Commit Graph

656 Commits

Author SHA1 Message Date
Andreas Österreicher 4477afc5ed Merge branch 'feature-3716/Messaging_inbox_outbox_user' 2020-02-20 14:59:49 +01:00
Paolo 6882199d0e Bugfixes to allow to write to a person or to a prestudent from different GUIs 2020-02-12 14:43:11 +01:00
Manfred Kindl 98b2abeb51 BugFix show PreStudent Variables instead of Person Variables in Msg 2020-02-12 09:40:19 +01:00
Manfred Kindl 4b3f6f109d Bugfix Load Phrases in ViewMessage 2020-02-12 09:08:32 +01:00
Paolo 98918bc336 - Bugfix: fixed phrases in views/system/messages/*
- Added new phrases where missing or hard coded
- Fixed windowz new lines in /application/*
2020-02-11 18:05:26 +01:00
Andreas Österreicher b0380f4b64 FilterWidget and TableWidget Pages can now also be access with Readonly Permission 2020-02-07 13:16:55 +01:00
Andreas Österreicher e2f4e35a7f Lehrauftragsverwaltung zeigt per Default das aktuelle Studiensemester statt dem nächsten 2020-02-05 15:25:00 +01:00
Paolo 15b3532359 Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-02-04 17:16:17 +01:00
Andreas Österreicher 16f6bdbf70 Merge branch 'feature-5128/FHC-IDAM_account_activation' 2020-02-03 14:53:24 +01:00
Cris 98bb9987da Now inkludierte Lehre also checking former (past) BIS Verwendungen
This allows display of column 'Betrag' in Lehraufträge annehmen.
(Important for external lectors, who want to see Betrag of their new
Lehrauftraege. They usually don't have active BIS Verwendung at the
beginning of each term, therefor last (past) BIS Verwendung needs to be
checked)
2020-01-29 09:55:59 +01:00
Paolo 8f908887be - Method parseMessageText of controller system/messages/Messages could accept also the prestudent_id parameter
- If prestudent_id parameter then CLMessagesModel->parseMessageTextPrestudent is called
- Fixed show_error(getData error in model CLMessagesModel
- Added new method parseMessageTextPrestudent to model CLMessagesModel
- Method _prepareHtmlWriteTemplate of model CLMessagesModel now checks if data are from a prestudent and then uses MessageLib->getMessageVarsPrestudent
- Added new method getMessageVarsPrestudent to MessageLib
- Function parseMessageText in js/messaging/messageWrite.js could call system/messages/Messages/parseMessageText with prestudent_id parameter
2020-01-24 18:13:03 +01:00
Paolo 15fa4a6c90 Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-01-23 09:55:00 +01:00
alex 09323d167b controllers/system/infocenter/InfoCenter.php: bugfix - links are not built incorrectly anymore when switch from freigegeben to uebersicht with filter_id 2020-01-23 09:39:00 +01:00
Paolo 0244caaa70 - Moved core from Redirect controller to ViewMessage controller
- Dropped Redirect controller
- Adapted configs and paths because of these changes
2020-01-17 15:39:34 +01:00
Paolo 63f475cd27 - Moved controllers Redirect and ViewMessage to system/messages/
- Changed config entries in message.php
- Changed Redirect controller to improve code and logic
2020-01-17 15:02:42 +01:00
Paolo 47682f37df Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user 2020-01-16 16:36:57 +01:00
Andreas Österreicher 908d63f07e Merge branch 'feature-5698/Clean_ViewMessage_MessageToken_model' 2020-01-15 13:17:41 +01:00
Andreas Österreicher b29871be59 Merge branch 'hotfix-5697/DigitalerLehrauftrag_ErrorMessages' 2020-01-15 10:04:17 +01:00
Andreas Österreicher 3600f18cd0 Merge branch 'feature-5131/FilterWidget/TableWidget_reloadDataset_true_by_default' 2020-01-15 08:05:54 +01:00
Andreas Österreicher e537c0e00a Fixed Errorhandling for Phrases 2020-01-15 08:04:18 +01:00
Andreas Österreicher a5fae5f07f Lehrauftragsverwaltung - Berechtigungsprüfung beim Akzeptieren von Lehraufträgen angepasst wenn Lektor mehrere Accounts besitzt 2020-01-08 16:16:49 +01:00
Cris 26228430aa Customized error messages
Before the user got only a general error message ('Systemerror')  when
an error occured. Now the error messages are more individual for better
debugging experience.
2020-01-08 15:46:17 +01:00
Paolo ac4350959b Cleaned and improved code 2019-12-20 16:25:27 +01:00
Paolo befb707870 Merge branch 'feature-5663/Create_new_helper_function_getError' into feature-5131/FilterWidget/TableWidget_reloadDataset_true_by_default 2019-12-20 15:08:28 +01:00
Paolo 1832f9a78a - Set reloadDataset = true when widget is loaded
- Remove reloadDataset = true where these widgets are called
2019-12-20 14:43:09 +01:00
Paolo 4e6fc7c607 - Create new function getError in helper hlp_return_object_helper that should just returns retval
- Replace all show_error(getData( with show_error(getError(
- Replace all error($...->retval) with error(getError($...))
- Replace all ->outputJsonError(getData( with ->outputJsonError(getError(
- Replace all show_error($...->retval with show_error(getError($...
- Replace all outputJsonError($...->retval with outputJsonError(getError$...
- Replace all return error($...->retval) with return $...
2019-12-18 18:35:19 +01:00
Andreas Österreicher 8f3aadd3e2 Merge branch 'feature-3994/Digitaler_Lehrauftrag' 2019-12-18 16:08:11 +01:00
Andreas Österreicher 2dd540c9e6 Changed Permission for Lehrauftrag-Report from lehre/bestellen to lehre/erteilen 2019-12-18 15:50:30 +01:00
Andreas Österreicher 478bfdb9a0 Navigationwidget can be called without initial Permission 2019-12-13 08:54:49 +01:00
Andreas Österreicher 5b27f29a92 Merge branch 'feature-3994/Digitaler_Lehrauftrag' 2019-12-12 13:54:20 +01:00
Cris 9bf1715cb4 Removed unused code from CTRL Lehrauftrag bestellen 2019-12-12 13:43:07 +01:00
Paolo 14e54ea48c Merge branch 'feature-4998/FHC-IDAM_REST_Schnittstelle_zum_Setzen_des_Aktivierungscodes' into feature-5128/FHC-IDAM_account_activation 2019-12-11 18:55:10 +01:00
hainberg cde7e82033 Merge remote-tracking branch 'origin/feature-3994/Digitaler_Lehrauftrag' into feature-3994/Digitaler_Lehrauftrag 2019-12-11 16:13:04 +01:00
Cris 9911d792e4 Changed: Inkludierte Lehre when not is null AND not 0
Now the return value is also checking against 0.
2019-12-11 15:31:36 +01:00
alex 1a3a56483c Merge remote-tracking branch 'origin/feature-3994/Digitaler_Lehrauftrag' into feature-3994/Digitaler_Lehrauftrag 2019-12-10 15:32:31 +01:00
alex 34d736262b added Lehraufträge Lehrendeuebersicht to menu 2019-12-10 15:32:08 +01:00
Cris e8942a69b6 Changed: linking URL to CIS_ROOT now 2019-12-10 12:04:03 +01:00
Cris 72ec67a605 Fixed: errormsg missing data_arr in cronjob is fixed now 2019-12-10 10:26:50 +01:00
Paolo 0319d0cc2a - Added new constants in config/constants.php:
- LANG_SESSION_ACTIVE_LANGUAGES
        - LANG_SESSION_CURRENT_LANGUAGE
- Added new functions in helper hlp_language_helper:
        - setUserLanguage
        - getDBActiveLanguages
        - getActiveLanguages
- Adapted code to make use of them
- Added new controller controllers/widgets/Language
2019-11-26 15:24:26 +01:00
Cris bc4bebb39f Minor changes in job MailLehrauftragToApprove
Optimized code, added logInfo.
2019-11-26 14:46:28 +01:00
Cris a93ddfbe3d Added cronjob mailLehrauftraegeToAccept()
This daily job sends information about all lehr-/projektauftraege
approved (and not accepted/cancelled) the day bofore.
Receivers: lectors
2019-11-26 14:44:24 +01:00
Cris 0a335b7627 Added cronjob mailLehrauftraegeToApprove()
This daily job sends information about all lehr-/projektauftraege
ordered (and not approved) the day bofore.
Receivers: Department-/Kompetenzfeldleiter
2019-11-25 08:46:31 +01:00
Andreas Österreicher 617f435a7c Merge branch 'feature-4825/Studiensemester_Studienjahr_anlegen_bessere_Fehlermeldung_wenn_existiert' 2019-11-15 11:08:53 +01:00
Paolo a093d470e4 Fixed merge mistakes in FilterWidget 2019-11-14 15:40:35 +01:00
hainberg cc4baa9dfb Merge branch 'feature-3994/Digitaler_Lehrauftrag' of https://github.com/FH-Complete/FHC-Core into feature-3994/Digitaler_Lehrauftrag 2019-11-12 16:21:38 +01:00
Cris e092a6c33e Minor change: removed unused field 2019-11-12 16:08:10 +01:00
Andreas Österreicher 609adcc431 Dashboard für Lehraufträge hinzugefügt 2019-11-12 16:02:13 +01:00
Cris 9f3c9d5481 Unified default text displayed in Dropdown-Widgets
Now the dropdown widgets used in lehrauftrags-process have all same
look & feel when nothing is (pre-)selected. It will display
'Ausbildungssemester' or 'Studiengang'.
2019-11-12 11:53:57 +01:00
alex 5c21e29a0a - Studiensemester + Studienjahr anlegen: if Studiensemester/Studienjahr to add already exist, more beautiful error message displayed instead of page crash with database error
- renamed methods "saveStudienjahr" and "saveStudiensemester" und Studienjahr and Studiensemester controller to clearer "updateStudienjahr" and "updateStudiensemester"
2019-11-06 16:57:58 +01:00
Cris 9571e1ed7d Changed: Check if HAS INKLUDIERTE LEHRE now done by AJAX within js file
After moving javascript code from the view to an external js file, the
usage of global variable has_inkludierteLehre was causing css issues.

Now the check if lector has inkludierte lehre is an extra method in the
controller which is called by AJAX in the tabulators render-callback
function.
2019-11-05 16:47:36 +01:00