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

CC-3027: Current Show progress bar is wrong

Browse source 
-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
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;
$date = new Application_Model_DateHelper;
$timeNow = $date->getUtcTimestamp();
$timeNow = $date->getTimestamp();
return array("env"=>APPLICATION_ENV,
"schedulerTime"=>$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
$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;
}
@ -1424,7 +1424,7 @@ class Application_Model_Show {
// Convert timestamps to local timezone
$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;
}
@ -1478,7 +1478,7 @@ class Application_Model_Show {
*/
public static function ConvertToLocalTimeZone(&$rows, $columnsToConvert) {
$timezone = date_default_timezone_get();
foreach($rows as &$row) {
foreach($columnsToConvert as $column) {
$row[$column] = Application_Model_DateHelper::ConvertToLocalDateTimeString($row[$column]);