mirror of
https://gitlab.dit.htwk-leipzig.de/htwk-software/htwkalender.git
synced 2025-08-02 17:59:14 +02:00
[#43] Bugfix
This commit is contained in:
@@ -43,7 +43,11 @@ func GetRoomScheduleForDay(app *pocketbase.PocketBase, room string, date string)
|
|||||||
var events []model.Event
|
var events []model.Event
|
||||||
|
|
||||||
// get all events from event records in the events collection
|
// get all events from event records in the events collection
|
||||||
err := app.Dao().DB().Select("*").From("events").Where(dbx.Like("Rooms", room)).AndWhere(dbx.Like("Start", date)).All(&events)
|
err := app.Dao().DB().Select("*").From("events").
|
||||||
|
Where(dbx.Like("Rooms", room).Escape("_", "_")).
|
||||||
|
AndWhere(dbx.Like("Start", date)).
|
||||||
|
GroupBy("Week", "Start", "End", "Rooms").
|
||||||
|
All(&events)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
print("Error while getting events from database: ", err)
|
print("Error while getting events from database: ", err)
|
||||||
return nil
|
return nil
|
||||||
@@ -67,7 +71,7 @@ func GetRoomSchedule(app *pocketbase.PocketBase, room string, from string, to st
|
|||||||
|
|
||||||
// get all events from event records in the events collection
|
// get all events from event records in the events collection
|
||||||
err = app.Dao().DB().Select("*").From("events").
|
err = app.Dao().DB().Select("*").From("events").
|
||||||
Where(dbx.Like("Rooms", room)).
|
Where(dbx.Like("Rooms", room).Escape("_", "_")).
|
||||||
AndWhere(dbx.Between("Start", fromDate, toDate)).
|
AndWhere(dbx.Between("Start", fromDate, toDate)).
|
||||||
GroupBy("Week", "Start", "End", "Rooms").
|
GroupBy("Week", "Start", "End", "Rooms").
|
||||||
All(&events)
|
All(&events)
|
||||||
|
Reference in New Issue
Block a user