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

CC-3888: Record Show: ON AIR light and scheduled Play will ON for several seconds when a record show starts

Browse source 
-fixed
This commit is contained in:
denise 2012-05-25 17:25:46 -04:00
parent b6446442ba
commit 3566480999
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/models/Show.php
View file

@ -1782,6 +1782,7 @@ class Application_Model_Show {
"end_timestamp"=>$rows[$i-1]['end_timestamp'], "end_timestamp"=>$rows[$i-1]['end_timestamp'],
"starts"=>$rows[$i-1]['starts'], "starts"=>$rows[$i-1]['starts'],
"ends"=>$rows[$i-1]['ends'], "ends"=>$rows[$i-1]['ends'],
"record"=>$rows[$i-1]['record'],
"type"=>"show"); "type"=>"show");
} }
@ -1797,6 +1798,7 @@ class Application_Model_Show {
"end_timestamp"=>$rows[$i+1]['end_timestamp'], "end_timestamp"=>$rows[$i+1]['end_timestamp'],
"starts"=>$rows[$i+1]['starts'], "starts"=>$rows[$i+1]['starts'],
"ends"=>$rows[$i+1]['ends'], "ends"=>$rows[$i+1]['ends'],
"record"=>$rows[$i+1]['record'],
"type"=>"show"); "type"=>"show");
} }
@ -1817,6 +1819,7 @@ class Application_Model_Show {
"end_timestamp"=>$rows[$i]['end_timestamp'], "end_timestamp"=>$rows[$i]['end_timestamp'],
"starts"=>$rows[$i]['starts'], "starts"=>$rows[$i]['starts'],
"ends"=>$rows[$i]['ends'], "ends"=>$rows[$i]['ends'],
"record"=>$rows[$i]['record'],
"type"=>"show"); "type"=>"show");
break; break;
} }
@ -1832,6 +1835,7 @@ class Application_Model_Show {
"end_timestamp"=>$rows[$previousShowIndex]['end_timestamp'], "end_timestamp"=>$rows[$previousShowIndex]['end_timestamp'],
"starts"=>$rows[$previousShowIndex]['starts'], "starts"=>$rows[$previousShowIndex]['starts'],
"ends"=>$rows[$previousShowIndex]['ends'], "ends"=>$rows[$previousShowIndex]['ends'],
"record"=>$rows[$previousShowIndex]['record'],
"type"=>"show"); "type"=>"show");
} }

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

@ -83,7 +83,7 @@ function updateProgressBarValue(){
songPercentDone = 0; songPercentDone = 0;
currentSong = null; currentSong = null;
} else { } else {
if ((currentSong.media_item_played == true && currentShow.length > 0) || songElapsedTime < 5000) { if ((currentSong.media_item_played == true && currentShow.length > 0) || (songElapsedTime < 5000 && currentShow[0].record != 1)) {
scheduled_play_line_to_switch.attr("class", "line-to-switch on"); scheduled_play_line_to_switch.attr("class", "line-to-switch on");
scheduled_play_div.addClass("ready"); scheduled_play_div.addClass("ready");
scheduled_play_source = true; scheduled_play_source = true;