ma0048
07f258248b
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# system/dbupdate_3.4.php
2026-10-01 14:02:32 +02:00
Harald Bamberger
76a8e00edf
Merge branch 'master' into feature-77757/WidgetsBerechtigung
2026-09-30 15:23:08 +02:00
ma0048
89fb90aef3
Added into ListView:
...
- Raumverschiebung
- Sichtbarkeitsstatus Änderung
- Tags hinzufügen/bearbeiten/löschen
ModalContent:
- Mailversandmöglichkeit
- Letzte Änderung der Zeitwünsche
- Anzahl Studierende
- Kollisionsinformation Details
- Tags des Eintrags anzeigen
- Anmerkungen zum LV-Teil
- Voller Name des Lehrenden
- Raumoptimierungs
- Sprung zur LV-Verwaltung (derzeit deaktiviert)
- Sprung zur Lehrveranstaltungsadminsitration (Vilesci)
- Lektor & Raum hinzufügen zum Filter
2026-09-29 11:12:41 +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
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
Ivymaster
e1af778d8f
Implemented custom table for kalender notiz, and added postgres triffer function for removing resources and stale notes
2026-09-11 14:27:17 +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
Ivymaster
02ff8d0e3c
Conflicts resolved
2026-09-02 15:01:56 +02:00
ma0048
90f62a7a9e
- merged master
...
- added raumvorschlag slots
2026-09-02 10:54:36 +02:00
ma0048
eeb49e1967
Merge remote-tracking branch 'origin/feature-78287/tempus_raumzuordnung' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# application/libraries/KalenderLib.php
# application/libraries/RaumvorschlagLib.php
2026-09-01 13:08:38 +02:00
ma0048
1361c3fc00
Merge remote-tracking branch 'origin/feature-78286/tempus_berechtigungen' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# application/controllers/api/frontend/v1/tempus/Coursepicker.php
# application/libraries/KalenderLib.php
2026-09-01 12:42:16 +02:00
ma0048
b91ba9fdbb
Merge remote-tracking branch 'origin/feature-78324/tempus_coursepicker_lektor' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# application/controllers/api/frontend/v1/tempus/Coursepicker.php
# public/js/components/Tempus/Coursepicker.js
2026-09-01 12:28:32 +02:00
ma0048
61ef27e5eb
Merge branch 'feature-77949/tempus_synchronisation' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# application/libraries/KalenderLib.php
# system/dbupdate_3.4.php
2026-09-01 12:20:12 +02:00
Ivymaster
61d7268f90
Conflicts resolved
2026-09-01 11:52:25 +02:00
chfhtw
cc9d1f983e
bugfix: missing call to getStudiensemesterKurzbz
2026-09-01 10:39:02 +02:00
ma0048
fb36b2a548
- merged master
...
- updaed Verbandsbaum to work with the new version
2026-08-31 14:58:27 +02:00
ma0048
51886960bb
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# application/controllers/api/frontend/v1/lv/StgTree.php
# public/js/components/Stv/Studentenverwaltung/Verband.js
# system/dbupdate_3.4.php
# tests/cypress/.gitignore
2026-08-31 12:49:28 +02:00
ma0048
98be0b43b7
- permissions geandert
2026-08-27 08:08:34 +02:00
ma0048
4cbf37d727
- ueberpruefung der berechtigung auf den studiengang von der lv beim verschieben/hinzufuegen/loeschen der lehreinheit
2026-08-27 08:07:39 +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
ma0048
8184555e12
location hinzugefuegt
...
raumlose planung aktivierbar/deaktivierbar
automatische zuteilung zum priorraum aktivierbar/deaktivierbar
raum zuteilung ueber dialog aktivierbar/deaktivierbar
2026-08-13 13:36:35 +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
ma0048
33b50bf479
course picker
...
- kurse vom lektor koennen angezeigt werden
- searchbar button hinzuefuegt um kurse vom lektor im course picker zu laden
2026-08-12 11:10:07 +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
Ivymaster
96526be231
Add kalender column rename from eindeutige_gruppen_id to eindeutige_kalender_gruppen_id
2026-08-06 13:43:20 +02:00
Ivymaster
a912fcf019
Add kalender column rename from eindeutige_gruppen_id to eindeutige_kalender_gruppen_id
2026-08-06 13:20:51 +02:00
ma0048
6282cb0402
hinzugefuegt:
...
- alle anzeigen option
- jetzt starten knopf
- oe rekursiv
2026-08-05 11:12:33 +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
ma0048
8636364c08
Merge branch 'feature-68298/Tempus_Grundstruktur' into feature-77949/tempus_synchronisation
...
# Conflicts:
# system/dbupdate_3.4.php
2026-08-03 12:31:07 +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
ma0048
cc3b47a10e
Raumzuteilung Entfernen / Hinzufuegen von Raeumen
...
Lehreinheiten entfernen
2026-07-31 10:34:15 +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