update report function

handlers/report.go

@@ -3,6 +3,7 @@ package handlers
 import (
 	"errors"
 	"slices"
+	"strings"
 
 	"gitea.tecamino.com/paadi/memberDB/models"
 )
@@ -17,6 +18,10 @@ func (dh *DatabaseHandler) GetReport(filter models.ReportFilter) (report models.
 		return report, errors.New("database not opened")
 	}
 
+	if len(filter.Date) == 0 {
+		return
+	}
+
 	var events []models.Event
 
 	if len(filter.Name) > 0 {
@@ -36,39 +41,9 @@ func (dh *DatabaseHandler) GetReport(filter models.ReportFilter) (report models.
 	addedMember := make(map[uint]bool)
 
 	for _, e := range events {
-		// skip if date lower or not equal from date as well as greater than to date
-		if (e.Date < filter.Date.From || e.Date > filter.Date.From) && e.Date != filter.Date.From {
-			continue
-		}
 
-		// skip if day not selected
-		switch e.Day {
-		case "Monday":
-			if !filter.Weekdays.Monday {
-				continue
-			}
-		case "Tuesday":
-			if !filter.Weekdays.Tuesday {
-				continue
-			}
-		case "Wednesday":
-			if !filter.Weekdays.Wednesday {
-				continue
-			}
-		case "Thursday":
-			if !filter.Weekdays.Thursday {
-				continue
-			}
-		case "Friday":
-			if !filter.Weekdays.Friday {
-				continue
-			}
-		case "Saturday":
-			if !filter.Weekdays.Saturday {
-				continue
-			}
-		case "Sunday":
-			if !filter.Weekdays.Sunday {
+		for _, d := range filter.Date {
+			if !strings.Contains(e.Date, d) {
 				continue
 			}
 		}