Merge branch 'feature/data-download-page-rebased' of github.com:Vizzu…

…ality/gfw-climate into feature/data-download-page-rebased
Vizzuality · Oct 26, 2017 · 45468d9 · 45468d9
2 parents 2994264 + 3644fad
commit 45468d9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/app/assets/javascripts/data-download/views/DataDownloadIndexView.js b/app/assets/javascripts/data-download/views/DataDownloadIndexView.js
@@ -39,7 +39,7 @@ define(
           placeholder: 'Select a country'
         },
         {
-          id: 'indicator_ids',
+          id: 'widget_ids',
           name: 'Indicators'
         },
         {
@@ -59,7 +59,7 @@ define(
           placeholder: 'Select an indicator'
         }
       ],
-      mandatorys: ['country_codes', 'indicator_ids'],
+      mandatorys: ['country_codes', 'widget_ids'],
       validationMsg: 'Please select, at least, a country, an indicator and a year',
       tresh: [10, 15, 20, 25, 30],
       switchs: [
@@ -125,7 +125,7 @@ define(
             case 'jurisdiction_ids':
               filter.options = [];
               break;
-            case 'indicator_ids':
+            case 'widget_ids':
               filter.options = this.getIndicatorsOptions();
               break;
             case 'dataSource':
@@ -372,7 +372,7 @@ define(
           case 'country_codes':
             this.onCountryChange(selection);
             break;
-          case 'indicator_ids':
+          case 'widget_ids':
             this.onIndicatorsChange(selection);
             break;
           case 'dataSource':
@@ -472,15 +472,6 @@ define(
               query += '&';
             }
             var value = view.selection.join(',');
-            if (view.filter.id === 'indicator_ids') {
-              var options = view.filter.options.filter(function(o) {
-                return view.selection.includes(o.value);
-              });
-              var indicators = options.map(function(i) {
-                return i.indicators;
-              });
-              value = _.flatten(indicators);
-            }
             query += view.filter.id + '[]=' + value;
           }
         });

diff --git a/app/assets/javascripts/data-download/views/DownloadFilterCardView.js b/app/assets/javascripts/data-download/views/DownloadFilterCardView.js
@@ -28,6 +28,12 @@ define(
 
       renderOptions: function(options, placeholder) {
         this.filter.options = options;
+        var selected = _.filter(options, function(option) {
+          return option.selected;
+        });
+        this.selection = _.map(selected, function(select) {
+          return select.value + '';
+        });
         this.selectAllEl.prop('disabled', !options.length);
         this.optionsContainer.html(
           this.optionsTemplate({

diff --git a/app/controllers/api/v1/downloads_controller.rb b/app/controllers/api/v1/downloads_controller.rb
@@ -10,7 +10,7 @@ def index
 
     def download_params
       params.permit(:iso, :id_1, :area, :start_year, :end_year,
-                    units: [], indicator_ids: [], thresholds: [])
+                    units: [], widget_ids: [], thresholds: [])
     end
   end
 end
diff --git a/app/models/download.rb b/app/models/download.rb
@@ -18,7 +18,9 @@ def initialize options
     @start_year = options[:start_year]
     @end_year = options[:end_year]
     @units = options[:units]
-    @indicator_ids = options[:indicator_ids]
+    @indicator_ids = options[:widget_ids].map do |widget_id|
+      Widget.find(widget_id).indicators.map{ |i| i["id"] }
+    end.flatten
     @thresholds = options[:thresholds]
   end
 

diff --git a/app/models/widget.rb b/app/models/widget.rb
@@ -29,5 +29,5 @@ def data_url(collection, id, params)
 
     url.to_s
   end
-  
+
 end