renalware-core 2.0.128 → 2.0.129

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcc25b7970b1a6a9a6033894090703cc9354b3ee10327537ecf42fdc80348950
-  data.tar.gz: 28d5be9b91830c59bd3e9fd83ad8b20cfd8871cbcb34cdaaf30f93db5a746b86
+  metadata.gz: 156b1e1ab54f4596ebc2b14b72f0f82c1476191b8b0efbe035615136120ad49e
+  data.tar.gz: 05cc53cd4907c8545db2566f8ab8e33744821f50274b259212765b108a92c929
 SHA512:
-  metadata.gz: cd5a41ec02111a2748f7602799b84fac3d780f01c85c9109a906eca19273008bbb551c0a231797d34a85a59f8f2dfeb6917bac6c68bd0c4a244e0db7ffeb3b2a
-  data.tar.gz: dad6b4eb6d61d16fad025cabea2ef899cc579597dff259635c4e5027d29f98ba111fcfc428bd5930e239cf91f46bdc6312fd59ad22ee8827699dc642e51ca298
+  metadata.gz: 2c8b74079f3b0dcb8e7cc78ca57f01b8d81a5ca789c3f76f60c8bedac26cab9b5e78d57d2c41ac072c2acdf2adf528c1af653787ecf7548ded3abb4b8b90741c
+  data.tar.gz: c2e35bc6f3bf69085582d1905353b07a3e6d0f8fa20c6c180ea3d48d8d3910a125a71868302aee08ffcfe74c65fafc89dce41df30e217a7cdd486a061ce434da

data/app/controllers/renalware/low_clearance/profiles_controller.rb

@@ -33,7 +33,7 @@ module Renalware
       end
 
       def profile_params
-        params.require(:low_clearance_profile).permit(document: {})
+        params.require(:low_clearance_profile).permit(:referrer_id, document: {})
       end
     end
   end

data/app/documents/renalware/low_clearance/profile_document.rb

@@ -11,6 +11,8 @@ module Renalware
       attribute :dialysis_planned_on, Date
       attribute :predicted_esrf_date, Date
       attribute :referral_creatinine, Integer
+      # Note that referred_by is now used as 'Referred by notes' as we have a new referrer relation
+      # on the profile itself. We need to keep the document version around, so using for notes.
       attribute :referred_by, String
       attribute :education_status, Document::Enum
       attribute :referral_egfr, Decimal

data/app/models/renalware/low_clearance/profile.rb

@@ -10,6 +10,7 @@ module Renalware
       include Document::Base
       validates :patient, presence: true
       belongs_to :patient, touch: true
+      belongs_to :referrer
       has_document class_name: "Renalware::LowClearance::ProfileDocument"
       has_paper_trail class_name: "Renalware::LowClearance::Version",
                       on: [:create, :update, :destroy]

data/app/models/renalware/low_clearance/referrer.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/low_clearance"
+require "document/base"
+
+module Renalware
+  module LowClearance
+    class Referrer < ApplicationRecord
+      validates :name, presence: true, uniqueness: true
+      scope :ordered, -> { order(name: :asc) }
+
+      def to_s
+        name
+      end
+    end
+  end
+end

data/app/models/renalware/pathology/observations_grouped_by_date_query.rb

@@ -30,7 +30,6 @@ module Renalware
     #   1           2016-03-15        {"NA": "137", "TP": "74", "ALB": "48", "ALP": "71", ...
     #   1           2016-02-29        {"NA": "136", "TP": "78", "ALB": "47", "ALP": "71", ...
     #
-    #
     class ObservationsGroupedByDateQuery
       attr_reader :patient, :observation_descriptions, :page, :limit
       alias current_page page
@@ -66,10 +65,24 @@ module Renalware
         Pathology::Observation.none
       end
 
