From 9e8fdb50cae79de630f5b0165dd1e294afc12720 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 24 Sep 2013 15:04:25 -0400 Subject: [PATCH] CC-5323: User's Timezone Can Improperly Edit Show --- .../controllers/ScheduleController.php | 21 +++++++++++++++ airtime_mvc/application/forms/AddShowWhen.php | 9 +++++++ .../application/models/airtime/CcShowDays.php | 9 ++++--- .../application/services/ShowFormService.php | 27 ++++++++++++++++++- .../views/scripts/form/add-show-when.phtml | 10 +++++++ airtime_mvc/public/css/styles.css | 4 +++ .../public/js/airtime/schedule/add-show.js | 24 +++++++++++++++++ 7 files changed, 99 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index e13547c88..0fc7a1f3a 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -35,6 +35,7 @@ class ScheduleController extends Zend_Controller_Action ->addActionContext('calculate-duration', 'json') ->addActionContext('get-current-show', 'json') ->addActionContext('update-future-is-scheduled', 'json') + ->addActionContext('localize-start-end-time', 'json') ->initContext(); $this->sched_sess = new Zend_Session_Namespace("schedule"); @@ -641,4 +642,24 @@ class ScheduleController extends Zend_Controller_Action $redrawLibTable = Application_Model_StoredFile::setIsScheduled($schedId, false); $this->_helper->json->sendJson(array("redrawLibTable" => $redrawLibTable)); } + + /** + * When the timezone is changed in add-show form this function + * applies the new timezone to the start and end time + */ + public function localizeStartEndTimeAction() + { + $service_showForm = new Application_Service_ShowFormService( + $this->_getParam("showId")); + $timezone = $this->_getParam('timezone'); + $localTime = array(); + + $localTime["start"] = $service_showForm->localizeDateTime( + $this->_getParam('startDate'), $this->_getParam('startTime'), $timezone); + + $localTime["end"] = $service_showForm->localizeDateTime( + $this->_getParam('endDate'), $this->_getParam('endTime'), $timezone); + + $this->_helper->json->sendJson($localTime); + } } diff --git a/airtime_mvc/application/forms/AddShowWhen.php b/airtime_mvc/application/forms/AddShowWhen.php index 007852ba4..9be8aa218 100644 --- a/airtime_mvc/application/forms/AddShowWhen.php +++ b/airtime_mvc/application/forms/AddShowWhen.php @@ -78,6 +78,15 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm 'decorators' => array('ViewHelper') )); + $timezone = new Zend_Form_Element_Select('add_show_timezone'); + $timezone->setRequired(true) + ->setLabel(_("Timezone:")) + ->setMultiOptions(Application_Common_Timezone::getTimezones()) + ->setValue(Application_Model_Preference::GetDefaultTimezone()) + ->setAttrib('class', 'input_select add_show_input_select') + ->setDecorators(array('ViewHelper')); + $this->addElement($timezone); + // Add repeats element $this->addElement('checkbox', 'add_show_repeats', array( 'label' => _('Repeats?'), diff --git a/airtime_mvc/application/models/airtime/CcShowDays.php b/airtime_mvc/application/models/airtime/CcShowDays.php index 7b08204a2..215ebdcf8 100644 --- a/airtime_mvc/application/models/airtime/CcShowDays.php +++ b/airtime_mvc/application/models/airtime/CcShowDays.php @@ -31,6 +31,7 @@ class CcShowDays extends BaseCcShowDays { return $dt; } + // Returns the start of a show in the timezone it was created in public function getLocalStartDateAndTime() { $dt = new DateTime( @@ -38,16 +39,16 @@ class CcShowDays extends BaseCcShowDays { new DateTimeZone($this->getDbTimezone()) ); - //make timezone current user specific - $dt->setTimezone(new DateTimeZone(Application_Model_Preference::GetTimezone())); + //set timezone to that of the show + $dt->setTimezone(new DateTimeZone($this->getDbTimezone())); return $dt; } /** * - * Enter description here ... - * @param DateTime $startDateTime first show in user's local time + * Returns the end of a show in the timezone it was created in + * @param DateTime $startDateTime first show in show's local time */ public function getLocalEndDateAndTime($showStart) { diff --git a/airtime_mvc/application/services/ShowFormService.php b/airtime_mvc/application/services/ShowFormService.php index c651c8ebd..5c7c4c0c1 100644 --- a/airtime_mvc/application/services/ShowFormService.php +++ b/airtime_mvc/application/services/ShowFormService.php @@ -150,6 +150,7 @@ class Application_Service_ShowFormService 'add_show_end_date_no_repeat' => $showEnd->format("Y-m-d"), 'add_show_end_time' => $showEnd->format("H:i"), 'add_show_duration' => $ccShowDay->formatDuration(true), + 'add_show_timezone' => $ccShowDay->getDbTimezone(), 'add_show_repeats' => $ccShowDay->isRepeating() ? 1 : 0)); return $showStart; @@ -159,7 +160,10 @@ class Application_Service_ShowFormService { $ccShowInstance = CcShowInstancesQuery::create()->findPk($this->instanceId); - $timezone = new DateTimeZone(Application_Model_Preference::GetTimezone()); + //get timezone the show is created in + $timezone = $ccShowInstance->getCcShow()->getFirstCcShowDay()->getDbTimezone(); + //$timezone = new DateTimeZone(Application_Model_Preference::GetDefaultTimezone()); + //DateTime object in UTC $showStart = $ccShowInstance->getDbStarts(null); $showStart->setTimezone($timezone); @@ -180,6 +184,7 @@ class Application_Service_ShowFormService 'add_show_end_time' => $showEnd->format("H:i"), 'add_show_duration' => $this->calculateDuration( $showStart->format("Y-m-d H:i:s"), $showEnd->format("Y-m-d H:i:s")), + 'add_show_timezone' => $timezone, 'add_show_repeats' => 0)); $form->getElement('add_show_repeats')->setOptions(array("disabled" => true)); @@ -482,4 +487,24 @@ class Application_Service_ShowFormService return "Invalid Date"; } } + + /** + * + * Enter description here ... + * @param $date String + * @param $time String + * @param $timezone String + */ + public function localizeDateTime($date, $time, $timezone) + { + $dt = new DateTime($date." ".$time, new DateTimeZone( + $this->ccShow->getFirstCcShowDay()->getDbTimezone())); + + $dt->setTimeZone(new DateTimeZone($timezone)); + + return array( + "date" => $dt->format("Y-m-d"), + "time" => $dt->format("h:i") + ); + } } \ No newline at end of file diff --git a/airtime_mvc/application/views/scripts/form/add-show-when.phtml b/airtime_mvc/application/views/scripts/form/add-show-when.phtml index 3a4d3f99d..f0569ce28 100644 --- a/airtime_mvc/application/views/scripts/form/add-show-when.phtml +++ b/airtime_mvc/application/views/scripts/form/add-show-when.phtml @@ -55,6 +55,16 @@ + +
+ +
+
+ element->getElement('add_show_timezone') ?> +
+
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 2d9ac34b7..14d27f775 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -445,6 +445,10 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus, .input_t vertical-align: top; } +.add_show_input_select{ + width: 150px; +} + /***** LIBRARY QTIP METADATA SPECIFIC STYLES BEGIN *****/ table.library-track-md{ width: 280px; diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js index fd2625559..d44e6f563 100644 --- a/airtime_mvc/public/js/airtime/schedule/add-show.js +++ b/airtime_mvc/public/js/airtime/schedule/add-show.js @@ -227,6 +227,30 @@ function setAddShowEvents() { } }); + form.find("#add_show_timezone").change(function(){ + var startDateField = form.find("#add_show_start_date"), + startTimeField = form.find("#add_show_start_time"), + endDateField = form.find("#add_show_end_date_no_repeat"), + endTimeField = form.find("#add_show_end_time"), + timezone = form.find("#add_show_timezone").val(), + showId = form.find("#add_show_id").val(); + + $.post(baseUrl+"Schedule/localize-start-end-time", + {format: "json", + startDate: startDateField.val(), + startTime: startTimeField.val(), + endDate: endDateField.val(), + endTime: endTimeField.val(), + timezone: timezone, + showId: showId}, function(json){ + + startDateField.val(json.start.date); + startTimeField.val(json.start.time); + endDateField.val(json.end.date); + endTimeField.val(json.end.time); + }); + }); + form.find("#add_show_repeat_type").change(function(){ toggleRepeatDays(); toggleMonthlyRepeatType();