From 18a7ff5c0a78f0a7db393b42a033083b7d2d3708 Mon Sep 17 00:00:00 2001
From: Robb Ebright <ebright.48@osu.edu>
Date: Wed, 3 Jan 2018 22:01:46 -0500
Subject: [PATCH] fixed autoplaylist database logic and icon position

---
 airtime_mvc/application/models/Show.php         | 6 ++----
 airtime_mvc/application/models/ShowInstance.php | 8 +++++++-
 airtime_mvc/public/css/styles.css               | 1 -
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php
index 692a6b387..6a9539e65 100644
--- a/airtime_mvc/application/models/Show.php
+++ b/airtime_mvc/application/models/Show.php
@@ -1024,8 +1024,6 @@ SQL;
             $p_start, $p_end);
         $isFull = Application_Model_ShowInstance::getIsFull($p_start, $p_end);
         $hasAutoPlaylist = Application_Model_ShowInstance::getShowHasAutoplaylist($p_start, $p_end);
-
-
         $displayTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone());
         $utcTimezone = new DateTimeZone("UTC");
         $now = new DateTime("now", $utcTimezone);
@@ -1067,9 +1065,9 @@ SQL;
                 $options["show_partial_filled"] = true;
             }
             if (array_key_exists($show['instance_id'], $hasAutoPlaylist)) {
-                $options["show_has_auto_playlist"] = !$hasAutoPlaylist[$show['instance_id']];
-            } else {
                 $options["show_has_auto_playlist"] = true;
+            } else {
+                $options["show_has_auto_playlist"] = false;
             }
 
             $event = array();
diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php
index c219637fa..3dddf80c8 100644
--- a/airtime_mvc/application/models/ShowInstance.php
+++ b/airtime_mvc/application/models/ShowInstance.php
@@ -565,9 +565,15 @@ SQL;
                 ->filterByDbEnds($p_end->format(DEFAULT_TIMESTAMP_FORMAT), Criteria::LESS_THAN)
                 ->filterByDbStarts($p_start->format(DEFAULT_TIMESTAMP_FORMAT), Criteria::GREATER_THAN)
                 ->leftJoinCcShow()
+                ->where('CcShow.has_autoplaylist = ?', 'true')
                 ->find($con);
-            return $showInstances;
+            $hasAutoplaylist = array();
+            foreach ($showInstances->toArray() as $ap) {
+                $hasAutoplaylist[$ap['DbId']] = true;
+            }
+            return $hasAutoplaylist;
         }
+
         catch (Exception $e) {
             $con->rollback();
             Logging::info("Couldn't query show instances for calendar to find which had autoplaylists");
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 70641a0cb..8011928ba 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -2277,7 +2277,6 @@ span.errors.sp-errors{
 }
 .small-icon.autoplaylist {
     background:url(images/icon_alert_cal_autoplaylist.png) no-repeat 0 0;
-    margin-top: 0px !important;
 }
 
 .small-icon.recording {