+      # Returns path results grouped by day, and on each day, a hash results keyed by OBX code
+      # containing an array of [result, comment]. The array and data structure is designed to
+      # save space over the wire and in memory - we could have retuned an array of hashes with
+      # code, result, comment keys etc.
+      # Note in jsonb_object_agg the final ORDER BY is by ASC when you would think it would be
+      # by DESC seeing as how we want to the latest result. However ASC works and DESC does not
+      # and I am not not sure why yet.
+      #
+      # Example output:
+      #
+      # 2016-12-06, "{""NA"": [""139"", """"], ""EGFR"": [""83"", ""adjusted original: 77""]}"
+      # 2016-10-20, "{""FOL"": [""6.4"", """"]}"
+      # 2016-09-04, "{""TSH"": [""0.36"", """"]}"
+      # ...
       def to_sql
         <<-SQL.squish
           select obs_req.patient_id, cast(observed_at as date) as observed_on,
-          jsonb_object_agg(obs_desc.code, ARRAY[obs.result, obs.comment]) results
+          jsonb_object_agg(obs_desc.code, ARRAY[obs.result, obs.comment] order by observed_at asc) results
           from pathology_observations obs
           inner join pathology_observation_requests obs_req on obs.request_id = obs_req.id
           inner join pathology_observation_descriptions obs_desc on obs.description_id = obs_desc.id

data/app/views/renalware/hd/sessions/_row.html.slim

@@ -37,7 +37,7 @@ tbody.hd-session-row(class=[session.state, stripe_class])
     td.nowrap= session.after_measurement_for(:bm_stix)
     td.nowrap= session.after_measurement_for(:blood_pressure)
     td.print-only= session.signed_off_by
-  tr
+  tr.noprint
     td(colspan=20)
       .quick-preview
         = definition_list_for(session, size: :large) do |list|

data/app/views/renalware/hd/sessions/_thead.html.slim

@@ -2,7 +2,7 @@ thead
   / - 20.times do
   /   colgroup
   tr
-    th
+    th.noprint
     th.noprint.col-width-small(rowspan=3)
     th.col-width-date(rowspan=3 valign="top")= t(".date")
     th.col-width-small= t(".site")

data/app/views/renalware/low_clearance/profiles/_summary.html.slim

@@ -19,6 +19,8 @@
       dd= document.predicted_esrf_date
       dt= t(".referral_creatinine")
       dd= document.referral_creatinine
+      dt= t(".referrer")
+      dd= profile.referrer
       dt= t(".referred_by")
       dd= document.referred_by
       dt= t(".education_status")

data/app/views/renalware/low_clearance/profiles/edit.html.slim

@@ -13,6 +13,7 @@
                     method: :put,
                     wrapper: "horizontal_form" do |f|
 
+
     = f.simple_fields_for :document, profile.document do |flc|
       = flc.input :first_seen_on, as: :date_picker, wrapper: :horizontal_datepicker
       = flc.input :dialysis_plan, wrapper: :horizontal_medium
@@ -20,6 +21,13 @@
       = flc.input :predicted_esrf_date, as: :date_picker, wrapper: :horizontal_datepicker
       = flc.input :referral_creatinine, wrapper: :horizontal_tiny
       = flc.input :referral_egfr, wrapper: :horizontal_tiny
+
+    = f.input :referrer_id,
+              wrapper: :horizontal_medium,
+              collection: Renalware::LowClearance::Referrer.ordered,
+              label: "Referred by"
+
+    = f.simple_fields_for :document, profile.document do |flc|
       = flc.input :referred_by, wrapper: :horizontal_medium
       = flc.input :education_status, wrapper: :horizontal_tiny
       = flc.input :education_type, wrapper: :horizontal_tiny

data/config/locales/renalware/low_clearance/profile.en.yml

@@ -9,7 +9,9 @@ en:
           dialysis_planned_on: Dialysis plan date
           predicted_esrf_date: Predicted ESRF date
           referral_creatinine: Referral CRE
