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

CC-3522 : Now Playing Screen-> Periodical message pops up

Browse source
This commit is contained in:
Naomi Aro 2012-04-26 12:14:41 +02:00
parent b5bf5e9598
commit b5863d3d7a
6 changed files with 39 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
airtime_mvc/application/controllers/ShowbuilderController.php
View file

@ -238,6 +238,7 @@ class ShowbuilderController extends Zend_Controller_Action
$show_filter = intval($request->getParam("showFilter", 0));
$my_shows = intval($request->getParam("myShows", 0));
$timestamp = intval($request->getParam("timestamp", -1));
$instances = $request->getParam("instances", array());
$startsDT = DateTime::createFromFormat("U", $starts_epoch, new DateTimeZone("UTC"));
$endsDT = DateTime::createFromFormat("U", $ends_epoch, new DateTimeZone("UTC"));
@ -247,7 +248,7 @@ class ShowbuilderController extends Zend_Controller_Action
//only send the schedule back if updates have been made.
// -1 default will always call the schedule to be sent back if no timestamp is defined.
if ($showBuilder->hasBeenUpdatedSince($timestamp)) {
if ($showBuilder->hasBeenUpdatedSince($timestamp, $instances)) {
$this->view->update = true;
}
else {
@ -275,7 +276,9 @@ class ShowbuilderController extends Zend_Controller_Action
$opts = array("myShows" => $my_shows, "showFilter" => $show_filter);
$showBuilder = new Application_Model_ShowBuilder($startsDT, $endsDT, $opts);
$this->view->schedule = $showBuilder->GetItems();
$data = $showBuilder->GetItems();
$this->view->schedule = $data["schedule"];
$this->view->instances = $data["showInstances"];
$this->view->timestamp = $current_time;
$end = microtime(true);