Last changes on Redmine 4.0

app/views/measurement_routines/_edit_form.html.erb

@@ -0,0 +1,9 @@
+<div id='measurement-routine-form'>
+  <% if @measurement.routine.persisted? %>
+    <%= render partial: 'measurement_routines/show_form',
+      locals: {routine: @measurement.routine} %>
+  <% else %>
+    <%= render partial: 'measurement_routines/form',
+      locals: {routine: @measurement.routine} %>
+  <% end %>
+</div>

app/views/measurement_routines/_form.html.erb

@@ -1,13 +1,33 @@
-<div class="tabular">
-  <%= fields_for 'measurement[routine_attributes]', routine do |ff| %>
-    <%= ff.hidden_field :id %>
+<div id='measurement-routine-form' class="tabular">
+  <%= fields_for :routine do |routine_f| %>
     <p>
-    <label><%= l(:field_name) %><span class="required"> *</span></label>
-    <%= ff.text_field :name, required: true, style: "width: 95%;" %>
-    </p>
-    <p>
-    <label><%= l(:field_description) %></label>
-    <%= ff.text_area :description, cols: 40, rows: 3, style: "width: 95%;" %>
+    <%= routine_f.select :id, options_from_collection_for_select(
+                                @project.measurement_routines, :id, :name, @routine.id),
+      {required: true}, autocomplete: 'off',
+      onchange: "var mr_id = $('#measurement_routine_attributes_id').val();
+                 $.ajax({
+                   url: '#{measurement_routine_path(id: :mr_id)}'.replace('mr_id', mr_id),
+                   dataType: 'script'
+                 });
+                 return false;" %>
+  <%= link_to_if l(:button_edit), '#',
+    onclick: "var mr_id = $('#measurement_routine_attributes_id').val();
+              $.ajax({
+                url: '#{edit_measurement_routine_path(id: :mr_id)}'.replace('mr_id', mr_id),
+                dataType: 'script'
+              });
+              return false;",
+    class: 'icon icon-edit' %>
+  <%= link_to_if l(:button_cancel), '#', onclick: "cancel edit" %>
     </p>
+
+    <% if @routine.persisted? %>
+      <% if @routine.description? %>
+        <p style='white-space: pre-wrap;' ><%= @routine.description %></p>
+      <% end %>
+    <% else %>
+      <p><%= routine_f.text_field :name, required: true, style: "width: 95%;" %></p>
+      <p><%= ff.text_area :description, cols: 40, rows: 3, style: "width: 95%;" %></p>
+    <% end %>
   <% end %>
 </div>

app/views/measurements/_edit_form.html.erb

@@ -1,8 +1,11 @@
-<%= labelled_form_for @measurement, url: measurement_path(@measurement, @view_params),
+<%= labelled_form_for @measurement, url: measurement_path(@measurement),
   method: :patch, remote: true,
   html: {id: 'edit-measurement-form', name: 'edit-measurement-form'} do |measurement_f| %>
 
   <div class="box tabular">
+    <%= render partial: 'measurement_routines/form',
+      locals: {measurement_f: measurement_f} %>
+    <hr style="width: 95%;">
     <%= render partial: 'measurements/form', locals: {measurement_f: measurement_f} %>
   </div>
 

app/views/measurements/_form.html.erb

@@ -1,17 +1,5 @@
 <%= error_messages_for @measurement %>
 
-<div id='measurement-routine-form'>
-  <% if @measurement.routine.persisted? %>
-    <%= render partial: 'measurement_routines/show_form',
-      locals: {routine: @measurement.routine} %>
-  <% else %>
-    <%= render partial: 'measurement_routines/form',
-      locals: {routine: @measurement.routine} %>
-  <% end %>
-</div>
-
-<hr style="width: 95%;">
-
 <div class="splitcontent">
   <div class="splitcontentleft">
     <p>

app/views/measurements/_index.html.erb

@@ -1,10 +1,10 @@
 <%= render partial: 'measurements/filters',
   locals: {url: filter_project_measurements_path(@project, @view_params)} %>
 
-<% if @measurements.any? { |m| m.persisted? } %>
+<% if @measurements.any? %>
   <%= error_messages_for @filter_q.formula if @filter_q %>
 
-  <table class="list">
+  <table id="measurements" class="list">
     <thead>
       <tr>
         <th style="width:5%"><%= l(:field_taken_at_date) %></th>
@@ -16,8 +16,7 @@
     </thead>
     <tbody>
       <% @measurements.each do |m| %>
-        <% next if m.new_record? %>
-        <tr id="measurement-<%= m.id %>" class="primary measurement">
+        <tr id="measurement-<%= m.id %>" class="measurement">
           <td class="topleft unwrappable"><%= format_datetime(m.taken_at) %></td>
           <td class="topleft">
             <div style="float:left;">

app/views/measurements/edit.js.erb

@@ -1,8 +1,9 @@
-$('tr[id=measurement-<%= @measurement.id %>]').nextUntil('tr.primary', ':not(.measurement)')
-  .remove();
-var columns = $('table > thead > tr > th').length;
-$('tr[id=measurement-<%= @measurement.id %>]').nextUntil('tr.primary').addBack().last().after(
-  '<tr><td class="form" colspan="'+columns+'"><div id="edit-measurement">' +
-  '<%= j render partial: 'measurements/edit_form' %>' +
-  '</div></td></tr>'
+$('tr[id=measurement-<%= @measurement.id %>]').nextUntil('tr.measurement')
+  .remove().addBack().first().after(
+    '<tr>' +
+      '<td class="topleft symmetric"' +
+          'colspan="'+$('table#measurements tr:first-child td').length+'">' +
+        '<%= j render partial: 'measurements/edit_form' %>' +
+    '</td>' +
+  '</tr>'
 );

app/views/measurements/index.js.erb

@@ -1,5 +1 @@
-<% if @view_params[:view] == :index %>
-  $('#measurements').html('<%= j render partial: 'measurements/index' %>');
-<% else %>
-  $('#readouts').html('<%= j render partial: 'measurements/readouts' %>');
-<% end %>
+$('#measurements').html('<%= j render partial: 'measurements/index' %>');

app/views/readouts/_edit_form.html.erb

@@ -0,0 +1,17 @@
+<%= labelled_form_for @measurement, url: measurement_readouts_path(@measurement),
+  method: :patch, remote: true,
+  html: {id: 'edit-measurement-form', name: 'edit-measurement-form'} do |measurement_f| %>
+
+  <div class="box tabular">
+    <%= render partial: 'measurements/form', locals: {measurement_f: measurement_f} %>
+  </div>
+
+  <div class="tabular">
+    <p>
+      <%= submit_tag l(:button_save) %>
+      <%= link_to l(:button_cancel), "#",
+        onclick: '$(this).closest("tr").nextUntil("tr.measurement", "tr.details").show()
+                    .addBack().first().remove(); return false;' %>
+    </p>
+  </div>
+<% end %>

app/views/readouts/edit.js.erb

@@ -0,0 +1,9 @@
+$('tr[id=measurement-<%= @measurement.id %>]').nextUntil('tr.measurement')
+  .remove('tr:not(.details)').hide().addBack().first().after(
+    '<tr>' +
+      '<td class="topleft symmetric"' +
+          'colspan="'+$('table#readouts tr:first-child td').length+'">' +
+        '<%= j render partial: 'readouts/edit_form' %>' +
+    '</td>' +
+  '</tr>'
+);

app/views/readouts/index.js.erb

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