arthur/xtablo-source
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 5

fix(11-02): show planning event dates

Browse source
This commit is contained in:
Arthur Belleville 2026-05-16 08:39:10 +02:00
parent 404b545a5d
commit bb84d70569
No known key found for this signature in database
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/internal/web/handlers_planning_test.go
View file

@ -130,7 +130,7 @@ func TestPlanningListsOwnedEventsChronologically(t *testing.T) {
} }
body := rec.Body.String() body := rec.Body.String()
assertBodyOrder(t, body, "Early", "Alpha", "Beta", "Gamma") 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) { if !strings.Contains(body, want) {
t.Fatalf("planning agenda missing %q; body: %.1200s", want, body) t.Fatalf("planning agenda missing %q; body: %.1200s", want, body)
} }

1
backend/templates/planning.templ
View file

@ -46,6 +46,7 @@ templ PlanningEventListItem(event PlanningEventRow) {
<a href={ templ.SafeURL(event.URL) } class="block focus:outline-none focus:ring-2 focus:ring-blue-600 focus:ring-offset-2" aria-label={ "Open event in tablo: " + event.Title }> <a href={ templ.SafeURL(event.URL) } class="block focus:outline-none focus:ring-2 focus:ring-blue-600 focus:ring-offset-2" aria-label={ "Open event in tablo: " + event.Title }>
<div class="flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between"> <div class="flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">
<div class="flex min-w-0 flex-col gap-1 sm:flex-row sm:items-center sm:gap-3"> <div class="flex min-w-0 flex-col gap-1 sm:flex-row sm:items-center sm:gap-3">
<span class="text-sm font-medium text-slate-700">{ event.DateLabel }</span>
<span class="text-sm font-medium text-slate-700">{ event.TimeRange }</span> <span class="text-sm font-medium text-slate-700">{ event.TimeRange }</span>
<span class="text-base font-semibold text-slate-900">{ event.Title }</span> <span class="text-base font-semibold text-slate-900">{ event.Title }</span>
</div> </div>

9
backend/templates/planning_forms.go
View file

@ -20,6 +20,7 @@ type PlanningAgenda struct {
type PlanningEventRow struct { type PlanningEventRow struct {
Title string Title string
DateLabel string
TimeRange string TimeRange string
TabloTitle string TabloTitle string
TabloColor string TabloColor string
@ -42,6 +43,7 @@ func NewPlanningAgenda(start time.Time, end time.Time, today time.Time, rows []s
} }
events = append(events, PlanningEventRow{ events = append(events, PlanningEventRow{
Title: row.Title, Title: row.Title,
DateLabel: PlanningEventDateLabel(row),
TimeRange: PlanningEventTimeRange(row), TimeRange: PlanningEventTimeRange(row),
TabloTitle: row.TabloTitle, TabloTitle: row.TabloTitle,
TabloColor: color, 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") 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 { func PlanningEventTimeRange(row sqlc.ListUserEventsRangeRow) string {
start := FormatEventTime(row.StartTime) start := FormatEventTime(row.StartTime)
if start == "" { if start == "" {