blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-01 10:59:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,123 Commits 229 Branches 6 Tags
d53f14eeea259004d2ccef8aef7f5caecfececce
Commit Graph

12123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
FHBGLD aac4467d8a Update set_gemeinde.php 2021-05-05 11:52:12 +02:00
OliiverHacker d21773bad5 markierung auch im vor und folgemonat 2021-05-05 09:21:32 +02:00
ma0048 062ff74b03 Mails bei freigabe zum RT und Freigabe an Studiengang fuer Master hinzugefuegt 2021-05-04 22:09:47 +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
FHBGLD b22c975355 Create set_gemeinde.php 2021-05-04 14:19:48 +02:00
manu a8c11d3e13 Update Page LV-Details Vilesci 2021-05-04 09:27:42 +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
manu 30746e1ee7 update Klasse Lehrmodus und Lehrveranstaltung 2021-05-03 15:28:35 +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
manu e91f3f692e Merge branch 'feature-12808/LVNeuesAttributLehrmodus' of https://github.com/FH-Complete/FHC-Core into feature-12808/LVNeuesAttributLehrmodus 2021-04-30 14:16:48 +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
ma0048 03feb6bd44 Merge branch 'feature-12177/master_zgv_im_infocenter_erfassbar' into feature-11001/zgv_ueberpruefung 2021-04-29 11:14:04 +02:00
ma0048 d490eb4323 freigabe nur fuer den bachelor 2021-04-29 11:12:48 +02:00
OliiverHacker c0b07ac1d2 fix bug when deleting ressource from projectphasen 2021-04-29 11:12:32 +02:00
OliiverHacker 898562e742 fix bug when deleting ressource from project 2021-04-29 11:06:51 +02:00
ma0048 5fff866363 Merge branch 'feature-4836/studiengang_der_anmerkung_ergaenzen' into feature-11001/zgv_ueberpruefung 2021-04-29 10:55:51 +02:00
ma0048 7c02e0247d Merge branch 'feature-12010/filter_for_bachelor_master' into feature-11001/zgv_ueberpruefung 2021-04-29 10:55:35 +02:00
ma0048 0b5ae2df9c Merge branch 'feature-12177/master_zgv_im_infocenter_erfassbar' into feature-11001/zgv_ueberpruefung 2021-04-29 10:53:00 +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
ma0048 5c339ce448 zgv ueberpruefung bug fixes 2021-04-28 16:56:50 +02:00
ma0048 c9bd10c3d0 zgv ueberpruefung bug fixes 2021-04-28 16:53:43 +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
OliiverHacker 35f1b00d7a display correct mitarbeiter ressources 2021-04-28 12:53:57 +02:00
manu 20e6573d68 Spalte lehrmodus_kurzbz zu addon.tbl_lvevaluierung_frage hinzugefügt 2021-04-28 09:34:58 +02:00
Cris 5f7672d9df Adapted Anrechnungen-files to use AjaxLib for uploading files 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-27 17:39:45 +02:00
Cris 5904d7f455 Added FILE UPLOAD functionality to AjaxLib 
Files can be uploaded now by passing a FormData object or a FileList.
The extra HTTP request option parameters processData and contentType
(important for fileupload) are added and set to false.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-27 17:26:58 +02:00
FHBGLD e4f6496387 Update gemeinde.class.php 2021-04-27 14:37:32 +02:00