Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

so no playlists show up on left side when a show is overbooked.

This commit is contained in:
Naomi 2011-03-07 12:59:46 -05:00
parent 76b1e3b7f7
commit 1e94578f13
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/models/Shows.php
View File

@ -670,9 +670,9 @@ class ShowInstance {
public function searchPlaylistsForShow($datatables){ public function searchPlaylistsForShow($datatables){
//$length = $this->getTimeUnScheduled(); $time_remaining = $this->getTimeUnScheduled();
//return StoredFile::searchPlaylistsForSchedule($length, $datatables);
return StoredFile::searchPlaylistsForSchedule($datatables); return StoredFile::searchPlaylistsForSchedule($time_remaining, $datatables);
} }
public function getShowListContent() { public function getShowListContent() {

3
application/models/StoredFile.php
View File

@ -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"; $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'"; $datatables["optWhere"][] = "plt.length > INTERVAL '00:00:00'";
return StoredFile::searchFiles($fromTable, $datatables); return StoredFile::searchFiles($fromTable, $datatables);