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:
denise 2012-09-18 15:52:20 -04:00
parent 8cae11d588 be214ac126
commit 1c89244b02
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/ScheduleController.php
View File

@ -783,6 +783,8 @@ class ScheduleController extends Zend_Controller_Action
$data['add_show_instance_id']); $data['add_show_instance_id']);
if ($success) { if ($success) {
$scheduler = new Application_Model_Scheduler();
$scheduler->removeGaps($data['add_show_instance_id']);
$this->view->addNewShow = true; $this->view->addNewShow = true;
$this->view->newForm = $this->view->render('schedule/add-show-form.phtml'); $this->view->newForm = $this->view->render('schedule/add-show-form.phtml');
} else { } else {

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

@ -331,7 +331,7 @@ class Application_Model_Scheduler
* This function squeezes all items of a show together so that * This function squeezes all items of a show together so that
* there are no gaps between them. * there are no gaps between them.
*/ */
private function removeGaps($showInstance, $exclude=null) public function removeGaps($showInstance, $exclude=null)
{ {
Logging::info("removing gaps from show instance #".$showInstance); Logging::info("removing gaps from show instance #".$showInstance);

12
airtime_mvc/application/models/ShowInstance.php
View File

@ -187,12 +187,12 @@ SQL;
if ($diff != 0) { if ($diff != 0) {
$sql = <<<SQL $sql = <<<SQL
UPDATE cc_schedule UPDATE cc_schedule
SET starts = starts + INTERVAL :diff1 SECOND, SET starts = starts + :diff1::INTERVAL SECOND,
ends = ends + INTERVAL :diff2 SECOND ends = ends + :diff2::INTERVAL SECOND
WHERE instance_id = :instanceId WHERE instance_id = :instanceId
SQL; SQL;
Application_Common_Database::prepareAndExecute($sql, Application_Common_Database::prepareAndExecute($sql,
array( array(
':diff1' => $diff, ':diff1' => $diff,
':diff2' => $diff, ':diff2' => $diff,
':instanceId' => $instance_id ), 'execute'); ':instanceId' => $instance_id ), 'execute');
@ -345,7 +345,7 @@ SQL;
//$sql = "SELECT timestamp '{$ends}' + interval '{$deltaDay} days' + interval '{$hours}:{$mins}'"; //$sql = "SELECT timestamp '{$ends}' + interval '{$deltaDay} days' + interval '{$hours}:{$mins}'";
$sql = "SELECT timestamp :ends + interval :deltaDays + interval :deltaTime"; $sql = "SELECT timestamp :ends + interval :deltaDays + interval :deltaTime";
$now_ends = Application_Common_Database::prepareAndExecute($sql, $now_ends = Application_Common_Database::prepareAndExecute($sql,
array(':ends' => $ends, array(':ends' => $ends,
':deltaDays' => "$deltaDay days", ':deltaDays' => "$deltaDay days",
':deltaTime' => "{$hours}:{$mins}"), 'column' ':deltaTime' => "{$hours}:{$mins}"), 'column'
@ -765,7 +765,7 @@ WHERE si.ends < :timeNow::TIMESTAMP
AND si.modified_instance = 'f' AND si.modified_instance = 'f'
ORDER BY si.ends DESC LIMIT 1; ORDER BY si.ends DESC LIMIT 1;
SQL; SQL;
$id = Application_Common_Database( $sql, array( $id = Application_Common_Database( $sql, array(
':timeNow' => $p_timeNow ), 'column' ); ':timeNow' => $p_timeNow ), 'column' );
return ($id ? new Application_Model_ShowInstance($id) : null ); return ($id ? new Application_Model_ShowInstance($id) : null );
@ -818,7 +818,7 @@ SELECT count(*) AS cnt
FROM cc_show_instances FROM cc_show_instances
WHERE ends < :day WHERE ends < :day
SQL; SQL;
return Application_Common_Database::prepareAndExecute( $sql, return Application_Common_Database::prepareAndExecute( $sql,
array( ':day' => $day ), 'column' ); array( ':day' => $day ), 'column' );
} }