blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 08:34:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,404 Commits 217 Branches 6 Tags
demo-pv21
Commit Graph
2614 Commits
Author SHA1 Message Date
Andreas Österreicher cb4f22141d Merge branch 'feature-11142/Reihungstest_aufgenommene_bei_Neupriorisierung' 2021-02-23 08:36:53 +01:00
Cris 9a3addd79d Removed comments on 'if (! defined('BASEPATH')) exit('No direct script access allowed');' 
Signed-off-by: cris-technikum <[email protected]>
 2021-02-18 14:59:11 +01:00
KarpAlex eb95421ff9 ReihungstestJob.php: formatted sql 2021-02-18 04:26:54 +01:00
Cris abcf41f7a3 Added feature to withdraw approvals/rejections for STGL 
Signed-off-by: cris-technikum <[email protected]>
 2021-02-17 19:07:13 +01:00
ma0048 935b370166 added filter for bachelor and master 2021-02-17 15:07:09 +01:00
Cris 86a065d0d6 Fixed: Now checking user by prestudent_id to entitle to read DMS document 
Signed-off-by: cris-technikum <[email protected]>
 2021-02-16 16:31:42 +01:00
Andreas Österreicher 3366f091dd Anrechnungen - Fixed Details Page for People with multiple Accounts 2021-02-15 21:12:14 +01:00
Andreas Österreicher 4d81f91840 Problem behoben wodurch falsche Anrechnungen geladen wurden 2021-02-15 16:44:34 +01:00
Cris acec92fa2b Adapted mail message for students (different text for approved/rejected) 
Signed-off-by: cris-technikum <[email protected]>
 2021-02-15 11:26:59 +01:00
KarpAlex da4e913a38 ReihungstestJob.php: 
- studiensemester is passed as parameter
- info mail is sent to lower priority when higher priority is cancelled (abgewiesen)
- info mail is sent to master studiengänge as well if higher prio is cancelled/aufgenommen and there are other bachelor prestudenten in same semester
 2021-02-13 00:37:33 +01:00
Andreas Österreicher bff6307a62 Anrechnungen 
- Neuer Job zum Setzen der Anrechnungsnote hinzugefügt
- Direktes setzen der Zeugnisnote bei Anrechnung entfernt
 2021-02-12 15:52:26 +01:00
Cris 77774e8cec Corrected STGL permission check to check against UID 
Signed-off-by: cris-technikum <[email protected]>
 2021-02-08 18:01:06 +01:00
KarpAlex fd79551f00 - Pruefungsprotokoll bugfix: replaced bitwise and with logical and 2021-02-04 20:37:05 +01:00
Cris c8ceacc972 Added checks if user is entitled to read DMS document / Anrechnung 
Signed-off-by: cris-technikum <[email protected]>
 2021-02-04 17:05:05 +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 <[email protected]>
 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 <[email protected]>
 2021-02-04 10:24:08 +01:00
Cris a3c33ed385 Added change of status when STGL requests for recommendation 
Signed-off-by: cris-technikum <[email protected]>
 2021-02-03 16:21:15 +01:00
Cris 5a8c779bcd Corrected URI and permissions 
Signed-off-by: cris-technikum <[email protected]>
 2021-02-03 16:18:06 +01:00
Cris e780a3e505 Added GUI for STGL Detail VIEW + logic (Antrag- and Empfehlungdata) 
Signed-off-by: cris-technikum <[email protected]>
 2021-02-03 15:30:53 +01:00
Cris 0affbf4e41 Added param to calling function rejectAnrechnung to work properly 
Signed-off-by: cris-technikum <[email protected]>
 2021-02-03 14:53:40 +01:00
Cris ec16354594 Adapted Controller for lector Details to process Empfehlungen 
Signed-off-by: cris-technikum <[email protected]>
 2021-02-03 11:03:58 +01:00
Cris b8046aeccf Added insertvon when saving new Anrechnung 
Signed-off-by: cris-technikum <[email protected]>
 2021-02-03 10:55:46 +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 <[email protected]>
 2021-02-02 14:06:49 +01:00
Cris da3720e65d Added lectors detail view CONTROLLER 
+ adaptations to AnrechnungLib
+ phrases

Signed-off-by: cris-technikum <[email protected]>
 2021-02-01 10:11:57 +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 aff6e2ed8a Changed: Now "Herkunft der Kenntnisse" are required 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-28 19:38:59 +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 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 1b00ae78b4 Created Anrechnungen LektorInen: GUI, Controller, Tabledata, Phrases 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-25 17:07:39 +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 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 9a0ea02e0c Minor code enhancement 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-20 19:03:53 +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-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
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 b5dd85f2a6 Created Anrechnungen STGL: GUI, Controller, Tabledata, Phrases 
Signed-off-by: cris-technikum <[email protected]>
 2021-01-19 14:43:32 +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
Andreas Österreicher 232f261a76 Merge branch 'bugfix-8370/Fehlermeldung_korrigieren_in_LehrauftragBestellen' 2020-11-17 17:56:46 +01:00
Cris c1e4278e71 Changed permission denying - text in 'Lehrauftrag bestellen' 
If a permission is correctly set, but the permission is restricted on
organisational units Department or Kompetenzfeld, the error-text gives now
meaningful information about the abort.

Signed-off-by: Cris <[email protected]>
 2020-10-13 15:45:37 +02:00
alex 0153364885 Prüfungsprotokoll Freigabe: passed data to controller in better way (password and freigegeben bool in a separate object) 2020-09-15 18:11:37 +02:00
Andreas Österreicher c31d74e9ba Added return value to Job to to avoid wrong logging Errors 2020-09-08 08:44:13 +02:00