eace7ab868
Merge branch 'feature-7252/Urlaubstool_DarstellungNichtFreigegebene'
2020-04-17 08:09:45 +02:00
53dd517b90
Merge branch 'feature-7074/Reihungstest_Bewerbungstool_Login'
2020-04-16 13:35:52 +02:00
68d934f12e
Bessere Darstellung vergangener nicht freigegebener Urlaube
2020-04-16 01:43:33 +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
64b8b81b91
Textkorrektur
2020-04-07 13:18:16 +02:00
b270103893
Diverse Anpassungen
...
- Testseite optisch verbessert
- Gebiet kann nicht mehr gestartet werden, wenn RT gesperrt wurde.
- Loginseite mit Einführungsvideo und check, ob Browser Firefox ist
2020-04-07 12:44:10 +02:00
c641a52898
Merge branch 'feature-7082/Cronjob_message_für_wartende'
2020-04-06 08:50:05 +02:00
abf8671ac9
Added phrases to phrasesupdate
2020-04-02 17:14:52 +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
aaaa5f52ae
Added Multilingualism to all Lehrauftraege tooltips
2020-04-02 17:07:04 +02:00
b6f509c057
Added Multilingualism to all Lehrauftraege Tablewidgets' columns fields
2020-04-02 16:33:26 +02:00
b960a5ec58
Added Multilingualism for Tablewidget: Help / GUI items
...
Shorter phrases are realised via FHC_PhrasesLib.
Longer text (including HTML tags) are realised by
. first retrieving language of FHC_JS_Storage_Object
. then switching to corresponding language text while rendering.
2020-04-02 15:53:06 +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
c09f4e4beb
Merge remote-tracking branch 'origin/feature-6642/Auswertung_FHTW_mit_Termin_Multiselect' into feature-6642/Auswertung_FHTW_mit_Termin_Multiselect
2020-04-01 20:36:09 +02:00
2bb4d74500
Stylefix
2020-04-01 20:36:06 +02:00
f8e80198c2
Bugfix Abgabetool
2020-04-01 20:35:18 +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
88caff35fb
Fehler in der Suche behoben bei dem Redirects nicht korrekt funktionieren wenn ein Link in einer anderen Sprache angeklickt wird.
2020-04-01 16:47:00 +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
36079cde6a
Zwischenseite für Testtool Anmeldung hinzugefügt
2020-03-31 16:21:15 +02:00
646378ad1a
Login für Testtool angepasst damit ein Login über das Bewerbungstool möglich ist wenn im Config aktiviert
2020-03-31 12:20:33 +02:00
0aef629134
Adapted SQL query for Projektbetreuungen
2020-03-31 11:57:46 +02:00
76afc73c49
Fixed: Now Projektbetreuer are selectable again
...
Before Projektbetreuer, that should be selectable in ordering process,
were excluded from selection. This is fixed now.
2020-03-31 11:50:11 +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
5b9c1f7ccc
vilesci/stammdaten/auswertung_fhtw:
...
- correct order of RT beendet text in Testende mail
2020-03-25 20:34:14 +01:00
54c2357016
vilesci/stammdaten/auswertung_fhtw:
...
- preselect RTs of current date if no selection
- fixed prestudent_id selection event bug
2020-03-25 18:50:50 +01:00
bb4d01f6e7
Merge branch 'feature-6587/DigitalerLehrauftrag_Fehlermeldung_Storno'
2020-03-25 16:23:04 +01:00
ef631e328d
vilesci/stammdaten/auswertung_fhtw:
...
- fixed bug where no results are shown when filtering by other criteria than reihungstestids
2020-03-25 16:16:30 +01:00
95ea5ab608
Merge branch 'feature-6594/Studienerfolgsbestaetigung_Englisch_Studiengangstyp_anzeigen'
2020-03-25 16:05:52 +01:00
0546b8c388
Merge branch 'master' into feature-6594/Studienerfolgsbestaetigung_Englisch_Studiengangstyp_anzeigen
2020-03-25 16:01:13 +01:00
384a086188
Gegencheck für bezeichnung_mehrsprachig in tbl_studiengangstyp hinzugefügt
...
Prüfung fuer Spaltenexistenz korrigert
2020-03-25 15:58:02 +01:00
898a498c2c
Merge branch 'feature-6050/Stundensatz_vorschlag'
2020-03-25 15:32:44 +01:00
2d1baebf1f
BACode korrigiert
2020-03-25 15:31:24 +01:00
ac305f4238
Merge branch 'master' into feature-6050/Stundensatz_vorschlag
2020-03-25 15:05:07 +01:00
dea3139897
Merge branch 'feature-6568/NotfallkontaktV2'
2020-03-25 14:59:12 +01:00
Andreas Österreicher