Added an active only / all filter.

outlandishideas · Dec 23, 2014 · 49fc60d · 49fc60d
1 parent be7d0b7
commit 49fc60d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/web/index.php b/web/index.php
@@ -73,6 +73,12 @@
 					'theme' => 'Theme'
 				)
 			))
+			->add('active_only', 'choice', array(
+				'choices' => array(
+					1 => 'Active',
+					0 => 'All'
+				)
+			))
 			->add('search', 'submit')
 			->getForm();
 
@@ -92,6 +98,7 @@
 $app->get('/search', function (Request $request) use ($app, $searchForm) {
 	$queryBuilder = $app['db']->createQueryBuilder();
 	$type = $request->get('type');
+	$active = $request->get('active_only');
 	$query = $request->get('q');
 	$results = array();
 	$data = array(
@@ -121,8 +128,17 @@
 			break;
 	}
 
+	switch ($active) {
+		case 1:
+			$queryBuilder->andWhere('is_active', true);
+			break;
+
+		default:
+			$queryBuilder->orderBy('is_active', 'DESC');
+			break;
+	}
+
 	$queryBuilder
-		->orderBy('is_active', 'DESC')
 		->addOrderBy('name LIKE :order', 'DESC')
 		->addOrderBy('name', 'ASC')
 		->setParameter(':name', "%{$query}%")

diff --git a/web/templates/searchbar.twig b/web/templates/searchbar.twig
@@ -1,17 +1,20 @@
 {{ form_start(searchForm, {'attr': {'class': 'row collapse'}}) }}
-    <div class="large-9 columns">
+    <div class="large-8 columns">
         <div class="row collapse">
             <div class="small-12 columns">
                 {{ form_widget(searchForm.q, {'required': false, 'attr': {'autofocus': 'true'}}) }}
             </div>
         </div>
     </div>
-    <div class="large-3 columns">
+    <div class="large-4 columns">
         <div class="row collapse">
-            <div class="small-6 columns">
+            <div class="small-4 columns">
                 {{ form_widget(searchForm.type) }}
             </div>
-            <div class="small-6 columns">
+            <div class="small-3 columns">
+                {{ form_widget(searchForm.active_only) }}
+            </div>
+            <div class="small-5 columns">
                 {{ form_widget(searchForm.search, { 'label': 'Search »','attr': {'class': 'primary-color postfix'}}) }}
             </div>
         </div>