Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Updated Measurement to reflect ReadoutValue removal

Browse Source
This commit is contained in:
cryptogopher
2019-11-30 01:01:43 +01:00
parent d74f290a4f
commit fc2db76a3e
8 changed files with 50 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
app/views/measurements/_form.html.erb
View File

@@ -1,46 +1,35 @@
<div id="add-measurement" <%= 'style=display:none;' if @measurement.errors.empty? %>>
<h2><%= t ".heading_new_measurement" %></h2>
<%= error_messages_for @measurement %>
<%= labelled_form_for @measurement,
url: project_measurements_path(@project),
html: {id: 'measurement-add-form', name: 'measurement-add-form'} do |f| %>
<%= error_messages_for @measurement %>
<div class="box tabular">
<p><%= f.text_field :name, size: 40, required: true %></p>
<p><%= f.select :source_id, source_options, required: false, include_blank: true %></p>
<% @measurement.readouts.each_with_index do |r, index| %>
<%= f.fields_for 'readouts_attributes', r, index: '' do |ff| %>
<p class="readout">
<%= ff.select :quantity_id, quantity_options,
{include_blank: true, label: (index > 0 ? '' : :field_readouts)} %>
<%= ff.select :unit_id, unit_options, {label: ''} %>
<%= ff.check_box :_destroy, {style: "display:none", label: ''} %>
<%= link_to t(".button_delete_readout"), '#',
class: 'icon icon-del',
style: (@measurement.readouts.length > 1 ? "" : "display:none"),
onclick: "deleteReadout(); return false;" %>
</p>
<% end %>
<% end %>
<p>
<%= link_to t(".button_add_readout"), '#', class: 'icon icon-add',
onclick: 'addReadout(); return false;' %>
<div class="box tabular">
<p><%= f.select :source_id, source_options,
{required: false, include_blank: t('.null_source')} %></p>
<p><%= f.text_field :name, size: 40, required: true %></p>
<% @measurement.readouts.each_with_index do |r, index| %>
<%= f.fields_for 'readouts_attributes', r, index: '' do |ff| %>
<p class="readout">
<%= ff.select :quantity_id, quantity_options,
{include_blank: true, label: (index > 0 ? '' : :field_readouts)} %>
<%= ff.number_field :value, {size: 8, step: :any, label: ''} %>
<%= ff.select :unit_id, unit_options, {label: ''} %>
<%= ff.check_box :_destroy, {style: "display:none", label: ''} %>
<%= link_to t(".button_delete_readout"), '#',
class: 'icon icon-del',
style: (@measurement.readouts.length > 1 ? "" : "display:none"),
onclick: "deleteReadout(); return false;" %>
</p>
</div>
<%= submit_tag l(:button_create) %>
<%= link_to l(:button_cancel), "#",
onclick: '$("#add-measurement").hide(); return false;' %>
<% end %>
<% end %>
<hr>
<p>
<%= link_to t(".button_add_readout"), '#', class: 'icon icon-add',
onclick: 'addReadout(); return false;' %>
</p>
</div>
<%= javascript_tag do %>
function addReadout() {
var row = $('p.readout:visible:last');
var new_row = row.clone().insertAfter(row);
new_row.find('select[id$=_quantity_id]').val('');
new_row.find('input[id$=_value], select[id$=_quantity_id]').val('');
new_row.find('select[id$=_unit_id]').val(row.find('select[id$=_unit_id]').val());
new_row.find('label:first').text('');
if ($('p.readout:visible').length > 1) {

22
app/views/measurements/index.html.erb
View File

@@ -9,9 +9,27 @@
<% end %>
</div>
<%= render partial: 'measurements/form' %>
<div id="add-measurement" <%= 'style=display:none;' if @measurement.errors.empty? %>>
<h2><%= t ".heading_new_measurement" %></h2>
<%= labelled_form_for @measurement,
url: project_measurements_path(@project),
html: {id: 'measurement-add-form', name: 'measurement-add-form'} do |f| %>
<%= render partial: 'measurements/form', locals: {f: f} %>
<div class="tabular">
<p>
<%= submit_tag l(:button_create) %>
<%= link_to l(:button_cancel), "#",
onclick: '$("#add-measurement").hide(); return false;' %>
</p>
</div>
<% end %>
<hr>
</div>
<h2><%= t ".heading" %></h2>
<div id='measurements'>
<%= render partial: 'measurements/list' %>
<%= render partial: 'measurements/index' %>
</div>