Add livestock search support.

cid-harvard · Apr 13, 2018 · ace2237 · ace2237
1 parent 90d0c04
commit ace2237
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/app/controllers/search.js b/app/controllers/search.js
@@ -63,6 +63,11 @@ export default Ember.Controller.extend({
       return get(d,'constructor.modelName') === 'nonag';
     });
   }),
+  livestockResults: computed('results.[]', function() {
+    return this.get('results').filter(function(d){
+      return get(d,'constructor.modelName') === 'livestock';
+    });
+  }),
   landuseResults: computed('results.[]', function() {
     return this.get('results').filter(function(d){
       return get(d,'constructor.modelName') === 'land-use';

diff --git a/app/routes/search.js b/app/routes/search.js
@@ -15,6 +15,7 @@ export default Ember.Route.extend({
 
     var agproducts = this.store.find('agproduct', { level: 'level3' });
     var nonags = this.store.find('nonag', { level: 'level3' });
+    var livestock = this.store.find('livestock', { level: 'level1' });
     var landuses = this.store.find('land-use', { level: 'level2' });
 
     var industriesDivision = this.store.find('industry', { level: 'division' });
@@ -29,9 +30,9 @@ export default Ember.Route.extend({
     } else if(transition.filter === 'product') {
       request = [products];
     } else if(transition.filter === 'rural') {
-      request = [agproducts, landuses, nonags];
+      request = [agproducts, landuses, nonags, livestock];
     } else {
-      request = [country, department, msa, municipality, industriesDivision, industriesClass, products, agproducts, landuses, nonags];
+      request = [country, department, msa, municipality, industriesDivision, industriesClass, products, agproducts, landuses, nonags, livestock];
     }
 
     return Ember.RSVP.all(request)

diff --git a/app/templates/search.hbs b/app/templates/search.hbs
@@ -88,6 +88,19 @@
     {{/each}}
   </ul>
 {{/if}}
+{{#if livestockResults.length}}
+  <h3 class="section__head results__subhead">{{t 'search.results_livestock'}}</h3>
+  <ul class="results__list">
+    {{#each result in livestockResults}}
+      {{search-result
+        result=result
+        tagName="li"
+        class="results__item"
+        levelOnly=true
+      }}
+    {{/each}}
+  </ul>
+{{/if}}
 {{#if industryResults.length}}
   <h3 class="section__head results__subhead">{{t 'search.results_industries'}}</h3>
   <ul class="results__list">