Commit Graph

439 Commits

Author SHA1 Message Date
Cris 81bd719e39 Added Empfehlungsnotiz in STGL Detailview + minor GUI change
Now STGL can save and update notes regarding recommendation.

Therefore minor GUI change by displaying tables within panels instead of
appending directly to panel - in STGL and lectors Detail view. This is
for clearer view and gives space for the notes.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-29 09:54:57 +02:00
Cris 21ce118f0b Merged master into branch
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-28 15:54:54 +02:00
Cris 7b485053d9 Adapted DMSLib upload method to be accept field name from Controller
The fieldname represents the HTML uploadfile input name attribute, which
is given by the developer in the VIEW.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-21 18:46:51 +02:00
Cris 6dcb5e3a65 Adapted DMSLib download method to be more generic
DMSLib now extends FHC Controller to use its new method 'outputFile',
which sets HTTP headers and reads the file.
DMSLib uses now download function to accept params from Controller like
own filename or special disposition.
Loading document and retrieving file info is outsourced into own method
to be reusable.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-21 17:53:42 +02:00
Cris b9955c14a6 Minor code changes for better maintainance
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-13 16:33:53 +02:00
Cris fe4b70ba19 Usability: Added 'Empfehlungsanforderung an/am' to STGL + lectors Detail view
. Now more "Empfehlungs"-data shown in a table.
. Better separation of PHP / JS.
. Adapted Controller, View, JS and library to provide data about WHEN and
TO WHOME the requests for recommendation had been sent.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 15:50:05 +02:00
Cris 343b7a3087 Adapted Controller to use library method getLectors()
...instead of redundant private method.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 11:59:13 +02:00
Cris 7c875d5f80 Usability: Added 'ZGV' to STGL and lectors Detail site
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-06 14:48:08 +02:00
Cris 7690a122b8 Refactored: Moved getAnrechnungstatusbezeichnung to AnrechnungLib
This method retrieves the Anrechnungstatusbezeichnung in the users language.
It is used multiple times -> moved to library.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-30 13:57:43 +02:00
Cris d183dda815 Fixed: Anrechnunglib returning values, Adapted error messages
Fixed: method getData in Controller was producing wrong returning message.
Fixed by removing, as library is returning boolean value now.

