Added measurement filtering

app/views/measurements/_filters.html.erb

@@ -0,0 +1,34 @@
+<fieldset id="filters" class="collapsible">
+  <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
+  <div>
+    <%= error_messages_for @formula_q %>
+
+    <%= form_tag url, id: 'filters-form', name: 'filters-form',
+      method: :get, remote: true do %>
+
+    <table class="filter">
+      <tr>
+        <td>
+          <%= text_field_tag 'filters[name]', session[:m_filters][:name], placeholder: 'name',
+            onblur: '$("#filters-form").submit(); return false;' %>
+        </td>
+        <td style="width:100%;">
+          <%= text_field_tag 'filters[formula]', session[:m_filters][:formula],
+            placeholder: 'conditional expression including readouts', size: 40,
+            style: 'box-sizing:border-box; width:100%;',
+            onblur: '$("#filters-form").submit(); return false;' %>
+        </td>
+        <td>
+          <%= link_to l(:button_apply), '#', class: "icon icon-checked",
+            onclick: '$("#filters-form").submit(); return false;' %>
+        </td>
+        <td>
+          <%= link_to l(:button_clear), '#', class: "icon icon-reload",
+            onclick: '$("#filters-form input, #filters-form select").val("");
+                      $("#filters-form").submit(); return false;' %>
+        </td>
+      </tr>
+    </table>
+    <% end %>
+  </div>
+</fieldset>

app/views/measurements/_index.html.erb

@@ -1,3 +1,6 @@
+<%= render partial: 'measurements/filters',
+  locals: {url: filter_project_measurements_path(@project)} %>
+
 <% if @measurements.any? { |m| m.persisted? } %>
   <table class="list">
     <thead>

app/views/measurements/_options.html.erb

@@ -1,7 +1,7 @@
 <fieldset id="options" class="collapsible">
   <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
   <div>
-    <%= form_tag toggle_column_measurement_path(@measurement),
+    <%= form_tag toggle_column_measurement_path(@scoping_measurement),
       id: 'toggle-column-form', name: 'toggle-column-form',
       method: :post, remote: true do %>
 

app/views/measurements/_readouts.html.erb

@@ -1,3 +1,6 @@
+<%= render partial: 'measurements/filters',
+  locals: {url: filter_project_measurements_path(@project)} %>
+
 <% if @measurements.any? %>
   <%= render partial: 'measurements/options' %>
 
@@ -9,7 +12,8 @@
         <% @quantities.each do |q| %>
           <th style="width:<%= 100/total_width %>%" class="closable ellipsible">
             <div style="float:right;position:relative;">
-              <%= link_to '', toggle_column_measurement_path(@measurement, quantity_id: q.id),
+              <%= link_to '',
+                toggle_column_measurement_path(@scoping_measurement, quantity_id: q.id),
                 {class: "icon icon-close", method: :post, remote: true} %>
             </div>
             <%= q.name %>