blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-26 00:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,142 Commits 217 Branches 6 Tags
ffa7abdf5a3118d97cf315b71eec387cae24fe93
Commit Graph
11142 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Cris 360aec41ee Restricted tabledata to retrieve only for studies of STGL 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-19 15:47:31 +01:00
Cris 8d26cc9a86 Added permission lehre/anrechnung_genehmigen to Controller 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-19 15:45:04 +01:00
Cris 1a050adea4 Added permission to DB: lehre/anrechnung_genehmigen and lehre/anrechnung_empfehlen 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-19 15:42:08 +01:00
Cris b5dd85f2a6 Created Anrechnungen STGL: GUI, Controller, Tabledata, Phrases 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-19 14:43:32 +01:00
Manfred Kindl adcb865cbf Merge remote-tracking branch 'origin/master' 2021-01-19 13:47:20 +01:00
Manfred Kindl 0c40452b4d Statusgrund in Excel-Export Studierende 2021-01-19 13:47:07 +01:00
Manfred Kindl 9e0febdff6 Abfrage der Gebiete angepasst 
Damit auch QuereinsteigerInnen des 2. Semesters die Gebiete sehen
 2021-01-19 13:46:15 +01:00
Cris f185c92db7 Created Anrechnungen Students GUI, Controller, DB-tables, library, phrases 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-19 13:03:26 +01:00
Cris c0952af290 Corrected default value for empfehlung_anrechnung to be nullable 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-19 08:27:59 +01:00
Andreas Österreicher 407d8d9613 Fehler behoben wodurch nicht alle Semester eines Studiengangs im FAS angezeigt wurden wenn nur direkte Inskriptionsgruppen vorhanden sind und keine Spezialgruppen oder Verbandsgruppen 2021-01-18 21:04:17 +01:00
Cris 4df012798f Changed bpk to Matrikelnummer 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-18 15:09:01 +01:00
Cris e04e584410 Added Anrechnungsdatum 
Signed-off-by: cris-technikum <[email protected]>
 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 <[email protected]>
 2021-01-18 13:59:29 +01:00
Cris 0edccc299c Deleted js-file - not needed by now 
Signed-off-by: cris-technikum <[email protected]>
 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 <[email protected]>
 2021-01-18 13:45:11 +01:00
Cris de5c67d2f1 Devided methods getAnrechnungData and getAnrechnungDataByLv 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-18 13:41:46 +01:00
Cris b6f5bc2703 Added phrases for Anrechnung beantragen 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-14 15:27:44 +01:00
Cris 0d546dc0c0 Renamed POST parameter lv_id, studiensemester 
...to stay consistent

Signed-off-by: cris-technikum <[email protected]>
 2021-01-14 15:24:26 +01:00
Cris 67c130f9c1 Included Anrechnung beantragen into CIS Menu 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-14 15:22:20 +01:00
Cris aff838d3c3 Fixed typo studiensemester in AnrechnungLib 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-14 14:55:42 +01:00
Cris a1dfd3f598 Created new model Anrechnungstatus_model 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-14 14:21:53 +01:00
Cris dc84c91dae Added methods saveAnrechnungstatus() and getLastAnrechnungstatus() 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-14 14:21:00 +01:00
Cris 85ec64876d Changed permission to student/anrechnung_beantragen 
Signed-off-by: cris-technikum <[email protected]>
 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 <[email protected]>
 2021-01-14 14:16:53 +01:00
Cris b57a3ec90f Added logic to download and open a document 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-14 14:13:17 +01:00
Cris 5af134312c Added logic for uploading file and saving anrechnung 
Signed-off-by: cris-technikum <[email protected]>
 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 <[email protected]>
 2021-01-14 14:09:33 +01:00
