Medication values can now be captured when entering a medication, add…

…resses #697.

app/controllers/medications_controller.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Allows editors to track subject medications.
 class MedicationsController < ApplicationController
   before_action :authenticate_user!
   before_action :find_viewable_project_or_redirect, only: [:index, :show]
@@ -36,6 +39,7 @@ def new
   def create
     @medication = @subject.medications.where(project: @project).new(medication_params)
     if @medication.save
+      @medication.save_medication_variables!
       redirect_to [@project, @subject, @medication], notice: "Medication was successfully created."
     else
       render :new
@@ -45,6 +49,7 @@ def create
   # PATCH /medications/1
   def update
     if @medication.update(medication_params)
+      @medication.save_medication_variables!
       redirect_to [@project, @subject, @medication], notice: "Medication was successfully updated."
     else
       render :edit
@@ -66,15 +71,17 @@ def find_medication_or_redirect
 
   def medication_params
     params.require(:medication).permit(
-      :position, :name, :start_date_fuzzy_edit, :stop_date_fuzzy_edit,
+      :position, :name,
+      :start_date_fuzzy_edit, :stop_date_fuzzy_edit,
       :start_date_fuzzy_mo_1, :start_date_fuzzy_mo_2,
       :start_date_fuzzy_dy_1, :start_date_fuzzy_dy_2,
       :start_date_fuzzy_yr_1, :start_date_fuzzy_yr_2,
       :start_date_fuzzy_yr_3, :start_date_fuzzy_yr_4,
       :stop_date_fuzzy_mo_1, :stop_date_fuzzy_mo_2,
       :stop_date_fuzzy_dy_1, :stop_date_fuzzy_dy_2,
       :stop_date_fuzzy_yr_1, :stop_date_fuzzy_yr_2,
-      :stop_date_fuzzy_yr_3, :stop_date_fuzzy_yr_4
+      :stop_date_fuzzy_yr_3, :stop_date_fuzzy_yr_4,
+      medication_variables: {}
     )
   end
 end

app/models/concerns/medications.rb

@@ -7,5 +7,6 @@ module Medications
     # Relationships
     has_many :medication_variables, -> { current }
     has_many :medications
+    has_many :medication_values
   end
 end

app/models/medication.rb

@@ -14,6 +14,7 @@ class Medication < ApplicationRecord
   # Relationships
   belongs_to :project
   belongs_to :subject
+  has_many :medication_values
 
   attr_writer :start_date_fuzzy_mo_1, :start_date_fuzzy_mo_2,
               :start_date_fuzzy_dy_1, :start_date_fuzzy_dy_2,
@@ -24,7 +25,7 @@ class Medication < ApplicationRecord
               :stop_date_fuzzy_yr_1, :stop_date_fuzzy_yr_2,
               :stop_date_fuzzy_yr_3, :stop_date_fuzzy_yr_4
 
-  attr_accessor :start_date_fuzzy_edit, :stop_date_fuzzy_edit
+  attr_accessor :start_date_fuzzy_edit, :stop_date_fuzzy_edit, :medication_variables
 
   # Methods
 
@@ -206,14 +207,14 @@ def set_fuzzy_date(key)
       errors.add(key, "day should be 99 if month is unknown")
     elsif yr.present? && mo == 99 && dy == 99
       if yr <= Time.zone.today.year
-        date_string  = "#{yrs}#{mos}#{dys}"
+        date_string = "#{yrs}#{mos}#{dys}"
       else
         errors.add(:"#{key}_yr", "can't be in future")
         errors.add(key, "can't be in future")
       end
     elsif yr.present? && mo.present? && dy == 99
       if yr < Time.zone.today.year && mo.in?(1..12) || yr == Time.zone.today.year && mo.in?(1..Time.zone.today.month)
-        date_string  = "#{yrs}#{mos}#{dys}"
+        date_string = "#{yrs}#{mos}#{dys}"
       else
         errors.add(:"#{key}_yr", "can't be in future")
         errors.add(:"#{key}_mo", "can't be in future")
@@ -228,7 +229,7 @@ def set_fuzzy_date(key)
           errors.add(:"#{key}_dy", "can't be in future")
           errors.add(key, "can't be in future")
         else
-          date_string  = "#{yrs}#{mos}#{dys}"
+          date_string = "#{yrs}#{mos}#{dys}"
         end
       else
         errors.add(:"#{key}_yr", "invalid date")
@@ -247,6 +248,20 @@ def set_fuzzy_date(key)
   end
 
   def digit?(value)
-    return !(/^\d$/ =~ value).nil?
+    !(/^\d$/ =~ value).nil?
+  end
+
+  def save_medication_variables!
+    return if medication_variables.blank?
+
+    medication_variables.each do |key, value|
+      medication_variable = project.medication_variables.find_by(id: key)
+      next unless medication_variable
+
+      medication_value = medication_values.where(
+        project: project, subject: subject, medication_variable: medication_variable
+      ).first_or_create
+      medication_value.update(value: value)
+    end
   end
 end

