update getreport function

This commit is contained in:
Adrian Zürcher
2026-02-11 14:52:20 +01:00
parent f2d20e83d6
commit 376ba27a9c
2 changed files with 25 additions and 11 deletions

View File

@@ -42,11 +42,16 @@ func (dh *DatabaseHandler) GetReport(filter models.ReportFilter) (report models.
for _, e := range events {
var includesDate bool
for _, d := range filter.Date {
if !strings.Contains(e.Date, d) {
continue
if strings.Contains(e.Date, d) {
includesDate = true
}
}
if !includesDate {
continue
}
var data *models.Data
if _, ok := count[e.Day]; !ok {
@@ -56,7 +61,7 @@ func (dh *DatabaseHandler) GetReport(filter models.ReportFilter) (report models.
data, ok := report.Data[e.Day]
if !ok {
data = &models.Data{}
data = &models.Data{Minimal: len(e.Attendees)}
report.Data[e.Day] = data
}
@@ -68,13 +73,14 @@ func (dh *DatabaseHandler) GetReport(filter models.ReportFilter) (report models.
data.Maximal = len(e.Attendees)
}
count[e.Day].total = +len(e.Attendees)
count[e.Day].total += len(e.Attendees)
data.Average = count[e.Day].total / count[e.Day].event
for _, a := range e.Attendees {
if _, ok := addedMember[a.Id]; ok {
continue
}
report.Attendees = append(report.Attendees, a)
addedMember[a.Id] = true
}
@@ -89,8 +95,12 @@ func (dh *DatabaseHandler) GetReport(filter models.ReportFilter) (report models.
for _, m := range members {
if _, ok := addedMember[m.Id]; ok {
continue
} else if !slices.Contains(filter.Groups, m.Group.Id) {
continue
} else if len(filter.Groups) > 0 {
if m.Group == nil {
continue
} else if !slices.Contains(filter.Groups, m.Group.Id) {
continue
}
}
report.NonAttendees = append(report.NonAttendees, &m)
}