aab0dd7fc7
Added / Adapted Model queries and api Controller regarding for Lehrveranstaltung- and Studienjahr Model
2025-03-06 09:40:40 +01:00
9a53880b9d
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
2025-01-28 13:58:58 +01:00
d9532d7607
Merge branch 'master' into feature-54841/DVs_Abhaengigkeit_zu_SAP_Extension_beseitigen
2025-01-21 13:40:26 +01:00
70b44c2202
Merge branch 'feature-40717/pep_faktor' into pep_deploy
...
# Conflicts:
# public/js/components/filter/Filter.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2024-12-13 11:50:53 +01:00
8127091e2e
- tags werden im fas nicht angezeigt
...
- class für tags hinzugefuegt
- prop confirmLimit hinzugefuegt
2024-12-11 13:25:38 +01:00
cc99d2b378
Gruppenmanagement: added checks so only Gruppenmanager can edit groups
2024-12-10 12:03:58 +01:00
ce2d69fc82
Vertragsbestandteil Model: check if sap sync table present before executing select for sap organisationseinheit
2024-12-06 13:05:35 +01:00
19b56ff252
- tags
...
- phrases
- stundensatzbydatum
- filter nur count
2024-12-03 12:36:54 +01:00
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
8983af4aef
refactor(Stundenplan_model/getStundenplanQuery):removes wrong comments
2024-11-25 19:59:39 +01:00
90bdb68175
fix(Stundenplan_model/getStundenplanQuery):changes how the OR sql statments are added to the query
2024-11-25 15:24:36 +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
45bc65d32a
- Tags testversion
...
- header tooltips
- lehre spalte markieren wenn altes semester
- legende-tab hinzugefuegt
2024-11-11 07:33:49 +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
9c637b8575
- added model
2024-11-04 12:20:52 +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
Cristina