app/models/medication_value.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Tracks a subject's medication value provided for a project medication
+# variable.
+class MedicationValue < ApplicationRecord
+  # Validations
+  validates :medication_variable_id, uniqueness: { scope: :medication_id }
+
+  # Relationships
+  belongs_to :project
+  belongs_to :medication_variable
+  belongs_to :subject
+  belongs_to :medication
+end

app/models/medication_variable.rb

@@ -12,4 +12,5 @@ class MedicationVariable < ApplicationRecord
 
   # Relationships
   belongs_to :project
+  has_many :medication_values
 end

app/models/subject.rb

@@ -36,6 +36,7 @@ def name
   has_many :ae_adverse_events, -> { current }
   has_many :randomizations, -> { current }
   has_many :medications, -> { current }
+  has_many :medication_values, -> { current }
   has_many :sheets, -> { current }
   has_many :subject_events, -> { joins(:event).order(:event_date, "events.position") }
 

app/views/medications/_form.html.haml

@@ -1,9 +1,13 @@
 = form_with model: [medication.project, medication.subject, medication], local: true do |form|
   = render "forms/horizontal/text_field", form: form, object: medication, key: :name, autocomplete: "off"
-  =# render "forms/horizontal/text_field", form: form, object: medication, key: :indication
-  =# render "forms/horizontal/text_field", form: form, object: medication, key: :dose
-  =# render "forms/horizontal/text_field", form: form, object: medication, key: :units
-  =# render "forms/horizontal/text_field", form: form, object: medication, key: :frequency
+
+  - @project.medication_variables.each do |medication_variable|
+    .form-group.row
+      = form.label medication_variable.name, nil, class: "col-md-2 col-form-label"
+      .col-md-10
+        - medication_value = medication.medication_values.find_by(medication_variable: medication_variable)
+        - value = params.dig(:medication, :medication_variables, medication_variable.id.to_s.to_sym) || medication_value&.value
+        = text_field_tag "medication[medication_variables][#{medication_variable.id}]", value, class: "form-control", autocomplete: "off", autocorrect: "off", autocapitalize: "none", spellcheck: "false"
 
   .form-group.row
     = form.label :start_date, "Start date", class: "col-md-2 col-form-label"

app/views/medications/show.html.haml

@@ -15,6 +15,10 @@
 .dashboard-container
   = render "forms/horizontal/show/text", object: @medication, key: :position
   = render "forms/horizontal/show/text", object: @medication, key: :name
+  - @project.medication_variables.each do |medication_variable|
+    - medication_value = @medication.medication_values.find_by(medication_variable: medication_variable)
+    = render "forms/horizontal/show/generic", title: medication_variable.name, content: medication_value&.value
+
   = render "forms/horizontal/show/generic", title: "Start date", content: @medication.fuzzy_pretty(:start_date_fuzzy)
   = render "forms/horizontal/show/generic", title: "Stop date", content: @medication.fuzzy_pretty(:stop_date_fuzzy)
 

db/migrate/20190307173518_create_medication_values.rb

@@ -0,0 +1,16 @@
+class CreateMedicationValues < ActiveRecord::Migration[6.0]
+  def change
+    create_table :medication_values do |t|
+      t.bigint :project_id
+      t.bigint :medication_variable_id
+      t.bigint :subject_id
+      t.bigint :medication_id
+      t.string :value
+      t.timestamps
+
+      t.index :project_id
+      t.index :subject_id
+      t.index [:medication_variable_id, :medication_id], unique: true, name: "index_med_values_on_medication_and_med_variable"
+    end
+  end
+end

test/controllers/medications_controller_test.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
+# Tests to assure project editors can create and update subject medications.
 class MedicationsControllerTest < ActionDispatch::IntegrationTest
   setup do
     @project_editor = users(:meds_project_editor)
@@ -12,7 +15,13 @@ def medication_params
     {
       name: @medication.name,
       start_date_fuzzy: @medication.start_date_fuzzy,
-      stop_date_fuzzy: @medication.stop_date_fuzzy
+      stop_date_fuzzy: @medication.stop_date_fuzzy,
+      medication_variables: {
+        medication_variables(:indication).id.to_s => "Some reason",
+        medication_variables(:unit).id.to_s => "tablespoon",
+        medication_variables(:frequency).id.to_s => "1X per day",
+        medication_variables(:route).id.to_s => "S.C. - subcutaneous"
+      }
     }
   end
 
@@ -31,7 +40,9 @@ def medication_params
   test "should create medication" do
     login(@project_editor)
     assert_difference("Medication.count") do
-      post project_subject_medications_url(@project, @subject), params: { medication: medication_params }
+      assert_difference("MedicationValue.count", 4) do
+        post project_subject_medications_url(@project, @subject), params: { medication: medication_params }
+      end
     end
     assert_redirected_to [@project, @subject, Medication.last]
   end

test/fixtures/medication_values.yml

@@ -0,0 +1,13 @@
+one:
+  project: medications
+  medication_variable: indication
+  subject: meds_01
+  medication: one
+  value: This is the reason.
+
+two:
+  project: medications
+  medication_variable: unit
+  subject: meds_01
+  medication: one
+  value: tablespoon

test/models/medication_value_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class MedicationValueTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end