From a901bd2e32d01eeab261d445299af72fe405946a Mon Sep 17 00:00:00 2001 From: Moe Date: Mon, 4 Mar 2019 20:31:24 -0800 Subject: [PATCH] fix SQLite Power Video bug - newly created events will only be fixed. Previous events will unfortunately remain broken. MariaDB/MySQL databases are unafftected. --- libs/events.js | 2 +- web/libs/js/dash2.socketio.js | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/events.js b/libs/events.js index 1c8e2961..13d6047d 100644 --- a/libs/events.js +++ b/libs/events.js @@ -254,7 +254,7 @@ module.exports = function(s,config,lang){ } //save this detection result in SQL, only coords. not image. if(filter.save && currentConfig.detector_save === '1'){ - s.sqlQuery('INSERT INTO Events (ke,mid,details) VALUES (?,?,?)',[d.ke,d.id,detailString]) + s.sqlQuery('INSERT INTO Events (ke,mid,details,time) VALUES (?,?,?,?)',[d.ke,d.id,detailString,new Date()]) } if(currentConfig.detector_notrigger === '1'){ var detector_notrigger_timeout diff --git a/web/libs/js/dash2.socketio.js b/web/libs/js/dash2.socketio.js index 4a4161d6..051a04e0 100644 --- a/web/libs/js/dash2.socketio.js +++ b/web/libs/js/dash2.socketio.js @@ -652,10 +652,12 @@ $.ccio.globalWebsocket=function(d,user){ var newSetOfEventsWithoutChecked = {}; var eventTime $.each(eventsToCheck,function(n,v){ - if(v.time.indexOf('T') > -1){ - eventTime = v.time.split('T'); + if(typeof v.time === 'string' && v.time.indexOf('T') > -1){ + eventTime = v.time.split('T') + }else if(typeof v.time === 'number'){ + eventTime = moment(v.time).format('YYYY-MM-DD HH:mm:ss').split(' ') }else{ - eventTime = v.time.split(' '); + eventTime = v.time.split(' ') } eventTime[1] = eventTime[1].replace(/-/g,':'),eventTime = eventTime.join(' '); if(eventTime === startTimeFormatted){