b549622f50
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
...
# Conflicts:
# application/models/organisation/Studiensemester_model.php
# system/phrasesupdate.php
2024-11-27 17:44:45 +01:00
c94a2d2d0c
Added param lehrveranstaltung_id to getTemplateLvTree method in Lehrveranstaltung_model.php and enhanced order
...
Now ordering extra templates to appear first and directly after the assigned lvs
2024-11-27 17:31:02 +01:00
1159b0dad5
Refactored getLvs method in Lehrveranstaltung_model.php
2024-11-27 17:28:54 +01:00
763d038b4c
fix(api/v1/Stundenplan/getStundenplan): fetches groups and studentlehrverbaende based on the date interval of the current and previous semesters
2024-11-21 12:19:22 +01:00
8a22eab0c8
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
2024-11-20 13:59:35 +01:00
ae94daa4a6
Added getStudienjahrByStudiensemester method to Studiensemester Model
2024-11-20 13:57:30 +01:00
933af94344
Added checkIsTemplate method to Lehrveranstaltung Model
...
Checks if given LV is a template (Quellkurs)
2024-11-20 13:55:11 +01:00
8d01995722
refactor(Studenplan Query):queries all studiensemester from start_date to end_date and matches the gruppen and studentlehrverbaende to the associated studiensemester in the query
2024-11-19 12:51:12 +01:00
1691c75a84
replace dependencies on legacy code with ci model functions
2024-11-07 19:18:08 +01:00
f68d18f0a8
Stundenplan Bugfix to also load Entries of Semester and Verband
2024-11-07 10:25:42 +01:00
eafbdcfffe
refactor(Cis Menu): changes method name and checks if the CIS4_MENU_ENTRY constant is defined
2024-11-04 13:39:13 +01:00
e78c2e1bf7
Merge branch 'master' into feature-25999/C4_cleanup
2024-10-30 17:19:01 +01:00
ff367339ea
makes MyLv more responsive
2024-10-29 14:31:20 +01:00
1e55b13546
force use of insertamum column from antrag table
2024-10-28 15:58:20 +01:00
8ba2a6852b
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
2024-10-22 11:04:07 +02:00
728e2f9b3a
fix getStundenplanQuery query building if benutzer gruppen are empty;
2024-10-21 13:48:32 +02:00
d4494836b1
fix file permissions erroneously commited as a21a292da6
2024-10-17 15:34:00 +02:00
0ab1ec1fc8
Merge branch 'master' into feature-25999/C4
2024-10-17 14:49:43 +02:00
e475fe568e
adds the dashboard menu punkt and adds greeting to the dashboard view
2024-10-17 09:58:28 +02:00
2f448ca2bc
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
...
# Conflicts:
# system/phrasesupdate.php
2024-10-16 09:44:50 +02:00
24ce443e95
nur die letzte komm oder zusaetzlichen komm Pruefung einer LV beruecksichtigen
2024-10-15 17:40:11 +02:00
439ae5113d
fix unterbrechung erstellen nicht möglich wenn ein abgelehnter unterbrechungsantrag existiert
2024-10-15 13:59:11 +02:00
14aa98c223
Merge branch 'master' into feature-25999/C4
2024-10-15 10:46:17 +02:00
e2cee7ffa3
Merge branch 'master' into feature-25999/C4
2024-10-15 10:44:56 +02:00
5774cb78c9
Merge branch 'feature-40816/Plausicheck_Anpassungen'
2024-10-15 10:28:38 +02:00
27e3f1d1bc
take status rejected into account when calculating available semster slots for unterbrechung
2024-10-14 15:40:25 +02:00
301466f944
Merge branch 'master' into feature-40816/Plausicheck_Anpassungen
2024-10-14 15:20:16 +02:00
0528f3b262
checks the size of the arrays before using the current method and does not allow mitarbeiter to access the student stundenplan
2024-10-14 11:32:23 +02:00
5359539a09
makes Stundenplan query BLAZINGLY fast
2024-10-10 20:59:55 +02:00
469867e98c
Studstatus: status "EmailVersandt" is not an active status
2024-10-10 12:37:57 +02:00
a2f70be7e4
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
2024-10-08 09:28:56 +02:00
b08e01f72f
Added columns to and moved where-clauses from _getQryLvsByStudienplan to calling methods in Lehrveranstaltung_model.php
...
.added cols lehrtyp_kurzbz and lehrveranstaltung_template_id
2024-10-07 16:37:07 +02:00
8744a00ce7
Added filter lehrtyp_kurzbz and $oe_column to getLvsByStudienplan in Lehrveranstaltung_model.php
...
.lehrtyp_kurzbz filters by Lehrtyp 'lv' or 'modul' (default no filter)
.oe_column is used when filtering $oes: Filter by lv.oe_kurzbz or stg.oe_kurzbz (the stg joined to lv)
2024-10-07 16:34:41 +02:00
11b0e770a2
Added filter lehrtyp_kurzbz to getAutocompleteSuggestions in Lehrveranstaltung_model.php
2024-10-07 16:29:53 +02:00
9dbb5291f4
- added limit
2024-10-03 11:17:09 +02:00
c754291c6d
Merge branch 'feature-20228/erfassung_internationalisierungsmassnahmen_beurteilung'
2024-10-03 10:42:00 +02:00
7f9352b820
prototyp fuer die Stundenplan query fuer Studierende
2024-10-02 13:25:39 +02:00
c461480d1d
stundenplanQuery optimization
2024-10-02 10:35:58 +02:00
f38b0cf78f
changes all the Headers from the CISHTML-Header to the CISVUE-Header
2024-09-30 11:58:20 +02:00
4a5a019841
loads the menu for the CISVUE-Header in the server side and not in the client side
2024-09-30 11:33:55 +02:00
be412abebc
Merge branch 'master' into feature-40896/kennzeichnung_unruly_person
2024-09-26 16:16:24 +02:00
b184cee975
Offset für das Laden von Geschaeftsjahren hinzugefügt
2024-09-24 12:40:12 +02:00
2d3643d1f0
Bismeldestichtag: added method for getting next Meldestichtag, loading data only after tabulator is ready
2024-09-20 16:04:27 +02:00
effad6f62d
only fetch person_id, vorname, nachname & unruly from tbl_person on checkUnruly()
2024-09-20 15:16:20 +02:00
79ea8c4521
renamed unrulyPerson api to checkPerson; built in logic into infoCenterDetails to trigger a number of checks about any changed data in the info center (in this case unruly) and update the page accordingly; Also fixed a bug when saving stammdaten without kontakt entries;
2024-09-17 14:09:49 +02:00
7c85e981f9
- absteigende sortierung endabgabe
2024-09-17 11:17:44 +02:00
585cec31e2
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
2024-09-16 16:20:51 +02:00
4836ed8de0
adds LvMenu to the CalendarModel WIP
2024-09-13 13:44:53 +02:00
d6966b24fe
Merge branch 'master' into feature-39161/PV21_Valorisierung
2024-09-13 12:39:05 +02:00
27c312d7d3
filterPerson unrulyPerson api & person model
2024-09-12 15:42:21 +02:00
Cris