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
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
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
75d2cabdbe
bugfix lv-plan
2026-08-20 15:10:26 +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
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
Harald Bamberger
736e897928
fix automated tags not found in stv search
2026-08-06 16:23:54 +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
adisposkofh
b427788e04
renamed tabulator presets-related phrases
2026-08-03 17:02: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
chfhtw
2b4aef5633
Merge branch 'feature-77417/studvw-tags-formatter-and-header-filter' into studvw_lvvw_2026_08_rc
2026-07-31 12:52:29 +02:00
adisposkofh
d1ca6eb988
reworked other lv plan view data controller using profil library
2026-07-29 11:28:13 +02:00
adisposkofh
be4db980ad
fixed issue with displayed locked profile images in other lv plan
2026-07-29 11:17:03 +02:00
ma0048
4e16220da1
Merge remote-tracking branch 'origin/feature-75959/StudVw_Automatische_Tags' into studvw_lvvw_2026_08_rc
...
# Conflicts:
# application/controllers/api/frontend/v1/stv/Students.php
2026-07-29 09:53:48 +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
chfhtw
0e099b2752
Remove deprecated files and lv_favorites variable
2026-07-24 14:05:50 +02:00
chfhtw
e7d2d3502b
Allow callables in $redirect_method
2026-07-22 16:45:23 +02:00
chfhtw
f46a3c1f68
LvVerwaltung: add routes for orgform and adapt endpoint to accept lower case orgform_kurzbz
2026-07-22 10:36:38 +02:00
Harald Bamberger
22b1f2822a
fix typo
2026-07-21 14:45:07 +02:00
Harald Bamberger
1fd15e14d5
Merge branch 'master' into feature-76160/StudVw_Verbandsbaum_durch_Extensions_erweiterbar_machen
2026-07-21 14:06:04 +02:00
Harald Bamberger
6c25a3b262
Merge branch 'feature-77537/Studvw_Feedback' into studvw_2026_05_rc_tags
2026-07-17 11:38:46 +02:00
Harald Bamberger
362d1c8bb0
Merge branch 'studvw_2026_05_rc' into studvw_2026_05_rc_tags
2026-07-17 11:22:50 +02:00
Harald Bamberger
25a61a56b7
Merge branch 'master' into studvw_2026_05_rc
2026-07-17 11:22:20 +02:00
Harald Bamberger
afb210b0c2
Merge branch 'master' into studvw_2026_05_rc
2026-07-17 11:21:24 +02:00
ma0068
35decf476c
make fields deletable with keyboard: Konto Buchungsdatum, Prüfung Datum, Abschlussprüfung Datum und Sponsion, Mobilität von und bis
2026-07-17 09:12:02 +02:00
ma0068 and Harald Bamberger
fd1b5daf9c
enable deletion of zgv and zgv master date with null and empty string
2026-07-16 14:51:38 +02:00
Harald Bamberger
c0b5f2f748
add permission to DetailHeader function for use in pv21
2026-07-16 12:58:00 +02:00
chfhtw
f65135be1e
For each treemenu seperate favorites
2026-07-15 16:18:19 +02:00
ma0048
e9312dfbb3
lvverwaltung new release
2026-07-15 11:35:37 +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
chfhtw
52c90111cc
Add treemenu to lvverwaltung
2026-07-15 11:01:03 +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
Harald Bamberger