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

CC-4069: Edit Show -> cannot edit show 

-fixed
This commit is contained in:
denise 2012-07-04 18:58:22 -04:00
parent cbf026412c
commit 1fa3da5bd0
3 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -743,6 +743,7 @@ class ScheduleController extends Zend_Controller_Action
} }
$show = new Application_Model_Show($data['add_show_id']); $show = new Application_Model_Show($data['add_show_id']);
$validateStartDate = true; $validateStartDate = true;
$validateStartTime = true; $validateStartTime = true;
if (!array_key_exists('add_show_start_date', $data)){ if (!array_key_exists('add_show_start_date', $data)){
@ -761,7 +762,7 @@ class ScheduleController extends Zend_Controller_Action
$data['add_show_record'] = $show->isRecorded(); $data['add_show_record'] = $show->isRecorded();
$origianlShowStartDateTime = Application_Common_DateHelper::ConvertToLocalDateTime($show->getStartDateAndTime()); $origianlShowStartDateTime = Application_Common_DateHelper::ConvertToLocalDateTime($show->getStartDateAndTime());
$success = Application_Model_Schedule::addUpdateShow($data, $this, $validateStartDate, $origianlShowStartDateTime); $success = Application_Model_Schedule::addUpdateShow($data, $this, $validateStartDate, $origianlShowStartDateTime, true, $data['add_show_instance_id']);
if ($success){ if ($success){
$this->view->addNewShow = true; $this->view->addNewShow = true;

7
airtime_mvc/application/forms/AddShowWhen.php
View File

@ -83,7 +83,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
} }
public function checkReliantFields($formData, $validateStartDate, $originalStartDate=null) { public function checkReliantFields($formData, $validateStartDate, $originalStartDate=null, $update=false, $instanceId=null) {
$valid = true; $valid = true;
$start_time = $formData['add_show_start_date']." ".$formData['add_show_start_time']; $start_time = $formData['add_show_start_date']." ".$formData['add_show_start_time'];
@ -144,8 +144,11 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
*/ */
if ($valid) { if ($valid) {
$show_start = new DateTime($start_time); $show_start = new DateTime($start_time);
$show_start->setTimezone(new DateTimeZone('UTC'));
$show_end = new DateTime($end_time); $show_end = new DateTime($end_time);
$overlapping = Application_Model_Schedule::checkOverlappingShows($show_start, $show_end); $show_end->setTimezone(new DateTimeZone('UTC'));
$overlapping = Application_Model_Schedule::checkOverlappingShows($show_start, $show_end, $update, $instanceId);
if ($overlapping) { if ($overlapping) {
$this->getElement('add_show_duration')->setErrors(array('Cannot have overlapping shows')); $this->getElement('add_show_duration')->setErrors(array('Cannot have overlapping shows'));
$valid = false; $valid = false;

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

@ -701,7 +701,7 @@ class Application_Model_Schedule {
} }
$when = $formWhen->isValid($data); $when = $formWhen->isValid($data);
if($when && $formWhen->checkReliantFields($data, true)) { if($when && $formWhen->checkReliantFields($data, true, null, true)) {
$start_dt = new DateTime($data['add_show_start_date']." ".$data['add_show_start_time'], new DateTimeZone(date_default_timezone_get())); $start_dt = new DateTime($data['add_show_start_date']." ".$data['add_show_start_time'], new DateTimeZone(date_default_timezone_get()));
$start_dt->setTimezone(new DateTimeZone('UTC')); $start_dt->setTimezone(new DateTimeZone('UTC'));
@ -751,7 +751,7 @@ class Application_Model_Schedule {
* Another clean-up is to move all the form manipulation to the proper form class..... * Another clean-up is to move all the form manipulation to the proper form class.....
* -Martin * -Martin
*/ */
public static function addUpdateShow($data, $controller, $validateStartDate, $originalStartDate=null){ public static function addUpdateShow($data, $controller, $validateStartDate, $originalStartDate=null, $update=false, $instanceId=null){
$userInfo = Zend_Auth::getInstance()->getStorage()->read(); $userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new Application_Model_User($userInfo->id); $user = new Application_Model_User($userInfo->id);
@ -778,7 +778,7 @@ class Application_Model_Schedule {
$when = $formWhen->isValid($data); $when = $formWhen->isValid($data);
$live = $formLive->isValid($data); $live = $formLive->isValid($data);
if($when) { if($when) {
$when = $formWhen->checkReliantFields($data, $validateStartDate, $originalStartDate); $when = $formWhen->checkReliantFields($data, $validateStartDate, $originalStartDate, $update, $instanceId);
} }
//The way the following code works is that is parses the hour and //The way the following code works is that is parses the hour and
@ -913,40 +913,26 @@ class Application_Model_Schedule {
} }
} }
public static function checkOverlappingShows($show_start, $show_end) { public static function checkOverlappingShows($show_start, $show_end, $update=false, $instanceId=false) {
global $CC_CONFIG; global $CC_CONFIG;
$overlapping = false; $overlapping = false;
//Set timezone to UTC to be consisent with DB
$show_start->setTimezone(new DateTimeZone('UTC'));
$con = Propel::getConnection(); $con = Propel::getConnection();
$sql = "SELECT id, starts, ends FROM ".$CC_CONFIG["showInstances"]."
where starts <= '{$show_start->format('Y-m-d H:i:s')}' order by ends"; if ($update) {
$sql = "SELECT id, starts, ends FROM ".$CC_CONFIG["showInstances"]."
where starts <= '{$show_start->format('Y-m-d H:i:s')}'
and id != ".$instanceId. " order by ends";
} else {
$sql = "SELECT id, starts, ends FROM ".$CC_CONFIG["showInstances"]."
where starts <= '{$show_start->format('Y-m-d H:i:s')}' order by ends";
}
$rows = $con->query($sql); $rows = $con->query($sql);
//Set back to local timezone to do comparison
$show_start->setTimezone(new DateTimeZone(Application_Model_Preference::GetTimezone()));
foreach($rows as $row) { foreach($rows as $row) {
$start = new DateTime($row["starts"]); $start = new DateTime($row["starts"], new DateTimeZone('UTC'));
$end = new DateTime($row["ends"]); $end = new DateTime($row["ends"], new DateTimeZone('UTC'));
/* When data is grabbed from the DB, the time is in UTC
* but the timezone is set locally. Comparing timestamps
* on two DateTime objects with different timezones but
* same time yeild different results.
*
* Since we cannot change the timezone back to UTC without
* changing the time, we convert each show's instance
* end time to local time via offset and then do the comparison.
*/
$offset = $show_start->getOffset();
if ($offset < 0) {
$end->sub(new DateInterval("PT".abs($offset)."S"));
} else {
$end->add(new DateInterval("PT".$offset."S"));
}
if ($show_start->getTimestamp() < $end->getTimestamp()) { if ($show_start->getTimestamp() < $end->getTimestamp()) {
$overlapping = true; $overlapping = true;