Commit Graph
186 Commits
Author SHA1 Message Date
cris-technikum 4f46476f87 Fixed: Now entitlement checked for all STGL. Also added hasData checks.
Before only the first returning STGL was checked for entitlement.
Also added hasData checks to avoid using getData on NULL values.

Signed-off-by: cris-technikum <[email protected]>
2021-09-06 12:56:43 +02:00
cris-technikum b7c22ac56f Fixed: Now including correctly config start- and enddate
Signed-off-by: cris-technikum <[email protected]>
2021-09-06 12:25:29 +02:00
cris-technikum bf3c8a344b Merge branch 'master' into feature/Anrechnungen_NEU 2021-06-21 17:18:07 +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 <[email protected]>
2021-05-25 13:19:40 +02:00
cris-technikum 758b9991d5 Added Antragssperre for Noten, when STGL wants to create Anrechnung
Added check, if LV was already graded and if grades are defined in configs
'blocking grades array'. If so, Anrechnung is not allowed.

Signed-off-by: cris-technikum <[email protected]>
2021-05-19 16:18:04 +02:00
OliiverHacker 847529d5aa nachname vorname tauschen 2021-05-19 09:03:20 +02:00
Cris 7bbd94bb89 Adapted & Enhanced Withdrawing of Approvement
. Added 'genehmigt von'
. Moved out to Model and added db rollback

Signed-off-by: cris-technikum <[email protected]>
2021-05-17 12:35:14 +02:00
Cris 842651e676 Added button 'Antrag jetzt bearbeiten' to 'Antrag anlegen'
The button 'Antrag jetzt bearbeiten' will appear right after creating
a new application, so that the user can directly open the new application
in a new tab.
The button disappears when selecting a new student again.

Signed-off-by: cris-technikum <[email protected]>
2021-05-05 17:03:42 +02:00
Cris 563c0cea58 Fixed wrong column grid / Small GUI adaptations
GUI adaptations:
. Changed 'Antrag anlegen': button instead of link
. Changed success text to: Antrag wurde angelegt

Signed-off-by: cris-technikum <[email protected]>
2021-05-05 15:52:25 +02:00
Cris 7a29d27a79 Adapted Deadline check to use config parameter
Signed-off-by: cris-technikum <[email protected]>
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 <[email protected]>
2021-05-03 16:17:23 +02:00
Cris 81bd719e39 Added Empfehlungsnotiz in STGL Detailview + minor GUI change
Now STGL can save and update notes regarding recommendation.

Therefore minor GUI change by displaying tables within panels instead of
appending directly to panel - in STGL and lectors Detail view. This is
for clearer view and gives space for the notes.

Signed-off-by: cris-technikum <[email protected]>
2021-04-29 09:54:57 +02:00
Cris 21ce118f0b Merged master into branch
Signed-off-by: cris-technikum <[email protected]>
2021-04-28 15:54:54 +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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
2021-04-20 16:41:25 +02:00
cris-technikum b7a6cefa36 Added Controller to create Anrechnungsantrag + Model Anrechnungbegruendung_model
Signed-off-by: cris-technikum <[email protected]>
2021-04-20 16:00:14 +02:00
Cris b9955c14a6 Minor code changes for better maintainance
Signed-off-by: cris-technikum <[email protected]>
2021-04-13 16:33:53 +02:00
Cris 7317623fbf Added jobs to send mails to students once per day (info approved/rejected)
. The jobs will send mails to students, whose Anrechnungen were
approved/rejected the last day.

. Removed former sendMailToStudent functions from Controllers.

Signed-off-by: cris-technikum <[email protected]>
2021-04-13 16:09:11 +02:00
Cris a70082f0e5 Usability: Added Pflichtfeld "Lesebestaetigung" to students VIEW
Signed-off-by: cris-technikum <[email protected]>
2021-04-12 17:00:03 +02:00
Cris fe4b70ba19 Usability: Added 'Empfehlungsanforderung an/am' to STGL + lectors Detail view
. Now more "Empfehlungs"-data shown in a table.
. Better separation of PHP / JS.
. Adapted Controller, View, JS and library to provide data about WHEN and
TO WHOME the requests for recommendation had been sent.

Signed-off-by: cris-technikum <[email protected]>
2021-04-07 15:50:05 +02:00
Cris 343b7a3087 Adapted Controller to use library method getLectors()
...instead of redundant private method.

Signed-off-by: cris-technikum <[email protected]>
2021-04-07 11:59:13 +02:00
Andreas Österreicher 170b2485d3 Merge branch 'feature-10965/beurteilungsformular_pdf_export' into feature-10963/Beurteilungsformular_datenbankanpassungen 2021-04-06 18:06:30 +02:00
Cris 7c875d5f80 Usability: Added 'ZGV' to STGL and lectors Detail site
Signed-off-by: cris-technikum <[email protected]>
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 <[email protected]>
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 <[email protected]>
2021-04-01 14:15:02 +02:00
Cris 68a0e45472 Usability: Added column 'Empfehlungsanfrage_am', 'Empfehlungsanfrage_an'
...to STGL and lectors Overview site

Signed-off-by: cris-technikum <[email protected]>
2021-04-01 09:18:55 +02:00
Cris 7690a122b8 Refactored: Moved getAnrechnungstatusbezeichnung to AnrechnungLib
This method retrieves the Anrechnungstatusbezeichnung in the users language.
It is used multiple times -> moved to library.

Signed-off-by: cris-technikum <[email protected]>
2021-03-30 13:57:43 +02:00
Cris d183dda815 Fixed: Anrechnunglib returning values, Adapted error messages
Fixed: method getData in Controller was producing wrong returning message.
Fixed by removing, as library is returning boolean value now.

Adapted few error functions to be more generic and bilingual.

Signed-off-by: cris-technikum <[email protected]>
2021-03-29 18:48:26 +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 <[email protected]>
2021-03-29 17:50:19 +02:00
Cris f9cbd9caf5 Refactored code
Signed-off-by: cris-technikum <[email protected]>
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 <[email protected]>
2021-03-25 15:06:47 +01:00
Cris 4450f5a473 Removed unnessessary code
Signed-off-by: cris-technikum <[email protected]>
2021-03-25 12:14:26 +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 <[email protected]>
2021-03-24 17:16:17 +01:00
Cris 683e9ffdda Modified to request recommendation (+send mails) ONLY if LV has lectors
Modifications done for STGL Overview and Detailview

Signed-off-by: cris-technikum <[email protected]>
2021-03-24 16:22:56 +01:00
Cris 3a0720e4de Changed: If LV has no lectors, show empty field instead of error message
Signed-off-by: cris-technikum <[email protected]>
2021-03-22 17:28:29 +01:00
Cris 00656efaef Changed filename on download to 'Anrechnungsantrag_OrgForm_LVID_VornameNachname'
Adapted STGL and lectors views to change the filename on download event.
All download functions moved from view to library.

Signed-off-by: cris-technikum <[email protected]>
2021-03-22 12:12:04 +01:00
cris-technikum 41e8b4094e Merge branch 'feature-11970/AnrechnungJob_MailToSTGL' into feature/Anrechnungen_NEU 2021-03-18 10:58:57 +01:00
Cris d345cbb43b Added 'Zurücknehmen'-button for recommendation in STGL Detail View
Requested recommendations can now be withdrawn.
Now a button 'Zurücknehmen' is displayed as long as the Anrechnung
is processed by the lector and only as long the lector has not provided
a recommendation.

Signed-off-by: cris-technikum <[email protected]>
2021-03-18 10:55:58 +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 <[email protected]>
2021-03-16 17:42:46 +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
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
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
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