Commit Graph

1478 Commits

Author SHA1 Message Date
Cris e25bf60bf1 Added GUI and phrase for info sheet for external lecturers
A new link was set.
. only shown to external lecturers
. links to dms document infoblatt for external lecturers
2020-04-15 09:51:25 +02:00
Cris 2938e0bdb0 Bugfixed: Removed undefined functions
After moving functions to Tablewidget.js, these function calls doesnt
exist anymore in the earlier corresponding javascripts. Therefore they
must be removed.
2020-03-30 19:27:12 +02:00
Cris e272975a17 Changed / Adapted Dropdown PDF Download for Lehrauftraege
Changed:
GUI. Now using Dropup button instead of 2 single buttons to give
clarity and ability to add more pdf download in a single point.

Adapted:
GUI and JS now adapted to newer GUI version (after merging column picker
branch into feature branch)
2020-03-30 19:10:59 +02:00
Cris eac386496a Merge remote-tracking branch 'origin/feature-5883/DigitalerLehrauftrag_ColumnPicker' into feature-5707/DigitalerLehrauftrag_PDF-Download_Akzeptierte_Lehrauftraege
# Conflicts:
#	public/js/lehre/lehrauftrag/acceptLehrauftrag.js
2020-03-30 12:32:39 +02:00
Cris d0c989ee63 Merge branch 'master' into feature-5707/DigitalerLehrauftrag_PDF-Download_Akzeptierte_Lehrauftraege 2020-03-26 14:31:49 +01:00
Cris 0b1d847882 Added Download PDF of accepted Lehrauftraege (seperated by FH /Lehrgaenge)
Lectors can now download as pfd all their accepted Lehrauftraege.
Therefore two buttons are available for seperate download of
Lehrauftraege on FH or Lehrgaenge.
The queries are proofing now if a contract exists and if the status is
'akzeptiert'.
2020-03-26 14:16:37 +01:00
Andreas Österreicher b4b9707d29 Merge branch 'feature-6622/Messaging_vorlagen_mehrfach_in_der_liste' 2020-03-25 14:12:47 +01:00
Andreas Österreicher 1f4722b7a0 - Config hinzugefügt um Lektorenzuordnungen im CIS nur anzuzeigen wenn der Vertrag erteilt wurde
- Verträge werden erst ab Status erteilt für Lektoren angezeigt
2020-03-12 19:24:47 +01:00
Andreas Österreicher 5bd9ece44a Merge branch 'master' into feature-5883/DigitalerLehrauftrag_ColumnPicker 2020-03-10 16:59:15 +01:00
Andreas Österreicher e8460f03c1 Fixed Syntax Error in Phrases Page 2020-03-10 16:56:00 +01:00
Andreas Österreicher 505dba7f4c Added Inbox/Outbox Link to CI Page 2020-03-10 16:42:22 +01:00
Andreas Österreicher 2df57dd019 Fixed Syntax Error in Message API 2020-03-10 16:41:01 +01:00
Paolo 9bb4e2507a - Added two new functions to config entry ou_function_whitelist
- Fixed Vorlage_widget to retrieve univocally templates
2020-03-09 13:41:17 +01:00
Paolo 88fc901bf7 - Added new config entry ou_function_whitelist in message.php
- Added new constant CFG_OU_FUNCTION_WHITELIST in library MessageLib
- MessageLib->getOeKurzbz now filters out organization units based on config entry ou_function_whitelist
- Removed redundant templates in Vorlage_widget
2020-03-06 16:56:27 +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
Paolo de62bc0f3d Merge branch 'feature-3716/Messaging_inbox_outbox_user' 2020-03-02 16:13: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
Paolo caf57092e4 - Page to write a new message from FAS/Infocenter has a wider and higher variables drop down
- Tabulator fix CSS
2020-02-28 17:05:11 +01:00
Manfred Kindl 48d422dd83 Deleted File "Priorisation" 2020-02-28 15:02:23 +01:00
Manfred Kindl 27e8208868 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2020-02-28 14:56:41 +01:00
Andreas Österreicher 88693f2dea Merge branch 'bugfix-6005/Digitaler_Lehrauftrag_Hidden_Field_4Chrome' 2020-02-28 13:44:37 +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 34b6581849 - Renamed BenutzerfunktionModel->getByPersonId to getActiveFunctionsByPersonId
- BenutzerfunktionModel->getActiveFunctionsByPersonId changed query to get only active functions
- Removed commented code
2020-02-26 17:22:59 +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 8507f63936 GUI-changes in writeTemplate
- Show only "bezeichnung" of template in select for regular users
- New styled "Preview"-Button.
- Click on "Preview" automatically scrolls to Preview-Div
2020-02-23 20:51:16 +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
Paolo 9a9b847138 Fixed Tabulator include in FHC-Header 2020-02-20 16:21:31 +01:00
Andreas Österreicher 1ac1c118d5 Fixed Message Reply 2020-02-20 15:53:43 +01:00
Andreas Österreicher 4477afc5ed Merge branch 'feature-3716/Messaging_inbox_outbox_user' 2020-02-20 14:59:49 +01:00
Paolo 0b3d5e19a3 CL/Messages_model->sendReply now uses as sender id the logged user person id or the previous message recipient id 2020-02-20 14:39:37 +01:00
Paolo 0db611ed27 - Added new config entry in mail config file called enable_debug
- If enable_debug is true then info about the mail are logged into the CI error logs
- Fixed queries to get sent and received messages with Recipient_model, now messages for which a notice email was not sent are retrieved and messages are sorted by insertamum
- CL/Messages_model:
	- Before setting a message as read check if a record is already present
	- If the recipient is a prestudent then in table tbl_msg_message oe_kurzbz is set with the ou of the prestudent
	- The sender id (person_id) now is get from the currently logged user also when replying
