Ivymaster
545316aea2
Merge branch 'feature-68298/Tempus_Grundstruktur' into test-83711/Tempus_Automatisierte_Tests
2026-10-15 10:56:39 +02:00
ma0048
3dec37f171
Make reservation participants editable
...
Shared modal components (time, room, collision, tags, participants)
Jump to collisions
Fix: semester 0 for Lehrverband groups
2026-10-14 14:51:43 +02:00
ma0048
9993f3b96e
filtervar for isCollisionCheckEnabled
2026-10-14 11:27:12 +02:00
Ivymaster
8a2d7f9ae4
BUG: Added conflict checking and max daily limit ofr lecturere and student month view
2026-10-14 10:30:49 +02:00
Ivymaster
8b4a67ed60
BUG: Minor revert
2026-10-14 10:05:12 +02:00
Ivymaster
b1fb9624ee
WIP
2026-10-14 09:50:54 +02:00
Ivymaster
d70a5cc731
Conflicts resolved
2026-10-13 11:03:27 +02:00
ma0048
83d8884df3
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# application/models/education/Lehreinheit_model.php
2026-10-06 12:57:38 +02:00
ma0048
6ae321280e
- Listenansicht hoehe der Tabelle auf 100%
...
- Listenansicht "status" Delete entfernt, Button gelassen
- Tags ohne Dialog & Popaus aus dem Kontextmenue entfernt
- Einstellung Prioraum verwenden Raumauswahl anzeigen als Dropdown
- Sortierung der Raeume im Event
- Reservierung anzeigen wenn STG Filter gesetzt ist
- Course Picker kuerzen von Events erst nach Confirm
- Fehlende Phrasen hinzugefuegt
2026-10-06 12:53:40 +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
643929a0c6
add cis4 class to body to make it harder for cms content style sheets to override padding, add names to calendar events renderer components, show lvmenu not only for route MyLvPlan but e.g. also in Dashboard LvPlan Widget
2026-10-05 17:56:57 +02:00
Harald Bamberger
4ba2869632
Merge branch 'master' into bugfix-83059_incorrect-ical-semester-parameters
2026-10-05 11:22:59 +02:00
ma0048
07f258248b
Merge branch 'master' into feature-68298/Tempus_Grundstruktur
...
# Conflicts:
# system/dbupdate_3.4.php
2026-10-01 14:02:32 +02:00
ma0048
70ea307f88
fixed qry fuer freie raeume
2026-10-01 12:52:39 +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
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
587e523990
Merge branch 'feature-67251/infocenter_zum_reihungstest_freigegeben_neue_spalte_eqk'
2026-09-23 11:03:20 +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
50951dfdcf
anrechnungen: add pdf file extension to content disposition filename
2026-09-22 13:00:28 +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
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
Ivymaster
bf050c9297
Dropped calender group id column from notizzuordnung and update migrateKalender commands
2026-09-17 11:02:35 +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
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
ma0048
c90f7a31bb
columns hinzugefuegt: insertvon/updatevon insertamum/updateamum
2026-09-11 12:03:06 +02:00
Harald Bamberger
c8c7d1566c
Merge branch 'master' into bugfix-83059_incorrect-ical-semester-parameters
2026-09-11 11:43:23 +02:00
Alexei Karpenko
073160dde4
Merge branch 'master' into feature-75891/Electronic_Onboarding_Infocenter_Tool
2026-09-10 20:08:08 +02:00
Ivymaster
26b779e864
Conflicts resolved
2026-09-10 14:21:20 +02:00
ma0048
606c5143de
fix: deleting calendar events that have a location but no room
2026-09-10 13:15:00 +02:00
Andreas Österreicher
0b1e2ef919
Merge branch 'feature-78220/titel-tals-tag-migrieren' into feature-68298/Tempus_Grundstruktur
2026-09-10 12:59:27 +02:00
Ivymaster
21c8bbbf90
Added check before droping all imported kalender events
2026-09-09 14:21:17 +02:00
Ivymaster
3dd46fa997
Minor mod
2026-09-09 14:05:57 +02:00
Ivymaster
45b6c190b6
Conlflicts resolved
2026-09-09 13:21:17 +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
Ivymaster
9f4ca01068
BUG: Fixed issue with refreshing and importing kalender events
2026-09-09 09:34:15 +02:00
Manuela Thamer
52f24645fb
update link StudVW
2026-09-08 14:23:59 +02:00
Ivymaster