Harald Bamberger
b97dec7343
Merge branch 'master' into cis40_2026-09_ma_rc
2026-10-05 13:11:02 +02:00
adisposkofh
c4e79ffdf9
filtering selectable semesters in range view depending on user age
2026-09-23 16:17:45 +02:00
adisposkofh
dfaaabfc2a
implemented permissions controller, reworked news admin permissions into api call
2026-09-17 18:05:24 +02:00
adisposkofh
fc89a25d3a
merged feature-78293/news into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
2026-09-16 16:31:56 +02:00
adisposkofh
aaf8dd16ef
merged feature-78456/MeineReservierungenUebersichtCis4 into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
2026-09-16 15:08:23 +02:00
adisposkofh
7ea80395a8
merged feature-78497/Cis4StudiumStgInfoBlock into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
2026-09-16 14:43:10 +02:00
adisposkofh
67f30c7765
fixed issue with wrong semester displayed and wrong ical dates used in my lv plan
2026-09-09 11:30:43 +02:00
Johann Hoffmann
f15349029f
WIP stg info sidebar in cis4 studium
2026-09-02 09:30:57 +02:00
Ivymaster
7275d6e897
Minor mods
2026-08-31 15:49:05 +02:00
Ivymaster
6f3c0fb174
WIP
2026-08-25 17:22:44 +02:00
Ivymaster
708ffac47e
WIP
2026-08-20 17:05:38 +02:00
Harald Bamberger
cabda4cc35
Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc
2026-08-20 08:13:30 +02:00
Harald Bamberger
a5d4629f07
Merge branch 'cis40_2026-05_ma_rc_78461_reservation_group_options' into cis40_2026-05_ma_rc
2026-08-20 07:48:18 +02:00
Harald Bamberger
16166db31a
Merge branch 'feature-77048/CIS4_MA_Widget_Studstatus' into cis40_2026-05_ma_rc
2026-08-20 07:46:02 +02:00
Harald Bamberger
37d9ef66ed
Merge branch 'features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster' into cis40_2026-05_ma_rc
2026-08-20 07:38:16 +02:00
Harald Bamberger
b80805e09c
Merge branch 'cis40_2026-05_ma_rc' into cis40_2026-05_ma_rc_78461_reservation_group_options
2026-08-18 18:22:20 +02:00
ma0068
9a592047a0
merge feature-70747/Zeitsperren_auf_VueJs_Portieren into feature-77941/CIS_MA_Zeitsperren_Portieren
2026-08-18 13:54:02 +02:00
ma0068
e6947a3246
merge master into feature-77941/CIS_MA_Zeitsperren_Portieren
2026-08-18 12:04:28 +02:00
Harald Bamberger
7910cf3055
Merge branch 'master' into cis40_2026-05_ma_rc
2026-08-13 17:36:38 +02:00
adisposkofh
ab1c8e63ee
fetching actual semester/verband/gruppe options for reservation creation form
2026-08-13 16:55:16 +02:00
Johann Hoffmann
67bbe9c105
new cis4 page "MyReservations" as new adaptation of cis/private/lvplan/stpl_reserve_list.php;
2026-08-13 16:37:03 +02:00
Johann Hoffmann
97be497fda
refactored the core pruefungslogic to revolve around PruefungsverlaufLib.php instead of tbl_pruefungstyp which was highly inflexible for any adjustments. could be reused in Stv/Pruefungen aswell since there invalid inserts are very much possible; typen are still being used but are irrelevant for sequencing the attempts correctly; incorporated kommissionelle Pruefung into Gesamtnoteneingabe as the last possible antritt a student makes; updated cypress suites accordingly and added some ui tests aswell; documented usage in a readme_benotungstool.txt for the suite;
2026-08-11 17:35:06 +02:00
adisposkofh
475b6210e0
displaying room additional info in reservations window
2026-08-10 15:02:12 +02:00
Johann Hoffmann
c9c92f82d3
WIP refactor
2026-08-06 10:33:46 +02:00
Ivymaster
d57985b90a
Add dedicated max alter params for frontend reqs
2026-08-05 14:12:29 +02:00
ma0068
0a46bf52dd
- neue funktion loadZeitsperrenforUid
...
– route für maUid
- Zeitsperren als Cis-App
– link für Zeitsperren maUid in Mitarbeiterprofil
- component ZeitsperrenMitarbeiterUid
- Dropdown oes:show only active Oes
2026-08-04 08:00:40 +02:00
Harald Bamberger
e9fc0629f5
Merge branch 'feature/76688-general-tabulator-issues_77080-persistence' into studvw_lvvw_2026_08_rc_77973
2026-08-03 16:06:34 +02:00
Harald Bamberger
9b0607ca74
use refactored routes
2026-07-31 16:34:32 +02:00
ma0068
55dc2b26d2
refactor listsZeitsperren
...
add phrases
remove logs
add watcher for type
show table in view lectorStg and byOe only if selectedValue exists
2026-07-30 11:01:23 +02:00
Harald Bamberger
aa52c32d40
Merge branch 'feature-77372/lv_verwaltung_release_fine_tuning' into studvw_lvvw_2026_08_rc
2026-07-28 15:50:06 +02:00
Harald Bamberger
02a97fb0e2
Merge branch 'feature-76160/StudVw_Verbandsbaum_durch_Extensions_erweiterbar_machen' into studvw_2026_08_rc
2026-07-28 15:35:54 +02:00
adisposkofh
89ea4187fa
merged master into
2026-07-27 15:58:08 +02:00
Johann Hoffmann
4e6a2d5218
Merge branch 'master' into feature-60873/GesamtnoteneingabeCis4
...
# Conflicts:
# application/config/routes.php
# application/controllers/api/frontend/v1/Lehre.php
# application/views/CisRouterView/CisRouterView.php
# cis/private/lehre/notenliste.xls.php
# public/js/api/factory/lehre.js
# public/js/apps/Cis/Cis.js
# public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
# public/js/helpers/StringHelpers.js
# system/phrasesupdate.php
2026-07-27 15:41:29 +02:00
chfhtw
0e099b2752
Remove deprecated files and lv_favorites variable
2026-07-24 14:05:50 +02:00
ma0068
e876b9e4ab
Zeitsperren Mitarbeiter - add component to Vertragsverwaltung
2026-07-24 13:11:40 +02:00
Johann Hoffmann
32de4aac6b
assistenz recht & features gesamtnoteneingabe; load stg array for assistenzen to choose any lva from; added configurable datelimit for each semester with defaults as per upcoming prüfungsordnung;
2026-07-23 16:59:40 +02:00
chfhtw
542590b470
Remove comment
2026-07-20 09:26:31 +02:00
chfhtw
f65135be1e
For each treemenu seperate favorites
2026-07-15 16:18:19 +02:00
ma0048
b21900d006
Merge remote-tracking branch 'origin/feature-70656/lvverwaltung_gruppen_im_baum_und_drag_and_drop' into feature-77372/lv_verwaltung_release_fine_tuning
2026-07-15 11:27:48 +02:00
ma0048
012571d070
Merge remote-tracking branch 'origin/feature-69453/lv_verwaltung_karteireiter_noten' into feature-77372/lv_verwaltung_release_fine_tuning
...
# Conflicts:
# public/js/components/Stv/Studentenverwaltung/Details/Noten/Teacher.js
# public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js
2026-07-15 09:43:53 +02:00
ma0048
a2d10ae09d
Merge remote-tracking branch 'origin/feature-69454/lvverwaltung_karteireiter_lv_termine' into feature-77372/lv_verwaltung_release_fine_tuning
...
# Conflicts:
# application/controllers/api/frontend/v1/LvPlan.php
# public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js
2026-07-15 09:32:03 +02:00
ma0048
c233902fe2
Merge remote-tracking branch 'origin/feature-70746/lvverwaltung_lektorentausch' into feature-77372/lv_verwaltung_release_fine_tuning
...
# Conflicts:
# application/libraries/LektorLib.php
2026-07-15 09:20:57 +02:00
Harald Bamberger
7e6d670d82
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
2026-07-13 14:32:51 +02:00
Harald Bamberger
b5e65cf072
Merge branch 'master' into studvw_2026_05_rc
2026-07-08 16:42:04 +02:00
Harald Bamberger
38447e2217
Merge branch 'master' into cis40_2026-05_ma_rc
2026-07-08 15:36:34 +02:00
chfhtw
5bed848aae
Merge branch 'master' into feature-76160/StudVw_Verbandsbaum_durch_Extensions_erweiterbar_machen
2026-07-08 09:43:58 +02:00
Harald Bamberger
5602c7091a
Merge branch 'feature/76688-general-tabulator-issues_76776-localization' into cis40_2026-02_rc_abgabetool_finetuning_76688
2026-07-08 07:17:24 +02:00
Harald Bamberger
0fd938e85c
Merge branch 'master' into feature/76688-general-tabulator-issues_76776-localization
2026-07-07 11:08:19 +02:00
Harald Bamberger
3f257af006
Merge branch 'feature-60873/GesamtnoteneingabeCis4' into cis40_2026-05_ma_rc
2026-07-03 14:35:20 +02:00
chfhtw
6428fccc48
Replace CoreRESTClient calls with $api calls in stv Studiensemester component and add logic to accept lowercase input (because it could come from the url)
2026-07-01 15:45:09 +02:00
Harald Bamberger