blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-22 17:32:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,257 Commits 216 Branches 6 Tags
cafd72e51dae745e90b17f497cbfb3d463d4933a
Commit Graph

11257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
Cris cf58762a6b Fixed Bestaetigung checkbox in students VIEW to be checked if Anrechnung exists 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-21 19:05:40 +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
Andreas Österreicher ada7cdfb58 Merge branch 'BUG-1731/Mitarbeiter_Verwendung_Datum' 2021-04-21 15:04:33 +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 dca828650a Adapted Bestaetigung Moodle link to open in new tab 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-20 16:51:18 +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 356435dbdd Added JS to create Anrechnungsantrag + Adapted TableWidget.js option 
Adapted TableWidgets option 'rowSelectionChanged' to be able to directly
define rowSelectionChanged within particular JS file, if needed.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-20 16:28:46 +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
OliiverHacker a7482425ef fix inserst typos 2021-04-20 15:57:43 +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
Cris f6f31f7efb Added Berechtigung 'lehre/anrechnung_anlegen' to create Anrechnung 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-20 15:49:08 +02:00
Paolo 142ea9a1f4 Merge branch 'FHBGLD-master' 2021-04-20 14:10:22 +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
Andreas Österreicher 3281e832ce Merge branch 'bug-3879/fehler_beim_akzeptieren_von_sonstigen_dokumenten' 2021-04-16 15:34:45 +02:00
Andreas Österreicher f3af4fd783 Merge branch 'feature-12598/Projektabgabe_SortierenNachDatum' 2021-04-16 15:27:43 +02:00
Andreas Österreicher abcbb0d81c Merge branch 'feature-10963/Beurteilungsformular_datenbankanpassungen' 2021-04-16 13:41:27 +02:00
Andreas Österreicher a1f4c90deb Merge branch 'master' into feature-10963/Beurteilungsformular_datenbankanpassungen 2021-04-16 13:15:30 +02:00
Andreas Österreicher 08237bdb7f Changed fhcomplete.org Wiki Links to fhcomplete.info 2021-04-15 11:54:50 +02:00
cris-technikum 8730f28d91 Merge branch 'master' into feature/Anrechnungen_NEU 2021-04-15 09:53:15 +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
KarpAlex 72b076c785 added repeat.png image for abgabetool 2021-04-13 13:25:42 +02:00
Cris b92260c1d5 Added Moodle-link to Anrechnungen-Prozessinformation 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-13 11:47:13 +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
OliiverHacker 456a4e2057 bugfix for datum validation 2021-04-12 11:52:01 +02:00
KarpAlex 1f02506eaf added phrase for Parbeitaktualität error 2021-04-10 04:09:29 +02:00
KarpAlex b29621354f - abgabetool: added zweitbetreuer mailto Link incl. icons 
- Bewertunglink is not sent in Parbeit Enduploadmail if older Semester
- phrasesupdate Projektarbeitsbeurteilung: added female form
 2021-04-10 03:55:05 +02:00
manu 07f483f3bf Ergänzung tablesorter 2021-04-08 19:13:19 +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 cbf4cd14e5 Added column 'Status' (last Anrechnungstatus) in FAS Anrechnung tab 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-08 13:15:11 +02:00
ma0048 88dbd77a95 bug gefixed, akzeptieren von mehreren sonstigen dokumenten nun ohne fehlermeldung moeglich 2021-04-08 09:43:36 +02:00
KarpAlex e254dfba54 Merge branch 'feature-10963/Beurteilungsformular_datenbankanpassungen' of https://github.com/FH-Complete/FHC-Core into feature-10963/Beurteilungsformular_datenbankanpassungen 2021-04-07 18:01:30 +02:00
KarpAlex c2f74b1bba - mail to Zweitbegutachter after student upload is only sent when it is the endupload 
- removed comments
 2021-04-07 18:00:10 +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 bd2727fa02 Fixed: Now trimming text when copying lectors reason to STGLs reason for rejection 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-07 11:59:32 +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