From 4a372715a36ad058b6de6f52a7254d6f639c1dc2 Mon Sep 17 00:00:00 2001
From: Yuchen Wang <yuchen@yuchen-MacBookPro.(none)>
Date: Thu, 12 Jan 2012 12:19:05 -0500
Subject: [PATCH] CC-3239: Create show form->Date start doesnt consider "Week
 starts on" parameter

Fixed
---
 .../application/controllers/ScheduleController.php | 14 ++++++++------
 airtime_mvc/public/js/airtime/schedule/add-show.js |  6 ++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index 9895b7d57..21ec7b96c 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -41,11 +41,11 @@ class ScheduleController extends Zend_Controller_Action
         $baseUrl = $request->getBaseUrl();
 
         $this->view->headScript()->appendFile($baseUrl.'/js/contextmenu/jjmenu.js','text/javascript');
-		$this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js','text/javascript');
-		$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js','text/javascript');
+	$this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js','text/javascript');
+	$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js','text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'/js/fullcalendar/fullcalendar.js','text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'/js/timepicker/jquery.ui.timepicker-0.0.6.js','text/javascript');
-		$this->view->headScript()->appendFile($baseUrl.'/js/colorpicker/js/colorpicker.js','text/javascript');
+	$this->view->headScript()->appendFile($baseUrl.'/js/colorpicker/js/colorpicker.js','text/javascript');
 
         //full-calendar-functions.js requires this variable, so that datePicker widget can be offset to server time instead of client time
         $this->view->headScript()->appendScript("var timezoneOffset = ".date("Z")."; //in seconds");
@@ -55,10 +55,10 @@ class ScheduleController extends Zend_Controller_Action
     	$this->view->headScript()->appendFile($baseUrl.'/js/airtime/schedule/schedule.js','text/javascript');
     	$this->view->headScript()->appendFile($baseUrl.'/js/meioMask/jquery.meio.mask.js','text/javascript');
 
-		$this->view->headLink()->appendStylesheet($baseUrl.'/css/jquery-ui-timepicker.css');
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/jquery-ui-timepicker.css');
         $this->view->headLink()->appendStylesheet($baseUrl.'/css/fullcalendar.css');
-		$this->view->headLink()->appendStylesheet($baseUrl.'/css/colorpicker/css/colorpicker.css');
-		$this->view->headLink()->appendStylesheet($baseUrl.'/css/add-show.css');
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/colorpicker/css/colorpicker.css');
+        $this->view->headLink()->appendStylesheet($baseUrl.'/css/add-show.css');
         $this->view->headLink()->appendStylesheet($baseUrl.'/css/contextmenu.css');
 
         Application_Model_Schedule::createNewFormSections($this->view);
@@ -67,6 +67,8 @@ class ScheduleController extends Zend_Controller_Action
         $user = new Application_Model_User($userInfo->id);
         $this->view->isAdmin = $user->isAdmin();
         $this->view->isProgramManager = $user->isUserType('P');
+        
+        $this->view->headScript()->appendScript("var weekStart = ".Application_Model_Preference::GetWeekStartDay().";");
     }
 
     public function eventFeedAction()
diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js
index 7ff725335..d052e1216 100644
--- a/airtime_mvc/public/js/airtime/schedule/add-show.js
+++ b/airtime_mvc/public/js/airtime/schedule/add-show.js
@@ -33,7 +33,8 @@ function createDateInput(el, onSelect) {
 			onSelect: onSelect,
 			dateFormat: 'yy-mm-dd',
 			closeText: 'Close',
-			showButtonPanel: true
+			showButtonPanel: true,
+                        firstDay: weekStart
 		});
 }
 
@@ -190,7 +191,8 @@ function setAddShowEvents() {
 		minDate: adjustDateToServerDate(new Date(), timezoneOffset),
 		dateFormat: 'yy-mm-dd',
 		closeText: 'Close',
-		showButtonPanel: true
+		showButtonPanel: true,
+                firstDay: weekStart
 	});
     form.find('input[name^="add_show_rebroadcast_time"]').timepicker({
         amPmText: ['', ''],