diff --git a/application/controllers/ScheduleController.php b/application/controllers/ScheduleController.php index bada06562..bbbf5e05f 100644 --- a/application/controllers/ScheduleController.php +++ b/application/controllers/ScheduleController.php @@ -478,8 +478,8 @@ class ScheduleController extends Zend_Controller_Action $rebroadcastAbsoluteFormValues = array(); $i = 1; foreach ($rebroadcastsAbsolute as $rebroadcast){ - $rebroadcastAbsoluteFormValues["add_show_rebroadcast_absolute_date_$i"] = $rebroadcast['start_date']; - $rebroadcastAbsoluteFormValues["add_show_rebroadcast_absolute_time_$i"] = Show::removeSecondsFromTime($rebroadcast['start_time']); + $rebroadcastAbsoluteFormValues["add_show_rebroadcast_date_absolute_$i"] = $rebroadcast['start_date']; + $rebroadcastAbsoluteFormValues["add_show_rebroadcast_time_absolute_$i"] = Show::removeSecondsFromTime($rebroadcast['start_time']); $i++; } $formAbsoluteRebroadcast->populate($rebroadcastAbsoluteFormValues); diff --git a/application/forms/AddShowAbsoluteRebroadcastDates.php b/application/forms/AddShowAbsoluteRebroadcastDates.php index 8c87b66c7..ab6f9891b 100644 --- a/application/forms/AddShowAbsoluteRebroadcastDates.php +++ b/application/forms/AddShowAbsoluteRebroadcastDates.php @@ -11,7 +11,7 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm for($i=1; $i<=10; $i++) { - $text = new Zend_Form_Element_Text("add_show_rebroadcast_absolute_date_$i"); + $text = new Zend_Form_Element_Text("add_show_rebroadcast_date_absolute_$i"); $text->setAttrib('class', 'input_text'); $text->addFilter('StringTrim'); $text->addValidator('date', false, array('YYYY-MM-DD')); @@ -19,7 +19,7 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm $text->setDecorators(array('ViewHelper')); $this->addElement($text); - $text = new Zend_Form_Element_Text("add_show_rebroadcast_absolute_time_$i"); + $text = new Zend_Form_Element_Text("add_show_rebroadcast_time_absolute_$i"); $text->setAttrib('class', 'input_text'); $text->addFilter('StringTrim'); $text->addValidator('date', false, array('HH:mm')); @@ -34,9 +34,9 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm $valid = true; - for($i=1; $i<=5; $i++) { + for($i=1; $i<=10; $i++) { - $day = $formData['add_show_rebroadcast_absolute_date_'.$i]; + $day = $formData['add_show_rebroadcast_date_absolute_'.$i]; if($day == "") { continue; @@ -52,11 +52,11 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm $show_end->add(new DateInterval("PT$duration[1]M")); $show_end->add(new DateInterval("PT1H"));//min time to wait until a rebroadcast - $rebroad_start = $day."".$formData['add_show_rebroadcast_absolute_time_'.$i]; + $rebroad_start = $day."".$formData['add_show_rebroadcast_time_absolute_'.$i]; $rebroad_start = new DateTime($rebroad_start); if($rebroad_start < $show_end) { - $this->getElement('add_show_rebroadcast_absolute_time_'.$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; } } diff --git a/application/models/Shows.php b/application/models/Shows.php index 6be170dd9..f973eba7d 100644 --- a/application/models/Shows.php +++ b/application/models/Shows.php @@ -656,7 +656,7 @@ class Show { //adding rows to cc_show_rebroadcast if ($isRecorded && $data['add_show_rebroadcast'] && $repeatType != -1) { - for ($i=1; $i<=5; $i++) { + for ($i=1; $i<=10; $i++) { if ($data['add_show_rebroadcast_date_'.$i]) { $showRebroad = new CcShowRebroadcast(); @@ -668,16 +668,16 @@ class Show { } } else if ($isRecorded && $data['add_show_rebroadcast'] && $repeatType == -1){ - for ($i=1; $i<=5; $i++) { + for ($i=1; $i<=10; $i++) { - if ($data['add_show_rebroadcast_absolute_date_'.$i]) { - $sql = "SELECT date '{$data['add_show_rebroadcast_absolute_date_'.$i]}' - date '{$data['add_show_start_date']}' "; + if ($data['add_show_rebroadcast_date_absolute_'.$i]) { + $sql = "SELECT date '{$data['add_show_rebroadcast_date_absolute_'.$i]}' - date '{$data['add_show_start_date']}' "; $r = $con->query($sql); $offset_days = $r->fetchColumn(0); $showRebroad = new CcShowRebroadcast(); $showRebroad->setDbDayOffset($offset_days." days"); - $showRebroad->setDbStartTime($data['add_show_rebroadcast_absolute_time_'.$i]); + $showRebroad->setDbStartTime($data['add_show_rebroadcast_time_absolute_'.$i]); $showRebroad->setDbShowId($showId); $showRebroad->save(); } diff --git a/application/views/scripts/form/add-show-rebroadcast-absolute.phtml b/application/views/scripts/form/add-show-rebroadcast-absolute.phtml index d235a6ae9..f8fc2d81c 100644 --- a/application/views/scripts/form/add-show-rebroadcast-absolute.phtml +++ b/application/views/scripts/form/add-show-rebroadcast-absolute.phtml @@ -5,18 +5,24 @@
diff --git a/application/views/scripts/form/add-show-rebroadcast.phtml b/application/views/scripts/form/add-show-rebroadcast.phtml index 44ae45b0c..2f090a00e 100644 --- a/application/views/scripts/form/add-show-rebroadcast.phtml +++ b/application/views/scripts/form/add-show-rebroadcast.phtml @@ -4,30 +4,40 @@
- + + + Add +
diff --git a/public/js/airtime/schedule/add-show.js b/public/js/airtime/schedule/add-show.js index 0c4659fac..2bc224686 100644 --- a/public/js/airtime/schedule/add-show.js +++ b/public/js/airtime/schedule/add-show.js @@ -150,14 +150,55 @@ function setAddShowEvents() { defaultTime: '01:00' }); - form.find('input[name^="add_show_rebroadcast_absolute_date"]').datepicker({ + form.find('input[name^="add_show_rebroadcast_date_absolute"]').datepicker({ minDate: new Date(), dateFormat: 'yy-mm-dd' }); - form.find('input[name^="add_show_rebroadcast_absolute_time"], input[name^="add_show_rebroadcast_time"]').timepicker({ + form.find('input[name^="add_show_rebroadcast_time"]').timepicker({ amPmText: ['', ''], defaultTime: '' }); + + form.find(".add_absolute_rebroadcast_day").click(function(){ + var li = $(this).prev().find("li:visible:last").next(); + + li.show(); + li = li.next(); + if(li.length === 0) { + $(this).hide(); + } + }); + + form.find('a[id^="remove_rebroadcast"]').click(function(){ + var list = $(this).parent().parent(); + var li_num = $(this).parent().index(); + var num = list.find("li").length; + var count = num - li_num; + + var curr = $(this).parent(); + var next = curr.next(); + + for(var i=0; i<=count; i++) { + var date = next.find('[name^="add_show_rebroadcast_date"]').val(); + curr.find('[name^="add_show_rebroadcast_date"]').val(date); + var time = next.find('[name^="add_show_rebroadcast_time"]').val(); + curr.find('[name^="add_show_rebroadcast_time"]').val(time); + + curr = next; + next = curr.next(); + } + + list.find("li:visible:last") + .find('[name^="add_show_rebroadcast_date"]') + .val('') + .end() + .find('[name^="add_show_rebroadcast_time"]') + .val('') + .end() + .hide(); + + list.next().show(); + }); form.find("#add_show_hosts_autocomplete").autocomplete({ source: findHosts, @@ -166,7 +207,7 @@ function setAddShowEvents() { }); form.find("#schedule-show-style input").ColorPicker({ - onChange: function (hsb, hex, rgb, el) { + onChange: function (hsb, hex, rgb, el) { $(el).val(hex); }, onSubmit: function(hsb, hex, rgb, el) { @@ -186,15 +227,17 @@ function setAddShowEvents() { var y = $("#schedule_calendar").width(); var z = $("#schedule-add-show").width(); - $("#schedule_calendar").width(y+z+50); - $("#schedule_calendar").fullCalendar('render'); + + $("#schedule_calendar").width(y+z+50) + .fullCalendar('render'); + $("#add-show-form").hide(); $.get("/Schedule/get-form", {format:"json"}, function(json){ - $("#add-show-form") - .empty() - .append(json.form); + $("#add-show-form") + .empty() + .append(json.form); - setAddShowEvents(); + setAddShowEvents(); }); makeAddShowButton(); }); @@ -204,7 +247,8 @@ function setAddShowEvents() { var addShowButton = $(this); if (!addShowButton.hasClass("disabled")){ addShowButton.addClass("disabled"); - } else { + } + else { return; }