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

CC-4364: Show - > On Air button is greyed out although you can hear the playout 

-fixed
This commit is contained in:
Martin Konecny 2012-09-06 16:18:28 -04:00
parent 18ec23526f
commit fba5d56c76
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/models/Schedule.php
View File

@ -52,7 +52,8 @@ class Application_Model_Schedule
"currentShow"=>$shows['currentShow'], "currentShow"=>$shows['currentShow'],
"nextShow"=>$shows['nextShow'], "nextShow"=>$shows['nextShow'],
"timezone"=> date("T"), "timezone"=> date("T"),
"timezoneOffset"=> date("Z")); "timezoneOffset"=> date("Z")
);
return $range; return $range;
} }
@ -71,7 +72,6 @@ class Application_Model_Schedule
return; return;
} }
global $CC_CONFIG;
$con = Propel::getConnection(); $con = Propel::getConnection();
$sql = "SELECT %%columns%% st.starts as starts, st.ends as ends, $sql = "SELECT %%columns%% st.starts as starts, st.ends as ends,
st.media_item_played as media_item_played, si.ends as show_ends st.media_item_played as media_item_played, si.ends as show_ends

8
airtime_mvc/application/models/Show.php
View File

@ -1838,7 +1838,7 @@ SELECT si.starts AS start_timestamp,
ends ends
FROM cc_show_instances si FROM cc_show_instances si
LEFT JOIN cc_show s LEFT JOIN cc_show s
ON si.instance_id = s.id ON si.show_id = s.id
WHERE si.show_id = s.id WHERE si.show_id = s.id
AND si.starts <= :timeNow1::timestamp AND si.starts <= :timeNow1::timestamp
AND si.ends > :timeNow2::timestamp AND si.ends > :timeNow2::timestamp
@ -1881,7 +1881,7 @@ SELECT si.starts AS start_timestamp,
ends ends
FROM cc_show_instances si FROM cc_show_instances si
LEFT JOIN cc_show s LEFT JOIN cc_show s
ON si.instance_id = s.id ON si.show_id = s.id
WHERE si.show_id = s.id WHERE si.show_id = s.id
AND si.starts > :timeNow1::timestamp - INTERVAL '2 days' AND si.starts > :timeNow1::timestamp - INTERVAL '2 days'
AND si.ends < :timeNow2::timestamp + INTERVAL '2 days' AND si.ends < :timeNow2::timestamp + INTERVAL '2 days'
@ -1895,7 +1895,7 @@ SQL;
$stmt->bindValue(':timeNow2', $p_timeNow); $stmt->bindValue(':timeNow2', $p_timeNow);
if ($stmt->execute()) { if ($stmt->execute()) {
$rows = $stmt->fetchAll(PDO::FETCH_ASSOC); $rows = $stmt->fetchAll();
} else { } else {
$msg = implode(',', $stmt->errorInfo()); $msg = implode(',', $stmt->errorInfo());
throw new Exception("Error: $msg"); throw new Exception("Error: $msg");
@ -2020,7 +2020,7 @@ SELECT si.starts AS start_timestamp,
ends ends
FROM cc_show_instances si FROM cc_show_instances si
LEFT JOIN cc_show s LEFT JOIN cc_show s
ON si.instance_id = s.id ON si.show_id = s.id
WHERE si.show_id = s.id WHERE si.show_id = s.id
AND si.starts >= :timeStart::timestamp AND si.starts >= :timeStart::timestamp
AND si.starts < :timeEnd::timestamp AND si.starts < :timeEnd::timestamp