From d95d8b996e39d32f11eaa1ae6137ab2c07241cf6 Mon Sep 17 00:00:00 2001 From: bronku Date: Sat, 5 Apr 2025 12:08:46 +0200 Subject: [PATCH] changed to show this month's orders by default --- internal/server/get.go | 21 +++++++++++++++++---- internal/server/templates/orders.gohtml | 10 +++++----- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/internal/server/get.go b/internal/server/get.go index c3300c0..8d8449a 100644 --- a/internal/server/get.go +++ b/internal/server/get.go @@ -10,13 +10,26 @@ import ( "github.com/Bronku/iroon/internal/models" ) +func monthInterval(y int, m time.Month) (firstDay, lastDay time.Time) { + firstDay = time.Date(y, m, 1, 0, 0, 0, 0, time.UTC) + lastDay = time.Date(y, m+1, 1, 0, 0, 0, -1, time.UTC) + return firstDay, lastDay +} + func (h *Server) orders(_ *http.Request) (any, int, error) { - //r.URL.Query().Get() - orders, err := h.s.GetFilteredOrder("", time.Now(), time.Now().Add(time.Hour*24)) + var ( + y int + m time.Month + ) + y, m, _ = time.Now().Date() + first, last := monthInterval(y, m) + fmt.Println(first, last) + orders, err := h.s.GetFilteredOrder("", first, last) data := struct { - Today string + First string + Last string Orders []models.Order - }{Today: time.Now().Format("2006-01-02"), Orders: orders} + }{first.Format("2006-01-02"), last.Format("2006-01-02"), orders} return data, http.StatusOK, err } diff --git a/internal/server/templates/orders.gohtml b/internal/server/templates/orders.gohtml index 948b5b1..e89c6a0 100644 --- a/internal/server/templates/orders.gohtml +++ b/internal/server/templates/orders.gohtml @@ -9,10 +9,10 @@ Orders - - + + - +
Searching... @@ -48,6 +48,6 @@ Orders {{.Status}} {{.Total}} - {{end}} + {{end}} + {{end}} -