Merge branch 'feature/51-issuefilter' into 'develop'

Feature/51 issuefilter

See merge request gtt/redmine_gtt!11

Author: dkastl

Gemfile

@@ -5,6 +5,5 @@ gem 'immutable-struct'
 gem "rgeo"
 gem "rgeo-geojson"
 gem "rgeo-activerecord"
-gem 'pg', '~> 0.18.1'
-gem 'activerecord-postgis-adapter'
-
+gem "pg"
+gem 'activerecord-postgis-adapter', '~> 3.1'

app/views/issues/index.api.rsb

@@ -26,6 +26,10 @@ api.array :issues, api_meta(:total_count => @issue_count, :offset => @offset, :l
         api.geojson ""
       end
 
+      if issue.distance
+        api.distance issue.distance
+      end
+
       render_api_custom_values issue.visible_custom_field_values, api
 
       api.created_on issue.created_on

app/views/issues/index/_map.html.erb

@@ -3,7 +3,7 @@
 <fieldset id="location" class="collapsible">
   <legend onclick="toggleFieldset(this);"><%= l(:field_location) %></legend>
 
-  <%= map_tag map: @project.map, geom: Issue.array_to_geojson(@issues, include_properties: { only: %i(id subject) }), popup: { href: '/issues/[id]' } %>
+  <%= map_tag map: @project.map, geom: (Issue.array_to_geojson(@issues, include_properties: { only: %i(id subject) }) if @issues), popup: { href: '/issues/[id]' } %>
 </fieldset>
 
 <% end %>

assets/javascripts/app.js

@@ -193,6 +193,9 @@ var App = (function ($, publ) {
 
     // Add LayerSwitcher Image Toolbar
     map.addControl(new ol.control.LayerPopup());
+
+    // Add map events
+    map.on('moveend', publ.updateFilter);
   };
 
   /**
@@ -343,6 +346,33 @@ var App = (function ($, publ) {
     }
   };
 
+  /**
+   *  Updates map settings for Redmine filter
+   */
+  publ.updateFilter = function () {
+    var center = map.getView().getCenter();
+    var extent = map.getView().calculateExtent(map.getSize());
+
+    center = ol.proj.transform(center,'EPSG:3857','EPSG:4326');
+    console.log("Map Center (WGS84): ", center);
+    $('fieldset#location').data('center', center);
+    $('#tr_distance #values_distance_3').val(center[0]);
+    $('#tr_distance #values_distance_4').val(center[1]);
+
+
+    extent = ol.proj.transformExtent(extent,'EPSG:3857','EPSG:4326').join('|');
+    console.log("Map Extent (WGS84): ",extent);
+    $('select[name="v[bbox][]"]').find('option').first().val(extent);
+    // adjust the value of the 'On map' option tag
+    // Also adjust the JSON data that's the basis for building the filter row
+    // html (this is relevant if the map is moved first and then the filter is
+    // added.)
+    if(window.availableFilters && window.availableFilters.bbox) {
+      window.availableFilters.bbox.values = [['On map', extent]];
+    }
+  },
+
+
   /**
    * Parse page for WKT strings in history
    */
@@ -647,3 +677,68 @@ var App = (function ($, publ) {
   return publ;
 
 })(jQuery, App || {});
+
+/**
+ * Extend core Redmine's buildFilterRow method
+ */
+window.buildFilterRowWithoutDistanceFilter = window.buildFilterRow;
+window.buildFilterRow = function(field, operator, values) {
+  if(field == 'distance') {
+    buildDistanceFilterRow(operator, values);
+  } else {
+    buildFilterRowWithoutDistanceFilter(field, operator, values);
+  }
+};
+
+function buildDistanceFilterRow(operator, values){
+  var field = 'distance';
+  var fieldId = field;
+  var filterTable = $("#filters-table");
+  var filterOptions = availableFilters[field];
+  if (!filterOptions) return;
+  var operators = operatorByType[filterOptions['type']];
+  var filterValues = filterOptions['values'];
+  var i, select;
+
+  var tr = $('<tr class="filter">').attr('id', 'tr_'+fieldId).html(
+    '<td class="field"><input checked="checked" id="cb_'+fieldId+'" name="f[]" value="'+field+'" type="checkbox"><label for="cb_'+fieldId+'"> '+filterOptions['name']+'</label></td>' +
+    '<td class="operator"><select id="operators_'+fieldId+'" name="op['+field+']"></td>' +
+    '<td class="values"></td>'
+  );
+  filterTable.append(tr);
+
+  select = tr.find('td.operator select');
+  for (i = 0; i < operators.length; i++) {
+    var option = $('<option>').val(operators[i]).text(operatorLabels[operators[i]]);
+    if (operators[i] == operator) { option.attr('selected', true); }
+    select.append(option);
+  }
+  select.change(function(){ toggleOperator(field); });
+
+  tr.find('td.values').append(
+    '<span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_1" size="14" class="value" /></span>' +
+    ' <span style="display:none;"><input type="text" name="v['+field+'][]" id="values_'+fieldId+'_2" size="14" class="value" /></span>' +
+    '<input type="hidden" name="v['+field+'][]" id="values_'+fieldId+'_3" />' +
+    '<input type="hidden" name="v['+field+'][]" id="values_'+fieldId+'_4" />'
+  );
+  $('#values_'+fieldId+'_1').val(values[0]);
+  var base_idx = 1;
+  if(values.length == 2 || values.length == 4) {
+    // upper bound for 'between' operator
+    $('#values_'+fieldId+'_2').val(values[1]);
+    base_idx = 2;
+  }
+  var x,y;
+  if(values.length > 2){
+    console.log('distance center point from values: ', values[base_idx], values[base_idx+1]);
+    x = values[base_idx];
+    y = values[base_idx+1];
+  } else {
+    console.log('taking distance from map fieldset: ', $('fieldset#location').data('center'));
+    var xy = $('fieldset#location').data('center');
+    x = xy[0]; y = xy[1];
+  }
+  $('#values_'+fieldId+'_3').val(x);
+  $('#values_'+fieldId+'_4').val(y);
+}
+