-started adding show list-view

.zfproject.xml

@@ -65,6 +65,8 @@
           <actionMethod actionName="findPlaylists"/>
           <actionMethod actionName="removeGroup"/>
           <actionMethod actionName="scheduleShowDialog"/>
+          <actionMethod actionName="showList"/>
+          <actionMethod actionName="getShowData"/>
         </controllerFile>
         <controllerFile controllerName="Api">
           <actionMethod actionName="index"/>
@@ -262,6 +264,12 @@
           <viewControllerScriptsDirectory forControllerName="Nowplaying">
             <viewScriptFile forActionName="livestream"/>
           </viewControllerScriptsDirectory>
+          <viewControllerScriptsDirectory forControllerName="Schedule">
+            <viewScriptFile forActionName="showList"/>
+          </viewControllerScriptsDirectory>
+          <viewControllerScriptsDirectory forControllerName="Schedule">
+            <viewScriptFile forActionName="getShowData"/>
+          </viewControllerScriptsDirectory>
         </viewScriptsDirectory>
         <viewHelpersDirectory/>
         <viewFiltersDirectory enabled="false"/>

application/controllers/NowplayingController.php

@@ -31,8 +31,6 @@ class NowplayingController extends Zend_Controller_Action
         //use bare bones layout (no header bar or menu)
         $this->_helper->layout->setLayout('bare');
     }
-
-
 }
 
 

application/controllers/ScheduleController.php

@@ -2,6 +2,7 @@
 
 class ScheduleController extends Zend_Controller_Action
 {
+
     protected $sched_sess = null;
 
     public function init()
@@ -24,6 +25,7 @@ class ScheduleController extends Zend_Controller_Action
                                     ->addActionContext('get-current-playlist', 'json')	
                 					->addActionContext('find-playlists', 'html')
                 					->addActionContext('remove-group', 'json')	
+                					->addActionContext('get-show-data', 'json')	
                                     ->initContext();
                 
                 		$this->sched_sess = new Zend_Session_Namespace("schedule");
@@ -300,5 +302,24 @@ class ScheduleController extends Zend_Controller_Action
                 		unset($this->view->playlists);
     }
 
+    public function showListAction()
+    {
+        $this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.min.js','text/javascript');
+        $this->view->headScript()->appendFile('/js/contextmenu/jjmenu.js','text/javascript');
+        $this->view->headScript()->appendFile('/js/playlist/showlistview.js','text/javascript');
+        $this->view->headLink()->appendStylesheet('/css/contextmenu.css');
+        $this->view->headLink()->appendStylesheet('/css/pro_dropdown_3.css');
+        $this->view->headLink()->appendStylesheet('/css/styles.css');           
+    }
+
+    public function getShowDataAction()
+    {
+		$this->view->data = Show::getShows("2011-01-27");
+    }
+
 
 }
+
+
+
+

application/layouts/scripts/layout.phtml

@@ -17,6 +17,6 @@
 
 <?php echo $this->navigation()->menu() ?>
  
-<div id="content"><?php echo $this->layout()->content ?></div>
+<div class="wrapper" id="content"><?php echo $this->layout()->content ?></div>
 </body>
 </html>

application/layouts/scripts/library.phtml

@@ -17,9 +17,9 @@
 
 <?php echo $this->navigation()->menu() ?>
 
-<div id="side_playlist" class="ui-widget ui-widget-content block-shadow alpha-block"><?php echo $this->layout()->spl ?></div>
-
-<div id="library_content" class="tabs ui-widget ui-widget-content block-shadow omega-block padded"><?php echo $this->layout()->library ?></div>
- 
+<div class="wrapper">
+	<div id="side_playlist" class="ui-widget ui-widget-content block-shadow alpha-block"><?php echo $this->layout()->spl ?></div>
+	<div id="library_content" class="tabs ui-widget ui-widget-content block-shadow omega-block padded"><?php echo $this->layout()->library ?></div>
+</div>
 </body>
 </html>

application/layouts/scripts/search.phtml

@@ -11,11 +11,11 @@
 <div id="nowplayingbar"><?= $this->partial('partialviews/header.phtml') ?></div>
 <div id="nav"><?php echo $this->navigation()->menu()->setRenderInvisible(true) ?></div>
  
+<div class="wrapper">
 <div id="search"><?php echo $this->layout()->search ?></div>
-
 <div id="library_content"><?php echo $this->layout()->library ?></div>
-
 <div id="side_playlist"><?php echo $this->layout()->spl ?></div>
+</div>
 
 </body>
 </html>

application/models/Shows.php

@@ -478,7 +478,8 @@ class Show {
 		}
 		if(!is_null($start) && is_null($end)) {
 			$sql_range = "(first_show <= '{$start}' AND last_show IS NULL) 
-					OR (first_show <= '{$start}' AND last_show > '{$start}')";
+					OR (first_show <= '{$start}' AND last_show > '{$start}')
+                    OR (first_show >= '{$start}')";
 
 			$sql = $sql_gen ." WHERE ". $sql_range;
 		}

application/views/scripts/schedule/get-show-data.phtml

@@ -0,0 +1,3 @@
+<?php
+    echo $this->data;
+?>

application/views/scripts/schedule/show-list.phtml

