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

CC-2179: Creating a record + rebroadcast show with no rebroadcast times causes DB error 

-fixed
This commit is contained in:
martin 2011-04-14 14:57:52 -04:00
parent 5a7ebc8a8b
commit 88362a2c52
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
application/forms/AddShowAbsoluteRebroadcastDates.php
View File

@ -35,12 +35,18 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm
$valid = true; $valid = true;
for($i=1; $i<=10; $i++) { for($i=1; $i<=10; $i++) {
$day = $formData['add_show_rebroadcast_date_absolute_'.$i]; $day = $formData['add_show_rebroadcast_date_absolute_'.$i];
if($day == "") { if(trim($day) == "") {
continue; continue;
} }
$time = $formData['add_show_rebroadcast_time_absolute_'.$i];
if (trim($time) == ""){
$this->getElement('add_show_rebroadcast_time_absolute_'.$i)->setErrors(array("Time must be specified"));
$valid = false;
}
$show_start_time = $formData['add_show_start_date']."".$formData['add_show_start_time']; $show_start_time = $formData['add_show_start_date']."".$formData['add_show_start_time'];
$show_end = new DateTime($show_start_time); $show_end = new DateTime($show_start_time);
@ -51,16 +57,16 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm
$show_end->add(new DateInterval("PT$duration[0]H")); $show_end->add(new DateInterval("PT$duration[0]H"));
$show_end->add(new DateInterval("PT$duration[1]M")); $show_end->add(new DateInterval("PT$duration[1]M"));
$show_end->add(new DateInterval("PT1H"));//min time to wait until a rebroadcast $show_end->add(new DateInterval("PT1H"));//min time to wait until a rebroadcast
$rebroad_start = $day."".$formData['add_show_rebroadcast_time_absolute_'.$i]; $rebroad_start = $day."".$formData['add_show_rebroadcast_time_absolute_'.$i];
$rebroad_start = new DateTime($rebroad_start); $rebroad_start = new DateTime($rebroad_start);
if($rebroad_start < $show_end) { if($rebroad_start < $show_end) {
$this->getElement('add_show_rebroadcast_time_absolute_'.$i)->setErrors(array("Must wait at least 1 hour to rebroadcast")); $this->getElement('add_show_rebroadcast_time_absolute_'.$i)->setErrors(array("Must wait at least 1 hour to rebroadcast"));
$valid = false; $valid = false;
} }
} }
return $valid; return $valid;
} }
} }

18
application/forms/AddShowRebroadcastDates.php
View File

@ -12,7 +12,7 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
$relativeDates = array(); $relativeDates = array();
$relativeDates[""] = ""; $relativeDates[""] = "";
for($i=0; $i<=30; $i++) { for($i=0; $i<=30; $i++) {
$relativeDates["$i days"] = "+$i days"; $relativeDates["$i days"] = "+$i days";
} }
for($i=1; $i<=10; $i++) { for($i=1; $i<=10; $i++) {
@ -40,12 +40,18 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
$valid = true; $valid = true;
for($i=1; $i<=5; $i++) { for($i=1; $i<=5; $i++) {
$days = $formData['add_show_rebroadcast_date_'.$i]; $days = $formData['add_show_rebroadcast_date_'.$i];
if($days == "") { if(trim($days) == "") {
continue; continue;
} }
$time = $formData['add_show_rebroadcast_time_'.$i];
if (trim($time) == ""){
$this->getElement('add_show_rebroadcast_time_'.$i)->setErrors(array("Time must be specified"));
$valid = false;
}
$days = explode(" ", $days); $days = explode(" ", $days);
$day = $days[0]; $day = $days[0];
@ -59,7 +65,7 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
$show_end->add(new DateInterval("PT$duration[0]H")); $show_end->add(new DateInterval("PT$duration[0]H"));
$show_end->add(new DateInterval("PT$duration[1]M")); $show_end->add(new DateInterval("PT$duration[1]M"));
$show_end->add(new DateInterval("PT1H"));//min time to wait until a rebroadcast $show_end->add(new DateInterval("PT1H"));//min time to wait until a rebroadcast
$rebroad_start = $formData['add_show_start_date']."".$formData['add_show_rebroadcast_time_'.$i]; $rebroad_start = $formData['add_show_start_date']."".$formData['add_show_rebroadcast_time_'.$i];
$rebroad_start = new DateTime($rebroad_start); $rebroad_start = new DateTime($rebroad_start);
$rebroad_start->add(new DateInterval("P".$day."D")); $rebroad_start->add(new DateInterval("P".$day."D"));
@ -68,8 +74,8 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
$this->getElement('add_show_rebroadcast_time_'.$i)->setErrors(array("Must wait at least 1 hour to rebroadcast")); $this->getElement('add_show_rebroadcast_time_'.$i)->setErrors(array("Must wait at least 1 hour to rebroadcast"));
$valid = false; $valid = false;
} }
} }
return $valid; return $valid;
} }
} }