Redmine/body_tracking
Archived
1
0
Fork 0
Code Releases Activity

Preliminary Target #new support

Browse Source
This commit is contained in:
cryptogopher
2020-06-27 21:52:32 +02:00
parent 1dd2e2b596
commit 0df2c6ec4f
18 changed files with 177 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/targets_controller.rb
View File

@@ -5,14 +5,14 @@ class TargetsController < ApplicationController
include Concerns::Finders
before_action :find_project_by_project_id, only: [:index]
before_action :find_project_by_project_id, only: [:index, :new]
def index
prepare_targets
end
def new
@target = @project.targets.new
@target = (@goal || @project.goals.binding).targets.new
@target.arity.times { @target.thresholds.new }
end

6
app/helpers/body_trackers_helper.rb
View File

@@ -32,6 +32,12 @@ module BodyTrackersHelper
options_for_select(options, disabled: 0)
end
def quantity_options(domain = :all)
nested_set_options(@project.quantities.send(domain)) do |q|
raw("#{'&ensp;' * q.level}#{q.name}")
end
end
def unit_options
@project.units.map do |u|
[u.shortname, u.id]

6
app/helpers/foods_helper.rb
View File

@@ -1,10 +1,4 @@
module FoodsHelper
def quantity_options
nested_set_options(@project.quantities.diet) do |q|
raw("#{'&ensp;' * q.level}#{q.name}")
end
end
def visibility_options(selected)
options = [["visible", 1], ["hidden", 0]]
options_for_select(options, selected)

6
app/helpers/measurements_helper.rb
View File

@@ -5,12 +5,6 @@ module MeasurementsHelper
.html_safe
end
def quantity_options
nested_set_options(@project.quantities.measurement) do |q|
raw("#{'&ensp;' * q.level}#{q.name}")
end
end
def source_options
@project.sources.map do |s|
[s.name, s.id]

13
app/helpers/targets_helper.rb Normal file
View File

@@ -0,0 +1,13 @@
module TargetsHelper
def condition_options
Target::CONDITIONS.each_with_index.to_a
end
def action_links(m)
link_to(l(:button_retake), retake_measurement_path(m, @view_params),
{remote: true, class: "icon icon-reload"}) +
link_to(l(:button_edit), edit_measurement_path(m, @view_params),
{remote: true, class: "icon icon-edit"}) +
delete_link(measurement_path(m), {remote: true, data: {}})
end
end

20
app/models/target.rb
View File

@@ -1,5 +1,7 @@
class Target < ActiveRecord::Base
belongs_to :goal, inverse_of: :targets
CONDITIONS = [:<, :<=, :>, :>=, :==]
belongs_to :goal, inverse_of: :targets, required: true
belongs_to :item, polymorphic: true, inverse_of: :targets
has_many :thresholds, as: :registry, inverse_of: :target, dependent: :destroy,
validate: true
@@ -7,19 +9,25 @@ class Target < ActiveRecord::Base
validates :thresholds, presence: true
accepts_nested_attributes_for :thresholds, allow_destroy: true,
reject_if: proc { |attrs| attrs['quantity_id'].blank? && attrs['value'].blank? }
# TODO: validate thresholds count according to condition type
validates :condition, inclusion: {in: [:<, :<=, :>, :>=, :==]}
validate do
errors.add(:thresholds, :count_mismatch) unless thresholds.count == arity
errors.add(:thresholds, :quantity_mismatch) if thresholds.to_a.uniq(&:quantity) != 1
end
validates :condition, inclusion: {in: CONDITIONS }
validates :scope, inclusion: {in: [:day], if: -> { thresholds.first.domain == :diet }}
validates :effective_from, presence: {unless: -> { goal.present? }},
absence: {if: -> { goal.present? }}
validates :effective_from, presence: {unless: :is_binding?}, absence: {if: :is_binding?}
after_initialize do
if new_record?
self.condition = :<
self.condition = CONDITIONS.first
end
end
def arity
BigDecimal.method(condition).arity
end
def is_binding?
goal == goal.project.goals.binding
end
end

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

@@ -25,7 +25,7 @@
<%= f.fields_for 'nutrients_attributes', n, index: '' do |ff| %>
<p class="nutrient">
<%= ff.hidden_field :id %>
<%= ff.select :quantity_id, quantity_options,
<%= ff.select :quantity_id, quantity_options(:diet),
{include_blank: true, required: true, label: (index > 0 ? '' : :field_nutrients)} %>
<%= ff.number_field :amount, {size: 8, min: 0, step: :any, label: ''} %>
<%= ff.select :unit_id, unit_options, {label: ''} %>

13
app/views/goals/_form.html.erb Normal file
View File

@@ -0,0 +1,13 @@
<div class="tabular">
<%= fields_for 'measurement[routine_attributes]', routine do |ff| %>
<%= ff.hidden_field :id %>
<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%;" %>
</p>
<% end %>
</div>

27
app/views/goals/_show_form.html.erb Normal file
View File