- MessageLib->_sendNoticeEmails checks that the message was sent only from FAS (NOT from infocenter)
2020-02-18 15:19:58 +01:00
Paolo b94aad14fb - Added new config entris for messaging: ou_receivers_no_notice and ou_receivers_private
- MessageLib:
	- Renamed method sendAllNotices to sendAllEmailNotices
	- Renamed method _sendOneNotice to _sendNoticeEmails
	- Renamed method _sendNotice to _sendNoticeEmail
	- If the recipient contact is empty is not anymore a blocking error
- Recipient_model->getMessageById renamed to getMessagesById, not it accepts an array of message ids, could return more results
- Fixed bug in public/js/messaging/writeReply.js to send subject value
2020-02-17 18:29:07 +01:00
Paolo 11f3fad1f7 Changed logic to send notice email to a message recipient 2020-02-14 19:17:09 +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 a4bfdfb4a0 Fixed merge with stashed files in system/messages/htmlWriteTemplate.php 2020-02-13 12:49:57 +01:00
Paolo c54579ef7d /system/messages/MessageClient/read sent messages: read them all 2020-02-12 16:39:00 +01:00
Paolo 937db42e11 - Allow to change the subject in all reply pages
- Remove tabs and/or blanks from subject when replying
2020-02-12 16:14:50 +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
Paolo 16cb4a0d4c - Replace "This is a notice to notice you that you have been noticed..." with:
EN: "This message will be delivered to the Infocenter of UAS Technikum Wien"
	DE: "Diese Nachricht wird an das Infocenter der FHTW zugestellt "
- Bugfix: fixed phrases in system/messages/MessageClient/write
2020-02-11 16:49:25 +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
Paolo c7b33fe160 Bugfix: FAS write page person id and prestudent id are swapped 2020-02-11 16:04:08 +01:00
Manfred Kindl 8f915d3c39 Initial File 2020-02-11 14:44:23 +01:00