From 4c6be1d89ceb2baf52edc985e4402981425042b8 Mon Sep 17 00:00:00 2001 From: Moe Date: Sat, 22 Oct 2022 20:07:51 -0700 Subject: [PATCH] fix some conversions --- web/assets/js/bs5.eventListWithPics.js | 6 +++--- web/assets/js/bs5.logViewer.js | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/assets/js/bs5.eventListWithPics.js b/web/assets/js/bs5.eventListWithPics.js index 5ae0f507..002b869c 100644 --- a/web/assets/js/bs5.eventListWithPics.js +++ b/web/assets/js/bs5.eventListWithPics.js @@ -19,12 +19,12 @@ $(document).ready(function(){ function drawDataRows(){ var selectedMonitorType = monitorSelector.val() selectedMonitorType = selectedMonitorType === 'all' ? '' : selectedMonitorType - var currentDateRange = dateSelector.data('daterangepicker'); + var dateRange = getSelectedTime(dateSelector) getEvents({ monitorId: selectedMonitorType, limit: 50, - startDate: currentDateRange.startDate, - endDate: currentDateRange.endDate, + startDate: dateRange.startDate, + endDate: dateRange.endDate, },function(response){ drawEventRowsToList(rowContainer,response.events) }) diff --git a/web/assets/js/bs5.logViewer.js b/web/assets/js/bs5.logViewer.js index 48700b63..1c6db435 100644 --- a/web/assets/js/bs5.logViewer.js +++ b/web/assets/js/bs5.logViewer.js @@ -27,12 +27,12 @@ $(document).ready(function(e){ var html = '' var selectedLogType = logTypeSelector.val() selectedLogType = selectedLogType === 'all' ? '' : selectedLogType - var currentDateRange = dateSelector.data('daterangepicker'); - var apiEndpoint = getApiPrefix(`logs`) + '/' + selectedLogType + '?start=' + formattedTimeForFilename(currentDateRange.startDate) + '&end=' + formattedTimeForFilename(currentDateRange.endDate) + var dateRange = getSelectedTime(dateSelector) + var apiEndpoint = getApiPrefix(`logs`) + '/' + selectedLogType + '?start=' + formattedTimeForFilename(dateRange.startDate) + '&end=' + formattedTimeForFilename(dateRange.endDate) $.getJSON(apiEndpoint,function(rows){ logViewerDataInMemory = { - startDate: currentDateRange.startDate, - endDate: currentDateRange.endDate, + startDate: dateRange.startDate, + endDate: dateRange.endDate, url: apiEndpoint, query: selectedLogType, rows: rows,