From c66b55ec17b1940693fb78e0e0677735fe9e5ec2 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Fri, 9 Mar 2012 11:13:32 +0100
Subject: [PATCH] CC-733 : playout history

translating mDataProp values to be able to search table on backend
---
 .../application/models/PlayoutHistory.php     | 22 +++++++++++++++++++
 airtime_mvc/public/css/media_library.css      |  4 ----
 airtime_mvc/public/css/styles.css             |  6 ++++-
 .../js/airtime/playouthistory/historytable.js |  3 ++-
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/application/models/PlayoutHistory.php b/airtime_mvc/application/models/PlayoutHistory.php
index 9084e05d6..6918f9dd1 100644
--- a/airtime_mvc/application/models/PlayoutHistory.php
+++ b/airtime_mvc/application/models/PlayoutHistory.php
@@ -15,6 +15,15 @@ class Application_Model_PlayoutHistory {
 	private $epoch_now;
 	private $opts;
 	
+	private $mDataPropMap = array(
+		"artist" => "file.artist_name",
+		"title" => "file.track_title",
+		"played" => "playout.played",
+		"length" => "file.length",
+		"composer" => "file.composer",
+		"copyright" => "file.copyright",		
+	);
+	
 	public function __construct($p_startDT, $p_endDT, $p_opts) {
 		
 		$this->con = Propel::getConnection(CcSchedulePeer::DATABASE_NAME);
@@ -25,8 +34,21 @@ class Application_Model_PlayoutHistory {
 		$this->opts = $p_opts;
 	}
 	
+	/*
+	 * map front end mDataProp labels to proper column names for searching etc.
+	 */
+	private function translateColumns() {
+		
+		for ($i = 0; $i < $this->opts["iColumns"]; $i++){
+			
+			$this->opts["mDataProp_{$i}"] = $this->mDataPropMap[$this->opts["mDataProp_{$i}"]];
+		}
+	}
+	
 	public function getItems() {
 		
+		$this->translateColumns();
+		
 		$select = array( 
 			"file.track_title as title",
 			"file.artist_name as artist",
diff --git a/airtime_mvc/public/css/media_library.css b/airtime_mvc/public/css/media_library.css
index 1456c04e7..87e156037 100644
--- a/airtime_mvc/public/css/media_library.css
+++ b/airtime_mvc/public/css/media_library.css
@@ -9,10 +9,6 @@
     table-layout:fixed;
 }
 
-#library_display th {
-    text-align: left;
-}
-
 #library_content #library_display {
 	width:100%;
 }
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 457e91a0f..a7de7fa82 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -510,6 +510,11 @@ dl.inline-list dd {
     border-width: 1px 1px 1px 1px;
 	width:100%;
 }
+
+.datatable th {
+    text-align: left;
+}
+
 .datatable tr td, .datatable tr th {
     border-color: #b1b1b1;
     border-style: solid;
@@ -671,7 +676,6 @@ button.ColVis_Button.ColVis_ShowAll {
 
 .library_length {
     text-align: right;
-    padding-right: 1em !important;
 }
 
 /*----END Data Table----*/
diff --git a/airtime_mvc/public/js/airtime/playouthistory/historytable.js b/airtime_mvc/public/js/airtime/playouthistory/historytable.js
index cfa69fec7..975e19410 100644
--- a/airtime_mvc/public/js/airtime/playouthistory/historytable.js
+++ b/airtime_mvc/public/js/airtime/playouthistory/historytable.js
@@ -18,7 +18,7 @@ var AIRTIME = (function(AIRTIME) {
                {"sTitle": "Title", "mDataProp": "title", "sClass": "his_title"}, /* Title */
                {"sTitle": "Artist", "mDataProp": "artist", "sClass": "his_artist"}, /* Creator */
                {"sTitle": "Played", "mDataProp": "played", "sClass": "his_artist"}, /* times played */
-               {"sTitle": "Length", "mDataProp": "length", "sClass": "his_length"}, /* Length */
+               {"sTitle": "Length", "mDataProp": "length", "sClass": "his_length library_length"}, /* Length */
                {"sTitle": "Composer", "mDataProp": "composer", "sClass": "his_composer"}, /* Composer */
                {"sTitle": "Copyright", "mDataProp": "copyright", "sClass": "his_copyright"} /* Copyright */
             ],
@@ -51,6 +51,7 @@ var AIRTIME = (function(AIRTIME) {
            
             "sDom": 'lfr<"H"><"dataTables_scrolling"t><"F"ip>', 
         });
+        oTable.fnSetFilteringDelay(350);
     };
     
 return AIRTIME;