ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some conversions

fix-timezone-by-ui
Moe 2022-10-22 20:07:51 -07:00
parent 9f25147dbe
commit 4c6be1d89c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/assets/js/bs5.eventListWithPics.js
View File

@ -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)
})

8
web/assets/js/bs5.logViewer.js
View File

@ -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,