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

CC-3359: Now Playing -> Day view has a bug with supporting UTC time

Browse source 
-fixed
This commit is contained in:
Martin Konecny 2012-03-02 16:32:16 -05:00
parent 82812e15a5
commit df22ab21a6
3 changed files with 45 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -354,7 +354,7 @@ class Application_Model_Schedule {
}
public static function getScheduleItemsInRange($timeNow, $start, $end)
public static function getScheduleItemsInRange($starts, $ends)
{
global $CC_DBC, $CC_CONFIG;
@ -380,9 +380,9 @@ class Application_Model_Schedule {
." ON st.file_id = ft.id"
." LEFT JOIN ".$CC_CONFIG["showTable"]." s"
." ON si.show_id = s.id"
." WHERE ((si.starts < TIMESTAMP '$timeNow' - INTERVAL '$start seconds' AND si.ends > TIMESTAMP '$timeNow' - INTERVAL '$start seconds')"
." OR (si.starts > TIMESTAMP '$timeNow' - INTERVAL '$start seconds' AND si.ends < TIMESTAMP '$timeNow' + INTERVAL '$end seconds')"
." OR (si.starts < TIMESTAMP '$timeNow' + INTERVAL '$end seconds' AND si.ends > TIMESTAMP '$timeNow' + INTERVAL '$end seconds'))"
." WHERE ((si.starts < TIMESTAMP '$starts' AND si.ends > TIMESTAMP '$starts')"
." OR (si.starts > TIMESTAMP '$starts' AND si.ends < TIMESTAMP '$ends')"
." OR (si.starts < TIMESTAMP '$ends' AND si.ends > TIMESTAMP '$ends'))"
." AND (st.starts < si.ends)"
." ORDER BY si.id, si.starts, st.starts";
@ -670,4 +670,4 @@ class Application_Model_Schedule {
}
$p_view->addNewShow = true;
}
}
}