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
3366f091dd
Anrechnungen - Fixed Details Page for People with multiple Accounts
2021-02-15 21:12:14 +01:00
4d81f91840
Problem behoben wodurch falsche Anrechnungen geladen wurden
2021-02-15 16:44:34 +01:00
6522def7a2
Merge branch 'feature/Anrechnungen_NEU'
2021-02-15 11:44:07 +01:00
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
38220ab772
Logeintrag beim Downloaden eines Bescheides
2021-02-15 08:11:37 +01:00
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
2973c9e856
Merge branch 'feature/Anrechnungen_NEU'
2021-02-12 16:14:59 +01:00
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
d44c526ba4
Minor changes
...
. phrases
. GUI
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-02-11 16:37:44 +01:00
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