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

fix UTC bug in calendar

build-default-monitor-config-from-definitions
Moe 2020-05-07 08:39:19 -07:00
parent 7248e3cefe
commit 3179fe1a20
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/libs/js/dash2.elements.js
View File

@ -469,7 +469,7 @@ $(document).ready(function(e){
videoSet = 'cloudVideos'
break;
}
e.videoURL=$.ccio.init('location',user)+user.auth_token+'/'+videoSet+'/'+e.ke+'/'+e.mid+'?limit='+e.limit+'&start='+$.ccio.init('th',e.dateRange.startDate)+'&end='+$.ccio.init('th',e.dateRange.endDate);
e.videoURL=$.ccio.init('location',user)+user.auth_token+'/'+videoSet+'/'+e.ke+'/'+e.mid+'?limit='+e.limit+'&start='+e.dateRange.startDate.utc().format('YYYY-MM-DDTHH:mm:ss')+'&end='+e.dateRange.endDate.utc().format('YYYY-MM-DDTHH:mm:ss');
$.getJSON(e.videoURL,function(d){
d.pages=d.total/100;
$('.video_viewer_total').text(d.total)
@ -501,9 +501,10 @@ $(document).ready(function(e){
$.vidview.loadedVideos[v.filename] = Object.assign(v,{})
var n=$.ccio.mon[v.ke+v.mid+user.auth_token];
if(n){v.title=n.name+' - '+(parseInt(v.size)/1048576).toFixed(2)+'mb';}
v.start=v.time;
v.start = moment.utc(v.time).local()
v.end = moment.utc(v.end).local()
// v.filename=$.ccio.init('tf',v.time)+'.'+v.ext;
e.ar.push(v);
e.ar.push(v)
}
})
e.b.html('')