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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Naomi Aro 2012-05-17 17:53:23 +02:00
commit fd0d82a873
3 changed files with 3 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

16
airtime_mvc/public/js/airtime/dashboard/dashboard.js
View file

@ -48,20 +48,12 @@ function secondsTimer(){
function newSongStart(){
nextSongPrepare = true;
currentSong = nextSong;
nextSong = null;
if (typeof notifySongStart == "function")
notifySongStart();
nextSong = null;
}
function nextShowStart(){
nextShowPrepare = true;
currentShow[0] = nextShow.shift();
//call function in nowplayingdatagrid.js
if (typeof notifyShowStart == "function")
notifyShowStart(currentShow[0]);
}
/* Called every "uiUpdateInterval" mseconds. */
@ -78,18 +70,16 @@ function updateProgressBarValue(){
$('#progress-show').attr("style", "width:"+showPercentDone+"%");
var songPercentDone = 0;
var songElapsedTime = 0;
var scheduled_play_div = $("#scheduled_play_div");
var scheduled_play_line_to_switch = scheduled_play_div.parent().find(".line-to-switch");
if (currentSong !== null){
if (currentSong !== null){
songPercentDone = (estimatedSchedulePosixTime - currentSong.songStartPosixTime)/currentSong.songLengthMs*100;
songElapsedTime = estimatedSchedulePosixTime - currentSong.songStartPosixTime;
if (songPercentDone < 0 || songPercentDone > 100){
songPercentDone = 0;
currentSong = null;
} else {
if ( (currentSong.media_item_played == true && currentShow.length > 0) || songElapsedTime < 5000 ){
if (currentSong.media_item_played == true && currentShow.length > 0) {
scheduled_play_line_to_switch.attr("class", "line-to-switch on");
scheduled_play_div.addClass("ready");
scheduled_play_source = true;

213
airtime_mvc/public/js/airtime/nowplaying/nowplayingdatagrid.js
View file

@ -1,213 +0,0 @@
var datagridData = null;
var currentShowInstanceID = -1;
function getDateText(obj){
var str = obj.aData[ obj.iDataColumn ].toString();
datetime = str.split(" ");
if (datetime.length == 2)
return datetime[0];
return str;
}
function getTimeText(obj){
var str = obj.aData[ obj.iDataColumn ].toString();
datetime = str.split(" ");
if (datetime.length == 2)
return changeTimePrecision(datetime[1]);
return str;
}
function changeTimePrecisionInit(obj){
var str = obj.aData[ obj.iDataColumn ].toString();
return changeTimePrecision(str);
}
function changeTimePrecision(str){
var temp = str.split(".")
if (temp.length == 2){
if (temp[1].length > 2)
return temp[0]+"."+temp[1].substr(0, 2);
}
return str;
}
function notifySongStart(){
for (var i=0; i<datagridData.rows.length; i++){
if (datagridData.rows[i][0] == "c")
datagridData.rows[i][0] = "p";
if (datagridData.rows[i][0] == "n"){
datagridData.rows[i][0] = "c";
break;
}
}
updateDataTable();
}
function notifyShowStart(show){
currentShowInstanceID = show.instance_id;
updateDataTable();
}
function statusColumn(obj) {
var sReturn = obj.aData[ obj.iDataColumn ];
if ( sReturn == "x" ) {
sReturn = '<img class="info-icon" src="/css/images/icon_overlap.png" width="51" height="15" alt="" />';
}
return sReturn;
}
var columns = [{"sTitle": "type", "bVisible":false},
{"sTitle":"Date"},
{"sTitle":"Start"},
{"sTitle":"End"},
{"sTitle":"Duration"},
{"sTitle":"Title"},
{"sTitle":"Creator"},
{"sTitle":"Album"},
{"sTitle":"Playlist"},
{"sTitle":"Show"},
{"sTitle":"Status", "fnRender":statusColumn}];
function getDateString(){
var date0 = $("#datepicker").datepicker("getDate");
return (date0.getFullYear() + "-" + (parseInt(date0.getMonth())+1) + "-" + date0.getDate());
}
function getAjaxUrl(){
var url = "/Nowplaying/get-data-grid-data/format/json/view/"+viewType;
if (viewType == "day"){
url += "/date/" + getDateString();
}
return url;
}
function updateDataTable(){
var table = $('#nowplayingtable').dataTable();
//Check if datagridData has been initialized since this update
//function can be called before ajax call has been returned.
if (datagridData != null){
table.fnClearTable(false);
table.fnAddData(datagridData.rows, false);
table.fnDraw(true);
}
}
function getData(){
$.ajax({ url: getAjaxUrl(), dataType:"json", success:function(data){
datagridData = data.entries;
if (datagridData.currentShow.length > 0)
currentShowInstanceID = datagridData.currentShow[0].instance_id;
updateDataTable();
}});
}
function init2(){
getData();
setTimeout(init2, 5000);
}
function redirect(url){
document.location.href = url;
}
function createDataGrid(){
columns[1]["fnRender"] = getDateText;
columns[2]["fnRender"] = getTimeText;
columns[3]["fnRender"] = getTimeText;
columns[4]["fnRender"] = changeTimePrecisionInit;
$('#nowplayingtable').dataTable( {
"bSort" : false,
"bJQueryUI": true,
"bFilter": false,
"bInfo": false,
"bLengthChange": false,
"bPaginate": false,
"aoColumns": columns,
"fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
//if (aData[aData.length-2] == currentShowInstanceID)
// $(nRow).addClass("playing-list");
if (aData[0].indexOf("c") != -1)
$(nRow).attr("class", "playing-song");
return nRow;
},
"fnDrawCallback": function(oSettings){
//check if there are any rows to display
if (oSettings.aiDisplay.length == 0)
return;
var nTrs = $('#nowplayingtable tbody tr');
var iColspan = nTrs[0].getElementsByTagName('td').length;
for (var i=0; i<nTrs.length; i++){
var iDisplayIndex = oSettings._iDisplayStart + i;
var sType = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[0];
if ( sType.indexOf("h") != -1 ){
//show header row found
var showName = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[4];
var startTime = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[2];
var endTime = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[3];
var nGroup = document.createElement('tr');
var nCell = document.createElement('td');
nCell.colSpan = iColspan;
nCell.className = "group";
nCell.innerHTML = showName + ": " + startTime + " - " + endTime;
nGroup.appendChild(nCell);
nTrs[i].parentNode.replaceChild(nGroup, nTrs[i]);
} else if ( sType.indexOf("g") != -1 ){
//gap row found
var gapTime = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[4];
var nGroup = document.createElement('tr');
var nCell = document.createElement('td');
nCell.colSpan = iColspan;
nCell.className = "gap";
nCell.innerHTML = "Gap until show end: " + gapTime;
nGroup.appendChild(nCell);
nTrs[i].parentNode.replaceChild(nGroup, nTrs[i]);
} else if ( sType.indexOf("r") != -1 ){
//gap row found
var showName = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[4];
var nGroup = document.createElement('tr');
var nCell = document.createElement('td');
nCell.colSpan = iColspan;
nCell.className = "record";
nCell.innerHTML = "Recording show \"" + showName + "\"";
nGroup.appendChild(nCell);
nTrs[i].parentNode.replaceChild(nGroup, nTrs[i]);
}
}
},
"bAutoWidth":false
} );
}
$(document).ready(function() {
createDataGrid();
if (viewType == "day"){
$('#now_view').click(function(){redirect('/Nowplaying/index')});
$("#datepicker").datepicker({
onSelect: function(dateText, inst)
{ getData();}});
$("#datepicker").datepicker("setDate", adjustDateToServerDate(new Date(), timezoneOffset));
} else {
$('#day_view').click(function(){redirect('/Nowplaying/day-view')});
}
init2();
});