From 03d3e1e2622b650d87aeeecaff9593b342cd472f Mon Sep 17 00:00:00 2001
From: cryptogopher <git6453hub@michalczyk.pro>
Date: Tue, 3 Dec 2019 01:21:17 +0100
Subject: [PATCH] Layout updates

---
 app/controllers/measurements_controller.rb | 2 ++
 app/views/measurements/_index.html.erb     | 6 ++++--
 app/views/measurements/index.html.erb      | 6 ++++--
 config/locales/en.yml                      | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/controllers/measurements_controller.rb b/app/controllers/measurements_controller.rb
index 0523f84..01b1466 100644
--- a/app/controllers/measurements_controller.rb
+++ b/app/controllers/measurements_controller.rb
@@ -47,7 +47,9 @@ class MeasurementsController < ApplicationController
   end
 
   def retake
+    @measurement = @measurement.dup
     prepare_measurements
+    redirect_to project_measurements_path(@project)
   end
 
   private
diff --git a/app/views/measurements/_index.html.erb b/app/views/measurements/_index.html.erb
index dbef6f0..e40c4e0 100644
--- a/app/views/measurements/_index.html.erb
+++ b/app/views/measurements/_index.html.erb
@@ -14,8 +14,10 @@
         <tr id="measurement-<%= m.id %>" class="measurement <%= 'hidden' if m.hidden %>">
           <td class="date"><%= m.taken_at.strftime("%F %R") %></td>
           <td class="name">
-            <%= m.name %>
-            <small><%= " (#{m.readouts.size} readouts)" %></small>
+            <div style="float:left;"><%= m.name %></div>
+            <div style="float:right;">
+              <small><%= " (#{pluralize(m.readouts.size, 'readout')})" %></small>
+            </div>
           </td>
           <td class="source"><%= m.source.name if m.source.present? %></td>
           <td class="action">
diff --git a/app/views/measurements/index.html.erb b/app/views/measurements/index.html.erb
index 141275b..8e8786e 100644
--- a/app/views/measurements/index.html.erb
+++ b/app/views/measurements/index.html.erb
@@ -5,11 +5,13 @@
 <div class="contextual">
   <% if User.current.allowed_to?(:manage_common, @project) %>
     <%= link_to t(".link_new_measurement"), '#', class: 'icon icon-add',
-      onclick: '$("#add-measurement").show(); $("#measurement_name").focus(); return false;' %>
+      onclick: '$("#add-measurement").toggle(); $("#measurement_name").focus(); return false;'
+    %>
   <% end %>
 </div>
 
-<div id="add-measurement" <%= 'style=display:none;' if @measurement.errors.empty? %>>
+<% hide_add_form = @measurement.errors.empty? && (action_name != "retake") %>
+<div id="add-measurement" <%= 'style=display:none;' if hide_add_form %>>
   <h2><%= t ".heading_new_measurement" %></h2>
 
   <%= labelled_form_for @measurement,
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 462e382..b932913 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -59,12 +59,12 @@ en:
       confirm_defaults: 'This will load default quantities and units. Continue?'
   measurements:
     form:
-      heading_new_measurement: 'New measurement'
       button_add_readout: 'Add readout'
       button_delete_readout: 'Delete'
       null_source: '- unspecified -'
     index:
       heading: 'Measurements'
+      heading_new_measurement: 'New measurement'
       link_new_measurement: 'New measurement'
   ingredients:
     contextual: