Commit Graph

673 Commits

Author SHA1 Message Date
Andreas Österreicher e8460f03c1 Fixed Syntax Error in Phrases Page 2020-03-10 16:56:00 +01:00
Andreas Österreicher 2df57dd019 Fixed Syntax Error in Message API 2020-03-10 16:41:01 +01:00
Paolo edf7800120 - Controller system/messages/Messages parameters are now retrieved via HTTP POST
- public/js/messaging/messageWrite.js function parseMessageText now perform a HTTP POST ajax call
2020-03-02 16:45:04 +01:00
Andreas Österreicher 331c90b64b Merge branch 'feature-6079/Infocenter_Freigabe_nach_RT_Anmeldung' 2020-03-02 16:03:28 +01:00
Manfred Kindl b169a7f672 Merge branch 'feature-5490/Cronjobs_Priorisierung' 2020-02-28 18:16:40 +01:00
Manfred Kindl 967ce5a106 Finalisierung prioritizationJob 2020-02-28 18:15:54 +01:00
Manfred Kindl 48d422dd83 Deleted File "Priorisation" 2020-02-28 15:02:23 +01:00
Manfred Kindl 4d98128a39 Merge branches 'feature-3716/Messaging_inbox_outbox_user', 'feature-5490/Cronjobs_Priorisierung' and 'master' of https://github.com/FH-Complete/FHC-Core 2020-02-27 18:31:48 +01:00
Paolo a50cc6cba8 - jobs/MailJob->sendAllMessageEmailNotices changed since parameter default value
- Moved ALT_OE from MessageLib to CL/Messages_model
- MessageLib->_setSentError renamed to _updatedRecipientNoticeEmailInfo
- MessageLib->_sendNoticeEmail changed to have more information about a not sent notice email
- Recipient_model->getNotSentMessages now does not retrieve messages with notice email send failure
2020-02-25 16:41:27 +01:00
Manfred Kindl d07b0684c3 Orgform nur dazu schreiben, wenn es mehr als Eine gibt 2020-02-23 20:47:54 +01:00
Paolo 304d7727f0 - CL/Messages_model-> sendReply applied workaround for Infocenter
- MailJob now extends JOB_Controller and writes logs in DB
- MailJob->sendMessages renamed to sendAllMessageEmailNotices
- sendAllMessageEmailNotices now accept new parameter since to restrict number of messages
- MessageLib->sendAllEmailNotices now accept new parameter since and adapted to use new MessageLib->_sendNoticeEmails
- Recipient_model->getMessages renamed to getNotSentMessages
- Now accepts only limit and since as parameters
- Changed query to retrieve only message ids
2020-02-21 16:59:25 +01:00
Manfred Kindl 8a8ed725c4 Merge branch 'master' into feature-5490/Cronjobs_Priorisierung 2020-02-20 20:48:40 +01:00
Manfred Kindl ff7f150cb6 prioritizationJob created 2020-02-20 20:42:37 +01:00
Andreas Österreicher 4477afc5ed Merge branch 'feature-3716/Messaging_inbox_outbox_user' 2020-02-20 14:59:49 +01:00
alex ed332717ce Infocenter Details:
- added notice for entering the placement test points when Freigabe after RT participation
2020-02-14 18:23:14 +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
alex b41ef00b3d crm/Prestudent_model: hasBewerber can optionally check bewerber only for a Studiengangtyp. In InfoCenter, only Bachelors are checked after Freigabe (for setting Bewerber and Reihungstestbooleans) 2020-02-11 16:42:04 +01:00
Manfred Kindl 8f915d3c39 Initial File 2020-02-11 14:44:23 +01:00
alex 7fdaaace50 If Prestudent is freigegeben for RT and has already a Bewerber with reihungstestangetreten = true, a new Bewerber for the prestudent is created, reihungstestangetreten and teilgenommen are set to true 2020-02-07 17:46:29 +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