blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 09:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,047 Commits 215 Branches 6 Tags
5d2adedd37d61d0134e7aa0292ffd64c1aa06ea7
Commit Graph

1962 Commits

Author SHA1 Message Date
Monika70 a6d83ef321 ZGV Doktor und zgv_erfuellt 2021-08-20 15:39:36 +02:00
Andreas Österreicher 73ce635188 Merge branch 'master' into feature-12988/MobilityOnline_Outgoing_mo_fhc_Verknuepfung 2021-08-20 10:34:55 +02:00
Harald Bamberger d091374622 create merged branch with all features on topic Wiederholer - feature 13864 2021-08-19 15:26:20 +02:00
Harald Bamberger 1d9ba9c232 create merged branch with all features on topic Wiederholer - feature 12997 2021-08-19 14:58:00 +02:00
manu 4d08dc58db merge master into feature-12808 2021-08-18 15:38:17 +02:00
Andreas Oesterreicher d8804730ba Merge branch 'master' into feature-13218/BewerbungstoolMasterDokumente 2021-08-18 11:18:33 +02:00
ma0048 6ff8df6ac3 merged master into anpassung_infocenter 2021-08-18 08:45:28 +02:00
cris-technikum 25ee1032e5 Added "homeoffice" to DB and bisverwendung Class 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-08-10 12:30:10 +02:00
Andreas Österreicher 9eae959b15 Merge branch 'master' into feature-10267/Zeiterfassung_Zeitaufzeichnungspflichtig 2021-07-28 12:10:28 +02:00
Andreas Österreicher 8822a589c9 Merge branch 'master' into feature-12075/zeitwuensche_lesezugriff 2021-07-23 14:22:36 +02:00
manu 7bd68775e9 statusgrund_kurzbz in dbupdate ergänzt 2021-07-23 13:44: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
KarpAlex e145a3854a added system.tbl_issues for issue tracking 2021-07-15 16:13:43 +02:00
cris-technikum f60e923829 Merge branch 'master' into feature-12997/Neue_Noten 2021-07-12 10:38:07 +02:00
KarpAlex cee6156646 - added Bisioaufenthaltfoerderung_model.php 
- dbupdate_3.3.php: added Buchungstyp "ZuschussIO"
 2021-07-07 20:22:53 +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
Andreas Österreicher 07cb19ccd1 Merge branch 'feature-13604/Pruefungsprotokolle_Filter_fuer_zukuenftige_Termine' 2021-07-01 14:44:33 +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
KarpAlex 1ce0045f86 - Prestudent_model.php: added getStandortCode and getFoerderrelevant methods 
- indent formatting
 2021-06-25 13:19:02 +02:00
Andreas Österreicher f4ddbd3084 Added DB-Index for lehre.tbl_pruefung to speed up queries 2021-06-25 11:15:12 +02:00
KarpAlex 9a24d2d7c7 dbupdate_3.3.php: removed inserts for bis.tbl_bisstandort, FHs should insert their data as needed 2021-06-23 17:57:31 +02:00
KarpAlex 72b7e5b1fe dbupdate_3.3.php: foerderrelevant field of tbl_prestudent: prefill with false where possible 2021-06-23 15:55:51 +02:00
KarpAlex 264ba0e66f dbupdate_3.3.php: 
- added bis.tbl_bisstandort
- added LIMIT 1 to melderelevant SELECT
- added columns foerderrelevant and standort to public.tbl_studiengang and public.tbl_prestudent
 2021-06-22 16:48:06 +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
cris-technikum bf3c8a344b Merge branch 'master' into feature/Anrechnungen_NEU 2021-06-21 17:18:07 +02:00
Harald Bamberger e5a6af7eb3 first guess adding filter for upcoming exams 2021-06-18 09:16:02 +02:00
Andreas Österreicher 948a26beac Merge branch 'master' into feature-12510/Planner_ZeitaufzeichnungsCheckbox 2021-06-17 09:12: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
KarpAlex 27b0679640 dbupdate_3.3.php: column melderelevant prefill with values, added comment 2021-06-15 19:03:41 +02:00
KarpAlex 2682026fec add column melderelevant to public.tbl_studiengang 2021-06-14 19:13:38 +02:00
Andreas Österreicher 6d0613e5c8 Merge branch 'master' into feature-12340/StudienblattAnpassungFureAbbrecher 2021-06-14 15:36:56 +02:00
cris-technikum 5765be1ab8 Added Note 'nicht zugelassen' 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-06-14 14:57:42 +02:00
cris-technikum fd4740e7e0 Added Note 'intern angerechnet' 
Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
 2021-06-14 14:46:14 +02:00
ma0048 c9ec4cb674 ist infocentermitarbeiter spalte nachgezogen 2021-06-10 12:19:42 +02:00
ma0048 3ba88b43dd zgvmaster spalte hinzugefuegt 2021-06-10 11:49:48 +02:00
ma0048 6550fb6301 wording angepasst 2021-05-31 13:29:13 +02:00
KarpAlex 3dddc97575 dbupdate_3.3.php: removed "bzeichnung_mehrsprachig" feld from bis.tbl_oehbeitrag table check 2021-05-27 16:29:27 +02:00
manu 0285e3fc92 Adaptierungen Bewerbungstool Übersichtsseite 2021-05-20 08:54:14 +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
OliiverHacker 301c836255 add spalte homeoffice to zeitaufzeichnung 2021-05-19 11:48:29 +02:00
KarpAlex 8fe1129910 Merge branch 'feature-12987/Sonderbeitrag_versicherung_trennen' into feature-10450/DVUH_requestMatrikelnummer 2021-05-18 23:40:39 +02:00
KarpAlex d476b8cbd6 created bis.tbl_oehbeitrag for storing oehbeitrag and Versicherung amounts 2021-05-18 22:44:31 +02:00
manu f5298ae351 Ergänzung lehrmodus für Gegenprüfung, Entfernen von addon.tbl_lvevaluierung_frage 2021-05-10 15:10:30 +02:00
ma0048 6f885fb924 fixed typo and put the insert on a other position 2021-05-07 22:23:48 +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
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