@@ -0,0 +1,2 @@
+<div id='json-string'></div>
+<div id='demo'></div>

install/airtime-install.php

@@ -228,10 +228,6 @@ $command = __DIR__."/../utils/airtime-import --copy ../audio_samples/ > /dev/nul
 
 $command = "python ".__DIR__."/../pypo/install/pypo-install.py";
 
-$output = array();
-@exec($command, $output, $results);
-foreach ($output as $value){
-    echo $value."\n";
-}
+system($command);
 echo "******************************* Install Complete *******************************\n";
 ?>

install/airtime-uninstall.php

@@ -225,10 +225,6 @@ airtime_uninstall_delete_files($CC_CONFIG['storageDir']);
 
 
 $command = "python ".__DIR__."/../pypo/install/pypo-uninstall.py";
-$output = array();
-@exec($command, $output, $results);
-foreach ($output as $value){
-    echo $value."\n";
-}
+system($command);
 echo "****************************** Uninstall Complete ******************************\n";
 ?>

public/js/playlist/playlist.js

@@ -111,10 +111,10 @@ function updateProgressBarValue(){
 
 function updatePlaybar(){
     /* Column 0 update */
-    $('#previous').text("Prev Song: N/A");
-    $('#prev-length').text("n/a,");
-    $('#current').text("Current Song: N/A");
-    $('#next').text("Next Song: N/A");
+    $('#previous').empty();
+    $('#prev-length').empty();
+    $('#current').text("Current:");
+    $('#next').empty();
     $('#next-length').empty();
     if (previousSongs.length > 0){
         $('#previous').text(getTrackInfo(previousSongs[previousSongs.length-1]));
@@ -133,8 +133,6 @@ function updatePlaybar(){
     $('#time-elapsed').empty();
     $('#time-remaining').empty();
     $('#song-length').empty();
-    $('#showposition').empty();
-    $('#showlength').empty();
     for (var i=0; i<currentSong.length; i++){
         $('#start').text(currentSong[i].starts.substring(currentSong[i].starts.indexOf(" ")+1));
         $('#end').text(currentSong[i].ends.substring(currentSong[i].starts.indexOf(" ")+1));
@@ -150,7 +148,7 @@ function updatePlaybar(){
     }
 
     /* Column 1 update */
-    $('#playlist').text("Current Show: N/A");
+    $('#playlist').text("Current Show:");
     for (var i=0; i<currentSong.length; i++){
         $('#playlist').text(currentSong[i].name);
     }

public/js/playlist/showlistview.js

@@ -0,0 +1,69 @@
+function createDataGrid(datagridData){
+
+    var columnHeaders = [
+        { "sTitle": "name" },
+        { "sTitle": "date" },
+        { "sTitle": "start time" },
+        { "sTitle": "end time" }
+    ];
+
+	$('#demo').html( '<table cellpadding="0" cellspacing="0" border="0" width="100%" id="nowplayingtable"></table>' );
+	$('#nowplayingtable').dataTable( {
+		"bSort" : false,
+		"bJQueryUI": true,
+		"bFilter": false,
+		"bInfo": false,
+		"bLengthChange": false,
+		"aaData": datagridData.rows,
+		"aoColumns": columnHeaders
+	} );
+    
+    
+      var options1 = [
+
+    	{title:"Menu Item 1 - Go TO www.google.com", action:{type:"gourl",url:"http://www.google.com/"}},
+    	{title:"Menu Item 2 - do <b style='color:red;'>nothing</b>"},
+    	{title:"Menu Item 3 - submenu", type:"sub", src:[{title:"Submenu 1"},{title:"Submenu 2"},{title:"Submenu 3"}, {title:"Submenu 4 - submenu", type:"sub", src:[{title:"SubSubmenu 1"},{title:"SubSubmenu 2"}]}]},
+    	{title:"Menu Item 4 - Js function", action:{type:"fn",callback:"(function(){ alert('THIS IS THE TEST'); })"}}
+      ];
+
+    
+    var userData = {};
+
+    var effects = { 
+    show:"default", //type of show effect
+    orientation: "auto", //type of menu orientation - to top, to bottom, auto (to bottom, if doesn't fit on screen - to top)
+    xposition:"mouse", // position of menu (left side or right side of trigger element) 
+    yposition:"mouse" 
+    }
+    
+    $('#demo').jjmenu('both', options1, userData, effects );
+}
+
+function initShowListView(){
+
+       
+	  $.ajax({ url: "/Schedule/get-show-data/format/json", dataType:"text", success:function(data){
+            $('#json-string').text(data);
+	  }});
+      
+      
+     
+     $.ajax({ url: "/Schedule/get-show-data/format/json", dataType:"json", success:function(data){
+            var temp = data.data;
+            var rows = new Array();
+            for (var i=0; i<temp.length; i++){
+                rows[i] = [temp[i].name.toString(), temp[i].first_show.toString(), temp[i].start_time.toString(), temp[i].end_time.toString()];
+                var datagridData = {rows:rows};
+                createDataGrid(datagridData);
+            }
+	  }});
+
+	  	
+        
+	  //setTimeout(initShowListView, 5000);
+}
+    
+$(document).ready(function() {
+	initShowListView();
+});