Commit Graph

1638 Commits

Author SHA1 Message Date
Cris 4e0fd56d99 Corrected empfehlung default value
Now default value is empty instead of false, as there are 3 different
stati to retrieve
1. null = no recommendation at all (default)
1. true = recommended
1. false = not recommended

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-18 13:45:11 +01:00
Cris de5c67d2f1 Devided methods getAnrechnungData and getAnrechnungDataByLv
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-18 13:41:46 +01:00
Cris 0d546dc0c0 Renamed POST parameter lv_id, studiensemester
...to stay consistent

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 15:24:26 +01:00
Cris aff838d3c3 Fixed typo studiensemester in AnrechnungLib
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 14:55:42 +01:00
Cris a1dfd3f598 Created new model Anrechnungstatus_model
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 14:21:53 +01:00
Cris dc84c91dae Added methods saveAnrechnungstatus() and getLastAnrechnungstatus()
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 14:21:00 +01:00
Cris 85ec64876d Changed permission to student/anrechnung_beantragen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 14:18:28 +01:00
Cris 091d921efa Redesigned and adapted GUI
Added download, alerts, new layout and styles that fit better to new
adaptations and to other GUIs.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 14:16:53 +01:00
Cris b57a3ec90f Added logic to download and open a document
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 14:13:17 +01:00
Cris 5af134312c Added logic for uploading file and saving anrechnung
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 14:12:08 +01:00
Cris 3116d4c7c9 Adapted index method and library(deadline, status, refactored code, lib functions)
- Check if application deadline is expired
- Refactored retrieving Anrechnung data (reusable)
- Adapted status for student view (new, in progress)

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-14 14:09:33 +01:00
Cris 5cd163819d Added upload function to DmsLib
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-11 15:24:12 +01:00
Cris 04174d35f5 Added Anrechnungsdata (student, lv and lectors of lv)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-05 12:19:27 +01:00
Cris fb29dc1e0e Added method getLvByStudent() to Lehrveranstaltung_model
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-05 12:17:41 +01:00
Cris 8309dfb3ca Created CONTROLLER Anrechnungen for students (CIS)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2020-12-22 16:00:07 +01:00
Cris e7d9d8859c Created VIEW Anrechnungen for students (CIS)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2020-12-22 15:43:44 +01:00
Andreas Österreicher b5510f023e Fixed Corner Case where wrong actual Studysemester ist retrieved if Start and End Dates are overlapping 2020-12-02 12:18:02 +01:00
Andreas Österreicher 0738f28144 Merge branch 'master' into feature-7434/Messages_Neue_Felder_zu_eingeloggtem_User_ergaenzen 2020-11-25 14:52:22 +01:00
Andreas Österreicher 34560fe78b Merge branch 'bug-10179/Message_recipient_without_internal_account' 2020-11-25 14:31:47 +01:00
Paolo 6e5c555a40 Fixed MessageLib->_sendNoticeEmail 2020-11-23 16:19:23 +01:00
Andreas Österreicher 119d5d99df Fixed Query to get User for Messages by PersonID and OrganisationUnit 2020-11-23 16:18:43 +01:00
Paolo 451e0e7843 Fixed MessageLib->_sendNoticeEmails: date and array comparisons 2020-11-19 00:09:53 +01:00
Paolo 9d2c004c6d Checks if the benutzer exists MessageLib->_sendNoticeEmails 2020-11-18 08:51:48 +01:00
Andreas Österreicher 232f261a76 Merge branch 'bugfix-8370/Fehlermeldung_korrigieren_in_LehrauftragBestellen' 2020-11-17 17:56:46 +01:00
Paolo 443caa91f2 Messaging sysntem: the internal email account is used only if the user
account is older then 24 hours
2020-11-09 10:45:25 +01:00
Andreas Österreicher ef3b86af4a Merge branch 'feature-10176/Diplomasupplement_Auslandsaufenthalt' 2020-11-09 08:27:01 +01:00
Paolo 2b6f8d9040 Fixed alias name of loglib in JQW_Controller 2020-10-23 10:42:12 +02:00
Andreas Österreicher bf0ada5d1e Merge branch 'feature-10172/Firmenhandy_von_FHC_nach_SAPSF' 2020-10-22 14:11:17 +02:00
alex a7d577baa5 person/Kontakt_model: added getZustellKontakt method for getting latest Zustellkontakt 2020-10-22 00:38:52 +02:00
alex 3ec0aabfee person/Kontakt_model: added getZustellKontakt for getting latest Zustellkontakt 2020-10-22 00:30:37 +02:00
Paolo 4654339681 Renamed library alias LogLib into LogLibJob when loaded in
JOB_Controller
2020-10-18 23:40:48 +02:00
Andreas Österreicher 048238a16f Merge branch 'feature-9150/TableWidgetAdaptations_for_Sync-Projects-FHtoSAP' 2020-10-15 13:38:58 +02:00
Andreas Österreicher e6a761abd7 Darstellungsfehler in OE-Widget behoben 2020-10-15 13:38:01 +02:00
alex a6e77b73c8 Merge remote-tracking branch 'origin/master' 2020-10-13 18:32:27 +02:00
alex 15877dd914 Lehrveranstaltung_model getStudents: possible to get only active students 2020-10-13 18:32:09 +02:00
Cris c1e4278e71 Changed permission denying - text in 'Lehrauftrag bestellen'
If a permission is correctly set, but the permission is restricted on
organisational units Department or Kompetenzfeld, the error-text gives now
meaningful information about the abort.

Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-10-13 15:45:37 +02:00
Cris 388a266822 Modified Dropdown-Widget Organisationseinheit
Modified to enable empty default-value and default text.

