diff --git a/airtime_mvc/application/services/ShowFormService.php b/airtime_mvc/application/services/ShowFormService.php index 7cd3d586d..0fa705f2a 100644 --- a/airtime_mvc/application/services/ShowFormService.php +++ b/airtime_mvc/application/services/ShowFormService.php @@ -468,10 +468,7 @@ class Application_Service_ShowFormService $startDateTime = new DateTime($start); $endDateTime = new DateTime($end); - $UTCStartDateTime = $startDateTime->setTimezone(new DateTimeZone('UTC')); - $UTCEndDateTime = $endDateTime->setTimezone(new DateTimeZone('UTC')); - - $duration = $UTCEndDateTime->diff($UTCStartDateTime); + $duration = $startDateTime->diff($endDateTime); $day = intval($duration->format('%d')); if ($day > 0) { @@ -482,7 +479,7 @@ class Application_Service_ShowFormService $sign = $duration->format('%r'); return sprintf('%s%02dh %02dm', $sign, $hour, $min); } else { - return $duration->format('%Hh %Im'); + return $duration->format('%r%Hh %Im'); } } catch (Exception $e) { return "Invalid Date"; diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js index 0ced4b7e9..57bf3748f 100644 --- a/airtime_mvc/public/js/airtime/schedule/add-show.js +++ b/airtime_mvc/public/js/airtime/schedule/add-show.js @@ -693,7 +693,7 @@ function setAddShowEvents() { } }) - function calculateDuration(endDateTime, startDateTime){ + function calculateDuration(startDateTime, endDateTime){ var loadingIcon = $('#icon-loader-small'); loadingIcon.show();