Commit Graph

1652 Commits

Author SHA1 Message Date
Cris 697e5057cf Added sending Sanchomail when Anrechnung is (not) recommended by lector
Mail goes to STGL. If not present, it will be sent to STGL assistance.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-27 11:37:51 +01:00
Cris 3fb2c3d387 Added Sanchomail sent when Anrechnung is applied by student
Mail goes to STGL. If not present, it will be sent to STGL assistance.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-27 10:33:19 +01:00
Cris 8a75bc9fdd Added method getFullName() to Person_model
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-26 18:54:42 +01:00
Cris db10f78505 Added method getLeitung() to Studiengang_model to retrieve STGL by studiengang_kz
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-26 18:52:28 +01:00
Cris 82780e9626 Added column "Herkunft (der Kenntnisse)" to STGL and lectors VIEW
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-26 15:39:18 +01:00
Cris e06a6768a4 Changed text as required in Students Anrechnung' View
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-26 15:26:16 +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 5b77a5d08f Restricted to upload only pdf files
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-25 18:23:59 +01:00
Cris aefd0842db Added tooltip for unselectable Anrechnungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-25 18:18:13 +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 0da2c6a74c Changed tabulator requiredPermissions for STGL Anrechnungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-21 14:41:46 +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 dc98b766c9 Now filtering / formatting correctly the updated data
...by adding status_kurzbz to returning json object

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-21 12:50:07 +01:00
Cris fd5b68d3b8 Set persistent layout and persistent sorting to STGL Anrechnungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-21 12:21:31 +01:00
Cris 8a03ccab5d Visibly greyed rows that are unselectable (at start and on update)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-21 11:19:11 +01:00
Cris 99db4ec3ce Adapted empfehlung to be human readable
ja/nein/- instead of boolean/null

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-21 11:08:57 +01:00
Cris 47c8432faf Added filter buttons to STGL Anrechnungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-21 10:51:22 +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 046f807788 Added ECTS to tabledata
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-20 11:06:53 +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 403304e1a7 Adapted CSS: Red button for rejecting, blue for approving
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-19 15:56:34 +01:00
Cris 360aec41ee Restricted tabledata to retrieve only for studies of STGL
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-19 15:47:31 +01:00
Cris 8d26cc9a86 Added permission lehre/anrechnung_genehmigen to Controller
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-19 15:45:04 +01:00
Cris b5dd85f2a6 Created Anrechnungen STGL: GUI, Controller, Tabledata, Phrases
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-19 14:43:32 +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 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