Signed-off-by: Cris <hainberg@technikum-wien.at>
2020-10-01 11:17:14 +02:00
Andreas Österreicher 3b33b6bcdb Formatierung des Betrags bei automatisierten Gegenbuchungen korrigiert 2020-09-18 11:55:52 +02:00
alex 0153364885 Prüfungsprotokoll Freigabe: passed data to controller in better way (password and freigegeben bool in a separate object) 2020-09-15 18:11:37 +02:00
Andreas Österreicher e717a3b65c Merge branch 'logging' 2020-09-15 13:43:57 +02:00
Paolo 65ee03f6ae - Added new constant OPT_MINUTES to FilterWidgetLib
- Now is it possible to use minutes and hours in the FilterWidget
- LogsViewer tool now displays milliseconds for execution time column
- Changed filters for LogsViewer tool
2020-09-14 15:01:33 +02:00
alex 3309157a99 Merge remote-tracking branch 'origin/master' 2020-09-14 11:11:58 +02:00
alex 080e3582cf Mitarbeiter_model getPersonal: possible to reduce result to eonly certain uids 2020-09-14 11:11:44 +02:00
Paolo fbd4ded720 - Added new constants P_NAME_REQUEST_ID and
P_NAME_REQUEST_DATA_FORMATTER tp logLib
- Added new properties _requestId and _requestDataFormatter to LogLib
- Added new public method setConfigs to LogLib
- Added possibility to choose the request id when the LogLib is loaded
- Added possibility to format the request data using the
_requestDataFormatter parameter
- Now LogLib always stores the request id + log level
- Added possibility to change the execution time parameter
- Adapted application/core/JOB_Controller.php code
- Adapted application/core/JQW_Controller.php code
2020-09-11 17:43:39 +02:00
Andreas Österreicher c31d74e9ba Added return value to Job to to avoid wrong logging Errors 2020-09-08 08:44:13 +02:00
Andreas Österreicher b365ac5611 Funktion zum Zahlungsausgleich hinzugefügt 2020-08-28 09:50:48 +02:00
Nikolaus Krondraf cb8dd948f0 Ansicht um Mitarbeiter ohne bPk erweitert 2020-08-26 13:10:18 +02:00
Andreas Oesterreicher 8a4d2abfd9 Added Start and End Date to getAktOrNextStudiensemester 2020-08-20 20:33:17 +02:00
alex 676b3b3039 - added sanitizeProblemChars to common helper for sanitizing chars
- improved alias handling in benutzermodel
- added kurzbz handling to employeemodel
2020-08-12 21:33:08 +02:00
Andreas Österreicher bc305dc86c Merge branch 'master' into feature-6656/Worker_queue 2020-08-10 18:11:31 +02:00