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

airtime_mvc/application/controllers/ScheduleController.php

@@ -900,15 +900,19 @@ class ScheduleController extends Zend_Controller_Action
         $startParam = $this->_getParam('startTime');
         $endParam = $this->_getParam('endTime');
         
-        $startDateTime = new DateTime($startParam);
-        $endDateTime = new DateTime($endParam);
+        try{
+            $startDateTime = new DateTime($startParam);
+            $endDateTime = new DateTime($endParam);
         
-        $UTCStartDateTime = $startDateTime->setTimezone(new DateTimeZone('UTC'));
-        $UTCEndDateTime = $endDateTime->setTimezone(new DateTimeZone('UTC'));
+            $UTCStartDateTime = $startDateTime->setTimezone(new DateTimeZone('UTC'));
+            $UTCEndDateTime = $endDateTime->setTimezone(new DateTimeZone('UTC'));
         
-        $duration = $UTCEndDateTime->diff($UTCStartDateTime);
+            $duration = $UTCEndDateTime->diff($UTCStartDateTime);
         
-        $result = $duration->format('%r%Hh %Im');
+            $result = $duration->format('%r%Hh %Im');
+        }catch (Exception $e){
+            $result = "Invalid Date";
+        }
         
         echo Zend_Json::encode($result);
         exit();

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

@@ -46,6 +46,7 @@
         </dt>
         <dd id="add_show_duration-element">
             <?php echo $this->element->getElement('add_show_duration') ?>
+            <img id="icon-loader-small" src="/css/images/loader-small.gif" style="vertical-align:middle; display:none;"/>
         </dd>
         <?php if($this->element->getElement('add_show_duration')->hasErrors()){ ?>
                 <ul class='errors'>

airtime_mvc/application/views/scripts/partialviews/header.phtml

@@ -24,9 +24,12 @@
  	<h3>Source Streams</h3>
     <ul>
       <li>
-        <div id="scheduled_play_div" class="source-label"> Scheduled Play</div>
+        <div id="master_dj_div" class="source-label">
+          <a id="master_dj" class="source-kick-button" onclick="kickSource(this)"></a>
+          Master Source
+        </div>
         <div class="line-to-switch"></div>
-        <a href="#" id="scheduled_play" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->scheduled_play_switch?></span></a>
+        <a href="#" id="master_dj" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->master_dj_switch?></span></a>
         <div class="line-to-on-air"></div>
       </li>
       <li>
@@ -39,12 +42,9 @@
         <div class="line-to-on-air"></div>
       </li>
       <li>
-        <div id="master_dj_div" class="source-label">
-          <a id="master_dj" class="source-kick-button" onclick="kickSource(this)"></a>
-          Master Source
-        </div>
+        <div id="scheduled_play_div" class="source-label"> Scheduled Play</div>
         <div class="line-to-switch"></div>
-        <a href="#" id="master_dj" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->master_dj_switch?></span></a>
+        <a href="#" id="scheduled_play" class="source-switch-button" onclick="setSwitchListener(this);"><span><?php echo $this->scheduled_play_switch?></span></a>
         <div class="line-to-on-air"></div>
       </li>
     </ul>

airtime_mvc/public/js/airtime/dashboard/helperfunctions.js

@@ -24,6 +24,10 @@ function getDateFromString(time){
     var month = parseInt(date[1], 10) -1;
     var day = parseInt(date[2], 10);
     
+    if (isNaN(year) || isNaN(month) || isNaN(day)){
+        return null;
+    }
+    
     return new Date(year, month, day);
     
 }

airtime_mvc/public/js/airtime/dashboard/playlist.js

@@ -20,6 +20,11 @@ var live_dj_on_air = false;
 var scheduled_play_on_air = false;
 var scheduled_play_source = false;
 
+//keep track of how many UI refreshes the ON-AIR light has been off for.
+//For example, the uiUpdateInterval is every 200ms, so if onAirOffIterations
+//is 25, then that means 5 seconds have gone by.
+var onAirOffIterations = 0;
+
 //var timezoneOffset = 0;
 
 //set to "development" if we are developing :). Useful to disable alerts
@@ -326,9 +331,16 @@ function parseSwitchStatus(obj){
 }
 
 function controlOnAirLight(){
-    if((scheduled_play_on_air && scheduled_play_source)|| live_dj_on_air || master_dj_on_air){
+    if ((scheduled_play_on_air && scheduled_play_source) || live_dj_on_air || master_dj_on_air) {
         $('#on-air-info').attr("class", "on-air-info on");
-    }else{
+        onAirOffIterations = 0;
+    } else if (onAirOffIterations < 15) {
+        //if less than 3 seconds have gone by (< 15 executions of this function)
+        //then keep the ON-AIR light on. Only after at least 3 seconds have gone by, 
+        //should we be allowed to turn it off. This is to stop the light from temporarily turning
+        //off between tracks: CC-3725
+        onAirOffIterations++;
+    } else {
         $('#on-air-info').attr("class", "on-air-info off");
     }
 }

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

@@ -460,9 +460,12 @@ function setAddShowEvents() {
     })
 
 	function calculateDuration(endDateTime, startDateTime){
-		var duration;
+		var loadingIcon = $('#icon-loader-small');
+		
+		loadingIcon.show();
 		$.post("/Schedule/calculate-duration", {startTime: startDateTime, endTime: endDateTime}, function(data){
 		    $('#add_show_duration').val(JSON.parse(data));
+		    loadingIcon.hide();
 		});
 	}
 }