Commit Graph

1495 Commits

Author SHA1 Message Date
Cris 637dbefce0 Removed user_language property from FHC_JS_DATA_STORAGE_OBJECT
To persist on a consistent translation system, the translation should be
performed by phrases system on serversite.
Therefore the user_language property is removed from
FHC_JS_DATA_STORAGE_OBJECT.
2020-04-20 14:55:01 +02:00
Andreas Österreicher 971e239d8e Merge branch 'feature-5961/DigitalerLehrauftrag_Auszahlungsinfoblatt_externe_Lehrende' into review/DigitaleLehrauftraege 2020-04-17 11:04:37 +02:00
Andreas Österreicher cee3d7bdd3 Merge branch 'feature-5883/DigitalerLehrauftrag_ColumnPicker' into review/DigitaleLehrauftraege 2020-04-17 09:33:32 +02:00
Andreas Österreicher b89ccf2595 Merge branch 'feature-5707/DigitalerLehrauftrag_PDF-Download_Akzeptierte_Lehrauftraege' into review/DigitaleLehrauftraege 2020-04-17 08:54:21 +02:00
Andreas Österreicher d5c8077d80 Merge branch 'feature-5405/DigitalerLehrauftrag_ExternePersonen_ausBestellungExkludieren' into review/DigitaleLehrauftraege 2020-04-17 08:47:16 +02:00
Andreas Österreicher 53dd517b90 Merge branch 'feature-7074/Reihungstest_Bewerbungstool_Login' 2020-04-16 13:35:52 +02:00
Andreas Österreicher 3855d6eb18 Vorlageermittlung korrigiert bei Sancho Mails damit immer die letzte aktive Vorlage genommen wird 2020-04-15 11:07:48 +02:00
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 2a99f37508 Added Help-Text (Guide to this page) to orderLehrauftrag & approveLehrauftrag
Moved text to function_getHelptext, which will switch language depending
on the given user language.
2020-04-14 13:58:40 +02:00
Cris 262fdc277e Added Help-Text (Guide to this page) to acceptLehrauftrag
Moved text to function_getHelptext, which will switch language depending
on the given user language.
2020-04-14 12:52:03 +02:00
Cris db78fa20f3 Added Multilingualism to all Lehrauftraege View GUI-items
Attention: part of phrases-array is used by javascripts.
(acceptLehrauftrag.js, approveLehrauftrag.js, orderLehrauftrag.js)
2020-04-02 17:12:36 +02:00
Cris b6f509c057 Added Multilingualism to all Lehrauftraege Tablewidgets' columns fields 2020-04-02 16:33:26 +02:00
Cris fe9e222182 Introduced user_language to FHC_JS_DATA_STORAGE_OBJECT
This is to retrieve easily user language via Javascript.
Retrieving using the storage will not cause any async issues as an
AJAX Call would do.
2020-04-02 15:46:07 +02:00
Paolo 2a59165332 Added new date format column ReihungstestDate to system/infocenter/infocenterFreigegebenData.php 2020-04-01 18:53:13 +02:00
Paolo 625b0f1167 - jobs/OneTimeMessages->sendMessageToApplicantsStillWaiting now accept
new message senderId to specify the sender for all the messages
- jobs/OneTimeMessages->sendMessageToApplicantsStillWaiting adapted code
to make use of the new method CLMessagesModel->sendExplicitTemplateSenderId
- jobs/OneTimeMessages->sendMessageToApplicantsStillWaiting now logs the
number of prestudents retrieved from database
- Renamed CLMessagesModel->sendExplicitTemplate as CLMessagesModel->sendExplicitTemplateSenderId
- Added new parameter sender_id to CLMessagesModel->sendExplicitTemplateSenderId to specify the sender person id
- Added new public method sendExplicitTemplate to CLMessagesModel as
wrapper method for sendExplicitTemplateSenderId
- CLMessagesModel->sendExplicitTemplate tries to retrieve the sender id
from the authentication session
2020-03-31 20:21:18 +02:00
Andreas Österreicher 1376509a37 Adapted SQL for MessageJob 2020-03-31 10:48:06 +02:00
Cris 9d4482767b Merge remote-tracking branch 'origin/feature-5883/DigitalerLehrauftrag_ColumnPicker' into feature-5405/DigitalerLehrauftrag_ExternePersonen_ausBestellungExkludieren
# Conflicts:
#	public/js/lehre/lehrauftrag/acceptLehrauftrag.js
#	public/js/lehre/lehrauftrag/orderLehrauftrag.js
2020-03-31 09:57:24 +02:00
Paolo e3257eef25 - CL/Messages_model->sendExplicitTemplate now gets the sender id from
the configuration if the user is not logged (ex. job)
- Added new job application/controllers/jobs/OneTimeMessages.php
2020-03-30 22:44:03 +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