Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

compute_quantities now returns single hash

Browse Source 
Fixed MeasurementsController view management
This commit is contained in:
cryptogopher
2020-04-26 20:21:17 +02:00
parent 9f5f31ca42
commit 4230d72206
27 changed files with 118 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/measurement_routines/_form.html.erb
View File

@@ -1,5 +1,5 @@
<div class="tabular">
<%= fields_for 'measurement[routine_attributes]', @routine do |ff| %>
<%= fields_for 'measurement[routine_attributes]', routine do |ff| %>
<%= ff.hidden_field :id %>
<p>
<label><%= l(:field_name) %><span class="required"> *</span></label>

9
app/views/measurement_routines/_show_form.html.erb
View File

@@ -1,10 +1,9 @@
<div>
<%= fields_for 'measurement[routine_attributes]', @routine do |ff| %>
<%= fields_for 'measurement[routine_attributes]', routine do |ff| %>
<p>
<label><%= l(:field_measurement_routine) %><span class="required"> *</span></label>
<%= ff.select :id,
options_from_collection_for_select(@project.measurement_routines,
:id, :name, @routine.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({
@@ -22,7 +21,7 @@
class: 'icon icon-edit' %>
</p>
<% end %>
<% unless @routine.description.empty? %>
<p style='white-space: pre-wrap;' ><%= @routine.description %></p>
<% unless routine.description.empty? %>
<p style='white-space: pre-wrap;' ><%= routine.description %></p>
<% end %>
</div>

3
app/views/measurement_routines/edit.js.erb
View File

@@ -1 +1,2 @@
$('#measurement-routine-form').html('<%= j render partial: 'measurement_routines/form' %>');
$('#measurement-routine-form').html('<%= j render partial: 'measurement_routines/form',
locals: {routine: @routine} %>');

3
app/views/measurement_routines/show.js.erb
View File

@@ -1 +1,2 @@
$('#measurement-routine-form').html('<%= j render partial: 'measurement_routines/show_form' %>');
$('#measurement-routine-form').html('<%= j render partial: 'measurement_routines/show_form',
locals: {routine: @routine} %>');