cc-2167: now playing view with recording shows a gap
-implemented
This commit is contained in:
parent
1337efcdcd
commit
9638f6dd3e
|
@ -1,27 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
class DashboardController extends Zend_Controller_Action
|
|
||||||
{
|
|
||||||
|
|
||||||
public function init()
|
|
||||||
{
|
|
||||||
/* Initialize action controller here */
|
|
||||||
}
|
|
||||||
|
|
||||||
public function indexAction()
|
|
||||||
{
|
|
||||||
// action body
|
|
||||||
}
|
|
||||||
|
|
||||||
public function helpAction()
|
|
||||||
{
|
|
||||||
// action body
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,10 @@ class Application_Model_Nowplaying
|
||||||
public static function CreateGapRow($p_gapTime){
|
public static function CreateGapRow($p_gapTime){
|
||||||
return array("g", $p_gapTime, "", "", "", "", "", "", "", "", "");
|
return array("g", $p_gapTime, "", "", "", "", "", "", "", "", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function CreateRecordingRow($p_showInstance){
|
||||||
|
return array("r", $p_showInstance->getName(), "", "", "", "", "", "", "", "", "");
|
||||||
|
}
|
||||||
|
|
||||||
public static function GetDataGridData($viewType, $dateString){
|
public static function GetDataGridData($viewType, $dateString){
|
||||||
|
|
||||||
|
@ -73,7 +77,9 @@ class Application_Model_Nowplaying
|
||||||
|
|
||||||
//append show gap time row
|
//append show gap time row
|
||||||
$gapTime = $si->getShowEndGapTime();
|
$gapTime = $si->getShowEndGapTime();
|
||||||
if ($gapTime > 0)
|
if ($si->isRecorded())
|
||||||
|
$data[] = Application_Model_Nowplaying::CreateRecordingRow($si);
|
||||||
|
else if ($gapTime > 0)
|
||||||
$data[] = Application_Model_Nowplaying::CreateGapRow($gapTime);
|
$data[] = Application_Model_Nowplaying::CreateGapRow($gapTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -424,16 +424,6 @@ class Schedule {
|
||||||
." ON si.show_id = show.id"
|
." ON si.show_id = show.id"
|
||||||
." WHERE st.starts < si.ends";
|
." WHERE st.starts < si.ends";
|
||||||
|
|
||||||
/*
|
|
||||||
$sql = "SELECT DISTINCT pt.name, ft.track_title, ft.artist_name, ft.album_title, st.starts, st.ends, st.clip_length, st.media_item_played, st.group_id, show.name as show_name, st.instance_id"
|
|
||||||
." FROM $CC_CONFIG[scheduleTable] st, $CC_CONFIG[filesTable] ft, $CC_CONFIG[playListTable] pt, $CC_CONFIG[showInstances] si, $CC_CONFIG[showTable] show"
|
|
||||||
." WHERE st.playlist_id = pt.id"
|
|
||||||
." AND st.file_id = ft.id"
|
|
||||||
." AND st.instance_id = si.id"
|
|
||||||
." AND si.show_id = show.id"
|
|
||||||
." AND st.starts < si.ends";
|
|
||||||
*/
|
|
||||||
|
|
||||||
if ($timePeriod < 0){
|
if ($timePeriod < 0){
|
||||||
$sql .= " AND st.ends < TIMESTAMP '$timeStamp'"
|
$sql .= " AND st.ends < TIMESTAMP '$timeStamp'"
|
||||||
." AND st.ends > (TIMESTAMP '$timeStamp' - INTERVAL '$interval')"
|
." AND st.ends > (TIMESTAMP '$timeStamp' - INTERVAL '$interval')"
|
||||||
|
|
|
@ -178,6 +178,18 @@ function createDataGrid(){
|
||||||
nCell.innerHTML = "Gap until show end: " + gapTime + " seconds";
|
nCell.innerHTML = "Gap until show end: " + gapTime + " seconds";
|
||||||
nGroup.appendChild(nCell);
|
nGroup.appendChild(nCell);
|
||||||
nTrs[i].parentNode.replaceChild(nGroup, nTrs[i]);
|
nTrs[i].parentNode.replaceChild(nGroup, nTrs[i]);
|
||||||
|
} else if ( sType.indexOf("r") != -1 ){
|
||||||
|
//gap row found
|
||||||
|
|
||||||
|
var showName = oSettings.aoData[ oSettings.aiDisplay[iDisplayIndex]]._aData[1];
|
||||||
|
|
||||||
|
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]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -139,7 +139,11 @@ function updatePlaybar(){
|
||||||
}
|
}
|
||||||
if (currentSong.length > 0){
|
if (currentSong.length > 0){
|
||||||
$('#current').text(getTrackInfo(currentSong[0]));
|
$('#current').text(getTrackInfo(currentSong[0]));
|
||||||
}
|
} else if (currentShow.length > 0){
|
||||||
|
if (currentShow[0].record == "1"){
|
||||||
|
$('#current').html("Current: <span style='color:red; font-weight:bold'>Recording</span>");
|
||||||
|
}
|
||||||
|
}
|
||||||
if (nextSongs.length > 0){
|
if (nextSongs.length > 0){
|
||||||
$('#next').text(getTrackInfo(nextSongs[0]));
|
$('#next').text(getTrackInfo(nextSongs[0]));
|
||||||
$('#next-length').text(convertToHHMMSSmm(nextSongs[0].songLengthMs));
|
$('#next-length').text(convertToHHMMSSmm(nextSongs[0].songLengthMs));
|
||||||
|
|
Loading…
Reference in New Issue