diff --git a/controllers/templates.go b/controllers/templates.go index 6648603..4659e26 100644 --- a/controllers/templates.go +++ b/controllers/templates.go @@ -13,7 +13,6 @@ var Templates, _ = template.Must(template.ParseFiles( "templates/executeFailure.html", "templates/executeSuccess.html", "templates/footer.html", - "templates/head.html", "templates/index.html", "templates/officeHourTable.html", "templates/requestNotFound.html")). diff --git a/main.go b/main.go index 6499bcc..83e3065 100644 --- a/main.go +++ b/main.go @@ -40,7 +40,7 @@ func main() { roomRepo := repositories.NewRoomRepo(db) courseRepo := repositories.NewCourseRepo(db) tutorRepo := repositories.NewTutorRepo(db) - officeHourRepo := repositories.NewOfficeHourRepo(db, roomRepo, tutorRepo, courseRepo, conf) + officeHourRepo := repositories.NewOfficeHourRepo(db, roomRepo, tutorRepo, courseRepo) requestRepo := repositories.NewRequestRepo(db, officeHourRepo, conf) h := controllers.NewBaseHandler(roomRepo, officeHourRepo, courseRepo, tutorRepo, requestRepo, conf) diff --git a/repositories/officeHour.go b/repositories/officeHour.go index 5dff4a0..ff04b82 100644 --- a/repositories/officeHour.go +++ b/repositories/officeHour.go @@ -4,8 +4,6 @@ package repositories import ( "database/sql" "fmt" - "log" - "sprechstundentool/config" "sprechstundentool/models" ) @@ -14,16 +12,14 @@ type OfficeHourRepo struct { roomRepo *RoomRepo tutorRepo *TutorRepo courseRepo *CourseRepo - config config.Config } -func NewOfficeHourRepo(db *sql.DB, roomRepo *RoomRepo, tutorRepo *TutorRepo, courseRepo *CourseRepo, conf config.Config) *OfficeHourRepo { +func NewOfficeHourRepo(db *sql.DB, roomRepo *RoomRepo, tutorRepo *TutorRepo, courseRepo *CourseRepo) *OfficeHourRepo { return &OfficeHourRepo{ db: db, roomRepo: roomRepo, tutorRepo: tutorRepo, courseRepo: courseRepo, - config: conf, } } @@ -172,18 +168,14 @@ func (r *OfficeHourRepo) NumberByTimeSpanAndRoom(date models.Date, duration int, return 0, err } var count int - // iterate over all points in the new officehour to get the maximum parallel officehours - for minute := 0; minute < duration; minute += r.config.Date.MinuteGranularity { - var minuteCount int = 0 - for _, officeHour := range officeHours { - // increase count if officehour starts before this point in time and ends later - if models.DateLess(officeHour.Date, models.GetEndDate(date, minute, false)) && models.DateLess(models.GetEndDate(date, minute, false), models.GetEndDate(officeHour.Date, officeHour.Duration, false)) { - minuteCount += 1 - } + for _, officeHour := range officeHours { + if models.DateLess(models.GetEndDate(officeHour.Date, officeHour.Duration, false), date) || models.GetEndDate(officeHour.Date, officeHour.Duration, false) == date { + continue } - if minuteCount > count { - count = minuteCount + if models.DateLess(models.GetEndDate(date, duration, false), officeHour.Date) || models.GetEndDate(date, duration, false) == officeHour.Date { + continue } + count += 1 } return count, nil } diff --git a/templates/addFailure.html b/templates/addFailure.html index f160553..e032c42 100644 --- a/templates/addFailure.html +++ b/templates/addFailure.html @@ -1,8 +1,6 @@ - - + Sprechstunde anlegen - {{template "head.html" .}} Irgendetwas ist schief gegangen. Bitte sende folgende Daten an sprechstundentool@mathebau.de mit einer Beschreibung, was du tun wolltest. diff --git a/templates/addMask.html b/templates/addMask.html index 8fbca62..e4e4e2b 100644 --- a/templates/addMask.html +++ b/templates/addMask.html @@ -1,49 +1,49 @@ - - + Sprechstunde anlegen - {{template "head.html" .}}

{{range .Errors}}{{.}}
{{end}}

-
- : -
- : -
- :
- :
- :
- : -
- :
- :
- : -
- :
- -
+

+

+ : +
+ : +
+ :
+ :
+ :
+ : +
+ :
+ :
+ : +
+ :
+ +
+

{{if ne .Config.Tutor.MailSuffix ""}}Du musst hier eine Email-Adresse angeben, die auf „{{.Config.Tutor.MailSuffix}}“ endet.
{{end}} Außerdem dürfen in Räumen nur begrenzt viele Sprechstunden gleichzeitig stattfinden, nämlich
{{range $room := .Rooms}} -
{{$room.Name}}
{{$room.MaxOccupy}} Sprechstunde{{if gt $room.MaxOccupy 1}}n{{end}}
{{end}} +
{{$room.Name}}
{{$room.MaxOccupy}} Sprechstunde{{if gt $room.MaxOccupy 1}}n{{end}}

{{end}}
{{template "footer.html" .}} diff --git a/templates/addSuccess.html b/templates/addSuccess.html index 272e500..b253965 100644 --- a/templates/addSuccess.html +++ b/templates/addSuccess.html @@ -1,8 +1,6 @@ - - + Sprechstunde anlegen - {{template "head.html" .}} Die Sprechstunde wurde angelegt. Du solltest eine Mail mit einem Aktivierungslink erhalten haben. diff --git a/templates/deleteSuccess.html b/templates/deleteSuccess.html index 01162c6..43502ac 100644 --- a/templates/deleteSuccess.html +++ b/templates/deleteSuccess.html @@ -1,8 +1,6 @@ - - + Sprechstunde löschen - {{template "head.html" .}} Du solltest eine Mail mit einem Bestätigungslink erhalten haben. diff --git a/templates/executeFailure.html b/templates/executeFailure.html index df27062..c1d86ca 100644 --- a/templates/executeFailure.html +++ b/templates/executeFailure.html @@ -1,8 +1,6 @@ - - + Anfrage ausführen fehlgeschlagen - {{template "head.html" .}} Irgendetwas ist schief gegangen. Bitte sende folgende Daten an sprechstundentool@mathebau.de mit einer Beschreibung, was du tun wolltest. diff --git a/templates/executeSuccess.html b/templates/executeSuccess.html index 1d4cdca..a99efbb 100644 --- a/templates/executeSuccess.html +++ b/templates/executeSuccess.html @@ -1,11 +1,9 @@ - - + Anfrage ausgeführt - {{template "head.html" .}} - Deine Anfrage wurde ausgeführt.
+ Deine Anfrage wurde ausgeführt. {{template "footer.html" .}} \ No newline at end of file diff --git a/templates/footer.html b/templates/footer.html index 0736807..8b85b85 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -1,5 +1,4 @@