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
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
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
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
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
d6966b24fe
Merge branch 'master' into feature-39161/PV21_Valorisierung
2024-09-13 12:39:05 +02:00
0c4d1afded
Merge branch 'master' into feature-40953/LV-Template_Uebersichtsseite
...
# Conflicts:
# system/phrasesupdate.php
2024-08-21 13:46:41 +02:00
3963358d95
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-21 13:16:22 +02:00
30396b3f0e
Merge remote-tracking branch 'origin/feature-40728/Issues_logik_auslagern_in_eigene_library' into feature-39161/PV21_Valorisierung
2024-08-13 18:32:15 +02:00
8a9e040554
added Gehaltstyp model
2024-08-13 16:57:05 +02:00
e5217afc09
ZGV Ausstellungsstaat
2024-08-13 13:10:11 +02:00
7e302adf53
Bugfix in Prestudent model
2024-08-09 13:25:42 +02:00
ffabd681c8
setFirstStudent logic
2024-08-08 16:24:23 +02:00
f1a2ef25c7
Remove unused functions
2024-08-08 12:45:36 +02:00
59314ae0aa
correct rolle exists check
2024-08-07 15:56:07 +02:00
24d74dd332
correct student check
2024-08-07 15:51:19 +02:00
0621073f8d
correct checkIfExistingAufgenommenerstatus
2024-08-07 15:40:11 +02:00
1fc7f9d3e8
correct checkIfExistingBewerberstatus
2024-08-07 15:37:43 +02:00
ee78a94aa2
codesniff Prestudentstatus_model
2024-08-06 14:20:22 +02:00
7abe95ba5f
Adapted LvsByStudienplan query to retrieve also Lehreinheitgruppen
2024-08-06 10:48:20 +02:00
235a8a73e9
codessniff studentlehrverband_model
2024-08-06 08:49:23 +02:00
a728d20b70
codesniff Models
2024-08-06 08:42:20 +02:00
437fd64a6f
refactor setFunctions and processStudentlehrverband
2024-08-05 16:52:46 +02:00
b0821be465
Added methods getLastOrAktStudienjahr / getAktOrNextStudienjahr to retrieve the last or next Studienjahr during the summer term
2024-08-05 10:52:15 +02:00
90162ed2c9
refactor generate alias, add transaction to addStatus
2024-08-02 13:55:46 +02:00
9bec0c61de
Merge branch 'master' into feature-40319/SWB_Software-und-Lizenzanforderung
...
# Conflicts:
# system/phrasesupdate.php
2024-08-01 13:55:51 +02:00
3213c051b3
Adapted getLvsByStudienplan query to get by given Lehrveranstaltungen
2024-08-01 13:48:06 +02:00
6f0e46ac57
Status: Max Semester
2024-08-01 12:57:06 +02:00
085ca2a16d
Adapted getLvsByStudienplan query to get all LVs, not only VZ
2024-07-31 11:44:42 +02:00
3d27c68dee
adapt functions toolbarInteressent, Phrases
2024-07-31 09:06:42 +02:00
49bd14496a
Adapted db query to get Lehrveranstaltungen via Studienplan instead of Lehreinheit
2024-07-30 15:38:02 +02:00
dd23bc26a2
Improvements: Status delete
2024-07-30 09:57:37 +02:00
d4db49e09e
Status->isLastStatus corrected
2024-07-26 12:04:20 +02:00
0534ab4ac2
corrected Studienpläne Query
2024-07-25 15:51:30 +02:00
abc74b09b3
Merge branch 'master' into feature-40728/Issues_logik_auslagern_in_eigene_library
2024-07-24 21:15:40 +02:00
93b301ee08
Finish Status insert function
2024-07-24 13:24:15 +02:00
d9cba6bf5c
Check orgform student/bewerber
2024-07-24 08:45:48 +02:00
7498b327d4
dynamic Toolbars Interessent, Student, update actions interessent
2024-07-24 08:42:19 +02:00
Cris