Adapted few error functions to be more generic and bilingual.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-29 18:48:26 +02:00
Cris f9cbd9caf5 Refactored code
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-25 16:51:11 +01:00
Cris 683e9ffdda Modified to request recommendation (+send mails) ONLY if LV has lectors
Modifications done for STGL Overview and Detailview

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-24 16:22:56 +01:00
Cris 3a0720e4de Changed: If LV has no lectors, show empty field instead of error message
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-22 17:28:29 +01:00
Cris 00656efaef Changed filename on download to 'Anrechnungsantrag_OrgForm_LVID_VornameNachname'
Adapted STGL and lectors views to change the filename on download event.
All download functions moved from view to library.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-22 12:12:04 +01:00
Cris 050eef120c Adapted download function in DMSLib to accept params filename and disposition
. Filename: uses given string as filename. Otherwise upload filename is used.
. Disposition: inline (open in new tab), attached (download dialog box)

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-22 12:08:57 +01:00
Andreas Österreicher 581a4c33a4 Merge branch 'feature-11690/SAPByD_User_Update_Request_Limit' 2021-02-23 08:48:30 +01:00
Andreas Österreicher 577d0f1eb5 Fixed Filename 2021-02-17 15:21:38 +01:00
Paolo 94d335600c - Added new protected method getOldestJob to JQW_Controller
- Added new public method getOldestJob to JobsQueueLib
2021-02-16 21:21:11 +01:00
Andreas Österreicher fec8fbb6d4 Anrechnungen - Mail Empfänger korrigiert bei Personen mit mehreren Accounts 2021-02-16 09:46:50 +01:00
Andreas Österreicher 4d81f91840 Problem behoben wodurch falsche Anrechnungen geladen wurden 2021-02-15 16:44:34 +01:00
Andreas Österreicher bff6307a62 Anrechnungen
- Neuer Job zum Setzen der Anrechnungsnote hinzugefügt
- Direktes setzen der Zeugnisnote bei Anrechnung entfernt
2021-02-12 15:52:26 +01:00
Cris 25400d8b5f Removed updateamum/updatevon when updating Anrechnungmodel
They are not needed. Just confusing.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-08 17:25:34 +01:00
Cris e9664c179a Added Genehmigungs GUI + Begreundungsnotiz for rejected Anrechnungen in STGL VIEWS
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-04 10:24:08 +01:00
Cris 110f05b91c Corrected empfehlung_datum
Now the query uses the correct status kurzbz 'inProgressDP'.
This is because the date the lector sends the recommendation (=empfehlung_datum),
the status is changed to inProgressDP and the insertamum is set there.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 15:43:14 +01:00
Cris e780a3e505 Added GUI for STGL Detail VIEW + logic (Antrag- and Empfehlungdata)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 15:30:53 +01:00
Cris 5109828772 Adapted STGL overview: info/begruendungsangabe when approving/rejecting
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 12:59:46 +01:00
Cris b13fb0cda8 Added lector Detail GUI to retrieve and process Empfehlungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 11:01:02 +01:00
Cris 8fc338ccb4 Added GUI/functionality to add begruendung for 'NICHT EMPFEHLEN' in lectors overview
. Begruendung is added as Notiz
. GUI to attach begruendung will slide down the moment 'Nicht Empfehlen'
is clicked
. added phrases

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-02 14:06:49 +01:00
Cris da3720e65d Added lectors detail view CONTROLLER
+ adaptations to AnrechnungLib
+ phrases

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-01 10:11:57 +01:00
Cris 70d02e25f9 Removed doublecheck of last status
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-29 11:54:52 +01:00
Cris bd293f3b3a Changed mail text to inform students about approved/rejected Anrechnungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-28 16:04:21 +01:00
Cris 8d09ee7299 Modified to update Zeugnisnote, if already exists
During approving process the zeugnisnote is set to 6 (angerechnet).
If zeugnisnote already exists, it will be updated now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-28 11:28:44 +01:00
Cris 35009097f1 Added sending Sanchomail to student when Anrechnung was approved/rejected
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-27 14:49:30 +01:00
Cris 7d0ff4fcee Added check, when STGL tries to request recommendation for already recommended Antraege
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-26 13:56:34 +01:00
Cris 1b00ae78b4 Created Anrechnungen LektorInen: GUI, Controller, Tabledata, Phrases
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-25 17:07:39 +01:00
Cris 0528ae3eb9 Added uebernahmedatum and benotungsdatum to zeugnisnote
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-21 13:39:31 +01:00
Cris 97d86cc702 Added logic & GUI adaptations for requesting recommendations
. Added request recommendation-methods in Controller and Library

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 19:07:33 +01:00
Cris 9a0ea02e0c Minor code enhancement
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 19:03:53 +01:00
Cris a09abfd70c Added Zeugnisnote = 6 (angerechnet) when Anrechnung is approved
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 15:14:31 +01:00
Cris 114ac7a69e Corrected Personenkennzeichen: students matrikelnr instead of person bpk
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 13:40:33 +01:00
Cris 1bd66d0ee2 Corrected: No genehmigt_von and update info when Anrechnung is rejected
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 13:15:28 +01:00
Cris f0ef091c5f Added logic & GUI adaptations for rejecting Anrechnungen
. Added rejecting-methods in Controller and Library

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 11:48:07 +01:00
cris-technikum 964bd40c14 Added logic & GUI adaptations for approving Anrechnungen
. Added approve-methods in Controller and Library
. Added row selection checks to avoid selecting approved and rejected
Antraege

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 11:02:15 +01:00
Cris f185c92db7 Created Anrechnungen Students GUI, Controller, DB-tables, library, phrases
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-19 13:03:26 +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
Paolo 6e5c555a40 Fixed MessageLib->_sendNoticeEmail 2020-11-23 16:19:23 +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
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
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