From 859213b76093a10fe920d48fbe0bade575571341 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Mon, 16 Jan 2012 09:56:57 +0100 Subject: [PATCH 01/33] CC-3174 Show Builder experimenting --- airtime_mvc/application/Bootstrap.php | 24 ++-- airtime_mvc/application/configs/ACL.php | 2 + .../controllers/LibraryController.php | 19 +-- .../controllers/ShowbuilderController.php | 60 ++++++++++ .../application/layouts/scripts/builder.phtml | 28 +++++ airtime_mvc/application/models/User.php | 111 +++++++++--------- .../views/scripts/library/index.phtml | 18 --- .../views/scripts/library/library.phtml | 9 ++ .../views/scripts/showbuilder/builder.phtml | 1 + .../views/scripts/showbuilder/index.phtml | 0 .../public/js/airtime/library/library.js | 32 ++--- .../public/js/airtime/showbuilder/builder.js | 63 ++++++++++ 12 files changed, 266 insertions(+), 101 deletions(-) create mode 100644 airtime_mvc/application/controllers/ShowbuilderController.php create mode 100644 airtime_mvc/application/layouts/scripts/builder.phtml create mode 100644 airtime_mvc/application/views/scripts/library/library.phtml create mode 100644 airtime_mvc/application/views/scripts/showbuilder/builder.phtml create mode 100644 airtime_mvc/application/views/scripts/showbuilder/index.phtml create mode 100644 airtime_mvc/public/js/airtime/showbuilder/builder.js diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index 9af163812..ae351982c 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -33,11 +33,11 @@ date_default_timezone_set(Application_Model_Preference::GetTimezone()); Zend_Validate::setDefaultNamespaces("Zend"); $front = Zend_Controller_Front::getInstance(); -$front->registerPlugin(new RabbitMqPlugin()); +$front->registerPlugin(new RabbitMqPlugin()); Logging::debug($_SERVER['REQUEST_URI']); -/* The bootstrap class should only be used to initialize actions that return a view. +/* The bootstrap class should only be used to initialize actions that return a view. Actions that return JSON will not use the bootstrap class! */ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap { @@ -77,7 +77,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view->headScript()->appendFile($baseUrl.'/js/airtime/dashboard/versiontooltip.js','text/javascript'); $view->headScript()->appendFile($baseUrl.'/js/airtime/common/common.js','text/javascript'); - + if (Application_Model_Preference::GetPlanLevel() != "disabled" && $_SERVER['REQUEST_URI'] != '/Dashboard/stream-player') { $client_id = Application_Model_Preference::GetClientId(); @@ -102,12 +102,12 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap { if (APPLICATION_ENV == "development"){ global $CC_DBC; - + $autoloader = Zend_Loader_Autoloader::getInstance(); $autoloader->registerNamespace('ZFDebug'); $options = array( - 'plugins' => array('Variables', + 'plugins' => array('Variables', 'Exception', 'Memory', 'Time') @@ -119,12 +119,12 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $frontController->registerPlugin($debug); } } - + protected function _initRouter() { $front = Zend_Controller_Front::getInstance(); $router = $front->getRouter(); - + $router->addRoute( 'password-change', new Zend_Controller_Router_Route('password-change/:user_id/:token', array( @@ -132,6 +132,16 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap 'controller' => 'auth', 'action' => 'password-change', ))); + + /* + $router->addRoute( + 'show-builder', + new Zend_Controller_Router_Route('show/builder/:show_instance_id/:user_id', array( + 'module' => 'default', + 'controller' => 'showbuilder', + 'action' => 'index', + ))); + */ } } diff --git a/airtime_mvc/application/configs/ACL.php b/airtime_mvc/application/configs/ACL.php index 6f0581296..e3001cffc 100644 --- a/airtime_mvc/application/configs/ACL.php +++ b/airtime_mvc/application/configs/ACL.php @@ -24,6 +24,7 @@ $ccAcl->add(new Zend_Acl_Resource('library')) ->add(new Zend_Acl_Resource('dashboard')) ->add(new Zend_Acl_Resource('preference')) ->add(new Zend_Acl_Resource('recorder')) + ->add(new Zend_Acl_Resource('showbuilder')) ->add(new Zend_Acl_Resource('auth')); /** Creating permissions */ @@ -42,6 +43,7 @@ $ccAcl->allow('G', 'index') ->allow('H', 'library') ->allow('H', 'search') ->allow('H', 'playlist') + ->allow('H', 'showbuilder') ->allow('A', 'user') ->allow('A', 'systemstatus') ->allow('A', 'preference'); diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index af40b2353..1404a2a2f 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -23,7 +23,15 @@ class LibraryController extends Zend_Controller_Action $this->search_sess = new Zend_Session_Namespace("search"); } - public function indexAction() + public function indexAction() { + + $this->_helper->layout->setLayout('library'); + + $this->_helper->actionStack('library', 'library'); + $this->_helper->actionStack('index', 'playlist'); + } + + public function libraryAction() { $request = $this->getRequest(); $baseUrl = $request->getBaseUrl(); @@ -43,7 +51,6 @@ class LibraryController extends Zend_Controller_Action $this->view->headLink()->appendStylesheet($baseUrl.'/css/datatables/css/ColVis.css'); $this->view->headLink()->appendStylesheet($baseUrl.'/css/datatables/css/ColReorder.css'); - $this->_helper->layout->setLayout('library'); $this->_helper->viewRenderer->setResponseSegment('library'); $form = new Application_Form_AdvancedSearch(); @@ -53,8 +60,6 @@ class LibraryController extends Zend_Controller_Action $this->search_sess->next_row[1] = 2; $this->view->form = $form; $this->view->md = $this->search_sess->md; - - $this->_helper->actionStack('index', 'playlist'); } public function contextMenuAction() @@ -183,7 +188,7 @@ class LibraryController extends Zend_Controller_Action $this->view->id = $id; } } - + public function deleteGroupAction() { $ids = $this->_getParam('ids'); @@ -217,7 +222,7 @@ class LibraryController extends Zend_Controller_Action Application_Model_RabbitMq::SendMessageToMediaMonitor("file_delete", $data); } } - + $this->view->ids = $ids; } } @@ -228,7 +233,7 @@ class LibraryController extends Zend_Controller_Action $post = $this->getRequest()->getPost(); Logging::log(print_r($post, true)); $datatables = Application_Model_StoredFile::searchFilesForPlaylistBuilder($post); - + //format clip lengh to 1 decimal foreach($datatables["aaData"] as &$data){ if($data['ftype'] == 'audioclip'){ diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php new file mode 100644 index 000000000..6a5e719a1 --- /dev/null +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -0,0 +1,60 @@ +_helper->getHelper('AjaxContext'); + $ajaxContext->addActionContext('schedule', 'json') + ->initContext(); + } + + public function indexAction() { + + $request = $this->getRequest(); + + $user_id = $request->getParam("uid", 0); + $show_instance_id = $request->getParam("sid", 0); + + try { + $user = new Application_Model_User($user_id); + $show_instance = new Application_Model_ShowInstance($show_instance_id); + } + catch(Exception $e) { + $this->_helper->redirector('denied', 'error'); + } + + //user is allowed to schedule this show. + if ($user->isAdmin() || $user->isHost($show_instance->getShowId())) { + $this->_helper->layout->setLayout('builder'); + + $this->_helper->actionStack('library', 'library'); + $this->_helper->actionStack('builder', 'showbuilder'); + } + else { + $this->_helper->redirector('denied', 'error'); + } + } + + public function builderAction() { + + $request = $this->getRequest(); + $baseUrl = $request->getBaseUrl(); + + $this->view->headScript()->appendFile($baseUrl.'/js/fullcalendar/fullcalendar_orig.js','text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/airtime/showbuilder/builder.js','text/javascript'); + + $this->view->headLink()->appendStylesheet($baseUrl.'/css/fullcalendar.css'); + + $this->_helper->viewRenderer->setResponseSegment('builder'); + } + + public function eventFeedAction() { + + } + + public function scheduleAction() { + + } +} \ No newline at end of file diff --git a/airtime_mvc/application/layouts/scripts/builder.phtml b/airtime_mvc/application/layouts/scripts/builder.phtml new file mode 100644 index 000000000..e7c4dbf0a --- /dev/null +++ b/airtime_mvc/application/layouts/scripts/builder.phtml @@ -0,0 +1,28 @@ +doctype() ?> + + + + headTitle() ?> + headScript() ?> + headLink() ?> + + + +
+ + versionNotify() ?> + partial('partialviews/header.phtml', array("user" => $this->loggedInAs(), "is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining())) ?> + +navigation()->menu()->setPartial($partial); ?> + +navigation()->menu() ?> +
+ +
+ +
layout()->library ?>
+
layout()->builder ?>
+
+ + diff --git a/airtime_mvc/application/models/User.php b/airtime_mvc/application/models/User.php index 81548f013..052294a06 100644 --- a/airtime_mvc/application/models/User.php +++ b/airtime_mvc/application/models/User.php @@ -11,11 +11,16 @@ class Application_Model_User { public function __construct($userId) { - if (strlen($userId)==0){ + if (empty($userId)){ $this->_userInstance = $this->createUser(); - } else { + } + else { $this->_userInstance = CcSubjsQuery::create()->findPK($userId); - } + + if (is_null($this->_userInstance)){ + throw new Exception(); + } + } } public function getId() { @@ -29,7 +34,7 @@ class Application_Model_User { public function isAdmin() { return $this->isUserType(UTYPE_ADMIN); } - + public function isUserType($type, $showId=''){ if(is_array($type)){ $result = false; @@ -62,99 +67,99 @@ class Application_Model_User { } } } - + public function setLogin($login){ $user = $this->_userInstance; - $user->setDbLogin($login); + $user->setDbLogin($login); } - + public function setPassword($password){ $user = $this->_userInstance; - $user->setDbPass(md5($password)); + $user->setDbPass(md5($password)); } - + public function setFirstName($firstName){ $user = $this->_userInstance; - $user->setDbFirstName($firstName); + $user->setDbFirstName($firstName); } - + public function setLastName($lastName){ $user = $this->_userInstance; - $user->setDbLastName($lastName); + $user->setDbLastName($lastName); } - + public function setType($type){ $user = $this->_userInstance; - $user->setDbType($type); + $user->setDbType($type); } public function setEmail($email){ $user = $this->_userInstance; - $user->setDbEmail($email); + $user->setDbEmail($email); } public function setSkype($skype){ $user = $this->_userInstance; - $user->setDbSkypeContact($skype); + $user->setDbSkypeContact($skype); } public function setJabber($jabber){ $user = $this->_userInstance; - $user->setDbJabberContact($jabber); + $user->setDbJabberContact($jabber); } - + public function getLogin(){ $user = $this->_userInstance; - return $user->getDbLogin(); - } - + return $user->getDbLogin(); + } + public function getPassword(){ $user = $this->_userInstance; - return $user->getDbPass(); + return $user->getDbPass(); } - + public function getFirstName(){ $user = $this->_userInstance; - return $user->getDbFirstName(); + return $user->getDbFirstName(); } - + public function getLastName(){ $user = $this->_userInstance; - return $user->getDbLastName(); + return $user->getDbLastName(); } - + public function getType(){ $user = $this->_userInstance; - return $user->getDbType(); + return $user->getDbType(); } public function getEmail(){ $user = $this->_userInstance; - return $user->getDbEmail(); + return $user->getDbEmail(); } public function getSkype(){ $user = $this->_userInstance; - return $user->getDbSkypeContact(); + return $user->getDbSkypeContact(); } public function getJabber(){ $user = $this->_userInstance; - return $user->getDbJabberContact(); - + return $user->getDbJabberContact(); + } - + public function save(){ $this->_userInstance->save(); } - + public function delete(){ if (!$this->_userInstance->isDeleted()) $this->_userInstance->delete(); } private function createUser() { - $user = new CcSubjs(); + $user = new CcSubjs(); return $user; } @@ -165,7 +170,7 @@ class Application_Model_User { $sql_gen = "SELECT login AS value, login AS label, id as index FROM cc_subjs "; $sql = $sql_gen; - + if(is_array($type)) { for($i=0; $iGetAll($sql); + + return $CC_DBC->GetAll($sql); } - + public static function getUserCount($type=NULL){ global $CC_DBC; $sql; $sql_gen = "SELECT count(*) AS cnt FROM cc_subjs "; - + if(!isset($type)){ $sql = $sql_gen; } @@ -209,21 +214,21 @@ class Application_Model_User { else { $sql_type = "type = {$type}"; } - + $sql = $sql_gen ." WHERE (". $sql_type.") "; } - + return $CC_DBC->GetOne($sql); } public static function getHosts($search=NULL) { return Application_Model_User::getUsers(array('H'), $search); } - + public static function getUsersDataTablesInfo($datatables_post) { $fromTable = "cc_subjs"; - + // get current user $username = ""; $auth = Zend_Auth::getInstance(); @@ -231,29 +236,29 @@ class Application_Model_User { if ($auth->hasIdentity()) { $username = $auth->getIdentity()->login; } - + $res = Application_Model_StoredFile::searchFiles($fromTable, $datatables_post); - + // mark record which is for the current user foreach($res['aaData'] as &$record){ if($record[1] == $username){ $record[5] = "self"; } } - + return $res; } - + public static function getUserData($id){ global $CC_DBC; - + $sql = "SELECT login, first_name, last_name, type, id, email, skype_contact, jabber_contact" ." FROM cc_subjs" ." WHERE id = $id"; - + return $CC_DBC->GetRow($sql); } - + public static function GetUserID($login){ $user = CcSubjsQuery::create()->findOneByDbLogin($login); if (is_null($user)){ diff --git a/airtime_mvc/application/views/scripts/library/index.phtml b/airtime_mvc/application/views/scripts/library/index.phtml index bfb8b78b3..e69de29bb 100644 --- a/airtime_mvc/application/views/scripts/library/index.phtml +++ b/airtime_mvc/application/views/scripts/library/index.phtml @@ -1,18 +0,0 @@ - -
- - - -
-
- diff --git a/airtime_mvc/application/views/scripts/library/library.phtml b/airtime_mvc/application/views/scripts/library/library.phtml new file mode 100644 index 000000000..d1f8d7cb8 --- /dev/null +++ b/airtime_mvc/application/views/scripts/library/library.phtml @@ -0,0 +1,9 @@ + +
+ + + +
+
diff --git a/airtime_mvc/application/views/scripts/showbuilder/builder.phtml b/airtime_mvc/application/views/scripts/showbuilder/builder.phtml new file mode 100644 index 000000000..8284050c2 --- /dev/null +++ b/airtime_mvc/application/views/scripts/showbuilder/builder.phtml @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/airtime_mvc/application/views/scripts/showbuilder/index.phtml b/airtime_mvc/application/views/scripts/showbuilder/index.phtml new file mode 100644 index 000000000..e69de29bb diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index ba989162c..aa8a6bb88 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -73,7 +73,7 @@ function confirmDeletePlaylist(params){ } function openFileOnSoundCloud(link){ - window.open(link) + window.open(link); } function checkImportStatus(){ @@ -84,7 +84,7 @@ function checkImportStatus(){ }else{ div.css('visibility', 'hidden'); } - }) + }); } function deletePlaylist(json) { @@ -152,7 +152,7 @@ function addProgressIcon(id) { $("#au_"+id).find("td.library_title").find("span").removeClass(); $("span[id="+id+"]").addClass("small-icon progress"); }else{ - $("#au_"+id).find("td.library_title").append('') + $("#au_"+id).find("td.library_title").append(''); } } @@ -167,7 +167,7 @@ function checkSCUploadStatus(){ $("span[id="+id+"]").removeClass("progress").addClass("sc-error"); } }); - }) + }); } function addQtipToSCIcons(){ @@ -190,7 +190,7 @@ function addQtipToSCIcons(){ show: { ready: true // Needed to make it show on first mouseover event } - }) + }); }else if($(this).hasClass("soundcloud")){ $(this).qtip({ content: { @@ -200,7 +200,7 @@ function addQtipToSCIcons(){ type: "post", data: ({format: "json", id : id, type: "file"}), success: function(json, status){ - this.set('content.text', "The soundcloud id for this file is: "+json.sc_id) + this.set('content.text', "The soundcloud id for this file is: "+json.sc_id); } } }, @@ -216,7 +216,7 @@ function addQtipToSCIcons(){ show: { ready: true // Needed to make it show on first mouseover event } - }) + }); }else if($(this).hasClass("sc-error")){ $(this).qtip({ content: { @@ -227,7 +227,7 @@ function addQtipToSCIcons(){ data: ({format: "json", id : id, type: "file"}), success: function(json, status){ this.set('content.text', "There was error while uploading to soundcloud.
"+"Error code: "+json.error_code+ - "
"+"Error msg: "+json.error_msg+"
") + "
"+"Error msg: "+json.error_msg+"
"); } } }, @@ -243,7 +243,7 @@ function addQtipToSCIcons(){ show: { ready: true // Needed to make it show on first mouseover event } - }) + }); } }); } @@ -251,8 +251,8 @@ function addQtipToSCIcons(){ function addMetadataQtip(){ var tableRow = $('#library_display tbody tr'); tableRow.each(function(){ - var title = $(this).find('td.library_title').html() - var info = $(this).attr("id") + var title = $(this).find('td.library_title').html(); + var info = $(this).attr("id"); info = info.split("_"); var id = info[1]; var type = info[0]; @@ -267,7 +267,7 @@ function addMetadataQtip(){ type: "post", data: ({format: "html", id : id, type: type}), success: function(data, status){ - this.set('content.text', data) + this.set('content.text', data); } } }, @@ -294,12 +294,12 @@ function addMetadataQtip(){ } } } - }) - }) + }); + }); tableRow.bind('contextmenu', function(e){ return false; - }) + }); } /** @@ -570,5 +570,5 @@ $(document).ready(function() { setInterval( "checkImportStatus()", 5000 ); setInterval( "checkSCUploadStatus()", 5000 ); - addQtipToSCIcons() + addQtipToSCIcons(); }); diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js new file mode 100644 index 000000000..aadcd90c7 --- /dev/null +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -0,0 +1,63 @@ +function getFullCalendarEvents(start, end, callback) { + var url, unix_ts_start, unix_ts_end; + + unix_ts_start = Math.round(start.getTime() / 1000), + unix_ts_end = Math.round(end.getTime() / 1000); + + url = '/Schedule/event-feed'; + + var d = new Date(); + + $.get(url, {format: "json", start: unix_ts_start, end: unix_ts_end, cachep: d.getTime()}, function(json){ + callback(json.events); + }); +} + +$(document).ready(function() { + $('#show_builder').fullCalendar({ + header: { + left: '', + center: '', + right: '' + }, + defaultView: 'agendaDay', + allDaySlot: false, + theme: true, + + events: getFullCalendarEvents, + + axisFormat: 'H:mm:ss', + slotMinutes: 1, + timeFormat: { + agenda: 'H:mm:ss{ - H:mm:ss}' + }, + + minTime: '17:00', + maxTime: '18:00', + + droppable: true, // this allows things to be dropped onto the calendar !!! + drop: function(date, allDay) { // this function is called when something is dropped + + // retrieve the dropped element's stored Event Object + //var originalEventObject = $(this).data('eventObject'); + + // we need to copy it, so that multiple events don't have a reference to the same object + //var copiedEventObject = $.extend({}, originalEventObject); + var copiedEventObject = {}; + + // assign it the date that was reported + copiedEventObject.title = "test title"; + copiedEventObject.start = date; + var end = new Date(date.getTime()); + end.setMinutes(end.getMinutes() + 5); + end.setSeconds(end.getSeconds() + 5); + copiedEventObject.end = end; + copiedEventObject.allDay = allDay; + + // render the event on the calendar + // the last `true` argument determines if the event "sticks" (http://arshaw.com/fullcalendar/docs/event_rendering/renderEvent/) + $('#show_builder').fullCalendar('renderEvent', copiedEventObject, true); + + } + }); +}); From 424206b9a9e34010db839bb489646b0036492e68 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 17 Jan 2012 11:18:17 +0100 Subject: [PATCH 02/33] CC-3174 : Show Builder data tables column resizing, starting separating out events. --- .../controllers/LibraryController.php | 4 +- .../controllers/ShowbuilderController.php | 11 + airtime_mvc/application/models/StoredFile.php | 60 +- .../library/events/library_playlistbuilder.js | 20 + .../library/events/library_showbuilder.js | 14 + .../public/js/airtime/library/library.js | 87 +- .../public/js/airtime/showbuilder/builder.js | 17 +- .../plugin/dataTables.ColReorderResize.js | 1020 +++++++++++++++++ 8 files changed, 1156 insertions(+), 77 deletions(-) create mode 100644 airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js create mode 100644 airtime_mvc/public/js/airtime/library/events/library_showbuilder.js create mode 100644 airtime_mvc/public/js/datatables/plugin/dataTables.ColReorderResize.js diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index d2dbf730b..0d499c9d6 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -27,6 +27,8 @@ class LibraryController extends Zend_Controller_Action $this->_helper->layout->setLayout('library'); + $this->view->headScript()->appendFile($this->view->baseUrl('/js/airtime/library/events/library_playlistbuilder.js'),'text/javascript'); + $this->_helper->actionStack('library', 'library'); $this->_helper->actionStack('index', 'playlist'); } @@ -41,7 +43,7 @@ class LibraryController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.fnSetFilteringDelay.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js','text/javascript'); - $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorder.js','text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorderResize.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.FixedColumns.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/library.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/advancedsearch.js','text/javascript'); diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index 6a5e719a1..674ea827d 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -29,6 +29,8 @@ class ShowbuilderController extends Zend_Controller_Action if ($user->isAdmin() || $user->isHost($show_instance->getShowId())) { $this->_helper->layout->setLayout('builder'); + $this->view->headScript()->appendFile($this->view->baseUrl('/js/airtime/library/events/library_showbuilder.js'),'text/javascript'); + $this->_helper->actionStack('library', 'library'); $this->_helper->actionStack('builder', 'showbuilder'); } @@ -56,5 +58,14 @@ class ShowbuilderController extends Zend_Controller_Action public function scheduleAction() { + $request = $this->getRequest(); + + $show_instance_id = $request->getParam("sid", 0); + $scheduled_item_id = $request->getParam("time", 0); + $scheduled_start = $request->getParam("start", 0); + + //snap to previous/next default. + $scheduled_type = $request->getParam("type", 0); + } } \ No newline at end of file diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index d371d083f..3e42e4e41 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -90,7 +90,7 @@ class Application_Model_StoredFile { } $this->setDbColMetadata($dbMd); } - + $this->_file->setDbMtime(new DateTime("now"), new DateTimeZone("UTC")); $this->_file->save(); } @@ -316,7 +316,7 @@ class Application_Model_StoredFile { // don't delete from the playslist. We might want to put a flag //Application_Model_Playlist::DeleteFileFromAllPlaylists($this->getId()); - + // set file_exists falg to false $this->_file->setDbFileExists(false); $this->_file->save(); @@ -418,10 +418,10 @@ class Application_Model_StoredFile { * @return string */ public function getFilePath() - { + { $music_dir = Application_Model_MusicDir::getDirByPK($this->_file->getDbDirectory()); $directory = $music_dir->getDirectory(); - + $filepath = $this->_file->getDbFilepath(); return $directory.$filepath; @@ -435,7 +435,7 @@ class Application_Model_StoredFile { public function setFilePath($p_filepath) { $path_info = Application_Model_MusicDir::splitFilePath($p_filepath); - + if (is_null($path_info)) { return -1; } @@ -505,7 +505,7 @@ class Application_Model_StoredFile { $storedFile->_file = $file; if(isset($md['MDATA_KEY_FILEPATH'])) { - // removed "//" in the path. Always use '/' for path separator + // removed "//" in the path. Always use '/' for path separator $filepath = str_replace("//", "/", $md['MDATA_KEY_FILEPATH']); $res = $storedFile->setFilePath($filepath); if ($res === -1) { @@ -684,8 +684,23 @@ class Application_Model_StoredFile { LEFT JOIN ".$CC_CONFIG['playListTimeView']." AS PLT USING(id)) UNION (".$fileSelect."id FROM ".$CC_CONFIG["filesTable"]." AS FILES WHERE file_exists = 'TRUE')) AS RESULTS"; - + $results = Application_Model_StoredFile::searchFiles($fromTable, $datatables); + + /* + type = aData["ftype"].substring(0,2); + id = aData["id"]; + + if(type == "au") { + $('td.library_type', nRow).html( '' ); + } else if(type == "pl") { + $('td.library_type', nRow).html( '' ); + } + + + $(nRow).attr("id", type+'_'+id); + */ + foreach($results['aaData'] as &$row){ // add checkbox row $row['checkbox'] = ""; @@ -694,7 +709,22 @@ class Application_Model_StoredFile { // split it and grab only the year info $yearSplit = explode('-', $row['year']); $row['year'] = $yearSplit[0]; + + $type = substr($row['ftype'], 0, 2); + + $row['id'] = "{$type}_{$row['id']}"; + + //TODO url like this to work on both playlist/showbuilder screens. + //datatable stuff really needs to be pulled out and generalized within the project + //access to zend view methods to access url helpers is needed. + if($type == "au") { + $row['ftype'] = ''; + } + else { + $row['ftype'] = ''; + } } + return $results; } @@ -773,9 +803,9 @@ class Application_Model_StoredFile { else { $sql = $selectorRows." FROM ".$fromTable." ORDER BY ".$orderby." OFFSET ".$data["iDisplayStart"]." LIMIT ".$data["iDisplayLength"]; } - + $results = $CC_DBC->getAll($sql); - + if(!isset($totalDisplayRows)) { $totalDisplayRows = $totalRows; } @@ -904,10 +934,10 @@ class Application_Model_StoredFile { $audio_stor = $stor . DIRECTORY_SEPARATOR . $fileName; Logging::log("copyFileToStor: moving file $audio_file to $audio_stor"); - + //Martin K.: changed to rename: Much less load + quicker since this is an atomic operation $r = @rename($audio_file, $audio_stor); - + //$r = @copy($audio_file, $audio_stor); //$r = @unlink($audio_file); } @@ -920,14 +950,14 @@ class Application_Model_StoredFile { } /** - * + * * Enter description here ... * @param $dir_id - if this is not provided, it returns all files with full path constructed. * @param $propelObj - if this is true, it returns array of proepl obj */ public static function listAllFiles($dir_id=null, $propelObj=false){ global $CC_DBC; - + if($propelObj){ $sql = "SELECT m.directory || f.filepath as fp" ." FROM CC_MUSIC_DIRS m" @@ -989,12 +1019,12 @@ class Application_Model_StoredFile { public function getSoundCloudErrorMsg(){ return $this->_file->getDbSoundCloudErrorMsg(); } - + public function setFileExistsFlag($flag){ $this->_file->setDbFileExists($flag) ->save(); } - + public function getFileExistsFlag(){ return $this->_file->getDbFileExists(); } diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js new file mode 100644 index 000000000..3935d8c23 --- /dev/null +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -0,0 +1,20 @@ +function dtRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { + + $(nRow).attr("id", aData["id"]); + + return nRow; +} + +function dtDrawCallback() { + addLibraryItemEvents(); + addMetadataQtip(); + //saveNumEntriesSetting(); + setupGroupActions(); +} + +function setupLibraryToolbar() { + $("div.library_toolbar").html('Reset Order' + + 'Delete' + + 'Add'); +} + diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js new file mode 100644 index 000000000..f5a1c6d18 --- /dev/null +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -0,0 +1,14 @@ +function dtRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { + + $(nRow).attr("id", aData["id"]); + + $(nRow).data("show_builder", {"id": aData["id"], "length": aData["length"]}); + + return nRow; +} + +function dtDrawCallback() { + addLibraryItemEvents(); + //addMetadataQtip(); + //setupGroupActions(); +} \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index aa8a6bb88..65dc7c54b 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -120,33 +120,6 @@ function addLibraryItemEvents() { } -function dtRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { - var id, type, once; - - type = aData["ftype"].substring(0,2); - id = aData["id"]; - - if(type == "au") { - $('td.library_type', nRow).html( '' ); - } else if(type == "pl") { - $('td.library_type', nRow).html( '' ); - } - - $(nRow).attr("id", type+'_'+id); - - // insert id on lenth field - $('td.library_length', nRow).attr("id", "length"); - - return nRow; -} - -function dtDrawCallback() { - addLibraryItemEvents(); - addMetadataQtip(); - saveNumEntriesSetting(); - setupGroupActions(); -} - function addProgressIcon(id) { if($("#au_"+id).find("td.library_title").find("span").length > 0){ $("#au_"+id).find("td.library_title").find("span").removeClass(); @@ -513,47 +486,43 @@ function createDataTable(data) { "fnRowCallback": dtRowCallback, "fnDrawCallback": dtDrawCallback, "aoColumns": [ - /* Checkbox */ {"sTitle": "", "bSortable": false, "bSearchable": false, "mDataProp": "checkbox", "sWidth": "25px", "sClass": "library_checkbox"}, - /* Id */ {"sName": "id", "bSearchable": false, "bVisible": false, "mDataProp": "id", "sClass": "library_id"}, - /* Title */ {"sTitle": "Title", "sName": "track_title", "mDataProp": "track_title", "sClass": "library_title"}, - /* Creator */ {"sTitle": "Creator", "sName": "artist_name", "mDataProp": "artist_name", "sClass": "library_creator"}, - /* Album */ {"sTitle": "Album", "sName": "album_title", "mDataProp": "album_title", "sClass": "library_album"}, - /* Genre */ {"sTitle": "Genre", "sName": "genre", "mDataProp": "genre", "sWidth": "10%", "sClass": "library_genre"}, - /* Year */ {"sTitle": "Year", "sName": "year", "mDataProp": "year", "sWidth": "8%", "sClass": "library_year"}, - /* Length */ {"sTitle": "Length", "sName": "length", "mDataProp": "length", "sWidth": "10%", "sClass": "library_length"}, - /* Type */ {"sTitle": "Type", "sName": "ftype", "bSearchable": false, "mDataProp": "ftype", "sWidth": "9%", "sClass": "library_type"}, - /* Upload Time */ {"sTitle": "Upload Time", "sName": "utime", "mDataProp": "utime", "sClass": "library_upload_time"}, - /* Last Modified */ {"sTitle": "Last Modified", "sName": "mtime", "bVisible": false, "mDataProp": "mtime", "sClass": "library_modified_time"}, - ], + /* Checkbox */ {"sTitle": "", "bSortable": false, "bSearchable": false, "mDataProp": "checkbox", "sWidth": "25px", "sClass": "library_checkbox"}, + /* Id */ {"sName": "id", "bSearchable": false, "bVisible": false, "mDataProp": "id", "sClass": "library_id"}, + /* Title */ {"sTitle": "Title", "sName": "track_title", "mDataProp": "track_title", "sClass": "library_title"}, + /* Creator */ {"sTitle": "Creator", "sName": "artist_name", "mDataProp": "artist_name", "sClass": "library_creator"}, + /* Album */ {"sTitle": "Album", "sName": "album_title", "mDataProp": "album_title", "sClass": "library_album"}, + /* Genre */ {"sTitle": "Genre", "sName": "genre", "mDataProp": "genre", "sWidth": "10%", "sClass": "library_genre"}, + /* Year */ {"sTitle": "Year", "sName": "year", "mDataProp": "year", "sWidth": "8%", "sClass": "library_year"}, + /* Length */ {"sTitle": "Length", "sName": "length", "mDataProp": "length", "sWidth": "10%", "sClass": "library_length"}, + /* Type */ {"sTitle": "Type", "sName": "ftype", "bSearchable": false, "mDataProp": "ftype", "sWidth": "9%", "sClass": "library_type"}, + /* Upload Time */ {"sTitle": "Upload Time", "sName": "utime", "mDataProp": "utime", "sClass": "library_upload_time"}, + /* Last Modified */ {"sTitle": "Last Modified", "sName": "mtime", "bVisible": false, "mDataProp": "mtime", "sClass": "library_modified_time"}, + ], "aaSorting": [[2,'asc']], "sPaginationType": "full_numbers", "bJQueryUI": true, "bAutoWidth": false, - "oLanguage": { - "sSearch": "" - }, - "iDisplayLength": getNumEntriesPreference(data), - "bStateSave": true, - // R = ColReorder, C = ColVis, see datatables doc for others - "sDom": 'Rlfr<"H"C<"library_toolbar">>t<"F"ip>', - "oColVis": { - "buttonText": "Show/Hide Columns", - "sAlign": "right", - "aiExclude": [0, 1, 2], - "sSize": "css", - "bShowAll": true + "oLanguage": { + "sSearch": "" + }, + "iDisplayLength": getNumEntriesPreference(data), + "bStateSave": true, + // R = ColReorder, C = ColVis, see datatables doc for others + "sDom": 'Rlfr<"H"C<"library_toolbar">>t<"F"ip>', + "oColVis": { + "buttonText": "Show/Hide Columns", + "sAlign": "right", + "aiExclude": [0, 1, 2], + "sSize": "css", + "bShowAll": true }, - "oColReorder": { - "aiOrder": [ 0, 2, 3, 4, 5, 6, 7, 8, 9, 10 ] /* code this */, - "iFixedColumns": 3 + "oColReorder": { + "aiOrder": [ 0, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], /* code this */ + "iFixedColumns": 3 } }); dTable.fnSetFilteringDelay(350); - $("div.library_toolbar").html('Reset Order' + - 'Delete' + - 'Add'); - $('#library_order_reset').click(function() { ColReorder.fnReset( dTable ); return false; diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index aadcd90c7..0038d4a40 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -26,7 +26,7 @@ $(document).ready(function() { events: getFullCalendarEvents, - axisFormat: 'H:mm:ss', + axisFormat: 'H:mm', slotMinutes: 1, timeFormat: { agenda: 'H:mm:ss{ - H:mm:ss}' @@ -44,6 +44,18 @@ $(document).ready(function() { // we need to copy it, so that multiple events don't have a reference to the same object //var copiedEventObject = $.extend({}, originalEventObject); var copiedEventObject = {}; + var data = $(this).data("show_builder"); + + $.ajax({url: "/showbuilder/schedule", + data:{format: "json", sid:"", schedule_start: date}, + dataType:"json", + success:function(json){ + var x; + }, + error:function(jqXHR, textStatus, errorThrown){ + var x; + } + }); // assign it the date that was reported copiedEventObject.title = "test title"; @@ -56,8 +68,9 @@ $(document).ready(function() { // render the event on the calendar // the last `true` argument determines if the event "sticks" (http://arshaw.com/fullcalendar/docs/event_rendering/renderEvent/) - $('#show_builder').fullCalendar('renderEvent', copiedEventObject, true); + //$('#show_builder').fullCalendar('renderEvent', copiedEventObject, true); + $("#schedule_calendar").fullCalendar( 'refetchEvents' ); } }); }); diff --git a/airtime_mvc/public/js/datatables/plugin/dataTables.ColReorderResize.js b/airtime_mvc/public/js/datatables/plugin/dataTables.ColReorderResize.js new file mode 100644 index 000000000..c1336ffac --- /dev/null +++ b/airtime_mvc/public/js/datatables/plugin/dataTables.ColReorderResize.js @@ -0,0 +1,1020 @@ +/* + * File: ColReorderWithResize.js + * Version: 1.0.3 + * CVS: $Id$ + * Description: Controls for column visiblity in DataTables + col resizing + * Author: Allan Jardine (www.sprymedia.co.uk) + * Created: Wed Sep 15 18:23:29 BST 2010 + * Modified: July 2011 by Christophe Battarel - christophe.battarel@altairis.fr (resizing) + * Language: Javascript + * License: GPL v2 or BSD 3 point style + * Project: DataTables + * Contact: www.sprymedia.co.uk/contact + * + * Copyright 2010-2011 Allan Jardine, all rights reserved. + * + * This source file is free software, under either the GPL v2 license or a + * BSD style license, available at: + * http://datatables.net/license_gpl2 + * http://datatables.net/license_bsd + * + */ + + +(function($, window, document) { + + +/** + * Switch the key value pairing of an index array to be value key (i.e. the old value is now the + * key). For example consider [ 2, 0, 1 ] this would be returned as [ 1, 2, 0 ]. + * @method fnInvertKeyValues + * @param array aIn Array to switch around + * @returns array + */ +function fnInvertKeyValues( aIn ) +{ + var aRet=[]; + for ( var i=0, iLen=aIn.length ; i= iCols ) + { + this.oApi._fnLog( oSettings, 1, "ColReorder 'from' index is out of bounds: "+iFrom ); + return; + } + + if ( iTo < 0 || iTo >= iCols ) + { + this.oApi._fnLog( oSettings, 1, "ColReorder 'to' index is out of bounds: "+iTo ); + return; + } + + /* + * Calculate the new column array index, so we have a mapping between the old and new + */ + var aiMapping = []; + for ( i=0, iLen=iCols ; i this.s.fixed-1 ) + { + this._fnMouseListener( i, this.s.dt.aoColumns[i].nTh ); + } + + /* Mark the original column order for later reference */ + this.s.dt.aoColumns[i]._ColReorder_iOrigCol = i; + } + + /* State saving */ + this.s.dt.aoStateSave.push( { + "fn": function (oS, sVal) { + return that._fnStateSave.call( that, sVal ); + }, + "sName": "ColReorder_State" + } ); + + /* An initial column order has been specified */ + var aiOrder = null; + if ( typeof this.s.init.aiOrder != 'undefined' ) + { + aiOrder = this.s.init.aiOrder.slice(); + } + + /* State loading, overrides the column order given */ + if ( this.s.dt.oLoadedState && typeof this.s.dt.oLoadedState.ColReorder != 'undefined' && + this.s.dt.oLoadedState.ColReorder.length == this.s.dt.aoColumns.length ) + { + aiOrder = this.s.dt.oLoadedState.ColReorder; + } + + /* If we have an order to apply - do so */ + if ( aiOrder ) + { + /* We might be called during or after the DataTables initialisation. If before, then we need + * to wait until the draw is done, if after, then do what we need to do right away + */ + if ( !that.s.dt._bInitComplete ) + { + var bDone = false; + this.s.dt.aoDrawCallback.push( { + "fn": function () { + if ( !that.s.dt._bInitComplete && !bDone ) + { + bDone = true; + var resort = fnInvertKeyValues( aiOrder ); + that._fnOrderColumns.call( that, resort ); + } + }, + "sName": "ColReorder_Pre" + } ); + } + else + { + var resort = fnInvertKeyValues( aiOrder ); + that._fnOrderColumns.call( that, resort ); + } + } + }, + + + /** + * Set the column order from an array + * @method _fnOrderColumns + * @param array a An array of integers which dictate the column order that should be applied + * @returns void + * @private + */ + "_fnOrderColumns": function ( a ) + { + if ( a.length != this.s.dt.aoColumns.length ) + { + this.s.dt.oInstance.oApi._fnLog( oDTSettings, 1, "ColReorder - array reorder does not "+ + "match known number of columns. Skipping." ); + return; + } + + for ( var i=0, iLen=a.length ; i 0 ) + { + this.dom.drag.removeChild( this.dom.drag.getElementsByTagName('tbody')[0] ); + } + while ( this.dom.drag.getElementsByTagName('tfoot').length > 0 ) + { + this.dom.drag.removeChild( this.dom.drag.getElementsByTagName('tfoot')[0] ); + } + + $('thead tr:eq(0)', this.dom.drag).each( function () { + $('th:not(:eq('+that.s.mouse.targetIndex+'))', this).remove(); + } ); + $('tr', this.dom.drag).height( $('tr:eq(0)', that.s.dt.nTHead).height() ); + + $('thead tr:gt(0)', this.dom.drag).remove(); + + $('thead th:eq(0)', this.dom.drag).each( function (i) { + this.style.width = $('th:eq('+that.s.mouse.targetIndex+')', that.s.dt.nTHead).width()+"px"; + } ); + + this.dom.drag.style.position = "absolute"; + this.dom.drag.style.zIndex = 1200; + this.dom.drag.style.top = "0px"; + this.dom.drag.style.left = "0px"; + this.dom.drag.style.width = $('th:eq('+that.s.mouse.targetIndex+')', that.s.dt.nTHead).outerWidth()+"px"; + + + this.dom.pointer = document.createElement( 'div' ); + this.dom.pointer.className = "DTCR_pointer"; + this.dom.pointer.style.position = "absolute"; + + if ( this.s.dt.oScroll.sX === "" && this.s.dt.oScroll.sY === "" ) + { + this.dom.pointer.style.top = $(this.s.dt.nTable).offset().top+"px"; + this.dom.pointer.style.height = $(this.s.dt.nTable).height()+"px"; + } + else + { + this.dom.pointer.style.top = $('div.dataTables_scroll', this.s.dt.nTableWrapper).offset().top+"px"; + this.dom.pointer.style.height = $('div.dataTables_scroll', this.s.dt.nTableWrapper).height()+"px"; + } + + document.body.appendChild( this.dom.pointer ); + document.body.appendChild( this.dom.drag ); + } +}; + + + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Static parameters + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +/** + * Array of all ColReorder instances for later reference + * @property ColReorder.aoInstances + * @type array + * @default [] + * @static + */ +ColReorder.aoInstances = []; + + + + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Static functions + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +/** + * Reset the column ordering for a DataTables instance + * @method ColReorder.fnReset + * @param object oTable DataTables instance to consider + * @returns void + * @static + */ +ColReorder.fnReset = function ( oTable ) +{ + for ( var i=0, iLen=ColReorder.aoInstances.length ; i Date: Mon, 23 Jan 2012 19:07:07 +0100 Subject: [PATCH 03/33] CC-3174 : Show builder, working on date choice pickers, make sure they accomodate client/server timezones. --- .../controllers/ScheduleController.php | 19 +- .../controllers/ShowbuilderController.php | 57 +- .../application/layouts/scripts/builder.phtml | 2 +- airtime_mvc/application/models/Schedule.php | 42 +- .../views/scripts/showbuilder/builder.phtml | 9 +- .../public/css/jquery-ui-timepicker.css | 28 - .../public/css/jquery.ui.timepicker.css | 69 + .../library/events/library_playlistbuilder.js | 16 + .../library/events/library_showbuilder.js | 17 + .../public/js/airtime/library/library.js | 16 - .../public/js/airtime/showbuilder/builder.js | 242 ++- .../timepicker/jquery.ui.timepicker-0.0.6.js | 849 ----------- .../js/timepicker/jquery.ui.timepicker.js | 1345 +++++++++++++++++ 13 files changed, 1715 insertions(+), 996 deletions(-) delete mode 100644 airtime_mvc/public/css/jquery-ui-timepicker.css create mode 100644 airtime_mvc/public/css/jquery.ui.timepicker.css delete mode 100644 airtime_mvc/public/js/timepicker/jquery.ui.timepicker-0.0.6.js create mode 100644 airtime_mvc/public/js/timepicker/jquery.ui.timepicker.js diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index c78dcb270..27e547863 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -41,33 +41,34 @@ 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/timepicker/jquery.ui.timepicker.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"); - $this->view->headScript()->appendFile($baseUrl.'/js/airtime/schedule/full-calendar-functions.js','text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/airtime/schedule/full-calendar-functions.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/schedule/add-show.js','text/javascript'); - $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->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/contextmenu.css'); + Application_Model_Schedule::createNewFormSections($this->view); $userInfo = Zend_Auth::getInstance()->getStorage()->read(); $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().";"); } diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index 674ea827d..85d491fde 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -7,36 +7,22 @@ class ShowbuilderController extends Zend_Controller_Action { $ajaxContext = $this->_helper->getHelper('AjaxContext'); $ajaxContext->addActionContext('schedule', 'json') + ->addActionContext('builder-feed', 'json') ->initContext(); } public function indexAction() { - $request = $this->getRequest(); + $this->_helper->layout->setLayout('builder'); - $user_id = $request->getParam("uid", 0); - $show_instance_id = $request->getParam("sid", 0); + $this->view->headScript()->appendFile($this->view->baseUrl('/js/airtime/library/events/library_showbuilder.js'),'text/javascript'); - try { - $user = new Application_Model_User($user_id); - $show_instance = new Application_Model_ShowInstance($show_instance_id); - } - catch(Exception $e) { - $this->_helper->redirector('denied', 'error'); - } + $this->_helper->actionStack('library', 'library'); + $this->_helper->actionStack('builder', 'showbuilder'); //user is allowed to schedule this show. - if ($user->isAdmin() || $user->isHost($show_instance->getShowId())) { - $this->_helper->layout->setLayout('builder'); - - $this->view->headScript()->appendFile($this->view->baseUrl('/js/airtime/library/events/library_showbuilder.js'),'text/javascript'); - - $this->_helper->actionStack('library', 'library'); - $this->_helper->actionStack('builder', 'showbuilder'); - } - else { - $this->_helper->redirector('denied', 'error'); - } + //if ($user->isAdmin() || $user->isHost($show_instance->getShowId())) { + //} } public function builderAction() { @@ -44,16 +30,39 @@ class ShowbuilderController extends Zend_Controller_Action $request = $this->getRequest(); $baseUrl = $request->getBaseUrl(); - $this->view->headScript()->appendFile($baseUrl.'/js/fullcalendar/fullcalendar_orig.js','text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/timepicker/jquery.ui.timepicker.js','text/javascript'); + + $this->view->headScript()->appendScript("var serverTimezoneOffset = ".date("Z")."; //in seconds"); + $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js','text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js','text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorderResize.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/showbuilder/builder.js','text/javascript'); - $this->view->headLink()->appendStylesheet($baseUrl.'/css/fullcalendar.css'); + $this->view->headLink()->appendStylesheet($baseUrl.'/css/jquery.ui.timepicker.css'); $this->_helper->viewRenderer->setResponseSegment('builder'); } - public function eventFeedAction() { + public function builderFeedAction() { + $request = $this->getRequest(); + $current_time = microtime(true); + + $starts_epoch = $request->getParam("start", $current_time); + //default ends is 24 hours after starts. + $ends_epoch = $request->getParam("end", $current_time + (60*60*24)); + + $startsDT = DateTime::createFromFormat("U.u", $starts_epoch, new DateTimeZone("UTC")); + $endsDT = DateTime::createFromFormat("U.u", $ends_epoch, new DateTimeZone("UTC")); + + $scheduled_items = Application_Model_Schedule::GetItems($startsDT->format("Y-m-d H:i:s.u"), $endsDT->format("Y-m-d H:i:s.u"), false); + + foreach ($scheduled_items as &$item) { + $itemStartsDT = DateTime::createFromFormat("Y-m-d H:i:s.u", $item["starts"], new DateTimeZone("UTC")); + $itemEndsDT = DateTime::createFromFormat("Y-m-d H:i:s.u", $item["ends"], new DateTimeZone("UTC")); + } + + $this->view->schedule = $scheduled_items; } public function scheduleAction() { diff --git a/airtime_mvc/application/layouts/scripts/builder.phtml b/airtime_mvc/application/layouts/scripts/builder.phtml index e7c4dbf0a..3efba392c 100644 --- a/airtime_mvc/application/layouts/scripts/builder.phtml +++ b/airtime_mvc/application/layouts/scripts/builder.phtml @@ -22,7 +22,7 @@
layout()->library ?>
-
layout()->builder ?>
+
layout()->builder ?>
diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php index 725578348..a0c8f3a5e 100644 --- a/airtime_mvc/application/models/Schedule.php +++ b/airtime_mvc/application/models/Schedule.php @@ -155,7 +155,7 @@ class Application_Model_Schedule { "nextShow"=>Application_Model_Show::GetNextShows($utcTimeNow, 1), "timezone"=> date("T"), "timezoneOffset"=> date("Z")); - + return $range; } @@ -294,6 +294,38 @@ class Application_Model_Schedule { return $rows; } + /* + * + * @param DateTime $p_startDateTime + * + * @param DateTime $p_endDateTime + * + * @return array $scheduledItems + * + */ + public static function GetScheduleDetailItems($p_startDateTime, $p_endDateTime) + { + global $CC_CONFIG, $CC_DBC; + + $sql = "SELECT DISTINCT + + showt.name, showt.color, showt.background_color, + si.starts, si.ends, si.time_filled, si.record, si.rebroadcast, + sched.starts, sched.ends, + ft.track_title, ft.artist_name, ft.album_title, ft.length + + FROM + ((cc_schedule AS sched JOIN cc_files AS ft ON (sched.file_id = ft.id) + RIGHT OUTER JOIN cc_show_instances AS si ON (si.id = sched.instance_id)) + JOIN cc_show AS showt ON (showt.id = si.show_id) + ) + + ORDER BY sched.starts;"; + + $rows = $CC_DBC->GetAll($sql); + return $rows; + } + public static function GetShowInstanceItems($instance_id) { global $CC_CONFIG, $CC_DBC; @@ -533,7 +565,7 @@ class Application_Model_Schedule { public static function createNewFormSections($p_view){ $isSaas = Application_Model_Preference::GetPlanLevel() == 'disabled'?false:true; - + $formWhat = new Application_Form_AddShowWhat(); $formWho = new Application_Form_AddShowWho(); $formWhen = new Application_Form_AddShowWhen(); @@ -560,16 +592,16 @@ class Application_Model_Schedule { 'add_show_duration' => '1h')); $formRepeats->populate(array('add_show_end_date' => date("Y-m-d"))); - + if(!$isSaas){ $formRecord = new Application_Form_AddShowRR(); $formAbsoluteRebroadcast = new Application_Form_AddShowAbsoluteRebroadcastDates(); $formRebroadcast = new Application_Form_AddShowRebroadcastDates(); - + $formRecord->removeDecorator('DtDdWrapper'); $formAbsoluteRebroadcast->removeDecorator('DtDdWrapper'); $formRebroadcast->removeDecorator('DtDdWrapper'); - + $p_view->rr = $formRecord; $p_view->absoluteRebroadcast = $formAbsoluteRebroadcast; $p_view->rebroadcast = $formRebroadcast; diff --git a/airtime_mvc/application/views/scripts/showbuilder/builder.phtml b/airtime_mvc/application/views/scripts/showbuilder/builder.phtml index 8284050c2..8a0834363 100644 --- a/airtime_mvc/application/views/scripts/showbuilder/builder.phtml +++ b/airtime_mvc/application/views/scripts/showbuilder/builder.phtml @@ -1 +1,8 @@ -
\ No newline at end of file +
+ + + + + +
+
\ No newline at end of file diff --git a/airtime_mvc/public/css/jquery-ui-timepicker.css b/airtime_mvc/public/css/jquery-ui-timepicker.css deleted file mode 100644 index 926f56692..000000000 --- a/airtime_mvc/public/css/jquery-ui-timepicker.css +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Timepicker stylesheet - * Highly inspired from datepicker - * FG - Nov 2010 - Web3R - * - * version 0.0.3 : Fixed some settings, more dynamic - * version 0.0.4 : Removed width:100% on tables - */ - -.ui-timepicker-inline { display: inline } - -#ui-timepicker-div { padding: 0.2em; z-index: 10 !important } -.ui-timepicker-table { display: inline-table } -.ui-timepicker-table table { margin:0.15em 0 0 0; border-collapse: collapse; } - -.ui-timepicker-hours, .ui-timepicker-minutes { padding: 0.2em; } - -.ui-timepicker-table .ui-timepicker-title { line-height: 1.8em; text-align: center; } -.ui-timepicker-table td { padding: 0.1em; width: 2.2em; } -.ui-timepicker-table th.periods { padding: 0.1em; width: 2.2em; } -.ui-timepicker-table td a { - display:block; - padding:0.2em 0.3em 0.2em 0.5em; - width: 1.2em; - - text-align:right; - text-decoration:none; -} diff --git a/airtime_mvc/public/css/jquery.ui.timepicker.css b/airtime_mvc/public/css/jquery.ui.timepicker.css new file mode 100644 index 000000000..08b442a7e --- /dev/null +++ b/airtime_mvc/public/css/jquery.ui.timepicker.css @@ -0,0 +1,69 @@ +/* + * Timepicker stylesheet + * Highly inspired from datepicker + * FG - Nov 2010 - Web3R + * + * version 0.0.3 : Fixed some settings, more dynamic + * version 0.0.4 : Removed width:100% on tables + * version 0.1.1 : set width 0 on tables to fix an ie6 bug + */ + +.ui-timepicker-inline { display: inline; } + +#ui-timepicker-div { padding: 0.2em } +.ui-timepicker-table { display: inline-table; width: 0; } +.ui-timepicker-table table { margin:0.15em 0 0 0; border-collapse: collapse; } + +.ui-timepicker-hours, .ui-timepicker-minutes { padding: 0.2em; } + +.ui-timepicker-table .ui-timepicker-title { line-height: 1.8em; text-align: center; } +.ui-timepicker-table td { padding: 0.1em; width: 2.2em; } +.ui-timepicker-table th.periods { padding: 0.1em; width: 2.2em; } + +/* span for disabled cells */ +.ui-timepicker-table td span { + display:block; + padding:0.2em 0.3em 0.2em 0.5em; + width: 1.2em; + + text-align:right; + text-decoration:none; +} +/* anchors for clickable cells */ +.ui-timepicker-table td a { + display:block; + padding:0.2em 0.3em 0.2em 0.5em; + width: 1.2em; + cursor: pointer; + text-align:right; + text-decoration:none; +} + + +/* buttons and button pane styling */ +.ui-timepicker .ui-timepicker-buttonpane { + background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; +} +.ui-timepicker .ui-timepicker-buttonpane button { margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } +/* The close button */ +.ui-timepicker .ui-timepicker-close { float: right } + +/* the now button */ +.ui-timepicker .ui-timepicker-now { float: left; } + +/* the deselect button */ +.ui-timepicker .ui-timepicker-deselect { float: left; } + + +/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ +.ui-timepicker-cover { + display: none; /*sorry for IE5*/ + display/**/: block; /*sorry for IE5*/ + position: absolute; /*must have*/ + z-index: -1; /*must have*/ + filter: mask(); /*must have*/ + top: -4px; /*must have*/ + left: -4px; /*must have*/ + width: 200px; /*must have*/ + height: 200px; /*must have*/ +} \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js index 3935d8c23..87c70d1cb 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -12,6 +12,22 @@ function dtDrawCallback() { setupGroupActions(); } +function addLibraryItemEvents() { + + $('#library_display tr[id ^= "au"]') + .draggable({ + helper: 'clone', + cursor: 'pointer' + }); + + $('#library_display tbody tr td').not('[class=library_checkbox]') + .jjmenu("click", + [{get:"/Library/context-menu/format/json/id/#id#/type/#type#"}], + {id: getId, type: getType}, + {xposition: "mouse", yposition: "mouse"}); + +} + function setupLibraryToolbar() { $("div.library_toolbar").html('Reset Order' + 'Delete' + diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js index f5a1c6d18..2070f9add 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -11,4 +11,21 @@ function dtDrawCallback() { addLibraryItemEvents(); //addMetadataQtip(); //setupGroupActions(); +} + +function addLibraryItemEvents() { + + $('#library_display tr') + .draggable({ + helper: 'clone', + cursor: 'pointer', + connectToSortable: '#show_builder_table' + }); + + $('#library_display tbody tr td').not('[class=library_checkbox]') + .jjmenu("click", + [{get:"/Library/context-menu/format/json/id/#id#/type/#type#"}], + {id: getId, type: getType}, + {xposition: "mouse", yposition: "mouse"}); + } \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 65dc7c54b..31b776f59 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -104,22 +104,6 @@ function deletePlaylist(json) { } //end callbacks called by jjmenu -function addLibraryItemEvents() { - - $('#library_display tr[id ^= "au"]') - .draggable({ - helper: 'clone', - cursor: 'pointer' - }); - - $('#library_display tbody tr td').not('[class=library_checkbox]') - .jjmenu("click", - [{get:"/Library/context-menu/format/json/id/#id#/type/#type#"}], - {id: getId, type: getType}, - {xposition: "mouse", yposition: "mouse"}); - -} - function addProgressIcon(id) { if($("#au_"+id).find("td.library_title").find("span").length > 0){ $("#au_"+id).find("td.library_title").find("span").removeClass(); diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 0038d4a40..02359e0d5 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -1,76 +1,192 @@ -function getFullCalendarEvents(start, end, callback) { - var url, unix_ts_start, unix_ts_end; +function tpStartOnHourShowCallback(hour) { + var tpEndHour = $('#show_builder_timepicker_end').timepicker('getHour'); + + // Check if proposed hour is prior or equal to selected end time hour + if (hour <= tpEndHour) { return true; } + // if hour did not match, it can not be selected + return false; +} - unix_ts_start = Math.round(start.getTime() / 1000), - unix_ts_end = Math.round(end.getTime() / 1000); +function tpStartOnMinuteShowCallback(hour, minute) { + var tpEndHour = $('#show_builder_timepicker_end').timepicker('getHour'), + tpEndMinute = $('#show_builder_timepicker_end').timepicker('getMinute'); + + // Check if proposed hour is prior to selected end time hour + if (hour < tpEndHour) { return true; } + // Check if proposed hour is equal to selected end time hour and minutes is prior + if ( (hour == tpEndHour) && (minute < tpEndMinute) ) { return true; } + // if minute did not match, it can not be selected + return false; +} - url = '/Schedule/event-feed'; +function tpEndOnHourShowCallback(hour) { + var tpStartHour = $('#show_builder_timepicker_start').timepicker('getHour'); + + // Check if proposed hour is after or equal to selected start time hour + if (hour >= tpStartHour) { return true; } + // if hour did not match, it can not be selected + return false; +} - var d = new Date(); +function tpEndOnMinuteShowCallback(hour, minute) { + var tpStartHour = $('#show_builder_timepicker_start').timepicker('getHour'), + tpStartMinute = $('#show_builder_timepicker_start').timepicker('getMinute'); + + // Check if proposed hour is after selected start time hour + if (hour > tpStartHour) { return true; } + // Check if proposed hour is equal to selected start time hour and minutes is after + if ( (hour == tpStartHour) && (minute > tpStartMinute) ) { return true; } + // if minute did not match, it can not be selected + return false; +} - $.get(url, {format: "json", start: unix_ts_start, end: unix_ts_end, cachep: d.getTime()}, function(json){ - callback(json.events); - }); +/* + * Get the schedule range start in unix timestamp form (in seconds). + * defaults to NOW if nothing is selected. + * + * @param String sDatePickerId + * + * @param String sTimePickerId + * + * @return Number iTime + */ +function fnGetUIPickerUnixTimestamp(sDatePickerId, sTimePickerId) { + var oDate, + oTimePicker = $( sTimePickerId ), + iTime, + iHour, + iMin, + iClientOffset, + iServerOffset; + + oDate = $( sDatePickerId ).datepicker( "getDate" ); + + //nothing has been selected from this datepicker. + if (oDate === null) { + oDate = new Date(); + } + else { + iHour = oTimePicker.timepicker('getHour'); + iMin = oTimePicker.timepicker('getMinute'); + + oDate.setHours(iHour, iMin); + } + + iTime = oDate.getTime(); //value is in millisec. + iTime = Math.round(iTime / 1000); + iClientOffset = -(oDate.getTimezoneOffset() * 60); //offset is returned in minutes. + iServerOffset = serverTimezoneOffset; + + return iTime; +} + +function fnGetScheduleRange() { + var iStart, + iEnd, + iRange; + + iStart = fnGetUIPickerUnixTimestamp("#show_builder_datepicker_start", "#show_builder_timepicker_start"); + iEnd = fnGetUIPickerUnixTimestamp("#show_builder_datepicker_end", "#show_builder_timepicker_end"); + + iRange = iEnd - iStart; +} + +function fnServerData( sSource, aoData, fnCallback ) { + aoData.push( { name: "format", value: "json"} ); + + $.ajax( { + "dataType": "json", + "type": "GET", + "url": sSource, + "data": aoData, + "success": fnCallback + } ); } $(document).ready(function() { - $('#show_builder').fullCalendar({ - header: { - left: '', - center: '', - right: '' - }, - defaultView: 'agendaDay', - allDaySlot: false, - theme: true, + var dTable; + + dTable = $('#show_builder_table').dataTable( { + "aoColumns": [ + /* starts */{"mDataProp": "starts", "sTitle": "starts"}, + /* ends */{"mDataProp": "ends", "sTitle": "ends"}, + /* title */{"mDataProp": "file_id", "sTitle": "file_id"} + ], + + "asStripClasses": [ 'odd' ], + + "bJQueryUI": true, + "bSort": false, + "bFilter": false, + "bProcessing": true, + "bServerSide": true, + "bInfo": false, + + "fnServerData": fnServerData, - events: getFullCalendarEvents, + // R = ColReorder, C = ColVis, see datatables doc for others + "sDom": 'Rr<"H"C>t<"F">', + + //options for infinite scrolling + //"bScrollInfinite": true, + //"bScrollCollapse": true, + "sScrollY": "400px", + + "sAjaxDataProp": "schedule", + "sAjaxSource": "/showbuilder/builder-feed" - axisFormat: 'H:mm', - slotMinutes: 1, - timeFormat: { - agenda: 'H:mm:ss{ - H:mm:ss}' - }, - - minTime: '17:00', - maxTime: '18:00', - - droppable: true, // this allows things to be dropped onto the calendar !!! - drop: function(date, allDay) { // this function is called when something is dropped - - // retrieve the dropped element's stored Event Object - //var originalEventObject = $(this).data('eventObject'); + }); + + $( "#show_builder_datepicker_start" ).datepicker({ + dateFormat: '@', + onSelect: function(sDate, oDatePicker) { + var oDate; - // we need to copy it, so that multiple events don't have a reference to the same object - //var copiedEventObject = $.extend({}, originalEventObject); - var copiedEventObject = {}; - var data = $(this).data("show_builder"); - - $.ajax({url: "/showbuilder/schedule", - data:{format: "json", sid:"", schedule_start: date}, - dataType:"json", - success:function(json){ - var x; - }, - error:function(jqXHR, textStatus, errorThrown){ - var x; - } - }); - - // assign it the date that was reported - copiedEventObject.title = "test title"; - copiedEventObject.start = date; - var end = new Date(date.getTime()); - end.setMinutes(end.getMinutes() + 5); - end.setSeconds(end.getSeconds() + 5); - copiedEventObject.end = end; - copiedEventObject.allDay = allDay; - - // render the event on the calendar - // the last `true` argument determines if the event "sticks" (http://arshaw.com/fullcalendar/docs/event_rendering/renderEvent/) - //$('#show_builder').fullCalendar('renderEvent', copiedEventObject, true); - - $("#schedule_calendar").fullCalendar( 'refetchEvents' ); + oDate = new Date(parseInt(sDate, 10)); + $(this).val(oDate.toDateString()); } }); + + $( "#show_builder_timepicker_start" ).timepicker({ + showPeriodLabels: false, + showCloseButton: true, + showLeadingZero: false + }); + + $( "#show_builder_datepicker_end" ).datepicker({ + dateFormat: '@', + onSelect: function(sDate, oDatePicker) { + var oDate; + + oDate = new Date(parseInt(sDate, 10)); + $(this).val(oDate.toDateString()); + } + }); + + $( "#show_builder_timepicker_end" ).timepicker({ + showPeriodLabels: false, + showCloseButton: true, + showLeadingZero: false + }); + + $( "#show_builder_timerange_button" ).click(function(ev){ + var oTable, oSettings, iStartDate, iEndDate, iStartTime, iEndTime; + + fnGetScheduleRange(); + + oTable = $('#show_builder_table').dataTable({"bRetrieve": true}); + oSettings = oTable.fnSettings(); + oSettings["_iDisplayStart"] = 1050; + + oTable.fnDraw(); + }); + + $( "#show_builder_table" ).sortable({ + placeholder: "ui-state-highlight", + items: 'tr', + receive: function(event, ui) { + var x; + } + }); + }); diff --git a/airtime_mvc/public/js/timepicker/jquery.ui.timepicker-0.0.6.js b/airtime_mvc/public/js/timepicker/jquery.ui.timepicker-0.0.6.js deleted file mode 100644 index a7a0d2b07..000000000 --- a/airtime_mvc/public/js/timepicker/jquery.ui.timepicker-0.0.6.js +++ /dev/null @@ -1,849 +0,0 @@ -/* - * jQuery UI Timepicker 0.0.5 - * - * Copyright 2010-2011, Francois Gelinas - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://fgelinas.com - * - * Depends: - * jquery.ui.core.js - */ - - /* - * As it is a timepicker, I inspired most of the code from the datepicker - * Francois Gelinas - Nov 2010 - */ - - /* - * Release 0.0.2 - Jan 6, 2011 - * Updated to include common display options for USA users - * Stephen Commisso - Jan 2011 - */ - - /* - * release 0.0.3 - Jan 8, 2011 - * Re-added a display:none on the main div (fix a small empty div visible at the bottom of the page before timepicker is called) (Thanks Gertjan van Roekel) - * Fixed a problem where the timepicker was never displayed with jquery ui 1.8.7 css, - * the problem was the class ui-helper-hidden-accessible, witch I removed. - * Thanks Alexander Fietz and StackOverflow : http://stackoverflow.com/questions/4522274/jquery-timepicker-and-jqueryui-1-8-7-conflict - */ - - /* - * Release 0.0.4 - jan 10, 2011 - * changed showLeadingZero to affect only hours, added showMinutesLeadingZero for minutes display - * Removed width:100% for tables in css - */ - - /* - * Release 0.0.5 - Jan 18, 2011 - * Now updating time picker selected value when manually typing in the text field (thanks Rasmus Schultz) - * Fixed : with showPeriod: true and showLeadingZero: true, PM hours did not show leading zeros (thanks Chandler May) - * Fixed : with showPeriod: true and showLeadingZero: true, Selecting 12 AM shows as 00 AM in the input field, also parsing 12AM did not work correctly (thanks Rasmus Schultz) - */ - - /* - * Release 0.0.6 - Jan 19, 2011 - * Added standard "change" event being triggered on the input when the content changes. (Thanks Rasmus Schultz) - * Added support for inline timePicker, attached to div or span - * Added altField that receive the parsed time value when selected time changes - * Added defaultTime value to use when input field is missing (inline) or input value is empty - * if defaultTime is missing, current time is used - * - */ - -(function ($, undefined) { - - $.extend($.ui, { timepicker: { version: "0.0.1"} }); - - var PROP_NAME = 'timepicker'; - var tpuuid = new Date().getTime(); - - /* Time picker manager. - Use the singleton instance of this class, $.timepicker, to interact with the time picker. - Settings for (groups of) time pickers are maintained in an instance object, - allowing multiple different settings on the same page. */ - - function Timepicker() { - this.debug = true; // Change this to true to start debugging - this._curInst = null; // The current instance in use - this._isInline = false; // true if the instance is displayed inline - this._disabledInputs = []; // List of time picker inputs that have been disabled - this._timepickerShowing = false; // True if the popup picker is showing , false if not - this._inDialog = false; // True if showing within a "dialog", false if not - this._dialogClass = 'ui-timepicker-dialog'; // The name of the dialog marker class - this._mainDivId = 'ui-timepicker-div'; // The ID of the main timepicker division - this._inlineClass = 'ui-timepicker-inline'; // The name of the inline marker class - this._currentClass = 'ui-timepicker-current'; // The name of the current hour / minutes marker class - this._dayOverClass = 'ui-timepicker-days-cell-over'; // The name of the day hover marker class - - this.regional = []; // Available regional settings, indexed by language code - this.regional[''] = { // Default regional settings - hourText: 'Hour', // Display text for hours section - minuteText: 'Minute', // Display text for minutes link - amPmText: ['AM', 'PM'] // Display text for AM PM - }; - this._defaults = { // Global defaults for all the time picker instances - showOn: 'focus', // 'focus' for popup on focus, - // 'button' for trigger button, or 'both' for either (not yet implemented) - showAnim: 'fadeIn', // Name of jQuery animation for popup - showOptions: {}, // Options for enhanced animations - appendText: '', // Display text following the input box, e.g. showing the format - onSelect: null, // Define a callback function when a hour / minutes is selected - onClose: null, // Define a callback function when the timepicker is closed - timeSeparator: ':', // The caracter to use to separate hours and minutes. - showPeriod: false, // Define whether or not to show AM/PM with selected time - showLeadingZero: true, // Define whether or not to show a leading zero for hours < 10. [true/false] - showMinutesLeadingZero: true, // Define whether or not to show a leading zero for minutes < 10. - altField: '', // Selector for an alternate field to store selected time into - defaultTime: '' // Used as default time when input field is empty or for inline timePicker - }; - $.extend(this._defaults, this.regional['']); - - this.tpDiv = $(''); - } - - $.extend(Timepicker.prototype, { - /* Class name added to elements to indicate already configured with a time picker. */ - markerClassName: 'hasTimepicker', - - /* Debug logging (if enabled). */ - log: function () { - if (this.debug) - console.log.apply('', arguments); - }, - - // TODO rename to "widget" when switching to widget factory - _widgetTimepicker: function () { - return this.tpDiv; - }, - - /* Override the default settings for all instances of the time picker. - @param settings object - the new settings to use as defaults (anonymous object) - @return the manager object */ - setDefaults: function (settings) { - extendRemove(this._defaults, settings || {}); - return this; - }, - - /* Attach the time picker to a jQuery selection. - @param target element - the target input field or division or span - @param settings object - the new settings to use for this time picker instance (anonymous) */ - _attachTimepicker: function (target, settings) { - // check for settings on the control itself - in namespace 'time:' - var inlineSettings = null; - for (var attrName in this._defaults) { - var attrValue = target.getAttribute('time:' + attrName); - if (attrValue) { - inlineSettings = inlineSettings || {}; - try { - inlineSettings[attrName] = eval(attrValue); - } catch (err) { - inlineSettings[attrName] = attrValue; - } - } - } - var nodeName = target.nodeName.toLowerCase(); - var inline = (nodeName == 'div' || nodeName == 'span'); - - if (!target.id) { - this.uuid += 1; - target.id = 'tp' + this.uuid; - } - var inst = this._newInst($(target), inline); - inst.settings = $.extend({}, settings || {}, inlineSettings || {}); - if (nodeName == 'input') { - this._connectTimepicker(target, inst); - } else if (inline) { - this._inlineTimepicker(target, inst); - } - }, - - /* Create a new instance object. */ - _newInst: function (target, inline) { - var id = target[0].id.replace(/([^A-Za-z0-9_-])/g, '\\\\$1'); // escape jQuery meta chars - return { id: id, input: target, // associated target - selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection - drawMonth: 0, drawYear: 0, // month being drawn - inline: inline, // is timepicker inline or not : - tpDiv: (!inline ? this.tpDiv : // presentation div - $('
')) - }; - }, - - /* Attach the time picker to an input field. */ - _connectTimepicker: function (target, inst) { - var input = $(target); - inst.append = $([]); - inst.trigger = $([]); - if (input.hasClass(this.markerClassName)) { return; } - this._attachments(input, inst); - input.addClass(this.markerClassName). - keydown(this._doKeyDown). - keyup(this._doKeyUp). - bind("setData.timepicker", function (event, key, value) { - inst.settings[key] = value; - }). - bind("getData.timepicker", function (event, key) { - return this._get(inst, key); - }); - //this._autoSize(inst); - $.data(target, PROP_NAME, inst); - }, - - /* Handle keystrokes. */ - _doKeyDown: function (event) { - var inst = $.timepicker._getInst(event.target); - var handled = true; - inst._keyEvent = true; - if ($.timepicker._timepickerShowing) { - switch (event.keyCode) { - case 9: $.timepicker._hideTimepicker(); - handled = false; - break; // hide on tab out - case 27: $.timepicker._hideTimepicker(); - break; // hide on escape - default: handled = false; - } - } - else if (event.keyCode == 36 && event.ctrlKey) { // display the time picker on ctrl+home - $.timepicker._showTimepicker(this); - } - else { - handled = false; - } - if (handled) { - event.preventDefault(); - event.stopPropagation(); - } - }, - - /* Update selected time on keyUp */ - /* Added verion 0.0.5 */ - _doKeyUp: function (event) { - var inst = $.timepicker._getInst(event.target); - $.timepicker._setTimeFromField(inst); - $.timepicker._updateTimepicker(inst); - }, - - /* Make attachments based on settings. */ - _attachments: function (input, inst) { - var appendText = this._get(inst, 'appendText'); - var isRTL = this._get(inst, 'isRTL'); - if (inst.append) { inst.append.remove(); } - if (appendText) { - inst.append = $('' + appendText + ''); - input[isRTL ? 'before' : 'after'](inst.append); - } - input.unbind('focus', this._showTimepicker); - if (inst.trigger) { inst.trigger.remove(); } - var showOn = this._get(inst, 'showOn'); - if (showOn == 'focus' || showOn == 'both') { // pop-up time picker when in the marked field - input.focus(this._showTimepicker); - } - if (showOn == 'button' || showOn == 'both') { // pop-up time picker when button clicked - var buttonText = this._get(inst, 'buttonText'); - var buttonImage = this._get(inst, 'buttonImage'); - inst.trigger = $(this._get(inst, 'buttonImageOnly') ? - $('').addClass(this._triggerClass). - attr({ src: buttonImage, alt: buttonText, title: buttonText }) : - $('').addClass(this._triggerClass). - html(buttonImage == '' ? buttonText : $('').attr( - { src: buttonImage, alt: buttonText, title: buttonText }))); - input[isRTL ? 'before' : 'after'](inst.trigger); - inst.trigger.click(function () { - if ($.timepicker._timepickerShowing && $.timepicker._lastInput == input[0]) { $.timepicker._hideTimepicker(); } - else { $.timepicker._showTimepicker(input[0]); } - return false; - }); - } - }, - - - /* Attach an inline time picker to a div. */ - _inlineTimepicker: function(target, inst) { - var divSpan = $(target); - if (divSpan.hasClass(this.markerClassName)) - return; - divSpan.addClass(this.markerClassName).append(inst.tpDiv). - bind("setData.timepicker", function(event, key, value){ - inst.settings[key] = value; - }).bind("getData.timepicker", function(event, key){ - return this._get(inst, key); - }); - $.data(target, PROP_NAME, inst); - this._setTimeFromField(inst); - this._updateTimepicker(inst); - inst.tpDiv.show(); - }, - - /* Pop-up the time picker for a given input field. - @param input element - the input field attached to the time picker or - event - if triggered by focus */ - _showTimepicker: function (input) { - input = input.target || input; - if (input.nodeName.toLowerCase() != 'input') { input = $('input', input.parentNode)[0]; } // find from button/image trigger - if ($.timepicker._isDisabledTimepicker(input) || $.timepicker._lastInput == input) { return; } // already here - - var inst = $.timepicker._getInst(input); - if ($.timepicker._curInst && $.timepicker._curInst != inst) { - $.timepicker._curInst.tpDiv.stop(true, true); - } - var beforeShow = $.timepicker._get(inst, 'beforeShow'); - extendRemove(inst.settings, (beforeShow ? beforeShow.apply(input, [input, inst]) : {})); - inst.lastVal = null; - $.timepicker._lastInput = input; - - $.timepicker._setTimeFromField(inst); - if ($.timepicker._inDialog) { input.value = ''; } // hide cursor - if (!$.timepicker._pos) { // position below input - $.timepicker._pos = $.timepicker._findPos(input); - $.timepicker._pos[1] += input.offsetHeight; // add the height - } - var isFixed = false; - $(input).parents().each(function () { - isFixed |= $(this).css('position') == 'fixed'; - return !isFixed; - }); - if (isFixed && $.browser.opera) { // correction for Opera when fixed and scrolled - $.timepicker._pos[0] -= document.documentElement.scrollLeft; - $.timepicker._pos[1] -= document.documentElement.scrollTop; - } - var offset = { left: $.timepicker._pos[0], top: $.timepicker._pos[1] }; - $.timepicker._pos = null; - // determine sizing offscreen - inst.tpDiv.css({ position: 'absolute', display: 'block', top: '-1000px' }); - $.timepicker._updateTimepicker(inst); - - // reset clicked state - inst._hoursClicked = false; - inst._minutesClicked = false; - - // fix width for dynamic number of time pickers - // and adjust position before showing - offset = $.timepicker._checkOffset(inst, offset, isFixed); - inst.tpDiv.css({ position: ($.timepicker._inDialog && $.blockUI ? - 'static' : (isFixed ? 'fixed' : 'absolute')), display: 'none', - left: offset.left + 'px', top: offset.top + 'px' - }); - if (!inst.inline) { - var showAnim = $.timepicker._get(inst, 'showAnim'); - var duration = $.timepicker._get(inst, 'duration'); - var postProcess = function () { - $.timepicker._timepickerShowing = true; - var borders = $.timepicker._getBorders(inst.tpDiv); - inst.tpDiv.find('iframe.ui-timepicker-cover'). // IE6- only - css({ left: -borders[0], top: -borders[1], - width: inst.tpDiv.outerWidth(), height: inst.tpDiv.outerHeight() - }); - }; - inst.tpDiv.zIndex($(input).zIndex() + 1); - if ($.effects && $.effects[showAnim]) { - inst.tpDiv.show(showAnim, $.timepicker._get(inst, 'showOptions'), duration, postProcess); - } - else { - inst.tpDiv[showAnim || 'show']((showAnim ? duration : null), postProcess); - } - if (!showAnim || !duration) { postProcess(); } - if (inst.input.is(':visible') && !inst.input.is(':disabled')) { inst.input.focus(); } - $.timepicker._curInst = inst; - } - }, - - /* Generate the time picker content. */ - _updateTimepicker: function (inst) { - var self = this; - var borders = $.timepicker._getBorders(inst.tpDiv); - inst.tpDiv.empty().append(this._generateHTML(inst)) - .find('iframe.ui-timepicker-cover') // IE6- only - .css({ left: -borders[0], top: -borders[1], - width: inst.tpDiv.outerWidth(), height: inst.tpDiv.outerHeight() - }) - .end() - .find('.ui-timepicker td a') - .bind('mouseout', function () { - $(this).removeClass('ui-state-hover'); - if (this.className.indexOf('ui-timepicker-prev') != -1) $(this).removeClass('ui-timepicker-prev-hover'); - if (this.className.indexOf('ui-timepicker-next') != -1) $(this).removeClass('ui-timepicker-next-hover'); - }) - .bind('mouseover', function () { - if (!self._isDisabledTimepicker(inst.inline ? inst.tpDiv.parent()[0] : inst.input[0])) { - $(this).parents('.ui-timepicker-calendar').find('a').removeClass('ui-state-hover'); - $(this).addClass('ui-state-hover'); - if (this.className.indexOf('ui-timepicker-prev') != -1) $(this).addClass('ui-timepicker-prev-hover'); - if (this.className.indexOf('ui-timepicker-next') != -1) $(this).addClass('ui-timepicker-next-hover'); - } - }) - .end() - .find('.' + this._dayOverClass + ' a') - .trigger('mouseover') - .end(); - }, - - /* Generate the HTML for the current state of the date picker. */ - _generateHTML: function (inst) { - var h, m, html = ''; - var showPeriod = (this._get(inst, 'showPeriod') == true); - var showLeadingZero = (this._get(inst, 'showLeadingZero') == true); - var showMinutesLeadingZero = (this._get(inst, 'showMinutesLeadingZero') == true); - var amPmText = this._get(inst, 'amPmText'); - - - html = '' + - '' + // Close the Hour td - '
' + - '
' + - this._get(inst, 'hourText') + - '
' + - ''; - - // AM - html += ''; - for (h = 0; h <= 5; h++) { - html += this._generateHTMLHourCell(inst, h, showPeriod, showLeadingZero); - } - - html += ''; - for (h = 6; h <= 11; h++) { - html += this._generateHTMLHourCell(inst, h, showPeriod, showLeadingZero); - } - - // PM - html += ''; - for (h = 12; h <= 17; h++) { - html += this._generateHTMLHourCell(inst, h, showPeriod, showLeadingZero); - } - - html += ''; - for (h = 18; h <= 23; h++) { - html += this._generateHTMLHourCell(inst, h, showPeriod, showLeadingZero); - } - html += '
' + amPmText[0] + '
' + amPmText[1] + '
' + // Close the hours cells table - '		' + // open minutes td - /* Add the minutes */ - '
' + - this._get(inst, 'minuteText') + - '
' + - '' + - ''; - for (m = 0; m < 15; m += 5) { - html += this._generateHTMLMinuteCell(inst, m, (m < 10) && showMinutesLeadingZero ? "0" + m.toString() : m.toString()); - } - html += ''; - for (m = 15; m < 30; m += 5) { - html += this._generateHTMLMinuteCell(inst, m, m.toString()); - } - html += ''; - for (m = 30; m < 45; m += 5) { - html += this._generateHTMLMinuteCell(inst, m, m.toString()); - } - html += ''; - for (m = 45; m < 60; m += 5) { - html += this._generateHTMLMinuteCell(inst, m, m.toString()); - } - html += '
' + - '
'; - return html; - }, - - /* Generate the content of a "Hour" cell */ - _generateHTMLHourCell: function (inst, hour, showPeriod, showLeadingZero) { - - var displayHour = hour; - if ((hour > 12) && showPeriod) { - displayHour = hour - 12; - } - if ((displayHour == 0) && showPeriod) { - displayHour = 12; - } - if ((displayHour < 10) && showLeadingZero) { - displayHour = '0' + displayHour; - } - - - var html = '' + - '' + - displayHour.toString() + - ''; - return html; - }, - /* Generate the content of a "Hour" cell */ - _generateHTMLMinuteCell: function (inst, minute, displayText) { - var html = '' + - '' + - displayText + - ''; - return html; - }, - - /* Is the first field in a jQuery collection disabled as a timepicker? - @param target element - the target input field or division or span - @return boolean - true if disabled, false if enabled */ - _isDisabledTimepicker: function (target) { - if (!target) { return false; } - for (var i = 0; i < this._disabledInputs.length; i++) { - if (this._disabledInputs[i] == target) { return true; } - } - return false; - }, - - /* Check positioning to remain on screen. */ - _checkOffset: function (inst, offset, isFixed) { - var tpWidth = inst.tpDiv.outerWidth(); - var tpHeight = inst.tpDiv.outerHeight(); - var inputWidth = inst.input ? inst.input.outerWidth() : 0; - var inputHeight = inst.input ? inst.input.outerHeight() : 0; - var viewWidth = document.documentElement.clientWidth + $(document).scrollLeft(); - var viewHeight = document.documentElement.clientHeight + $(document).scrollTop(); - - offset.left -= (this._get(inst, 'isRTL') ? (tpWidth - inputWidth) : 0); - offset.left -= (isFixed && offset.left == inst.input.offset().left) ? $(document).scrollLeft() : 0; - offset.top -= (isFixed && offset.top == (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0; - - // now check if datepicker is showing outside window viewport - move to a better place if so. - offset.left -= Math.min(offset.left, (offset.left + tpWidth > viewWidth && viewWidth > tpWidth) ? - Math.abs(offset.left + tpWidth - viewWidth) : 0); - offset.top -= Math.min(offset.top, (offset.top + tpHeight > viewHeight && viewHeight > tpHeight) ? - Math.abs(tpHeight + inputHeight) : 0); - - return offset; - }, - - /* Find an object's position on the screen. */ - _findPos: function (obj) { - var inst = this._getInst(obj); - var isRTL = this._get(inst, 'isRTL'); - while (obj && (obj.type == 'hidden' || obj.nodeType != 1)) { - obj = obj[isRTL ? 'previousSibling' : 'nextSibling']; - } - var position = $(obj).offset(); - return [position.left, position.top]; - }, - - /* Retrieve the size of left and top borders for an element. - @param elem (jQuery object) the element of interest - @return (number[2]) the left and top borders */ - _getBorders: function (elem) { - var convert = function (value) { - return { thin: 1, medium: 2, thick: 3}[value] || value; - }; - return [parseFloat(convert(elem.css('border-left-width'))), - parseFloat(convert(elem.css('border-top-width')))]; - }, - - - /* Close time picker if clicked elsewhere. */ - _checkExternalClick: function (event) { - if (!$.timepicker._curInst) { return; } - var $target = $(event.target); - if ($target[0].id != $.timepicker._mainDivId && - $target.parents('#' + $.timepicker._mainDivId).length == 0 && - !$target.hasClass($.timepicker.markerClassName) && - !$target.hasClass($.timepicker._triggerClass) && - $.timepicker._timepickerShowing && !($.timepicker._inDialog && $.blockUI)) - $.timepicker._hideTimepicker(); - }, - - /* Hide the time picker from view. - @param input element - the input field attached to the time picker */ - _hideTimepicker: function (input) { - var inst = this._curInst; - if (!inst || (input && inst != $.data(input, PROP_NAME))) { return; } - if (this._timepickerShowing) { - var showAnim = this._get(inst, 'showAnim'); - var duration = this._get(inst, 'duration'); - var postProcess = function () { - $.timepicker._tidyDialog(inst); - this._curInst = null; - }; - if ($.effects && $.effects[showAnim]) { - inst.tpDiv.hide(showAnim, $.timepicker._get(inst, 'showOptions'), duration, postProcess); - } - else { - inst.tpDiv[(showAnim == 'slideDown' ? 'slideUp' : - (showAnim == 'fadeIn' ? 'fadeOut' : 'hide'))]((showAnim ? duration : null), postProcess); - } - if (!showAnim) { postProcess(); } - var onClose = this._get(inst, 'onClose'); - if (onClose) { - onClose.apply( - (inst.input ? inst.input[0] : null), - [(inst.input ? inst.input.val() : ''), inst]); // trigger custom callback - } - this._timepickerShowing = false; - this._lastInput = null; - if (this._inDialog) { - this._dialogInput.css({ position: 'absolute', left: '0', top: '-100px' }); - if ($.blockUI) { - $.unblockUI(); - $('body').append(this.tpDiv); - } - } - this._inDialog = false; - } - }, - - /* Tidy up after a dialog display. */ - _tidyDialog: function (inst) { - inst.tpDiv.removeClass(this._dialogClass).unbind('.ui-timepicker'); - }, - - /* Retrieve the instance data for the target control. - @param target element - the target input field or division or span - @return object - the associated instance data - @throws error if a jQuery problem getting data */ - _getInst: function (target) { - try { - return $.data(target, PROP_NAME); - } - catch (err) { - throw 'Missing instance data for this timepicker'; - } - }, - - /* Get a setting value, defaulting if necessary. */ - _get: function (inst, name) { - return inst.settings[name] !== undefined ? - inst.settings[name] : this._defaults[name]; - }, - - /* Parse existing time and initialise time picker. */ - _setTimeFromField: function (inst) { - if (inst.input.val() == inst.lastVal) { return; } - var defaultTime = this._get(inst, 'defaultTime'); - - - var timeToParse = this._getCurrentTimeRounded(inst); - if (defaultTime != '') { timeToParse = defaultTime } - if ((inst.inline == false) && (inst.input.val() != '')) { timeToParse = inst.input.val() } - - //var timeVal = inst.lastVal = inst.inline == false ? inst.input.val() : - // defaultTime ? defaultTime : - // getHours(new Date()) + timeSeparator + getMinutes(new Date()); - var timeVal = inst.lastVal = timeToParse; - //alert ('inst.input ' + inst.input.attr('id')); - var time = this.parseTime(inst, timeVal); - inst.hours = time.hours; - inst.minutes = time.minutes; - }, - - /* Return the current time, ready to be parsed, rounded to the closest 5 minute */ - _getCurrentTimeRounded: function (inst) { - var currentTime = new Date(); - var timeSeparator = this._get(inst, 'timeSeparator'); - // setting selected time , least priority first - var currentMinutes = currentTime.getMinutes() - // round to closest 5 - currentMinutes = Math.round( currentMinutes / 5 ) * 5; - - return currentTime.getHours().toString() + timeSeparator + currentMinutes.toString(); - }, - - /* - * Pase a time string into hours and minutes - */ - parseTime: function (inst, timeVal) { - var retVal = new Object(); - retVal.hours = -1; - retVal.minutes = -1; - - var timeSeparator = this._get(inst, 'timeSeparator'); - var amPmText = this._get(inst, 'amPmText'); - var p = timeVal.indexOf(timeSeparator); - if (p == -1) { return retVal; } - - retVal.hours = parseInt(timeVal.substr(0, p), 10); - retVal.minutes = parseInt(timeVal.substr(p + 1), 10); - - var showPeriod = (this._get(inst, 'showPeriod') == true); - var timeValUpper = timeVal.toUpperCase(); - if ((retVal.hours < 12) && (showPeriod) && (timeValUpper.indexOf(amPmText[1].toUpperCase()) != -1)) { - retVal.hours += 12; - } - // fix for 12 AM - if ((retVal.hours == 12) && (showPeriod) && (timeValUpper.indexOf(amPmText[0].toUpperCase()) != -1)) { - retVal.hours = 0; - } - - return retVal; - }, - - - - selectHours: function (id, newHours, td, fromDoubleClick) { - var target = $(id); - var inst = this._getInst(target[0]); - $(td).parents('.ui-timepicker-hours:first').find('a').removeClass('ui-state-active'); - //inst.tpDiv.children('.ui-timepicker-hours a').removeClass('ui-state-active'); - $(td).children('a').addClass('ui-state-active'); - - inst.hours = newHours; - this._updateSelectedValue(inst); - - inst._hoursClicked = true; - if ((inst._minutesClicked) || (fromDoubleClick)) { $.timepicker._hideTimepicker(); } - }, - - selectMinutes: function (id, newMinutes, td, fromDoubleClick) { - var target = $(id); - var inst = this._getInst(target[0]); - $(td).parents('.ui-timepicker-minutes:first').find('a').removeClass('ui-state-active'); - $(td).children('a').addClass('ui-state-active'); - - inst.minutes = newMinutes; - this._updateSelectedValue(inst); - - inst._minutesClicked = true; - if ((inst._hoursClicked) || (fromDoubleClick)) { $.timepicker._hideTimepicker(); } - }, - - _updateSelectedValue: function (inst) { - if ((inst.hours < 0) || (inst.hours > 23)) { inst.hours = 12; } - if ((inst.minutes < 0) || (inst.minutes > 59)) { inst.minutes = 0; } - - var period = ""; - var showPeriod = (this._get(inst, 'showPeriod') == true); - var showLeadingZero = (this._get(inst, 'showLeadingZero') == true); - var amPmText = this._get(inst, 'amPmText'); - var selectedHours = inst.hours ? inst.hours : 0; - var selectedMinutes = inst.minutes ? inst.minutes : 0; - - var displayHours = selectedHours; - if ( ! displayHours) { - displayHoyrs = 0; - } - - - if (showPeriod) { - if (inst.hours == 0) { - displayHours = 12; - } - if (inst.hours < 12) { - period = amPmText[0]; - } - else { - period = amPmText[1]; - if (displayHours > 12) { - displayHours -= 12; - } - } - } - - var h = displayHours.toString(); - if (showLeadingZero && (displayHours < 10)) { h = '0' + h; } - - - var m = selectedMinutes.toString(); - if (selectedMinutes < 10) { m = '0' + m; } - - var newTime = h + this._get(inst, 'timeSeparator') + m; - if (period.length > 0) { newTime += " " + period; } - - if (inst.input) { - inst.input.val(newTime); - inst.input.trigger('change'); - } - - var onSelect = this._get(inst, 'onSelect'); - if (onSelect) { onSelect.apply((inst.input ? inst.input[0] : null), [newTime, inst]); } // trigger custom callback - - this._updateAlternate(inst, newTime); - - return newTime; - }, - - /* Update any alternate field to synchronise with the main field. */ - _updateAlternate: function(inst, newTime) { - var altField = this._get(inst, 'altField'); - if (altField) { // update alternate field too - $(altField).each(function() { $(this).val(newTime); }); - } - } - }); - - - - /* Invoke the timepicker functionality. - @param options string - a command, optionally followed by additional parameters or - Object - settings for attaching new datepicker functionality - @return jQuery object */ - $.fn.timepicker = function (options) { - - /* Initialise the date picker. */ - if (!$.timepicker.initialized) { - $(document).mousedown($.timepicker._checkExternalClick). - find('body').append($.timepicker.tpDiv); - $.timepicker.initialized = true; - } - - var otherArgs = Array.prototype.slice.call(arguments, 1); - if (typeof options == 'string' && (options == 'isDisabled' || options == 'getDate' || options == 'widget')) - return $.timepicker['_' + options + 'Datepicker']. - apply($.timepicker, [this[0]].concat(otherArgs)); - if (options == 'option' && arguments.length == 2 && typeof arguments[1] == 'string') - return $.timepicker['_' + options + 'Datepicker']. - apply($.timepicker, [this[0]].concat(otherArgs)); - return this.each(function () { - typeof options == 'string' ? - $.timepicker['_' + options + 'Datepicker']. - apply($.timepicker, [this].concat(otherArgs)) : - $.timepicker._attachTimepicker(this, options); - }); - }; - - /* jQuery extend now ignores nulls! */ - function extendRemove(target, props) { - $.extend(target, props); - for (var name in props) - if (props[name] == null || props[name] == undefined) - target[name] = props[name]; - return target; - }; - - $.timepicker = new Timepicker(); // singleton instance - $.timepicker.initialized = false; - $.timepicker.uuid = new Date().getTime(); - $.timepicker.version = "1.8.6"; - - // Workaround for #4055 - // Add another global to avoid noConflict issues with inline event handlers - window['TP_jQuery_' + tpuuid] = $; - -})(jQuery); - -/* - ____ - ___ .-~. /_"-._ - `-._~-. / /_ "~o\ :Y - \ \ / : \~x. ` ') - ] Y / | Y< ~-.__j - / ! _.--~T : l l< /.-~ - / / ____.--~ . ` l /~\ \<|Y - / / .-~~" /| . ',-~\ \L| - / / / .^ \ Y~Y \.^>/l_ "--' - / Y .-"( . l__ j_j l_/ /~_.-~ . - Y l / \ ) ~~~." / `/"~ / \.__/l_ - | \ _.-" ~-{__ l : l._Z~-.___.--~ - | ~---~ / ~~"---\_ ' __[> - l . _.^ ___ _>-y~ - \ \ . .-~ .-~ ~>--" / - \ ~---" / ./ _.-' - "-.,_____.,_ _.--~\ _.-~ - ~~ ( _} -Row - `. ~( - ) \ - /,`--'~\--'~\ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ->T-Rex<- -*/ \ No newline at end of file diff --git a/airtime_mvc/public/js/timepicker/jquery.ui.timepicker.js b/airtime_mvc/public/js/timepicker/jquery.ui.timepicker.js new file mode 100644 index 000000000..d086b674b --- /dev/null +++ b/airtime_mvc/public/js/timepicker/jquery.ui.timepicker.js @@ -0,0 +1,1345 @@ +/* + * jQuery UI Timepicker 0.2.9 + * + * Copyright 2010-2011, Francois Gelinas + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://fgelinas.com/code/timepicker + * + * Depends: + * jquery.ui.core.js + * jquery.ui.position.js (only if position settngs are used) + * + * Change version 0.1.0 - moved the t-rex up here + * + ____ + ___ .-~. /_"-._ + `-._~-. / /_ "~o\ :Y + \ \ / : \~x. ` ') + ] Y / | Y< ~-.__j + / ! _.--~T : l l< /.-~ + / / ____.--~ . ` l /~\ \<|Y + / / .-~~" /| . ',-~\ \L| + / / / .^ \ Y~Y \.^>/l_ "--' + / Y .-"( . l__ j_j l_/ /~_.-~ . + Y l / \ ) ~~~." / `/"~ / \.__/l_ + | \ _.-" ~-{__ l : l._Z~-.___.--~ + | ~---~ / ~~"---\_ ' __[> + l . _.^ ___ _>-y~ + \ \ . .-~ .-~ ~>--" / + \ ~---" / ./ _.-' + "-.,_____.,_ _.--~\ _.-~ + ~~ ( _} -Row + `. ~( + ) \ + /,`--'~\--'~\ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ->T-Rex<- +*/ + +(function ($, undefined) { + + $.extend($.ui, { timepicker: { version: "0.2.9"} }); + + var PROP_NAME = 'timepicker'; + var tpuuid = new Date().getTime(); + + /* Time picker manager. + Use the singleton instance of this class, $.timepicker, to interact with the time picker. + Settings for (groups of) time pickers are maintained in an instance object, + allowing multiple different settings on the same page. */ + + function Timepicker() { + this.debug = true; // Change this to true to start debugging + this._curInst = null; // The current instance in use + this._isInline = false; // true if the instance is displayed inline + this._disabledInputs = []; // List of time picker inputs that have been disabled + this._timepickerShowing = false; // True if the popup picker is showing , false if not + this._inDialog = false; // True if showing within a "dialog", false if not + this._dialogClass = 'ui-timepicker-dialog'; // The name of the dialog marker class + this._mainDivId = 'ui-timepicker-div'; // The ID of the main timepicker division + this._inlineClass = 'ui-timepicker-inline'; // The name of the inline marker class + this._currentClass = 'ui-timepicker-current'; // The name of the current hour / minutes marker class + this._dayOverClass = 'ui-timepicker-days-cell-over'; // The name of the day hover marker class + + this.regional = []; // Available regional settings, indexed by language code + this.regional[''] = { // Default regional settings + hourText: 'Hour', // Display text for hours section + minuteText: 'Minute', // Display text for minutes link + amPmText: ['AM', 'PM'], // Display text for AM PM + closeButtonText: 'Done', // Text for the confirmation button (ok button) + nowButtonText: 'Now', // Text for the now button + deselectButtonText: 'Deselect' // Text for the deselect button + }; + this._defaults = { // Global defaults for all the time picker instances + showOn: 'focus', // 'focus' for popup on focus, + // 'button' for trigger button, or 'both' for either (not yet implemented) + button: null, // 'button' element that will trigger the timepicker + showAnim: 'fadeIn', // Name of jQuery animation for popup + showOptions: {}, // Options for enhanced animations + appendText: '', // Display text following the input box, e.g. showing the format + + beforeShow: null, // Define a callback function executed before the timepicker is shown + onSelect: null, // Define a callback function when a hour / minutes is selected + onClose: null, // Define a callback function when the timepicker is closed + + timeSeparator: ':', // The character to use to separate hours and minutes. + periodSeparator: ' ', // The character to use to separate the time from the time period. + showPeriod: false, // Define whether or not to show AM/PM with selected time + showPeriodLabels: true, // Show the AM/PM labels on the left of the time picker + showLeadingZero: true, // Define whether or not to show a leading zero for hours < 10. [true/false] + showMinutesLeadingZero: true, // Define whether or not to show a leading zero for minutes < 10. + altField: '', // Selector for an alternate field to store selected time into + defaultTime: 'now', // Used as default time when input field is empty or for inline timePicker + // (set to 'now' for the current time, '' for no highlighted time) + myPosition: 'left top', // Position of the dialog relative to the input. + // see the position utility for more info : http://jqueryui.com/demos/position/ + atPosition: 'left bottom', // Position of the input element to match + // Note : if the position utility is not loaded, the timepicker will attach left top to left bottom + //NEW: 2011-02-03 + onHourShow: null, // callback for enabling / disabling on selectable hours ex : function(hour) { return true; } + onMinuteShow: null, // callback for enabling / disabling on time selection ex : function(hour,minute) { return true; } + + hours: { + starts: 0, // first displayed hour + ends: 23 // last displayed hour + }, + minutes: { + starts: 0, // first displayed minute + ends: 55, // last displayed minute + interval: 5 // interval of displayed minutes + }, + rows: 4, // number of rows for the input tables, minimum 2, makes more sense if you use multiple of 2 + // 2011-08-05 0.2.4 + showHours: true, // display the hours section of the dialog + showMinutes: true, // display the minute section of the dialog + optionalMinutes: false, // optionally parse inputs of whole hours with minutes omitted + + // buttons + showCloseButton: false, // shows an OK button to confirm the edit + showNowButton: false, // Shows the 'now' button + showDeselectButton: false // Shows the deselect time button + + }; + $.extend(this._defaults, this.regional['']); + + this.tpDiv = $(''); + } + + $.extend(Timepicker.prototype, { + /* Class name added to elements to indicate already configured with a time picker. */ + markerClassName: 'hasTimepicker', + + /* Debug logging (if enabled). */ + log: function () { + if (this.debug) + console.log.apply('', arguments); + }, + + _widgetTimepicker: function () { + return this.tpDiv; + }, + + /* Override the default settings for all instances of the time picker. + @param settings object - the new settings to use as defaults (anonymous object) + @return the manager object */ + setDefaults: function (settings) { + extendRemove(this._defaults, settings || {}); + return this; + }, + + /* Attach the time picker to a jQuery selection. + @param target element - the target input field or division or span + @param settings object - the new settings to use for this time picker instance (anonymous) */ + _attachTimepicker: function (target, settings) { + // check for settings on the control itself - in namespace 'time:' + var inlineSettings = null; + for (var attrName in this._defaults) { + var attrValue = target.getAttribute('time:' + attrName); + if (attrValue) { + inlineSettings = inlineSettings || {}; + try { + inlineSettings[attrName] = eval(attrValue); + } catch (err) { + inlineSettings[attrName] = attrValue; + } + } + } + var nodeName = target.nodeName.toLowerCase(); + var inline = (nodeName == 'div' || nodeName == 'span'); + + if (!target.id) { + this.uuid += 1; + target.id = 'tp' + this.uuid; + } + var inst = this._newInst($(target), inline); + inst.settings = $.extend({}, settings || {}, inlineSettings || {}); + if (nodeName == 'input') { + this._connectTimepicker(target, inst); + // init inst.hours and inst.minutes from the input value + this._setTimeFromField(inst); + } else if (inline) { + this._inlineTimepicker(target, inst); + } + + + }, + + /* Create a new instance object. */ + _newInst: function (target, inline) { + var id = target[0].id.replace(/([^A-Za-z0-9_-])/g, '\\\\$1'); // escape jQuery meta chars + return { + id: id, input: target, // associated target + inline: inline, // is timepicker inline or not : + tpDiv: (!inline ? this.tpDiv : // presentation div + $('
')) + }; + }, + + /* Attach the time picker to an input field. */ + _connectTimepicker: function (target, inst) { + var input = $(target); + inst.append = $([]); + inst.trigger = $([]); + if (input.hasClass(this.markerClassName)) { return; } + this._attachments(input, inst); + input.addClass(this.markerClassName). + keydown(this._doKeyDown). + keyup(this._doKeyUp). + bind("setData.timepicker", function (event, key, value) { + inst.settings[key] = value; + }). + bind("getData.timepicker", function (event, key) { + return this._get(inst, key); + }); + $.data(target, PROP_NAME, inst); + }, + + /* Handle keystrokes. */ + _doKeyDown: function (event) { + var inst = $.timepicker._getInst(event.target); + var handled = true; + inst._keyEvent = true; + if ($.timepicker._timepickerShowing) { + switch (event.keyCode) { + case 9: $.timepicker._hideTimepicker(); + handled = false; + break; // hide on tab out + case 13: + $.timepicker._updateSelectedValue(inst); + $.timepicker._hideTimepicker(); + + return false; // don't submit the form + break; // select the value on enter + case 27: $.timepicker._hideTimepicker(); + break; // hide on escape + default: handled = false; + } + } + else if (event.keyCode == 36 && event.ctrlKey) { // display the time picker on ctrl+home + $.timepicker._showTimepicker(this); + } + else { + handled = false; + } + if (handled) { + event.preventDefault(); + event.stopPropagation(); + } + }, + + /* Update selected time on keyUp */ + /* Added verion 0.0.5 */ + _doKeyUp: function (event) { + var inst = $.timepicker._getInst(event.target); + $.timepicker._setTimeFromField(inst); + $.timepicker._updateTimepicker(inst); + }, + + /* Make attachments based on settings. */ + _attachments: function (input, inst) { + var appendText = this._get(inst, 'appendText'); + var isRTL = this._get(inst, 'isRTL'); + if (inst.append) { inst.append.remove(); } + if (appendText) { + inst.append = $('' + appendText + ''); + input[isRTL ? 'before' : 'after'](inst.append); + } + input.unbind('focus.timepicker', this._showTimepicker); + if (inst.trigger) { inst.trigger.remove(); } + + var showOn = this._get(inst, 'showOn'); + if (showOn == 'focus' || showOn == 'both') { // pop-up time picker when in the marked field + input.bind("focus.timepicker", this._showTimepicker); + } + if (showOn == 'button' || showOn == 'both') { // pop-up time picker when 'button' element is clicked + var button = this._get(inst, 'button'); + $(button).bind("click.timepicker", function () { + if ($.timepicker._timepickerShowing && $.timepicker._lastInput == input[0]) { $.timepicker._hideTimepicker(); } + else { $.timepicker._showTimepicker(input[0]); } + return false; + }); + + } + }, + + + /* Attach an inline time picker to a div. */ + _inlineTimepicker: function(target, inst) { + var divSpan = $(target); + if (divSpan.hasClass(this.markerClassName)) + return; + divSpan.addClass(this.markerClassName).append(inst.tpDiv). + bind("setData.timepicker", function(event, key, value){ + inst.settings[key] = value; + }).bind("getData.timepicker", function(event, key){ + return this._get(inst, key); + }); + $.data(target, PROP_NAME, inst); + + this._setTimeFromField(inst); + this._updateTimepicker(inst); + inst.tpDiv.show(); + }, + + /* Pop-up the time picker for a given input field. + @param input element - the input field attached to the time picker or + event - if triggered by focus */ + _showTimepicker: function (input) { + input = input.target || input; + if (input.nodeName.toLowerCase() != 'input') { input = $('input', input.parentNode)[0]; } // find from button/image trigger + if ($.timepicker._isDisabledTimepicker(input) || $.timepicker._lastInput == input) { return; } // already here + + // fix v 0.0.8 - close current timepicker before showing another one + $.timepicker._hideTimepicker(); + + var inst = $.timepicker._getInst(input); + if ($.timepicker._curInst && $.timepicker._curInst != inst) { + $.timepicker._curInst.tpDiv.stop(true, true); + } + var beforeShow = $.timepicker._get(inst, 'beforeShow'); + extendRemove(inst.settings, (beforeShow ? beforeShow.apply(input, [input, inst]) : {})); + inst.lastVal = null; + $.timepicker._lastInput = input; + + $.timepicker._setTimeFromField(inst); + + // calculate default position + if ($.timepicker._inDialog) { input.value = ''; } // hide cursor + if (!$.timepicker._pos) { // position below input + $.timepicker._pos = $.timepicker._findPos(input); + $.timepicker._pos[1] += input.offsetHeight; // add the height + } + var isFixed = false; + $(input).parents().each(function () { + isFixed |= $(this).css('position') == 'fixed'; + return !isFixed; + }); + if (isFixed && $.browser.opera) { // correction for Opera when fixed and scrolled + $.timepicker._pos[0] -= document.documentElement.scrollLeft; + $.timepicker._pos[1] -= document.documentElement.scrollTop; + } + + var offset = { left: $.timepicker._pos[0], top: $.timepicker._pos[1] }; + + $.timepicker._pos = null; + // determine sizing offscreen + inst.tpDiv.css({ position: 'absolute', display: 'block', top: '-1000px' }); + $.timepicker._updateTimepicker(inst); + + + // position with the ui position utility, if loaded + if ( ( ! inst.inline ) && ( typeof $.ui.position == 'object' ) ) { + inst.tpDiv.position({ + of: inst.input, + my: $.timepicker._get( inst, 'myPosition' ), + at: $.timepicker._get( inst, 'atPosition' ), + // offset: $( "#offset" ).val(), + // using: using, + collision: 'flip' + }); + var offset = inst.tpDiv.offset(); + $.timepicker._pos = [offset.top, offset.left]; + } + + + // reset clicked state + inst._hoursClicked = false; + inst._minutesClicked = false; + + // fix width for dynamic number of time pickers + // and adjust position before showing + offset = $.timepicker._checkOffset(inst, offset, isFixed); + inst.tpDiv.css({ position: ($.timepicker._inDialog && $.blockUI ? + 'static' : (isFixed ? 'fixed' : 'absolute')), display: 'none', + left: offset.left + 'px', top: offset.top + 'px' + }); + if ( ! inst.inline ) { + var showAnim = $.timepicker._get(inst, 'showAnim'); + var duration = $.timepicker._get(inst, 'duration'); + + var postProcess = function () { + $.timepicker._timepickerShowing = true; + var borders = $.timepicker._getBorders(inst.tpDiv); + inst.tpDiv.find('iframe.ui-timepicker-cover'). // IE6- only + css({ left: -borders[0], top: -borders[1], + width: inst.tpDiv.outerWidth(), height: inst.tpDiv.outerHeight() + }); + }; + + // Fixed the zIndex problem for real (I hope) - FG - v 0.2.9 + inst.tpDiv.css('zIndex', $.timepicker._getZIndex(input) +1); + + if ($.effects && $.effects[showAnim]) { + inst.tpDiv.show(showAnim, $.timepicker._get(inst, 'showOptions'), duration, postProcess); + } + else { + inst.tpDiv[showAnim || 'show']((showAnim ? duration : null), postProcess); + } + if (!showAnim || !duration) { postProcess(); } + if (inst.input.is(':visible') && !inst.input.is(':disabled')) { inst.input.focus(); } + $.timepicker._curInst = inst; + } + }, + + // This is a copy of the zIndex function of UI core 1.8.?? + // Copied in the timepicker to stay backward compatible. + _getZIndex: function (target) { + var elem = $( target ), position, value; + while ( elem.length && elem[ 0 ] !== document ) { + position = elem.css( "position" ); + if ( position === "absolute" || position === "relative" || position === "fixed" ) { + value = parseInt( elem.css( "zIndex" ), 10 ); + if ( !isNaN( value ) && value !== 0 ) { + return value; + } + } + elem = elem.parent(); + } + }, + + /* Generate the time picker content. */ + _updateTimepicker: function (inst) { + inst.tpDiv.empty().append(this._generateHTML(inst)); + this._rebindDialogEvents(inst); + + }, + + _rebindDialogEvents: function (inst) { + var borders = $.timepicker._getBorders(inst.tpDiv), + self = this; + inst.tpDiv + .find('iframe.ui-timepicker-cover') // IE6- only + .css({ left: -borders[0], top: -borders[1], + width: inst.tpDiv.outerWidth(), height: inst.tpDiv.outerHeight() + }) + .end() + // after the picker html is appended bind the click & double click events (faster in IE this way + // then letting the browser interpret the inline events) + // the binding for the minute cells also exists in _updateMinuteDisplay + .find('.ui-timepicker-minute-cell') + .unbind() + .bind("click", { fromDoubleClick:false }, $.proxy($.timepicker.selectMinutes, this)) + .bind("dblclick", { fromDoubleClick:true }, $.proxy($.timepicker.selectMinutes, this)) + .end() + .find('.ui-timepicker-hour-cell') + .unbind() + .bind("click", { fromDoubleClick:false }, $.proxy($.timepicker.selectHours, this)) + .bind("dblclick", { fromDoubleClick:true }, $.proxy($.timepicker.selectHours, this)) + .end() + .find('.ui-timepicker td a') + .unbind() + .bind('mouseout', function () { + $(this).removeClass('ui-state-hover'); + if (this.className.indexOf('ui-timepicker-prev') != -1) $(this).removeClass('ui-timepicker-prev-hover'); + if (this.className.indexOf('ui-timepicker-next') != -1) $(this).removeClass('ui-timepicker-next-hover'); + }) + .bind('mouseover', function () { + if ( ! self._isDisabledTimepicker(inst.inline ? inst.tpDiv.parent()[0] : inst.input[0])) { + $(this).parents('.ui-timepicker-calendar').find('a').removeClass('ui-state-hover'); + $(this).addClass('ui-state-hover'); + if (this.className.indexOf('ui-timepicker-prev') != -1) $(this).addClass('ui-timepicker-prev-hover'); + if (this.className.indexOf('ui-timepicker-next') != -1) $(this).addClass('ui-timepicker-next-hover'); + } + }) + .end() + .find('.' + this._dayOverClass + ' a') + .trigger('mouseover') + .end() + .find('.ui-timepicker-now').bind("click",function(e) { + $.timepicker.selectNow(e); + }).end() + .find('.ui-timepicker-deselect').bind("click",function(e) { + $.timepicker.deselectTime(e); + }).end() + .find('.ui-timepicker-close').bind("click",function(e) { + $.timepicker._hideTimepicker(); + }).end(); + }, + + /* Generate the HTML for the current state of the time picker. */ + _generateHTML: function (inst) { + + var h, m, row, col, html, hoursHtml, minutesHtml = '', + showPeriod = (this._get(inst, 'showPeriod') == true), + showPeriodLabels = (this._get(inst, 'showPeriodLabels') == true), + showLeadingZero = (this._get(inst, 'showLeadingZero') == true), + showHours = (this._get(inst, 'showHours') == true), + showMinutes = (this._get(inst, 'showMinutes') == true), + amPmText = this._get(inst, 'amPmText'), + rows = this._get(inst, 'rows'), + amRows = 0, + pmRows = 0, + amItems = 0, + pmItems = 0, + amFirstRow = 0, + pmFirstRow = 0, + hours = Array(), + hours_options = this._get(inst, 'hours'), + hoursPerRow = null, + hourCounter = 0, + hourLabel = this._get(inst, 'hourText'), + showCloseButton = this._get(inst, 'showCloseButton'), + closeButtonText = this._get(inst, 'closeButtonText'), + showNowButton = this._get(inst, 'showNowButton'), + nowButtonText = this._get(inst, 'nowButtonText'), + showDeselectButton = this._get(inst, 'showDeselectButton'), + deselectButtonText = this._get(inst, 'deselectButtonText'), + showButtonPanel = showCloseButton || showNowButton || showDeselectButton; + + + + // prepare all hours and minutes, makes it easier to distribute by rows + for (h = hours_options.starts; h <= hours_options.ends; h++) { + hours.push (h); + } + hoursPerRow = Math.ceil(hours.length / rows); // always round up + + if (showPeriodLabels) { + for (hourCounter = 0; hourCounter < hours.length; hourCounter++) { + if (hours[hourCounter] < 12) { + amItems++; + } + else { + pmItems++; + } + } + hourCounter = 0; + + amRows = Math.floor(amItems / hours.length * rows); + pmRows = Math.floor(pmItems / hours.length * rows); + + // assign the extra row to the period that is more densly populated + if (rows != amRows + pmRows) { + // Make sure: AM Has Items and either PM Does Not, AM has no rows yet, or AM is more dense + if (amItems && (!pmItems || !amRows || (pmRows && amItems / amRows >= pmItems / pmRows))) { + amRows++; + } else { + pmRows++; + } + } + amFirstRow = Math.min(amRows, 1); + pmFirstRow = amRows + 1; + hoursPerRow = Math.ceil(Math.max(amItems / amRows, pmItems / pmRows)); + } + + + html = ''; + + if (showHours) { + + html += ''; // Close the Hour td + } + + if (showMinutes) { + html += ''; + } + + html += ''; + + + if (showButtonPanel) { + var buttonPanel = ''; + } + html += '
' + + '
' + + hourLabel + + '
' + + ''; + + for (row = 1; row <= rows; row++) { + html += ''; + // AM + if (row == amFirstRow && showPeriodLabels) { + html += ''; + } + // PM + if (row == pmFirstRow && showPeriodLabels) { + html += ''; + } + for (col = 1; col <= hoursPerRow; col++) { + if (showPeriodLabels && row < pmFirstRow && hours[hourCounter] >= 12) { + html += this._generateHTMLHourCell(inst, undefined, showPeriod, showLeadingZero); + } else { + html += this._generateHTMLHourCell(inst, hours[hourCounter], showPeriod, showLeadingZero); + hourCounter++; + } + } + html += ''; + } + html += '
' + amPmText[0] + '' + amPmText[1] + '
' + // Close the hours cells table + '		'; + html += this._generateHTMLMinutes(inst); + html += '
'; + if (showNowButton) { + buttonPanel += ''; + } + if (showDeselectButton) { + buttonPanel += ''; + } + if (showCloseButton) { + buttonPanel += ''; + } + + html += buttonPanel + '
'; + + /* IE6 IFRAME FIX (taken from datepicker 1.5.3, fixed in 0.1.2 */ + html += ($.browser.msie && parseInt($.browser.version,10) < 7 && !inst.inline ? + '' : ''); + + return html; + }, + + /* Special function that update the minutes selection in currently visible timepicker + * called on hour selection when onMinuteShow is defined */ + _updateMinuteDisplay: function (inst) { + var newHtml = this._generateHTMLMinutes(inst); + inst.tpDiv.find('td.ui-timepicker-minutes').html(newHtml); + this._rebindDialogEvents(inst); + // after the picker html is appended bind the click & double click events (faster in IE this way + // then letting the browser interpret the inline events) + // yes I know, duplicate code, sorry +/* .find('.ui-timepicker-minute-cell') + .bind("click", { fromDoubleClick:false }, $.proxy($.timepicker.selectMinutes, this)) + .bind("dblclick", { fromDoubleClick:true }, $.proxy($.timepicker.selectMinutes, this)); +*/ + + }, + + /* + * Generate the minutes table + * This is separated from the _generateHTML function because is can be called separately (when hours changes) + */ + _generateHTMLMinutes: function (inst) { + + var m, row, html = '', + rows = this._get(inst, 'rows'), + minutes = Array(), + minutes_options = this._get(inst, 'minutes'), + minutesPerRow = null, + minuteCounter = 0, + showMinutesLeadingZero = (this._get(inst, 'showMinutesLeadingZero') == true), + onMinuteShow = this._get(inst, 'onMinuteShow'), + minuteLabel = this._get(inst, 'minuteText'); + + if ( ! minutes_options.starts) { + minutes_options.starts = 0; + } + if ( ! minutes_options.ends) { + minutes_options.ends = 59; + } + for (m = minutes_options.starts; m <= minutes_options.ends; m += minutes_options.interval) { + minutes.push(m); + } + minutesPerRow = Math.round(minutes.length / rows + 0.49); // always round up + + /* + * The minutes table + */ + // if currently selected minute is not enabled, we have a problem and need to select a new minute. + if (onMinuteShow && + (onMinuteShow.apply((inst.input ? inst.input[0] : null), [inst.hours , inst.minutes]) == false) ) { + // loop minutes and select first available + for (minuteCounter = 0; minuteCounter < minutes.length; minuteCounter += 1) { + m = minutes[minuteCounter]; + if (onMinuteShow.apply((inst.input ? inst.input[0] : null), [inst.hours, m])) { + inst.minutes = m; + break; + } + } + } + + + + html += '
' + + minuteLabel + + '
' + + ''; + + minuteCounter = 0; + for (row = 1; row <= rows; row++) { + html += ''; + while (minuteCounter < row * minutesPerRow) { + var m = minutes[minuteCounter]; + var displayText = ''; + if (m !== undefined ) { + displayText = (m < 10) && showMinutesLeadingZero ? "0" + m.toString() : m.toString(); + } + html += this._generateHTMLMinuteCell(inst, m, displayText); + minuteCounter++; + } + html += ''; + } + + html += '
'; + + return html; + }, + + /* Generate the content of a "Hour" cell */ + _generateHTMLHourCell: function (inst, hour, showPeriod, showLeadingZero) { + + var displayHour = hour; + if ((hour > 12) && showPeriod) { + displayHour = hour - 12; + } + if ((displayHour == 0) && showPeriod) { + displayHour = 12; + } + if ((displayHour < 10) && showLeadingZero) { + displayHour = '0' + displayHour; + } + + var html = ""; + var enabled = true; + var onHourShow = this._get(inst, 'onHourShow'); //custom callback + + if (hour == undefined) { + html = ' '; + return html; + } + + if (onHourShow) { + enabled = onHourShow.apply((inst.input ? inst.input[0] : null), [hour]); + } + + if (enabled) { + html = '' + + '' + + displayHour.toString() + + ''; + } + else { + html = + '' + + '' + + displayHour.toString() + + '' + + ''; + } + return html; + }, + + /* Generate the content of a "Hour" cell */ + _generateHTMLMinuteCell: function (inst, minute, displayText) { + var html = ""; + var enabled = true; + var onMinuteShow = this._get(inst, 'onMinuteShow'); //custom callback + if (onMinuteShow) { + //NEW: 2011-02-03 we should give the hour as a parameter as well! + enabled = onMinuteShow.apply((inst.input ? inst.input[0] : null), [inst.hours,minute]); //trigger callback + } + + if (minute == undefined) { + html = ' '; + return html; + } + + if (enabled) { + html = '' + + '' + + displayText + + ''; + } + else { + + html = '' + + '' + + displayText + + '' + + ''; + } + return html; + }, + + + /* Enable the date picker to a jQuery selection. + @param target element - the target input field or division or span */ + _enableTimepicker: function(target) { + var $target = $(target), + target_id = $target.attr('id'), + inst = $.data(target, PROP_NAME); + + if (!$target.hasClass(this.markerClassName)) { + return; + } + var nodeName = target.nodeName.toLowerCase(); + if (nodeName == 'input') { + target.disabled = false; + inst.trigger.filter('button'). + each(function() { this.disabled = false; }).end(); + } + else if (nodeName == 'div' || nodeName == 'span') { + var inline = $target.children('.' + this._inlineClass); + inline.children().removeClass('ui-state-disabled'); + } + this._disabledInputs = $.map(this._disabledInputs, + function(value) { return (value == target_id ? null : value); }); // delete entry + }, + + /* Disable the time picker to a jQuery selection. + @param target element - the target input field or division or span */ + _disableTimepicker: function(target) { + var $target = $(target); + var inst = $.data(target, PROP_NAME); + if (!$target.hasClass(this.markerClassName)) { + return; + } + var nodeName = target.nodeName.toLowerCase(); + if (nodeName == 'input') { + target.disabled = true; + + inst.trigger.filter('button'). + each(function() { this.disabled = true; }).end(); + + } + else if (nodeName == 'div' || nodeName == 'span') { + var inline = $target.children('.' + this._inlineClass); + inline.children().addClass('ui-state-disabled'); + } + this._disabledInputs = $.map(this._disabledInputs, + function(value) { return (value == target ? null : value); }); // delete entry + this._disabledInputs[this._disabledInputs.length] = $target.attr('id'); + }, + + /* Is the first field in a jQuery collection disabled as a timepicker? + @param target_id element - the target input field or division or span + @return boolean - true if disabled, false if enabled */ + _isDisabledTimepicker: function (target_id) { + if ( ! target_id) { return false; } + for (var i = 0; i < this._disabledInputs.length; i++) { + if (this._disabledInputs[i] == target_id) { return true; } + } + return false; + }, + + /* Check positioning to remain on screen. */ + _checkOffset: function (inst, offset, isFixed) { + var tpWidth = inst.tpDiv.outerWidth(); + var tpHeight = inst.tpDiv.outerHeight(); + var inputWidth = inst.input ? inst.input.outerWidth() : 0; + var inputHeight = inst.input ? inst.input.outerHeight() : 0; + var viewWidth = document.documentElement.clientWidth + $(document).scrollLeft(); + var viewHeight = document.documentElement.clientHeight + $(document).scrollTop(); + + offset.left -= (this._get(inst, 'isRTL') ? (tpWidth - inputWidth) : 0); + offset.left -= (isFixed && offset.left == inst.input.offset().left) ? $(document).scrollLeft() : 0; + offset.top -= (isFixed && offset.top == (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0; + + // now check if datepicker is showing outside window viewport - move to a better place if so. + offset.left -= Math.min(offset.left, (offset.left + tpWidth > viewWidth && viewWidth > tpWidth) ? + Math.abs(offset.left + tpWidth - viewWidth) : 0); + offset.top -= Math.min(offset.top, (offset.top + tpHeight > viewHeight && viewHeight > tpHeight) ? + Math.abs(tpHeight + inputHeight) : 0); + + return offset; + }, + + /* Find an object's position on the screen. */ + _findPos: function (obj) { + var inst = this._getInst(obj); + var isRTL = this._get(inst, 'isRTL'); + while (obj && (obj.type == 'hidden' || obj.nodeType != 1)) { + obj = obj[isRTL ? 'previousSibling' : 'nextSibling']; + } + var position = $(obj).offset(); + return [position.left, position.top]; + }, + + /* Retrieve the size of left and top borders for an element. + @param elem (jQuery object) the element of interest + @return (number[2]) the left and top borders */ + _getBorders: function (elem) { + var convert = function (value) { + return { thin: 1, medium: 2, thick: 3}[value] || value; + }; + return [parseFloat(convert(elem.css('border-left-width'))), + parseFloat(convert(elem.css('border-top-width')))]; + }, + + + /* Close time picker if clicked elsewhere. */ + _checkExternalClick: function (event) { + if (!$.timepicker._curInst) { return; } + var $target = $(event.target); + if ($target[0].id != $.timepicker._mainDivId && + $target.parents('#' + $.timepicker._mainDivId).length == 0 && + !$target.hasClass($.timepicker.markerClassName) && + !$target.hasClass($.timepicker._triggerClass) && + $.timepicker._timepickerShowing && !($.timepicker._inDialog && $.blockUI)) + $.timepicker._hideTimepicker(); + }, + + /* Hide the time picker from view. + @param input element - the input field attached to the time picker */ + _hideTimepicker: function (input) { + var inst = this._curInst; + if (!inst || (input && inst != $.data(input, PROP_NAME))) { return; } + if (this._timepickerShowing) { + var showAnim = this._get(inst, 'showAnim'); + var duration = this._get(inst, 'duration'); + var postProcess = function () { + $.timepicker._tidyDialog(inst); + this._curInst = null; + }; + if ($.effects && $.effects[showAnim]) { + inst.tpDiv.hide(showAnim, $.timepicker._get(inst, 'showOptions'), duration, postProcess); + } + else { + inst.tpDiv[(showAnim == 'slideDown' ? 'slideUp' : + (showAnim == 'fadeIn' ? 'fadeOut' : 'hide'))]((showAnim ? duration : null), postProcess); + } + if (!showAnim) { postProcess(); } + var onClose = this._get(inst, 'onClose'); + if (onClose) { + onClose.apply( + (inst.input ? inst.input[0] : null), + [(inst.input ? inst.input.val() : ''), inst]); // trigger custom callback + } + this._timepickerShowing = false; + this._lastInput = null; + if (this._inDialog) { + this._dialogInput.css({ position: 'absolute', left: '0', top: '-100px' }); + if ($.blockUI) { + $.unblockUI(); + $('body').append(this.tpDiv); + } + } + this._inDialog = false; + } + }, + + + + /* Tidy up after a dialog display. */ + _tidyDialog: function (inst) { + inst.tpDiv.removeClass(this._dialogClass).unbind('.ui-timepicker'); + }, + + /* Retrieve the instance data for the target control. + @param target element - the target input field or division or span + @return object - the associated instance data + @throws error if a jQuery problem getting data */ + _getInst: function (target) { + try { + return $.data(target, PROP_NAME); + } + catch (err) { + throw 'Missing instance data for this timepicker'; + } + }, + + /* Get a setting value, defaulting if necessary. */ + _get: function (inst, name) { + return inst.settings[name] !== undefined ? + inst.settings[name] : this._defaults[name]; + }, + + /* Parse existing time and initialise time picker. */ + _setTimeFromField: function (inst) { + if (inst.input.val() == inst.lastVal) { return; } + var defaultTime = this._get(inst, 'defaultTime'); + + var timeToParse = defaultTime == 'now' ? this._getCurrentTimeRounded(inst) : defaultTime; + if ((inst.inline == false) && (inst.input.val() != '')) { timeToParse = inst.input.val() } + + if (timeToParse instanceof Date) { + inst.hours = timeToParse.getHours(); + inst.minutes = timeToParse.getMinutes(); + } else { + var timeVal = inst.lastVal = timeToParse; + if (timeToParse == '') { + inst.hours = -1; + inst.minutes = -1; + } else { + var time = this.parseTime(inst, timeVal); + inst.hours = time.hours; + inst.minutes = time.minutes; + } + } + + + $.timepicker._updateTimepicker(inst); + }, + + /* Update or retrieve the settings for an existing time picker. + @param target element - the target input field or division or span + @param name object - the new settings to update or + string - the name of the setting to change or retrieve, + when retrieving also 'all' for all instance settings or + 'defaults' for all global defaults + @param value any - the new value for the setting + (omit if above is an object or to retrieve a value) */ + _optionTimepicker: function(target, name, value) { + var inst = this._getInst(target); + if (arguments.length == 2 && typeof name == 'string') { + return (name == 'defaults' ? $.extend({}, $.timepicker._defaults) : + (inst ? (name == 'all' ? $.extend({}, inst.settings) : + this._get(inst, name)) : null)); + } + var settings = name || {}; + if (typeof name == 'string') { + settings = {}; + settings[name] = value; + } + if (inst) { + if (this._curInst == inst) { + this._hideTimepicker(); + } + extendRemove(inst.settings, settings); + this._updateTimepicker(inst); + } + }, + + + /* Set the time for a jQuery selection. + @param target element - the target input field or division or span + @param time String - the new time */ + _setTimeTimepicker: function(target, time) { + var inst = this._getInst(target); + if (inst) { + this._setTime(inst, time); + this._updateTimepicker(inst); + this._updateAlternate(inst, time); + } + }, + + /* Set the time directly. */ + _setTime: function(inst, time, noChange) { + var origHours = inst.hours; + var origMinutes = inst.minutes; + var time = this.parseTime(inst, time); + inst.hours = time.hours; + inst.minutes = time.minutes; + + if ((origHours != inst.hours || origMinutes != inst.minuts) && !noChange) { + inst.input.trigger('change'); + } + this._updateTimepicker(inst); + this._updateSelectedValue(inst); + }, + + /* Return the current time, ready to be parsed, rounded to the closest 5 minute */ + _getCurrentTimeRounded: function (inst) { + var currentTime = new Date(), + currentMinutes = currentTime.getMinutes(), + // round to closest 5 + adjustedMinutes = Math.round( currentMinutes / 5 ) * 5; + currentTime.setMinutes(adjustedMinutes); + return currentTime; + }, + + /* + * Parse a time string into hours and minutes + */ + parseTime: function (inst, timeVal) { + var retVal = new Object(); + retVal.hours = -1; + retVal.minutes = -1; + + var timeSeparator = this._get(inst, 'timeSeparator'), + amPmText = this._get(inst, 'amPmText'), + showHours = this._get(inst, 'showHours'), + showMinutes = this._get(inst, 'showMinutes'), + optionalMinutes = this._get(inst, 'optionalMinutes'), + showPeriod = (this._get(inst, 'showPeriod') == true), + p = timeVal.indexOf(timeSeparator); + + // check if time separator found + if (p != -1) { + retVal.hours = parseInt(timeVal.substr(0, p), 10); + retVal.minutes = parseInt(timeVal.substr(p + 1), 10); + } + // check for hours only + else if ( (showHours) && ( !showMinutes || optionalMinutes ) ) { + retVal.hours = parseInt(timeVal, 10); + } + // check for minutes only + else if ( ( ! showHours) && (showMinutes) ) { + retVal.minutes = parseInt(timeVal, 10); + } + + if (showHours) { + var timeValUpper = timeVal.toUpperCase(); + if ((retVal.hours < 12) && (showPeriod) && (timeValUpper.indexOf(amPmText[1].toUpperCase()) != -1)) { + retVal.hours += 12; + } + // fix for 12 AM + if ((retVal.hours == 12) && (showPeriod) && (timeValUpper.indexOf(amPmText[0].toUpperCase()) != -1)) { + retVal.hours = 0; + } + } + + return retVal; + }, + + selectNow: function(e) { + + var id = $(e.target).attr("data-timepicker-instance-id"), + $target = $(id), + inst = this._getInst($target[0]); + + //if (!inst || (input && inst != $.data(input, PROP_NAME))) { return; } + var currentTime = new Date(); + inst.hours = currentTime.getHours(); + inst.minutes = currentTime.getMinutes(); + this._updateSelectedValue(inst); + this._updateTimepicker(inst); + this._hideTimepicker(); + }, + + deselectTime: function(e) { + var id = $(e.target).attr("data-timepicker-instance-id"), + $target = $(id), + inst = this._getInst($target[0]); + inst.hours = -1; + inst.minutes = -1; + this._updateSelectedValue(inst); + this._hideTimepicker(); + }, + + + selectHours: function (event) { + var $td = $(event.currentTarget), + id = $td.attr("data-timepicker-instance-id"), + newHours = $td.attr("data-hour"), + fromDoubleClick = event.data.fromDoubleClick, + $target = $(id), + inst = this._getInst($target[0]), + showMinutes = (this._get(inst, 'showMinutes') == true); + + // don't select if disabled + if ( $.timepicker._isDisabledTimepicker($target.attr('id')) ) { return false } + + $td.parents('.ui-timepicker-hours:first').find('a').removeClass('ui-state-active'); + $td.children('a').addClass('ui-state-active'); + inst.hours = newHours; + + // added for onMinuteShow callback + var onMinuteShow = this._get(inst, 'onMinuteShow'); + if (onMinuteShow) { + // this will trigger a callback on selected hour to make sure selected minute is allowed. + this._updateMinuteDisplay(inst); + } + + this._updateSelectedValue(inst); + + inst._hoursClicked = true; + if ((inst._minutesClicked) || (fromDoubleClick) || (showMinutes == false)) { + $.timepicker._hideTimepicker(); + } + // return false because if used inline, prevent the url to change to a hashtag + return false; + }, + + selectMinutes: function (event) { + var $td = $(event.currentTarget), + id = $td.attr("data-timepicker-instance-id"), + newMinutes = $td.attr("data-minute"), + fromDoubleClick = event.data.fromDoubleClick, + $target = $(id), + inst = this._getInst($target[0]), + showHours = (this._get(inst, 'showHours') == true); + + // don't select if disabled + if ( $.timepicker._isDisabledTimepicker($target.attr('id')) ) { return false } + + $td.parents('.ui-timepicker-minutes:first').find('a').removeClass('ui-state-active'); + $td.children('a').addClass('ui-state-active'); + + inst.minutes = newMinutes; + this._updateSelectedValue(inst); + + inst._minutesClicked = true; + if ((inst._hoursClicked) || (fromDoubleClick) || (showHours == false)) { + $.timepicker._hideTimepicker(); + // return false because if used inline, prevent the url to change to a hashtag + return false; + } + + // return false because if used inline, prevent the url to change to a hashtag + return false; + }, + + _updateSelectedValue: function (inst) { + var newTime = this._getParsedTime(inst); + if (inst.input) { + inst.input.val(newTime); + inst.input.trigger('change'); + } + var onSelect = this._get(inst, 'onSelect'); + if (onSelect) { onSelect.apply((inst.input ? inst.input[0] : null), [newTime, inst]); } // trigger custom callback + this._updateAlternate(inst, newTime); + return newTime; + }, + + /* this function process selected time and return it parsed according to instance options */ + _getParsedTime: function(inst) { + + if (inst.hours == -1 && inst.minutes == -1) { + return ''; + } + + if ((inst.hours < 0) || (inst.hours > 23)) { inst.hours = 12; } + if ((inst.minutes < 0) || (inst.minutes > 59)) { inst.minutes = 0; } + + var period = "", + showPeriod = (this._get(inst, 'showPeriod') == true), + showLeadingZero = (this._get(inst, 'showLeadingZero') == true), + showHours = (this._get(inst, 'showHours') == true), + showMinutes = (this._get(inst, 'showMinutes') == true), + optionalMinutes = (this._get(inst, 'optionalMinutes') == true), + amPmText = this._get(inst, 'amPmText'), + selectedHours = inst.hours ? inst.hours : 0, + selectedMinutes = inst.minutes ? inst.minutes : 0, + displayHours = selectedHours ? selectedHours : 0, + parsedTime = ''; + + if (showPeriod) { + if (inst.hours == 0) { + displayHours = 12; + } + if (inst.hours < 12) { + period = amPmText[0]; + } + else { + period = amPmText[1]; + if (displayHours > 12) { + displayHours -= 12; + } + } + } + + var h = displayHours.toString(); + if (showLeadingZero && (displayHours < 10)) { h = '0' + h; } + + var m = selectedMinutes.toString(); + if (selectedMinutes < 10) { m = '0' + m; } + + if (showHours) { + parsedTime += h; + } + if (showHours && showMinutes && (!optionalMinutes || m != 0)) { + parsedTime += this._get(inst, 'timeSeparator'); + } + if (showMinutes && (!optionalMinutes || m != 0)) { + parsedTime += m; + } + if (showHours) { + if (period.length > 0) { parsedTime += this._get(inst, 'periodSeparator') + period; } + } + + return parsedTime; + }, + + /* Update any alternate field to synchronise with the main field. */ + _updateAlternate: function(inst, newTime) { + var altField = this._get(inst, 'altField'); + if (altField) { // update alternate field too + $(altField).each(function(i,e) { + $(e).val(newTime); + }); + } + }, + + /* This might look unused but it's called by the $.fn.timepicker function with param getTime */ + /* added v 0.2.3 - gitHub issue #5 - Thanks edanuff */ + _getTimeTimepicker : function(input) { + var inst = this._getInst(input); + return this._getParsedTime(inst); + }, + _getHourTimepicker: function(input) { + var inst = this._getInst(input); + if ( inst == undefined) { return -1; } + return inst.hours; + }, + _getMinuteTimepicker: function(input) { + var inst= this._getInst(input); + if ( inst == undefined) { return -1; } + return inst.minutes; + } + + }); + + + + /* Invoke the timepicker functionality. + @param options string - a command, optionally followed by additional parameters or + Object - settings for attaching new timepicker functionality + @return jQuery object */ + $.fn.timepicker = function (options) { + + /* Initialise the time picker. */ + if (!$.timepicker.initialized) { + $(document).mousedown($.timepicker._checkExternalClick). + find('body').append($.timepicker.tpDiv); + $.timepicker.initialized = true; + } + + var otherArgs = Array.prototype.slice.call(arguments, 1); + if (typeof options == 'string' && (options == 'getTime' || options == 'getHour' || options == 'getMinute' )) + return $.timepicker['_' + options + 'Timepicker']. + apply($.timepicker, [this[0]].concat(otherArgs)); + if (options == 'option' && arguments.length == 2 && typeof arguments[1] == 'string') + return $.timepicker['_' + options + 'Timepicker']. + apply($.timepicker, [this[0]].concat(otherArgs)); + return this.each(function () { + typeof options == 'string' ? + $.timepicker['_' + options + 'Timepicker']. + apply($.timepicker, [this].concat(otherArgs)) : + $.timepicker._attachTimepicker(this, options); + }); + }; + + /* jQuery extend now ignores nulls! */ + function extendRemove(target, props) { + $.extend(target, props); + for (var name in props) + if (props[name] == null || props[name] == undefined) + target[name] = props[name]; + return target; + }; + + $.timepicker = new Timepicker(); // singleton instance + $.timepicker.initialized = false; + $.timepicker.uuid = new Date().getTime(); + $.timepicker.version = "0.2.9"; + + // Workaround for #4055 + // Add another global to avoid noConflict issues with inline event handlers + window['TP_jQuery_' + tpuuid] = $; + +})(jQuery); From b0c3bace1cf83ecdfc8b693e3adc8a7328b00839 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Thu, 26 Jan 2012 15:21:04 +0100 Subject: [PATCH 04/33] CC-3174 : show builder made sure the column reordering/visibility selection works with modified show header/footer rows (their td spans the entire tr) --- .../controllers/LibraryController.php | 2 +- .../controllers/ShowbuilderController.php | 26 ++- airtime_mvc/application/models/Schedule.php | 19 ++- .../application/models/ShowBuilder.php | 111 +++++++++++++ airtime_mvc/public/css/styles.css | 5 + .../library/events/library_playlistbuilder.js | 5 +- .../library/events/library_showbuilder.js | 7 +- .../public/js/airtime/library/library.js | 6 +- .../public/js/airtime/showbuilder/builder.js | 150 +++++++++++++----- 9 files changed, 261 insertions(+), 70 deletions(-) create mode 100644 airtime_mvc/application/models/ShowBuilder.php diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 0d499c9d6..7ff27b7bb 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -43,7 +43,7 @@ class LibraryController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.fnSetFilteringDelay.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js','text/javascript'); - $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorderResize.js','text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorder.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.FixedColumns.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/library.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/advancedsearch.js','text/javascript'); diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index 85d491fde..eb383c159 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -19,10 +19,6 @@ class ShowbuilderController extends Zend_Controller_Action $this->_helper->actionStack('library', 'library'); $this->_helper->actionStack('builder', 'showbuilder'); - - //user is allowed to schedule this show. - //if ($user->isAdmin() || $user->isHost($show_instance->getShowId())) { - //} } public function builderAction() { @@ -33,9 +29,9 @@ class ShowbuilderController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'/js/timepicker/jquery.ui.timepicker.js','text/javascript'); $this->view->headScript()->appendScript("var serverTimezoneOffset = ".date("Z")."; //in seconds"); - $this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js','text/javascript'); - $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js','text/javascript'); - $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorderResize.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.ColVis.js','text/javascript'); + //$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorder.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/showbuilder/builder.js','text/javascript'); $this->view->headLink()->appendStylesheet($baseUrl.'/css/jquery.ui.timepicker.css'); @@ -46,23 +42,21 @@ class ShowbuilderController extends Zend_Controller_Action public function builderFeedAction() { $request = $this->getRequest(); - $current_time = microtime(true); + $current_time = time(); $starts_epoch = $request->getParam("start", $current_time); //default ends is 24 hours after starts. $ends_epoch = $request->getParam("end", $current_time + (60*60*24)); - $startsDT = DateTime::createFromFormat("U.u", $starts_epoch, new DateTimeZone("UTC")); - $endsDT = DateTime::createFromFormat("U.u", $ends_epoch, new DateTimeZone("UTC")); + $startsDT = DateTime::createFromFormat("U", $starts_epoch, new DateTimeZone("UTC")); + $endsDT = DateTime::createFromFormat("U", $ends_epoch, new DateTimeZone("UTC")); - $scheduled_items = Application_Model_Schedule::GetItems($startsDT->format("Y-m-d H:i:s.u"), $endsDT->format("Y-m-d H:i:s.u"), false); + Logging::log("showbuilder starts {$startsDT->format("Y-m-d H:i:s")}"); + Logging::log("showbuilder ends {$endsDT->format("Y-m-d H:i:s")}"); - foreach ($scheduled_items as &$item) { - $itemStartsDT = DateTime::createFromFormat("Y-m-d H:i:s.u", $item["starts"], new DateTimeZone("UTC")); - $itemEndsDT = DateTime::createFromFormat("Y-m-d H:i:s.u", $item["ends"], new DateTimeZone("UTC")); - } + $showBuilder = new Application_Model_ShowBuilder($startsDT, $endsDT); - $this->view->schedule = $scheduled_items; + $this->view->schedule = $showBuilder->GetItems(); } public function scheduleAction() { diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php index a0c8f3a5e..1884a4ea5 100644 --- a/airtime_mvc/application/models/Schedule.php +++ b/airtime_mvc/application/models/Schedule.php @@ -309,10 +309,15 @@ class Application_Model_Schedule { $sql = "SELECT DISTINCT - showt.name, showt.color, showt.background_color, - si.starts, si.ends, si.time_filled, si.record, si.rebroadcast, - sched.starts, sched.ends, - ft.track_title, ft.artist_name, ft.album_title, ft.length + showt.name AS show_name, showt.color AS show_color, showt.background_color AS show_background_colour, + + si.starts AS si_starts, si.ends AS si_ends, si.time_filled AS si_time_filled, + si.record AS si_record, si.rebroadcast AS si_rebroadcast, si.id AS si_id, + + sched.starts AS sched_starts, sched.ends AS sched_ends, + + ft.track_title AS file_track_title, ft.artist_name AS file_artist_name, + ft.album_title AS file_album_title, ft.length AS file_length FROM ((cc_schedule AS sched JOIN cc_files AS ft ON (sched.file_id = ft.id) @@ -320,7 +325,11 @@ class Application_Model_Schedule { JOIN cc_show AS showt ON (showt.id = si.show_id) ) - ORDER BY sched.starts;"; + WHERE si.starts >= '{$p_startDateTime}' AND si.ends <= '{$p_endDateTime}' + + ORDER BY si.starts, sched.starts;"; + + //Logging::log($sql); $rows = $CC_DBC->GetAll($sql); return $rows; diff --git a/airtime_mvc/application/models/ShowBuilder.php b/airtime_mvc/application/models/ShowBuilder.php new file mode 100644 index 000000000..c031a3057 --- /dev/null +++ b/airtime_mvc/application/models/ShowBuilder.php @@ -0,0 +1,111 @@ + false, + "footer" => false, + "empty" => false, + "instance" => "", + "starts" => "", + "ends" => "", + "title" => "" + ); + + /* + * @param DateTime $p_startsDT + * @param DateTime $p_endsDT + */ + public function __construct($p_startDT, $p_endDT) { + + $this->startDT = $p_startDT; + $this->endDT = $p_endDT; + $this->timezone = date_default_timezone_get(); + } + + private function makeFooterRow() { + + $row = $this->defaultRowArray; + $row["footer"] = true; + + return $row; + } + + private function makeHeaderRow($p_item) { + + $row = $this->defaultRowArray; + + $showStartDT = new DateTime($p_item["si_starts"], new DateTimeZone("UTC")); + $showStartDT->setTimezone(new DateTimeZone($this->timezone)); + $showEndDT = new DateTime($p_item["si_ends"], new DateTimeZone("UTC")); + $showEndDT->setTimezone(new DateTimeZone($this->timezone)); + + $row["header"] = true; + $row["starts"] = $showStartDT->format("Y-m-d H:i"); + $row["ends"] = $showEndDT->format("Y-m-d H:i"); + $row["title"] = $p_item["show_name"]; + + return $row; + } + + private function makeScheduledItemRow($p_item) { + $row = $this->defaultRowArray; + + if (isset($p_item["sched_starts"])) { + + $schedStartDT = new DateTime($p_item["sched_starts"], new DateTimeZone("UTC")); + $schedStartDT->setTimezone(new DateTimeZone($this->timezone)); + $schedEndDT = new DateTime($p_item["sched_ends"], new DateTimeZone("UTC")); + $schedEndDT->setTimezone(new DateTimeZone($this->timezone)); + + $row["instance"] = $p_item["si_id"]; + $row["starts"] = $schedStartDT->format("Y-m-d H:i:s"); + $row["ends"] = $schedEndDT->format("Y-m-d H:i:s"); + $row["title"] = $p_item["file_track_title"]; + } + //show is empty + else { + $row["empty"] = true; + } + + return $row; + } + + public function GetItems() { + + $current_id = -1; + $display_items = array(); + + $scheduled_items = Application_Model_Schedule::GetScheduleDetailItems($this->startDT->format("Y-m-d H:i:s"), $this->endDT->format("Y-m-d H:i:s")); + + foreach ($scheduled_items as $item) { + + //make a header row. + if ($current_id !== $item["si_id"]) { + + //make a footer row. + if ($current_id !== -1) { + $display_items[] = $this->makeFooterRow(); + } + + $display_items[] = $this->makeHeaderRow($item); + + $current_id = $item["si_id"]; + } + + //make a normal data row. + $display_items[] = $this->makeScheduledItemRow($item); + } + + //make the last footer if there were any scheduled items. + if (count($scheduled_items) > 0) { + $display_items[] = $this->makeFooterRow(); + } + + return $display_items; + } +} \ No newline at end of file diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index e2acc5daa..703d105c3 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -523,6 +523,11 @@ dl.inline-list dd { .even { background-color:#c7c7c7; } + +.datatable .show-builder-placeholder { + height: 30px; +} + .datatable tr.even.selected td { background-color: #abcfe2; } diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js index 87c70d1cb..2fcec1285 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -1,11 +1,11 @@ -function dtRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { +function fnLibraryTableRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { $(nRow).attr("id", aData["id"]); return nRow; } -function dtDrawCallback() { +function fnLibraryTableDrawCallback() { addLibraryItemEvents(); addMetadataQtip(); //saveNumEntriesSetting(); @@ -33,4 +33,3 @@ function setupLibraryToolbar() { 'Delete' + 'Add'); } - diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js index 2070f9add..d380578a0 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -1,4 +1,4 @@ -function dtRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { +function fnLibraryTableRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { $(nRow).attr("id", aData["id"]); @@ -7,7 +7,7 @@ function dtRowCallback( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { return nRow; } -function dtDrawCallback() { +function fnLibraryTableDrawCallback() { addLibraryItemEvents(); //addMetadataQtip(); //setupGroupActions(); @@ -28,4 +28,7 @@ function addLibraryItemEvents() { {id: getId, type: getType}, {xposition: "mouse", yposition: "mouse"}); +} + +function setupLibraryToolbar() { } \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 31b776f59..fac705b37 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -467,8 +467,8 @@ function createDataTable(data) { "success": testCallback } ); }, - "fnRowCallback": dtRowCallback, - "fnDrawCallback": dtDrawCallback, + "fnRowCallback": fnLibraryTableRowCallback, + "fnDrawCallback": fnLibraryTableDrawCallback, "aoColumns": [ /* Checkbox */ {"sTitle": "", "bSortable": false, "bSearchable": false, "mDataProp": "checkbox", "sWidth": "25px", "sClass": "library_checkbox"}, /* Id */ {"sName": "id", "bSearchable": false, "bVisible": false, "mDataProp": "id", "sClass": "library_id"}, @@ -507,6 +507,8 @@ function createDataTable(data) { }); dTable.fnSetFilteringDelay(350); + setupLibraryToolbar(); + $('#library_order_reset').click(function() { ColReorder.fnReset( dTable ); return false; diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 02359e0d5..dd7133286 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -1,3 +1,4 @@ +/* function tpStartOnHourShowCallback(hour) { var tpEndHour = $('#show_builder_timepicker_end').timepicker('getHour'); @@ -39,6 +40,7 @@ function tpEndOnMinuteShowCallback(hour, minute) { // if minute did not match, it can not be selected return false; } +*/ /* * Get the schedule range start in unix timestamp form (in seconds). @@ -56,8 +58,8 @@ function fnGetUIPickerUnixTimestamp(sDatePickerId, sTimePickerId) { iTime, iHour, iMin, - iClientOffset, - iServerOffset; + iServerOffset, + iClientOffset; oDate = $( sDatePickerId ).datepicker( "getDate" ); @@ -74,26 +76,53 @@ function fnGetUIPickerUnixTimestamp(sDatePickerId, sTimePickerId) { iTime = oDate.getTime(); //value is in millisec. iTime = Math.round(iTime / 1000); - iClientOffset = -(oDate.getTimezoneOffset() * 60); //offset is returned in minutes. iServerOffset = serverTimezoneOffset; + iClientOffset = oDate.getTimezoneOffset() * 60;//function returns minutes + + //adjust for the fact the the Date object is + iTime = iTime + iServerOffset + iClientOffset; return iTime; } - +/* + * Returns an object containing a unix timestamp in seconds for the start/end range + * + * @return Object {"start", "end", "range"} + */ function fnGetScheduleRange() { var iStart, iEnd, - iRange; + iRange, + MIN_RANGE = 60*60*24; iStart = fnGetUIPickerUnixTimestamp("#show_builder_datepicker_start", "#show_builder_timepicker_start"); iEnd = fnGetUIPickerUnixTimestamp("#show_builder_datepicker_end", "#show_builder_timepicker_end"); iRange = iEnd - iStart; + + //return min range + if (iRange < MIN_RANGE){ + iEnd = iStart + MIN_RANGE; + iRange = MIN_RANGE; + } + + return { + start: iStart, + end: iEnd, + range: iRange + }; } -function fnServerData( sSource, aoData, fnCallback ) { +var fnServerData = function fnServerData( sSource, aoData, fnCallback ) { aoData.push( { name: "format", value: "json"} ); + if (fnServerData.hasOwnProperty("start")) { + aoData.push( { name: "start", value: fnServerData.start} ); + } + if (fnServerData.hasOwnProperty("end")) { + aoData.push( { name: "end", value: fnServerData.end} ); + } + $.ajax( { "dataType": "json", "type": "GET", @@ -101,16 +130,70 @@ function fnServerData( sSource, aoData, fnCallback ) { "data": aoData, "success": fnCallback } ); -} +}; + +var fnShowBuilderRowCallback = function ( nRow, aData, iDisplayIndex, iDisplayIndexFull ){ + var i, + sSeparatorHTML, + fnPrepareSeparatorRow; + + fnPrepareSeparatorRow = function(sRowContent, sClass) { + var node; + + node = nRow.children[0]; + node.innerHTML = sRowContent; + node.setAttribute('colspan',100); + for (i = 1; i < nRow.children.length; i = i+1) { + node = nRow.children[i]; + node.innerHTML = ""; + node.setAttribute("style", "display : none"); + } + + nRow.className = sClass; + }; + + if (aData.header === true) { + sSeparatorHTML = ''+aData.title+''+aData.starts+''+aData.ends+''; + fnPrepareSeparatorRow(sSeparatorHTML, "show-builder-header"); + } + else if (aData.footer === true) { + sSeparatorHTML = 'Show Footer'; + fnPrepareSeparatorRow(sSeparatorHTML, "show-builder-footer"); + } + + return nRow; +}; $(document).ready(function() { - var dTable; + var dTable, + oBaseDatePickerSettings, + oBaseTimePickerSettings; + + oBaseDatePickerSettings = { + dateFormat: 'yy-mm-dd', + onSelect: function(sDate, oDatePicker) { + var oDate, + dInput; + + dInput = $(this); + oDate = dInput.datepicker( "setDate", sDate ); + } + }; + + oBaseTimePickerSettings = { + showPeriodLabels: false, + showCloseButton: true, + showLeadingZero: false, + defaultTime: '0:00' + }; dTable = $('#show_builder_table').dataTable( { "aoColumns": [ + /* hidden */ {"mDataProp": "instance", "bVisible": false, "sTitle": "hidden"}, + /* instance */{"mDataProp": "instance", "sTitle": "si_id"}, /* starts */{"mDataProp": "starts", "sTitle": "starts"}, /* ends */{"mDataProp": "ends", "sTitle": "ends"}, - /* title */{"mDataProp": "file_id", "sTitle": "file_id"} + /* title */{"mDataProp": "title", "sTitle": "track_title"} ], "asStripClasses": [ 'odd' ], @@ -123,6 +206,11 @@ $(document).ready(function() { "bInfo": false, "fnServerData": fnServerData, + "fnRowCallback": fnShowBuilderRowCallback, + + "oColVis": { + "aiExclude": [ 0 ] + }, // R = ColReorder, C = ColVis, see datatables doc for others "sDom": 'Rr<"H"C>t<"F">', @@ -137,53 +225,33 @@ $(document).ready(function() { }); - $( "#show_builder_datepicker_start" ).datepicker({ - dateFormat: '@', - onSelect: function(sDate, oDatePicker) { - var oDate; - - oDate = new Date(parseInt(sDate, 10)); - $(this).val(oDate.toDateString()); - } - }); + $( "#show_builder_datepicker_start" ).datepicker(oBaseDatePickerSettings); - $( "#show_builder_timepicker_start" ).timepicker({ - showPeriodLabels: false, - showCloseButton: true, - showLeadingZero: false - }); + $( "#show_builder_timepicker_start" ).timepicker(oBaseTimePickerSettings); - $( "#show_builder_datepicker_end" ).datepicker({ - dateFormat: '@', - onSelect: function(sDate, oDatePicker) { - var oDate; - - oDate = new Date(parseInt(sDate, 10)); - $(this).val(oDate.toDateString()); - } - }); + $( "#show_builder_datepicker_end" ).datepicker(oBaseDatePickerSettings); - $( "#show_builder_timepicker_end" ).timepicker({ - showPeriodLabels: false, - showCloseButton: true, - showLeadingZero: false - }); + $( "#show_builder_timepicker_end" ).timepicker(oBaseTimePickerSettings); $( "#show_builder_timerange_button" ).click(function(ev){ - var oTable, oSettings, iStartDate, iEndDate, iStartTime, iEndTime; + var oTable, + oSettings, + oRange; - fnGetScheduleRange(); + oRange = fnGetScheduleRange(); oTable = $('#show_builder_table').dataTable({"bRetrieve": true}); oSettings = oTable.fnSettings(); - oSettings["_iDisplayStart"] = 1050; + oSettings.fnServerData.start = oRange.start; + oSettings.fnServerData.end = oRange.end; oTable.fnDraw(); }); $( "#show_builder_table" ).sortable({ - placeholder: "ui-state-highlight", + placeholder: "placeholder show-builder-placeholder", items: 'tr', + cancel: ".show-builder-header .show-builder-footer", receive: function(event, ui) { var x; } From f5761fd03c24b1166cfc6b51181cb97c00356c88 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Thu, 26 Jan 2012 19:10:37 +0100 Subject: [PATCH 05/33] CC-3174 : show builder status icon on left side of table static check mark in the footer currently --- .../controllers/LibraryController.php | 2 +- .../controllers/ShowbuilderController.php | 1 + airtime_mvc/application/models/Schedule.php | 2 +- .../application/models/ShowBuilder.php | 39 +- .../public/js/airtime/showbuilder/builder.js | 39 +- .../plugin/dataTables.FixedHeader.js | 916 ++++++++++++++++++ 6 files changed, 981 insertions(+), 18 deletions(-) create mode 100644 airtime_mvc/public/js/datatables/plugin/dataTables.FixedHeader.js diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 7ff27b7bb..0d499c9d6 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -43,7 +43,7 @@ class LibraryController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.fnSetFilteringDelay.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js','text/javascript'); - $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorder.js','text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorderResize.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.FixedColumns.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/library.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/advancedsearch.js','text/javascript'); diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index eb383c159..5da2c875f 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -32,6 +32,7 @@ class ShowbuilderController extends Zend_Controller_Action //$this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js','text/javascript'); //$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js','text/javascript'); //$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorder.js','text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.FixedHeader.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/showbuilder/builder.js','text/javascript'); $this->view->headLink()->appendStylesheet($baseUrl.'/css/jquery.ui.timepicker.css'); diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php index 1884a4ea5..c3e655b53 100644 --- a/airtime_mvc/application/models/Schedule.php +++ b/airtime_mvc/application/models/Schedule.php @@ -314,7 +314,7 @@ class Application_Model_Schedule { si.starts AS si_starts, si.ends AS si_ends, si.time_filled AS si_time_filled, si.record AS si_record, si.rebroadcast AS si_rebroadcast, si.id AS si_id, - sched.starts AS sched_starts, sched.ends AS sched_ends, + sched.starts AS sched_starts, sched.ends AS sched_ends, sched.id AS sched_id, ft.track_title AS file_track_title, ft.artist_name AS file_artist_name, ft.album_title AS file_album_title, ft.length AS file_length diff --git a/airtime_mvc/application/models/ShowBuilder.php b/airtime_mvc/application/models/ShowBuilder.php index c031a3057..507224548 100644 --- a/airtime_mvc/application/models/ShowBuilder.php +++ b/airtime_mvc/application/models/ShowBuilder.php @@ -10,10 +10,15 @@ class Application_Model_ShowBuilder { "header" => false, "footer" => false, "empty" => false, + "checkbox" => false, + "id" => "", "instance" => "", "starts" => "", "ends" => "", - "title" => "" + "runtime" => "", + "title" => "", + "creator" => "", + "album" => "" ); /* @@ -27,6 +32,26 @@ class Application_Model_ShowBuilder { $this->timezone = date_default_timezone_get(); } + /* + * @param DateInterval $p_interval + * + * @return string $runtime + */ + private function formatDuration($p_interval){ + + $hours = $p_interval->format("%h"); + $mins = $p_interval->format("%i"); + + if( $hours == 0) { + $runtime = $p_interval->format("%i:%S"); + } + else { + $runtime = $p_interval->format("%h:%I:%S"); + } + + return $runtime; + } + private function makeFooterRow() { $row = $this->defaultRowArray; @@ -44,6 +69,8 @@ class Application_Model_ShowBuilder { $showEndDT = new DateTime($p_item["si_ends"], new DateTimeZone("UTC")); $showEndDT->setTimezone(new DateTimeZone($this->timezone)); + //$diff = + $row["header"] = true; $row["starts"] = $showStartDT->format("Y-m-d H:i"); $row["ends"] = $showEndDT->format("Y-m-d H:i"); @@ -62,10 +89,16 @@ class Application_Model_ShowBuilder { $schedEndDT = new DateTime($p_item["sched_ends"], new DateTimeZone("UTC")); $schedEndDT->setTimezone(new DateTimeZone($this->timezone)); + $runtime = $schedStartDT->diff($schedEndDT); + + $row["id"] = $p_item["sched_id"]; $row["instance"] = $p_item["si_id"]; - $row["starts"] = $schedStartDT->format("Y-m-d H:i:s"); - $row["ends"] = $schedEndDT->format("Y-m-d H:i:s"); + $row["starts"] = $schedStartDT->format("H:i:s"); + $row["ends"] = $schedEndDT->format("H:i:s"); + $row["runtime"] = $this->formatDuration($runtime); $row["title"] = $p_item["file_track_title"]; + $row["creator"] = $p_item["file_artist_name"]; + $row["album"] = $p_item["file_album_title"]; } //show is empty else { diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index dd7133286..38600398a 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -135,15 +135,15 @@ var fnServerData = function fnServerData( sSource, aoData, fnCallback ) { var fnShowBuilderRowCallback = function ( nRow, aData, iDisplayIndex, iDisplayIndexFull ){ var i, sSeparatorHTML, - fnPrepareSeparatorRow; + fnPrepareSeparatorRow, + node; fnPrepareSeparatorRow = function(sRowContent, sClass) { - var node; - node = nRow.children[0]; + node = nRow.children[1]; node.innerHTML = sRowContent; node.setAttribute('colspan',100); - for (i = 1; i < nRow.children.length; i = i+1) { + for (i = 2; i < nRow.children.length; i = i+1) { node = nRow.children[i]; node.innerHTML = ""; node.setAttribute("style", "display : none"); @@ -153,10 +153,17 @@ var fnShowBuilderRowCallback = function ( nRow, aData, iDisplayIndex, iDisplayIn }; if (aData.header === true) { + node = nRow.children[0]; + node.innerHTML = ''; + sSeparatorHTML = ''+aData.title+''+aData.starts+''+aData.ends+''; fnPrepareSeparatorRow(sSeparatorHTML, "show-builder-header"); } else if (aData.footer === true) { + + node = nRow.children[0]; + node.innerHTML = ''; + sSeparatorHTML = 'Show Footer'; fnPrepareSeparatorRow(sSeparatorHTML, "show-builder-footer"); } @@ -165,7 +172,7 @@ var fnShowBuilderRowCallback = function ( nRow, aData, iDisplayIndex, iDisplayIn }; $(document).ready(function() { - var dTable, + var oTable, oBaseDatePickerSettings, oBaseTimePickerSettings; @@ -187,13 +194,17 @@ $(document).ready(function() { defaultTime: '0:00' }; - dTable = $('#show_builder_table').dataTable( { + oTable = $('#show_builder_table').dataTable( { "aoColumns": [ - /* hidden */ {"mDataProp": "instance", "bVisible": false, "sTitle": "hidden"}, - /* instance */{"mDataProp": "instance", "sTitle": "si_id"}, - /* starts */{"mDataProp": "starts", "sTitle": "starts"}, - /* ends */{"mDataProp": "ends", "sTitle": "ends"}, - /* title */{"mDataProp": "title", "sTitle": "track_title"} + /* checkbox */ {"mDataProp": "checkbox", "sTitle": "", "sWidth": "25px"}, + // /* scheduled id */{"mDataProp": "id", "sTitle": "id", "bVisible": false, "sWidth": "1px"}, + // /* instance */{"mDataProp": "instance", "sTitle": "si_id"}, + /* starts */{"mDataProp": "starts", "sTitle": "Airtime"}, + /* ends */{"mDataProp": "ends", "sTitle": "Off Air"}, + /* runtime */{"mDataProp": "runtime", "sTitle": "Runtime"}, + /* title */{"mDataProp": "title", "sTitle": "Title"}, + /* creator */{"mDataProp": "creator", "sTitle": "Creator"}, + /* album */{"mDataProp": "album", "sTitle": "Album"} ], "asStripClasses": [ 'odd' ], @@ -209,7 +220,7 @@ $(document).ready(function() { "fnRowCallback": fnShowBuilderRowCallback, "oColVis": { - "aiExclude": [ 0 ] + "aiExclude": [ 0, 1 ] }, // R = ColReorder, C = ColVis, see datatables doc for others @@ -218,12 +229,14 @@ $(document).ready(function() { //options for infinite scrolling //"bScrollInfinite": true, //"bScrollCollapse": true, - "sScrollY": "400px", + //"sScrollY": "400px", "sAjaxDataProp": "schedule", "sAjaxSource": "/showbuilder/builder-feed" }); + //new FixedHeader( oTable ); + new FixedColumns( oTable ); $( "#show_builder_datepicker_start" ).datepicker(oBaseDatePickerSettings); diff --git a/airtime_mvc/public/js/datatables/plugin/dataTables.FixedHeader.js b/airtime_mvc/public/js/datatables/plugin/dataTables.FixedHeader.js new file mode 100644 index 000000000..e00ce1f34 --- /dev/null +++ b/airtime_mvc/public/js/datatables/plugin/dataTables.FixedHeader.js @@ -0,0 +1,916 @@ +/* + * File: FixedHeader.js + * Version: 2.0.5 + * Description: "Fix" a header at the top of the table, so it scrolls with the table + * Author: Allan Jardine (www.sprymedia.co.uk) + * Created: Wed 16 Sep 2009 19:46:30 BST + * Language: Javascript + * License: GPL v2 or BSD 3 point style + * Project: Just a little bit of fun - enjoy :-) + * Contact: www.sprymedia.co.uk/contact + * + * Copyright 2009-2010 Allan Jardine, all rights reserved. + * + * This source file is free software, under either the GPL v2 license or a + * BSD style license, available at: + * http://datatables.net/license_gpl2 + * http://datatables.net/license_bsd + */ + +/* + * Function: FixedHeader + * Purpose: Provide 'fixed' header, footer and columns on an HTML table + * Returns: object:FixedHeader - must be called with 'new' + * Inputs: mixed:mTable - target table + * 1. DataTable object - when using FixedHeader with DataTables, or + * 2. HTML table node - when using FixedHeader without DataTables + * object:oInit - initialisation settings, with the following properties (each optional) + * bool:top - fix the header (default true) + * bool:bottom - fix the footer (default false) + * bool:left - fix the left most column (default false) + * bool:right - fix the right most column (default false) + * int:zTop - fixed header zIndex + * int:zBottom - fixed footer zIndex + * int:zLeft - fixed left zIndex + * int:zRight - fixed right zIndex + */ +var FixedHeader = function ( mTable, oInit ) { + /* Sanity check - you just know it will happen */ + if ( typeof this.fnInit != 'function' ) + { + alert( "FixedHeader warning: FixedHeader must be initialised with the 'new' keyword." ); + return; + } + + var that = this; + var oSettings = { + "aoCache": [], + "oSides": { + "top": true, + "bottom": false, + "left": false, + "right": false + }, + "oZIndexes": { + "top": 104, + "bottom": 103, + "left": 102, + "right": 101 + }, + "oMes": { + "iTableWidth": 0, + "iTableHeight": 0, + "iTableLeft": 0, + "iTableRight": 0, /* note this is left+width, not actually "right" */ + "iTableTop": 0, + "iTableBottom": 0 /* note this is top+height, not actually "bottom" */ + }, + "nTable": null, + "bUseAbsPos": false, + "bFooter": false + }; + + /* + * Function: fnGetSettings + * Purpose: Get the settings for this object + * Returns: object: - settings object + * Inputs: - + */ + this.fnGetSettings = function () { + return oSettings; + }; + + /* + * Function: fnUpdate + * Purpose: Update the positioning and copies of the fixed elements + * Returns: - + * Inputs: - + */ + this.fnUpdate = function () { + this._fnUpdateClones(); + this._fnUpdatePositions(); + }; + + /* + * Function: fnPosition + * Purpose: Update the positioning of the fixed elements + * Returns: - + * Inputs: - + */ + this.fnPosition = function () { + this._fnUpdatePositions(); + }; + + /* Let's do it */ + this.fnInit( mTable, oInit ); + + /* Store the instance on the DataTables object for easy access */ + if ( typeof mTable.fnSettings == 'function' ) + { + mTable._oPluginFixedHeader = this; + } +}; + + +/* + * Variable: FixedHeader + * Purpose: Prototype for FixedHeader + * Scope: global + */ +FixedHeader.prototype = { + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Initialisation + */ + + /* + * Function: fnInit + * Purpose: The "constructor" + * Returns: - + * Inputs: {as FixedHeader function} + */ + fnInit: function ( oTable, oInit ) + { + var s = this.fnGetSettings(); + var that = this; + + /* Record the user definable settings */ + this.fnInitSettings( s, oInit ); + + /* DataTables specific stuff */ + if ( typeof oTable.fnSettings == 'function' ) + { + if ( typeof oTable.fnVersionCheck == 'functon' && + oTable.fnVersionCheck( '1.6.0' ) !== true ) + { + alert( "FixedHeader 2 required DataTables 1.6.0 or later. "+ + "Please upgrade your DataTables installation" ); + return; + } + + var oDtSettings = oTable.fnSettings(); + + if ( oDtSettings.oScroll.sX != "" || oDtSettings.oScroll.sY != "" ) + { + alert( "FixedHeader 2 is not supported with DataTables' scrolling mode at this time" ); + return; + } + + s.nTable = oDtSettings.nTable; + oDtSettings.aoDrawCallback.push( { + "fn": function () { + FixedHeader.fnMeasure(); + that._fnUpdateClones.call(that); + that._fnUpdatePositions.call(that); + }, + "sName": "FixedHeader" + } ); + } + else + { + s.nTable = oTable; + } + + s.bFooter = ($('>tfoot', s.nTable).length > 0) ? true : false; + + /* "Detect" browsers that don't support absolute positioing - or have bugs */ + s.bUseAbsPos = (jQuery.browser.msie && (jQuery.browser.version=="6.0"||jQuery.browser.version=="7.0")); + + /* Add the 'sides' that are fixed */ + if ( s.oSides.top ) + { + s.aoCache.push( that._fnCloneTable( "fixedHeader", "FixedHeader_Header", that._fnCloneThead ) ); + } + if ( s.oSides.bottom ) + { + s.aoCache.push( that._fnCloneTable( "fixedFooter", "FixedHeader_Footer", that._fnCloneTfoot ) ); + } + if ( s.oSides.left ) + { + s.aoCache.push( that._fnCloneTable( "fixedLeft", "FixedHeader_Left", that._fnCloneTLeft ) ); + } + if ( s.oSides.right ) + { + s.aoCache.push( that._fnCloneTable( "fixedRight", "FixedHeader_Right", that._fnCloneTRight ) ); + } + + /* Event listeners for window movement */ + FixedHeader.afnScroll.push( function () { + that._fnUpdatePositions.call(that); + } ); + + jQuery(window).resize( function () { + FixedHeader.fnMeasure(); + that._fnUpdateClones.call(that); + that._fnUpdatePositions.call(that); + } ); + + /* Get things right to start with */ + FixedHeader.fnMeasure(); + that._fnUpdateClones(); + that._fnUpdatePositions(); + }, + + + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Support functions + */ + + /* + * Function: fnInitSettings + * Purpose: Take the user's settings and copy them to our local store + * Returns: - + * Inputs: object:s - the local settings object + * object:oInit - the user's settings object + */ + fnInitSettings: function ( s, oInit ) + { + if ( typeof oInit != 'undefined' ) + { + if ( typeof oInit.top != 'undefined' ) { + s.oSides.top = oInit.top; + } + if ( typeof oInit.bottom != 'undefined' ) { + s.oSides.bottom = oInit.bottom; + } + if ( typeof oInit.left != 'undefined' ) { + s.oSides.left = oInit.left; + } + if ( typeof oInit.right != 'undefined' ) { + s.oSides.right = oInit.right; + } + + if ( typeof oInit.zTop != 'undefined' ) { + s.oZIndexes.top = oInit.zTop; + } + if ( typeof oInit.zBottom != 'undefined' ) { + s.oZIndexes.bottom = oInit.zBottom; + } + if ( typeof oInit.zLeft != 'undefined' ) { + s.oZIndexes.left = oInit.zLeft; + } + if ( typeof oInit.zRight != 'undefined' ) { + s.oZIndexes.right = oInit.zRight; + } + } + + /* Detect browsers which have poor position:fixed support so we can use absolute positions. + * This is much slower since the position must be updated for each scroll, but widens + * compatibility + */ + s.bUseAbsPos = (jQuery.browser.msie && + (jQuery.browser.version=="6.0"||jQuery.browser.version=="7.0")); + }, + + /* + * Function: _fnCloneTable + * Purpose: Clone the table node and do basic initialisation + * Returns: - + * Inputs: - + */ + _fnCloneTable: function ( sType, sClass, fnClone ) + { + var s = this.fnGetSettings(); + var nCTable; + + /* We know that the table _MUST_ has a DIV wrapped around it, because this is simply how + * DataTables works. Therefore, we can set this to be relatively position (if it is not + * alreadu absolute, and use this as the base point for the cloned header + */ + if ( jQuery(s.nTable.parentNode).css('position') != "absolute" ) + { + s.nTable.parentNode.style.position = "relative"; + } + + /* Just a shallow clone will do - we only want the table node */ + nCTable = s.nTable.cloneNode( false ); + nCTable.removeAttribute( 'id' ); + + var nDiv = document.createElement( 'div' ); + nDiv.style.position = "absolute"; + nDiv.style.top = "0px"; + nDiv.style.left = "0px"; + nDiv.className += " FixedHeader_Cloned "+sType+" "+sClass; + + /* Set the zIndexes */ + if ( sType == "fixedHeader" ) + { + nDiv.style.zIndex = s.oZIndexes.top; + } + if ( sType == "fixedFooter" ) + { + nDiv.style.zIndex = s.oZIndexes.bottom; + } + if ( sType == "fixedLeft" ) + { + nDiv.style.zIndex = s.oZIndexes.left; + } + else if ( sType == "fixedRight" ) + { + nDiv.style.zIndex = s.oZIndexes.right; + } + + /* remove margins since we are going to poistion it absolutely */ + nCTable.style.margin = "0"; + + /* Insert the newly cloned table into the DOM, on top of the "real" header */ + nDiv.appendChild( nCTable ); + document.body.appendChild( nDiv ); + + return { + "nNode": nCTable, + "nWrapper": nDiv, + "sType": sType, + "sPosition": "", + "sTop": "", + "sLeft": "", + "fnClone": fnClone + }; + }, + + /* + * Function: _fnUpdatePositions + * Purpose: Get the current positioning of the table in the DOM + * Returns: - + * Inputs: - + */ + _fnMeasure: function () + { + var + s = this.fnGetSettings(), + m = s.oMes, + jqTable = jQuery(s.nTable), + oOffset = jqTable.offset(), + iParentScrollTop = this._fnSumScroll( s.nTable.parentNode, 'scrollTop' ), + iParentScrollLeft = this._fnSumScroll( s.nTable.parentNode, 'scrollLeft' ); + + m.iTableWidth = jqTable.outerWidth(); + m.iTableHeight = jqTable.outerHeight(); + m.iTableLeft = oOffset.left + s.nTable.parentNode.scrollLeft; + m.iTableTop = oOffset.top + iParentScrollTop; + m.iTableRight = m.iTableLeft + m.iTableWidth; + m.iTableRight = FixedHeader.oDoc.iWidth - m.iTableLeft - m.iTableWidth; + m.iTableBottom = FixedHeader.oDoc.iHeight - m.iTableTop - m.iTableHeight; + }, + + /* + * Function: _fnSumScroll + * Purpose: Sum node parameters all the way to the top + * Returns: int: sum + * Inputs: node:n - node to consider + * string:side - scrollTop or scrollLeft + */ + _fnSumScroll: function ( n, side ) + { + var i = n[side]; + while ( n = n.parentNode ) + { + if ( n.nodeName != 'HTML' && n.nodeName != 'BODY' ) + { + break; + } + i = n[side]; + } + return i; + }, + + /* + * Function: _fnUpdatePositions + * Purpose: Loop over the fixed elements for this table and update their positions + * Returns: - + * Inputs: - + */ + _fnUpdatePositions: function () + { + var s = this.fnGetSettings(); + this._fnMeasure(); + + for ( var i=0, iLen=s.aoCache.length ; i oWin.iScrollTop ) + { + /* Above the table */ + this._fnUpdateCache( oCache, 'sPosition', "absolute", 'position', nTable.style ); + this._fnUpdateCache( oCache, 'sTop', oMes.iTableTop+"px", 'top', nTable.style ); + this._fnUpdateCache( oCache, 'sLeft', oMes.iTableLeft+"px", 'left', nTable.style ); + } + else if ( oWin.iScrollTop > oMes.iTableTop+iTbodyHeight ) + { + /* At the bottom of the table */ + this._fnUpdateCache( oCache, 'sPosition', "absolute", 'position', nTable.style ); + this._fnUpdateCache( oCache, 'sTop', (oMes.iTableTop+iTbodyHeight)+"px", 'top', nTable.style ); + this._fnUpdateCache( oCache, 'sLeft', oMes.iTableLeft+"px", 'left', nTable.style ); + } + else + { + /* In the middle of the table */ + if ( s.bUseAbsPos ) + { + this._fnUpdateCache( oCache, 'sPosition', "absolute", 'position', nTable.style ); + this._fnUpdateCache( oCache, 'sTop', oWin.iScrollTop+"px", 'top', nTable.style ); + this._fnUpdateCache( oCache, 'sLeft', oMes.iTableLeft+"px", 'left', nTable.style ); + } + else + { + this._fnUpdateCache( oCache, 'sPosition', 'fixed', 'position', nTable.style ); + this._fnUpdateCache( oCache, 'sTop', "0px", 'top', nTable.style ); + this._fnUpdateCache( oCache, 'sLeft', (oMes.iTableLeft-oWin.iScrollLeft)+"px", 'left', nTable.style ); + } + } + }, + + /* + * Function: _fnUpdateCache + * Purpose: Check the cache and update cache and value if needed + * Returns: - + * Inputs: object:oCache - local cache object + * string:sCache - cache property + * string:sSet - value to set + * string:sProperty - object property to set + * object:oObj - object to update + */ + _fnUpdateCache: function ( oCache, sCache, sSet, sProperty, oObj ) + { + if ( oCache[sCache] != sSet ) + { + oObj[sProperty] = sSet; + oCache[sCache] = sSet; + } + }, + + + + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Cloning functions + */ + + /* + * Function: _fnCloneThead + * Purpose: Clone the thead element + * Returns: - + * Inputs: object:oCache - the cahced values for this fixed element + */ + _fnCloneThead: function ( oCache ) + { + var s = this.fnGetSettings(); + var nTable = oCache.nNode; + + /* Set the wrapper width to match that of the cloned table */ + oCache.nWrapper.style.width = jQuery(s.nTable).outerWidth()+"px"; + + /* Remove any children the cloned table has */ + while ( nTable.childNodes.length > 0 ) + { + jQuery('thead th', nTable).unbind( 'click' ); + nTable.removeChild( nTable.childNodes[0] ); + } + + /* Clone the DataTables header */ + var nThead = jQuery('thead', s.nTable).clone(true)[0]; + nTable.appendChild( nThead ); + + /* Copy the widths across - apparently a clone isn't good enough for this */ + jQuery("thead>tr th", s.nTable).each( function (i) { + jQuery("thead>tr th:eq("+i+")", nTable).width( jQuery(this).width() ); + } ); + + jQuery("thead>tr td", s.nTable).each( function (i) { + jQuery("thead>tr td:eq("+i+")", nTable).width( jQuery(this).width() ); + } ); + }, + + /* + * Function: _fnCloneTfoot + * Purpose: Clone the tfoot element + * Returns: - + * Inputs: object:oCache - the cahced values for this fixed element + */ + _fnCloneTfoot: function ( oCache ) + { + var s = this.fnGetSettings(); + var nTable = oCache.nNode; + + /* Set the wrapper width to match that of the cloned table */ + oCache.nWrapper.style.width = jQuery(s.nTable).outerWidth()+"px"; + + /* Remove any children the cloned table has */ + while ( nTable.childNodes.length > 0 ) + { + nTable.removeChild( nTable.childNodes[0] ); + } + + /* Clone the DataTables footer */ + var nTfoot = jQuery('tfoot', s.nTable).clone(true)[0]; + nTable.appendChild( nTfoot ); + + /* Copy the widths across - apparently a clone isn't good enough for this */ + jQuery("tfoot:eq(0)>tr th", s.nTable).each( function (i) { + jQuery("tfoot:eq(0)>tr th:eq("+i+")", nTable).width( jQuery(this).width() ); + } ); + + jQuery("tfoot:eq(0)>tr td", s.nTable).each( function (i) { + jQuery("tfoot:eq(0)>tr th:eq("+i+")", nTable)[0].style.width( jQuery(this).width() ); + } ); + }, + + /* + * Function: _fnCloneTLeft + * Purpose: Clone the left column + * Returns: - + * Inputs: object:oCache - the cahced values for this fixed element + */ + _fnCloneTLeft: function ( oCache ) + { + var s = this.fnGetSettings(); + var nTable = oCache.nNode; + var nBody = $('tbody', s.nTable)[0]; + var iCols = $('tbody tr:eq(0) td', s.nTable).length; + var bRubbishOldIE = ($.browser.msie && ($.browser.version == "6.0" || $.browser.version == "7.0")); + + /* Remove any children the cloned table has */ + while ( nTable.childNodes.length > 0 ) + { + nTable.removeChild( nTable.childNodes[0] ); + } + + /* Is this the most efficient way to do this - it looks horrible... */ + nTable.appendChild( jQuery("thead", s.nTable).clone(true)[0] ); + nTable.appendChild( jQuery("tbody", s.nTable).clone(true)[0] ); + if ( s.bFooter ) + { + nTable.appendChild( jQuery("tfoot", s.nTable).clone(true)[0] ); + } + + jQuery('thead tr th:gt(0)', nTable).remove(); + jQuery('tfoot tr th:gt(0)', nTable).remove(); + + /* Remove unneeded cells */ + $('tbody tr', nTable).each( function (k) { + $('td:gt(0)', this).remove(); + } ); + + this.fnEqualiseHeights( 'tbody', nBody.parentNode, nTable ); + + var iWidth = jQuery('thead tr th:eq(0)', s.nTable).outerWidth(); + nTable.style.width = iWidth+"px"; + oCache.nWrapper.style.width = iWidth+"px"; + }, + + /* + * Function: _fnCloneTRight + * Purpose: Clone the right most colun + * Returns: - + * Inputs: object:oCache - the cahced values for this fixed element + */ + _fnCloneTRight: function ( oCache ) + { + var s = this.fnGetSettings(); + var nBody = $('tbody', s.nTable)[0]; + var nTable = oCache.nNode; + var iCols = jQuery('tbody tr:eq(0) td', s.nTable).length; + var bRubbishOldIE = ($.browser.msie && ($.browser.version == "6.0" || $.browser.version == "7.0")); + + /* Remove any children the cloned table has */ + while ( nTable.childNodes.length > 0 ) + { + nTable.removeChild( nTable.childNodes[0] ); + } + + /* Is this the most efficient way to do this - it looks horrible... */ + nTable.appendChild( jQuery("thead", s.nTable).clone(true)[0] ); + nTable.appendChild( jQuery("tbody", s.nTable).clone(true)[0] ); + if ( s.bFooter ) + { + nTable.appendChild( jQuery("tfoot", s.nTable).clone(true)[0] ); + } + jQuery('thead tr th:not(:nth-child('+iCols+'n))', nTable).remove(); + jQuery('tfoot tr th:not(:nth-child('+iCols+'n))', nTable).remove(); + + /* Remove unneeded cells */ + $('tbody tr', nTable).each( function (k) { + $('td:lt('+(iCols-1)+')', this).remove(); + } ); + + this.fnEqualiseHeights( 'tbody', nBody.parentNode, nTable ); + + var iWidth = jQuery('thead tr th:eq('+(iCols-1)+')', s.nTable).outerWidth(); + nTable.style.width = iWidth+"px"; + oCache.nWrapper.style.width = iWidth+"px"; + }, + + + /** + * Equalise the heights of the rows in a given table node in a cross browser way. Note that this + * is more or less lifted as is from FixedColumns + * @method fnEqualiseHeights + * @returns void + * @param {string} parent Node type - thead, tbody or tfoot + * @param {element} original Original node to take the heights from + * @param {element} clone Copy the heights to + * @private + */ + "fnEqualiseHeights": function ( parent, original, clone ) + { + var that = this, + jqBoxHack = $(parent+' tr:eq(0)', original).children(':eq(0)'), + iBoxHack = jqBoxHack.outerHeight() - jqBoxHack.height(), + bRubbishOldIE = ($.browser.msie && ($.browser.version == "6.0" || $.browser.version == "7.0")); + + /* Remove cells which are not needed and copy the height from the original table */ + $(parent+' tr', clone).each( function (k) { + /* Can we use some kind of object detection here?! This is very nasty - damn browsers */ + if ( $.browser.mozilla || $.browser.opera ) + { + $(this).children().height( $(parent+' tr:eq('+k+')', original).outerHeight() ); + } + else + { + $(this).children().height( $(parent+' tr:eq('+k+')', original).outerHeight() - iBoxHack ); + } + + if ( !bRubbishOldIE ) + { + $(parent+' tr:eq('+k+')', original).height( $(parent+' tr:eq('+k+')', original).outerHeight() ); + } + } ); + } +}; + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Static properties and methods + * We use these for speed! This information is common to all instances of FixedHeader, so no + * point if having them calculated and stored for each different instance. + */ + +/* + * Variable: oWin + * Purpose: Store information about the window positioning + * Scope: FixedHeader + */ +FixedHeader.oWin = { + "iScrollTop": 0, + "iScrollRight": 0, + "iScrollBottom": 0, + "iScrollLeft": 0, + "iHeight": 0, + "iWidth": 0 +}; + +/* + * Variable: oDoc + * Purpose: Store information about the document size + * Scope: FixedHeader + */ +FixedHeader.oDoc = { + "iHeight": 0, + "iWidth": 0 +}; + +/* + * Variable: afnScroll + * Purpose: Array of functions that are to be used for the scrolling components + * Scope: FixedHeader + */ +FixedHeader.afnScroll = []; + +/* + * Function: fnMeasure + * Purpose: Update the measurements for the window and document + * Returns: - + * Inputs: - + */ +FixedHeader.fnMeasure = function () +{ + var + jqWin = jQuery(window), + jqDoc = jQuery(document), + oWin = FixedHeader.oWin, + oDoc = FixedHeader.oDoc; + + oDoc.iHeight = jqDoc.height(); + oDoc.iWidth = jqDoc.width(); + + oWin.iHeight = jqWin.height(); + oWin.iWidth = jqWin.width(); + oWin.iScrollTop = jqWin.scrollTop(); + oWin.iScrollLeft = jqWin.scrollLeft(); + oWin.iScrollRight = oDoc.iWidth - oWin.iScrollLeft - oWin.iWidth; + oWin.iScrollBottom = oDoc.iHeight - oWin.iScrollTop - oWin.iHeight; +}; + + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Global processing + */ + +/* + * Just one 'scroll' event handler in FixedHeader, which calls the required components. This is + * done as an optimisation, to reduce calculation and proagation time + */ +jQuery(window).scroll( function () { + FixedHeader.fnMeasure(); + for ( var i=0, iLen=FixedHeader.afnScroll.length ; i Date: Fri, 27 Jan 2012 21:06:04 +0100 Subject: [PATCH 06/33] CC-3174 : Show builder creating a scheduling system to work with the new timeline in mind using propel. --- .../application/configs/navigation.php | 9 ++- .../controllers/LibraryController.php | 4 +- .../controllers/ShowbuilderController.php | 49 ++++++++++--- airtime_mvc/application/models/Scheduler.php | 70 +++++++++++++++++++ .../application/models/ShowBuilder.php | 8 +++ airtime_mvc/application/models/StoredFile.php | 2 + .../public/js/airtime/library/library.js | 13 ++-- .../public/js/airtime/showbuilder/builder.js | 47 +++++++++++-- 8 files changed, 175 insertions(+), 27 deletions(-) create mode 100644 airtime_mvc/application/models/Scheduler.php diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php index 851cae36b..0eec09124 100644 --- a/airtime_mvc/application/configs/navigation.php +++ b/airtime_mvc/application/configs/navigation.php @@ -29,6 +29,13 @@ $pages = array( 'action' => 'index', 'resource' => 'library' ), + array( + 'label' => 'Show Builder', + 'module' => 'default', + 'controller' => 'Showbuilder', + 'action' => 'index', + 'resource' => 'showbuilder' + ), array( 'label' => 'Calendar', 'module' => 'default', @@ -67,7 +74,7 @@ $pages = array( 'action' => 'stream-setting' ), array( - 'label' => + 'label' => Application_Model_Preference::GetPlanLevel() == 'disabled'?'Support Settings':'Station Information Settings', 'module' => 'default', 'controller' => 'Preference', diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 0d499c9d6..2e52ca019 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -232,8 +232,8 @@ class LibraryController extends Zend_Controller_Action public function contentsAction() { - $post = $this->getRequest()->getPost(); - $datatables = Application_Model_StoredFile::searchFilesForPlaylistBuilder($post); + $params = $this->getRequest()->getParams(); + $datatables = Application_Model_StoredFile::searchFilesForPlaylistBuilder($params); //format clip lengh to 1 decimal foreach($datatables["aaData"] as &$data){ diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index 5da2c875f..89f36eeac 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -26,13 +26,8 @@ class ShowbuilderController extends Zend_Controller_Action $request = $this->getRequest(); $baseUrl = $request->getBaseUrl(); - $this->view->headScript()->appendFile($baseUrl.'/js/timepicker/jquery.ui.timepicker.js','text/javascript'); - $this->view->headScript()->appendScript("var serverTimezoneOffset = ".date("Z")."; //in seconds"); - //$this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js','text/javascript'); - //$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js','text/javascript'); - //$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorder.js','text/javascript'); - $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.FixedHeader.js','text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/timepicker/jquery.ui.timepicker.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/showbuilder/builder.js','text/javascript'); $this->view->headLink()->appendStylesheet($baseUrl.'/css/jquery.ui.timepicker.css'); @@ -64,12 +59,44 @@ class ShowbuilderController extends Zend_Controller_Action $request = $this->getRequest(); - $show_instance_id = $request->getParam("sid", 0); - $scheduled_item_id = $request->getParam("time", 0); - $scheduled_start = $request->getParam("start", 0); + $instance = $request->getParam("instance", null); + $id = $request->getParam("id", null); + $starts_epoch = $request->getParam("start", null); + $file_id = $request->getParam("file", null); - //snap to previous/next default. - $scheduled_type = $request->getParam("type", 0); + $startDT = DateTime::createFromFormat("U", $starts_epoch, new DateTimeZone("UTC")); + //invalid request + if (is_null($start)) { + return; + } + + //updating a scheduled item. + if (isset($id)) { + $schedItem = CcScheduleQuery::create()->findPK($id); + $duration = $schedItem->getDbEnds('U') - $schedItem->getDbStarts('U'); + + $endDT = DateTime::createFromFormat("U", $starts_epoch + $duration, new DateTimeZone("UTC")); + + $oldInstance = $schedItem->getDbInstanceId(); + + if ($instance === $oldInstance) { + CcScheduleQuery::create() + ->filterByDbInstanceId($oldInstance) + ->find(); + } + //file was dragged out of the show into another show or scheduled not within a show. + else { + } + + + } + else { + $schedItem = new CcSchedule(); + } + + $schedItem->setDbStarts($startDT); + $schedItem->setDbEnds($endDT); + $schedItem->save(); } } \ No newline at end of file diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php new file mode 100644 index 000000000..3a3391eb1 --- /dev/null +++ b/airtime_mvc/application/models/Scheduler.php @@ -0,0 +1,70 @@ +propSched = new CcSchedule(); + } + else { + $this->propSched = CcScheduleQuery::create()->findPK($id); + } + } + + /* + public function findScheduledItems($starts, $ends) { + + CcScheduleQuery::create() + ->filterByDbStarts(array('min' => $starts->format('Y-m-d H:i:s'), 'max' => $ends->format('Y-m-d H:i:s'))) + ->find(); + } + */ + + public function addScheduledItem($starts, $duration, $adjustSched = true) { + + } + + /* + * @param DateTime $starts + */ + public function updateScheduledItem($p_newStarts, $p_adjustSched = true) { + + $origStarts = $this->propSched->getDbStarts(null); + + $diff = $origStarts->diff($p_newStarts); + + //item is scheduled further in future + if ($diff->format("%R") === "+") { + + CcScheduleQuery::create() + ->filterByDbStarts($this->propSched->getDbStarts(), Criteria::GREATER_THAN) + ->filterByDbId($this->propSched->getDbId(), Criteria::NOT_EQUAL) + ->find(); + + } + //item has been scheduled earlier + else { + CcScheduleQuery::create() + ->filterByDbStarts($this->propSched->getDbStarts(), Criteria::GREATER_THAN) + ->filterByDbId($this->propSched->getDbId(), Criteria::NOT_EQUAL) + ->find(); + } + } + + public function removeScheduledItem($adjustSched = true) { + + if ($adjustSched === true) { + $duration = $this->propSched->getDbEnds('U') - $this->propSched->getDbStarts('U'); + + CcScheduleQuery::create() + ->filterByDbInstanceId() + ->filterByDbStarts() + ->find(); + } + + $this->propSched->delete(); + } +} \ No newline at end of file diff --git a/airtime_mvc/application/models/ShowBuilder.php b/airtime_mvc/application/models/ShowBuilder.php index 507224548..8724b6e50 100644 --- a/airtime_mvc/application/models/ShowBuilder.php +++ b/airtime_mvc/application/models/ShowBuilder.php @@ -14,7 +14,9 @@ class Application_Model_ShowBuilder { "id" => "", "instance" => "", "starts" => "", + "startsUnix" => null, "ends" => "", + "endsUnix" => null, "runtime" => "", "title" => "", "creator" => "", @@ -73,7 +75,10 @@ class Application_Model_ShowBuilder { $row["header"] = true; $row["starts"] = $showStartDT->format("Y-m-d H:i"); + $row["startsUnix"] = $showStartDT->format("U"); $row["ends"] = $showEndDT->format("Y-m-d H:i"); + $row["endsUnix"] = $showEndDT->format("U"); + $row["duration"] = $showEndDT->format("U") - $showStartDT->format("U"); $row["title"] = $p_item["show_name"]; return $row; @@ -94,7 +99,10 @@ class Application_Model_ShowBuilder { $row["id"] = $p_item["sched_id"]; $row["instance"] = $p_item["si_id"]; $row["starts"] = $schedStartDT->format("H:i:s"); + $row["startsUnix"] = $schedStartDT->format("U"); $row["ends"] = $schedEndDT->format("H:i:s"); + $row["endsUnix"] = $schedEndDT->format("U"); + $row["duration"] = $schedEndDT->format("U") - $schedStartDT->format("U"); $row["runtime"] = $this->formatDuration($runtime); $row["title"] = $p_item["file_track_title"]; $row["creator"] = $p_item["file_artist_name"]; diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 3e42e4e41..1963738af 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -804,6 +804,8 @@ class Application_Model_StoredFile { $sql = $selectorRows." FROM ".$fromTable." ORDER BY ".$orderby." OFFSET ".$data["iDisplayStart"]." LIMIT ".$data["iDisplayLength"]; } + Logging::log($sql); + $results = $CC_DBC->getAll($sql); if(!isset($totalDisplayRows)) { diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index fac705b37..b99dbc89a 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -273,7 +273,7 @@ function saveNumEntriesSetting() { * Use user preference for number of entries to show */ function getNumEntriesPreference(data) { - return parseInt(data.libraryInit.numEntries); + return parseInt(data.libraryInit.numEntries, 10); } function groupAdd() { @@ -457,11 +457,12 @@ function createDataTable(data) { dTable = $('#library_display').dataTable( { "bProcessing": true, "bServerSide": true, - "sAjaxSource": "/Library/contents/format/json", + "sAjaxSource": "/Library/contents", "fnServerData": function ( sSource, aoData, testCallback ) { + aoData.push( { name: "format", value: "json"} ); $.ajax( { "dataType": 'json', - "type": "POST", + "type": "GET", "url": sSource, "data": aoData, "success": testCallback @@ -490,7 +491,7 @@ function createDataTable(data) { "sSearch": "" }, "iDisplayLength": getNumEntriesPreference(data), - "bStateSave": true, + // R = ColReorder, C = ColVis, see datatables doc for others "sDom": 'Rlfr<"H"C<"library_toolbar">>t<"F"ip>', "oColVis": { @@ -499,10 +500,6 @@ function createDataTable(data) { "aiExclude": [0, 1, 2], "sSize": "css", "bShowAll": true - }, - "oColReorder": { - "aiOrder": [ 0, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], /* code this */ - "iFixedColumns": 3 } }); dTable.fnSetFilteringDelay(350); diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 38600398a..c0fc7f0a2 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -138,6 +138,9 @@ var fnShowBuilderRowCallback = function ( nRow, aData, iDisplayIndex, iDisplayIn fnPrepareSeparatorRow, node; + //save some info for reordering purposes. + $(nRow).data({aData: aData}); + fnPrepareSeparatorRow = function(sRowContent, sClass) { node = nRow.children[1]; @@ -167,6 +170,12 @@ var fnShowBuilderRowCallback = function ( nRow, aData, iDisplayIndex, iDisplayIn sSeparatorHTML = 'Show Footer'; fnPrepareSeparatorRow(sSeparatorHTML, "show-builder-footer"); } + else if (aData.empty === true) { + + } + else { + $(nRow).attr("id", "sched_"+aData.id); + } return nRow; }; @@ -197,7 +206,7 @@ $(document).ready(function() { oTable = $('#show_builder_table').dataTable( { "aoColumns": [ /* checkbox */ {"mDataProp": "checkbox", "sTitle": "", "sWidth": "25px"}, - // /* scheduled id */{"mDataProp": "id", "sTitle": "id", "bVisible": false, "sWidth": "1px"}, + // /* scheduled id */{"mDataProp": "id", "sTitle": "id"}, // /* instance */{"mDataProp": "instance", "sTitle": "si_id"}, /* starts */{"mDataProp": "starts", "sTitle": "Airtime"}, /* ends */{"mDataProp": "ends", "sTitle": "Off Air"}, @@ -215,6 +224,7 @@ $(document).ready(function() { "bProcessing": true, "bServerSide": true, "bInfo": false, + "bAutoWidth": false, "fnServerData": fnServerData, "fnRowCallback": fnShowBuilderRowCallback, @@ -235,8 +245,6 @@ $(document).ready(function() { "sAjaxSource": "/showbuilder/builder-feed" }); - //new FixedHeader( oTable ); - new FixedColumns( oTable ); $( "#show_builder_datepicker_start" ).datepicker(oBaseDatePickerSettings); @@ -263,10 +271,39 @@ $(document).ready(function() { $( "#show_builder_table" ).sortable({ placeholder: "placeholder show-builder-placeholder", - items: 'tr', - cancel: ".show-builder-header .show-builder-footer", + forceHelperSize: true, + forcePlaceholderSize: true, + items: 'tr:not(.show-builder-header):not(.show-builder-footer)', + //cancel: ".show-builder-header .show-builder-footer", receive: function(event, ui) { var x; + }, + update: function(event, ui) { + var oItemData = ui.item.data("aData"), + oPrevData = ui.item.prev().data("aData"), + oRequestData = {format: "json"}; + + //if prev item is a footer, item is not scheduled into a show. + if (oPrevData.footer === false) { + oRequestData.instance = oPrevData.instance; + } + + //set the start time appropriately + if (oPrevData.header === true) { + oRequestData.start = oPrevData.startsUnix; + } + else { + oRequestData.start = oPrevData.endsUnix; + } + + oRequestData.id = oItemData.id; + oRequestData.duration = oItemData.duration; + + /* + $.post("/showbuilder/schedule", oRequestData, function(json){ + var x; + }); + */ } }); From fbda0e733b243cda48660f6789f1c4a3198d766e Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Tue, 31 Jan 2012 18:59:27 +0100 Subject: [PATCH 07/33] CC-3174 : showbuilder check into issue that propel doesn't return DateTime object in UTC. using table tools to keep track of selected rows. --- .../controllers/LibraryController.php | 4 + .../controllers/ShowbuilderController.php | 36 +- airtime_mvc/application/models/Schedule.php | 3 +- airtime_mvc/application/models/Scheduler.php | 191 +- .../application/models/ShowBuilder.php | 10 +- airtime_mvc/application/models/StoredFile.php | 14 - airtime_mvc/application/models/User.php | 18 + airtime_mvc/public/css/TableTools.css | 265 ++ airtime_mvc/public/css/TableTools_JUI.css | 183 ++ .../library/events/library_playlistbuilder.js | 15 +- .../library/events/library_showbuilder.js | 33 +- .../public/js/airtime/library/library.js | 311 +- .../public/js/airtime/showbuilder/builder.js | 413 +-- .../plugin/dataTables.TableTools.js | 2569 +++++++++++++++++ .../plugin/dataTables.ZeroClipboard.js | 367 +++ .../public/js/libs/jquery-1.7.1.min.js | 4 + 16 files changed, 3999 insertions(+), 437 deletions(-) create mode 100755 airtime_mvc/public/css/TableTools.css create mode 100755 airtime_mvc/public/css/TableTools_JUI.css create mode 100755 airtime_mvc/public/js/datatables/plugin/dataTables.TableTools.js create mode 100755 airtime_mvc/public/js/datatables/plugin/dataTables.ZeroClipboard.js create mode 100644 airtime_mvc/public/js/libs/jquery-1.7.1.min.js diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 2e52ca019..4acb26ee8 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -39,12 +39,15 @@ class LibraryController 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/plugin/dataTables.fnSetFilteringDelay.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorderResize.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.FixedColumns.js','text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.TableTools.js','text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/library.js','text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/advancedsearch.js','text/javascript'); @@ -52,6 +55,7 @@ class LibraryController extends Zend_Controller_Action $this->view->headLink()->appendStylesheet($baseUrl.'/css/contextmenu.css'); $this->view->headLink()->appendStylesheet($baseUrl.'/css/datatables/css/ColVis.css'); $this->view->headLink()->appendStylesheet($baseUrl.'/css/datatables/css/ColReorder.css'); + $this->view->headLink()->appendStylesheet($baseUrl.'/css/TableTools.css'); $this->_helper->viewRenderer->setResponseSegment('library'); diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index 89f36eeac..39dfc4f99 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -6,7 +6,9 @@ class ShowbuilderController extends Zend_Controller_Action public function init() { $ajaxContext = $this->_helper->getHelper('AjaxContext'); - $ajaxContext->addActionContext('schedule', 'json') + $ajaxContext->addActionContext('schedule-update', 'json') + ->addActionContext('schedule-add', 'json') + ->addActionContext('schedule-remove', 'json') ->addActionContext('builder-feed', 'json') ->initContext(); } @@ -55,6 +57,38 @@ class ShowbuilderController extends Zend_Controller_Action $this->view->schedule = $showBuilder->GetItems(); } + public function scheduleAddAction() { + + $request = $this->getRequest(); + + $id = $request->getParam("id", null); + $instance = $request->getParam("instance", null); + + $items = $request->getParam("items", array()); + } + + public function scheduleRemoveAction() + { + $request = $this->getRequest(); + + $ids = $request->getParam("ids", null); + + Logging::log($ids); + + $json = array(); + + try { + Application_Model_Scheduler::removeItems($ids); + $json["message"]="success... maybe"; + } + catch (Exception $e) { + $json["message"]=$e->getMessage(); + Logging::log($e->getMessage()); + } + + $this->view->data = $json; + } + public function scheduleAction() { $request = $this->getRequest(); diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php index c3e655b53..13f268cf6 100644 --- a/airtime_mvc/application/models/Schedule.php +++ b/airtime_mvc/application/models/Schedule.php @@ -309,7 +309,8 @@ class Application_Model_Schedule { $sql = "SELECT DISTINCT - showt.name AS show_name, showt.color AS show_color, showt.background_color AS show_background_colour, + showt.name AS show_name, showt.color AS show_color, + showt.background_color AS show_background_colour, showt.id AS show_id, si.starts AS si_starts, si.ends AS si_ends, si.time_filled AS si_time_filled, si.record AS si_record, si.rebroadcast AS si_rebroadcast, si.id AS si_id, diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php index 3a3391eb1..b25b7e7c6 100644 --- a/airtime_mvc/application/models/Scheduler.php +++ b/airtime_mvc/application/models/Scheduler.php @@ -3,6 +3,7 @@ class Application_Model_Scheduler { private $propSched; + private $con; public function __construct($id = null) { @@ -15,13 +16,193 @@ class Application_Model_Scheduler { } /* - public function findScheduledItems($starts, $ends) { + * @param $id + * @param $type + * + * @return $files + */ + private static function retrieveMediaFiles($id, $type) { - CcScheduleQuery::create() - ->filterByDbStarts(array('min' => $starts->format('Y-m-d H:i:s'), 'max' => $ends->format('Y-m-d H:i:s'))) - ->find(); + $fileInfo = array( + "id" => "", + "cliplength" => "", + "cuein" => "00:00:00", + "cueout" => "00:00:00", + "fadein" => "00:00:00", + "fadeout" => "00:00:00" + ); + + $files = array(); + + if ($type === "file") { + $file = CcFilesQuery::create()->findByPK($id); + + $data = $fileInfo; + $data["id"] = $id; + $data["cliplength"] = $file->getDbLength(); + + $files[] = $data; + } + else if ($type === "playlist") { + + } + + return $files; + } + + /* + * @param array $scheduledIds + * @param array $fileIds + * @param array $playlistIds + */ + public static function scheduleAfter($scheduledIds, $mediaIds, $adjustSched = true) { + + $con = Propel::getConnection(CcSchedulePeer::DATABASE_NAME); + + $con->beginTransaction(); + + try { + + $schedFiles = array(); + foreach($mediaIds as $id => $type) { + $schedFiles = array_merge($schedFiles, self::retrieveMediaFiles($id, $type)); + } + + foreach ($scheduledIds as $id) { + + $schedItem = CcScheduleQuery::create()->findByPK($id); + + if ($adjustSched === true) { + $followingSchedItems = CcScheduleQuery::create() + ->filterByDBStarts($schedItem->getDbStarts("Y-m-d H:i:s.u"), Criteria::GREATER_THAN) + ->filterByDbInstanceId($instance) + ->orderByDbStarts() + ->find(); + } + + $nextItemDT = $schedItem->getDbEnds(null); + $instance = $schedItem->getDbInstanceId(); + + foreach($schedFiles as $file) { + + $durationDT = DateTime::createFromFormat("Y-m-d H:i:s.u", "1970-01-01 {$file['cliplength']}", new DateTimeZone("UTC")); + $endTimeEpoch = $nextItemDT->format("U.u") + $durationDT->format("U.u"); + $endTimeDT = DateTime::createFromFormat("U.u", $endTimeEpoch, new DateTimeZone("UTC")); + + $newItem = new CcSchedule(); + $newItem->setDbStarts($nextItemDT); + $newItem->setDbEnds($endTimeDT); + $newItem->setDbFileId($file['id']); + $newItem->setDbCueIn($file['cuein']); + $newItem->setDbCueOut($file['cueout']); + $newItem->setDbFadeIn($file['fadein']); + $newItem->setDbFadeOut($file['fadeout']); + $newItem->setDbInstanceId($instance); + $newItem->save($con); + + $nextItemDT = $endTimeDT; + } + + if ($adjustSched === true) { + + //recalculate the start/end times after the inserted items. + foreach($followingSchedItems as $followingItem) { + + $durationDT = DateTime::createFromFormat("Y-m-d H:i:s.u", "1970-01-01 {$file['cliplength']}", new DateTimeZone("UTC")); + $endTimeEpoch = $nextItemDT->format("U.u") + $durationDT->format("U.u"); + $endTimeDT = DateTime::createFromFormat("U.u", $endTimeEpoch, new DateTimeZone("UTC")); + + $followingItem->setDbStarts($nextItemDT); + $followingItem->setDbEnds($endTimeDT); + $followingItem->save($con); + + $nextItemDT = $endTimeDT; + } + } + } + } + catch (Exception $e) { + $con->rollback(); + throw $e; + } + } + + public function removeItems($scheduledIds, $adjustSched = true) { + + $showInstances = array(); + + $this->con = Propel::getConnection(CcSchedulePeer::DATABASE_NAME); + + $this->con->beginTransaction(); + + try { + + $removedItems = CcScheduleQuery::create()->findPks($scheduledIds); + $removedItems->delete($this->con); + + if ($adjustSched === true) { + //get the show instances of the shows we must adjust times for. + foreach ($removedItems as $item) { + + $instance = $item->getDBInstanceId(); + if (!in_array($instance, $showInstances)) { + $showInstances[] = $instance; + } + } + + foreach($showInstances as $instance) { + self::removeGaps($instance); + } + } + } + catch (Exception $e) { + $this->con->rollback(); + throw $e; + } + } + + public function removeGaps($showInstance) { + + Logging::log("removing gaps from show instance #".$showInstance); + + $instance = CcShowInstancesQuery::create()->findPK($showInstance); + $itemStartDT = $instance->getDbStarts(null); + + $schedule = CcScheduleQuery::create() + ->filterByDbInstanceId($showInstance) + ->orderByDbStarts() + ->find(); + + + foreach ($schedule as $item) { + + Logging::log("adjusting item #".$item->getDbId()); + + if (!$item->isDeleted()) { + Logging::log("item #".$item->getDbId()." is not deleted"); + + $durationDT = new DateTime("1970-01-01 {$item->getDbClipLength()}", new DateTimeZone("UTC")); + $startEpoch = $itemStartDT->format("U"); + Logging::log("new start time"); + Logging::log($itemStartDT->format("Y-m-d H:i:s")); + + Logging::log("duration"); + Logging::log($durationDT->format("Y-m-d H:i:s")); + Logging::log($durationDT->format("U"). "seconds"); + + $endEpoch = $itemStartDT->format("U") + $durationDT->format("U"); + $itemEndDT = DateTime::createFromFormat("U", $endEpoch, new DateTimeZone("UTC")); + Logging::log("new end time"); + Logging::log($itemEndDT->format("Y-m-d H:i:s")); + + $item->setDbStarts($itemStartDT); + $item->setDbEnds($itemEndDT); + $item->save($this->con); + + $itemStartDT = $itemEndDT; + } + } } - */ public function addScheduledItem($starts, $duration, $adjustSched = true) { diff --git a/airtime_mvc/application/models/ShowBuilder.php b/airtime_mvc/application/models/ShowBuilder.php index 8724b6e50..34aaa7d75 100644 --- a/airtime_mvc/application/models/ShowBuilder.php +++ b/airtime_mvc/application/models/ShowBuilder.php @@ -5,6 +5,7 @@ class Application_Model_ShowBuilder { private $timezone; private $startDT; private $endDT; + private $user; private $defaultRowArray = array( "header" => false, @@ -32,6 +33,7 @@ class Application_Model_ShowBuilder { $this->startDT = $p_startDT; $this->endDT = $p_endDT; $this->timezone = date_default_timezone_get(); + $this->user = Application_Model_User::GetCurrentUser(); } /* @@ -96,8 +98,8 @@ class Application_Model_ShowBuilder { $runtime = $schedStartDT->diff($schedEndDT); - $row["id"] = $p_item["sched_id"]; - $row["instance"] = $p_item["si_id"]; + $row["id"] = intval($p_item["sched_id"]); + $row["instance"] = intval($p_item["si_id"]); $row["starts"] = $schedStartDT->format("H:i:s"); $row["startsUnix"] = $schedStartDT->format("U"); $row["ends"] = $schedEndDT->format("H:i:s"); @@ -107,6 +109,10 @@ class Application_Model_ShowBuilder { $row["title"] = $p_item["file_track_title"]; $row["creator"] = $p_item["file_artist_name"]; $row["album"] = $p_item["file_album_title"]; + + if ($this->user->canSchedule($item["show_id"]) === true) { + $row["checkbox"] = true; + } } //show is empty else { diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 1963738af..5ddcc08c3 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -687,20 +687,6 @@ class Application_Model_StoredFile { $results = Application_Model_StoredFile::searchFiles($fromTable, $datatables); - /* - type = aData["ftype"].substring(0,2); - id = aData["id"]; - - if(type == "au") { - $('td.library_type', nRow).html( '' ); - } else if(type == "pl") { - $('td.library_type', nRow).html( '' ); - } - - - $(nRow).attr("id", type+'_'+id); - */ - foreach($results['aaData'] as &$row){ // add checkbox row $row['checkbox'] = ""; diff --git a/airtime_mvc/application/models/User.php b/airtime_mvc/application/models/User.php index ad0a4306e..aa79e71bf 100644 --- a/airtime_mvc/application/models/User.php +++ b/airtime_mvc/application/models/User.php @@ -35,6 +35,19 @@ class Application_Model_User { return $this->isUserType(UTYPE_ADMIN); } + public function canSchedule($p_showId) { + $type = $this->getType(); + + if ( $type === UTYPE_ADMIN || + $type === UTYPE_PROGRAM_MANAGER || + CcShowHostsQuery::create()->filterByDbShow($p_showId)->filterByDbHost($this->getId())->count() > 0 ) + { + return true; + } + + return false; + } + public function isUserType($type, $showId=''){ if(is_array($type)){ $result = false; @@ -270,4 +283,9 @@ class Application_Model_User { } } + public static function GetCurrentUser() { + $userinfo = Zend_Auth::getInstance()->getStorage()->read(); + + return new self($userinfo->id); + } } diff --git a/airtime_mvc/public/css/TableTools.css b/airtime_mvc/public/css/TableTools.css new file mode 100755 index 000000000..2b8812a3b --- /dev/null +++ b/airtime_mvc/public/css/TableTools.css @@ -0,0 +1,265 @@ +/* + * File: TableTools.css + * Description: Styles for TableTools 2 + * Author: Allan Jardine (www.sprymedia.co.uk) + * Language: Javascript + * License: LGPL / 3 point BSD + * Project: DataTables + * + * Copyright 2010 Allan Jardine, all rights reserved. + * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * + * CSS name space: + * DTTT DataTables TableTools + * + * Colour dictionary: + * Button border #d0d0d0 + * Button border hover #999999 + * Hover background #f0f0f0 + * Action blue #4b66d9 + * + * Style sheet provides: + * CONTAINER TableTools container element and styles applying to all components + * BUTTON_STYLES Action specific button styles + * SELECTING Row selection styles + * COLLECTIONS Drop down list (collection) styles + * PRINTING Print display styles + * MISC Minor misc styles + */ + + +/* + * CONTAINER + * TableTools container element and styles applying to all components + */ +div.DTTT_container { + position: relative; + float: left; + margin-bottom: 1em; +} + +button.DTTT_button { + position: relative; + float: left; + height: 30px; + margin-right: 3px; + padding: 3px 5px; + border: 1px solid #d0d0d0; + background-color: #fff; + cursor: pointer; + *cursor: hand; +} + +button.DTTT_button::-moz-focus-inner { + border: none !important; + padding: 0; +} + + +/* + * BUTTON_STYLES + * Action specific button styles + */ + +button.DTTT_button_csv { + padding-right: 30px; + background: url(../images/csv.png) no-repeat center right; +} + +button.DTTT_button_csv_hover { + padding-right: 30px; + border: 1px solid #999; + background: #f0f0f0 url(../images/csv_hover.png) no-repeat center right; +} + + +button.DTTT_button_xls { + padding-right: 30px; + background: url(../images/xls.png) no-repeat center right; +} + +button.DTTT_button_xls_hover { + padding-right: 30px; + border: 1px solid #999; + background: #f0f0f0 url(../images/xls_hover.png) no-repeat center right; +} + + +button.DTTT_button_copy { + padding-right: 30px; + background: url(../images/copy.png) no-repeat center right; +} + +button.DTTT_button_copy_hover { + padding-right: 30px; + border: 1px solid #999; + background: #f0f0f0 url(../images/copy_hover.png) no-repeat center right; +} + + +button.DTTT_button_pdf { + padding-right: 30px; + background: url(../images/pdf.png) no-repeat center right; +} + +button.DTTT_button_pdf_hover { + padding-right: 30px; + border: 1px solid #999; + background: #f0f0f0 url(../images/pdf_hover.png) no-repeat center right; +} + + +button.DTTT_button_print { + padding-right: 30px; + background: url(../images/print.png) no-repeat center right; +} + +button.DTTT_button_print_hover { + padding-right: 30px; + border: 1px solid #999; + background: #f0f0f0 url(../images/print_hover.png) no-repeat center right; +} + + +button.DTTT_button_text { +} + +button.DTTT_button_text_hover { + border: 1px solid #999; + background-color: #f0f0f0; +} + + +button.DTTT_button_collection { + padding-right: 17px; + background: url(../images/collection.png) no-repeat center right; +} + +button.DTTT_button_collection_hover { + padding-right: 17px; + border: 1px solid #999; + background: #f0f0f0 url(../images/collection_hover.png) no-repeat center right; +} + + +/* + * SELECTING + * Row selection styles + */ +table.DTTT_selectable tbody tr { + cursor: pointer; + *cursor: hand; +} + +tr.DTTT_selected.odd { + background-color: #9FAFD1; +} + +tr.DTTT_selected.odd td.sorting_1 { + background-color: #9FAFD1; +} + +tr.DTTT_selected.odd td.sorting_2 { + background-color: #9FAFD1; +} + +tr.DTTT_selected.odd td.sorting_3 { + background-color: #9FAFD1; +} + + +tr.DTTT_selected.even { + background-color: #B0BED9; +} + +tr.DTTT_selected.even td.sorting_1 { + background-color: #B0BED9; +} + +tr.DTTT_selected.even td.sorting_2 { + background-color: #B0BED9; +} + +tr.DTTT_selected.even td.sorting_3 { + background-color: #B0BED9; +} + + +/* + * COLLECTIONS + * Drop down list (collection) styles + */ + +div.DTTT_collection { + width: 150px; + padding: 3px; + border: 1px solid #ccc; + background-color: #f3f3f3; + overflow: hidden; + z-index: 2002; +} + +div.DTTT_collection_background { + background: transparent url(../images/background.png) repeat top left; + z-index: 2001; +} + +div.DTTT_collection button.DTTT_button { + float: none; + width: 100%; + margin-bottom: 2px; + background-color: white; +} + + +/* + * PRINTING + * Print display styles + */ + +.DTTT_print_info { + position: absolute; + top: 50%; + left: 50%; + width: 400px; + height: 150px; + margin-left: -200px; + margin-top: -75px; + text-align: center; + background-color: #3f3f3f; + color: white; + padding: 10px 30px; + + opacity: 0.9; + + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5); +} + +.DTTT_print_info h6 { + font-weight: normal; + font-size: 28px; + line-height: 28px; + margin: 1em; +} + +.DTTT_print_info p { + font-size: 14px; + line-height: 20px; +} + + +/* + * MISC + * Minor misc styles + */ + +.DTTT_disabled { + color: #999; +} diff --git a/airtime_mvc/public/css/TableTools_JUI.css b/airtime_mvc/public/css/TableTools_JUI.css new file mode 100755 index 000000000..95996ed2b --- /dev/null +++ b/airtime_mvc/public/css/TableTools_JUI.css @@ -0,0 +1,183 @@ +/* + * File: TableTools.css + * Description: Styles for TableTools 2 with JUI theming + * Author: Allan Jardine (www.sprymedia.co.uk) + * Language: Javascript + * License: LGPL / 3 point BSD + * Project: DataTables + * + * Copyright 2010 Allan Jardine, all rights reserved. + * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * + * Notes: + * Generally speaking, please refer to the TableTools.css file - this file contains basic + * modifications to that 'master' stylesheet for ThemeRoller. + * + * CSS name space: + * DTTT DataTables TableTools + * + * Colour dictionary: + * Button border #d0d0d0 + * Button border hover #999999 + * Hover background #f0f0f0 + * Action blue #4b66d9 + * + * Style sheet provides: + * CONTAINER TableTools container element and styles applying to all components + * SELECTING Row selection styles + * COLLECTIONS Drop down list (collection) styles + * PRINTING Print display styles + * MISC Minor misc styles + */ + + +/* + * CONTAINER + * TableTools container element and styles applying to all components + */ +div.DTTT_container { + position: relative; + float: left; +} + +button.DTTT_button { + position: relative; + float: left; + height: 24px; + margin-right: 3px; + padding: 3px 10px; + border: 1px solid #d0d0d0; + background-color: #fff; + cursor: pointer; + *cursor: hand; +} + +button.DTTT_button::-moz-focus-inner { + border: none !important; + padding: 0; +} + + + +/* + * SELECTING + * Row selection styles + */ +table.DTTT_selectable tbody tr { + cursor: pointer; + *cursor: hand; +} + +tr.DTTT_selected.odd { + background-color: #9FAFD1; +} + +tr.DTTT_selected.odd td.sorting_1 { + background-color: #9FAFD1; +} + +tr.DTTT_selected.odd td.sorting_2 { + background-color: #9FAFD1; +} + +tr.DTTT_selected.odd td.sorting_3 { + background-color: #9FAFD1; +} + + +tr.DTTT_selected.even { + background-color: #B0BED9; +} + +tr.DTTT_selected.even td.sorting_1 { + background-color: #B0BED9; +} + +tr.DTTT_selected.even td.sorting_2 { + background-color: #B0BED9; +} + +tr.DTTT_selected.even td.sorting_3 { + background-color: #B0BED9; +} + + +/* + * COLLECTIONS + * Drop down list (collection) styles + */ + +div.DTTT_collection { + width: 150px; + background-color: #f3f3f3; + overflow: hidden; + z-index: 2002; + + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5); +} + +div.DTTT_collection_background { + background: url(../images/background.png) repeat top left; + z-index: 2001; +} + +div.DTTT_collection button.DTTT_button { + float: none; + width: 100%; + margin-bottom: -0.1em; +} + + +/* + * PRINTING + * Print display styles + */ + +.DTTT_print_info { + position: absolute; + top: 50%; + left: 50%; + width: 400px; + height: 150px; + margin-left: -200px; + margin-top: -75px; + text-align: center; + background-color: #3f3f3f; + color: white; + padding: 10px 30px; + + opacity: 0.9; + + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + + box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5); + -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.5); +} + +.DTTT_print_info h6 { + font-weight: normal; + font-size: 28px; + line-height: 28px; + margin: 1em; +} + +.DTTT_print_info p { + font-size: 14px; + line-height: 20px; +} + + +/* + * MISC + * Minor misc styles + */ + +.DTTT_disabled { + color: #999; +} diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js index 2fcec1285..956eb2477 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -9,7 +9,7 @@ function fnLibraryTableDrawCallback() { addLibraryItemEvents(); addMetadataQtip(); //saveNumEntriesSetting(); - setupGroupActions(); + //setupGroupActions(); } function addLibraryItemEvents() { @@ -20,16 +20,23 @@ function addLibraryItemEvents() { cursor: 'pointer' }); + /* $('#library_display tbody tr td').not('[class=library_checkbox]') .jjmenu("click", [{get:"/Library/context-menu/format/json/id/#id#/type/#type#"}], {id: getId, type: getType}, {xposition: "mouse", yposition: "mouse"}); + */ } function setupLibraryToolbar() { - $("div.library_toolbar").html('Reset Order' + - 'Delete' + - 'Add'); + //[0] = button text + //[1] = id + //[2] = enabled + var aButtons = [["Reset Order", "library_order_reset", true], + ["Delete", "library_group_delete", false], + ["Add", "library_group_add", false]]; + + addToolBarButtonsLibrary(aButtons); } diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js index d380578a0..e2c46ad85 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -21,14 +21,33 @@ function addLibraryItemEvents() { cursor: 'pointer', connectToSortable: '#show_builder_table' }); - - $('#library_display tbody tr td').not('[class=library_checkbox]') - .jjmenu("click", - [{get:"/Library/context-menu/format/json/id/#id#/type/#type#"}], - {id: getId, type: getType}, - {xposition: "mouse", yposition: "mouse"}); - } function setupLibraryToolbar() { + var aButtons, + fnTest, + fnAddSelectedItems; + + fnTest = function() { + alert("hi"); + }; + + fnAddSelectedItems = function() { + var oTT = TableTools.fnGetInstance('show_builder_table'), + aData = oTT.fnGetSelectedData(), + i, + length = aData.length; + + for (i=0, i'; + libToolBar.append(html); + libToolBar.find("#"+aButtons[i][1]).click(aButtons[i][3]); + } +} + +function enableGroupBtn(btnId, func) { + btnId = '#' + btnId; + if ($(btnId).hasClass('ui-state-disabled')) { + $(btnId).removeClass('ui-state-disabled'); + } +} + +function disableGroupBtn(btnId) { + btnId = '#' + btnId; + if (!$(btnId).hasClass('ui-state-disabled')) { + $(btnId).addClass('ui-state-disabled'); + } +} + function deleteItem(type, id) { var tr_id, tr, dt; @@ -34,14 +71,15 @@ function deleteAudioClip(json) { return; } - if (json.ids != undefined) { - for (var i = json.ids.length - 1; i >= 0; i--) { - deleteItem("au", json.ids[i]); - } - } else if (json.id != undefined) { - deleteItem("au", json.id); + if (json.ids != undefined) { + for (var i = json.ids.length - 1; i >= 0; i--) { + deleteItem("au", json.ids[i]); } - location.reload(true); + } + else if (json.id != undefined) { + deleteItem("au", json.id); + } + location.reload(true); } function confirmDeleteGroup() { @@ -50,28 +88,6 @@ function confirmDeleteGroup() { } } -//callbacks called by jjmenu -function confirmDeleteAudioClip(params){ - if(confirm('The file will be deleted from disk, are you sure you want to delete?')){ - var url = '/Library/delete' + params; - $.ajax({ - url: url, - success: deleteAudioClip - }); - } -} - -//callbacks called by jjmenu -function confirmDeletePlaylist(params){ - if(confirm('Are you sure you want to delete?')){ - var url = '/Playlist/delete' + params; - $.ajax({ - url: url, - success: deletePlaylist - }); - } -} - function openFileOnSoundCloud(link){ window.open(link); } @@ -102,7 +118,6 @@ function deletePlaylist(json) { } window.location.reload(); } -//end callbacks called by jjmenu function addProgressIcon(id) { if($("#au_"+id).find("td.library_title").find("span").length > 0){ @@ -277,184 +292,17 @@ function getNumEntriesPreference(data) { } function groupAdd() { - if (checkedPLCount > 0) { - alert("Can't add playlist to another playlist"); - return; - } - disableGroupBtn('library_group_add'); - - var ids = new Array(); - var addGroupUrl = '/Playlist/add-group'; - var newSPLUrl = '/Playlist/new/format/json'; - var dirty = true; - $('#library_display tbody tr').each(function() { - var idSplit = $(this).attr('id').split("_"); - var id = idSplit.pop(); - var type = idSplit.pop(); - if (dirty && $(this).find(":checkbox").attr("checked")) { - if (type == "au") { - ids.push(id); - } else if (type == "pl") { - alert("Can't add playlist to another playlist"); - dirty = false; - } - } - }); - - if (dirty && ids.length > 0) { - stopAudioPreview(); - - if ($('#spl_sortable').length == 0) { - $.post(newSPLUrl, function(json) { - openDiffSPL(json); - redrawDataTablePage(); - - $.post(addGroupUrl, {format: "json", ids: ids}, setSPLContent); - }); - } else { - $.post(addGroupUrl, {format: "json", ids: ids}, setSPLContent); - } - } + } function groupDelete() { - disableGroupBtn('library_group_delete'); - - var auIds = new Array(); - var plIds = new Array(); - var auUrl = '/Library/delete-group'; - var plUrl = '/Playlist/delete-group'; - var dirty = true; - $('#library_display tbody tr').each(function() { - var idSplit = $(this).attr('id').split("_"); - var id = idSplit.pop(); - var type = idSplit.pop(); - if (dirty && $(this).find(":checkbox").attr("checked")) { - if (type == "au") { - auIds.push(id); - } else if (type == "pl") { - plIds.push(id); - } - } - }); - - if (dirty && (auIds.length > 0 || plIds.length > 0)) { - stopAudioPreview(); - - if (auIds.length > 0) { - $.post(auUrl, {format: "json", ids: auIds}, deleteAudioClip); - } - if (plIds.length > 0) { - $.post(plUrl, {format: "json", ids: plIds}, deletePlaylist); - } - } -} - -function toggleAll() { - var checked = $(this).attr("checked"); - $('#library_display tr').each(function() { - var idSplit = $(this).attr('id').split("_"); - var type = idSplit[0]; - $(this).find(":checkbox").attr("checked", checked); - if (checked) { - if (type == "pl") { - checkedPLCount++; - } - $(this).addClass('selected'); - } else { - $(this).removeClass('selected'); - } - }); - - if (checked) { - checkedCount = $('#library_display tbody tr').size(); - enableGroupBtn('library_group_add', groupAdd); - enableGroupBtn('library_group_delete', confirmDeleteGroup); - } else { - checkedCount = 0; - checkedPLCount = 0; - disableGroupBtn('library_group_add'); - disableGroupBtn('library_group_delete'); - } -} - -function enableGroupBtn(btnId, func) { - btnId = '#' + btnId; - if ($(btnId).hasClass('ui-state-disabled')) { - $(btnId).removeClass('ui-state-disabled'); - $(btnId).unbind("click").click(func); - } -} - -function disableGroupBtn(btnId) { - btnId = '#' + btnId; - if (!$(btnId).hasClass('ui-state-disabled')) { - $(btnId).addClass('ui-state-disabled'); - $(btnId).unbind("click"); - } -} - -function checkBoxChanged() { - var cbAll = $('#library_display thead').find(":checkbox"); - var cbAllChecked = cbAll.attr("checked"); - var checked = $(this).attr("checked"); - var size = $('#library_display tbody tr').size(); - var idSplit = $(this).parent().parent().attr('id').split("_"); - var type = idSplit[0]; - if (checked) { - if (checkedCount < size) { - checkedCount++; - } - if (type == "pl" && checkedPLCount < size) { - checkedPLCount++; - } - enableGroupBtn('library_group_add', groupAdd); - enableGroupBtn('library_group_delete', confirmDeleteGroup); - $(this).parent().parent().addClass('selected'); - } else { - if (checkedCount > 0) { - checkedCount--; - } - if (type == "pl" && checkedPLCount > 0) { - checkedPLCount--; - } - if (checkedCount == 0) { - disableGroupBtn('library_group_add'); - disableGroupBtn('library_group_delete'); - } - $(this).parent().parent().removeClass('selected'); - } - - if (cbAllChecked && checkedCount < size) { - cbAll.attr("checked", false); - } else if (!cbAllChecked && checkedCount == size) { - cbAll.attr("checked", true); - } -} - -function setupGroupActions() { - checkedCount = 0; - checkedPLCount = 0; - $('#library_display tr:nth-child(1)').find(":checkbox").attr("checked", false); - $('#library_display thead').find(":checkbox").unbind('change').change(toggleAll); - $('#library_display tbody tr').each(function() { - $(this).find(":checkbox").unbind('change').change(checkBoxChanged); - }); - - disableGroupBtn('library_group_add'); - disableGroupBtn('library_group_delete'); -} - -function fnShowHide(iCol) { - /* Get the DataTables object again - this is not a recreation, just a get of the object */ - var oTable = dTable; - - var bVis = oTable.fnSettings().aoColumns[iCol].bVisible; - oTable.fnSetColumnVis( iCol, bVis ? false : true ); + } function createDataTable(data) { - dTable = $('#library_display').dataTable( { + var oTable; + + oTable = $('#library_display').dataTable( { "bProcessing": true, "bServerSide": true, "sAjaxSource": "/Library/contents", @@ -471,7 +319,7 @@ function createDataTable(data) { "fnRowCallback": fnLibraryTableRowCallback, "fnDrawCallback": fnLibraryTableDrawCallback, "aoColumns": [ - /* Checkbox */ {"sTitle": "", "bSortable": false, "bSearchable": false, "mDataProp": "checkbox", "sWidth": "25px", "sClass": "library_checkbox"}, + /* Checkbox */ {"sTitle": "", "bSortable": false, "bSearchable": false, "mDataProp": "checkbox", "sWidth": "25px", "sClass": "library_checkbox"}, /* Id */ {"sName": "id", "bSearchable": false, "bVisible": false, "mDataProp": "id", "sClass": "library_id"}, /* Title */ {"sTitle": "Title", "sName": "track_title", "mDataProp": "track_title", "sClass": "library_title"}, /* Creator */ {"sTitle": "Creator", "sName": "artist_name", "mDataProp": "artist_name", "sClass": "library_creator"}, @@ -493,7 +341,35 @@ function createDataTable(data) { "iDisplayLength": getNumEntriesPreference(data), // R = ColReorder, C = ColVis, see datatables doc for others - "sDom": 'Rlfr<"H"C<"library_toolbar">>t<"F"ip>', + "sDom": 'Rlfr<"H"T<"library_toolbar"C>>t<"F"ip>', + + "oTableTools": { + "sRowSelect": "multi", + "aButtons": [], + "fnRowSelected": function ( node ) { + var x; + + //seems to happen if everything is selected + if ( node === null) { + oTable.find("input[type=checkbox]").attr("checked", true); + } + else { + $(node).find("input[type=checkbox]").attr("checked", true); + } + }, + "fnRowDeselected": function ( node ) { + var x; + + //seems to happen if everything is deselected + if ( node === null) { + oTable.find("input[type=checkbox]").attr("checked", false); + } + else { + $(node).find("input[type=checkbox]").attr("checked", false); + } + } + }, + "oColVis": { "buttonText": "Show/Hide Columns", "sAlign": "right", @@ -502,14 +378,25 @@ function createDataTable(data) { "bShowAll": true } }); - dTable.fnSetFilteringDelay(350); + oTable.fnSetFilteringDelay(350); setupLibraryToolbar(); $('#library_order_reset').click(function() { - ColReorder.fnReset( dTable ); + ColReorder.fnReset( oTable ); return false; }); + + $('[name="pl_cb_all"]').click(function(){ + var oTT = TableTools.fnGetInstance('library_display'); + + if ($(this).is(":checked")) { + oTT.fnSelectAll(); + } + else { + oTT.fnSelectNone(); + } + }); } $(document).ready(function() { @@ -519,8 +406,8 @@ $(document).ready(function() { error:function(jqXHR, textStatus, errorThrown){}}); checkImportStatus(); - setInterval( "checkImportStatus()", 5000 ); - setInterval( "checkSCUploadStatus()", 5000 ); + //setInterval( "checkImportStatus()", 5000 ); + //setInterval( "checkSCUploadStatus()", 5000 ); addQtipToSCIcons(); }); diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index c0fc7f0a2..c294b25e5 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -1,189 +1,10 @@ -/* -function tpStartOnHourShowCallback(hour) { - var tpEndHour = $('#show_builder_timepicker_end').timepicker('getHour'); - - // Check if proposed hour is prior or equal to selected end time hour - if (hour <= tpEndHour) { return true; } - // if hour did not match, it can not be selected - return false; -} - -function tpStartOnMinuteShowCallback(hour, minute) { - var tpEndHour = $('#show_builder_timepicker_end').timepicker('getHour'), - tpEndMinute = $('#show_builder_timepicker_end').timepicker('getMinute'); - - // Check if proposed hour is prior to selected end time hour - if (hour < tpEndHour) { return true; } - // Check if proposed hour is equal to selected end time hour and minutes is prior - if ( (hour == tpEndHour) && (minute < tpEndMinute) ) { return true; } - // if minute did not match, it can not be selected - return false; -} - -function tpEndOnHourShowCallback(hour) { - var tpStartHour = $('#show_builder_timepicker_start').timepicker('getHour'); - - // Check if proposed hour is after or equal to selected start time hour - if (hour >= tpStartHour) { return true; } - // if hour did not match, it can not be selected - return false; -} - -function tpEndOnMinuteShowCallback(hour, minute) { - var tpStartHour = $('#show_builder_timepicker_start').timepicker('getHour'), - tpStartMinute = $('#show_builder_timepicker_start').timepicker('getMinute'); - - // Check if proposed hour is after selected start time hour - if (hour > tpStartHour) { return true; } - // Check if proposed hour is equal to selected start time hour and minutes is after - if ( (hour == tpStartHour) && (minute > tpStartMinute) ) { return true; } - // if minute did not match, it can not be selected - return false; -} -*/ - -/* - * Get the schedule range start in unix timestamp form (in seconds). - * defaults to NOW if nothing is selected. - * - * @param String sDatePickerId - * - * @param String sTimePickerId - * - * @return Number iTime - */ -function fnGetUIPickerUnixTimestamp(sDatePickerId, sTimePickerId) { - var oDate, - oTimePicker = $( sTimePickerId ), - iTime, - iHour, - iMin, - iServerOffset, - iClientOffset; - - oDate = $( sDatePickerId ).datepicker( "getDate" ); - - //nothing has been selected from this datepicker. - if (oDate === null) { - oDate = new Date(); - } - else { - iHour = oTimePicker.timepicker('getHour'); - iMin = oTimePicker.timepicker('getMinute'); - - oDate.setHours(iHour, iMin); - } - - iTime = oDate.getTime(); //value is in millisec. - iTime = Math.round(iTime / 1000); - iServerOffset = serverTimezoneOffset; - iClientOffset = oDate.getTimezoneOffset() * 60;//function returns minutes - - //adjust for the fact the the Date object is - iTime = iTime + iServerOffset + iClientOffset; - - return iTime; -} -/* - * Returns an object containing a unix timestamp in seconds for the start/end range - * - * @return Object {"start", "end", "range"} - */ -function fnGetScheduleRange() { - var iStart, - iEnd, - iRange, - MIN_RANGE = 60*60*24; - - iStart = fnGetUIPickerUnixTimestamp("#show_builder_datepicker_start", "#show_builder_timepicker_start"); - iEnd = fnGetUIPickerUnixTimestamp("#show_builder_datepicker_end", "#show_builder_timepicker_end"); - - iRange = iEnd - iStart; - - //return min range - if (iRange < MIN_RANGE){ - iEnd = iStart + MIN_RANGE; - iRange = MIN_RANGE; - } - - return { - start: iStart, - end: iEnd, - range: iRange - }; -} - -var fnServerData = function fnServerData( sSource, aoData, fnCallback ) { - aoData.push( { name: "format", value: "json"} ); - - if (fnServerData.hasOwnProperty("start")) { - aoData.push( { name: "start", value: fnServerData.start} ); - } - if (fnServerData.hasOwnProperty("end")) { - aoData.push( { name: "end", value: fnServerData.end} ); - } - - $.ajax( { - "dataType": "json", - "type": "GET", - "url": sSource, - "data": aoData, - "success": fnCallback - } ); -}; - -var fnShowBuilderRowCallback = function ( nRow, aData, iDisplayIndex, iDisplayIndexFull ){ - var i, - sSeparatorHTML, - fnPrepareSeparatorRow, - node; - - //save some info for reordering purposes. - $(nRow).data({aData: aData}); - - fnPrepareSeparatorRow = function(sRowContent, sClass) { - - node = nRow.children[1]; - node.innerHTML = sRowContent; - node.setAttribute('colspan',100); - for (i = 2; i < nRow.children.length; i = i+1) { - node = nRow.children[i]; - node.innerHTML = ""; - node.setAttribute("style", "display : none"); - } - - nRow.className = sClass; - }; - - if (aData.header === true) { - node = nRow.children[0]; - node.innerHTML = ''; - - sSeparatorHTML = ''+aData.title+''+aData.starts+''+aData.ends+''; - fnPrepareSeparatorRow(sSeparatorHTML, "show-builder-header"); - } - else if (aData.footer === true) { - - node = nRow.children[0]; - node.innerHTML = ''; - - sSeparatorHTML = 'Show Footer'; - fnPrepareSeparatorRow(sSeparatorHTML, "show-builder-footer"); - } - else if (aData.empty === true) { - - } - else { - $(nRow).attr("id", "sched_"+aData.id); - } - - return nRow; -}; - $(document).ready(function() { - var oTable, + var tableDiv = $('#show_builder_table'), + oTable, oBaseDatePickerSettings, - oBaseTimePickerSettings; + oBaseTimePickerSettings, + fnAddSelectedItems, + fnRemoveSelectedItems; oBaseDatePickerSettings = { dateFormat: 'yy-mm-dd', @@ -203,9 +24,178 @@ $(document).ready(function() { defaultTime: '0:00' }; - oTable = $('#show_builder_table').dataTable( { + /* + * Get the schedule range start in unix timestamp form (in seconds). + * defaults to NOW if nothing is selected. + * + * @param String sDatePickerId + * + * @param String sTimePickerId + * + * @return Number iTime + */ + function fnGetUIPickerUnixTimestamp(sDatePickerId, sTimePickerId) { + var oDate, + oTimePicker = $( sTimePickerId ), + iTime, + iHour, + iMin, + iServerOffset, + iClientOffset; + + oDate = $( sDatePickerId ).datepicker( "getDate" ); + + //nothing has been selected from this datepicker. + if (oDate === null) { + oDate = new Date(); + } + else { + iHour = oTimePicker.timepicker('getHour'); + iMin = oTimePicker.timepicker('getMinute'); + + oDate.setHours(iHour, iMin); + } + + iTime = oDate.getTime(); //value is in millisec. + iTime = Math.round(iTime / 1000); + iServerOffset = serverTimezoneOffset; + iClientOffset = oDate.getTimezoneOffset() * 60;//function returns minutes + + //adjust for the fact the the Date object is + iTime = iTime + iServerOffset + iClientOffset; + + return iTime; + } + /* + * Returns an object containing a unix timestamp in seconds for the start/end range + * + * @return Object {"start", "end", "range"} + */ + function fnGetScheduleRange() { + var iStart, + iEnd, + iRange, + MIN_RANGE = 60*60*24; + + iStart = fnGetUIPickerUnixTimestamp("#show_builder_datepicker_start", "#show_builder_timepicker_start"); + iEnd = fnGetUIPickerUnixTimestamp("#show_builder_datepicker_end", "#show_builder_timepicker_end"); + + iRange = iEnd - iStart; + + //return min range + if (iRange < MIN_RANGE){ + iEnd = iStart + MIN_RANGE; + iRange = MIN_RANGE; + } + + return { + start: iStart, + end: iEnd, + range: iRange + }; + } + + var fnServerData = function ( sSource, aoData, fnCallback ) { + aoData.push( { name: "format", value: "json"} ); + + if (fnServerData.hasOwnProperty("start")) { + aoData.push( { name: "start", value: fnServerData.start} ); + } + if (fnServerData.hasOwnProperty("end")) { + aoData.push( { name: "end", value: fnServerData.end} ); + } + + $.ajax( { + "dataType": "json", + "type": "GET", + "url": sSource, + "data": aoData, + "success": fnCallback + } ); + }; + + var fnShowBuilderRowCallback = function ( nRow, aData, iDisplayIndex, iDisplayIndexFull ){ + var i, + sSeparatorHTML, + fnPrepareSeparatorRow, + node; + + //save some info for reordering purposes. + $(nRow).data({aData: aData}); + + fnPrepareSeparatorRow = function(sRowContent, sClass) { + + node = nRow.children[1]; + node.innerHTML = sRowContent; + node.setAttribute('colspan',100); + for (i = 2; i < nRow.children.length; i = i+1) { + node = nRow.children[i]; + node.innerHTML = ""; + node.setAttribute("style", "display : none"); + } + + nRow.className = sClass; + }; + + if (aData.header === true) { + node = nRow.children[0]; + node.innerHTML = ''; + + sSeparatorHTML = ''+aData.title+''+aData.starts+''+aData.ends+''; + fnPrepareSeparatorRow(sSeparatorHTML, "show-builder-header"); + } + else if (aData.footer === true) { + + node = nRow.children[0]; + node.innerHTML = ''; + + sSeparatorHTML = 'Show Footer'; + fnPrepareSeparatorRow(sSeparatorHTML, "show-builder-footer"); + } + else if (aData.empty === true) { + + } + else { + $(nRow).attr("id", "sched_"+aData.id); + + node = nRow.children[0]; + if (aData.checkbox === true) { + node.innerHTML = ''; + } + else { + node.innerHTML = ''; + + $(nRow).addClass("show-builder-not-allowed"); + } + } + + return nRow; + }; + + fnRemoveSelectedItems = function() { + var oTT = TableTools.fnGetInstance('show_builder_table'), + aData = oTT.fnGetSelectedData(), + item, + temp, + ids = []; + + for (item in aData) { + temp = aData[item]; + if (temp !== null && temp.hasOwnProperty('id')) { + ids.push(temp.id); + } + } + + $.post( "/showbuilder/schedule-remove", + {"ids": ids, "format": "json"}, + function(data) { + var x; + }); + }; + + oTable = tableDiv.dataTable( { "aoColumns": [ - /* checkbox */ {"mDataProp": "checkbox", "sTitle": "", "sWidth": "25px"}, + /* checkbox */ {"mDataProp": "checkbox", "sTitle": "", "sWidth": "15px"}, // /* scheduled id */{"mDataProp": "id", "sTitle": "id"}, // /* instance */{"mDataProp": "instance", "sTitle": "si_id"}, /* starts */{"mDataProp": "starts", "sTitle": "Airtime"}, @@ -233,8 +223,35 @@ $(document).ready(function() { "aiExclude": [ 0, 1 ] }, + "oTableTools": { + "sRowSelect": "multi", + "aButtons": [], + "fnRowSelected": function ( node ) { + var x; + + //seems to happen if everything is selected + if ( node === null) { + oTable.find("input[type=checkbox]").attr("checked", true); + } + else { + $(node).find("input[type=checkbox]").attr("checked", true); + } + }, + "fnRowDeselected": function ( node ) { + var x; + + //seems to happen if everything is deselected + if ( node === null) { + oTable.find("input[type=checkbox]").attr("checked", false); + } + else { + $(node).find("input[type=checkbox]").attr("checked", false); + } + } + }, + // R = ColReorder, C = ColVis, see datatables doc for others - "sDom": 'Rr<"H"C>t<"F">', + "sDom": 'Rr<"H"CT<"#show_builder_toolbar">>t<"F">', //options for infinite scrolling //"bScrollInfinite": true, @@ -246,6 +263,17 @@ $(document).ready(function() { }); + $('[name="sb_cb_all"]').click(function(){ + var oTT = TableTools.fnGetInstance('show_builder_table'); + + if ($(this).is(":checked")) { + oTT.fnSelectAll(); + } + else { + oTT.fnSelectNone(); + } + }); + $( "#show_builder_datepicker_start" ).datepicker(oBaseDatePickerSettings); $( "#show_builder_timepicker_start" ).timepicker(oBaseTimePickerSettings); @@ -255,13 +283,11 @@ $(document).ready(function() { $( "#show_builder_timepicker_end" ).timepicker(oBaseTimePickerSettings); $( "#show_builder_timerange_button" ).click(function(ev){ - var oTable, - oSettings, + var oSettings, oRange; oRange = fnGetScheduleRange(); - oTable = $('#show_builder_table').dataTable({"bRetrieve": true}); oSettings = oTable.fnSettings(); oSettings.fnServerData.start = oRange.start; oSettings.fnServerData.end = oRange.end; @@ -269,7 +295,7 @@ $(document).ready(function() { oTable.fnDraw(); }); - $( "#show_builder_table" ).sortable({ + tableDiv.sortable({ placeholder: "placeholder show-builder-placeholder", forceHelperSize: true, forcePlaceholderSize: true, @@ -307,4 +333,9 @@ $(document).ready(function() { } }); + $("#show_builder_toolbar") + .append('') + .find(".ui-icon-trash") + .click(fnRemoveSelectedItems); + }); diff --git a/airtime_mvc/public/js/datatables/plugin/dataTables.TableTools.js b/airtime_mvc/public/js/datatables/plugin/dataTables.TableTools.js new file mode 100755 index 000000000..3e02c2c08 --- /dev/null +++ b/airtime_mvc/public/js/datatables/plugin/dataTables.TableTools.js @@ -0,0 +1,2569 @@ +/* + * File: TableTools.js + * Version: 2.0.2 + * Description: Tools and buttons for DataTables + * Author: Allan Jardine (www.sprymedia.co.uk) + * Language: Javascript + * License: GPL v2 or BSD 3 point style + * Project: DataTables + * + * Copyright 2009-2012 Allan Jardine, all rights reserved. + * + * This source file is free software, under either the GPL v2 license or a + * BSD style license, available at: + * http://datatables.net/license_gpl2 + * http://datatables.net/license_bsd + */ + +/* Global scope for TableTools */ +var TableTools; + +(function($, window, document) { + +/** + * TableTools provides flexible buttons and other tools for a DataTables enhanced table + * @class TableTools + * @constructor + * @param {Object} oDT DataTables instance + * @param {Object} oOpts TableTools options + * @param {String} oOpts.sSwfPath ZeroClipboard SWF path + * @param {String} oOpts.sRowSelect Row selection options - 'none', 'single' or 'multi' + * @param {Function} oOpts.fnPreRowSelect Callback function just prior to row selection + * @param {Function} oOpts.fnRowSelected Callback function just after row selection + * @param {Function} oOpts.fnRowDeselected Callback function when row is deselected + * @param {Array} oOpts.aButtons List of buttons to be used + */ +TableTools = function( oDT, oOpts ) +{ + /* Santiy check that we are a new instance */ + if ( !this.CLASS || this.CLASS != "TableTools" ) + { + alert( "Warning: TableTools must be initialised with the keyword 'new'" ); + } + + + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Public class variables + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + + /** + * @namespace Settings object which contains customisable information for TableTools instance + */ + this.s = { + /** + * Store 'this' so the instance can be retreieved from the settings object + * @property that + * @type object + * @default this + */ + "that": this, + + /** + * DataTables settings objects + * @property dt + * @type object + * @default null + */ + "dt": null, + + /** + * @namespace Print specific information + */ + "print": { + /** + * DataTables draw 'start' point before the printing display was shown + * @property saveStart + * @type int + * @default -1 + */ + "saveStart": -1, + + /** + * DataTables draw 'length' point before the printing display was shown + * @property saveLength + * @type int + * @default -1 + */ + "saveLength": -1, + + /** + * Page scrolling point before the printing display was shown so it can be restored + * @property saveScroll + * @type int + * @default -1 + */ + "saveScroll": -1, + + /** + * Wrapped function to end the print display (to maintain scope) + * @property funcEnd + * @type Function + * @default function () {} + */ + "funcEnd": function () {} + }, + + /** + * A unique ID is assigned to each button in each instance + * @property buttonCounter + * @type int + * @default 0 + */ + "buttonCounter": 0, + + /** + * @namespace Select rows specific information + */ + "select": { + /** + * Select type - can be 'none', 'single' or 'multi' + * @property type + * @type string + * @default "" + */ + "type": "", + + /** + * Array of nodes which are currently selected + * @property selected + * @type array + * @default [] + */ + "selected": [], + + /** + * Function to run before the selection can take place. Will cancel the select if the + * function returns false + * @property preRowSelect + * @type Function + * @default null + */ + "preRowSelect": null, + + /** + * Function to run when a row is selected + * @property postSelected + * @type Function + * @default null + */ + "postSelected": null, + + /** + * Function to run when a row is deselected + * @property postDeselected + * @type Function + * @default null + */ + "postDeselected": null, + + /** + * Indicate if all rows are selected (needed for server-side processing) + * @property all + * @type boolean + * @default false + */ + "all": false, + + /** + * Class name to add to selected TR nodes + * @property selectedClass + * @type String + * @default "" + */ + "selectedClass": "" + }, + + /** + * Store of the user input customisation object + * @property custom + * @type object + * @default {} + */ + "custom": {}, + + /** + * SWF movie path + * @property swfPath + * @type string + * @default "" + */ + "swfPath": "", + + /** + * Default button set + * @property buttonSet + * @type array + * @default [] + */ + "buttonSet": [], + + /** + * When there is more than one TableTools instance for a DataTable, there must be a + * master which controls events (row selection etc) + * @property master + * @type boolean + * @default false + */ + "master": false + }; + + + /** + * @namespace Common and useful DOM elements for the class instance + */ + this.dom = { + /** + * DIV element that is create and all TableTools buttons (and their children) put into + * @property container + * @type node + * @default null + */ + "container": null, + + /** + * The table node to which TableTools will be applied + * @property table + * @type node + * @default null + */ + "table": null, + + /** + * @namespace Nodes used for the print display + */ + "print": { + /** + * Nodes which have been removed from the display by setting them to display none + * @property hidden + * @type array + * @default [] + */ + "hidden": [], + + /** + * The information display saying tellng the user about the print display + * @property message + * @type node + * @default null + */ + "message": null + }, + + /** + * @namespace Nodes used for a collection display. This contains the currently used collection + */ + "collection": { + /** + * The div wrapper containing the buttons in the collection (i.e. the menu) + * @property collection + * @type node + * @default null + */ + "collection": null, + + /** + * Background display to provide focus and capture events + * @property background + * @type node + * @default null + */ + "background": null + } + }; + + + + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Public class methods + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + + /** + * Retreieve the settings object from an instance + * @method fnSettings + * @returns {object} TableTools settings object + */ + this.fnSettings = function () { + return this.s; + }; + + + /* Constructor logic */ + if ( typeof oOpts == 'undefined' ) + { + oOpts = {}; + } + + this.s.dt = oDT.fnSettings(); + this._fnConstruct( oOpts ); + + return this; +}; + + + +TableTools.prototype = { + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Public methods + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + + /** + * Retreieve the settings object from an instance + * @method fnGetSelected + * @returns {array} List of TR nodes which are currently selected + */ + "fnGetSelected": function () + { + var masterS = this._fnGetMasterSettings(); + return masterS.select.selected; + }, + + + /** + * Get the data source objects/arrays from DataTables for the selected rows (same as + * fnGetSelected followed by fnGetData on each row from the table) + * @method fnGetSelectedData + * @returns {array} Data from the TR nodes which are currently selected + */ + "fnGetSelectedData": function () + { + var masterS = this._fnGetMasterSettings(); + var selected = masterS.select.selected; + var out = []; + + for ( var i=0, iLen=selected.length ; i 0 ) + { + sTitle = anTitle[0].innerHTML; + } + } + + /* Strip characters which the OS will object to - checking for UTF8 support in the scripting + * engine + */ + if ( "\u00A1".toString().length < 4 ) { + return sTitle.replace(/[^a-zA-Z0-9_\u00A1-\uFFFF\.,\-_ !\(\)]/g, ""); + } else { + return sTitle.replace(/[^a-zA-Z0-9_\.,\-_ !\(\)]/g, ""); + } + }, + + + /** + * Calculate a unity array with the column width by proportion for a set of columns to be + * included for a button. This is particularly useful for PDF creation, where we can use the + * column widths calculated by the browser to size the columns in the PDF. + * @method fnCalcColRations + * @param {Object} oConfig Button configuration object + * @returns {Array} Unity array of column ratios + */ + "fnCalcColRatios": function ( oConfig ) + { + var + aoCols = this.s.dt.aoColumns, + aColumnsInc = this._fnColumnTargets( oConfig.mColumns ), + aColWidths = [], + iWidth = 0, iTotal = 0, i, iLen; + + for ( i=0, iLen=aColumnsInc.length ; i