blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 16:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,169 Commits 217 Branches 6 Tags
d66fc6e4937ee028fc1b482bc4aca52eddc00971
Commit Graph
11169 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Österreicher 1ea521e858 Merge branch 'master' into 9503/csvExportProjektÜbersicht 2021-01-29 15:28:41 +01:00
Cris 907ecca333 Added coloured status alert in students view 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-29 11:55:27 +01:00
Cris 70d02e25f9 Removed doublecheck of last status 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-29 11:54:52 +01:00
Cris 8ba7744acb HOTFIX: Removed test-UIDS! 
Signed-off-by: cris-technikum <[email protected]>
 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 <[email protected]>
 2021-01-29 07:59:24 +01:00
Cris aff6e2ed8a Changed: Now "Herkunft der Kenntnisse" are required 
Signed-off-by: cris-technikum <[email protected]>
 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 <[email protected]>
 2021-01-28 18:55:02 +01:00
Cris 14d1762c9f Changed email links to correct CIS URL 
Signed-off-by: cris-technikum <[email protected]>
 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 <[email protected]>
 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 <[email protected]>
 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 <[email protected]>
 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 <[email protected]>
 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 <[email protected]>
 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 <[email protected]>
 2021-01-27 10:33:19 +01:00
Cris 8a75bc9fdd Added method getFullName() to Person_model 
Signed-off-by: cris-technikum <[email protected]>
 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 <[email protected]>
 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 <[email protected]>
 2021-01-26 15:39:18 +01:00
Cris e06a6768a4 Changed text as required in Students Anrechnung' View 
Signed-off-by: cris-technikum <[email protected]>
 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 <[email protected]>
 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 <[email protected]>
 2021-01-26 13:56:34 +01:00
Cris 5b77a5d08f Restricted to upload only pdf files 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-25 18:23:59 +01:00
Cris aefd0842db Added tooltip for unselectable Anrechnungen 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-25 18:18:13 +01:00
Cris 1b00ae78b4 Created Anrechnungen LektorInen: GUI, Controller, Tabledata, Phrases 
Signed-off-by: cris-technikum <[email protected]>
 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
Cris 0da2c6a74c Changed tabulator requiredPermissions for STGL Anrechnungen 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-21 14:41:46 +01:00
cris-technikum 0bf0c2a152 Merge branch 'master' into feature/Anrechnungen_NEU 2021-01-21 14:07:40 +01:00
cris-technikum 71b8122a20 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2021-01-21 14:06:58 +01:00
cris-technikum 2359592032 Merge branch 'master' into feature/Anrechnungen_NEU 
# Conflicts:
#	application/libraries/AnrechnungLib.php
#	application/views/lehre/anrechnung/requestAnrechnung.php
#	system/dbupdate_3.3.php
#	system/phrasesupdate.php
 2021-01-21 14:06:03 +01:00
Cris 0528ae3eb9 Added uebernahmedatum and benotungsdatum to zeugnisnote 
Signed-off-by: cris-technikum <[email protected]>
 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 <[email protected]>
 2021-01-21 12:50:07 +01:00
Cris fd5b68d3b8 Set persistent layout and persistent sorting to STGL Anrechnungen 
Signed-off-by: cris-technikum <[email protected]>
 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 <[email protected]>
 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 <[email protected]>
 2021-01-21 11:08:57 +01:00
Cris 47c8432faf Added filter buttons to STGL Anrechnungen 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-21 10:51:22 +01:00
Cris 9e5b03b2dc Adapted Select-all-button to select only Anrechnungen progressed by STGL 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-20 19:16:17 +01:00
Cris 97d86cc702 Added logic & GUI adaptations for requesting recommendations 
. Added request recommendation-methods in Controller and Library

Signed-off-by: cris-technikum <[email protected]>
 2021-01-20 19:07:33 +01:00
Cris 3a285c5672 Added status inProgressLektor 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-20 19:05:56 +01:00
Cris 9a0ea02e0c Minor code enhancement 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-20 19:03:53 +01:00
Cris a09abfd70c Added Zeugnisnote = 6 (angerechnet) when Anrechnung is approved 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-20 15:14:31 +01:00
Cris 114ac7a69e Corrected Personenkennzeichen: students matrikelnr instead of person bpk 
Signed-off-by: cris-technikum <[email protected]>
 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 <[email protected]>
 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 <[email protected]>
 2021-01-20 11:48:07 +01:00
Cris 046f807788 Added ECTS to tabledata 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-20 11:06:53 +01:00
Cris 4ed786d65a Added promise check (browser compatibility) and redrawing table on resize 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-20 11:03:47 +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 <[email protected]>
 2021-01-20 11:02:15 +01:00
Nikolaus Krondraf 5c1c9f1df4 Beim Löschen eines Prüfungstermins kann ein Infomail versendet werden 2021-01-20 10:18:00 +01:00
Cris 403304e1a7 Adapted CSS: Red button for rejecting, blue for approving 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-19 15:56:34 +01:00