 adisposkofh
|
c34a74c040
|
reservierung model table alias fix
|
2026-09-22 14:16:31 +02:00 |
|
|
adisposkofh
|
aaf8dd16ef
|
merged feature-78456/MeineReservierungenUebersichtCis4 into cis40_2026-05_ma_rc_routerlink_merge-playground-2026-09
|
2026-09-16 15:08:23 +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
|
7910cf3055
|
Merge branch 'master' into cis40_2026-05_ma_rc
|
2026-08-13 17:36:38 +02:00 |
|
|
Johann Hoffmann
|
67bbe9c105
|
new cis4 page "MyReservations" as new adaptation of cis/private/lvplan/stpl_reserve_list.php;
|
2026-08-13 16:37:03 +02:00 |
|
|
adisposkofh
|
b2af8587c2
|
displaying reservation group information
|
2026-08-12 13:27:07 +02:00 |
|
|
adisposkofh
|
4e67d7b765
|
fixed issue with unresponsive reservation delete buttons in widget and my lv plan
|
2026-08-10 13:21:48 +02:00 |
|
|
ma0048
|
c233902fe2
|
Merge remote-tracking branch 'origin/feature-70746/lvverwaltung_lektorentausch' into feature-77372/lv_verwaltung_release_fine_tuning
# Conflicts:
# application/libraries/LektorLib.php
|
2026-07-15 09:20:57 +02:00 |
|
|
adisposkofh
|
d9ea5a95af
|
fixed issue with undefined reservierung attributes
|
2026-05-11 15:04:32 +02:00 |
|
|
Harald Bamberger
|
cffa493984
|
Merge branch 'feature-68301/cis4_ma_raumreservierung' into cis40_2026-05_ma_rc
|
2026-05-04 18:17:53 +02:00 |
|
|
adisposkofh
|
f1c3c8296f
|
implemented 'OtherLvPlan' to view other users' timetables
|
2026-04-13 10:41:41 +02:00 |
|
|
ma0048
|
e26387a75a
|
lektoren tausch auch bei verplanten lektoren hinzugefuegt
|
2026-01-19 15:08:59 +01:00 |
|
|
ma0048
|
8f9f447acf
|
cis4 raumreservierung beta version
|
2025-12-18 11:08:40 +01:00 |
|
|
Harald Bamberger
|
d148eaed11
|
ReservierungModel getRerservierungenMitarbeiter remove unused paramter ort_kurzbz, StundenplanLib only query reservations for logged in user if request is for the personal lv plan aka if ort_kurbz is empty
|
2025-10-01 16:19:15 +02:00 |
|
|
SimonGschnell
|
c080d1abb2
|
refactor(Rename Stundenplan to LvPlan):renames all methods and files from Stundenplan to LvPlan
|
2025-06-10 11:46:19 +02:00 |
|
|
Johann Hoffmann
|
4936cfd61c
|
added roomInfo to app routes & remove old views; stundenplan reservierungen for MA working WIP roomInformation/roomContent link from lvinfo event ort_kurzbz;
|
2025-02-10 17:05:27 +01:00 |
|
|
Harald Bamberger
|
d4494836b1
|
fix file permissions erroneously commited as a21a292da6
|
2024-10-17 15:34:00 +02:00 |
|
|
SimonGschnell
|
f2a57f85a8
|
fixes the errors with the stundenplan/reservierungen data query
|
2024-09-11 10:19:46 +02:00 |
|
|
SimonGschnell
|
ac35ba3e27
|
puts the logic that adds the object informtion to the json reponse in the controllers instead of the models
|
2024-09-11 09:50:04 +02:00 |
|
|
SimonGschnell
|
1de658ace6
|
fixes the query for the reservierungen in the stundenplan and in the raum informations
|
2024-09-11 09:32:28 +02:00 |
|
|
SimonGschnell
|
715b8075b8
|
reworks the query for the reservierungen stundenplan/room
|
2024-09-10 12:30:40 +02:00 |
|
|
SimonGschnell
|
122673d291
|
gets rid of the stunden dependency and uses the beginn and ende property of the queried events
|
2024-09-06 11:20:20 +02:00 |
|
|
SimonGschnell
|
8376e8b92d
|
bundles the room_events and the reservierungen api calls together with Promise.allSettled
|
2024-09-06 11:02:14 +02:00 |
|
|
SimonGschnell
|
f9b69fe08c
|
changes how the reservierungen are fetched from the database to have the same information as the room events
|
2024-09-05 14:57:57 +02:00 |
|
|
SimonGschnell
|
e33162d20e
|
changes the structure of the JSON data from the stundenplan
|
2024-09-04 14:59:56 +02:00 |
|
|
SimonGschnell
|
9c51f25c9e
|
modifies how the slot template from the Calendar Page is passed to the CalendarApp and prints the reservierungen differently (but the reservierungen are not grouped yet)
|
2024-06-11 15:03:09 +02:00 |
|
|
SimonGschnell
|
022ad26dd2
|
reservierungen query also joins the studiengangs and mitarbeiter information
|
2024-06-10 13:01:55 +02:00 |
|
|
SimonGschnell
|
392d8f38d2
|
adding the reservierungen to the room plannung
|
2024-06-10 11:39:16 +02:00 |
|
|
SimonGschnell
|
a21a292da6
|
dokument upload
|
2024-01-29 16:48:41 +01:00 |
|
|
cgfhtw
|
0f60ab2a54
|
Stundenplan & Calendar
|
2023-02-06 08:43:43 +01:00 |
|
|
Paminger
|
6836c3608d
|
Models
|
2016-05-04 07:05:23 +02:00 |
|