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

Fixed bug where shows weren't populating when moving forward in the calendar

This commit is contained in:
denise 2013-03-26 10:33:06 -04:00
parent ef8f87df5d
commit 230d1a6aa9
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
airtime_mvc/application/services/ShowService.php
View File

@ -103,6 +103,10 @@ class Application_Service_ShowService
$ccShowDays = $this->ccShow->getCcShowDays(); $ccShowDays = $this->ccShow->getCcShowDays();
} }
if (!is_null($end)) {
$populateUntil = $end;
}
foreach ($ccShowDays as $day) { foreach ($ccShowDays as $day) {
switch ($day->getDbRepeatType()) { switch ($day->getDbRepeatType()) {
case NO_REPEAT: case NO_REPEAT:
@ -137,20 +141,12 @@ class Application_Service_ShowService
$startTimeString = $today_timestamp->format("Y-m-d H:i:s"); $startTimeString = $today_timestamp->format("Y-m-d H:i:s");
} }
return CcShowDaysQuery::create() $c = new Criteria();
->add("last_show", null, "=") $c->add(CcShowDaysPeer::FIRST_SHOW, $endTimeString, Criteria::LESS_THAN);
->addOr("first_show", $endTimeString, "<") $c->addAnd(CcShowDaysPeer::LAST_SHOW, $startTimeString, Criteria::GREATER_THAN);
->add("last_show", $startTimeString, ">") $c->addOr(CcShowDaysPeer::LAST_SHOW, null, Criteria::ISNULL);
->find();
/*$sql = <<< SQL
SELECT * FROM cc_show_days
WHERE last_show IS NULL
OR first_show < :endTimeString
AND last_show > :startTimeString
SQL;
return Application_Common_Database::prepareAndExecute($sql, return CcShowDaysPeer::doSelect($c);
array( ':endTimeString' => $endTimeString, ':startTimeString' => $startTimeString ), 'all');*/
} }
public static function formatShowDuration($duration) public static function formatShowDuration($duration)
@ -664,7 +660,7 @@ SQL;
} }
} }
$nextDate = $utcEndDateTime->add($repeatInterval); $nextDate = $utcEndDateTime->add($repeatInterval);
$this->setNextRepeatingShowDate($nextDate->format("Y-m-d"), $day); $this->setNextRepeatingShowDate($nextDate->format("Y-m-d"), $day, $show_id);
} }
private function createMonthlyMonthlyRepeatInstances($showDay, $populateUntil, private function createMonthlyMonthlyRepeatInstances($showDay, $populateUntil,
@ -736,7 +732,7 @@ SQL;
} }
$start = $this->getNextMonthlyMonthlyRepeatDate($start, $timezone); $start = $this->getNextMonthlyMonthlyRepeatDate($start, $timezone);
} }
$this->setNextRepeatingShowDate($start->format("Y-m-d"), $day); $this->setNextRepeatingShowDate($start->format("Y-m-d"), $day, $show_id);
} }
/** /**
@ -1107,12 +1103,12 @@ SQL;
* @param $showId * @param $showId
* @param $day * @param $day
*/ */
private function setNextRepeatingShowDate($nextDate, $day) private function setNextRepeatingShowDate($nextDate, $day, $showId)
{ {
$nextInfo = explode(" ", $nextDate); $nextInfo = explode(" ", $nextDate);
$repeatInfo = CcShowDaysQuery::create() $repeatInfo = CcShowDaysQuery::create()
->filterByDbShowId($this->ccShow->getDbId()) ->filterByDbShowId($showId)
->filterByDbDay($day) ->filterByDbDay($day)
->findOne(); ->findOne();