f05493d3f3
modal und check hinzugefuegt
2021-05-20 09:33:08 +02:00
9382b2738f
Merge branch 'master' into feature/Anrechnungen_NEU
2021-05-20 08:55:00 +02:00
0285e3fc92
Adaptierungen Bewerbungstool Übersichtsseite
2021-05-20 08:54:14 +02:00
8f93ab5927
Bugfixed TabelWidget: Ausgewählte Zeilen now displaying amount correctly
...
Added 'typeof' to correctly check against 'undefined'. Before it was
checking against string.
Also corrected all other occurences.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-19 17:08:26 +02:00
a822f96e88
Changed Create Anrechnung window to open in new tab
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-19 16:21:55 +02:00
758b9991d5
Added Antragssperre for Noten, when STGL wants to create Anrechnung
...
Added check, if LV was already graded and if grades are defined in configs
'blocking grades array'. If so, Anrechnung is not allowed.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-19 16:18:04 +02:00
a783b0085b
Splitted Antragsdaten into 2 tables
...
Split to gain more space to see all functionalities/buttons at a glance.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-19 15:28:06 +02:00
847529d5aa
nachname vorname tauschen
2021-05-19 09:03:20 +02:00
eba394e170
Merge branch 'bug-12339/GeburtsdatumValidieren'
2021-05-18 17:09:31 +02:00
fc9d1ce24b
Merge branch 'feature-12338/Zeitbestätigung'
2021-05-18 16:48:16 +02:00
c220bddadc
Kurzbezeichnung der Zeitbestätigung korrigiert
2021-05-18 16:10:13 +02:00
8fe136a5ae
Merge branch 'master' into feature/Anrechnungen_NEU
...
# Conflicts:
# cis/private/tools/projektabgabe.php
2021-05-18 13:24:49 +02:00
7bbd94bb89
Adapted & Enhanced Withdrawing of Approvement
...
. Added 'genehmigt von'
. Moved out to Model and added db rollback
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-17 12:35:14 +02:00
d016e26e70
Added new AnrechnungJob deleteAnrechnungGrades
...
This job deletes Zeugnisnoten 'angerechnet', when Anrechnung is rejected
afterwards. E.g., when STGL first accepts, then withdraws and finally
rejects the approvement.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-17 12:30:56 +02:00
ce302750f8
Wording im FAS angepasst: Lehreinheit->LV-Teil, Semesterstunden->Lehrauftragsstunden, Planstunden->LV-Plan Stunden
2021-05-12 15:48:05 +02:00
45b150f0d4
Abgabtetool: Fixed broken ZIP Download
2021-05-12 15:46:05 +02:00
0d4bf432e2
deleted console.log
2021-05-12 14:00:45 +02:00
ffa7abdf5a
standardtitel hinzugefuegt
2021-05-12 13:52:19 +02:00
2c6d8937f6
funktion hinzugefuegt um mehrere bewerber abzuweisen und status wird nur angezeigt wenn aktiv
2021-05-12 12:48:29 +02:00
475f57d10f
Erweiterung um Langbezeichnung
2021-05-12 09:42:24 +02:00
d5a72af39f
Merge branch 'master' into feature/Anrechnungen_NEU
2021-05-11 13:48:21 +02:00
4b8bf41837
Plagiatsprüfung Link aktualisiert
2021-05-11 11:07:31 +02:00
cefe34a68f
neue Funktion variableChangeValueIfNumber()
2021-05-10 11:28:08 +02:00
5b3871e999
Corrected requiredPermission of tabulator to create Anrechnung
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-10 08:36:30 +02:00
6f885fb924
fixed typo and put the insert on a other position
2021-05-07 22:23:48 +02:00
0681049122
ParbeitsbeurteilungEndupload.txt Vorlage: Paabgabetyp "Abgabe" wenn not endupload, corrected comment
2021-05-07 12:44:23 +02:00
da3396e816
Merge branch 'master' of https://github.com/FH-Complete/FHC-Core
2021-05-07 12:21:33 +02:00
4ec3172ccd
Projektarbeitsbeurteilung Zweitbetreuer: Abgabetyp is passed to Vorlage also when token is resend
2021-05-07 12:20:48 +02:00
7a80a1f1cd
Tokenversand Link ist jetzt immer Sichtbar
2021-05-07 11:49:56 +02:00
9121488151
Updated PHPSecLib
2021-05-06 12:57:52 +02:00
d0b76aaac5
Merge branch 'BUG-13075/Urlaubstool_Markierung_Folgemonat'
2021-05-06 12:54:28 +02:00
4f26a831f4
Merge branch 'feature-12881/Titel_Projektexport'
2021-05-06 12:46:26 +02:00
debd6724b3
Merge branch 'master' into feature/Anrechnungen_NEU
2021-05-05 17:21:56 +02:00
842651e676
Added button 'Antrag jetzt bearbeiten' to 'Antrag anlegen'
...
The button 'Antrag jetzt bearbeiten' will appear right after creating
a new application, so that the user can directly open the new application
in a new tab.
The button disappears when selecting a new student again.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-05 17:03:42 +02:00
73c2319933
Parbeitsbeurteilung Abgabe:
...
- Mail after Zwischenabgabe for Erstbegutachter has not Beurteilunglink
- added Paabgabetyp for Mail after Abgabe
- Plagiatsprüfung Button links to newer Plagiatschecksite
2021-05-05 16:14:10 +02:00
563c0cea58
Fixed wrong column grid / Small GUI adaptations
...
GUI adaptations:
. Changed 'Antrag anlegen': button instead of link
. Changed success text to: Antrag wurde angelegt
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-05 15:52:25 +02:00
d21773bad5
markierung auch im vor und folgemonat
2021-05-05 09:21:32 +02:00
062ff74b03
Mails bei freigabe zum RT und Freigabe an Studiengang fuer Master hinzugefuegt
2021-05-04 22:09:47 +02:00
69b33a7f92
Bugfix: Now Ampelmail is sending HTML content correctly
...
...so that the eMail client can parse and display HTML content correctly.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-04 16:23:24 +02:00
7a29d27a79
Adapted Deadline check to use config parameter
...
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-03 16:18:32 +02:00
a50a666d11
Added Antragssperre for Noten, that are defined in config array
...
. Added new config file
. Added check, if LV was already graded and if grades are defined in configs
'blocking grades array'. If so, Anrechnung is not allowed.
. Adapted GUI to process data via JS only
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-03 16:17:23 +02:00
d23faa6e96
Usability: Avoided manually scrolling when recommending/approving on Detailsite
...
...for STGL and lectors Detailview.
Before the downsliding panel was sliding above the window screen, so that
user was forced to scroll down the page. Now it scrolls up by itself.
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-03 10:50:52 +02:00
99b1de542d
Improvements to all Detail views for lightweighted look and space at end of pages
...
. Removed 'wrapping' panel
. Removed unnecessary panels and breaks
. Added breaks at the end of site to avoid buttons 'sticking' at the bottom
Signed-off-by: cris-technikum <hainberg@technikum-wien.at >
2021-05-03 10:40:37 +02:00
44be64dcca
add titel also to sheet header
2021-04-30 10:56:16 +02:00
d29d80fc59
Merge pull request #10 from FHBGLD/FHBGLD-patch-include_gemeinde_class
...
Update gemeinde.class.php
2021-04-30 10:36:16 +02:00
3075277ca4
Merge branch 'feature-12881/Titel_Projektexport' of https://github.com/FH-Complete/FHC-Core into feature-12881/Titel_Projektexport
2021-04-29 13:04:40 +02:00
27549c1a70
fix umlaute und max length also for excel
2021-04-29 13:03:19 +02:00
03feb6bd44
Merge branch 'feature-12177/master_zgv_im_infocenter_erfassbar' into feature-11001/zgv_ueberpruefung
2021-04-29 11:14:04 +02:00
d490eb4323
freigabe nur fuer den bachelor
2021-04-29 11:12:48 +02:00
c0b07ac1d2
fix bug when deleting ressource from projectphasen
2021-04-29 11:12:32 +02:00
ma0048