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
fbb7b45b69
- added zweitbegutachterFehltWarnung phrase
2021-03-22 04:55:46 +01:00
2c9ca77500
Fixed code indentation, standart output, includes path, removed unused
...
variables and added a check to mail send where missing
2021-03-18 19:14:56 +01:00
4c0c6aa6cd
bugfix reload projekt
2021-03-18 12:04:28 +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
95c5a9c475
added UNIQUE constraing to zugangstoken column of lehre.tbl_projektbetreuer
2021-03-15 23:48:00 +01:00
ee7d51d2b3
Pruefung_model.php: method for retrieving Prüfung by person and studiensemester
2021-03-15 23:27:28 +01:00
2ef2a906c3
- Projektarbeitsbenotung (abgabe_lektor_details.php): benoten button only shown when semester > SS2021
...
- updated phrases for text showing if older semester
2021-03-12 09:46:27 +01:00
73525c94ab
uid of student instead of logged in user is passed to sancho infomail
2021-03-11 12:42:18 +01:00
3db9b9abee
added projektbeurteilung pdfexport
2021-03-09 14:13:55 +01:00
e33eb2e9a9
Zeitraumabfragen für Projektphasen korrigiert
2021-03-09 13:23:56 +01:00
fb7835de57
added new zeitwuensche permission
2021-03-08 12:53:59 +01:00
5f187b5293
Merge branch 'master' into feature-10450/DVUH_requestMatrikelnummer
2021-03-07 21:44:56 +01:00
5da754c9db
Anmerkung bei Lehreinheitmitarbeiter verschoben
2021-03-04 07:59:38 +01:00
5b546d25a8
- abgabe_student_details.php: added reply to and other header/footer to sancho Endupload mails
...
- sancho.inc.php: enabled reply-to and passing of footer image
2021-03-04 00:04:47 +01:00
6bb9c77ca1
abgabe_student_details.php: Mail to Erst- and Zweitbegutachter is a sancho mail
2021-03-03 10:43:37 +01:00
edf657fdb9
abgabe_student_details.php: Mail with link (and possibly token for second assessor) to project assessment is sent with final upload to first and second assessor.
2021-03-03 00:00:51 +01:00
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
9cbcec7231
Fallback-Lösung für LV-Regel wenn im aktuellen Semester kein Status vorhanden ist
2021-03-02 15:26:44 +01:00
9677a5a4fd
- BenutzerModel: added comment for getFromPersonId method
...
- UPDATE permission for web for tbl_projektbetreuer added
- added phrase for Zweitbegutachter - link
2021-03-01 09:33:14 +01:00
8bd148f7e5
Hinweistext für Zahlungen angepasst
2021-02-26 15:01:23 +01:00
95c2e4bf9c
fix true false
2021-02-26 00:25:59 +01:00
54286a7e6c
Merge branch 'master' into 9503/csvExportProjektÜbersicht
2021-02-25 15:49:52 +01:00
d9cbea680e
Fixed Loading of AZG Relevant Checkbox in FAS
...
Fixed missing Column Warning in DB Update
2021-02-25 15:25:41 +01:00
8086501d04
Merge branch 'master' into feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig
2021-02-25 14:43:06 +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
20413b1b03
abgabetool: replaced link in CIS to redirect to new Beurteilungsformular
2021-02-18 01:53:57 +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
Cris