Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-3027: Current Show progress bar is wrong 

-looks like it's working.
This commit is contained in:
Martin Konecny 2011-11-12 00:04:37 -05:00
parent 1a45a38055
commit 20fc49b7be
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/models/Schedule.php
View File

@ -144,7 +144,7 @@ class Application_Model_Schedule {
global $CC_CONFIG; global $CC_CONFIG;
$date = new Application_Model_DateHelper; $date = new Application_Model_DateHelper;
$timeNow = $date->getUtcTimestamp(); $timeNow = $date->getTimestamp();
return array("env"=>APPLICATION_ENV, return array("env"=>APPLICATION_ENV,
"schedulerTime"=>$timeNow, "schedulerTime"=>$timeNow,
"previous"=>Application_Model_Dashboard::GetPreviousItem($timeNow), "previous"=>Application_Model_Dashboard::GetPreviousItem($timeNow),

6
airtime_mvc/application/models/Show.php
View File

@ -1383,7 +1383,7 @@ class Application_Model_Show {
// Convert back to local timezone // Convert back to local timezone
$rows = $CC_DBC->GetAll($sql); $rows = $CC_DBC->GetAll($sql);
Application_Model_Show::ConvertToLocalTimeZone($rows, array("start_timestamp", "end_timestamp")); Application_Model_Show::ConvertToLocalTimeZone($rows, array("starts", "ends", "start_timestamp", "end_timestamp"));
return $rows; return $rows;
} }
@ -1424,7 +1424,7 @@ class Application_Model_Show {
// Convert timestamps to local timezone // Convert timestamps to local timezone
$rows = $CC_DBC->GetAll($sql); $rows = $CC_DBC->GetAll($sql);
Application_Model_Show::ConvertToLocalTimeZone($rows, array("start_timestamp", "end_timestamp")); Application_Model_Show::ConvertToLocalTimeZone($rows, array("starts", "ends", "start_timestamp", "end_timestamp"));
return $rows; return $rows;
} }
@ -1478,7 +1478,7 @@ class Application_Model_Show {
*/ */
public static function ConvertToLocalTimeZone(&$rows, $columnsToConvert) { public static function ConvertToLocalTimeZone(&$rows, $columnsToConvert) {
$timezone = date_default_timezone_get(); $timezone = date_default_timezone_get();
foreach($rows as &$row) { foreach($rows as &$row) {
foreach($columnsToConvert as $column) { foreach($columnsToConvert as $column) {
$row[$column] = Application_Model_DateHelper::ConvertToLocalDateTimeString($row[$column]); $row[$column] = Application_Model_DateHelper::ConvertToLocalDateTimeString($row[$column]);

10
airtime_mvc/public/js/airtime/dashboard/playlist.js
View File

@ -13,7 +13,7 @@ var currentElem;
var serverUpdateInterval = 5000; var serverUpdateInterval = 5000;
var uiUpdateInterval = 200; var uiUpdateInterval = 200;
var timezoneOffset = 0; //var timezoneOffset = 0;
//set to "development" if we are developing :). Useful to disable alerts //set to "development" if we are developing :). Useful to disable alerts
//when entering production mode. //when entering production mode.
@ -167,11 +167,13 @@ function updatePlaybar(){
$('#show-length').empty(); $('#show-length').empty();
if (currentShow.length > 0){ if (currentShow.length > 0){
$('#show-length').text(convertDateToHHMM(currentShow[0].showStartPosixTime + timezoneOffset) + " - " + convertDateToHHMM(currentShow[0].showEndPosixTime + timezoneOffset)); //$('#show-length').text(convertDateToHHMM(currentShow[0].showStartPosixTime + timezoneOffset) + " - " + convertDateToHHMM(currentShow[0].showEndPosixTime + timezoneOffset));
$('#show-length').text(convertDateToHHMM(currentShow[0].showStartPosixTime) + " - " + convertDateToHHMM(currentShow[0].showEndPosixTime));
} }
/* Column 2 update */ /* Column 2 update */
$('#time').text(convertDateToHHMMSS(estimatedSchedulePosixTime + timezoneOffset)); //$('#time').text(convertDateToHHMMSS(estimatedSchedulePosixTime + timezoneOffset));
$('#time').text(convertDateToHHMMSS(estimatedSchedulePosixTime));
} }
function calcAdditionalData(currentItem){ function calcAdditionalData(currentItem){
@ -211,7 +213,7 @@ function parseItems(obj){
calcAdditionalShowData(obj.nextShow); calcAdditionalShowData(obj.nextShow);
var schedulePosixTime = convertDateToPosixTime(obj.schedulerTime); var schedulePosixTime = convertDateToPosixTime(obj.schedulerTime);
timezoneOffset = parseInt(obj.timezoneOffset)*1000; //timezoneOffset = parseInt(obj.timezoneOffset)*1000;
var date = new Date(); var date = new Date();
localRemoteTimeOffset = date.getTime() - schedulePosixTime; localRemoteTimeOffset = date.getTime() - schedulePosixTime;
} }