From 1e94578f132c9bd8e7993abedc3df679879ec05e Mon Sep 17 00:00:00 2001 From: Naomi <naomi@naomi-DX4840.(none)> Date: Mon, 7 Mar 2011 12:59:46 -0500 Subject: [PATCH] so no playlists show up on left side when a show is overbooked. --- application/models/Shows.php | 6 +++--- application/models/StoredFile.php | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/application/models/Shows.php b/application/models/Shows.php index 8684fd597..8a3f6ac84 100644 --- a/application/models/Shows.php +++ b/application/models/Shows.php @@ -670,9 +670,9 @@ class ShowInstance { public function searchPlaylistsForShow($datatables){ - //$length = $this->getTimeUnScheduled(); - //return StoredFile::searchPlaylistsForSchedule($length, $datatables); - return StoredFile::searchPlaylistsForSchedule($datatables); + $time_remaining = $this->getTimeUnScheduled(); + + return StoredFile::searchPlaylistsForSchedule($time_remaining, $datatables); } public function getShowListContent() { diff --git a/application/models/StoredFile.php b/application/models/StoredFile.php index 73a2bcf64..32d1ab0dc 100644 --- a/application/models/StoredFile.php +++ b/application/models/StoredFile.php @@ -1558,9 +1558,10 @@ class StoredFile { } - public static function searchPlaylistsForSchedule($datatables) + public static function searchPlaylistsForSchedule($time_remaining, $datatables) { $fromTable = "cc_playlist AS pl LEFT JOIN cc_playlisttimes AS plt USING(id) LEFT JOIN cc_subjs AS sub ON pl.editedby = sub.id"; + $datatables["optWhere"][] = "INTERVAL '{$time_remaining}' > INTERVAL '00:00:00'"; $datatables["optWhere"][] = "plt.length > INTERVAL '00:00:00'"; return StoredFile::searchFiles($fromTable, $datatables);