Commit Graph

11323 Commits

Author SHA1 Message Date
cris-technikum 1c780d5aae Merge remote-tracking branch 'origin/feature/Anrechnungen_NEU' into feature/Anrechnungen_NEU 2021-05-20 16:09:04 +02:00
cris-technikum 5c5f389a2d Corrected: Anrechnungen were not shown in Overview after 'Löschen von Nachweisdokumenten'
Left Joining table dms_version fixed this issue.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-05-20 13:31:02 +02:00
cris-technikum 35edf82ca6 Merge branch 'master' into feature/Anrechnungen_NEU 2021-05-20 13:27:28 +02:00
cris-technikum 9382b2738f Merge branch 'master' into feature/Anrechnungen_NEU 2021-05-20 08:55:00 +02:00
cris-technikum 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
cris-technikum 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
cris-technikum 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
cris-technikum 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
Andreas Österreicher eba394e170 Merge branch 'bug-12339/GeburtsdatumValidieren' 2021-05-18 17:09:31 +02:00
Andreas Österreicher fc9d1ce24b Merge branch 'feature-12338/Zeitbestätigung' 2021-05-18 16:48:16 +02:00
Andreas Österreicher c220bddadc Kurzbezeichnung der Zeitbestätigung korrigiert 2021-05-18 16:10:13 +02:00
cris-technikum 8fe136a5ae Merge branch 'master' into feature/Anrechnungen_NEU
# Conflicts:
#	cis/private/tools/projektabgabe.php
2021-05-18 13:24:49 +02:00
Cris 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
Cris 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
Andreas Österreicher ce302750f8 Wording im FAS angepasst: Lehreinheit->LV-Teil, Semesterstunden->Lehrauftragsstunden, Planstunden->LV-Plan Stunden 2021-05-12 15:48:05 +02:00
Andreas Österreicher 45b150f0d4 Abgabtetool: Fixed broken ZIP Download 2021-05-12 15:46:05 +02:00
cris-technikum d5a72af39f Merge branch 'master' into feature/Anrechnungen_NEU 2021-05-11 13:48:21 +02:00
Andreas Österreicher 4b8bf41837 Plagiatsprüfung Link aktualisiert 2021-05-11 11:07:31 +02:00
Cris 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
KarpAlex 0681049122 ParbeitsbeurteilungEndupload.txt Vorlage: Paabgabetyp "Abgabe" wenn not endupload, corrected comment 2021-05-07 12:44:23 +02:00
KarpAlex da3396e816 Merge branch 'master' of https://github.com/FH-Complete/FHC-Core 2021-05-07 12:21:33 +02:00
KarpAlex 4ec3172ccd Projektarbeitsbeurteilung Zweitbetreuer: Abgabetyp is passed to Vorlage also when token is resend 2021-05-07 12:20:48 +02:00
Andreas Österreicher 7a80a1f1cd Tokenversand Link ist jetzt immer Sichtbar 2021-05-07 11:49:56 +02:00
Andreas Österreicher 9121488151 Updated PHPSecLib 2021-05-06 12:57:52 +02:00
Andreas Österreicher d0b76aaac5 Merge branch 'BUG-13075/Urlaubstool_Markierung_Folgemonat' 2021-05-06 12:54:28 +02:00
Andreas Österreicher 4f26a831f4 Merge branch 'feature-12881/Titel_Projektexport' 2021-05-06 12:46:26 +02:00
cris-technikum debd6724b3 Merge branch 'master' into feature/Anrechnungen_NEU 2021-05-05 17:21:56 +02:00
Cris 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
KarpAlex 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
Cris 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
OliiverHacker d21773bad5 markierung auch im vor und folgemonat 2021-05-05 09:21:32 +02:00
Cris 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
Cris 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
Cris 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
Cris 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
Cris 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
OliiverHacker 44be64dcca add titel also to sheet header 2021-04-30 10:56:16 +02:00
Pable d29d80fc59 Merge pull request #10 from FHBGLD/FHBGLD-patch-include_gemeinde_class
Update gemeinde.class.php
2021-04-30 10:36:16 +02:00
OliiverHacker 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
OliiverHacker 27549c1a70 fix umlaute und max length also for excel 2021-04-29 13:03:19 +02:00
Cris 81bd719e39 Added Empfehlungsnotiz in STGL Detailview + minor GUI change
Now STGL can save and update notes regarding recommendation.

Therefore minor GUI change by displaying tables within panels instead of
appending directly to panel - in STGL and lectors Detail view. This is
for clearer view and gives space for the notes.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-29 09:54:57 +02:00
Andreas Österreicher 935519d1c3 Merge branch 'master' into feature-12881/Titel_Projektexport 2021-04-28 17:38:59 +02:00
Andreas Österreicher 77c06516f5 Merge branch 'feature-9612/Casetime_Zeitwarnungen_differenzieren' 2021-04-28 17:29:04 +02:00
Andreas Österreicher 05a3f787e4 Merge branch 'master' into feature-9612/Casetime_Zeitwarnungen_differenzieren 2021-04-28 17:21:51 +02:00
Andreas Österreicher d5ef17d66a Merge branch 'feature-11250/zeitaufzeichnung_stammkostenstelle' 2021-04-28 17:18:40 +02:00
Andreas Österreicher b5be5be59d Merge branch 'master' into feature-11250/zeitaufzeichnung_stammkostenstelle 2021-04-28 17:17:02 +02:00
Andreas Österreicher 4dc0bc3aec Merge branch 'feature-98/Feiertage_in_Urlaubstool' 2021-04-28 16:52:09 +02:00
Andreas Österreicher dda82e32f1 Merge branch 'master' into feature-98/Feiertage_in_Urlaubstool 2021-04-28 16:45:28 +02:00
Cris 21ce118f0b Merged master into branch
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-28 15:54:54 +02:00
Cris cafd72e51d Removed accaptance of FormData object within AjaxLib controllerParameter check
Also adapted JS files to this change.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
2021-04-28 15:53:17 +02:00