Commit Graph

255 Commits

Author SHA1 Message Date
Cris 339f82291c Disabled edit elements / create Anrechnung in GUI if user has readonly access / no permission to create Anrechnung 2022-02-22 16:36:11 +01:00
Andreas Österreicher b4eb2d426a Lehrauftragsverwaltung - Anzeige von Nachname und Vorname bei Betreuungen vertauscht 2021-12-01 17:00:28 +01:00
Manfred a72f6597b3 BugFix 9. und 10. Semester bei Lehrauftragsverwaltung
Manche Studiengänge haben ein 9. oder 10. Semester. Dieses muss auch bei der Lehrauftragsverwaltung aufscheinen.
2021-10-21 17:16:20 +02:00
cris-technikum 635974fa22 Merge branch 'master' into feature/Anrechnungen_NEU
# Conflicts:
#	application/models/crm/Prestudent_model.php
#	system/dbupdate_3.3.php
2021-07-07 15:05:31 +02:00
Andreas Österreicher 07cb19ccd1 Merge branch 'feature-13604/Pruefungsprotokolle_Filter_fuer_zukuenftige_Termine' 2021-07-01 14:44:33 +02:00
cris-technikum 1eb3f96200 Added STGL-Notizfeld to Lectors Detail View
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-06-22 12:46:03 +02:00
cris-technikum bf3c8a344b Merge branch 'master' into feature/Anrechnungen_NEU 2021-06-21 17:18:07 +02:00
cris-technikum 2d6bd0af34 Adjusted 'createAnrechnung'-button to stay inline in smaller devices
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-06-21 17:17:10 +02:00
Harald Bamberger e76dead570 add parantheses although not explicitly needed for correct function 2021-06-18 14:45:05 +02:00
Harald Bamberger cea673fa82 adjust indentation, changed filter lastWeek to cover last 7 days and not only a week ago today 2021-06-18 12:45:44 +02:00
Harald Bamberger a0b86b6207 rename in_the_future to upcoming consistently 2021-06-18 09:21:39 +02:00
Harald Bamberger e5a6af7eb3 first guess adding filter for upcoming exams 2021-06-18 09:16:02 +02:00
ma0048 212261a38e autofill vom username im falschen feld verhindern 2021-06-16 09:18:53 +02:00
cris-technikum b7939f645e Fixed width exceeding table columns, when containing large text
In some cases table columns were exceeding the table width. Fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-26 19:57:23 +02:00
cris-technikum cfcf556a6a Corrected: Status now displaying correct Status (issue when deadline has expired)
Before, if application deadline has expired, the status was showing
'Deadline expired', even if the application was already existing and in
process. This is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-25 13:24:59 +02:00
cris-technikum 5c5f389a2d Corrected: Anrechnungen were not shown in Overview after 'Löschen von Nachweisdokumenten'
Left Joining table dms_version fixed this issue.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-20 13:31:02 +02:00
cris-technikum a822f96e88 Changed Create Anrechnung window to open in new tab
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-19 16:21:55 +02:00
cris-technikum a783b0085b Splitted Antragsdaten into 2 tables
Split to gain more space to see all functionalities/buttons at a glance.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-19 15:28:06 +02:00
OliiverHacker 847529d5aa nachname vorname tauschen 2021-05-19 09:03:20 +02:00
Cris 5b3871e999 Corrected requiredPermission of tabulator to create Anrechnung
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-10 08:36:30 +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 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 99b1de542d Improvements to all Detail views for lightweighted look and space at end of pages
. Removed 'wrapping' panel
. Removed unnecessary panels and breaks
. Added breaks at the end of site to avoid buttons 'sticking' at the bottom

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-03 10:40:37 +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
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 5f7672d9df Adapted Anrechnungen-files to use AjaxLib for uploading files
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-27 17:39:45 +02:00
Cris 731c5b9461 Added link 'Neuen Antrag anlegen' in STGL Overview Site
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-21 13:37:43 +02:00
Cris 6dca00e4e5 Corrected query to retrieve only prestudentstatus 'students'
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-20 18:45:43 +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 ca378ef13b Added header filter to all hidden table columns
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-13 17:35:55 +02:00
Cris cb5037626b Minor change: Now using language phrase for 'maxZeichen'
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-13 09:45:23 +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 b8768f997c Usability: Gendered StudentIn; Changed first table column to bold text - Students VIEW
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-08 14:44:00 +02:00
Cris 1008f6b8b3 Fixed DB errormessage in STGL Overview (related to added Ausbildungssemester)
The subquery was returning multiple rows. This is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-08 14:34:16 +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 587796e374 Usability: Gendered StudentIn; Changed first table column to bold text
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 15:52:06 +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
Cris b5ba81b26e Added fixed column width to tables
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-07 11:49:42 +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 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 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-technikum 2c091cd405 Fixed: Recommendation button was not enabled correctly after withdrawing approvement
Now, if approvment is withdrawn, the recommendation button is enabled again
ONLY if no recommendation was submitted until yet.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-29 13:05:27 +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 faf253c159 Adapted to keep individual filters by opening views in new tabs
When Detail Views were opened within the same browser window, individual
filters of the overview site were lost when returning to the overview.
Fixed by opening detail views in new tab.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-25 16:41:41 +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 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
Cris 9b396eea4e Added columns Organisationsform and Ausbildungssemester to STGL Overview table
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-18 10:57:49 +01:00