From af9f2797fb5eba60ada36a9f918f3f5690b0ee1f Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 5 Jul 2016 13:38:06 -0400
Subject: [PATCH] Update for amenity output

If the amenity is empty then don't output
---
 models/front/members/list.php | 45 +++++++++++++++++++----------------
 views/front/members/list.html | 40 ++++++++++++++++---------------
 2 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/models/front/members/list.php b/models/front/members/list.php
index f7b0b81d..06221e05 100644
--- a/models/front/members/list.php
+++ b/models/front/members/list.php
@@ -405,7 +405,7 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
                     $amenity_sql .= " AND group_id IN ( " . implode( ',', $f_groups ) ." ) ";
                 }
             }
-            $amenity_sql .= ")"; 
+            $amenity_sql .= ")";
             $amenityData = $Amenities->getList( $amenity_sql );
 
             // Add default flag as false to all entries
@@ -444,6 +444,9 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
                 } // If we have a sane amenity ID
             } // If an amenity search has been selected
         } // it doing amenity search
+        $amenityData = array_filter( $amenityData );
+        echo '<pre>amenityData: ' . print_r(amenityData, true) . '</pre>';
+        echo '<pre>count: ' . print_r(count($amenityData), true) . '</pre>';
 
         // Only look at active member information where the member is displayable  (access = 20, 30, 40)
         $where .= $whereSep."
@@ -532,33 +535,33 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
 
         // Compile template data
         $templateData = array(
-            'haveMembers' => $haveMembers,
-            'members' => $list,
-            'membersFound' => $membersFound,
-            'haveFilter' => $haveFilter,
+            'haveMembers'    => $haveMembers,
+            'members'        => $list,
+            'membersFound'   => $membersFound,
+            'haveFilter'     => $haveFilter,
             'filterArchived' => $filterArchived,
-            'filterPending' => $filterPending,
-            'filterName' => stripslashes($filterName),
-            'textSearch' => $textSearch,
-            'categories' => $categoryData,
+            'filterPending'  => $filterPending,
+            'filterName'     => stripslashes($filterName),
+            'textSearch'     => $textSearch,
+            'categories'     => $categoryData,
             'singleCategory' => $singleCategory,
-            'catSelected' => $catSelected,
-            'amenities' => $amenityData,
-            'amenSelected' => $amenSelected,
-            'alphaList' => $alphaList,
-            'alphaSelected' => $alphaSelected,
-            'blankStart' => $blankStart,
-            'view' => $view,
+            'catSelected'    => $catSelected,
+            'amenities'      => $amenityData,
+            'amenSelected'   => $amenSelected,
+            'alphaList'      => $alphaList,
+            'alphaSelected'  => $alphaSelected,
+            'blankStart'     => $blankStart,
+            'view'           => $view,
         );
 
         // Return status, suggested view, and data to controller - also return any modified settings
         return array(
-            'status' => $success,
+            'status'           => $success,
             'menuItemRedirect' => false,
-            'modelRedirect' => false,
-            'view' => "front/members/list.html",
-            'data' => $templateData,
-            'settings' => $settings
+            'modelRedirect'    => false,
+            'view'             => "front/members/list.html",
+            'data'             => $templateData,
+            'settings'         => $settings
         );
 
     }
diff --git a/views/front/members/list.html b/views/front/members/list.html
index ac7929f2..cda67963 100644
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -1,4 +1,4 @@
-<div class="glm-member-db-list glm-member-db-{$view}-view 
+<div class="glm-member-db-list glm-member-db-{$view}-view
     {if $settings.list_map_show_opened}map-opened{else}map-closed{/if}
     {if $settings.list_show_search_filters_opened}filters-opened{else}filters-closed{/if}
 ">
@@ -14,7 +14,7 @@
                 FILTERS
             </div>
             <div id="glm-member-list-filters-box">
-                <div id="glm-member-list-filters-close" class="button glm-button glm-member-list-filters-toggle">Close</div> 
+                <div id="glm-member-list-filters-close" class="button glm-button glm-member-list-filters-toggle">Close</div>
                 <form action="{$thisUrl}?glm_action=list" method="post" enctype="multipart/form-data">
                     <div class="small-12 columns glm-member-search glm-member-entry-container glm-member-container">
                         {apply_filters('glm-member-db-front-members-list-searchFormTop', '')}
@@ -37,6 +37,7 @@
                             </div>
                         {/if}
                         {if $settings.list_show_search_amenities}
+                            {if $amenities|@count gt 0}
                             <div>
                                 {$terms.term_member_cap} Amenity:
                                 <select name="amenitySearch[]" id="amenitySelect" title="Click to Select Amenities" multiple="multiple">
@@ -47,6 +48,7 @@
                                     {/foreach}
                                 </select>
                             </div>
+                            {/if}
                         {/if}
 
                         {if $settings.list_show_search_text}
