diff --git a/backend/internal/web/handlers_planning_test.go b/backend/internal/web/handlers_planning_test.go index 05eefbc..fa43856 100644 --- a/backend/internal/web/handlers_planning_test.go +++ b/backend/internal/web/handlers_planning_test.go @@ -130,7 +130,7 @@ func TestPlanningListsOwnedEventsChronologically(t *testing.T) { } body := rec.Body.String() assertBodyOrder(t, body, "Early", "Alpha", "Beta", "Gamma") - for _, want := range []string{"09:30", "11:00", "11:00-12:00", "Blue Launch", "#123abc", "Red Studio", "Office", "HQ", "/tablos/" + blueTablo.ID.String() + "/events?month=2026-05", "/tablos/" + redTablo.ID.String() + "/events?month=2026-05"} { + for _, want := range []string{"May 17, 2026", "May 18, 2026", "09:30", "11:00", "11:00-12:00", "Blue Launch", "#123abc", "Red Studio", "Office", "HQ", "/tablos/" + blueTablo.ID.String() + "/events?month=2026-05", "/tablos/" + redTablo.ID.String() + "/events?month=2026-05"} { if !strings.Contains(body, want) { t.Fatalf("planning agenda missing %q; body: %.1200s", want, body) } diff --git a/backend/templates/planning.templ b/backend/templates/planning.templ index a3bb862..81ee10e 100644 --- a/backend/templates/planning.templ +++ b/backend/templates/planning.templ @@ -46,6 +46,7 @@ templ PlanningEventListItem(event PlanningEventRow) {
+ { event.DateLabel } { event.TimeRange } { event.Title }
diff --git a/backend/templates/planning_forms.go b/backend/templates/planning_forms.go index 5ffa88c..ab777fc 100644 --- a/backend/templates/planning_forms.go +++ b/backend/templates/planning_forms.go @@ -20,6 +20,7 @@ type PlanningAgenda struct { type PlanningEventRow struct { Title string + DateLabel string TimeRange string TabloTitle string TabloColor string @@ -42,6 +43,7 @@ func NewPlanningAgenda(start time.Time, end time.Time, today time.Time, rows []s } events = append(events, PlanningEventRow{ Title: row.Title, + DateLabel: PlanningEventDateLabel(row), TimeRange: PlanningEventTimeRange(row), TabloTitle: row.TabloTitle, TabloColor: color, @@ -72,6 +74,13 @@ func PlanningEventURL(row sqlc.ListUserEventsRangeRow) string { return "/tablos/" + row.TabloID.String() + "/events?month=" + row.EventDate.Time.Format("2006-01") } +func PlanningEventDateLabel(row sqlc.ListUserEventsRangeRow) string { + if !row.EventDate.Valid { + return "" + } + return row.EventDate.Time.Format("Jan 2, 2006") +} + func PlanningEventTimeRange(row sqlc.ListUserEventsRangeRow) string { start := FormatEventTime(row.StartTime) if start == "" {