diff --git a/internal/web/ui.go b/internal/web/ui.go index c95a973..8e48e6a 100644 --- a/internal/web/ui.go +++ b/internal/web/ui.go @@ -88,6 +88,10 @@ type PageData struct { CurrentPage int SelectedFrom string SelectedTo string + WeekStart string + WeekEnd string + MonthStart string + MonthEnd string TodayAlarmCount int DeviceMetrics []DeviceMetric ConsoleDevices []ConsoleDeviceData @@ -1933,6 +1937,18 @@ func (u *UI) pageAlarms(w http.ResponseWriter, r *http.Request) { data.SelectedTo = to data.CurrentPage = page + // Compute quick-link ranges. + now := time.Now() + weekday := int(now.Weekday()) + if weekday == 0 { + weekday = 7 + } + mon := now.AddDate(0, 0, -(weekday - 1)) + data.WeekStart = mon.Format("2006-01-02") + data.WeekEnd = today + data.MonthStart = now.Format("2006-01-02")[:8] + "01" + data.MonthEnd = today + if u.alarmCollector != nil { data.AlarmRecords, data.TotalAlarmCount = u.alarmCollector.GetFiltered(from, to, perPage, (page-1)*perPage) } diff --git a/internal/web/ui/templates/alarms.html b/internal/web/ui/templates/alarms.html index 0b2301d..7a2fa0b 100644 --- a/internal/web/ui/templates/alarms.html +++ b/internal/web/ui/templates/alarms.html @@ -3,7 +3,6 @@