Commit Graph

43 Commits

Author SHA1 Message Date
Cris 110d6bace3 Adapted backend logic to save/retrieve begruendung_ects and begruendung_lvinhalt 2023-07-20 13:42:53 +02:00
Harald Bamberger a663fa9436 Merge branch 'feature-27388/Anrechnungen_Zeitfenster-pflegen' into merged_Anrechnungen_26625_27388_28278_28557 2023-04-24 11:30:32 +02:00
Cris 479feea8aa Changed way of checkíng Anrechnungszeitraum
Changed function isExpired to check Anrechnungszeitraeume of tbl_anrechnungszeitraum instead of using config entries.
2023-03-06 15:26:12 +01:00
Cris 7cdb7688c4 Fixed: Vergangene Anrechnungen können jetzt eingesehen werden
Manche vergangene Anrechnungen konnten nicht eingesehen werden, weil
die Zuordnung der Studenten zu den Lehrveranstaltungen aufgelöst bzw. geändert werden.
Gefixt, indem nun bei einer bestehenden Anrechnung die bei der Anrechnung hinterlegten Lehrveranstaltung
herangezogen wird.
2022-11-28 17:27:39 +01:00
Cris 3a595dda58 Merge branch 'master' into feature-18224/Anrechnungen_ECTS-Grenze
# Conflicts:
#	application/controllers/lehre/anrechnung/RequestAnrechnung.php
2022-09-08 14:15:49 +02:00
Cris d13cc789ad Fix Anrechnung Student View: Änderung des Download-Dokumentnamens zurückgenommen
Der Download-Dokumentname ist in der Studierendenansicht nun wieder gleich wie der originale Dokuementname beim Hochladen.
2022-09-08 12:53:44 +02:00
Cris c88061463f Hotfix Anrechnung Student View: Änderung des Download-Dokumentnamens zurückgenommen
Der Download-Dokumentname ist in der Studierendenansicht nun wieder gleich wie der originale Dokuementname beim Hochladen.
2022-09-06 14:21:54 +02:00
Andreas Österreicher 259dbe9bdc Fixed Error on File Download from Student View 2022-09-05 18:46:13 +02:00
Andreas Österreicher ac91d8ccbc Merge branch 'master' into feature-16370/AkteLib_create_new_CI_library_to_handle_akte 2022-05-27 14:18:30 +02:00
Cris c8f93cae07 Adapted system feedback when uploading too large documents
. Added clientside check to avoid uploads > max upload size on serverside
. Adapted message returned by server, when max upload size is exceeded
2022-02-24 14:11:11 +01:00
Paolo 9b1182405e - core/FHC_Controller->outputFile cleaned
- Adapted controllers/lehre/anrechnung/* to make use of the changed core/FHC_Controller->outputFile
- Changed application/core/FS_Model:
	- It's not abstract anymore
	- Added new constants READ_MODE, READ_WRITE_MODE, READ_APPEND_MODE, BLOCK_SIZE, META_URI
	- Constructor accept a mandatory parameter
	- Does not load the FilesystemLib anymore
	- Renamed all the public methods with the suffix Base64
	- Added new public methods openRead, openReadWrite, openReadAppend, close, readBlock and write
	- Added new private methods _checkPath and _open
- Removed the libraries/FilesystemLib
- Adapted model content/DmsFS_model to make use of the changed core/FS_Model
- Changed libraries/DmsLib:
	- Does not extend the FHC_Controller anymore
	- removed private propery UPLOAD_PATH
	- Cleaned code, make use of the standards
	- Adapted to use the Base64 suffixed methods from core/FS_Model
	- Deprecated old methods
	- Refactored public methods download and getFileInfo
2021-12-03 15:56:39 +01:00
cris-technikum 8677cbf6dc Fixed requesting Anrechnungsantrag although grade is a blocking grade
Blocking grades (eg angerechnet), that should not allow
the student to request for Anrechnung, were not fully blocking.
This is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-10-12 12:11:06 +02:00
cris-technikum b7c22ac56f Fixed: Now including correctly config start- and enddate
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-09-06 12:25:29 +02:00
Cris 12e531532b Changed checking Application Deadline by checking start-/enddate
Now checking start-/enddate in the config entries.
If not provided, start-/endedate of Studiensemester will be used.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-25 13:19:40 +02:00
Cris 7a29d27a79 Adapted Deadline check to use config parameter
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-03 16:18:32 +02:00
Cris a50a666d11 Added Antragssperre for Noten, that are defined in config array
. Added new config file
. Added check, if LV was already graded and if grades are defined in configs
'blocking grades array'. If so, Anrechnung is not allowed.
. Adapted GUI to process data via JS only

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-03 16:17:23 +02:00
Cris cafd72e51d Removed accaptance of FormData object within AjaxLib controllerParameter check
Also adapted JS files to this change.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-28 15:53:17 +02:00
Cris 7b485053d9 Adapted DMSLib upload method to be accept field name from Controller
The fieldname represents the HTML uploadfile input name attribute, which
is given by the developer in the VIEW.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-21 18:46:51 +02:00
Cris bb0776a808 Added method createAnrechnungsantrag to Anrechnungsmodel + Refactored code
Moved code from Controller to Anrechnungmodel.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-20 16:41:25 +02:00
Cris a70082f0e5 Usability: Added Pflichtfeld "Lesebestaetigung" to students VIEW
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-12 17:00:03 +02:00
Cris 7c875d5f80 Usability: Added 'ZGV' to STGL and lectors Detail site
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-06 14:48:08 +02:00
Cris 5dafb3447b Usability: Added column 'Empfehlungsanfrage_am', 'Empfehlungsanfrage_an'
...to STGL and lectors Overview site

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-01 14:25:15 +02:00
Cris fdf53ea3eb Modified: Now user gets back error message if upload failes
...instead of hard program exit

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-01 14:15:02 +02:00
Cris c455778731 Fixed: Added formatted download-document-link after application was done
After refactoring the code and doing the application via AJAX call, the
document-download-link must be created on ajax success. This was missing
and is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-29 17:50:19 +02:00
Cris f9cbd9caf5 Refactored code
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-25 16:51:11 +01:00
Cris 3ba4229eed Refactored Students View + Controller
. Now application is done via AJAX call.
. Now messages are returned to user instead of hard exits.
. Now formatting status on client side, not on serverside.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-25 15:06:47 +01:00
Cris 997f6f406b Fixed: Now application can only be done for actual study semester
Before student could apply for past study semester, which should not be
possible. Fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-24 17:16:17 +01:00
Cris 7340564d1e Added job to send mail to STGL with yesterdays new Anrechnungen
. added AnrechnungJob sendMailToSTGL()
. removed functions to send mail from CTRL

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-16 17:42:46 +01:00
Cris 86a065d0d6 Fixed: Now checking user by prestudent_id to entitle to read DMS document
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-16 16:31:42 +01:00
Andreas Österreicher 4d81f91840 Problem behoben wodurch falsche Anrechnungen geladen wurden 2021-02-15 16:44: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 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 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 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 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 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 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 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 f185c92db7 Created Anrechnungen Students GUI, Controller, DB-tables, library, phrases
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-01-19 13:03:26 +01:00