paadi/memberDB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update getreport function

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

14
api/reportHandler.go
View File

@@ -68,12 +68,16 @@ func (a *APIHandler) GetReport(c *gin.Context) {
} }
for _, e := range events { for _, e := range events {
var includesDate bool
for _, d := range request.Date { for _, d := range request.Date {
if !strings.Contains(e.Date, d) { if strings.Contains(e.Date, d) {
continue includesDate = true
} }
} }
if !includesDate {
continue
}
var data *models.Data var data *models.Data
if _, ok := count[e.Day]; !ok { if _, ok := count[e.Day]; !ok {
@@ -83,7 +87,7 @@ func (a *APIHandler) GetReport(c *gin.Context) {
data, ok := report.Data[e.Day] data, ok := report.Data[e.Day]
if !ok { if !ok {
data = &models.Data{} data = &models.Data{Minimal: len(e.Attendees)}
report.Data[e.Day] = data report.Data[e.Day] = data
} }
@@ -95,13 +99,14 @@ func (a *APIHandler) GetReport(c *gin.Context) {
data.Maximal = len(e.Attendees) 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 data.Average = count[e.Day].total / count[e.Day].event
for _, a := range e.Attendees { for _, a := range e.Attendees {
if _, ok := addedMember[a.Id]; ok { if _, ok := addedMember[a.Id]; ok {
continue continue
} }
report.Attendees = append(report.Attendees, a) report.Attendees = append(report.Attendees, a)
addedMember[a.Id] = true addedMember[a.Id] = true
} }
@@ -126,7 +131,6 @@ func (a *APIHandler) GetReport(c *gin.Context) {
} else if !slices.Contains(request.Groups, m.Group.Id) { } else if !slices.Contains(request.Groups, m.Group.Id) {
continue continue
} }
} }
report.NonAttendees = append(report.NonAttendees, &m) report.NonAttendees = append(report.NonAttendees, &m)
} }

22
handlers/report.go
View File

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