From cb63e6d4652e0a46e720cddde228891f6210d487 Mon Sep 17 00:00:00 2001 From: Dylan Ravel Date: Mon, 13 Jul 2026 16:24:15 -1000 Subject: [PATCH 1/2] Update export.go --- cmd/history/export.go | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/cmd/history/export.go b/cmd/history/export.go index 21b0401..1427fa6 100644 --- a/cmd/history/export.go +++ b/cmd/history/export.go @@ -55,18 +55,37 @@ func ExportCmd() *cobra.Command { } entries, err = db.GetEntriesByMilestone(projectName, exportMilestone) } else if exportToday { - start := time.Now().Truncate(24 * time.Hour) + tz := settings.GetDisplayTimezone() + if exportUtc { + tz = time.UTC + } + + now := time.Now().In(tz) + start := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, tz) end := start.Add(24 * time.Hour) + entries, err = db.GetEntriesByDateRange(start, end) } else if exportWeek { - now := time.Now() + tz := settings.GetDisplayTimezone() + if exportUtc { + tz = time.UTC + } + + now := time.Now().In(tz) weekday := int(now.Weekday()) if weekday == 0 { weekday = 7 // sunday } - start := now.AddDate(0, 0, -weekday+1).Truncate(24 * time.Hour) + firstOfWeek := now.AddDate(0, 0, -weekday+1) + start := time.Date( + firstOfWeek.Year(), + firstOfWeek.Month(), + firstOfWeek.Day(), + 0, 0, 0, 0, + tz) end := start.AddDate(0, 0, 7) + entries, err = db.GetEntriesByDateRange(start, end) } else if exportProject != "" { entries, err = db.GetEntriesByProject(exportProject) From 0926a5884d611c82d81e35d4e5772070567376ed Mon Sep 17 00:00:00 2001 From: Dylan Ravel Date: Mon, 13 Jul 2026 17:04:42 -1000 Subject: [PATCH 2/2] Fixed edge case with daylight savings time --- cmd/history/export.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/history/export.go b/cmd/history/export.go index 1427fa6..197df70 100644 --- a/cmd/history/export.go +++ b/cmd/history/export.go @@ -62,7 +62,7 @@ func ExportCmd() *cobra.Command { now := time.Now().In(tz) start := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, tz) - end := start.Add(24 * time.Hour) + end := start.AddDate(0, 0, 1) entries, err = db.GetEntriesByDateRange(start, end) } else if exportWeek {