fix only one event per day
This commit is contained in:
@@ -3,7 +3,6 @@ package api
|
|||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"slices"
|
"slices"
|
||||||
"strings"
|
|
||||||
|
|
||||||
"gitea.tecamino.com/paadi/memberDB/models"
|
"gitea.tecamino.com/paadi/memberDB/models"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
@@ -62,9 +61,13 @@ func (a *APIHandler) GetReport(c *gin.Context) {
|
|||||||
for _, e := range events {
|
for _, e := range events {
|
||||||
var includesDate bool
|
var includesDate bool
|
||||||
|
|
||||||
for i, d := range request.Date {
|
if len(e.Date) < 10 {
|
||||||
if strings.Contains(e.Date, d) {
|
continue
|
||||||
request.Date = slices.Delete(request.Date, i, min(len(request.Date), i+1))
|
}
|
||||||
|
for _, d := range request.Date {
|
||||||
|
if len(d) < 10 {
|
||||||
|
continue
|
||||||
|
} else if d[:10] == e.Date[:10] {
|
||||||
includesDate = true
|
includesDate = true
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package handlers
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"slices"
|
"slices"
|
||||||
"strings"
|
|
||||||
|
|
||||||
"gitea.tecamino.com/paadi/memberDB/models"
|
"gitea.tecamino.com/paadi/memberDB/models"
|
||||||
)
|
)
|
||||||
@@ -36,9 +35,13 @@ func (dh *DatabaseHandler) GetReport(filter models.ReportFilter) (report models.
|
|||||||
|
|
||||||
var includesDate bool
|
var includesDate bool
|
||||||
|
|
||||||
for i, d := range filter.Date {
|
if len(e.Date) < 10 {
|
||||||
if strings.Contains(e.Date, d) {
|
continue
|
||||||
filter.Date = slices.Delete(filter.Date, i, min(len(filter.Date), i+1))
|
}
|
||||||
|
for _, d := range filter.Date {
|
||||||
|
if len(d) < 10 {
|
||||||
|
continue
|
||||||
|
} else if d[:10] == e.Date[:10] {
|
||||||
includesDate = true
|
includesDate = true
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user