-          referred_by: Referred by
+          referrer: Referred by
+          referrer_id: Referred by
+          referred_by: Referred by notes
           education_status: Education status
           referral_egfr: Referral eGFR
           education_type: Education type
@@ -30,7 +32,7 @@ en:
         predicted_esrf_date: Predicted ESRF date
         referral_creatinine: Referral CRE
         referral_egfr: Referral eGFR
-        referred_by: Referred by
+        referred_by: Referred by notes
         education_status: Education status
         education_type: Education type
         attended_on: Date attended educ.

data/db/migrate/20191213094611_create_low_clearance_referrers.rb

@@ -0,0 +1,21 @@
+class CreateLowClearanceReferrers < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      create_table :low_clearance_referrers do |t|
+        t.string :name, null: false, index: { unique: true }
+        t.boolean :hidden, null: false, default: false
+        t.timestamps null: false
+      end
+
+      add_reference(
+        :low_clearance_profiles,
+        :referrer,
+        references: :low_clearance_referrers,
+        index: true,
+        null: true
+      )
+
+      add_foreign_key :low_clearance_profiles, :low_clearance_referrers, column: :referrer_id
+    end
+  end
+end

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.128"
+  VERSION = "2.0.129"
 end

data/spec/support/pages/low_clearance/profile_page.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require_relative "../page_object"
+
+module Pages
+  module LowClearance
+    class ProfilePage < Pages::PageObject
+      pattr_initialize :patient
+
+      def add_or_edit
+        visit patient_low_clearance_dashboard_path(patient)
+
+        within ".page-actions" do
+          click_on "Add"
+          click_on "Profile"
+        end
+      end
+
+      def save
+        within ".form-actions" do
+          find('input[name="commit"]').click
+        end
+      end
+
+      def referred_by=(value)
+        select value, from: "Referred by"
+      end
+
+      def referred_by_notes=(value)
+        fill_in "Referred by notes", with: value
+      end
+
+      def date_first_seen=(value)
+        fill_in "Date first seen", with: value
+      end
+
+      def dialysis_plan=(value)
+        select value, from: "Dialysis plan"
+      end
+
+      def dialysis_plan_date=(value)
+        fill_in "Dialysis plan date", with: value
+      end
+
+      def predicted_esrf_date=(value)
+        fill_in "Predicted ESRF date", with: value
+      end
+
+      def referral_cre=(value)
+        fill_in "Referral CRE", with: value
+      end
+
+      def referral_efgr=(value)
+        fill_in "Referral eGFR", with: value
+      end
+
+      def education_status=(value)
+        select value, from: "Education status"
+      end
+
+      def education_type=(value)
+        select value, from: "Education type"
+      end
+
+      def date_attending=(value)
+        fill_in "Date attended educ.", with: value
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.128
+  version: 2.0.129
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview-component
@@ -1658,6 +1658,7 @@ files:
 - app/models/renalware/low_clearance/modality_description.rb
 - app/models/renalware/low_clearance/patient.rb
 - app/models/renalware/low_clearance/profile.rb
+- app/models/renalware/low_clearance/referrer.rb
 - app/models/renalware/low_clearance/version.rb
 - app/models/renalware/medications.rb
 - app/models/renalware/medications/dose_unit.rb
@@ -3723,6 +3724,7 @@ files:
 - db/migrate/20191205185835_update_survey_views.rb
 - db/migrate/20191209160151_add_patient_question_text_to_survey_responses.rb
 - db/migrate/20191209163151_update_survey_views_to_allow_free_text.rb
+- db/migrate/20191213094611_create_low_clearance_referrers.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -4087,6 +4089,7 @@ files:
 - spec/support/pages/clinical/profile_page.rb
 - spec/support/pages/letters/form.rb
 - spec/support/pages/letters/patient_letters.rb
+- spec/support/pages/low_clearance/profile_page.rb
 - spec/support/pages/medications/prescription_fom.rb
 - spec/support/pages/page_object.rb
 - spec/support/pathology_spec_helper.rb