blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 00:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,019 Commits 217 Branches 6 Tags
feature-40319/SWB_Software-und-Lizenzanforderung
Commit Graph
953 Commits
Author SHA1 Message Date
Cris 06ed2e23aa Merge branch 'master' into feature-40319/SWB_Software-und-Lizenzanforderung 
# Conflicts:
#	system/phrasesupdate.php
 2024-09-04 14:47:20 +02:00
Cris e4fc0660f8 Added getTemplateLvTree method to Lehrveranstaltung_model.php 
This method gets all Templates and unions with all Lehrveranstaltungen of given Studiensemester and Oes, that are assigned to
a template. This data structure can be used for nested tabulator data tree.
 2024-08-14 11:14:20 +02:00
cgfhtw e5217afc09 ZGV Ausstellungsstaat 2024-08-13 13:10:11 +02:00
cgfhtw 7e302adf53 Bugfix in Prestudent model 2024-08-09 13:25:42 +02:00
cgfhtw ffabd681c8 setFirstStudent logic 2024-08-08 16:24:23 +02:00
cgfhtw f1a2ef25c7 Remove unused functions 2024-08-08 12:45:36 +02:00
cgfhtw 59314ae0aa correct rolle exists check 2024-08-07 15:56:07 +02:00
cgfhtw 24d74dd332 correct student check 2024-08-07 15:51:19 +02:00
cgfhtw 0621073f8d correct checkIfExistingAufgenommenerstatus 2024-08-07 15:40:11 +02:00
cgfhtw 1fc7f9d3e8 correct checkIfExistingBewerberstatus 2024-08-07 15:37:43 +02:00
cgfhtw ee78a94aa2 codesniff Prestudentstatus_model 2024-08-06 14:20:22 +02:00
Cris 7abe95ba5f Adapted LvsByStudienplan query to retrieve also Lehreinheitgruppen 2024-08-06 10:48:20 +02:00
ma0068 235a8a73e9 codessniff studentlehrverband_model 2024-08-06 08:49:23 +02:00
ma0068 a728d20b70 codesniff Models 2024-08-06 08:42:20 +02:00
ma0068 437fd64a6f refactor setFunctions and processStudentlehrverband 2024-08-05 16:52:46 +02:00
Cris b0821be465 Added methods getLastOrAktStudienjahr / getAktOrNextStudienjahr to retrieve the last or next Studienjahr during the summer term 2024-08-05 10:52:15 +02:00
ma0068 90162ed2c9 refactor generate alias, add transaction to addStatus 2024-08-02 13:55:46 +02:00
Cris 9bec0c61de Merge branch 'master' into feature-40319/SWB_Software-und-Lizenzanforderung 
# Conflicts:
#	system/phrasesupdate.php
 2024-08-01 13:55:51 +02:00
Cris 3213c051b3 Adapted getLvsByStudienplan query to get by given Lehrveranstaltungen 2024-08-01 13:48:06 +02:00
cgfhtw 6f0e46ac57 Status: Max Semester 2024-08-01 12:57:06 +02:00
Cris 085ca2a16d Adapted getLvsByStudienplan query to get all LVs, not only VZ 2024-07-31 11:44:42 +02:00
ma0068 3d27c68dee adapt functions toolbarInteressent, Phrases 2024-07-31 09:06:42 +02:00
Cris 49bd14496a Adapted db query to get Lehrveranstaltungen via Studienplan instead of Lehreinheit 2024-07-30 15:38:02 +02:00
cgfhtw dd23bc26a2 Improvements: Status delete 2024-07-30 09:57:37 +02:00
cgfhtw d4db49e09e Status->isLastStatus corrected 2024-07-26 12:04:20 +02:00
cgfhtw 0534ab4ac2 corrected Studienpläne Query 2024-07-25 15:51:30 +02:00
cgfhtw 93b301ee08 Finish Status insert function 2024-07-24 13:24:15 +02:00
cgfhtw d9cba6bf5c Check orgform student/bewerber 2024-07-24 08:45:48 +02:00
ma0068 7498b327d4 dynamic Toolbars Interessent, Student, update actions interessent 2024-07-24 08:42:19 +02:00
Cris 0df9385f33 Adapted DB query to filter only Lehrveranstaltungen with lehrtyp_kurzbz 'lv' 2024-07-22 12:02:08 +02:00
cgfhtw 31abd39ba8 PrestudentstatusCheckLib: status history 2024-07-19 13:34:56 +02:00
cgfhtw f4376d44a2 Fix Bugs in Bismeldestichtag_model checkIfMeldestichtagErreicht 2024-07-18 13:40:52 +02:00
cgfhtw b62634242a Bismeldestichtag_model fix missing DateTime 2024-07-18 12:01:15 +02:00
ma0068 287d44f64a add formatted dates to sql query getHistoryPrestudent 2024-07-17 09:20:31 +02:00
cgfhtw 7031a4d9c4 Use only active Statusgruende & "--keine Auswahl--" 2024-07-16 09:59:10 +02:00
ma0068 58403ff00e bugfixes changeStatus, generateMatrikelnummer, updateLists, validations 2024-07-15 15:41:45 +02:00
ma0068 780dce293d refactor addStudent, bugfix updateList after delete, check organisationsform ersterStudent 2024-07-15 11:57:16 +02:00
cgfhtw af127d666d Merge branch 'master' into feature-30660/FHC4_StudierendenGUI_Prototyp 2024-07-15 09:35:19 +02:00
ma0068 eb12b35e37 reload detailtab after changedStatus, update getUserLanguage() 2024-07-12 11:29:38 +02:00
ma0068 19775fac3f Merge branch 'feature-30660/FHC4_StudierendenGUI_Prototyp' of github.com:FH-Complete/FHC-Core into feature-30660/FHC4_StudierendenGUI_Prototyp 2024-07-12 09:23:00 +02:00
ma0068 0bb5cb1fdc bugfix generateMatrikelnnummer, Reihenfolge validierung turnIntoStudent 2024-07-12 09:20:42 +02:00
cgfhtw 78471a2c3a Use Prestudentstatus_model instead of Prestudent_model for status history 2024-07-12 08:30:57 +02:00
Harald Bamberger 16ab9998b0 Merge branch 'master' into feature-39592/vereinfachte_Sicht_fuer_Assistenz 2024-07-11 14:44:44 +02:00
Cris ce7b368a8e Adapted lv.orgform_kurzbz to selects in Lehrveranstaltung_model.php 2024-07-11 14:33:38 +02:00
cgfhtw 4c862932e8 use CI Model functions for Bismeldestichtag_model->getLastReachedMeldestichtag() 2024-07-11 14:28:29 +02:00
Harald Bamberger 115151473a backport recent changes of Betriebsmittel component and phrases from feature-30660/FHC4_StudierendenGUI_Prototyp Branch 2024-07-11 11:57:45 +02:00
ma0068 a728bec15f BewerberZuStudent: new action turnIntoStudent 2024-07-11 10:52:59 +02:00
cgfhtw e79a70fc2f Betriebsmittel: stabilized 2024-07-09 14:06:29 +02:00
Alexei Karpenko 1a8a7cc260 prestudent model gethistoryprestudent: added order by for insertamum, ext_id 2024-07-08 12:42:32 +02:00
Cris 4d48dfe018 Added method getLvsByStudiensemesterAndOes to Lehrveranstaltung_model.php 
getLvsByStudiensemesterAndOes: Gets Lehrveranstaltungen with its Stg, OE and OE-type and filters by Studiensemester and Organisationseinheiten if necessary.
 2024-07-08 12:26:41 +02:00