Commit Graph

1792 Commits

Author SHA1 Message Date
cris-technikum debd6724b3 Merge branch 'master' into feature/Anrechnungen_NEU 2021-05-05 17:21:56 +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 <hainberg@technikum-wien.at>
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 <hainberg@technikum-wien.at>
2021-05-05 15:52:25 +02:00
Cris 69b33a7f92 Bugfix: Now Ampelmail is sending HTML content correctly
...so that the eMail client can parse and display HTML content correctly.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-04 16:23:24 +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 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 <hainberg@technikum-wien.at>
2021-04-29 09:54:57 +02:00
Andreas Österreicher b5be5be59d Merge branch 'master' into feature-11250/zeitaufzeichnung_stammkostenstelle 2021-04-28 17:17:02 +02:00
Cris 21ce118f0b Merged master into branch
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-28 15:54:54 +02:00
Cris dca828650a Adapted Bestaetigung Moodle link to open in new tab
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-20 16:51:18 +02:00
Cris 5e77e252c7 Added GUI to create Anrechnungsantrag
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-20 15:54:16 +02:00
Cris f6f31f7efb Added Berechtigung 'lehre/anrechnung_anlegen' to create Anrechnung
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-20 15:49:08 +02:00
Cris b92260c1d5 Added Moodle-link to Anrechnungen-Prozessinformation
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-13 11:47:13 +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
KarpAlex b29621354f - abgabetool: added zweitbetreuer mailto Link incl. icons
- Bewertunglink is not sent in Parbeit Enduploadmail if older Semester
- phrasesupdate Projektarbeitsbeurteilung: added female form
2021-04-10 03:55:05 +02:00
Cris 094b502862 Usability: Limited chars-length for 'Herkunft der Kenntnisse' / Added chars counter
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 17:17:53 +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 <hainberg@technikum-wien.at>
2021-04-07 15:50:05 +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 68a0e45472 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 09:18:55 +02:00
Cris 132b5097ee Usability: Added column 'ZGV' to STGL and lectors Overview site
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-31 13:56:52 +02:00
Cris d53d91d7d1 Usability: Added filterbutton 'Alle anzeigen, die auf Empfehlung von LektorIn warten'
The filterbutton was added to the STGLs Overview site.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-30 17:02:15 +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 <hainberg@technikum-wien.at>
2021-03-29 18:48:26 +02:00
Cris 287b961697 Fixed: Added serversite check on required form fields
After refactoring code to apply via AJAX call, required fields
have to be direclty validated in JS or on serversite. Now fixed by
checking on serversite.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-29 17:55:50 +02:00
Cris 279157b920 Added button to copy Empfehlungstext into reason textarea when rejecting
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-25 17:12:38 +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
KarpAlex 8f2ef521e7 changed Projektarbeitsbeurteilung phrase for thema criteria 2021-03-25 13:22:39 +01:00
KarpAlex a68dfc1c6c - Projektarbeitsabgabe: added Link to Projektarbeitsuebersicht to Zweitbegutachtermail
- updated abgabetool phrases
2021-03-24 22:49:34 +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 683e9ffdda Modified to request recommendation (+send mails) ONLY if LV has lectors
Modifications done for STGL Overview and Detailview

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-24 16:22:56 +01:00
KarpAlex fbb7b45b69 - added zweitbegutachterFehltWarnung phrase 2021-03-22 04:55:46 +01:00
cris-technikum 983ff1b16e Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU 2021-03-18 11:43:42 +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 <hainberg@technikum-wien.at>
2021-03-18 10:55:58 +01:00
KarpAlex 95c5a9c475 added UNIQUE constraing to zugangstoken column of lehre.tbl_projektbetreuer 2021-03-15 23:48:00 +01:00
KarpAlex 2ef2a906c3 - Projektarbeitsbenotung (abgabe_lektor_details.php): benoten button only shown when semester > SS2021
- updated phrases for text showing if older semester
2021-03-12 09:46:27 +01:00
KarpAlex 9677a5a4fd - BenutzerModel: added comment for getFromPersonId method
- UPDATE permission for web for tbl_projektbetreuer added
- added phrase for Zweitbegutachter - link
2021-03-01 09:33:14 +01:00
Andreas Österreicher 6f27fccc09 - Corrected Permissions for Anrechnungen
- Removed Useless Sequence
2021-02-23 17:55:41 +01:00
Cris 2723e130f0 Fixed repeating grant privileges on tbl anrechnungstatus to web user
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-18 14:53:03 +01:00
Cris abcf41f7a3 Added feature to withdraw approvals/rejections for STGL
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-17 19:07:13 +01:00
Cris 734db4a2a8 Granted Web User for tbl_anrechnung_status; Added Sequence Anrechnung Status
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-16 18:22:00 +01:00
Cris 241fb34b23 Added filter button to STGL Overview (filter: show all progressed by STGL)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-16 18:04:27 +01:00
Cris d44c526ba4 Minor changes
. phrases
. GUI

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-11 16:37:44 +01:00
Cris eaf902c528 Adapted tooltips for Students VIEW, minor change of phrase text
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-11 11:36:38 +01:00
Cris c0843e9506 Translated STGL and Lectors VIEW to English
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-10 18:25:48 +01:00
Cris c82ebaf678 Translated Students VIEW to English
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-09 16:31:32 +01:00
Cris 494cf1f688 Changed style & flow of approve/reject/recommend/dont recommend
This was done for better clarity in workflow.
Now, when clicking on approve/reject/recommend/dont recommend - button,
this will always lead to second panel. In that one the user may leave
a reason, but in any case the user need to CONFIRM (or break) the action.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-08 17:19:58 +01:00
Cris 071a6a4ee6 Added tooltips (Upload info, Read Infoboxen-info)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-04 15:42:26 +01:00
KarpAlex 1f88bfae40 - Projektbetreuer Model: added getBetreuerByToken method
- phrasesupdate: added new Projektarbeitsbeurtielung phrases
2021-02-04 11:21:40 +01:00
Cris e9664c179a Added Genehmigungs GUI + Begreundungsnotiz for rejected Anrechnungen in STGL VIEWS
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-04 10:24:08 +01:00
Cris e780a3e505 Added GUI for STGL Detail VIEW + logic (Antrag- and Empfehlungdata)
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 15:30:53 +01:00
Cris 39016b873f Adapted STGL overview: info/begruendungsangabe when approving/rejecting
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 12:41:26 +01:00
Cris b13fb0cda8 Added lector Detail GUI to retrieve and process Empfehlungen
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-03 11:01:02 +01:00