blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-18 20:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,065 Commits 228 Branches 6 Tags
e6da4b2e2d9d2dd239f88d43c8ddbbd91a854c96
Commit Graph

11065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cris e6da4b2e2d Minor changes 
- unfold 'Antrag Voraussetzungen' in Infopanels
- open Detailpage on same page (not on new tab)
- unified sancho mails titles

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-04 10:56:03 +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 52450561fd Added method getApprovedOrRejected() to Anrechnung Model 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-04 10:20:10 +01:00
Cris d380e6ac49 Added change of status in lectors Detail GUI 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-03 16:22:19 +01:00
Cris a3c33ed385 Added change of status when STGL requests for recommendation 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-03 16:21:15 +01:00
Cris 5a8c779bcd Corrected URI and permissions 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-03 16:18:06 +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 5e1bbfe718 Minor change to InfoPanels 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-03 15:32:42 +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 0affbf4e41 Added param to calling function rejectAnrechnung to work properly 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-03 14:53:40 +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 39016b873f Adapted STGL overview: info/begruendungsangabe when approving/rejecting 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-03 12:41:26 +01:00
Cris 1c0c8e9ad4 Hided empfehlung/begruendung panels in lector overview after sending recommendation 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-03 12:37:48 +01:00
Cris 9790fc650b Adapted lector overview to slide in/out info when recommending 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-03 11:13:05 +01:00
Cris ec16354594 Adapted Controller for lector Details to process Empfehlungen 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-03 11:03:58 +01:00
Cris 8b6f0f56af Corrected not collapsing 'Fristen' in Infopanels 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-03 11:02:26 +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 5235915d6a Changed method getNotizByAnrechnung() -> added param titel 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-03 10:57:27 +01:00
Cris b8046aeccf Added insertvon when saving new Anrechnung 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-03 10:55:46 +01:00
Cris 297c96c3e5 Changed method getLastAnrechnungstatus() -> added param status_kurzbz 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-03 10:53:51 +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 a0658a61c3 Added lectors Detail VIEW to review and recommend Anrechnung 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-01 10:10:55 +01:00
Cris a218b36323 Added getUID() by prestudentID - method to Prestudent Model 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-01 10:03:18 +01:00
Cris 907ecca333 Added coloured status alert in students view 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-01-29 11:55:27 +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 8ba7744acb HOTFIX: Removed test-UIDS! 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-01-29 08:23:25 +01:00
cris-technikum f3feb53438 Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU 2021-01-29 08:04:20 +01:00
cris-technikum 02e4004300 Merge branch 'master' into feature/Anrechnungen_NEU 2021-01-29 08:02:04 +01:00
cris-technikum ea7d0692b9 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2021-01-29 08:01:15 +01:00
Cris 106cbe8194 HOTFIX: Removed test-UIDS! 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-01-29 07:59:24 +01:00
Cris aff6e2ed8a Changed: Now "Herkunft der Kenntnisse" are required 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-01-28 19:38:59 +01:00
Cris ce794d0e54 Added important help text for students view regarding applying correclty 
German only. English will follow.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-01-28 18:55:02 +01:00
Cris 14d1762c9f Changed email links to correct CIS URL 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-01-28 16:52:14 +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 6a37c71cfc Added sending Sanchomail to lector asking to recommend Anrechnung 
Mails are send to lectors (prio for LV-Leitung, if not present to all
lectors of LV) Anyway, as many there recommendation may be requested
for many lvs at the same time, the receiver array will be unique to ensure
sending only once to one and the same lector. e.g. if lector is lv-leitung
for lv x and lector for lv y, will get only one mail.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-01-28 10:21:56 +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 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 3f3d7aa7d7 Changed lektors status text to 'Empfehlung angefordert' 
...to make status in process more understandable.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-01-26 13:57:57 +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
Andreas Österreicher 7dc21fde5a FAS Länge der Betriebsmittel Nummer auf 32 Zeichen erhöht damit Schlüsselnummern gespeichert werden können 2021-01-22 13:57:28 +01:00