changed module model and fixed empty name in event while fetch

This commit is contained in:
Elmar Kresse
2023-09-30 21:44:43 +02:00
parent 86f2636681
commit b1927864c2
5 changed files with 31 additions and 42 deletions

View File

@@ -5,6 +5,7 @@ import (
"github.com/pocketbase/pocketbase"
"github.com/pocketbase/pocketbase/models"
"htwkalender/model"
"htwkalender/service/functions"
"log"
)
@@ -39,7 +40,7 @@ func SaveEvents(seminarGroup []model.SeminarGroup, collection *models.Collection
record.Set("Week", event.Week)
record.Set("Start", event.Start)
record.Set("End", event.End)
record.Set("Name", event.Name)
record.Set("Name", functions.ReplaceEmptyString(event.Name, "Sonderveranstaltungen"))
record.Set("EventType", event.EventType)
record.Set("Prof", event.Prof)
record.Set("Rooms", event.Rooms)
@@ -120,31 +121,14 @@ func GetAllModulesForCourse(app *pocketbase.PocketBase, course string, semester
return eventArray, nil
}
func GetAllModulesDistinct(app *pocketbase.PocketBase) ([]struct {
Name string
Course string
}, error) {
var events []struct {
Name string `db:"Name" json:"Name"`
Course string `db:"course" json:"course"`
}
func GetAllModulesDistinct(app *pocketbase.PocketBase) (model.Events, error) {
var events model.Events
var eventArray []struct {
Name string
Course string
}
err := app.Dao().DB().Select("Name", "course").From("events").Distinct(true).All(&events)
err := app.Dao().DB().Select("*").From("events").Distinct(true).All(&events)
if err != nil {
print("Error while getting events from database: ", err)
return eventArray, err
return nil, err
}
for _, event := range events {
eventArray = append(eventArray, struct {
Name string
Course string
}{event.Name, event.Course})
}
return eventArray, nil
return events, nil
}