Johann Hoffmann
754e619e30
Merge branch 'master' into feature-83650/cis40_2026-05_ma_rc_LE_optional_4_PA_fix
...
# Conflicts:
# application/models/education/Projektarbeit_model.php
# public/js/apps/Cis/Cis.js
# public/js/components/Cis/Compat.js
# system/dbupdate_3.4.php
# system/phrasesupdate.php
2026-09-24 11:25:31 +02:00
Harald Bamberger
15c1da74a2
CisMenu: do not overwrite calculated url if menuitem is multiple times in menu tree
2026-09-23 16:09:42 +02:00
Harald Bamberger
8b44e4475b
Merge branch 'master' of github.com:FH-Complete/FHC-Core into bhdev_backport_compat
2026-09-22 16:51:34 +02:00
Harald Bamberger
d251987850
backport compat controller and component
2026-09-22 16:50:56 +02:00
Harald Bamberger
ba92eea7eb
studvw: fix lvtermine student_lehrverband
2026-09-22 14:09:51 +02:00
Harald Bamberger
8eb27b194f
add target attribute to redirect content menu entries, use entry target attribute if set when rendering cis4 menu
2026-09-18 17:12:30 +02:00
Harald Bamberger
75c341d983
Merge branch 'master' into cis40_2026-05_ma_rc
2026-09-16 10:55:13 +02:00
Johann Hoffmann
69fd223358
fix load projektarbeit.studiensemester_kurzbz for fetchProjektarbeitById in order to query getDefaultStundensaetze successfully
2026-09-15 11:49:19 +02:00
Harald Bamberger
9c43374267
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
2026-09-15 07:53:10 +02:00
adisposkofh
80e17e264a
merged cis40_2026-05_ma_rc into
2026-09-14 17:08:15 +02:00
Harald Bamberger
6dfe292776
API LV: extend regex to allow studiengang_kz 0
2026-09-14 11:09:45 +02:00
Andreas Österreicher
1bf2b707ef
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
2026-09-09 09:43:11 +02:00
Andreas Österreicher
bf29faa5a7
Merge branch 'feature-82292/Cis4StudiumLVohneModulAnzeigen'
2026-09-02 15:20:28 +02:00
chfhtw
cc9d1f983e
bugfix: missing call to getStudiensemesterKurzbz
2026-09-01 10:39:02 +02:00
Johann Hoffmann
57c48f2c4a
cis4 studium page dont filter away lehrveranstaltungen without a module and give them their own box in the ui;
2026-08-26 13:15:16 +02:00
Andreas Österreicher
e32691994c
Merge branch 'master' into feature-75469/LeOptional4Projektarbeit
2026-08-26 08:21:30 +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
Harald Bamberger
1bbea69139
refine menuItem content check
2026-08-21 11:41:21 +02:00
Harald Bamberger
d639ec5e70
Merge branch 'features-777941-70747/Zeitsperren_Zeitsperrenma_mergedMaster' into cis40_2026-05_ma_rc
2026-08-21 08:35:01 +02:00
Harald Bamberger
c6b1d518cf
use correct model name
2026-08-21 08:34:40 +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
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
Harald Bamberger
84c99d23cd
Merge branch 'master' into cis40_2026-05_ma_rc
2026-08-18 18:11:15 +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
adisposkofh
ab1c8e63ee
fetching actual semester/verband/gruppe options for reservation creation form
2026-08-13 16:55:16 +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
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
adisposkofh
59ac56374e
removed redundant response meta used for dev
2026-08-11 09:44:41 +02:00
adisposkofh
108f91ea1a
quick copy option on full name and title in profile and other lv plan
2026-08-10 17:09:31 +02:00
adisposkofh
475b6210e0
displaying room additional info in reservations window
2026-08-10 15:02:12 +02:00
Harald Bamberger
736e897928
fix automated tags not found in stv search
2026-08-06 16:23:54 +02:00
ma0068
0d5c898106
add routes for types all, fix, lector, oe, stg and ass
...
remove component from vertragsverwaltung
refactor component Zeitsperrenmitarbeiter_uid
phrase
view change table back from dark mode
add validations for params
2026-08-06 11:42:36 +02:00
Johann Hoffmann
c9c92f82d3
WIP refactor
2026-08-06 10:33:46 +02:00
Johann Hoffmann
56fcb23275
WIP
2026-08-04 17:40:07 +02:00
Johann Hoffmann
dba199b531
Merge remote-tracking branch 'origin/master' into feature-60873/GesamtnoteneingabeCis4
2026-08-04 15:31:19 +02:00
Johann Hoffmann
193dd166c3
finalizing current state of benotungstool api testsuite before touching implementation again; access suite and pruefungstermin suite have a few known failing tests, rest should run fine on a freshly resetted database! reset with 'php system/setup_testinstance.php --setup' for wrapped db setup routine;
2026-08-04 14:05:17 +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
ecfe648bf5
Merge branch 'master' into studvw_lvvw_2026_08_rc_77973_76688
2026-08-03 19:36:18 +02:00
Harald Bamberger
2686aee158
avoid multiple assignments to one variable
2026-08-03 19:30:49 +02:00
Harald Bamberger
b7a2198057
Merge branch 'feature/76688-general-tabulator-issues_77080-persistence' into studvw_lvvw_2026_08_rc_77973_76688
2026-08-03 17:04:34 +02:00
Johann Hoffmann