Preliminary Target #new support

app/controllers/targets_controller.rb

@@ -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
 

app/helpers/body_trackers_helper.rb

@@ -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("#{' ' * q.level}#{q.name}")
+    end
+  end
+
   def unit_options
     @project.units.map do |u|
       [u.shortname, u.id]

app/helpers/foods_helper.rb

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

app/helpers/measurements_helper.rb

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

app/helpers/targets_helper.rb

@@ -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

app/models/target.rb

@@ -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

app/views/foods/_form.html.erb

@@ -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: ''} %>

app/views/goals/_form.html.erb

@@ -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>

app/views/goals/_show_form.html.erb

@@ -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>

app/views/measurement_routines/_show_form.html.erb

@@ -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>

app/views/measurements/_form.html.erb

@@ -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: ''} %>

app/views/targets/_form.html.erb

@@ -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 %>

app/views/targets/_new_form.html.erb

@@ -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>

app/views/targets/new.js.erb

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

config/locales/en.yml

@@ -27,6 +27,11 @@ en:
   activerecord:
     errors:
       models:
+        target:
+          attributes:
+            thresholds:
+              count_mismatch: 'count invalid for given condition'
+              quantity_mismatch: 'should refer to the same quantity'
         meal:
           attributes:
             ingredients:
@@ -34,7 +39,7 @@ en:
         measurement:
           attributes:
             readouts:
-              duplicated_quantity_unit_pair: 'each quantity+unit pair can only be specified
+              duplicated_quantity_unit_pair: 'each (quantity, unit) pair can only be specified
                 once per measurement'
         food:
           attributes:

config/routes.rb

@@ -7,6 +7,7 @@ resources :projects, shallow: true do
       post 'defaults'
     end
   end
+  resources :goals, only: [:show, :edit]
   resources :targets, except: [:show]
   resources :ingredients, only: [] do
     post 'adjust/:adjustment', to: 'meals#adjust', as: :adjust, on: :member

init.rb

@@ -14,6 +14,7 @@ Redmine::Plugin.register :body_tracking do
   project_module :body_tracking do
     permission :view_body_trackers, {
       body_trackers: [:index],
+      goals: [:show],
       targets: [:index],
       meals: [:index],
       measurement_routines: [:show],
@@ -25,6 +26,7 @@ Redmine::Plugin.register :body_tracking do
     }, read: true
     permission :manage_common, {
       body_trackers: [:defaults],
+      goals: [:edit],
       targets: [:new, :create, :edit, :update, :destroy],
       meals: [:new, :create, :edit, :update, :destroy, :edit_notes, :update_notes,
               :toggle_eaten, :toggle_exposure, :adjust],

lib/body_tracking/project_patch.rb

@@ -29,7 +29,11 @@ module BodyTracking::ProjectPatch
     has_many :meal_quantities, -> { order "lft" }, through: :meal_exposures,
       source: 'quantity'
 
-    has_many :thresholds, through: :quantities
-    has_many :targets, through: :thresholds, source_type: 'Target'
+    has_many :goals, dependent: :destroy do
+      def binding
+        find_or_create_by(name: "binding")
+      end
+    end
+    has_many :targets, through: :goals
   end
 end