diff --git a/api/reportHandler.go b/api/reportHandler.go index 5a5fefc..83e2a22 100644 --- a/api/reportHandler.go +++ b/api/reportHandler.go @@ -3,7 +3,6 @@ package api import ( "net/http" "slices" - "strings" "gitea.tecamino.com/paadi/memberDB/models" "github.com/gin-gonic/gin" @@ -62,9 +61,13 @@ func (a *APIHandler) GetReport(c *gin.Context) { for _, e := range events { var includesDate bool - for i, d := range request.Date { - if strings.Contains(e.Date, d) { - request.Date = slices.Delete(request.Date, i, min(len(request.Date), i+1)) + if len(e.Date) < 10 { + continue + } + for _, d := range request.Date { + if len(d) < 10 { + continue + } else if d[:10] == e.Date[:10] { includesDate = true break } diff --git a/handlers/report.go b/handlers/report.go index ec5b08b..b38dbd0 100644 --- a/handlers/report.go +++ b/handlers/report.go @@ -3,7 +3,6 @@ package handlers import ( "errors" "slices" - "strings" "gitea.tecamino.com/paadi/memberDB/models" ) @@ -36,9 +35,13 @@ func (dh *DatabaseHandler) GetReport(filter models.ReportFilter) (report models. var includesDate bool - for i, d := range filter.Date { - if strings.Contains(e.Date, d) { - filter.Date = slices.Delete(filter.Date, i, min(len(filter.Date), i+1)) + if len(e.Date) < 10 { + continue + } + for _, d := range filter.Date { + if len(d) < 10 { + continue + } else if d[:10] == e.Date[:10] { includesDate = true break }