Cris 44e8bd57b0 Set default value to NOW() for insertamum in lehre.tbl_anrechnung 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-14 10:00:44 +01:00
Cris 78e4edd590 Added permission student/anrechnung_beantragen 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-14 08:36:53 +01:00
Cris 47f66644ef Added Bezeichnung 'berufliche Praxis' to Anrechnungbegruendung 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-13 14:55:50 +01:00
Cris 2454104cc3 Changed datum type from timestamp to date in tbl_anrechnung_anrechnungstatus 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-13 14:37:55 +01:00
Cris 5cd163819d Added upload function to DmsLib 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-11 15:24:12 +01:00
Cris 1fefffcab3 Added / Adapted DB for Anrechnungen 
- Added column dms_id, studiensemester_kurzbz, anmerkung_student und
empfehlung_anrechnung in tbl_anrechnung
- Changed genehmigt_von and begruendung_id to be NULLABLE in
tbl_anrechnung
- Added DMS category "anrechnung"
- Added DMS category permissiongroup for DMS category "anrechnung"
- Add table anrechnung_status
- Added table anrechnung_anrechnungstatus
- Für bestehende genehmigte Anrechnungsanträge wird ein Eintrag mit dem
Status 'approved' angelegt

Signed-off-by: cris-technikum <[email protected]>
 2021-01-11 13:43:57 +01:00
Andreas Österreicher 57c0f3020a Bei den Zahlungsbestätigungen werden nur noch Zahlungen angezeigt bei denen das Buchungsdatum nicht in der Zukunft liegt um zu verhindern, dass Studierende die Zahlungen tätigen bevor sie eine Rechnung bekommen 2021-01-07 16:52:26 +01:00
Cris 04174d35f5 Added Anrechnungsdata (student, lv and lectors of lv) 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-05 12:19:27 +01:00
Cris fb29dc1e0e Added method getLvByStudent() to Lehrveranstaltung_model 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-05 12:17:41 +01:00
Cris 8309dfb3ca Created CONTROLLER Anrechnungen for students (CIS) 
Signed-off-by: cris-technikum <[email protected]>
 2020-12-22 16:00:07 +01:00
Cris e7d9d8859c Created VIEW Anrechnungen for students (CIS) 
Signed-off-by: cris-technikum <[email protected]>
 2020-12-22 15:43:44 +01:00
Andreas Österreicher 6a9871c0d5 Feldgroesse für ZGV angepasst für Darstellung auf kleinen Devices 2020-12-22 09:42:35 +01:00
cris-technikum 5dbad37416 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 
Signed-off-by: cris-technikum <[email protected]>

# Conflicts:
#	locale/de-AT/global.php
#	locale/en-US/global.php
 2020-12-21 15:54:18 +01:00
Andreas Österreicher 095c11f167 Jobwatcher verschickt Infomail an Administrator falls Cronjobs im Status Running hängen bleiben 2020-12-11 11:10:29 +01:00
Andreas Österreicher 7ed9266b0a Neuen Config-Eintrag hinzugefügt um die Mahnspanne bei den Zahlungen im FAS auszublenden 2020-12-07 10:58:29 +01:00
Andreas Österreicher 33cc431267 Added Phrases for Additional Informations 2020-12-04 15:41:59 +01:00
cris-technikum 3cf6e338d7 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2020-12-03 10:33:05 +01:00
Manfred Kindl 8109fd6757 Merge remote-tracking branch 'origin/master' 2020-12-02 13:57:32 +01:00
Manfred Kindl 47d09ec7eb Tablesorter für Meldungsübersicht 2020-12-02 13:57: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
Cris 442cd67d08 Changed COVID page text, Removed placeholder in COVID textarea 
Signed-off-by: cris-technikum <[email protected]>
 2020-11-30 11:01:09 +01:00
Andreas Österreicher c7605b2107 Merge branch 'feature-7434/Messages_Neue_Felder_zu_eingeloggtem_User_ergaenzen' 2020-11-26 13:30:21 +01:00
Andreas Österreicher 73688eec83 Merge branch 'master' into feature-7434/Messages_Neue_Felder_zu_eingeloggtem_User_ergaenzen 2020-11-26 12:52:24 +01:00