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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
James 2012-09-17 17:56:45 -04:00
parent 81a015dfac 8b50ff70c3
commit 8f991dc50b
1 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
airtime_mvc/application/models/ShowBuilder.php
View File

@ -23,26 +23,26 @@ class Application_Model_ShowBuilder
private $showInstances = array(); private $showInstances = array();
private $defaultRowArray = array( private $defaultRowArray = array(
"header" => false, "header" => false,
"footer" => false, "footer" => false,
"empty" => false, "empty" => false,
"allowed" => false, "allowed" => false,
"id" => 0, "id" => 0,
"instance" => "", "instance" => "",
"starts" => "", "starts" => "",
"ends" => "", "ends" => "",
"runtime" => "", "runtime" => "",
"title" => "", "title" => "",
"creator" => "", "creator" => "",
"album" => "", "album" => "",
"timestamp" => null, "timestamp" => null,
"cuein" => "", "cuein" => "",
"cueout" => "", "cueout" => "",
"fadein" => "", "fadein" => "",
"fadeout" => "", "fadeout" => "",
"image" => false, "image" => false,
"color" => "", //in hex without the '#' sign. "color" => "", //in hex without the '#' sign.
"backgroundColor"=> "", //in hex without the '#' sign. "backgroundColor" => "", //in hex without the '#' sign.
); );
/* /*
@ -51,12 +51,12 @@ class Application_Model_ShowBuilder
*/ */
public function __construct($p_startDT, $p_endDT, $p_opts) public function __construct($p_startDT, $p_endDT, $p_opts)
{ {
$this->startDT = $p_startDT; $this->startDT = $p_startDT;
$this->endDT = $p_endDT; $this->endDT = $p_endDT;
$this->timezone = date_default_timezone_get(); $this->timezone = date_default_timezone_get();
$this->user = Application_Model_User::getCurrentUser(); $this->user = Application_Model_User::getCurrentUser();
$this->opts = $p_opts; $this->opts = $p_opts;
$this->epoch_now = floatval(microtime(true)); $this->epoch_now = floatval(microtime(true));
$this->currentShow = false; $this->currentShow = false;
} }
@ -129,6 +129,7 @@ class Application_Model_ShowBuilder
* 0 = past * 0 = past
* 1 = current * 1 = current
* 2 = future * 2 = future
* TODO : change all of the above to real constants -- RG
*/ */
private function getScheduledStatus($p_epochItemStart, $p_epochItemEnd, &$row) private function getScheduledStatus($p_epochItemStart, $p_epochItemEnd, &$row)
{ {
@ -157,6 +158,14 @@ class Application_Model_ShowBuilder
//item is in the future. //item is in the future.
else if ($this->epoch_now < $p_epochItemStart) { else if ($this->epoch_now < $p_epochItemStart) {
$row["scheduled"] = 2; $row["scheduled"] = 2;
} else {
Logging::warn("No-op? is this what should happen...printing
debug just in case");
$d = array(
'$p_epochItemStart' => $p_epochItemStart,
'$p_epochItemEnd' => $p_epochItemEnd,
'$row' => $row);
Logging::warn($d);
} }
} }