blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 08:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,838 Commits 211 Branches 6 Tags
70f3cebd3680e41d795aa2fd92cd65a39b102f43
Commit Graph

140 Commits

Author SHA1 Message Date
Harald Bamberger ef93736891 eucovidqr phrases modified 2021-10-28 12:31:48 +02:00
ma0048 54f6d88901 Merge branch 'feature-7423/infocenter_udf_schule_job' into feature/infocenter_anpassungen 2021-10-25 10:37:14 +02:00
Harald Bamberger 52272932ed another euvocid phrase 2021-10-22 10:31:02 +02:00
ma0048 d7364d08dd Merge remote-tracking branch 'origin/feature-15389/infocenter_automatische_abfrage_ob_bewerberin_vorhanden' into feature/infocenter_anpassungen 2021-10-22 07:13:06 +02:00
Harald Bamberger 7de012c930 more phrases for eucovidqr 2021-10-21 18:31:48 +02:00
Harald Bamberger b0571e0a26 additional phrases for eucovidqr 2021-10-21 08:18:04 +02:00
Harald Bamberger 2bb357ccbd remove 3G from phrases 2021-10-13 15:14:13 +02:00
Harald Bamberger bd3ed4952b add phrases for eucovidqr errormsgs 2021-10-13 12:26:03 +02:00
ma0048 3e00e4b3a1 infocenter warning falls bewerberIn bereits vorhanden ist 2021-10-12 13:08:17 +02:00
Harald Bamberger 4ef7f49bdb add missing phrase 2021-10-08 15:12:06 +02:00
Harald Bamberger 524a3dfd95 phrases for eucovidqr 2021-10-08 11:25:55 +02:00
ma0048 8a417e5cb8 fixed uebersicht nicht abgeschickt 2021-09-15 13:45:43 +02:00
Andreas Österreicher 04261e11e4 Wording für Anrechnungen angepasst 2021-09-03 17:38:52 +02:00
Andreas Österreicher 484151bab2 Merge branch 'master' into feature/Anrechnungen_NEU 2021-08-26 11:32:47 +02:00
ma0048 6ff8df6ac3 merged master into anpassung_infocenter 2021-08-18 08:45:28 +02:00
cris-technikum 68a469bce6 Changed text for Anrechnungen Antragsfrist 15.09. -> to 22.09. 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-07-19 14:50:12 +02:00
cris-technikum 50a7bfe927 Minor text changes in Infobox/Nachweisdokumente 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-07-19 12:03:55 +02:00
cris-technikum 635974fa22 Merge branch 'master' into feature/Anrechnungen_NEU 
# Conflicts:
#	application/models/crm/Prestudent_model.php
#	system/dbupdate_3.3.php
 2021-07-07 15:05:31 +02:00
ma0048 36507959ac dokumentenpruefung im infocenter in eigenes js ausgelagert, reloaden der anzeige beim nachreichen eines doks 2021-06-30 13:09:56 +02:00
ma0048 d4d84a93ba Nachreichdatum kann nun auch ueber das Infocenter gesetzt werden 2021-06-29 14:43:19 +02:00
cris-technikum 1eb3f96200 Added STGL-Notizfeld to Lectors Detail View 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-06-22 12:46:03 +02:00
Harald Bamberger e5a6af7eb3 first guess adding filter for upcoming exams 2021-06-18 09:16:02 +02:00
ma0048 934248aa0e Merge branch 'feature-12178/message_bei_master_freigabe' into feature-13277/anpassung_infocenter 2021-06-16 09:26:30 +02:00
ma0048 8fa40a843b Merge branch 'feature-11001/zgv_ueberpruefung' into feature-13277/anpassung_infocenter 
# Conflicts:
#	application/controllers/system/infocenter/InfoCenter.php
#	application/views/system/infocenter/dokpruefung.php
#	application/views/system/infocenter/infocenterData.php
#	application/views/system/infocenter/infocenterFreigegebenData.php
#	application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
 2021-06-16 09:26:03 +02:00
ma0048 6550fb6301 wording angepasst 2021-05-31 13:29:13 +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 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
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
ma0048 062ff74b03 Mails bei freigabe zum RT und Freigabe an Studiengang fuer Master hinzugefuegt 2021-05-04 22:09:47 +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 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
Cris 21ce118f0b Merged master into branch 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-28 15:54:54 +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 5e77e252c7 Added GUI to create Anrechnungsantrag 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-04-20 15:54:16 +02:00
ma0048 bc7e3c5cc5 zgv ueberpruefung hinzugefuegt 2021-04-20 13:51:41 +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 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
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
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 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
Andreas Österreicher 170b2485d3 Merge branch 'feature-10965/beurteilungsformular_pdf_export' into feature-10963/Beurteilungsformular_datenbankanpassungen 2021-04-06 18:06:30 +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
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
Cris d53d91d7d1 Usability: Added filterbutton 'Alle anzeigen, die auf Empfehlung von LektorIn warten' 
The filterbutton was added to the STGLs Overview site.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-03-30 17:02:15 +02:00
Cris d183dda815 Fixed: Anrechnunglib returning values, Adapted error messages 
Fixed: method getData in Controller was producing wrong returning message.
Fixed by removing, as library is returning boolean value now.

Adapted few error functions to be more generic and bilingual.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-03-29 18:48:26 +02:00
Cris 287b961697 Fixed: Added serversite check on required form fields 
After refactoring code to apply via AJAX call, required fields
have to be direclty validated in JS or on serversite. Now fixed by
checking on serversite.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-03-29 17:55:50 +02:00
Cris 279157b920 Added button to copy Empfehlungstext into reason textarea when rejecting 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-03-25 17:12:38 +01:00
Cris 3ba4229eed Refactored Students View + Controller 
. Now application is done via AJAX call.
. Now messages are returned to user instead of hard exits.
. Now formatting status on client side, not on serverside.

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-03-25 15:06:47 +01:00
KarpAlex 8f2ef521e7 changed Projektarbeitsbeurteilung phrase for thema criteria 2021-03-25 13:22:39 +01:00
KarpAlex a68dfc1c6c - Projektarbeitsabgabe: added Link to Projektarbeitsuebersicht to Zweitbegutachtermail 
- updated abgabetool phrases
 2021-03-24 22:49:34 +01:00