blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 16:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,730 Commits 211 Branches 6 Tags
2906c1803e9d0caf5cac630730eb1de18ce2cdac
Commit Graph

1534 Commits

Author SHA1 Message Date
Cris d35ee0c834 Adapted method to retrieve user fields when method is called by a cronjob 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-06-02 15:06:22 +02:00
Cris 8b80f2226e Added logic for cronjob to add senders fields into message body 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-06-02 15:03:31 +02:00
Cris 4f1796ee9d Added logic to add message vars data of logged in user into message body 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-05-28 09:48:31 +02:00
Cris ebd9c2c0ba Added method to retrieve message vars data of the logged in user 
This method retrieves the specific data of the logged in user to be
used in 'Meine Felder'

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-05-28 09:46:15 +02:00
Cris 634401485a Renamed 'Meine Felder'-msg names and small method adaptation to retrieve fields 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-05-28 09:42:51 +02:00
Cris a5e0c9ca5a Added logic to provide fields of logged in user in Messaging system 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-05-27 11:52:12 +02:00
Cris 7ab2155d6a Added method to retrieve data of logged in user in Message model 
Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-05-27 11:49:35 +02:00
Cris 1be1d1c8e9 Added GUI for 'Eigene Felder' + layout adaptations 
. GUI: added multidropdown 'Eigene Felder', which contains fields of
the logged in user
. Layout: Message text area has now min and max height; sending
button now aligned correctly; multidropdowns now aligned to text area

Signed-off-by: Cris <hainberg@technikum-wien.at>
 2020-05-27 11:48:05 +02:00
Andreas Österreicher 08b0a7bf08 Merge branch 'hotfix/DigitalerLehrauftrag_Sprache_umschalten' 2020-05-20 08:49:30 +02:00
Andreas Österreicher 3d52c4b598 Merge branch 'bug-7422/Bewerbungsfrist_wird_falsch_angezeigt' 2020-05-20 08:38:57 +02:00
alex 784afe0044 crm/Prestudent_model getPrestudentWithZgv: added order for Bewerbungstermine 2020-05-14 13:40:34 +02:00
Andreas Österreicher 7859559311 Merge branch 'bug-7422/Bewerbungsfrist_wird_falsch_angezeigt' 2020-05-14 13:04:41 +02:00
Cris f45f4f6987 Fixed check for external lector to display / hide infosheet correctly 2020-05-13 17:13:42 +02:00
KarpAlex 7e1f1acb22 Prestudent_model getPrestudentWithZgv: Bewerbungsfrist shown corretly evne if Prestudent from Drittland 2020-05-13 16:18:05 +02:00
Cris 8be6552235 Added check if language isset in COOKIE in hlp_language_helper 2020-05-07 14:48:05 +02:00
Andreas Österreicher b7a9f139af Merge branch 'review/DigitaleLehrauftraege' 2020-05-05 08:03:13 +02:00
gerryraab 364d754b51 Anpassung Datumsformat, Darstellung aller RTs des laufenden 
Studienjahres
 2020-04-27 15:52:47 +02:00
Andreas Österreicher ec884fe372 Merge branch 'master' into feature-5491/UDFWidget_add_new_features 2020-04-21 15:59:09 +02:00
Andreas Österreicher b935d7a175 Merge branch 'feature-6814/Infocentertool_nach_dem_RT_hinzugefuegte_Bewerbungen_auf_Detailseite_markieren' 2020-04-21 15:33:11 +02:00
Andreas Österreicher 4679701bcd Merge branch 'feature-6963/Messaging_system_hide_button_to_write' 2020-04-21 15:16:38 +02:00
Andreas Österreicher ebb6e1b90f Fixed Phrasename for Back Button 2020-04-21 15:15:57 +02:00
Andreas Österreicher 900d93fb4d Merge branch 'feature-6789/Messaging_answer-Button_for_assistants' 2020-04-21 14:48:49 +02:00
Cris 989409f860 Created view for acceptLehrauftrag-Helptext (using phrases-system) 2020-04-21 13:31:58 +02:00
Cris 3dacba5625 Created view for approveLehrauftrag-Helptext (using phrases-system) 2020-04-21 13:31:37 +02:00
Cris af8b6ed93d Created view for orderLehrauftrag-Helptext (using phrases-system) 2020-04-21 13:31:13 +02:00
Andreas Österreicher e698485a39 Merge branch 'feature-6634/Neue_Variable_Orgform_Bezeichnung_in_vw_msg_vars' 2020-04-21 11:26:59 +02:00
Cris 67a29b2ff7 Moved Tablesettings-Helptext to server (using phrases-system) 2020-04-20 14:58:24 +02:00
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 299f16dd8c - View system/messages/ajaxWrite added new button backButton 
- Added new function backToInOut to public/js/messaging/write.js
- Assigned function backToInOut to backButton click event
- Added new phrase backToReadWeiteMeassage to system/phrasesupdate.php
 2020-04-01 18:27:10 +02:00
Paolo 35970696ca CL/Messages_model->prepareHtmlRead hide reply button only if the sender 
is not the system sender and are present configurations to reply
 2020-03-31 21:48:55 +02:00
Paolo e038fa4f34 - system/messages/MessageClient->read now loads view system/messages/ajaxRead with $this->CLMessagesModel->prepareAjaxRead() as parameter 
- view system/messages/ajaxRead.php can hide the button to write new messages
- Added new public method prepareAjaxRead to model CL/Messages_model
 2020-03-31 21:28:16 +02:00
Paolo a2c9954a6d - FAS_UDF->index declared missing array data 
- public/js/UDFWidget.js changed save button caption to "Speichern"
 2020-03-31 20:40:41 +02:00
Paolo 91d78066a4 Merge branch 'master' into feature-5491/UDFWidget_add_new_features 2020-03-31 20:33:01 +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