From 4b03a45d4660e7eb5cfdffabada6fd92429f27dd Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 15 May 2012 14:20:53 -0400 Subject: [PATCH] CC-3757: Widgets: ON AIR show's elapsed and remaining time are wrong -fixed --- airtime_mvc/application/models/Show.php | 3 +-- widgets/js/jquery.showinfo.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 6794fe756..33d84b33e 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -1753,8 +1753,7 @@ class Application_Model_Show { ." AND modified_instance != TRUE" ." ORDER BY si.starts"; - // Convert back to local timezone - $rows = $con->query($sql)->fetchAll(); + $rows = $con->query($sql)->fetchAll(PDO::FETCH_ASSOC); $numberOfRows = count($rows); $results['previousShow'] = array(); diff --git a/widgets/js/jquery.showinfo.js b/widgets/js/jquery.showinfo.js index 8017081d7..873f5b64f 100644 --- a/widgets/js/jquery.showinfo.js +++ b/widgets/js/jquery.showinfo.js @@ -282,7 +282,7 @@ function ScheduleData(data){ this.schedulePosixTime = convertDateToPosixTime(data.schedulerTime); - this.schedulePosixTime += parseInt(data.timezoneOffset)*1000; + //this.schedulePosixTime += parseInt(data.timezoneOffset, 10)*1000; var date = new Date(); this.localRemoteTimeOffset = date.getTime() - this.schedulePosixTime; }