so no playlists show up on left side when a show is overbooked.
This commit is contained in:
parent
76b1e3b7f7
commit
1e94578f13
|
@ -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() {
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue