renalware-core 2.0.106 → 2.0.108

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efb794ae27f5828ca612778342c373a1c21523c321b8d128fc375b599c73e6f5
-  data.tar.gz: 193b964ca2a0d8dddbe61fdf32ca7dec8a30b13d775d4f711e84f1d348adb0c5
+  metadata.gz: 5ddbc1bf89e7d3c6d32c617656f612b98929fab1110a56a48e52d53cc74251c0
+  data.tar.gz: a63750e0fc7606ae785449cef68320c84ceedebd983a4ca568341cea7bdf511b
 SHA512:
-  metadata.gz: 7897419fac1a376460c4f7e696ca853686845ba2a4c3918928dfc85964c1a3e2bede291f6db07fa7a3fef179e335fe9b0df62d8cf353278fb18a23d84b89d3fc
-  data.tar.gz: 61043d951f2a2c2194679f0ac9682ee7cb22181ebe3bbc8f51e01f2832facaaef79b8632ef34df056aa7db6c37d2ed4bc3fb2e39af17de9352ae4dbe8353ff9f
+  metadata.gz: 96ada68134d8d5a5fd76092e38a562ab0c3efdee4c6f7b3d2fc3eac00ef9ea2c7a51f97c43bed32c4647cb39da9e2b3243150f00001575a004d49d44f28310cd
+  data.tar.gz: 5539d4f554e53988a5de121af668fbaf7ae06fc709cf1c88aa3dac31a6e301238813b670dc2c255d2aa8d28079923f531facd3d459842ee12dc9c3a0debe2d14

data/app/documents/renalware/blood_group.rb

@@ -2,7 +2,7 @@
 
 module Renalware
   class BloodGroup < NestedAttribute
-    attribute :group, Document::Enum, enums: %i(A B O AB)
+    attribute :group, Document::Enum
     attribute :rhesus, Document::Enum, enums: %i(positive negative)
 
     def to_s

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

@@ -47,7 +47,7 @@ module Renalware
       attribute :dialysis, Dialysis
 
       class Anticoagulant < Document::Embedded
-        attribute :type, Document::Enum, enums: %i(heparin enoxyparin warfarin none)
+        attribute :type, Document::Enum # See .yml file for values
         attribute :loading_dose
         attribute :hourly_dose
         attribute :stop_time

data/app/models/renalware/hd/prescription_administration.rb

@@ -28,6 +28,7 @@ module Renalware
 
       def validate_administrator_and_witness?
         return false if skip_validation || not_administered?
+        return false unless Renalware.config.hd_session_prescriptions_require_signoff
 
         true
       end

data/app/models/renalware/ukrdc/treatment_timeline/generator_factory.rb

@@ -13,7 +13,9 @@ module Renalware
         # Each modality_description has a :code fiekd
         def self.call(modality)
           type = modality.description.code&.to_s&.camelize
-          (klass_for(type) || klass_for(DEFAULT_TYPE)).new(modality)
+          klass = (klass_for(type) || klass_for(DEFAULT_TYPE)).new(modality)
+          Rails.logger.info "GeneratorFactory type = #{type} class = #{klass}"
+          klass
         end
 
         def self.klass_for(type)

data/app/models/renalware/ukrdc/treatment_timeline/hd/generator.rb

@@ -80,7 +80,7 @@ module Renalware
           # - change of site
           # - change of hd_type to from hd and (hdf_pre || hdf_post)
           # - change of hd prescription
-          # Loop through the hd_profiles and trigger an new treatment when these change
+          # Loop through the hd_profiles and trigger a new treatment when any of these change
           # There is a problem here as we are creating duplicate treatments
           # I think we need to first find the hd profile that is associated with the hd modality
           # and that becomes the 'last_profile' here

