Visualization controller now returns correct year range based on

dataset.
cid-harvard · Apr 13, 2018 · dc3d239 · dc3d239
1 parent 3030f5c
commit dc3d239
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/app/controllers/visualization.js b/app/controllers/visualization.js
@@ -24,19 +24,25 @@ export default Ember.Controller.extend({
     // in question, not the first and last year of the product / industry
     // datasets
     let entityType = this.get("entityType");
-    let yearRangeKey = `featureToggle.year_ranges.${entityType}.first_year`;
-    if (this.get(yearRangeKey) !== undefined){
-      return this.get(yearRangeKey);
+    let datasetYearRangeKey = `featureToggle.year_ranges.${entityType}.first_year`;
+    let agCensusDatasets = this.get('featureToggle.agcensus_datasets');
+    if (_.contains(agCensusDatasets, entityType)){
+      return this.get('featureToggle.year_ranges.agcensus.first_year');
+    } else if (this.get(datasetYearRangeKey) !== undefined){
+      return this.get(datasetYearRangeKey);
     } else {
       return this.get("featureToggle.first_year");
     }
   }),
   lastYear: computed('entityType', 'featureToggle', function(){
     // See firstYear ^
     let entityType = this.get("entityType");
-    let yearRangeKey = `featureToggle.year_ranges.${entityType}.last_year`;
-    if (this.get(yearRangeKey) !== undefined){
-      return this.get(yearRangeKey);
+    let datasetYearRangeKey = `featureToggle.year_ranges.${entityType}.last_year`;
+    let agCensusDatasets = this.get('featureToggle.agcensus_datasets');
+    if (_.contains(agCensusDatasets, entityType)){
+      return this.get('featureToggle.year_ranges.agcensus.last_year');
+    } else if (this.get(datasetYearRangeKey) !== undefined){
+      return this.get(datasetYearRangeKey);
     } else {
       return this.get("featureToggle.last_year");
     }

diff --git a/app/variables/data-variables.js b/app/variables/data-variables.js
@@ -25,6 +25,8 @@ export default  {
       "agproduct": { "first_year": 2007, "last_year": 2015 },
       "agcensus": { "first_year": 2014, "last_year": 2014 } // land use, farm type, etc
     },
+    // These determine which datasets use the "agcensus" year range
+    "agcensus_datasets": ["agproduct", "livestock", "nonag", 'landUse'],
     "geo_center": [4.6,-74.06],
     "subregions" : {
       "country": "department",