Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Martin Konecny 2012-09-06 16:18:37 -04:00
parent fba5d56c76 1852843f96
commit 83415cf298
2 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/models/Schedule.php
View File

@ -1078,7 +1078,6 @@ SQL;
and modified_instance = false and id != :instanceId order by ends"); and modified_instance = false and id != :instanceId order by ends");
$stmt->execute(array( $stmt->execute(array(
':showInstances' => $CC_CONFIG['showInstances'],
':show_end1' => $show_end->format('Y-m-d H:i:s'), ':show_end1' => $show_end->format('Y-m-d H:i:s'),
':show_end2' => $show_end->format('Y-m-d H:i:s'), ':show_end2' => $show_end->format('Y-m-d H:i:s'),
':show_end3' => $show_end->format('Y-m-d H:i:s'), ':show_end3' => $show_end->format('Y-m-d H:i:s'),

48
airtime_mvc/application/models/Show.php
View File

@ -220,18 +220,46 @@ class Application_Model_Show
$current_timestamp = gmdate("Y-m-d H:i:s"); $current_timestamp = gmdate("Y-m-d H:i:s");
//update all cc_show_instances that are in the future. //update all cc_show_instances that are in the future.
$sql = "UPDATE cc_show_instances SET ends = (ends + interval '{$deltaDay} days' + interval '{$hours}:{$mins}') $sql = "UPDATE cc_show_instances
WHERE (show_id = {$this->_showId} AND ends > '$current_timestamp') SET ends = (ends + interval '{$deltaDay} days' + interval '{$hours}:{$mins}')
AND ((ends + interval '{$deltaDay} days' + interval '{$hours}:{$mins}' - starts) <= interval '24:00');"; WHERE (show_id = {$this->_showId} AND ends > '$current_timestamp')
AND ((ends + interval '{$deltaDay} days' + interval '{$hours}:{$mins}' - starts) <= interval '24:00');";
//update cc_show_days so future shows can be created with the new duration. //update cc_show_days so future shows can be created with the new duration.
//only setting new duration if it is less than or equal to 24 hours. //only setting new duration if it is less than or equal to 24 hours.
$sql = $sql . " UPDATE cc_show_days SET duration = (CAST(duration AS interval) + interval '{$deltaDay} days' + interval '{$hours}:{$mins}') $sql = $sql . "
WHERE show_id = {$this->_showId} UPDATE cc_show_days SET duration = (CAST(duration AS interval) + interval '{$deltaDay} days' + interval '{$hours}:{$mins}')
AND ((CAST(duration AS interval) + interval '{$deltaDay} days' + interval '{$hours}:{$mins}') <= interval '24:00')"; WHERE show_id = {$this->_showId}
AND ((CAST(duration AS interval) + interval '{$deltaDay} days' + interval '{$hours}:{$mins}') <= interval '24:00')";
$sql_gen = <<<SQL
UPDATE cc_show_instances
SET ends = (ends + interval :deltaDay1 + interval :interval1)
WHERE (show_id = :show_id1 AND ends > :current_timestamp1)
AND ((ends + interval :deltaDay2 + interval :interval2 - starts) <= interval '24:00')
UPDATE cc_show_days SET duration = (CAST(duration AS interval) + interval :deltaDay3 + interval :interval3)
WHERE show_id = :show_id2
AND ((CAST(duration AS interval) + interval :deltaDay4 + interval :interval4) <= interval '24:00')
SQL;
Application_Common_Database::prepareAndExecute($sql_gen,
array(
':deltaDay1' => "$deltaDay days",
':interval1' => "$hours:$mins",
':show_id1' => $this->_showId,
':current_timestamp1' => $current_timestamp,
':deltaDay2' => "$deltaDay days",
':interval2' => "$hours:$mins",
':deltaDay3' => "$deltaDay days",
':interval3' => "$hours:$mins",
':show_id2' => $this->_showId,
':deltaDay4' => "$deltaDay days",
':interval4' => "$hours:$mins"
), "execute");
//do both the queries at once. //do both the queries at once.
$con->exec($sql); //$con->exec($sql);
$con = Propel::getConnection(CcSchedulePeer::DATABASE_NAME); $con = Propel::getConnection(CcSchedulePeer::DATABASE_NAME);
$con->beginTransaction(); $con->beginTransaction();
@ -768,11 +796,11 @@ class Application_Model_Show
$timestamp = $date->getUtcTimestamp(); $timestamp = $date->getUtcTimestamp();
$stmt = $con->prepare("UPDATE cc_show_days " $stmt = $con->prepare("UPDATE cc_show_days "
."SET duration = :add_show_duration" ."SET duration = :add_show_duration "
."WHERE show_id = :add_show_id" ); ."WHERE show_id = :add_show_id" );
$stmt->execute( array( $stmt->execute( array(
':add_show_duration' => $p_data[add_show_duration], ':add_show_duration' => $p_data['add_show_duration'],
':add_show_id' => $p_data[add_show_id] ':add_show_id' => $p_data['add_show_id']
)); ));
$sql = "UPDATE cc_show_instances " $sql = "UPDATE cc_show_instances "