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
Andreas Österreicher
803076d7d2
Merge branch 'feature-12337/nationenliste_sortieren'
2021-03-31 15:37:41 +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
9ee473d9bd
Usability: Added Link to Anrechnungen in CIS LV Menu (for lectors)
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-30 16:41:02 +02:00
cris-technikum
3366cf224b
Merge branch 'master' into feature/Anrechnungen_NEU
2021-03-30 14:04:03 +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
Andreas Österreicher
96bdafbda8
Merge branch 'bugfix-12144/Bewerberstatistikmail_HTMLError'
2021-03-30 12:20:08 +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
Andreas Österreicher
989772402d
LVA-Liste prüft die Vertragszuordnung jetzt pro Lehreinheit statt pro LV
2021-03-23 08:38:55 +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
983ff1b16e
Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU
2021-03-18 11:43:42 +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
Andreas Österreicher
5da754c9db
Anmerkung bei Lehreinheitmitarbeiter verschoben
2021-03-04 07:59:38 +01:00
Cris
9ba6f3b538
Fixed HTML code appearing within mail message body
...
. by breaking lines with \n
. using nowrap to avoid breaking text
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-03-02 15:44:46 +01:00
Nikolaus Krondraf
9cbcec7231
Fallback-Lösung für LV-Regel wenn im aktuellen Semester kein Status vorhanden ist
2021-03-02 15:26:44 +01:00
Andreas Österreicher
8bd148f7e5
Hinweistext für Zahlungen angepasst
2021-02-26 15:01:23 +01:00
Andreas Österreicher
6f27fccc09
- Corrected Permissions for Anrechnungen
...
- Removed Useless Sequence
2021-02-23 17:55:41 +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
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
cris-technikum
cf5ee6afa3
Merge branch 'master' into feature/Anrechnungen_NEU
2021-02-22 16:05:50 +01:00
Andreas Österreicher
4d041023a8
Problem beim Speichern der Lektorenzuordnung behoben wenn Semesterstunden leer sind
2021-02-22 08:49:52 +01:00
Andreas Österreicher
f208fbcd4b
Merge branch 'feature-11869/testtool_sprache_und_sprachwahl'
2021-02-19 17:15:00 +01:00
Andreas Österreicher
d69083eba2
Fixed Typo in Demo Page
2021-02-19 17:13:53 +01:00
Andreas Österreicher
b44853d536
Merge branch 'master' into feature-11869/testtool_sprache_und_sprachwahl
2021-02-19 17:13:25 +01:00
Andreas Österreicher
ad9de97a8c
Merge branch 'feature-10816/log_download_bescheid'
2021-02-19 16:23:07 +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
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