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

CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source 

-fixed
This commit is contained in:
denise 2012-04-16 15:51:05 -04:00
parent a7fb8ea3f2
commit 479e112317
2 changed files with 11 additions and 2 deletions
airtime_mvc
application/controllers
ScheduleController.php
public/js/airtime/dashboard
playlist.js

2
airtime_mvc/application/controllers/ScheduleController.php
View File

@ -333,6 +333,7 @@ class ScheduleController extends Zend_Controller_Action
public function getCurrentPlaylistAction() public function getCurrentPlaylistAction()
{ {
$range = Application_Model_Schedule::GetPlayOrderRange(); $range = Application_Model_Schedule::GetPlayOrderRange();
$show = Application_Model_Show::GetCurrentShow();
/* Convert all UTC times to localtime before sending back to user. */ /* Convert all UTC times to localtime before sending back to user. */
if (isset($range["previous"])){ if (isset($range["previous"])){
@ -371,6 +372,7 @@ class ScheduleController extends Zend_Controller_Action
$this->view->switch_status = $switch_status; $this->view->switch_status = $switch_status;
$this->view->entries = $range; $this->view->entries = $range;
$this->view->show_name = $show[0]["name"];
} }
public function removeGroupAction() public function removeGroupAction()

9
airtime_mvc/public/js/airtime/dashboard/playlist.js
View File

@ -8,6 +8,8 @@ var nextSong = null;
var currentShow = new Array(); var currentShow = new Array();
var nextShow = new Array(); var nextShow = new Array();
var showName = null;
var currentElem; var currentElem;
var serverUpdateInterval = 5000; var serverUpdateInterval = 5000;
@ -149,9 +151,13 @@ function updatePlaybar(){
$('#current').text(currentSong.name+","); $('#current').text(currentSong.name+",");
}else{ }else{
if (master_dj_on_air) { if (master_dj_on_air) {
if (showName) {
$('#current').html("Current: <span style='color:red; font-weight:bold'>"+showName+" - Master Stream</span>");
} else {
$('#current').html("Current: <span style='color:red; font-weight:bold'>Master Stream</span>"); $('#current').html("Current: <span style='color:red; font-weight:bold'>Master Stream</span>");
}
} else if (live_dj_on_air) { } else if (live_dj_on_air) {
$('#current').html("Current: <span style='color:red; font-weight:bold'>"+currentShow.name+"</span>"); $('#current').html("Current: <span style='color:red; font-weight:bold'>"+showName+" - Live Stream</span>");
} else { } else {
$('#current').html("Current: <span style='color:red; font-weight:bold'>Nothing Scheduled</span>"); $('#current').html("Current: <span style='color:red; font-weight:bold'>Nothing Scheduled</span>");
} }
@ -352,6 +358,7 @@ function getScheduleFromServer(){
parseItems(data.entries); parseItems(data.entries);
parseSourceStatus(data.source_status); parseSourceStatus(data.source_status);
parseSwitchStatus(data.switch_status); parseSwitchStatus(data.switch_status);
showName = data.show_name;
}, error:function(jqXHR, textStatus, errorThrown){}}); }, error:function(jqXHR, textStatus, errorThrown){}});
setTimeout(getScheduleFromServer, serverUpdateInterval); setTimeout(getScheduleFromServer, serverUpdateInterval);
} }