feat:#65 source code adjusted due to dep changes

This commit is contained in:
Elmar Kresse
2025-04-20 14:13:14 +02:00
parent 629a376176
commit c695eb6a1e
5 changed files with 82 additions and 23 deletions

View File

@@ -34,7 +34,7 @@ func GetRooms(app *pocketbase.PocketBase) ([]string, error) {
}
// get all rooms from event records in the events collection
err := app.Dao().DB().Select("Rooms", "course").From("events").Distinct(true).All(&events)
err := app.DB().Select("Rooms", "course").From("events").Distinct(true).All(&events)
if err != nil {
return nil, err
}
@@ -83,7 +83,7 @@ func GetRoomScheduleForDay(app *pocketbase.PocketBase, room string, date string)
var events []model.Event
// get all events from event records in the events collection
err := app.Dao().DB().Select("*").From("events").
err := app.DB().Select("*").From("events").
Where(dbx.Like("Rooms", room).Escape("_", "_")).
AndWhere(dbx.Like("Start", date)).
GroupBy("Week", "Start", "End", "Rooms").
@@ -94,6 +94,21 @@ func GetRoomScheduleForDay(app *pocketbase.PocketBase, room string, date string)
return events, nil
}
func GetRoomSchedule(app *pocketbase.PocketBase, room string) ([]model.Event, error) {
var events []model.Event
// get all events from event records in the events collection
err := app.DB().Select("*").From("events").
Where(dbx.Like("Rooms", room).Escape("_", "_")).
GroupBy("Week", "Start", "End", "Rooms").
All(&events)
if err != nil {
return nil, err
}
return events, nil
}
func GetRoomScheduleInTimeSpan(app *pocketbase.PocketBase, room string, from string, to string) ([]model.Event, error) {
var events []model.Event
@@ -107,7 +122,7 @@ func GetRoomScheduleInTimeSpan(app *pocketbase.PocketBase, room string, from str
}
// get all events from event records in the events collection
err = app.Dao().DB().Select("*").From("events").
err = app.DB().Select("*").From("events").
Where(dbx.Like("Rooms", room).Escape("_", "_")).
AndWhere(dbx.Between("Start", fromDate, toDate)).
GroupBy("Week", "Start", "End", "Rooms").
@@ -118,17 +133,3 @@ func GetRoomScheduleInTimeSpan(app *pocketbase.PocketBase, room string, from str
}
return events, nil
}
func GetRoomSchedule(app *pocketbase.PocketBase, room string) ([]model.Event, error) {
var events []model.Event
// get all events from event records in the events collection
err := app.Dao().DB().Select("*").From("events").
Where(dbx.Like("Rooms", room).Escape("_", "_")).
GroupBy("Week", "Start", "End", "Rooms").
All(&events)
if err != nil {
return nil, err
}
return events, nil
}