Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

using an accordian to display per show logs.

This commit is contained in:
Naomi Aro 2013-08-28 23:30:15 -04:00
parent 429cdeeffb
commit a4c97479b6
4 changed files with 139 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/controllers/PlayouthistoryController.php
View File

@ -120,12 +120,13 @@ class PlayouthistoryController extends Zend_Controller_Action
$starts_epoch = $request->getParam("start", $current_time - (60*60*24));
$ends_epoch = $request->getParam("end", $current_time);
$instance = $request->getParam("instance_id", null);
$startsDT = DateTime::createFromFormat("U", $starts_epoch, new DateTimeZone("UTC"));
$endsDT = DateTime::createFromFormat("U", $ends_epoch, new DateTimeZone("UTC"));
$historyService = new Application_Service_HistoryService();
$r = $historyService->getPlayedItemData($startsDT, $endsDT, $params);
$r = $historyService->getPlayedItemData($startsDT, $endsDT, $params, $instance);
$this->view->sEcho = $r["sEcho"];
$this->view->iTotalDisplayRecords = $r["iTotalDisplayRecords"];

22
airtime_mvc/application/services/HistoryService.php
View File

@ -22,7 +22,7 @@ class Application_Service_HistoryService
}
//opts is from datatables.
public function getPlayedItemData($startDT, $endDT, $opts)
public function getPlayedItemData($startDT, $endDT, $opts, $instanceId=null)
{
$mainSqlQuery = "";
$paramMap = array();
@ -59,7 +59,7 @@ class Application_Service_HistoryService
}
$historyRange = "(".
"SELECT history.starts, history.ends, history.id AS history_id".
"SELECT history.starts, history.ends, history.id AS history_id, history.instance_id".
" FROM cc_playout_history as history".
" WHERE history.starts >= :starts and history.starts < :ends".
") AS history_range";
@ -71,7 +71,12 @@ class Application_Service_HistoryService
" ) AS %KEY%".
" ) AS %KEY%_filter";
$mainSelect = array("history_range.starts", "history_range.ends", "history_range.history_id");
$mainSelect = array(
"history_range.starts",
"history_range.ends",
"history_range.history_id",
"history_range.instance_id"
);
$mdFilters = array();
$numFileMdFields = count($fields_filemd);
@ -184,6 +189,17 @@ class Application_Service_HistoryService
throw new Exception("Error: $msg");
}
//-----------------------------------------------------------------------
//Using the instance_id to filter the data.
if (isset($instanceId)) {
$mainSqlQuery.=
" WHERE history_range.instance_id = :instance";
$paramMap["instance"] = $instanceId;
}
//------------------------------------------------------------------------
//Using Datatables parameters to sort the data.

4
airtime_mvc/application/views/scripts/playouthistory/index.phtml
View File

@ -18,9 +18,7 @@
</div>
<?php endif; ?>
<div id="his-tabs-3">
<ul id="history_show_summary">
<li>Show Summary</li>
</ul>
<div id="history_show_summary"></div>
</div>
</div>

90
airtime_mvc/public/js/airtime/playouthistory/historytable.js
View File

@ -153,6 +153,9 @@ var AIRTIME = (function(AIRTIME) {
if (fnServerData.hasOwnProperty("end")) {
aoData.push( { name: "end", value: fnServerData.end} );
}
if (fnServerData.hasOwnProperty("instance")) {
aoData.push( { name: "instance_id", value: fnServerData.instance} );
}
aoData.push( { name: "format", value: "json"} );
@ -165,6 +168,83 @@ var AIRTIME = (function(AIRTIME) {
} );
}
//config: name, type, filemd, required
function createShowAccordSection(config) {
var template,
$el;
/*
template =
"<li " +
"data-instance='<%= instance %>' " +
"data-starts='<%= starts %>' " +
"data-ends='<%= ends %>'" +
">" +
"<span><%= name %></span>" +
"<span><%= starts %></span>" +
"<span><%= ends %></span>" +
"</li>";
*/
template =
"<h3 " +
"data-instance='<%= instance %>' " +
"data-starts='<%= starts %>' " +
"data-ends='<%= ends %>'" +
">" +
"<a href='#'>" +
"<span><%= name %></span>" +
"<span><%= starts %></span>" +
"<span><%= ends %></span>" +
"</a>" +
"</h3>" +
"<div>First content panel</div>";
template = _.template(template);
$el = $(template(config));
return $el;
}
function drawShowList(oShows) {
var $showList = $historyContentDiv.find("#history_show_summary"),
i,
len,
$accordSection,
show;
$showList.empty();
for (i = 0, len = oShows.length; i < len; i++) {
show = oShows[i];
$accordSection = createShowAccordSection({
instance: show.instance_id,
name: show.name,
starts: show.starts,
ends: show.ends
});
$showList.append($accordSection);
}
$showList.accordion({
create: function( event, ui ) {
var $div = $showList.find(".ui-accordion-content-active");
},
change: function( event, ui ) {
var x;
},
changestart: function( event, ui ) {
var x;
}
});
}
function drawShowTable() {
}
function createToolbarButtons ($el) {
var $menu = $("<div class='btn-toolbar' />");
@ -234,9 +314,9 @@ var AIRTIME = (function(AIRTIME) {
return oTable;
}
function itemHistoryTable() {
function itemHistoryTable(id) {
var oTable,
$historyTableDiv = $historyContentDiv.find("#history_table_list"),
$historyTableDiv = $historyContentDiv.find("#"+id),
$toolbar,
columns,
fnRowCallback,
@ -317,8 +397,8 @@ var AIRTIME = (function(AIRTIME) {
end: oRange.end
};
$.post(url, data, function() {
var x;
$.post(url, data, function(json) {
drawShowList(json);
});
}
@ -334,7 +414,7 @@ var AIRTIME = (function(AIRTIME) {
{
initialized: false,
initialize: function() {
oTableItem = itemHistoryTable();
oTableItem = itemHistoryTable("history_table_list");
}
},
{