CC-3174 : showbuilder
removing old scheduling method code to avoid confusion.
This commit is contained in:
Naomi Aro
parent
2aae318a5a
commit
0ba3049528
9 changed files with 30 additions and 400 deletions
|
|
@ -15,12 +15,9 @@ class ScheduleController extends Zend_Controller_Action
|
|||
->addActionContext('move-show', 'json')
|
||||
->addActionContext('resize-show', 'json')
|
||||
->addActionContext('delete-show', 'json')
|
||||
->addActionContext('schedule-show', 'json')
|
||||
->addActionContext('schedule-show-dialog', 'json')
|
||||
->addActionContext('show-content-dialog', 'json')
|
||||
->addActionContext('clear-show', 'json')
|
||||
->addActionContext('get-current-playlist', 'json')
|
||||
->addActionContext('find-playlists', 'json')
|
||||
->addActionContext('remove-group', 'json')
|
||||
->addActionContext('edit-show', 'json')
|
||||
->addActionContext('add-show', 'json')
|
||||
|
|
@ -43,8 +40,6 @@ class ScheduleController extends Zend_Controller_Action
|
|||
$baseUrl = $request->getBaseUrl();
|
||||
|
||||
$this->view->headScript()->appendFile($baseUrl.'/js/contextmenu/jquery.contextMenu.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
|
||||
$this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
|
||||
$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
|
||||
|
||||
//full-calendar-functions.js requires this variable, so that datePicker widget can be offset to server time instead of client time
|
||||
$this->view->headScript()->appendScript("var timezoneOffset = ".date("Z")."; //in seconds");
|
||||
|
|
@ -264,37 +259,6 @@ class ScheduleController extends Zend_Controller_Action
|
|||
$this->view->items = $menu;
|
||||
}
|
||||
|
||||
public function scheduleShowAction()
|
||||
{
|
||||
$showInstanceId = $this->sched_sess->showInstanceId;
|
||||
$search = $this->_getParam('search', null);
|
||||
$plId = $this->_getParam('plId');
|
||||
|
||||
if($search == "") {
|
||||
$search = null;
|
||||
}
|
||||
|
||||
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
|
||||
$user = new Application_Model_User($userInfo->id);
|
||||
try{
|
||||
$show = new Application_Model_ShowInstance($showInstanceId);
|
||||
}catch(Exception $e){
|
||||
$this->view->show_error = true;
|
||||
return false;
|
||||
}
|
||||
|
||||
if($user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER, UTYPE_HOST),$show->getShowId())) {
|
||||
$show->scheduleShow(array($plId));
|
||||
}
|
||||
|
||||
$this->view->showContent = $show->getShowContent();
|
||||
$this->view->timeFilled = $show->getTimeScheduled();
|
||||
$this->view->percentFilled = $show->getPercentScheduled();
|
||||
|
||||
$this->view->chosen = $this->view->render('schedule/scheduled-content.phtml');
|
||||
unset($this->view->showContent);
|
||||
}
|
||||
|
||||
public function clearShowAction()
|
||||
{
|
||||
$showInstanceId = $this->_getParam('id');
|
||||
|
|
@ -336,27 +300,6 @@ class ScheduleController extends Zend_Controller_Action
|
|||
$this->view->entries = $range;
|
||||
}
|
||||
|
||||
public function findPlaylistsAction()
|
||||
{
|
||||
$post = $this->getRequest()->getPost();
|
||||
try{
|
||||
$show = new Application_Model_ShowInstance($this->sched_sess->showInstanceId);
|
||||
}catch(Exception $e){
|
||||
$this->view->show_error = true;
|
||||
return false;
|
||||
}
|
||||
|
||||
$playlists = $show->searchPlaylistsForShow($post);
|
||||
foreach( $playlists['aaData'] as &$data){
|
||||
// calling two functions to format time to 1 decimal place
|
||||
$sec = Application_Model_Playlist::playlistTimeToSeconds($data['length']);
|
||||
$data['length'] = Application_Model_Playlist::secondsToPlaylistTime($sec);
|
||||
}
|
||||
|
||||
//for datatables
|
||||
die(json_encode($playlists));
|
||||
}
|
||||
|
||||
public function removeGroupAction()
|
||||
{
|
||||
$showInstanceId = $this->sched_sess->showInstanceId;
|
||||
|
|
@ -383,44 +326,6 @@ class ScheduleController extends Zend_Controller_Action
|
|||
unset($this->view->showContent);
|
||||
}
|
||||
|
||||
public function scheduleShowDialogAction()
|
||||
{
|
||||
$showInstanceId = $this->_getParam('id');
|
||||
$this->sched_sess->showInstanceId = $showInstanceId;
|
||||
|
||||
try{
|
||||
$show = new Application_Model_ShowInstance($showInstanceId);
|
||||
}catch(Exception $e){
|
||||
$this->view->show_error = true;
|
||||
return false;
|
||||
}
|
||||
|
||||
$start_timestamp = $show->getShowInstanceStart();
|
||||
$end_timestamp = $show->getShowInstanceEnd();
|
||||
|
||||
$dateInfo_s = getDate(strtotime(Application_Model_DateHelper::ConvertToLocalDateTimeString($start_timestamp)));
|
||||
$dateInfo_e = getDate(strtotime(Application_Model_DateHelper::ConvertToLocalDateTimeString($end_timestamp)));
|
||||
|
||||
$this->view->showContent = $show->getShowContent();
|
||||
$this->view->timeFilled = $show->getTimeScheduled();
|
||||
$this->view->showName = $show->getName();
|
||||
$this->view->showLength = $show->getShowLength();
|
||||
$this->view->percentFilled = $show->getPercentScheduled();
|
||||
|
||||
$this->view->s_wday = $dateInfo_s['weekday'];
|
||||
$this->view->s_month = $dateInfo_s['month'];
|
||||
$this->view->s_day = $dateInfo_s['mday'];
|
||||
$this->view->e_wday = $dateInfo_e['weekday'];
|
||||
$this->view->e_month = $dateInfo_e['month'];
|
||||
$this->view->e_day = $dateInfo_e['mday'];
|
||||
$this->view->startTime = sprintf("%02d:%02d", $dateInfo_s['hours'], $dateInfo_s['minutes']);
|
||||
$this->view->endTime = sprintf("%02d:%02d", $dateInfo_e['hours'], $dateInfo_e['minutes']);
|
||||
|
||||
$this->view->chosen = $this->view->render('schedule/scheduled-content.phtml');
|
||||
$this->view->dialog = $this->view->render('schedule/schedule-show-dialog.phtml');
|
||||
unset($this->view->showContent);
|
||||
}
|
||||
|
||||
public function showContentDialogAction()
|
||||
{
|
||||
$showInstanceId = $this->_getParam('id');
|
||||
|
|
|
|||
|
|
@ -582,7 +582,8 @@ class Application_Model_StoredFile {
|
|||
public static function searchFilesForPlaylistBuilder($datatables) {
|
||||
global $CC_CONFIG;
|
||||
|
||||
$displayData = array("track_title", "artist_name", "album_title", "genre", "length", "year", "utime", "mtime", "ftype", "track_number");
|
||||
$displayData = array("track_title", "artist_name", "album_title", "genre", "length",
|
||||
"year", "utime", "mtime", "ftype", "track_number");
|
||||
|
||||
$plSelect = "SELECT ";
|
||||
$fileSelect = "SELECT ";
|
||||
|
|
@ -656,15 +657,6 @@ class Application_Model_StoredFile {
|
|||
return $results;
|
||||
}
|
||||
|
||||
public static function searchPlaylistsForSchedule($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 Application_Model_StoredFile::searchFiles($fromTable, $datatables);
|
||||
}
|
||||
|
||||
public static function searchFiles($fromTable, $data)
|
||||
{
|
||||
global $CC_CONFIG, $CC_DBC;
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
<li id="sp_<?php echo $this->id ?>" class="ui-widget-content">
|
||||
<span><?php echo $this->name ?></span>
|
||||
<span><?php echo $this->length ?></span>
|
||||
<div>
|
||||
<span>Creator: <?php echo $this->creator ?></span>
|
||||
<?php if($this->state === "edited") : ?>
|
||||
<span>Editing: <?php echo $this->login ?></span>
|
||||
<?php endif ?>
|
||||
</div>
|
||||
<div><?php echo $this->description ?></div>
|
||||
</li>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<?php
|
||||
if(count($this->playlists) > 0) {
|
||||
echo $this->partialLoop('schedule/find-playlists-partial.phtml', $this->playlists);
|
||||
}
|
||||
else {
|
||||
echo "No Playlists Fit Duration";
|
||||
}
|
||||
?>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<?php
|
||||
if(count($this->playlists) > 0) {
|
||||
echo $this->partialLoop('schedule/find-playlists-partial.phtml', $this->playlists);
|
||||
}
|
||||
else {
|
||||
echo "No Playlists Fit Duration";
|
||||
}
|
||||
?>
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
<div id="schedule_playlist_dialog">
|
||||
<h2 id="scheduled_playlist_name">
|
||||
<?php echo $this->showName; ?>: <span><?php echo $this->s_wday." ".$this->s_month." ".$this->s_day." ".$this->startTime.
|
||||
" - ".$this->e_wday." ".$this->e_month." ".$this->e_day." ".$this->endTime; ?></span>
|
||||
</h2>
|
||||
<div class="clearfix">
|
||||
<div class="wrapp-one">
|
||||
<table id="schedule_playlists" cellpadding="0" cellspacing="0" class="datatable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Id</th>
|
||||
<th>Description</th>
|
||||
<th>Title</th>
|
||||
<th>Creator</th>
|
||||
<th>Length</th>
|
||||
<th>Editing</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody></tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="wrapp-two">
|
||||
<div><h4>Items In This Show:</h4></div>
|
||||
<ul id="schedule_playlist_chosen"></ul>
|
||||
<div id="show_time_info">
|
||||
<span id="show_time_filled" class="time"><?php echo $this->timeFilled; ?></span>
|
||||
<div id="show_progressbar"></div>
|
||||
<span id="show_length" class="time"><?php echo $this->showLength; ?></span>
|
||||
</div>
|
||||
<div id="show_time_warning" style="display:none"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
<?php if(count($this->showContent) > 0) : ?>
|
||||
<?php foreach($this->showContent as $pl) : ?>
|
||||
<li id="g_<?php echo $pl["pl_group"] ?>" >
|
||||
<h3 class="ui-accordion-header ui-state-default ui-corner-all">
|
||||
<span class="ui-icon ui-icon-triangle-1-e"></span>
|
||||
<span class="ui-icon ui-icon-close"></span>
|
||||
<div class="sh_pl_name"><?php echo $pl["pl_name"] ?></div>
|
||||
<div class="sh_pl_creator"><?php echo $pl["pl_creator"] ?></div>
|
||||
<div class="sh_pl_time"><?php echo $pl["pl_length"] ?></div>
|
||||
</h3>
|
||||
<div class="group_list ui-widget-content ui-corner-bottom" style="display:none">
|
||||
<div class="sched_description"><?php echo $pl["pl_description"] ?></div>
|
||||
<?php foreach($pl["pl_content"] as $file) : ?>
|
||||
<div>
|
||||
<span class="sh_file_name"><?php echo $file["f_name"] ?></span>
|
||||
<span><?php echo $file["f_length"] ?></span>
|
||||
</div>
|
||||
<div class="sh_file_artist"><?php echo $file["f_artist"] ?></div>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
</li>
|
||||
<?php endforeach; ?>
|
||||
<?php else : ?>
|
||||
<li>Nothing Scheduled</li>
|
||||
<?php endif; ?>
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue