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
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
f9cbd9caf5
Refactored code
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-25 16:51:11 +01:00
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
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
4450f5a473
Removed unnessessary code
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-25 12:14:26 +01:00
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
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
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
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
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
983ff1b16e
Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU
2021-03-18 11:43:42 +01:00
41e8b4094e
Merge branch 'feature-11970/AnrechnungJob_MailToSTGL' into feature/Anrechnungen_NEU
2021-03-18 10:58:57 +01:00
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
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
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
5da754c9db
Anmerkung bei Lehreinheitmitarbeiter verschoben
2021-03-04 07:59:38 +01:00
9cbcec7231
Fallback-Lösung für LV-Regel wenn im aktuellen Semester kein Status vorhanden ist
2021-03-02 15:26:44 +01:00
8bd148f7e5
Hinweistext für Zahlungen angepasst
2021-02-26 15:01:23 +01:00
6f27fccc09
- Corrected Permissions for Anrechnungen
...
- Removed Useless Sequence
2021-02-23 17:55:41 +01:00
616cfaaf41
Merge branch 'master' into feature/Anrechnungen_NEU
2021-02-23 14:21:47 +01:00
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
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
581a4c33a4
Merge branch 'feature-11690/SAPByD_User_Update_Request_Limit'
2021-02-23 08:48:30 +01:00
cb4f22141d
Merge branch 'feature-11142/Reihungstest_aufgenommene_bei_Neupriorisierung'
2021-02-23 08:36:53 +01:00
4ebd5a85bb
Avoided click event bubbling for nested buttons
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-22 16:12:15 +01:00
cf5ee6afa3
Merge branch 'master' into feature/Anrechnungen_NEU
2021-02-22 16:05:50 +01:00
4d041023a8
Problem beim Speichern der Lektorenzuordnung behoben wenn Semesterstunden leer sind
2021-02-22 08:49:52 +01:00
f208fbcd4b
Merge branch 'feature-11869/testtool_sprache_und_sprachwahl'
2021-02-19 17:15:00 +01:00
d69083eba2
Fixed Typo in Demo Page
2021-02-19 17:13:53 +01:00
b44853d536
Merge branch 'master' into feature-11869/testtool_sprache_und_sprachwahl
2021-02-19 17:13:25 +01:00
ad9de97a8c
Merge branch 'feature-10816/log_download_bescheid'
2021-02-19 16:23:07 +01:00
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
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
4b3cf019c3
Fixed flickering popup massage preventing approving AFTER withdrawing a rejection
...
This happened because of a conflict between HTML forms native submit behaviour
(automatically refreshing page) and our javascripts submit onclick functions.
Now fixed by setting event.preventDefault() within the js functions.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-18 13:56:15 +01:00
6d3407c309
Reset deleted filter button in STGL overview (show recommended)
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-18 09:42:16 +01:00
ce2deb32e1
Deleted testuser
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-18 09:32:46 +01:00
eb95421ff9
ReihungstestJob.php: formatted sql
2021-02-18 04:26:54 +01:00
b5c9567c01
Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU
...
# Conflicts:
# public/js/lehre/anrechnung/approveAnrechnungDetail.js
2021-02-17 19:09:09 +01:00
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
d9d71c42ce
Added feature to withdraw approvals/rejections for STGL
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-17 18:54:53 +01:00
577d0f1eb5
Fixed Filename
2021-02-17 15:21:38 +01:00
0993b94507
Anrechnungen Tooltip korrigiert bei STGL Filter
2021-02-17 11:44:35 +01:00
a02d581d0a
Merge branch 'feature/Anrechnungen_NEU'
2021-02-17 08:49:24 +01:00
94d335600c
- Added new protected method getOldestJob to JQW_Controller
...
- Added new public method getOldestJob to JobsQueueLib
2021-02-16 21:21:11 +01:00
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
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
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
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
fec8fbb6d4
Anrechnungen - Mail Empfänger korrigiert bei Personen mit mehreren Accounts
2021-02-16 09:46:50 +01:00
cris-technikum