blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-15 02:59:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,245 Commits 227 Branches 6 Tags
bhdev_rollup
Commit Graph

2397 Commits

Author SHA1 Message Date
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
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
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 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
ma0048 7c02e0247d Merge branch 'feature-12010/filter_for_bachelor_master' into feature-11001/zgv_ueberpruefung 2021-04-29 10:55:35 +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 b5be5be59d Merge branch 'master' into feature-11250/zeitaufzeichnung_stammkostenstelle 2021-04-28 17:17:02 +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
manu 20e6573d68 Spalte lehrmodus_kurzbz zu addon.tbl_lvevaluierung_frage hinzugefügt 2021-04-28 09:34:58 +02:00
manu 398418515f neue Tabelle lehre.tbl_lehrmodus, neue Spalte lehrmodus_kurzbz in lehre.tbl_lehrveranstaltung 2021-04-22 09:58:53 +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
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
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