@@ -61,7 +63,7 @@
             </div> <!-- glm-member-list-filters-box -->
         </div> <!-- glm-member-list-wrapper -->
         {/if} {*list_show_search*}
-    {if $settings.list_show_map}        
+    {if $settings.list_show_map}
         <script src="http://maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
         {apply_filters('glm-member-db-front-members-list-mapTop', '')}
         <div id="glm-locationMap-container">
@@ -70,14 +72,14 @@
         {apply_filters('glm-member-db-front-members-list-mapBottom', '')}
     {/if}
     {apply_filters('glm-member-db-front-members-list-listHeaderTop', '')}
-    
-        
+
+
  {if $settings.list_show_list && !$blankStart}
         <h3>List of {$terms.term_member_plur_cap}</h3>
   {if $haveMembers}
 
     {$terms.term_member_plur_cap} found: {$membersFound}<br>
-    
+
     {if $settings.list_show_search_alpha}
         <div class="glm-alpha-links">
             <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}&categorySearch={$catSelected}" class="glm-alpha-link{if !$alphaSelected} glm-alpha-link-selected{/if}">All</a>
@@ -87,7 +89,7 @@
        </div>
     {/if}
         {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')}
- 
+
      <!-- Member information displayed in list -->
 
     <div class="glm-member-list-listing-container">
@@ -114,7 +116,7 @@
                     {/if}
                     {if $settings.list_show_detail_link}
                         </a>
-                    {/if}   
+                    {/if}
                     <h4 class="glm-member-title">
                         {if $settings.list_show_detail_link}
                             <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/">
@@ -218,7 +220,7 @@
              <div class="glm-member-list-container glm-member-container small-12 columns">
                 {apply_filters('glm-member-db-front-members-list-memberTop', '', $m.member_pointer)}
                  <!-- Member Logo - Medium and up-->
-                 
+
                     <div class="glm-member-list-data small-12 columns">
                 {if $m.logo && $settings.list_show_logo}
                     <div class="glm-member-list-image-wrapper right small-12 medium-4 columns">
@@ -227,7 +229,7 @@
                         </div>
                    </div>
                 {/if}
-                        
+
                      <div class="glm-member-list-active-info small-12 medium-8 columns">
  <!-- Member name, address, and basic information -->
                     {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $m.member_pointer)}
@@ -266,7 +268,7 @@
                     <div class="glm-member-db-socials">
                        {apply_filters('glm-member-db-front-members-social-list', '', $m.member_pointer)}
                     </div>
-                    
+
                 <div class="glm-member-list-description small-12 columns">
                     <div>
                     {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $m.member_pointer)}
@@ -308,8 +310,8 @@
                 </div>
                     {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $m.member_pointer)}
                  </div>
-                    
-                        
+
+
                     <!-- Laury - This is the one that should go underneath all the address and description area -->
                 {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $m.member_pointer)}
                 {apply_filters('glm-member-db-front-members-list-memberBottom', '', $m.member_pointer)}
@@ -385,7 +387,7 @@
             </div>
             {apply_filters('glm-member-db-front-members-list-mapBubbleBottom', '', $m.member_pointer)}
         </div> <!-- End of information displayed in map bubbles -->
- 
+
      {/foreach} {*$members*}
          </div>
 
@@ -394,18 +396,18 @@
  {else}
         <div>(no {$terms.term_member_plur} listed)</div>
  {/if}
- 
+
     {/if} {*list_show_list*}
     <script type="text/javascript">
         jQuery(document).ready(function($) {
             jQuery('select[multiple').asmSelect();
             // Show search filters box
             {if $settings.list_show_search}
-            
+
                 // Float filter box
 
                     var fixmeTop = $('#glm-member-list-filters-button').offset().top;
-                    $(window).scroll(function() { 
+                    $(window).scroll(function() {
 
                         var currentScroll = $(window).scrollTop();
                         console.log("{$settings.list_floating_search_distance_top}");
@@ -426,7 +428,7 @@
                 });
                 $(".glm-member-list-filters-toggle").click( function() {
                     $(".glm-member-db-{$view}-view").toggleClass("filters-opened");
-                    $(".glm-member-db-{$view}-view").toggleClass("filters-closed");  
+                    $(".glm-member-db-{$view}-view").toggleClass("filters-closed");
                     $("#glm-locationMap-container").one("webkitTransitionEnd otransitionend oTransitionEnd msTransitionEnd transitionend",
                         function() {
                             var center = map.getCenter();
@@ -450,7 +452,7 @@
                             disableDefaultUI: false,
                             mapTypeId: google.maps.MapTypeId.MAP,
                         });
-                        
+
                         $("#glm-member-list-map-toggle").click( function() {
                             $(".glm-member-db-{$view}-view").toggleClass("map-opened");
                             $(".glm-member-db-{$view}-view").toggleClass("map-closed");
-- 
2.17.1