@@ -0,0 +1,27 @@
<div>
<%= fields_for 'target[goal_attributes]', goal do |ff| %>
<p>
<label><%= l(:field_goal) %><span class="required"> *</span></label>
<%= ff.select :id,
options_from_collection_for_select(@project.goals, :id, :name, goal.id),
{required: true}, autocomplete: 'off',
onchange: "var goal_id = $('#target_goal_attributes_id').val();
$.ajax({
url: '#{goal_path(id: :goal_id)}'.replace('goal_id', goal_id),
dataType: 'script'
});
return false;" %>
<%= link_to l(:button_edit), '#',
onclick: "var goal_id = $('#target_goal_attributes_id').val();
$.ajax({
url: '#{edit_goal_path(id: :goal_id)}'.replace('goal_id', goal_id),
dataType: 'script'
});
return false;",
class: 'icon icon-edit' %>
</p>
<% end %>
<% if goal.description? %>
<p style='white-space: pre-wrap;' ><%= goal.description %></p>
<% end %>
</div>

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

@@ -21,7 +21,7 @@
class: 'icon icon-edit' %>
</p>
<% end %>
<% unless routine.description.empty? %>
<% if routine.description? %>
<p style='white-space: pre-wrap;' ><%= routine.description %></p>
<% end %>
</div>

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

@@ -30,7 +30,7 @@
<%= f.fields_for 'readouts_attributes', r, index: '' do |ff| %>
<p class="readout">
<%= ff.hidden_field :id %>
<%= ff.select :quantity_id, quantity_options,
<%= ff.select :quantity_id, quantity_options(:measurement),
{include_blank: true, required: true, label: (index > 0 ? '' : :field_readouts)} %>
<%= ff.number_field :value, {size: 8, step: :any, label: ''} %>
<%= ff.select :unit_id, unit_options, {label: ''} %>

65
app/views/targets/_form.html.erb Normal file
View File

@@ -0,0 +1,65 @@
<%= error_messages_for @target %>
<div class="box">
<div id='goal-form' class="tabular">
<% if @target.goal.persisted? %>
<%= render partial: 'goals/show_form', locals: {goal: @target.goal} %>
<%= f.date_field(:effective_from, required: true) if @target.is_binding? %>
<% else %>
<%= render partial: 'goals/form', locals: {goal: @target.goal} %>
<% end %>
</div>
<hr style="width: 95%;">
<div class="tabular">
<p class="target">
<% @target.thresholds.each_with_index do |t, index| %>
<%= f.fields_for 'thresholds_attributes', t, index: '' do |ff| %>
<% if index == 0 %>
<%= ff.select :quantity_id, quantity_options,
{include_blank: true, required: true, label: :field_target} %>
<%= f.select :condition, condition_options, required: true %>
<% end %>
<%= ff.hidden_field :id %>
<%= ff.number_field :value, {size: 8, step: :any, label: ''} %>
<% if index == 0 %>
<%= ff.select :unit_id, unit_options, {label: ''} %>
<% end %>
<% end %>
<% end %>
<%= link_to t(".button_delete_target"), '#',
class: 'icon icon-del',
onclick: "deleteTarget(); return false;" %>
</p>
<%= link_to t(".button_new_target"), '#',
class: 'icon icon-add',
onclick: 'newTarget(); return false;' %>
</div>
</div>
<%= javascript_tag do %>
function newReadout() {
var form = $(event.target).closest('form');
var row = form.find('p.readout:visible:last');
var new_row = row.clone().insertAfter(row);
new_row.find('input[id$=__id], 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('input[id$=__destroy]').val('');
new_row.find('label:first').hide();
form.find('p.readout:visible a.icon-del').show();
}
function deleteReadout() {
var form = $(event.target).closest('form');
var row = $(event.target).closest('p.readout');
if (row.find('input[id$=__id]').val()) {
row.hide();
row.find('input[id$=__destroy]').val('1');
} else {
row.remove();
}
form.find('p.readout:visible:first label:first').show();
if (form.find('p.readout:visible').length <= 1) {
form.find('p.readout:visible a.icon-del').hide();
}
}
<% end %>

18
app/views/targets/_new_form.html.erb Normal file
View File

@@ -0,0 +1,18 @@
<h2><%= t ".heading_new_target" %></h2>
<%= labelled_form_for @target,
url: project_targets_path(@project, @view_params),
remote: true,
html: {id: 'new-target-form', name: 'new-target-form'} do |f| %>
<%= render partial: 'targets/form', locals: {f: f} %>
<div class="tabular">
<p>
<%= submit_tag l(:button_create) %>
<%= link_to l(:button_cancel), "#",
onclick: '$("#new-target").empty(); return false;' %>
</p>
</div>
<% end %>
<hr>

1
app/views/targets/new.js.erb Normal file
View File

@@ -0,0 +1 @@
$('#new-target').html('<%= j render partial: 'targets/new_form' %>');