data/app/models/renalware/ukrdc/treatment_timeline/transplant/generator.rb

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/ukrdc"
+require "attr_extras"
+
+# QBL   TXT   Description
+# "20"  "20"  "Transplant ; Cadaver donor"
+# "21"  "21"  "Transplant ; Live related - sibling"
+# "74"  "74"  "Transplant ; Live related - father"
+# "75"  "75"  "Transplant ; Live related - mother"
+# "77"  "77"  "Transplant ; Live related - child"
+# "23"  "23"  "Transplant ; Live related - other"
+# "24"  "24"  "Transplant ; Live genetically unrelated"
+# "25"  "25"  "Transplant ; Cadaver donor + transp other organ"
+# "26"  "26"  "Transplant ; Live donor + transplant other organ"
+# "27"  "27"  "Transplant ; Live donor non-UK transplant"
+# "28"  "28"  "Transplant ; non-heart-beating donor"
+# "29"  "29"  "Transplant ; type unknown"
+module Renalware
+  module UKRDC
+    module TreatmentTimeline
+      module Transplant
+        class Generator
+          pattr_initialize :modality
+          delegate :patient, to: :modality
+
+          UKRR_TXT = {
+            cadaver: 20,
+            unknown: 29,
+            live_related_other: 23,
+            live_related_sibling: 21,
+            live_related_father: 74,
+            live_related_mother: 75,
+            live_related_child: 77,
+            non_heart_beating: 28,
+            live_unrelated: 24
+          }.freeze
+
+          # We need to create a treatment record to match the UKRDC code expectations
+          # based on donor relationship.
+          # Otherwise Default to 29 Transplant ; type unknown
+          def call
+            create_treatment
+          end
+
+          private
+
+          def create_treatment
+            operation
+            Treatment.create!(
+              patient: modality.patient,
+              clinician: modality.created_by,
+              started_on: modality.started_on,
+              modality_id: modality.id,
+              modality_description_id: modality.description_id,
+              ended_on: modality.ended_on,
+              modality_code: ukrr_modality_code
+            )
+          end
+
+          def unknown_transplant_ukrr_modality_code
+            ukrr_modality_code_for_txt(UKRR_TXT[:unknown])
+          end
+
+          def ukrr_modality_code
+            return unknown_transplant_ukrr_modality_code if operation.nil?
+            return unknown_transplant_ukrr_modality_code if donor_type.nil?
+
+            if donor_type == :live_related
+              ukrr_modality_code_for_live_donor_relationship
+            else
+              ukrr_modality_code_for_txt(UKRR_TXT[donor_type])
+            end
+          end
+
+          def donor_type
+            operation.document.donor.type&.to_sym
+          end
+
+          def donor_relationship
+            operation.document.donor.relationship&.to_sym
+          end
+
+          # rubocop:disable Style/StringLiterals
+          def ukrr_modality_code_for_live_donor_relationship
+            key = :"live_related_#{donor_relationship || 'other'}"
+            ukrr_modality_code_for_txt(UKRR_TXT.fetch(key))
+          end
+          # rubocop:enable Style/StringLiterals
+
+          def ukrr_modality_code_for_txt(txt_code)
+            UKRDC::ModalityCode.find_by(txt_code: txt_code)
+          end
+
+          # Try and select an operation within the start and end dates of the modality
+          def operation
+            @operation ||= begin
+              Renalware::Transplants::RecipientOperation
+                .for_patient(patient)
+                .where(
+                  "performed_on >= ? and performed_on <= ?",
+                  modality.started_on,
+                  modality.ended_on || Time.zone.today
+                )
+                .order(performed_on: :desc)
+                .first
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/presenters/renalware/ukrdc/patient_presenter.rb

@@ -62,11 +62,16 @@ module Renalware
         )
       end
 
+      # Use DISTINCT ON (performed_on) and an order(performed_on: :desc) to make sure we only
+      # get one hd session per day - the last of the day. This is becuase currrently RW allows
+      # a duplicate session to be added, and this occasionally happens.
       def finished_hd_sessions
         hd_patient
           .finished_hd_sessions
           .includes(:patient, :dialysate, :updated_by)
+          .select("distinct on (hd_sessions.performed_on) *")
           .where("hd_sessions.updated_at > ?", changes_since)
