Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-5788 : Library Cleanup 

got rid of this js file.
This commit is contained in:
Naomi Aro 2014-04-09 00:38:19 -04:00
parent 7990d6a71c
commit c0006f1461
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
airtime_mvc/application/controllers/ScheduleController.php
View File

@ -81,7 +81,6 @@ class ScheduleController extends Zend_Controller_Action
//Start Show builder JS/CSS requirements //Start Show builder JS/CSS requirements
$this->view->headScript()->appendFile($baseUrl.'js/datatables/js/jquery.dataTables.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/datatables/js/jquery.dataTables.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.fnSetFilteringDelay.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.ColVis.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.ColVis.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.ColReorder.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.ColReorder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
@ -115,7 +114,7 @@ class ScheduleController extends Zend_Controller_Action
$currentUser = $service_user->getCurrentUser(); $currentUser = $service_user->getCurrentUser();
$userTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone()); $userTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone());
$start = new DateTime($this->_getParam('start', null), $userTimezone); $start = new DateTime($this->_getParam('start', null), $userTimezone);
$start->setTimezone(new DateTimeZone("UTC")); $start->setTimezone(new DateTimeZone("UTC"));
$end = new DateTime($this->_getParam('end', null), $userTimezone); $end = new DateTime($this->_getParam('end', null), $userTimezone);
@ -260,10 +259,10 @@ class ScheduleController extends Zend_Controller_Action
public function getCurrentPlaylistAction() public function getCurrentPlaylistAction()
{ {
$range = Application_Model_Schedule::getDashboardInfo(); $range = Application_Model_Schedule::getDashboardInfo();
/* Convert all UTC times to localtime before sending back to user. */ /* Convert all UTC times to localtime before sending back to user. */
$range["schedulerTime"] = Application_Common_DateHelper::UTCStringToUserTimezoneString($range["schedulerTime"]); $range["schedulerTime"] = Application_Common_DateHelper::UTCStringToUserTimezoneString($range["schedulerTime"]);
if (isset($range["previous"])) { if (isset($range["previous"])) {
$range["previous"]["starts"] = Application_Common_DateHelper::UTCStringToUserTimezoneString($range["previous"]["starts"]); $range["previous"]["starts"] = Application_Common_DateHelper::UTCStringToUserTimezoneString($range["previous"]["starts"]);
$range["previous"]["ends"] = Application_Common_DateHelper::UTCStringToUserTimezoneString($range["previous"]["ends"]); $range["previous"]["ends"] = Application_Common_DateHelper::UTCStringToUserTimezoneString($range["previous"]["ends"]);
@ -276,14 +275,14 @@ class ScheduleController extends Zend_Controller_Action
$range["next"]["starts"] = Application_Common_DateHelper::UTCStringToUserTimezoneString($range["next"]["starts"]); $range["next"]["starts"] = Application_Common_DateHelper::UTCStringToUserTimezoneString($range["next"]["starts"]);
$range["next"]["ends"] = Application_Common_DateHelper::UTCStringToUserTimezoneString($range["next"]["ends"]); $range["next"]["ends"] = Application_Common_DateHelper::UTCStringToUserTimezoneString($range["next"]["ends"]);
} }
Application_Common_DateHelper::convertTimestamps( Application_Common_DateHelper::convertTimestamps(
$range["currentShow"], $range["currentShow"],
array("starts", "ends", "start_timestamp", "end_timestamp"), array("starts", "ends", "start_timestamp", "end_timestamp"),
"user" "user"
); );
Application_Common_DateHelper::convertTimestamps( Application_Common_DateHelper::convertTimestamps(
$range["nextShow"], $range["nextShow"],
array("starts", "ends", "start_timestamp", "end_timestamp"), array("starts", "ends", "start_timestamp", "end_timestamp"),
"user" "user"
); );
@ -291,7 +290,7 @@ class ScheduleController extends Zend_Controller_Action
//TODO: Add timezone and timezoneOffset back into the ApiController's results. //TODO: Add timezone and timezoneOffset back into the ApiController's results.
$range["timezone"] = Application_Common_DateHelper::getUserTimezoneAbbreviation(); $range["timezone"] = Application_Common_DateHelper::getUserTimezoneAbbreviation();
$range["timezoneOffset"] = Application_Common_DateHelper::getUserTimezoneOffset(); $range["timezoneOffset"] = Application_Common_DateHelper::getUserTimezoneOffset();
$source_status = array(); $source_status = array();
$switch_status = array(); $switch_status = array();
$live_dj = Application_Model_Preference::GetSourceStatus("live_dj"); $live_dj = Application_Model_Preference::GetSourceStatus("live_dj");
@ -342,27 +341,27 @@ class ScheduleController extends Zend_Controller_Action
$displayTimeZone = new DateTimeZone(Application_Model_Preference::GetTimezone()); $displayTimeZone = new DateTimeZone(Application_Model_Preference::GetTimezone());
$originalDateTime = new DateTime($originalShowStart, new DateTimeZone("UTC")); $originalDateTime = new DateTime($originalShowStart, new DateTimeZone("UTC"));
$originalDateTime->setTimezone($displayTimeZone); $originalDateTime->setTimezone($displayTimeZone);
$this->view->additionalShowInfo = $this->view->additionalShowInfo =
sprintf(_("Rebroadcast of show %s from %s at %s"), sprintf(_("Rebroadcast of show %s from %s at %s"),
$originalShowName, $originalShowName,
$originalDateTime->format("l, F jS"), $originalDateTime->format("l, F jS"),
$originalDateTime->format("G:i")); $originalDateTime->format("G:i"));
} }
$historyService = new Application_Service_HistoryService(); $historyService = new Application_Service_HistoryService();
$columns = $historyService->getDatatablesLogSheetColumns(); $columns = $historyService->getDatatablesLogSheetColumns();
$contents = $historyService->getPlayedItemData(null, null, $showInstanceId); $contents = $historyService->getPlayedItemData(null, null, $showInstanceId);
//remove the checkbox column. //remove the checkbox column.
array_shift($columns); array_shift($columns);
$this->view->itemColumns = $columns; $this->view->itemColumns = $columns;
$this->view->itemContents = $contents; $this->view->itemContents = $contents;
$this->view->dialog = $this->view->render('schedule/show-content-dialog.phtml'); $this->view->dialog = $this->view->render('schedule/show-content-dialog.phtml');
$this->view->showTitle = htmlspecialchars($show->getName()); $this->view->showTitle = htmlspecialchars($show->getName());
unset($this->view->columns); unset($this->view->columns);
unset($this->view->contents); unset($this->view->contents);
} }
@ -632,7 +631,7 @@ class ScheduleController extends Zend_Controller_Action
$start = $this->_getParam('startTime'); $start = $this->_getParam('startTime');
$end = $this->_getParam('endTime'); $end = $this->_getParam('endTime');
$timezone = $this->_getParam('timezone'); $timezone = $this->_getParam('timezone');
$service_showForm = new Application_Service_ShowFormService(); $service_showForm = new Application_Service_ShowFormService();
$result = $service_showForm->calculateDuration($start, $end, $timezone); $result = $service_showForm->calculateDuration($start, $end, $timezone);
@ -643,10 +642,10 @@ class ScheduleController extends Zend_Controller_Action
public function updateFutureIsScheduledAction() public function updateFutureIsScheduledAction()
{ {
$schedId = $this->_getParam('schedId'); $schedId = $this->_getParam('schedId');
$scheduleService = new Application_Service_SchedulerService(); $scheduleService = new Application_Service_SchedulerService();
$redrawLibTable = $scheduleService->updateFutureIsScheduled($schedId, false); $redrawLibTable = $scheduleService->updateFutureIsScheduled($schedId, false);
$this->_helper->json->sendJson(array("redrawLibTable" => $redrawLibTable)); $this->_helper->json->sendJson(array("redrawLibTable" => $redrawLibTable));
} }