Commit Graph

1772 Commits

Author SHA1 Message Date
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-technikum 7fab658954 Merge branch 'master' into feature/Anrechnungen_NEU 2021-04-01 13:29:14 +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 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 <hainberg@technikum-wien.at>
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 <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 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-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 f9cbd9caf5 Refactored code
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-25 16:51:11 +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 4450f5a473 Removed unnessessary code
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
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 <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
ma0048 10441baff3 sortierung anhand kurztext 2021-03-23 09:34:49 +01:00
Cris 3a0720e4de Changed: If LV has no lectors, show empty field instead of error message
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
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 <hainberg@technikum-wien.at>
2021-03-22 12:12:04 +01:00
Cris 050eef120c Adapted download function in DMSLib to accept params filename and disposition
. Filename: uses given string as filename. Otherwise upload filename is used.
. Disposition: inline (open in new tab), attached (download dialog box)

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-03-22 12:08:57 +01:00
cris-technikum 41e8b4094e Merge branch 'feature-11970/AnrechnungJob_MailToSTGL' into feature/Anrechnungen_NEU 2021-03-18 10:58:57 +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
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
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-technikum 616cfaaf41 Merge branch 'master' into feature/Anrechnungen_NEU 2021-02-23 14:21:47 +01:00
Cris 83b1286e08 Added column Antragsdatum to STGL/Lector Overview
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-23 14:21:21 +01:00
Cris 6446e424a9 Fixed: Now all buttons have a type (button / reset)
+ belonging adaptations in JS:
. removed e.preventDefault as no longer needed with button type=button
. removed empty text value settings with button type=reset

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-23 11:27:03 +01:00
Andreas Österreicher 581a4c33a4 Merge branch 'feature-11690/SAPByD_User_Update_Request_Limit' 2021-02-23 08:48:30 +01:00
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 <hainberg@technikum-wien.at>
2021-02-18 14:59:11 +01:00
Cris ce2deb32e1 Deleted testuser
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-18 09:32:46 +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 <hainberg@technikum-wien.at>
2021-02-17 19:07:13 +01:00
Andreas Österreicher 577d0f1eb5 Fixed Filename 2021-02-17 15:21:38 +01:00
Andreas Österreicher 0993b94507 Anrechnungen Tooltip korrigiert bei STGL Filter 2021-02-17 11:44:35 +01:00
Paolo 94d335600c - Added new protected method getOldestJob to JQW_Controller
- Added new public method getOldestJob to JobsQueueLib
2021-02-16 21:21:11 +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 1ca22970a9 Adapted: Show only applications that were requested for recommendation
Change in lectors overview.
Now lectors only get Anrechnungsanträge, where the STGL had requested
a recommendation.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-16 17:37:14 +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 fec8fbb6d4 Anrechnungen - Mail Empfänger korrigiert bei Personen mit mehreren Accounts 2021-02-16 09:46:50 +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 <hainberg@technikum-wien.at>
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 d44c526ba4 Minor changes
. phrases
. GUI

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-11 16:37:44 +01:00
Cris 6dea79180c Adapted tables' boolean headerfilter to be used with strings
i.e. entering 'yes' will filter all truish entries

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-11 16:06:20 +01:00
Cris c23a3bdac9 Fixed button breaking line in smaller devices; now all buttons inline
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-02-11 11:52:57 +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