Create Readouts controller

Move #readouts + #toggle_exposure from Measurements to Readouts

app/views/measurements/_index.html.erb

@@ -18,10 +18,10 @@
       <% @measurements.each do |m| %>
         <% next if m.new_record? %>
         <tr id="measurement-<%= m.id %>" class="primary measurement">
-          <td class="topleft unwrappable"><%= format_datetime(m) %></td>
+          <td class="topleft unwrappable"><%= format_datetime(m.taken_at) %></td>
           <td class="topleft">
             <div style="float:left;">
-              <%= link_to m.routine.name, readouts_measurement_routine_path(m.routine) %>
+              <%= link_to m.routine.name, measurement_routine_readouts_path(m.routine) %>
             </div>
             <div style="float:right;">
               <small><%= " (#{pluralize(m.readouts.size, 'readout')})" %></small>

app/views/measurements/toggle_exposure.js.erb

@@ -1 +0,0 @@
-$('#readouts').html('<%= j render partial: 'measurements/readouts' %>');

app/views/readouts/_index.html.erb

@@ -2,13 +2,13 @@
   locals: {url: filter_project_measurements_path(@project, @view_params)} %>
 
 <% if @measurements.any? %>
-  <%= render partial: 'measurements/options' %>
+  <%= render partial: 'readouts/options' %>
 
-  <% formulas = @quantities.map { |q| q.formula } %>
+  <% formulas = @quantities.collect(&:formula) %>
   <% formulas.unshift(@filter_q.formula) if @filter_q %>
   <%= error_messages_for *formulas %>
 
-  <table class="readouts list odd-even">
+  <table id="readouts" class="list odd-even">
     <thead>
       <tr>
         <% total_width = 3 + @quantities.length %>
@@ -17,7 +17,7 @@
           <th style="width:<%= 100/total_width %>%" class="closable ellipsible">
             <div style="float:right;position:relative;">
               <%= link_to '',
-                toggle_exposure_measurement_routine_path(@routine, quantity_id: q.id),
+                measurement_routine_toggle_exposure_path(@routine, quantity_id: q.id),
                 {class: "icon icon-close", method: :post, remote: true} %>
             </div>
             <%= q.name %>
@@ -34,7 +34,9 @@
         <tr id="measurement-<%= measurement.id %>" class="primary <%= row_class %>">
           <td class="topleft unwrappable" style="cursor: pointer;"
               onclick="$(this).closest('tr').toggle(); $(this).closest('tr').nextUntil('tr.primary', '.measurement').toggle(); return false;">
-            <span class="icon icon-bullet-closed"><%= format_datetime(measurement) %></span>
+            <span class="icon icon-bullet-closed">
+              <%= format_datetime(measurement.taken_at) %>
+            </span>
           </td>
           <% @quantities.each do |q| %>
             <td class="primary right ellipsible"><%= format_value(readouts[q]) %></td>
@@ -50,7 +52,9 @@
              end %>
           <td rowspan="<%= rows %>" class="topleft unwrappable" style="cursor: pointer;"
               onclick="$(this).closest('tr').prev('tr.primary').toggle(); $(this).closest('tr').prev('tr.primary').nextUntil('tr.primary', '.measurement').toggle(); return false;">
-            <span class="icon icon-bullet-open"><%= format_datetime(measurement) %></span>
+              <span class="icon icon-bullet-open">
+                <%= format_datetime(measurement.taken_at) %>
+              </span>
           </td>
           <% @quantities.each do |q| %>
             <td class="primary topleft ellipsible">

app/views/readouts/_options.html.erb

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

app/views/readouts/index.html.erb

@@ -7,6 +7,9 @@
 
 <%= title [t("measurements.index.heading"), project_measurements_path(@project)],
           @routine.name %>
+<% if @routine.description? %>
+  <p class="subtitle" style='white-space: pre-wrap;'><%= @routine.description %></p>
+<% end %>
 <div id='readouts'>
-  <%= render partial: 'measurements/readouts' %>
+  <%= render partial: 'readouts/index' %>
 </div>

app/views/readouts/toggle_exposure.js.erb

@@ -0,0 +1 @@
+$('#readouts').html('<%= j render partial: 'readouts/index' %>');

app/views/targets/_index.html.erb

@@ -1,16 +1,12 @@
-<%#= render partial: 'measurements/filters',
-  locals: {url: filter_project_measurements_path(@project, @view_params)} %>
-
 <% if @targets_by_date.any? %>
   <%= render partial: 'targets/options' %>
 
-  <% formulas = @quantities.map { |q| q.formula } %>
-  <%# formulas.unshift(@filter_q.formula) if @filter_q %>
+  <% formulas = @quantities.collect(&:formula) %>
   <%= error_messages_for *formulas %>
 
   <table id="targets" class="list odd-even">
     <thead>
-      <% total_width = 3 + @quantities.length %>
+      <% total_width = 2 + @quantities.length %>
       <% header = quantities_table_header(@quantities) %>
       <% header.each_with_index do |row, i| %>
         <tr class="header">