blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-24 10:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,287 Commits 216 Branches 6 Tags
debd6724b3a343c236bcfead4e77ea15fc0fa49c
Commit Graph

1812 Commits

Author SHA1 Message Date
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
Cris 4df012798f Changed bpk to Matrikelnummer 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-01-18 15:09:01 +01:00
Cris e04e584410 Added Anrechnungsdatum 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-01-18 15:08:16 +01:00
Cris 3ffc5c7d3f Deactivated application deadline 
Deactivated application deadline by setting checking variable
is_expired to false. This is to keep the logic for a later time when the
application deadline is going to be defined.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-01-18 13:59:29 +01:00
Cris 0edccc299c Deleted js-file - not needed by now 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-01-18 13:52:26 +01:00
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