blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-18 23:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,205 Commits 211 Branches 6 Tags
bb44bd05b67b644d01808f052dffb0f0452bc983
Commit Graph

2034 Commits

Author SHA1 Message Date
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 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
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
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
ma0048 c9bd10c3d0 zgv ueberpruefung bug fixes 2021-04-28 16:53:43 +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
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 3a9704563f Adapted JOB sendMailToSTGL to send mail only if Anrechnung not already processed 
Job gets all yesterdays Anrechnungen, that did not process further than
first status. (If Anrechnung is new, but STGL already
started the process yesterday, he does not need to be informed about
this new Anrechnung anymore)

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-22 15:52:46 +02:00
KarpAlex 5fa856c138 add erhalter kz to getByPerson method from Zeugnisnote_model.php 2021-04-22 01:02:32 +02:00
Cris 7b485053d9 Adapted DMSLib upload method to be accept field name from Controller 
The fieldname represents the HTML uploadfile input name attribute, which
is given by the developer in the VIEW.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-21 18:46:51 +02:00
Cris 6dcb5e3a65 Adapted DMSLib download method to be more generic 
DMSLib now extends FHC Controller to use its new method 'outputFile',
which sets HTTP headers and reads the file.
DMSLib uses now download function to accept params from Controller like
own filename or special disposition.
Loading document and retrieving file info is outsourced into own method
to be reusable.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-21 17:53:42 +02:00
Cris 731c5b9461 Added link 'Neuen Antrag anlegen' in STGL Overview Site 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-21 13:37:43 +02:00
Cris 6dca00e4e5 Corrected query to retrieve only prestudentstatus 'students' 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-20 18:45:43 +02:00
Cris bb0776a808 Added method createAnrechnungsantrag to Anrechnungsmodel + Refactored code 
Moved code from Controller to Anrechnungmodel.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-20 16:41:25 +02:00
cris-technikum b7a6cefa36 Added Controller to create Anrechnungsantrag + Model Anrechnungbegruendung_model 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-20 16:00:14 +02:00
Cris 5e77e252c7 Added GUI to create Anrechnungsantrag 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-20 15:54:16 +02:00
Paolo 9699de8c33 Removed commented code 2021-04-20 14:09:52 +02:00
Paolo 61fbb60492 Merge branch 'master' of https://github.com/FHBGLD/FHC-Core into FHBGLD-master 2021-04-20 14:07:07 +02:00
ma0048 bc7e3c5cc5 zgv ueberpruefung hinzugefuegt 2021-04-20 13:51:41 +02:00
Andreas Österreicher a1f4c90deb Merge branch 'master' into feature-10963/Beurteilungsformular_datenbankanpassungen 2021-04-16 13:15:30 +02:00
Cris 3d574c30b7 Adapted job sendMailtoSTGL: interval '24 hours' instead of '1 day' 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-14 11:07:20 +02:00
Cris ca378ef13b Added header filter to all hidden table columns 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-13 17:35:55 +02:00
Cris b9955c14a6 Minor code changes for better maintainance 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-13 16:33:53 +02:00
Cris 7317623fbf Added jobs to send mails to students once per day (info approved/rejected) 
. The jobs will send mails to students, whose Anrechnungen were
approved/rejected the last day.

. Removed former sendMailToStudent functions from Controllers.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-13 16:09:11 +02:00
Cris cb5037626b Minor change: Now using language phrase for 'maxZeichen' 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-13 09:45:23 +02:00
Cris a70082f0e5 Usability: Added Pflichtfeld "Lesebestaetigung" to students VIEW 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-12 17:00:03 +02:00
Cris b8768f997c Usability: Gendered StudentIn; Changed first table column to bold text - Students VIEW 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-08 14:44:00 +02:00
Cris 1008f6b8b3 Fixed DB errormessage in STGL Overview (related to added Ausbildungssemester) 
The subquery was returning multiple rows. This is fixed now.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-08 14:34:16 +02:00
Cris 094b502862 Usability: Limited chars-length for 'Herkunft der Kenntnisse' / Added chars counter 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-07 17:17:53 +02:00
Cris 587796e374 Usability: Gendered StudentIn; Changed first table column to bold text 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-07 15:52:06 +02:00
Cris fe4b70ba19 Usability: Added 'Empfehlungsanforderung an/am' to STGL + lectors Detail view 
. Now more "Empfehlungs"-data shown in a table.
. Better separation of PHP / JS.
. Adapted Controller, View, JS and library to provide data about WHEN and
TO WHOME the requests for recommendation had been sent.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-07 15:50:05 +02:00
Cris 343b7a3087 Adapted Controller to use library method getLectors() 
...instead of redundant private method.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-07 11:59:13 +02:00
Cris b5ba81b26e Added fixed column width to tables 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-07 11:49:42 +02:00
Andreas Österreicher 170b2485d3 Merge branch 'feature-10965/beurteilungsformular_pdf_export' into feature-10963/Beurteilungsformular_datenbankanpassungen 2021-04-06 18:06:30 +02:00
Cris 7c875d5f80 Usability: Added 'ZGV' to STGL and lectors Detail site 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-06 14:48:08 +02:00
ma0048 42d2f45561 bei den anmerkungen studiengang hinzugefuegt 2021-04-06 13:51:27 +02:00
ma0048 acdfdc028b zgv beim master nur updaten wenn es sich um einen master handelt 2021-04-06 12:31:46 +02:00
Cris 5dafb3447b 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 14:25:15 +02:00
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
FHBGLD 376f413d2a Update LDAPLib.php 2021-03-31 14:58:31 +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
ma0048 9b57248007 zgv auch bei master uebernehmen 2021-03-31 13:12:20 +02:00