From 9c52b2ee1f4b8788e45bde2903a129610d4ee3a4 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Tue, 27 Mar 2012 16:27:43 +0200
Subject: [PATCH] CC-3174 : showbuilder

fixing jplayer preview
---
 .../controllers/AudiopreviewController.php    | 19 ++++++++++---------
 .../application/models/ShowBuilder.php        |  7 ++++++-
 .../application/models/ShowInstance.php       |  3 ++-
 .../public/js/airtime/showbuilder/builder.js  |  2 +-
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/airtime_mvc/application/controllers/AudiopreviewController.php b/airtime_mvc/application/controllers/AudiopreviewController.php
index 93a41b04d..9ebd1be42 100644
--- a/airtime_mvc/application/controllers/AudiopreviewController.php
+++ b/airtime_mvc/application/controllers/AudiopreviewController.php
@@ -135,7 +135,7 @@ class AudiopreviewController extends Zend_Controller_Action
         $this->_helper->layout->setLayout('audioPlayer');
 
         $logo = Application_Model_Preference::GetStationLogo();
-        if($logo){
+        if ($logo){
             $this->view->logo = "data:image/png;base64,$logo";
         } else {
             $this->view->logo = "$baseUrl/css/images/airtime_logo_jp.png";
@@ -163,16 +163,17 @@ class AudiopreviewController extends Zend_Controller_Action
         }
         
         $showInstance = new Application_Model_ShowInstance($showID);
-        $result = Array();
+        $result = array();
         $position = 0;
-        foreach ( $showInstance->getShowListContent() as $track ){
-            
-            $elementMap = array( 'element_title' => isset($track['track_title'])?$track['track_title']:"",
-                              'element_artist' => isset($track['artist_name'])?$track['artist_name']:"",
-                              'element_position' => $position,
-                              'element_id' => ++$position,
-                            );
+        foreach ($showInstance->getShowListContent() as $track){
             
+            $elementMap = array( 
+                'element_title' => isset($track['track_title']) ? $track['track_title'] : "",
+                'element_artist' => isset($track['artist_name']) ? $track['artist_name'] : "",
+                'element_position' => $position,
+                'element_id' => ++$position,
+            );
+           
             $fileExtension = pathinfo($track['filepath'], PATHINFO_EXTENSION);
             if ($fileExtension === 'mp3'){
                 $elementMap['element_mp3'] = $track['gunid'].'.'.$fileExtension;
diff --git a/airtime_mvc/application/models/ShowBuilder.php b/airtime_mvc/application/models/ShowBuilder.php
index 86a11eacf..797ff61b6 100644
--- a/airtime_mvc/application/models/ShowBuilder.php
+++ b/airtime_mvc/application/models/ShowBuilder.php
@@ -14,7 +14,8 @@ class Application_Model_ShowBuilder {
 
     private $user;
     private $opts;
-
+    
+    private $pos;
     private $contentDT;
     private $epoch_now;
    
@@ -209,6 +210,8 @@ class Application_Model_ShowBuilder {
             $row["cueout"] = $p_item["cue_out"];
             $row["fadein"] = round(substr($p_item["fade_in"], 6), 6);
             $row["fadeout"] = round(substr($p_item["fade_out"], 6), 6);
+            
+            $row["pos"] = $this->pos++;
 
             $this->contentDT = $schedEndDT;
         }
@@ -332,6 +335,8 @@ class Application_Model_ShowBuilder {
                 $display_items[] = $this->makeHeaderRow($item);
 
                 $current_id = $item["si_id"];
+                
+                $this->pos = 1;
             }
 
             //make a normal data row.
diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php
index 8fa3d5149..f58d329f2 100644
--- a/airtime_mvc/application/models/ShowInstance.php
+++ b/airtime_mvc/application/models/ShowInstance.php
@@ -657,7 +657,8 @@ class Application_Model_ShowInstance {
 
         $sql = "SELECT *
             FROM (cc_schedule AS s LEFT JOIN cc_files AS f ON f.id = s.file_id)
-            WHERE s.instance_id = '{$this->_instanceId}' ORDER BY starts";
+            WHERE s.instance_id = '{$this->_instanceId}' AND s.playout_status >= 0
+            ORDER BY starts";
 
         Logging::log($sql);
 
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index 7ee39aa00..1b2349faa 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -299,7 +299,7 @@ var AIRTIME = (function(AIRTIME){
 					if (aData.image === true) {
 						$image.html('<img src="/css/images/icon_audioclip.png"></img>')
 							.click(function() {
-			                    open_show_preview(aData.instance, iDisplayIndex);
+			                    open_show_preview(aData.instance, aData.pos);
 			                    return false;
 			                });
 					}