+          .order(performed_on: :desc)
       end
 
       def current_registration_status_rr_code

data/app/views/renalware/api/ukrdc/patients/_clinic_visit_observation.xml.builder

@@ -1,23 +1,25 @@
 # frozen_string_literal: true
 
-return if visit.public_send(method).blank?
+measurement = visit.public_send(method)
 
-xml = builder
+if measurement.present? && measurement.to_f.nonzero?
+  xml = builder
+  i18n_key ||= method
 
-i18n_key ||= method
-xml.Observation do
-  xml.ObservationTime visit.datetime
+  xml.Observation do
+    xml.ObservationTime visit.datetime
 
-  xml.ObservationCode do
-    xml.CodingStandard "UKRR"
-    xml.Code I18n.t("loinc.#{i18n_key}.code")
-    xml.Description I18n.t("loinc.#{i18n_key}.description")
-  end
+    xml.ObservationCode do
+      xml.CodingStandard "UKRR"
+      xml.Code I18n.t("loinc.#{i18n_key}.code")
+      xml.Description I18n.t("loinc.#{i18n_key}.description")
+    end
 
-  xml.ObservationValue visit.public_send(method)
-  xml.ObservationUnits I18n.t("loinc.#{i18n_key}.units")
+    xml.ObservationValue measurement
+    xml.ObservationUnits I18n.t("loinc.#{i18n_key}.units")
 
-  xml.Clinician do
-    xml.Description visit.updated_by&.to_s
+    xml.Clinician do
+      xml.Description visit.updated_by&.to_s
+    end
   end
 end

data/app/views/renalware/api/ukrdc/patients/_hd_session_observations.xml.builder

@@ -18,17 +18,19 @@ observation_times = {
   }
 
   measurements.each do |i18n_key, value|
-    xml.Observation do
-      xml.ObservationTime observation_times[pre_post].iso8601
-      xml.ObservationCode do
-        xml.CodingStandard "UKRR"
-        xml.Code I18n.t("loinc.#{i18n_key}.code")
-        xml.Description I18n.t("loinc.#{i18n_key}.description")
-      end
+    if value.present? && value.to_f.nonzero?
+      xml.Observation do
+        xml.ObservationTime observation_times[pre_post].iso8601
+        xml.ObservationCode do
+          xml.CodingStandard "UKRR"
+          xml.Code I18n.t("loinc.#{i18n_key}.code")
+          xml.Description I18n.t("loinc.#{i18n_key}.description")
+        end
 
-      xml.ObservationValue value
-      xml.ObservationUnits I18n.t("loinc.#{i18n_key}.units")
-      xml.PrePost pre_post.to_s.upcase # eg PRE or POST
+        xml.ObservationValue value
+        xml.ObservationUnits I18n.t("loinc.#{i18n_key}.units")
+        xml.PrePost pre_post.to_s.upcase # eg PRE or POST
+      end
     end
   end
 end

data/app/views/renalware/hd/sessions/form/_drugs_to_be_administered.html.slim

@@ -18,8 +18,7 @@
                                  when false then "not-administered"
                                  else "undecided"
                                  end
