Fachschaft/sprechstunden-go
7
1
Fork 0
Code Issues 8 Pull requests Releases Activity

Compare commits

base: Fachschaft:d55fea031c53f0bbf8e2b71fd3ee8536a96314e0
Branches Tags
Fachschaft:main
Fachschaft:configSupportMail
..
compare: Fachschaft:5c68aea9a73333d2c5273aa90d30954319dafc9d
Branches Tags
Fachschaft:main
Fachschaft:configSupportMail

3 commits
d55fea031c ... 5c68aea9a7

Author SHA1 Message Date
Johannes
5c68aea9a7 ui: some enhancements for narrow screens 2023-07-11 16:09:46 +02:00
Johannes
ed8c8bc5fd ux: improve some user-facing texts 2023-07-11 16:09:46 +02:00
Johannes
0b1988f2a8 ux: hide officeHourTable if it has no entries at all 2023-07-11 16:09:20 +02:00
1 changed files with 3 additions and 5 deletions
Show stats Expand all files Collapse all files

8
controllers/timetable.go
View file

@ -50,8 +50,10 @@ func (b *BaseHandler) GetTimetable(officeHours []models.OfficeHour) (timetable m
} }
func (b *BaseHandler) printTimetable(timetable map[models.Date]map[int]models.OfficeHour, slots []int, deleteIcons bool) template.HTML { func (b *BaseHandler) printTimetable(timetable map[models.Date]map[int]models.OfficeHour, slots []int, deleteIcons bool) template.HTML {
if len(timetable) == 0 { // no office hours to display
return template.HTML("<p class=\"text-center\">Aktuell sind keine passenden Sprechstunden eingetragen.</p>")
}
var tableBody string var tableBody string
var anyOfficeHourExists bool = false // do not show table if no entry in there
for hour := 8; hour < 19; hour += 1 { for hour := 8; hour < 19; hour += 1 {
for minute := 0; minute < 60; minute += b.config.Date.MinuteGranularity { for minute := 0; minute < 60; minute += b.config.Date.MinuteGranularity {
tableBody += "<tr>" tableBody += "<tr>"
@ -94,7 +96,6 @@ func (b *BaseHandler) printTimetable(timetable map[models.Date]map[int]models.Of
// TODO: better error wrapping up to top-level request handler // TODO: better error wrapping up to top-level request handler
} }
tableBody += celldata.String() tableBody += celldata.String()
anyOfficeHourExists = true
} }
} else { } else {
if slot+1 == slots[day] { if slot+1 == slots[day] {
@ -108,9 +109,6 @@ func (b *BaseHandler) printTimetable(timetable map[models.Date]map[int]models.Of
tableBody += "</tr>\n" tableBody += "</tr>\n"
} }
} }
if !anyOfficeHourExists {
return template.HTML("<p class=\"text-center\">Aktuell sind keine passenden Sprechstunden eingetragen.</p>")
}
var table bytes.Buffer var table bytes.Buffer
tableData := struct { tableData := struct {