adisposkofh
96104fd93a
fixed news model query syntax error
2026-09-22 14:37:12 +02:00
adisposkofh
c34a74c040
reservierung model table alias fix
2026-09-22 14:16:31 +02:00
adisposkofh
43b849e787
merged master into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
2026-09-22 13:44:49 +02:00
Harald Bamberger
579a55a00d
fix nested ternary operators
2026-09-17 14:18:10 +02:00
Andreas Österreicher
0a00caa1e4
Merge branch 'feature-82683/lvverwaltung_zusaetzliche_spalten_bei_lehrenden'
2026-09-17 14:00:07 +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
09f18d9039
merged cis40_2026-05_ma_rc_routerlink_ma0080 into
2026-09-15 17:03:03 +02:00
ma0048
c90f7a31bb
columns hinzugefuegt: insertvon/updatevon insertamum/updateamum
2026-09-11 12:03:06 +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
304870f18c
BUG: Fix active messages display
2026-08-31 12:36:27 +02:00
Ivymaster
a0ea54d0c0
Fixed bugs found during testing
2026-08-26 17:08:53 +02:00
Ivymaster
de627171d5
WIP
2026-08-26 14:46:49 +02:00
Andreas Österreicher
e32691994c
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
2026-08-26 08:21:30 +02:00
Ivymaster
6f3c0fb174
WIP
2026-08-25 17:22:44 +02:00
Harald Bamberger
6d641bbd06
pass in uid by reference
2026-08-24 13:56:55 +02:00
Harald Bamberger
9bf5bc2ad9
more generic bugfix, to use studentlehrverband only with date_range for the same studiensemester_kurzbz
2026-08-24 07:26:12 +02:00
Ivymaster
708ffac47e
WIP
2026-08-20 17:05:38 +02:00
Harald Bamberger
75d2cabdbe
bugfix lv-plan
2026-08-20 15:10:26 +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
b2213bff62
Merge branch 'bugfix-70747/excluding-zeitverfugbarkeit-zeitsperren-option' into features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster
2026-08-20 07:14:47 +02:00
Harald Bamberger
411d2192cb
Merge branch 'master' into features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster
2026-08-19 18:44:20 +02:00
Harald Bamberger
391bf296d7
Merge branch 'master' into cis40_2026-05_ma_rc
2026-08-19 18:41:29 +02:00
Cristina
0f843db33d
Merge branch 'master' into epic/LVEvaluierung-Neu
2026-08-19 13:34:53 +02:00
Ivymaster
ab854067eb
BUG: Fixing typos for frontend news issues
2026-08-19 09:09:47 +02:00
Harald Bamberger
8d9113d5c8
Merge branch 'master' into feature-77666/Details_anzeigen_der_Valorisierung_pro_Person
2026-08-19 08:06: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
Cristina
5e15d4b219
Add Distinct to getLeitung in Studiengang_model.php
...
Avoid multiple records for same active STGL.
e.g. double entries
2026-08-18 16:51:39 +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
adisposkofh
00f07ba6f0
excluding zeitverfugbarkeit option from zeitsperren dropdown
2026-08-14 14:13:03 +02:00
Harald Bamberger
7910cf3055
Merge branch 'master' into cis40_2026-05_ma_rc
2026-08-13 17:36:38 +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
46f8d0d07d
remove all remaining projektarbeit-lehreinheit joins across the codebase;
...
master merge reverted the LE removal in Projektarbeit_model -> re-applied that fix and went through every file that touches tbl_projektarbeit to find remaining issues.
Projektarbeit_model, stv Projektarbeit controller, Vertrag_model, vertrag.class, lehrauftragsliste_gst.xls.php, zeitaufzeichnung.class.php, sammelzeugnis.rdf.php, zeugnis.rdf.php, projektarbeit.rdf.php,
lehrauftrag.xml.php, personal_lektorenohnelehrauftrag.php, personal_generateverwendung.php
tbl_lehreinheit joins remain in tbl_lehreinheitmitarbeiter contexts where lehreinheit_id is always set.
2026-08-12 18:05:45 +02:00
adisposkofh
b2af8587c2
displaying reservation group information
2026-08-12 13:27:07 +02:00
Harald Bamberger
c81b5338de
Merge branch 'master' into feature-78292/dv_gehaltsbestandteil_ersteinstufung
2026-08-12 11:39:49 +02:00
Johann Hoffmann
9274743df3
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
...
# Conflicts:
# application/controllers/api/frontend/v1/Abgabe.php
# application/controllers/api/frontend/v1/stv/Projektarbeit.php
# application/models/education/Projektarbeit_model.php
# public/css/Studentenverwaltung.css
# public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js
# public/js/components/Cis/Abgabetool/AbgabetoolMitarbeiter.js
# public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektarbeit.js
# public/js/components/Stv/Studentenverwaltung/Details/Projektarbeit/Projektbetreuer.js
2026-08-12 11:26:51 +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
Werner Masik
d66fe72cc9
add field for salary adaption type (Ersteinstufung, indiv. Erhöhung, ..)
2026-08-11 11:18:36 +02:00
ma0068
31bae9b693
use function getStgAndDetails instead of getStgAndSem
2026-08-11 09:48:17 +02:00
adisposkofh
475b6210e0
displaying room additional info in reservations window
2026-08-10 15:02:12 +02:00
adisposkofh
4e67d7b765
fixed issue with unresponsive reservation delete buttons in widget and my lv plan
2026-08-10 13:21:48 +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
Johann Hoffmann
dba199b531
Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
2026-08-04 15:31:19 +02:00
adisposkofh