b7a9f139af
Merge branch 'review/DigitaleLehrauftraege'
2020-05-05 08:03:13 +02:00
364d754b51
Anpassung Datumsformat, Darstellung aller RTs des laufenden
...
Studienjahres
2020-04-27 15:52:47 +02:00
ec884fe372
Merge branch 'master' into feature-5491/UDFWidget_add_new_features
2020-04-21 15:59:09 +02:00
b935d7a175
Merge branch 'feature-6814/Infocentertool_nach_dem_RT_hinzugefuegte_Bewerbungen_auf_Detailseite_markieren'
2020-04-21 15:33:11 +02:00
4679701bcd
Merge branch 'feature-6963/Messaging_system_hide_button_to_write'
2020-04-21 15:16:38 +02:00
ebb6e1b90f
Fixed Phrasename for Back Button
2020-04-21 15:15:57 +02:00
900d93fb4d
Merge branch 'feature-6789/Messaging_answer-Button_for_assistants'
2020-04-21 14:48:49 +02:00
989409f860
Created view for acceptLehrauftrag-Helptext (using phrases-system)
2020-04-21 13:31:58 +02:00
3dacba5625
Created view for approveLehrauftrag-Helptext (using phrases-system)
2020-04-21 13:31:37 +02:00
af8b6ed93d
Created view for orderLehrauftrag-Helptext (using phrases-system)
2020-04-21 13:31:13 +02:00
e698485a39
Merge branch 'feature-6634/Neue_Variable_Orgform_Bezeichnung_in_vw_msg_vars'
2020-04-21 11:26:59 +02:00
67a29b2ff7
Moved Tablesettings-Helptext to server (using phrases-system)
2020-04-20 14:58:24 +02:00
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
971e239d8e
Merge branch 'feature-5961/DigitalerLehrauftrag_Auszahlungsinfoblatt_externe_Lehrende' into review/DigitaleLehrauftraege
2020-04-17 11:04:37 +02:00
cee3d7bdd3
Merge branch 'feature-5883/DigitalerLehrauftrag_ColumnPicker' into review/DigitaleLehrauftraege
2020-04-17 09:33:32 +02:00
b89ccf2595
Merge branch 'feature-5707/DigitalerLehrauftrag_PDF-Download_Akzeptierte_Lehrauftraege' into review/DigitaleLehrauftraege
2020-04-17 08:54:21 +02:00
d5c8077d80
Merge branch 'feature-5405/DigitalerLehrauftrag_ExternePersonen_ausBestellungExkludieren' into review/DigitaleLehrauftraege
2020-04-17 08:47:16 +02:00
53dd517b90
Merge branch 'feature-7074/Reihungstest_Bewerbungstool_Login'
2020-04-16 13:35:52 +02:00
3855d6eb18
Vorlageermittlung korrigiert bei Sancho Mails damit immer die letzte aktive Vorlage genommen wird
2020-04-15 11:07:48 +02:00
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
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
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
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
b6f509c057
Added Multilingualism to all Lehrauftraege Tablewidgets' columns fields
2020-04-02 16:33:26 +02:00
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
2a59165332
Added new date format column ReihungstestDate to system/infocenter/infocenterFreigegebenData.php
2020-04-01 18:53:13 +02:00
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
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
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
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
91d78066a4
Merge branch 'master' into feature-5491/UDFWidget_add_new_features
2020-03-31 20:33:01 +02:00
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
1376509a37
Adapted SQL for MessageJob
2020-03-31 10:48:06 +02:00
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
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
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
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
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
d0c989ee63
Merge branch 'master' into feature-5707/DigitalerLehrauftrag_PDF-Download_Akzeptierte_Lehrauftraege
2020-03-26 14:31:49 +01:00
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
b4b9707d29
Merge branch 'feature-6622/Messaging_vorlagen_mehrfach_in_der_liste'
2020-03-25 14:12:47 +01:00
18a3e7be99
Infocenter details:
...
- mark Applications before Freigabe of an applicant if placement test already took place
- removed "style" attributes in zgvpruefungen.php view
2020-03-24 18:28:50 +01:00
4ac4abf907
views/system/messages: dynamic resizing of variables window in message write view
2020-03-13 19:27:31 +01:00
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
da621a2154
Merge branch 'master' into feature-5491/UDFWidget_add_new_features
2020-03-12 11:19:17 +01:00
5bd9ece44a
Merge branch 'master' into feature-5883/DigitalerLehrauftrag_ColumnPicker
2020-03-10 16:59:15 +01:00
e8460f03c1
Fixed Syntax Error in Phrases Page
2020-03-10 16:56:00 +01:00
505dba7f4c
Added Inbox/Outbox Link to CI Page
2020-03-10 16:42:22 +01:00
2df57dd019
Fixed Syntax Error in Message API
2020-03-10 16:41:01 +01:00
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
Andreas Österreicher