Andreas Österreicher
0c4d102850
Merge branch 'bug-83698/StudVW_Projektarbeit_Kontaktdaten'
2026-10-07 09:11:42 +02:00
Andreas Österreicher
88b49b70e9
Fehlermeldung korrigiert beim Endupload wenn Zweitbetreuer keine E-Mail hinterlegt hat
2026-10-06 14:47:45 +02:00
Harald Bamberger
efc8fa1eeb
Merge branch 'master' into feature-83444/lvverwaltung_suche_nach_le_und_lv_inkl_router
2026-10-06 10:27:46 +02:00
Harald Bamberger
4ba2869632
Merge branch 'master' into bugfix-83059_incorrect-ical-semester-parameters
2026-10-05 11:22:59 +02:00
Manuela Thamer
3034615455
fix pagelock of modals
...
prevent editing contact data of employees
2026-10-01 17:27:54 +02:00
Harald Bamberger
76a8e00edf
Merge branch 'master' into feature-77757/WidgetsBerechtigung
2026-09-30 15:23:08 +02:00
ma0048
e369a8c03f
LV-Verwaltung:
...
- Semester unter Orgform im Verbandsbaum
- Kombinierte LV/LE-Suche
- Semester/Orgform/Lehrform in Suchergebnissen
2026-09-28 08:42:37 +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
d33b45d7cb
Merge branch 'bhdev_backport_compat'
2026-09-23 14:58:26 +02:00
Andreas Österreicher
2050f5ae65
Merge branch 'feature-75891/Electronic_Onboarding_Infocenter_Tool'
2026-09-23 11:14:01 +02:00
Andreas Österreicher
5ec1a1c54c
Merge branch 'feature-77686/infocentertool_status_setzen_fuer_zgv_pruefung_soll_message_ausloesen'
2026-09-23 10:56:54 +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
ma0048
faad2c4a9a
lv auch anzeigen wenn keine lvteile in dem semester dran haengen
...
phrasen hinzugefuegt
2026-09-18 12:34:47 +02:00
Alexei Karpenko
0dadaece08
Merge branch 'master' into feature-75891/Electronic_Onboarding_Infocenter_Tool
2026-09-16 16:59:09 +02:00
ma0048
2ffaf36270
suche fuer lehreinheiten und lehrveranstaltungen in der lvverwaltung
2026-09-15 15:46:48 +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
Alexei Karpenko
073160dde4
Merge branch 'master' into feature-75891/Electronic_Onboarding_Infocenter_Tool
2026-09-10 20:08:08 +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
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
Harald Bamberger
92d27fc242
Merge branch 'master' into feature/78128-quick-copy-full-name-and-title
2026-08-18 14:52:41 +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
Harald Bamberger
10218305db
Merge branch 'bug-78116/StudStatus_sendStglSammelmail_empty_list'
2026-08-11 10:40:26 +02:00
ma0068
31bae9b693
use function getStgAndDetails instead of getStgAndSem
2026-08-11 09:48:17 +02:00
adisposkofh
59ac56374e
removed redundant response meta used for dev
2026-08-11 09:44:41 +02:00
adisposkofh
a397460e0e
Merge branch 'master' into feature/78128-quick-copy-full-name-and-title
2026-08-11 09:43:27 +02:00
Harald Bamberger
046a552f34
Merge branch 'master' into feature-76995/StudStatusModal_Hinweis_Beratungsgespraech_bei_Abmeldung
2026-08-11 08:11:55 +02:00
Harald Bamberger
e8a534f0fe
Cis MyLv Endpoints only require logged in user
2026-08-11 07:52:02 +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