From 0d5f581e35a97f9cd3b61bdfc17fe96006f469b3 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Fri, 27 Apr 2012 14:07:14 -0400
Subject: [PATCH] CC-3731: Can add a show of zero length

- fixed
- extra fix: Changed all the duration format so it's consistent
---
 airtime_mvc/application/forms/AddShowWhen.php | 6 +++---
 airtime_mvc/application/models/Schedule.php   | 2 +-
 airtime_mvc/application/models/Show.php       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/airtime_mvc/application/forms/AddShowWhen.php b/airtime_mvc/application/forms/AddShowWhen.php
index 4372a9b6c..0b7da6155 100644
--- a/airtime_mvc/application/forms/AddShowWhen.php
+++ b/airtime_mvc/application/forms/AddShowWhen.php
@@ -69,7 +69,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
         $this->addElement('text', 'add_show_duration', array(
         	'label'		 => 'Duration:',
             'class'      => 'input_text',
-        	'value'		 => '01h00m',
+        	'value'		 => '01h 00m',
         	'readonly'	 => true,
             'decorators'  => array('ViewHelper')
         ));
@@ -99,8 +99,8 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
 	        }
 	    }
 	    
-        if( $formData["add_show_duration"] == "0m" ) {
-            $this->getElement('add_show_duration')->setErrors(array('Cannot have duration 0m'));
+        if( $formData["add_show_duration"] == "00h 00m" ) {
+            $this->getElement('add_show_duration')->setErrors(array('Cannot have duration 00h 00m'));
             $valid = false;
         }elseif(strpos($formData["add_show_duration"], 'h') !== false && intval(substr($formData["add_show_duration"], 0, strpos($formData["add_show_duration"], 'h'))) > 24) {
             $this->getElement('add_show_duration')->setErrors(array('Cannot have duration greater than 24h'));
diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php
index 71538520b..97d8c9f03 100644
--- a/airtime_mvc/application/models/Schedule.php
+++ b/airtime_mvc/application/models/Schedule.php
@@ -618,7 +618,7 @@ class Application_Model_Schedule {
                                       'add_show_start_time' => '00:00',
                                       'add_show_end_date_no_repeate' => date("Y-m-d"),
                                       'add_show_end_time' => '01:00',
-                                      'add_show_duration' => '1h'));
+                                      'add_show_duration' => '01h 00m'));
 
         $formRepeats->populate(array('add_show_end_date' => date("Y-m-d")));
 
diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index b3fa0f0f1..457000284 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -765,7 +765,7 @@ class Application_Model_Show {
             return $showDay->getDbDuration();
         }else{
             $info = explode(':',$showDay->getDbDuration());
-            return ($info[0] != 0 ? intval($info[0]).'h'.' ' : '').($info[1] != 0 ? intval($info[1]).'m' : '');
+            return str_pad(intval($info[0]),2,'0',STR_PAD_LEFT).'h '.str_pad(intval($info[1]),2,'0',STR_PAD_LEFT).'m';
         }
     }