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

CC-3532: Now Playing GUI-> Progress bar is still playing after end of show

Browse source 
-fixed
This commit is contained in:
Martin Konecny 2012-04-03 18:29:36 -04:00
parent edcce7432d
commit 366ea78fce
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -308,7 +308,6 @@ class ScheduleController extends Zend_Controller_Action
public function getCurrentPlaylistAction() public function getCurrentPlaylistAction()
{ {
$range = Application_Model_Schedule::GetPlayOrderRange(); $range = Application_Model_Schedule::GetPlayOrderRange();
/* Convert all UTC times to localtime before sending back to user. */ /* Convert all UTC times to localtime before sending back to user. */
@ -348,7 +347,6 @@ 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;
} }
public function removeGroupAction() public function removeGroupAction()

15
airtime_mvc/application/models/Schedule.php
View file

@ -71,8 +71,15 @@ class Application_Model_Schedule {
return; return;
global $CC_CONFIG, $CC_DBC; global $CC_CONFIG, $CC_DBC;
$sql = 'Select ft.artist_name, ft.track_title, st.starts as starts, st.ends as ends, st.media_item_played as media_item_played $sql = 'Select ft.artist_name,
FROM cc_schedule st LEFT JOIN cc_files ft ON st.file_id = ft.id ft.track_title,
st.starts as starts,
st.ends as ends,
st.media_item_played as media_item_played,
si.ends as show_ends
FROM cc_schedule st
LEFT JOIN cc_files ft ON st.file_id = ft.id
LEFT JOIN cc_show_instances si on st.instance_id = si.id
WHERE '; WHERE ';
if (isset($p_previousShowID)){ if (isset($p_previousShowID)){
@ -115,10 +122,10 @@ class Application_Model_Schedule {
} }
$results['current'] = array("name"=>$rows[$i]["artist_name"]." - ".$rows[$i]["track_title"], $results['current'] = array("name"=>$rows[$i]["artist_name"]." - ".$rows[$i]["track_title"],
"starts"=>$rows[$i]["starts"], "starts"=>$rows[$i]["starts"],
"ends"=>$rows[$i]["ends"], "ends"=> (($rows[$i]["ends"] > $rows[$i]["show_ends"]) ? $rows[$i]["show_ends"]: $rows[$i]["ends"]),
"media_item_played"=>$rows[$i]["media_item_played"], "media_item_played"=>$rows[$i]["media_item_played"],
"record"=>0); "record"=>0);
if ( isset($rows[$i+1])){ if ( isset($rows[$i+1])){
$results['next'] = array("name"=>$rows[$i+1]["artist_name"]." - ".$rows[$i+1]["track_title"], $results['next'] = array("name"=>$rows[$i+1]["artist_name"]." - ".$rows[$i+1]["track_title"],
"starts"=>$rows[$i+1]["starts"], "starts"=>$rows[$i+1]["starts"],