blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-28 09:29:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,095 Commits 227 Branches 6 Tags
d44c526ba4c1ec8fdbf0a2ff4b2cbe47ca4912d2
Commit Graph

1726 Commits

Author SHA1 Message Date
Cris d44c526ba4 Minor changes 
. phrases
. GUI

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-11 16:37:44 +01:00
Cris 6dea79180c Adapted tables' boolean headerfilter to be used with strings 
i.e. entering 'yes' will filter all truish entries

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-11 16:06:20 +01:00
Cris c23a3bdac9 Fixed button breaking line in smaller devices; now all buttons inline 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-11 11:52:57 +01:00
Cris eaf902c528 Adapted tooltips for Students VIEW, minor change of phrase text 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-11 11:36:38 +01:00
Cris c0843e9506 Translated STGL and Lectors VIEW to English 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-10 18:25:48 +01:00
Cris c82ebaf678 Translated Students VIEW to English 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-09 16:31:32 +01:00
Cris 81151025da Fixed non-existing phrases 
. anrechnungNichtEmpfehlenAsk
. empfehlungNegativ

The phrases did not exist anymore, they got new name. Now fixed.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-09 14:54:32 +01:00
cris-technikum 3eecd74b1f Merge branch 'master' into feature/Anrechnungen_NEU 2021-02-09 10:54:28 +01:00
cris-technikum 6e689ce657 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2021-02-09 10:53:41 +01:00
Cris c69188dffe Corrected typos in name that caused button not being disabled 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-08 18:25:27 +01:00
Cris 17ae1b144c Corrected: Now correct text for confirmed positive recommendation 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-08 18:13:50 +01:00
Cris 2a59d2464b Uncommented tooltips for genehmigung/empfehlung 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-08 18:07:40 +01:00
Cris 77774e8cec Corrected STGL permission check to check against UID 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-08 18:01:06 +01:00
Cris 00799f2f64 Adapted: Ordered Notizen to retrieve last inserted first 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-08 17:35:34 +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 494cf1f688 Changed style & flow of approve/reject/recommend/dont recommend 
This was done for better clarity in workflow.
Now, when clicking on approve/reject/recommend/dont recommend - button,
this will always lead to second panel. In that one the user may leave
a reason, but in any case the user need to CONFIRM (or break) the action.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-08 17:19:58 +01:00
ma0048 8c666ceef2 Studiengang Dropdown angepasst 2021-02-08 17:09:34 +01:00
Cris c8ceacc972 Added checks if user is entitled to read DMS document / Anrechnung 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-04 17:05:05 +01:00
Cris 071a6a4ee6 Added tooltips (Upload info, Read Infoboxen-info) 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-04 15:42:26 +01:00
Cris 4a8fa95a3a Changed: Now infobox color is blue and icons are info-icons 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-04 15:36:12 +01:00
Cris cfc3b4f985 Corrected: Added space to be able to disable textarea 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-02-04 11:04:20 +01:00
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 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 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