-          # administration_klass = "not-administered" unless administration.administered?
-          #- administration_klass = "undecided" if administration.administered.nil?
+
         .hd-drug-administration(
           data-token-count="#{'2' if administration.administrator_authorised? && administration.witness_authorised?}"
           class="#{administration_klass}"
@@ -51,34 +50,35 @@
             = fpa.label :reason_id
             = fpa.association :reason, wrapper: :zilch
 
-          .authentication(
-            class="#{'disabled-with-faded-overlay' unless administration.administered?}"
-            data-authentication-url=renalware.hd_prescription_administration_authorisations_path
-          )
-            / Output username and password fields for administrator and witness
-            - { administrator: :administered, witness: :witnessed }.each do |user_role, prefix|
+          - if Renalware.config.hd_session_prescriptions_require_signoff
+            .authentication(
+              class="#{'disabled-with-faded-overlay' unless administration.administered?}"
+              data-authentication-url=renalware.hd_prescription_administration_authorisations_path
+            )
+              / Output username and password fields for administrator and witness
+              - { administrator: :administered, witness: :witnessed }.each do |user_role, prefix|
 
-              - authorised = administration.public_send(:"#{user_role}_authorised?")
-              - token_symbol = :"#{user_role}_authorisation_token"
-              .user-and-password(
-                class="user-and-password--#{user_role} #{'authorised' if authorised} #{'error' if fpa.object.errors[token_symbol].any?}"
-              )
-                = fpa.hidden_field token_symbol, class: "authentication-token"
-                = fpa.label :"#{prefix}_by"
-                = fpa.association :"#{prefix}_by",
-                                  as: :user_picker,
-                                  collection: Renalware::User.ordered,
-                                  wrapper: :zilch,
-                                  label: false,
-                                  input_html: { class: "authentication-user-id" }
+                - authorised = administration.public_send(:"#{user_role}_authorised?")
+                - token_symbol = :"#{user_role}_authorisation_token"
+                .user-and-password(
+                  class="user-and-password--#{user_role} #{'authorised' if authorised} #{'error' if fpa.object.errors[token_symbol].any?}"
+                )
+                  = fpa.hidden_field token_symbol, class: "authentication-token"
+                  = fpa.label :"#{prefix}_by"
+                  = fpa.association :"#{prefix}_by",
+                                    as: :user_picker,
+                                    collection: Renalware::User.ordered,
+                                    wrapper: :zilch,
+                                    label: false,
+                                    input_html: { class: "authentication-user-id" }
 
-                / Password is only visible as long as the user has not been authenticated
-                = password_field_tag :"#{prefix}_by_password",
-                                      "",
-                                      placeholder: "Password",
-                                      class: "user-password",
-                                      autocomplete: :off
-                small.error.invalid-password Invalid password
-                .confirmed
-                  i.fas.fa-check-circle
-                  = link_to "Clear", "#", class: "user-and-password--clear"
+                  / Password is only visible as long as the user has not been authenticated
+                  = password_field_tag :"#{prefix}_by_password",
+                                        "",
+                                        placeholder: "Password",
+                                        class: "user-password",
+                                        autocomplete: :off
+                  small.error.invalid-password Invalid password
+                  .confirmed
+                    i.fas.fa-check-circle
+                    = link_to "Clear", "#", class: "user-and-password--clear"

data/app/views/renalware/medications/prescriptions/_table.html.slim

@@ -21,7 +21,7 @@
               = sort_link_if(treatable.sortable?, search, :prescribed_on, "Prescribed on")
             th Prescribed By
             - unless current_scope
-              th Terminated On
+              th.col-width-date Terminated On
               th Terminated By
         tbody
           - prescriptions.each do |prescription|

data/config/locales/renalware/hd/profile.yml

@@ -51,6 +51,14 @@ en:
         hdf_pre: HDF-PRE
         hdf_post: HDF-POST
 
+    renalware/hd/profile_document/anticoagulant:
+      # The host app should implement this I18n key to specify available coagulants.
+      # See e.g. dummy/config/locales for anticoagulant types
+      # We always specify a Non option because enumerize complains if the key is not
+      # a non-empty array.
+      type:
+        none: None
+
     renalware/hd/profile_document/transport:
       type:
         ambulance_wheelchair: Ambulance (wheelchair)

data/lib/renalware/configuration.rb

@@ -83,6 +83,8 @@ module Renalware
     # of the PDF so we can examine its content
     config_accessor(:render_pdf_as_html_for_debugging) { false }
 
+    config_accessor(:hd_session_prescriptions_require_signoff) { true }
+
     # A host app can override this to add/remove/re-order the clinical summary display
     # Note these have to be strings - they mapped to constants in ClinicalSummaryPresenter.
     config_accessor(:page_layouts) {

data/lib/renalware/version.rb

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

data/spec/factories/ukrdc/modality_codes.rb

@@ -43,5 +43,59 @@ FactoryBot.define do
       txt_code { 111 }
       qbl_code { 111 }
     end
+
+    trait :type_unknown do
+      description { "Transplant ; type unknown" }
+      txt_code { 29 }
+      qbl_code { 29 }
+    end
+
+    trait :cadaver do
+      description { "Transplant ; Cadaver donor" }
+      txt_code { 20 }
+      qbl_code { 20 }
+    end
+
+    trait :live_related_sibling do
+      description { "Transplant ; Transplant; Live related - sibling" }
+      txt_code { 21 }
+      qbl_code { 21 }
+    end
+
+    trait :live_related_father do
+      description { "Transplant ; Transplant; Live related - father" }
+      txt_code { 74 }
+      qbl_code { 74 }
+    end
+
+    trait :live_related_mother do
+      description { "Transplant ; Transplant; Live related - mother" }
+      txt_code { 75 }
+      qbl_code { 75 }
+    end
+
+    trait :live_related_child do
+      description { "Transplant ; Transplant; Live related - child" }
+      txt_code { 77 }
+      qbl_code { 77 }
+    end
+
+    trait :live_related_other do
+      description { "Transplant ; Transplant; Live related - other" }
+      txt_code { 23 }
+      qbl_code { 23 }
+    end
+
+    trait :non_heart_beating do
+      description { "Transplant ; non-heart-beating donor" }
+      txt_code { 28 }
+      qbl_code { 28 }
+    end
+
+    trait :live_unrelated do
+      description { "Transplant ; Live genetically unrelated" }
+      txt_code { 24 }
+      qbl_code { 24 }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.106
+  version: 2.0.108
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-10 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.1
 - !ruby/object:Gem::Dependency
   name: devise-security
   requirement: !ruby/object:Gem::Requirement
@@ -660,14 +660,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.22.2
+        version: 2.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.22.2
+        version: 2.24.0
 - !ruby/object:Gem::Dependency
   name: rails-assets-mousetrap
   requirement: !ruby/object:Gem::Requirement
@@ -1864,7 +1864,7 @@ files:
 - app/models/renalware/ukrdc/treatment_timeline/prepare_tables.rb
 - app/models/renalware/ukrdc/treatment_timeline/remap_model_table_names_to_their_prepared_equivalents.rb
 - app/models/renalware/ukrdc/treatment_timeline/transfer_out/generator.rb
-- app/models/renalware/ukrdc/treatment_timeline/transplant/generator.rb.wip
+- app/models/renalware/ukrdc/treatment_timeline/transplant/generator.rb
 - app/models/renalware/ukrdc/xml_renderer.rb
 - app/models/renalware/user.rb
 - app/models/renalware/version.rb

data/app/models/renalware/ukrdc/treatment_timeline/transplant/generator.rb.wip

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency "renalware/ukrdc"
-require "attr_extras"
-
-# QBL   TXT   Description
-# "20"  "20"  "Transplant ; Cadaver donor"
-# "21"  "21"  "Transplant ; Live related - sibling"
-# "74"  "74"  "Transplant ; Live related - father"
-# "75"  "75"  "Transplant ; Live related - mother"
-# "77"  "77"  "Transplant ; Live related - child"
-# "23"  "23"  "Transplant ; Live related - other"
-# "24"  "24"  "Transplant ; Live genetically unrelated"
-# "25"  "25"  "Transplant ; Cadaver donor + transp other organ"
-# "26"  "26"  "Transplant ; Live donor + transplant other organ"
-# "27"  "27"  "Transplant ; Live donor non-UK transplant"
-# "28"  "28"  "Transplant ; non-heart-beating donor"
-# "29"  "29"  "Transplant ; type unknown"
-module Renalware
-  module UKRDC
-    module TreatmentTimeline
-      module Transplant
-        class Generator
-          pattr_initialize :modality
-          delegate :patient, to: :modality
-
-          # We need to create a treatment record to match the UKRDC code expectations
-          # based on donor relationship.
-          # Otherwise Default to 29 Transplant ; type unknown
-          def call
-
-          end
-        end
-      end
-    end
-  end
-end