CC-6064: Allow shows to be started "now"

airtime_mvc/application/controllers/ScheduleController.php

@@ -98,6 +98,9 @@ class ScheduleController extends Zend_Controller_Action
         $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.columnFilter.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
 
+        $this->view->headScript()->appendFile($baseUrl.'js/libs/moment.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'js/libs/moment-timezone-with-data-2010-2020.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
+
         $this->view->headScript()->appendFile($baseUrl.'js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/airtime/library/events/library_showbuilder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/airtime/library/library.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
@@ -584,7 +587,20 @@ class ScheduleController extends Zend_Controller_Action
         $forms = $this->createShowFormAction();
         
         $this->view->addNewShow = true;
-        
+
+        if ($data['add_show_start_now'] == "now") {
+
+            //have to use the timezone the user has entered in the form to check past/present
+            $showTimezone = new DateTimeZone($data["add_show_timezone"]);
+            $nowDateTime = new DateTime("now", $showTimezone);
+            //$showStartDateTime = new DateTime($start_time, $showTimezone);
+            //$showEndDateTime = new DateTime($end_time, $showTimezone);
+
+            $data['add_show_start_time'] = $nowDateTime->format("H:i");
+            $data['add_show_start_date'] = $nowDateTime->format("Y-m-d");
+        }
+
+
         if ($service_showForm->validateShowForms($forms, $data)) {
         	// Get the show ID from the show service to pass as a parameter to the RESTful ShowImageController
         	$this->view->showId = $service_show->addUpdateShow($data);

airtime_mvc/application/forms/AddShowWhen.php

@@ -15,11 +15,26 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
             "/^[0-2]?[0-9]:[0-5][0-9]$/",
             _("'%value%' does not fit the time format 'HH:mm'"));
 
+
+        // Add start date element
+        $startNow = new Zend_Form_Element_Radio('add_show_start_now');
+        $startNow->setRequired(false)
+            ->setLabel(_('Start Time:'))
+            ->addMultiOptions(array(
+                'now' => 'Now',
+                'future' => 'In the Future:'
+            ))
+            ->setValue('future')
+            ->setDecorators(array('ViewHelper'));
+        //$startDate->setAttrib('alt', 'date');
+        $this->addElement($startNow);
+
+
         // Add start date element
         $startDate = new Zend_Form_Element_Text('add_show_start_date');
         $startDate->class = 'input_text';
         $startDate->setRequired(true)
-                    ->setLabel(_('Date/Time Start:'))
+                    ->setLabel(_('In the Future:'))
                     ->setValue(date("Y-m-d"))
                     ->setFilters(array('StringTrim'))
                     ->setValidators(array(
@@ -46,7 +61,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
         $endDate = new Zend_Form_Element_Text('add_show_end_date_no_repeat');
         $endDate->class = 'input_text';
         $endDate->setRequired(true)
-                    ->setLabel(_('Date/Time End:'))
+                    ->setLabel(_('End Time:'))
                     ->setValue(date("Y-m-d"))
                     ->setFilters(array('StringTrim'))
                     ->setValidators(array(
@@ -119,7 +134,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
         $showStartDateTime = new DateTime($start_time, $showTimezone);
         $showEndDateTime = new DateTime($end_time, $showTimezone);
 
-        if ($validateStartDate) {
+        if ($validateStartDate && ($formData['add_show_start_now'] != "now")) {
             if ($showStartDateTime < $nowDateTime) {
                 $this->getElement('add_show_start_time')->setErrors(array(_('Cannot create show in the past')));
                 $valid = false;

airtime_mvc/application/services/ShowFormService.php

@@ -169,6 +169,9 @@ class Application_Service_ShowFormService
             }
         }
 
+        //Disable starting a show 'now' when editing an existing show.
+        $form->getElement('add_show_start_now')->setAttrib('disable', array('now'));
+
         $form->populate(
             array(
                 'add_show_start_date' => $showStart->format("Y-m-d"),
@@ -225,8 +228,12 @@ class Application_Service_ShowFormService
             $form->disableStartDateAndTime();
         }
 
+        //Disable starting a show 'now' when editing an existing show.
+        $form->getElement('add_show_start_now')->setAttrib('disable', array('now'));
+
         $form->populate(
             array(
+                'add_show_start_now' => 'future',
                 'add_show_start_date' => $showStart->format("Y-m-d"),
                 'add_show_start_time' => $showStart->format("H:i"),
                 'add_show_end_date_no_repeat' => $showEnd->format("Y-m-d"),

airtime_mvc/application/views/scripts/form/add-show-when.phtml

@@ -1,8 +1,18 @@
 <fieldset>
     <dl>
+        <dt id="add_show_start_now-label">
+            <label for="add_show_start_now">
+                <?php echo $this->element->getElement('add_show_start_now')->getLabel()?>
+            </label>
+        </dt>
+        <dd>
+            <?php echo $this->element->getElement('add_show_start_now') ?>
+        </dd>
+
+
         <dt id="add_show_start_date-label">
             <label for="add_show_start_date" class="required">
-                <?php echo $this->element->getElement('add_show_start_date')->getLabel()?>
+                <?php //echo $this->element->getElement('add_show_start_date')->getLabel()?>
             </label>
         </dt>
         <dd>
@@ -19,6 +29,9 @@
                     <?php endforeach; ?>
                 </ul>
         <?php } ?>
+
+
+
         <dt id="add_show_end_date_no_repeat-label">
             <label for="add_show_end_date_no_repeat" class="required">
                 <?php echo $this->element->getElement('add_show_end_date_no_repeat')->getLabel()?>

airtime_mvc/public/js/airtime/schedule/add-show.js

@@ -4,24 +4,15 @@
 *
 */
 
-function openAddShowForm() {
+function openAddShowForm(nowOrFuture) {
      if($("#add-show-form").length == 1) {
         if( ($("#add-show-form").css('display')=='none')) {
-            $("#add-show-form").show();
-            
-            /*
-            var windowWidth = $(window).width();
-            // margin on showform are 16 px on each side
-            var calendarWidth = 100-(($("#schedule-add-show").width() + (16 * 4))/windowWidth*100);
-            var widthPercent = parseInt(calendarWidth)+"%";
-            $("#schedule_calendar").css("width", widthPercent);
 
-            // 200 px for top dashboard and 50 for padding on main content
-            // this calculation was copied from schedule.js line 326
-            var mainHeight = document.documentElement.clientHeight - 200 - 50;
-            $('#schedule_calendar').fullCalendar('option', 'contentHeight', mainHeight);
-            */
-           windowResize();
+            $('#add_show_start_now-now').attr('checked', 'checked');
+            setupStartTimeWidgets();
+            $("#add-show-form").show();
+
+            windowResize();
         }
         $("#schedule-show-what").show(0, function(){
             $add_show_name = $("#add_show_name");
@@ -37,7 +28,7 @@ function makeAddShowButton(){
         .append('<span class="fc-button"><a href="#" class="add-button"><span class="add-icon"></span>'+$.i18n._("Show")+'</a></span>')
         .find('span.fc-button:last > a')
             .click(function(){
-                openAddShowForm();
+                openAddShowForm(true);
                 removeAddShowButton();
             });
 }
@@ -51,6 +42,30 @@ function removeAddShowButton(){
     span.remove();
 }
 
+function setupStartTimeWidgets() {
+
+    if ($('input[name=add_show_start_now]:checked').val() == 'now') {
+        $('#add_show_start_date').prop('disabled', 'true');
+        $('#add_show_start_time').prop('disabled', 'true');
+        var currentTimezone = $("#add_show_timezone").val();
+
+        //Set the show start time to now (in the show timezone)
+        var now = moment(new Date()).tz(currentTimezone);
+        $('#add_show_start_date').val(now.format('YYYY-MM-DD'));
+        $('#add_show_start_time').val(now.format('HH:mm'));
+
+        //Set the show end time to be now + 1 hour.
+        var nowShowEnd = now.add(1, 'h');
+        $('#add_show_end_date').val(nowShowEnd.format('YYYY-MM-DD'));
+        $('#add_show_end_date_no_repeat').val(nowShowEnd.format('YYYY-MM-DD'));
+        $('#add_show_end_time').val(nowShowEnd.format('HH:mm'));
+
+    } else {
+        $('#add_show_start_date').removeProp('disabled');
+        $('#add_show_start_time').removeProp('disabled');
+    }
+}
+
 //$el is DOM element #add-show-form
 //form is the new form contents to append to $el
 function redrawAddShowForm($el, form) {
@@ -218,6 +233,12 @@ function setAddShowEvents(form) {
         $(this).next().toggle();
     });
 
+
+    form.find('input:radio[name=add_show_start_now]').click(function() {
+        setupStartTimeWidgets();
+    });
+
+
     if(!form.find("#add_show_repeats").attr('checked')) {
         form.find("#schedule-show-when > fieldset:last").hide();
         $("#add_show_rebroadcast_relative").hide();

airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js

@@ -99,6 +99,11 @@ function dayClick(date, allDay, jsEvent, view){
             chosenDate = selected.getFullYear() + '-' + pad(selected.getMonth()+1,2) + '-' + pad(selected.getDate(),2);
             var endDateFormat = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2);
 
+
+            //TODO: This should all be refactored into a proper initialize() function for the show form.
+            $("#add_show_start_now-future").attr('checked', 'checked');
+            $("#add_show_start_now-now").removeProp('disabled');
+            setupStartTimeWidgets(); //add-show.js
             $("#add_show_start_date").val(chosenDate);
             $("#add_show_end_date_no_repeat").val(endDateFormat);
             $("#add_show_end_date").val(endDateFormat);

airtime_mvc/public/js/libs/moment-timezone.min.js

@@ -0,0 +1,6 @@
+//! moment-timezone.js
+//! version : 0.4.0
+//! author : Tim Wood
+//! license : MIT
+//! github.com/moment/moment-timezone
+!function(a,b){"use strict";"function"==typeof define&&define.amd?define(["moment"],b):"object"==typeof exports?module.exports=b(require("moment")):b(a.moment)}(this,function(a){"use strict";function b(a){return a>96?a-87:a>64?a-29:a-48}function c(a){var c,d=0,e=a.split("."),f=e[0],g=e[1]||"",h=1,i=0,j=1;for(45===a.charCodeAt(0)&&(d=1,j=-1),d;d<f.length;d++)c=b(f.charCodeAt(d)),i=60*i+c;for(d=0;d<g.length;d++)h/=60,c=b(g.charCodeAt(d)),i+=c*h;return i*j}function d(a){for(var b=0;b<a.length;b++)a[b]=c(a[b])}function e(a,b){for(var c=0;b>c;c++)a[c]=Math.round((a[c-1]||0)+6e4*a[c]);a[b-1]=1/0}function f(a,b){var c,d=[];for(c=0;c<b.length;c++)d[c]=a[b[c]];return d}function g(a){var b=a.split("|"),c=b[2].split(" "),g=b[3].split(""),h=b[4].split(" ");return d(c),d(g),d(h),e(h,g.length),{name:b[0],abbrs:f(b[1].split(" "),g),offsets:f(c,g),untils:h}}function h(a){a&&this._set(g(a))}function i(a){return(a||"").toLowerCase().replace(/\//g,"_")}function j(a){var b,c,d;for("string"==typeof a&&(a=[a]),b=0;b<a.length;b++)c=a[b].split("|")[0],d=i(c),v[d]=a[b],x[d]=c}function k(a,b){a=i(a);var c,d=v[a];return d instanceof h?d:"string"==typeof d?(d=new h(d),v[a]=d,d):w[a]&&b!==k&&(c=k(w[a],k))?(d=v[a]=new h,d._set(c),d.name=x[a],d):null}function l(){var a,b=[];for(a in x)x.hasOwnProperty(a)&&(v[a]||v[w[a]])&&x[a]&&b.push(x[a]);return b.sort()}function m(a){var b,c,d,e;for("string"==typeof a&&(a=[a]),b=0;b<a.length;b++)c=a[b].split("|"),d=i(c[0]),e=i(c[1]),w[d]=e,x[d]=c[0],w[e]=d,x[e]=c[1]}function n(a){j(a.zones),m(a.links),r.dataVersion=a.version}function o(a){return o.didShowError||(o.didShowError=!0,q("moment.tz.zoneExists('"+a+"') has been deprecated in favor of !moment.tz.zone('"+a+"')")),!!k(a)}function p(a){return!(!a._a||void 0!==a._tzm)}function q(a){"undefined"!=typeof console&&"function"==typeof console.error&&console.error(a)}function r(b){var c=Array.prototype.slice.call(arguments,0,-1),d=arguments[arguments.length-1],e=k(d),f=a.utc.apply(null,c);return e&&!a.isMoment(b)&&p(f)&&f.add(e.parse(f),"minutes"),f.tz(d),f}function s(a){return function(){return this._z?this._z.abbr(this):a.call(this)}}function t(a){return function(){return this._z=null,a.apply(this,arguments)}}if(void 0!==a.tz)return q("Moment Timezone "+a.tz.version+" was already loaded "+(a.tz.dataVersion?"with data from ":"without any data")+a.tz.dataVersion),a;var u="0.4.0",v={},w={},x={},y=a.version.split("."),z=+y[0],A=+y[1];(2>z||2===z&&6>A)&&q("Moment Timezone requires Moment.js >= 2.6.0. You are using Moment.js "+a.version+". See momentjs.com"),h.prototype={_set:function(a){this.name=a.name,this.abbrs=a.abbrs,this.untils=a.untils,this.offsets=a.offsets},_index:function(a){var b,c=+a,d=this.untils;for(b=0;b<d.length;b++)if(c<d[b])return b},parse:function(a){var b,c,d,e,f=+a,g=this.offsets,h=this.untils,i=h.length-1;for(e=0;i>e;e++)if(b=g[e],c=g[e+1],d=g[e?e-1:e],c>b&&r.moveAmbiguousForward?b=c:b>d&&r.moveInvalidForward&&(b=d),f<h[e]-6e4*b)return g[e];return g[i]},abbr:function(a){return this.abbrs[this._index(a)]},offset:function(a){return this.offsets[this._index(a)]}},r.version=u,r.dataVersion="",r._zones=v,r._links=w,r._names=x,r.add=j,r.link=m,r.load=n,r.zone=k,r.zoneExists=o,r.names=l,r.Zone=h,r.unpack=g,r.unpackBase60=c,r.needsOffset=p,r.moveInvalidForward=!0,r.moveAmbiguousForward=!1;var B=a.fn;a.tz=r,a.defaultZone=null,a.updateOffset=function(b,c){var d,e=a.defaultZone;void 0===b._z&&(e&&p(b)&&!b._isUTC&&(b._d=a.utc(b._a)._d,b.utc().add(e.parse(b),"minutes")),b._z=e),b._z&&(d=b._z.offset(b),Math.abs(d)<16&&(d/=60),void 0!==b.utcOffset?b.utcOffset(-d,c):b.zone(d,c))},B.tz=function(b){return b?(this._z=k(b),this._z?a.updateOffset(this):q("Moment Timezone has no data for "+b+". See http://momentjs.com/timezone/docs/#/data-loading/."),this):this._z?this._z.name:void 0},B.zoneName=s(B.zoneName),B.zoneAbbr=s(B.zoneAbbr),B.utc=t(B.utc),a.tz.setDefault=function(b){return(2>z||2===z&&9>A)&&q("Moment Timezone setDefault() requires Moment.js >= 2.9.0. You are using Moment.js "+a.version+"."),a.defaultZone=b?k(b):null,a};var C=a.momentProperties;return"[object Array]"===Object.prototype.toString.call(C)?(C.push("_z"),C.push("_a")):C&&(C._z=null),a});