From: Steve Sutton Date: Mon, 8 Jul 2013 20:05:34 +0000 (+0000) Subject: update search form X-Git-Tag: v1.0~90 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=563137fc5366c1f72bb614602aa61d289d7aeb8d;p=web%2FMichiganTrailMaps.git update search form Adding amenities to form add some style for the group of checkboxes --- diff --git a/Toolkit/Members/SearchQueryGenerator.php b/Toolkit/Members/SearchQueryGenerator.php index 9d847ef..b0232ff 100644 --- a/Toolkit/Members/SearchQueryGenerator.php +++ b/Toolkit/Members/SearchQueryGenerator.php @@ -245,6 +245,10 @@ class Toolkit_Members_SearchQueryGenerator 'filter' => FILTER_VALIDATE_INT, 'flags' => FILTER_FORCE_ARRAY ), + 'amenity' => array( + 'filter' => FILTER_VALIDATE_INT, + 'flags' => FILTER_FORCE_ARRAY + ), 'park' => array( 'filter' => FILTER_VALIDATE_INT, 'flags' => FILTER_FORCE_ARRAY @@ -252,7 +256,14 @@ class Toolkit_Members_SearchQueryGenerator ) ); extract($postedArrays); - +// var_dump($postedArrays);exit; + if (!empty($amenity) && $amenity[0]) { + $params[] = "m.member_id IN ( + SELECT member_id + FROM member_amenity + WHERE amenity_id IN (" + .implode(',', $amenity)."))"; + } if (!empty($activity) && $activity[0]) { $params[] = "m.member_id IN ( SELECT member_id diff --git a/Toolkit/Members/UserSearchForm.php b/Toolkit/Members/UserSearchForm.php index 1f0cb02..9c42e0e 100644 --- a/Toolkit/Members/UserSearchForm.php +++ b/Toolkit/Members/UserSearchForm.php @@ -380,21 +380,16 @@ class Toolkit_Members_UserSearchForm WHERE m.new_member <> CAST(1 AS BOOLEAN) AND m.active = CAST(1 AS BOOLEAN) AND a.display_form = CAST(1 AS BOOLEAN) - AND (mc.category_id = :cid - OR mc.category_id in ( - SELECT category_id - FROM category - WHERE parent_id = :cid)) ORDER BY amenity_name"; $stmt = $dbh->prepare($sql); foreach ($this->memberCatsAssignedToPage as $id) { $isAccommodationCategory->bindParam(':cid', $id, PDO::PARAM_INT); $isAccommodationCategory->execute(); - if (!$isAccommodationCategory->fetchColumn()) { - continue; - } - $stmt->bindParam(':cid', $id, PDO::PARAM_INT); +// if (!$isAccommodationCategory->fetchColumn()) { +// continue; +// } +// $stmt->bindParam(':cid', $id, PDO::PARAM_INT); $stmt->execute(); while ($row = $stmt->fetch()) { $amenities[$row['amenity_name']] = $row['amenity_id']; @@ -578,10 +573,11 @@ class Toolkit_Members_UserSearchForm $tpl = new HTML_Template_Flexy($flexyOpts); $tpl->compile($this->formTemplate); - $activity = $this->getActivities(); - $parks = $this->getParks(); - $regions = $this->memberRegionsAssignedToPage; - $counties = $this->getCounties(); + $activity = $this->getActivities(); + $amenities = $this->getMemberAmenities($this->dbh); + $parks = $this->getParks(); + $regions = $this->memberRegionsAssignedToPage; + $counties = $this->getCounties(); $page = new stdClass(); $page->formURL = BASE_URL . 'index.php?catid=' . $this->_catid; @@ -601,6 +597,8 @@ class Toolkit_Members_UserSearchForm = (!empty($counties) && count($counties) > 1) ? $counties : null; + $page->amenities = $amenities; +// var_dump($page);exit; return $tpl->bufferedOutputObject($page); } diff --git a/Toolkit/Members/templates/userSearchForm.html b/Toolkit/Members/templates/userSearchForm.html index 3924cf4..e457d6c 100644 --- a/Toolkit/Members/templates/userSearchForm.html +++ b/Toolkit/Members/templates/userSearchForm.html @@ -1,13 +1,14 @@ +
+ + +
+
+ + +
- +
{foreach:activities,id,name}
- +
{foreach:parks,id,name}
-
- - -
-
- - + +
+ +
+ {foreach:amenities,name,id} + + {end:} +
+