CC-3757: Widgets: ON AIR show's elapsed and remaining time are wrong
-fixed
This commit is contained in:
parent
55b0715142
commit
4b03a45d46
|
@ -1753,8 +1753,7 @@ class Application_Model_Show {
|
||||||
." AND modified_instance != TRUE"
|
." AND modified_instance != TRUE"
|
||||||
." ORDER BY si.starts";
|
." ORDER BY si.starts";
|
||||||
|
|
||||||
// Convert back to local timezone
|
$rows = $con->query($sql)->fetchAll(PDO::FETCH_ASSOC);
|
||||||
$rows = $con->query($sql)->fetchAll();
|
|
||||||
$numberOfRows = count($rows);
|
$numberOfRows = count($rows);
|
||||||
|
|
||||||
$results['previousShow'] = array();
|
$results['previousShow'] = array();
|
||||||
|
|
|
@ -282,7 +282,7 @@ function ScheduleData(data){
|
||||||
|
|
||||||
|
|
||||||
this.schedulePosixTime = convertDateToPosixTime(data.schedulerTime);
|
this.schedulePosixTime = convertDateToPosixTime(data.schedulerTime);
|
||||||
this.schedulePosixTime += parseInt(data.timezoneOffset)*1000;
|
//this.schedulePosixTime += parseInt(data.timezoneOffset, 10)*1000;
|
||||||
var date = new Date();
|
var date = new Date();
|
||||||
this.localRemoteTimeOffset = date.getTime() - this.schedulePosixTime;
|
this.localRemoteTimeOffset = date.getTime() - this.schedulePosixTime;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue