From 3d156a0516b41a4bc9f76b03e84529b530c45719 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Thu, 12 Apr 2012 10:01:22 -0400
Subject: [PATCH 1/7] CC-3612: Stream->Preferences-> inappropriate error
 message is popped up

-fixed
---
 airtime_mvc/application/forms/GeneralPreferences.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php
index e79a1d526..5ee581c9d 100644
--- a/airtime_mvc/application/forms/GeneralPreferences.php
+++ b/airtime_mvc/application/forms/GeneralPreferences.php
@@ -33,8 +33,8 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
             'required'   => false,
             'filters'    => array('StringTrim'),
             'validators' => array(array('regex', false,
-                array('/^[0-5][0-9](\.\d{1,6})?$/',
-                'messages' => 'enter a time in seconds 00{.000000}'))),
+                array('/^[0-9]{1,2}(\.\d{1,6})?$/',
+                'messages' => 'enter a time in seconds 0{.000000}'))),
             'value' => $defaultFade,
             'decorators' => array(
                 'ViewHelper'

From 0b1b7d0e9f792d2fa2319e9bd3c833d6e6c31981 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Thu, 12 Apr 2012 12:25:35 -0400
Subject: [PATCH 2/7] CC-3511: Pausing and then playing the live stream player
 should restart the stream at current time instead of playing from the buffer

-play/pause removed
---
 .../application/views/scripts/dashboard/stream-player.phtml     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
index b31757141..042531b68 100644
--- a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
+++ b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml
@@ -73,8 +73,6 @@ $(document).ready(function(){
     <div class="jp-type-single">
         <div id="jp_interface_1" class="jp-gui jp-interface">
             <ul class="jp-controls">
-                <li><a href="javascript:;" class="jp-play" tabindex="1">play</a></li>
-                <li><a href="javascript:;" class="jp-pause" tabindex="1">pause</a></li>
                 <li><a title="mute" tabindex="1" class="jp-mute" href="javascript:;">mute</a></li>
                 <li><a title="unmute" tabindex="1" class="jp-unmute" href="javascript:;">unmute</a></li>
                 <li><a title="max volume" tabindex="1" class="jp-volume-max" href="javascript:;">max volume</a></li>

From fbef6aa3c4e67e9c084bef0b7955007b660ddc69 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Thu, 12 Apr 2012 13:11:45 -0400
Subject: [PATCH 3/7] -remove reference to deleted meio mask jquery library

---
 airtime_mvc/public/js/airtime/schedule/add-show.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js
index 44766ddd9..e33b6fbea 100644
--- a/airtime_mvc/public/js/airtime/schedule/add-show.js
+++ b/airtime_mvc/public/js/airtime/schedule/add-show.js
@@ -483,7 +483,6 @@ function showErrorSections() {
         $("#schedule-record-rebroadcast").show();
         $("#add_show_rebroadcast_relative").show();
     }
-    $('input:text').setMask()
 }
 
 $(document).ready(function() {

From 04718a88ae4db24d9bc4c47f80f1d1848a355b04 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Thu, 12 Apr 2012 13:29:49 -0400
Subject: [PATCH 4/7] CC-3548: Schedule: Separate repeate show template and
 single instance on 'When' section

-done
---
 .../controllers/ScheduleController.php        | 36 ++++----
 airtime_mvc/application/models/Schedule.php   | 83 +++++++++++++++++++
 2 files changed, 102 insertions(+), 17 deletions(-)

diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index 487253647..5ad6ce234 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -464,6 +464,7 @@ class ScheduleController extends Zend_Controller_Action
         $showInstanceId = $this->_getParam('id');
                 
         $show_instance = CcShowInstancesQuery::create()->findPK($showInstanceId);
+        $show = new Application_Model_Show($show_instance->getDbShowId());
                 
         $starts_string = $show_instance->getDbStarts();
         $ends_string = $show_instance->getDbEnds();
@@ -474,15 +475,20 @@ class ScheduleController extends Zend_Controller_Action
         $starts_datetime->setTimezone(new DateTimeZone(date_default_timezone_get()));
         $ends_datetime->setTimezone(new DateTimeZone(date_default_timezone_get()));
 
-        $instance_duration = $starts_datetime->diff($ends_datetime);        
+        $instance_duration = $starts_datetime->diff($ends_datetime);  
+
+        $formWhat->populate(array('add_show_id' => $show->getId(),
+                    'add_show_instance_id' => $showInstanceId,
+                    'add_show_name' => $show->getName(),
+                    'add_show_url' => $show->getUrl(),
+                    'add_show_genre' => $show->getGenre(),
+                    'add_show_description' => $show->getDescription()));        
         
-        $formValues = array('add_show_start_date' => $starts_datetime->format("Y-m-d"),
+        $formWhen->populate(array('add_show_start_date' => $starts_datetime->format("Y-m-d"),
                                   'add_show_start_time' => $starts_datetime->format("H:i"),
         						  'add_show_end_date_no_repeat' => $ends_datetime->format("Y-m-d"),
         						  'add_show_end_time'	=> $ends_datetime->format("H:i"),
-                                  'add_show_duration' => $instance_duration->format("%h"));
-                                          
-        $formWhen->populate($formValues);
+                                  'add_show_duration' => $instance_duration->format("%h")));
 
         $formWhat->disable();
         $formWho->disable();
@@ -719,19 +725,15 @@ class ScheduleController extends Zend_Controller_Action
         foreach($js as $j){
             $data[$j["name"]] = $j["value"];
         }
-
         
-        $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'));
-        
-        $end_dt = new DateTime($data['add_show_end_date_no_repeat']." ".$data['add_show_end_time'], new DateTimeZone(date_default_timezone_get()));
-        $end_dt->setTimezone(new DateTimeZone('UTC'));
-                
-        //add_show_instance_id not being populated by populateShowInstanceFormAction.
-        $ccShowInstance = CcShowInstancesQuery::create()->findPK($data["add_show_instance_id"]);
-        $ccShowInstance->setDbStarts($start_dt);
-        $ccShowInstance->setDbEnds($end_dt);
-        $ccShowInstance->save();
+        $success = Application_Model_Schedule::updateShowInstance($data, $this);
+        if ($success){
+            $this->view->addNewShow = true;
+            $this->view->newForm = $this->view->render('schedule/add-show-form.phtml');
+        } else {
+            $this->view->addNewShow = false;
+            $this->view->form = $this->view->render('schedule/add-show-form.phtml');
+        }
     }
     
     public function editShowAction(){
diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php
index eb98f47d2..ae43c0331 100644
--- a/airtime_mvc/application/models/Schedule.php
+++ b/airtime_mvc/application/models/Schedule.php
@@ -629,6 +629,89 @@ class Application_Model_Schedule {
         $p_view->addNewShow = true;
     }
     
+    /* This function is responsible for handling the case where an individual 
+     * show instance in a repeating show was edited (via the context menu in the Calendar).
+     * There is still lots of clean-up to do. For example we shouldn't be passing $controller into
+     * this method to manipulate the view (this should be done inside the controller function). With
+     * 2.1 deadline looming, this is OK for now. -Martin */
+    public static function updateShowInstance($data, $controller){
+        $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
+        
+        $formWhat = new Application_Form_AddShowWhat();
+		$formWhen = new Application_Form_AddShowWhen();
+		$formRepeats = new Application_Form_AddShowRepeats();
+		$formWho = new Application_Form_AddShowWho();
+		$formStyle = new Application_Form_AddShowStyle();
+		$formLive = new Application_Form_AddShowLiveStream();
+
+		$formWhat->removeDecorator('DtDdWrapper');
+		$formWhen->removeDecorator('DtDdWrapper');
+		$formRepeats->removeDecorator('DtDdWrapper');
+		$formWho->removeDecorator('DtDdWrapper');
+		$formStyle->removeDecorator('DtDdWrapper');
+		$formLive->removeDecorator('DtDdWrapper');
+        
+        if(!$isSaas){
+            $formRecord = new Application_Form_AddShowRR();
+            $formAbsoluteRebroadcast = new Application_Form_AddShowAbsoluteRebroadcastDates();
+            $formRebroadcast = new Application_Form_AddShowRebroadcastDates();
+
+            $formRecord->removeDecorator('DtDdWrapper');
+            $formAbsoluteRebroadcast->removeDecorator('DtDdWrapper');
+            $formRebroadcast->removeDecorator('DtDdWrapper');
+        }
+        $when = $formWhen->isValid($data);
+        
+        if($when && $formWhen->checkReliantFields($data, true)) {        
+            $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'));
+            
+            $end_dt = new DateTime($data['add_show_end_date_no_repeat']." ".$data['add_show_end_time'], new DateTimeZone(date_default_timezone_get()));
+            $end_dt->setTimezone(new DateTimeZone('UTC'));
+                    
+            $ccShowInstance = CcShowInstancesQuery::create()->findPK($data["add_show_instance_id"]);
+            $ccShowInstance->setDbStarts($start_dt);
+            $ccShowInstance->setDbEnds($end_dt);
+            $ccShowInstance->save();    
+        
+            Application_Model_Schedule::createNewFormSections($controller->view);
+            
+            return true;
+        } else {
+            $formWhat->disable();
+            $formWhen->disableRepeatCheckbox();
+            $formRepeats->disable();
+            $formWho->disable();
+            $formStyle->disable();
+            //$formLive->disable();
+        
+            $controller->view->what = $formWhat;
+            $controller->view->when = $formWhen;
+            $controller->view->repeats = $formRepeats;
+            $controller->view->who = $formWho;
+            $controller->view->style = $formStyle;
+            $controller->view->live = $formLive; 
+            if(!$isSaas){
+                $controller->view->rr = $formRecord;
+                $controller->view->absoluteRebroadcast = $formAbsoluteRebroadcast;
+                $controller->view->rebroadcast = $formRebroadcast;
+                
+                //$formRecord->disable();
+                //$formAbsoluteRebroadcast->disable();
+                //$formRebroadcast->disable();
+            }
+            return false;
+        }    
+    }
+    
+    /* This function is responsible for handling the case where the entire show (not a single show instance) 
+     * was edited (via the context menu in the Calendar).
+     * There is still lots of clean-up to do. For example we shouldn't be passing $controller into
+     * this method to manipulate the view (this should be done inside the controller function). With
+     * 2.1 deadline looming, this is OK for now.
+     * Another clean-up is to move all the form manipulation to the proper form class.....
+     * -Martin 
+     */
     public static function addUpdateShow($data, $controller, $validateStartDate){
     
         $userInfo = Zend_Auth::getInstance()->getStorage()->read();

From 83d78eb0ddf06181b9821d3f127a2544b2c69d9b Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Thu, 12 Apr 2012 13:36:36 -0400
Subject: [PATCH 5/7] -check if exec function is available before using it

---
 airtime_mvc/application/models/Preference.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index 1d1193334..a267c142a 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -543,7 +543,7 @@ class Application_Model_Preference
     }
 
     public static function GetAirtimeVersion(){
-        if (defined('APPLICATION_ENV') && APPLICATION_ENV == "development"){
+        if (defined('APPLICATION_ENV') && APPLICATION_ENV == "development" && function_exists('exec')){
             return self::GetValue("system_version")."+".exec("git rev-parse --short HEAD");
         } else {
             return self::GetValue("system_version");

From a2fedaa3f195eef5c190d14c1809809a5a5e3969 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Thu, 12 Apr 2012 13:36:45 -0400
Subject: [PATCH 6/7] CC-3621: Calendar -> show contents (for a 24 hours show):
 It display "0:00:00" as total time of 24 hours show

-fixed
---
 airtime_mvc/application/models/ShowInstance.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php
index 8e096aad3..fa7cf76fd 100644
--- a/airtime_mvc/application/models/ShowInstance.php
+++ b/airtime_mvc/application/models/ShowInstance.php
@@ -609,7 +609,10 @@ class Application_Model_ShowInstance {
         $end = $this->getShowInstanceEnd(null);
 
         $interval = $start->diff($end);
-        return $interval->format("%h:%I:%S");
+        $days = $interval->format("%d");
+        
+        if ($days > 0) return "24:" . $interval->format("%I:%S");
+        else return $interval->format("%h:%I:%S");
     }
 
     public function getShowListContent()

From c2db20f0048ca2af79171f255a1c2b8e35cb70d6 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Thu, 12 Apr 2012 15:10:40 -0400
Subject: [PATCH 7/7] CC-3548: Schedule: Separate repeate show template and
 single instance on 'When' section

-cleanup
---
 airtime_mvc/application/models/Schedule.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php
index ae43c0331..48343b891 100644
--- a/airtime_mvc/application/models/Schedule.php
+++ b/airtime_mvc/application/models/Schedule.php
@@ -635,7 +635,7 @@ class Application_Model_Schedule {
      * this method to manipulate the view (this should be done inside the controller function). With
      * 2.1 deadline looming, this is OK for now. -Martin */
     public static function updateShowInstance($data, $controller){
-        $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
+        $isSaas = (Application_Model_Preference::GetPlanLevel() != 'disabled');
         
         $formWhat = new Application_Form_AddShowWhat();
 		$formWhen = new Application_Form_AddShowWhen();
@@ -718,7 +718,7 @@ class Application_Model_Schedule {
         $user = new Application_Model_User($userInfo->id);
         $isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));
 
-        $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true;
+        $isSaas = (Application_Model_Preference::GetPlanLevel() != 'disabled');
         $record = false;
 
         $formWhat = new Application_Form_AddShowWhat();