renalware-core 2.0.124 → 2.0.125

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 965f9e69a6b55986cb882e50b82928bb99b2208966d7258a0fe5856d9a593db1
-  data.tar.gz: f93fa7318de181ff6177f5427570ad2fe005dad29845599ac7f27f606e49cd56
+  metadata.gz: f02d9c6095c5d84a50a76fb8b2b1a5c0167a5fbad53fbfdf886ac610e162dca3
+  data.tar.gz: fd8ac6bdca0f0b55ebb66c490ef77db34efca9f644ea88594d38fd74bb30d593
 SHA512:
-  metadata.gz: 4000b4914976fb5c97455c8301b81e2076c32cf0400bc566f4613842f01570583a30b89f4aceda79c84dd478f57f55151b280859866fa8b8277317d4cad505aa
-  data.tar.gz: 265d952f82bd209271be9b36abf72c2c556f5cbe729e3e0e74c6346d27c0bb82ca9425324fcc359199078811e34bca7de5d36a249c8fc33f6e5cfdd5399092d1
+  metadata.gz: 8ec5256950daad498967c57453f259a84fcace23c47006316c1e1a838d93db7edf0ea70353a875bece3dbd3c60c9fcafeab3c13c68a91f3ae3bb9897eab70da0
+  data.tar.gz: ac3ceff3c0f484bab79c5b00ca2bb78d64b6132455bb39e0eedad01163717be0b488c4107596ab0d93e8a0280fd835b3ad4940d80f37b147621b0780df294b67

data/app/assets/images/renalware/icons/more-horizontal.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-more-horizontal"><circle cx="12" cy="12" r="1"></circle><circle cx="19" cy="12" r="1"></circle><circle cx="5" cy="12" r="1"></circle></svg>

data/app/assets/images/renalware/icons/more-vertical.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-more-vertical"><circle cx="12" cy="12" r="1"></circle><circle cx="12" cy="5" r="1"></circle><circle cx="12" cy="19" r="1"></circle></svg>

data/app/assets/stylesheets/renalware/modules/_surveys.scss

@@ -0,0 +1,58 @@
+$survey-0: #fff;
+$survey-1: #FFF8E8;
+$survey-2: #FFE8B4;
+$survey-3: #FFB81C;
+$survey-4: #ED8B00;
+
+dl.pos-s-key {
+  font-size: .9rem;
+  margin-top: 2rem;
+
+  dt, dd {
+    display: inline-block;
+    padding-right: .2rem;
+  }
+
+  dd {
+    padding: 0 .2rem;
+    margin-right: 1rem;
+  }
+
+  dt {
+    padding: 0 .5rem;
+    text-align: center;
+    border-radius: 3px;
+    border: solid 1px #DDD;
+    margin-right: .2rem;
+  }
+}
+
+.pos-s--0 {
+  background-color: $survey-0;
+}
+
+.pos-s--1 {
+  background-color: $survey-1;
+}
+
+.pos-s--2 {
+  background-color: $survey-2;
+}
+
+.pos-s--3 {
+  background-color: $survey-3;
+}
+
+.pos-s--4 {
+  background-color: $survey-4;
+}
+
+.summary-part--pos_s table {
+  td {
+    text-align: center;
+
+    &:first-child {
+      text-align: left;
+    }
+  }
+}

data/app/controllers/renalware/medications/prescriptions_controller.rb

@@ -65,6 +65,7 @@ module Renalware
         gp_provider_code = Provider.codes.find { |code| code == :gp }
         prescription = Prescription.new(treatable: treatable, provider: gp_provider_code)
         prescription.build_termination
+        prescription.prescribed_on = Date.current
         prescription
       end
 

data/app/controllers/renalware/pathology/requests/requests_controller.rb

@@ -104,6 +104,7 @@ module Renalware
             Pathology::OrderedPatientQuery
               .new(patient_ids)
               .call
+              .includes(:current_observation_set, :rules)
           authorize Renalware::Patient
         end
 

data/app/controllers/renalware/pd/peritonitis_episodes_controller.rb

@@ -124,7 +124,7 @@ module Renalware
             :catheter_removed, :line_break, :exit_site_infection,
             :diarrhoea, :abdominal_pain, :fluid_description_id, :white_cell_total,
             :white_cell_neutro, :white_cell_lympho, :white_cell_degen,
-            :white_cell_other, :notes, { episode_types: [] }
+            :white_cell_other, :notes, episode_types: []
           )
       end
     end

data/app/helpers/renalware/layout_helper.rb

@@ -69,7 +69,7 @@ module Renalware
       old_formats = formats
       begin
         self.formats = [format]
-        return yield
+        yield
       ensure
         self.formats = old_formats
       end

data/app/helpers/renalware/primary_care_physicians_helper.rb

@@ -13,8 +13,9 @@ module Renalware
       if primary_care_physician.practices.any?
         return practices_list(primary_care_physician.practices)
       end
+
       if primary_care_physician.address.present?
-        return format_address(primary_care_physician.address)
+        format_address(primary_care_physician.address)
       end
     end
 

data/app/helpers/renalware/toggle_helper.rb

@@ -30,5 +30,17 @@ module Renalware
         content_tag(:i)
       end
     end
+
+    def th_toggle_all_rows
+      content_tag(:th, class: "noprint togglers") do
+        table_toggler(link_title: "Toggle all rows")
+      end
+    end
+
+    def td_toggle_row(row_selector)
+      content_tag(:td, class: "noprint") do
+        toggler(row_selector)
+      end
+    end
   end
 end

data/app/models/renalware/feeds/files/practice_memberships/import_job.rb

@@ -11,7 +11,7 @@ module Renalware
           include Feeds::Job
           FILE_TO_EXTRACT_FROM_ARCHIVE = /epracmem.csv/.freeze
 
-          # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+          # rubocop:disable Metrics/AbcSize
           # TODO: refactor
           def perform(file)
             logging_to_stringio(strio = StringIO.new)
@@ -27,7 +27,7 @@ module Renalware
           ensure
             file.update!(status: status, result: strio.string, time_taken: elapsed_ms)
           end
-          # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+          # rubocop:enable Metrics/AbcSize
 
           private
 

data/app/models/renalware/letters/letter_query.rb

@@ -7,7 +7,7 @@ module Renalware
     module QueryableLetter
       extend ActiveSupport::Concern
       included do
-        self.ransacker :effective_date, type: :date do
+        ransacker :effective_date, type: :date do
           Arel.sql(Letter.effective_date_sort)
         end
 

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

@@ -5,7 +5,7 @@ require_dependency "renalware/pathology"
 module Renalware
   module Pathology
     class ObservationForPatientObservationDescriptionUsingSetQuery
-      pattr_initialize :patient, :observation_description
+      pattr_initialize :patient, :observation_description_code
 
       # Fetches the patient's most recent observation for the supplied observation_description.code
       # (eg 'HGB') using the patient's current_observation_set jsonb hash and returnd something
@@ -13,7 +13,7 @@ module Renalware
       def call
         return {} unless patient.current_observation_set
 
-        patient.current_observation_set.values.fetch(observation_description.code, {})
+        patient.current_observation_set.values.fetch(observation_description_code, {})
       end
     end
   end

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

@@ -10,12 +10,26 @@ module Renalware
         @observation_description = request_description.required_observation_description
       end
 
+      # I tried to switch over here to pulling the results from current_observation_set but]
+      # the dates seemed to be one year ahead in the test suite
       def call
-        @patient
-          .observations
-          .where(description: @observation_description)
-          .order(observed_at: :desc)
-          .first
+        return if @observation_description.nil?
+
+        return if @patient.current_observation_set.nil?
+
+        result = @patient.current_observation_set.values[@observation_description.code]
+        if result
+          OpenStruct.new(
+            observed_on: Time.zone.parse(result["observed_at"]).to_date,
+            result: result["result"].to_f
+          )
+        end
+
+        # @patient
+        #   .observations
+        #   .where(description: @observation_description)
+        #   .order(observed_at: :desc)
+        #   .first
       end
     end
   end

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

@@ -40,6 +40,10 @@ module Renalware
         current_observation_set || build_current_observation_set
       end
 
+      def current_drug_ids
+        @current_drug_ids ||= prescriptions.current.pluck(:drug_id).uniq
+      end
+
       private
 
       def date_for_algorithms

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

@@ -7,19 +7,21 @@ module Renalware
     class RequestForPatientRequestDescriptionQuery
       def initialize(patient, request_description)
         @patient = patient
-        @request_description = Renalware::Pathology::RequestDescription.find(request_description.id)
+        @request_description = request_description
       end
 
       def call
         @patient
           .requests
-          .eager_load(:request_descriptions)
+          .includes(request_descriptions: :required_observation_description)
           .where(
             pathology_request_descriptions_requests_requests: {
               request_description_id: @request_description.id
             }
           )
           .order(created_at: :desc)
+          .limit(1)
+          .pluck(:created_at)
           .first
       end
     end

data/app/models/renalware/pathology/requests/global_algorithm.rb

@@ -22,7 +22,10 @@ module Renalware
         private
 
         def rule_sets
-          GlobalRuleSet.for_clinic(@clinic).ordered
+          GlobalRuleSet
+            .for_clinic(@clinic)
+            .ordered
+            .eager_load(:rules, request_description: :required_observation_description)
         end
       end
     end

data/app/models/renalware/pathology/requests/global_rule/observation_result.rb

@@ -17,19 +17,25 @@ module Renalware
           end
 
           def to_s
-            "#{observation_description.code} " \
+            "#{observation_description_code} " \
             " #{param_comparison_operator} " \
             "#{param_comparison_value}"
           end
 
-          def observation_description
-            @observation_description ||= ObservationDescription.find_by(id: param_id)
+          # def observation_description
+          #   @observation_description ||= ObservationDescription.where(id: param_id).first
+          # end
+
+          def observation_description_code
+            @observation_description_code ||= begin
+              ObservationDescription.where(id: param_id).pluck(:code).first
+            end
           end
 
           private
 
           def observation_description_present
-            return if observation_description.present?
+            return if observation_description_code.present?
 
             errors.add(:param_id, "param_id must be the id of an ObservationDescription")
           end
@@ -37,7 +43,13 @@ module Renalware
 
         class PatientGlobalRuleDecision
           pattr_initialize :patient, :rule
-          delegate :param_comparison_operator, :param_comparison_value, :param_id, to: :rule
+          delegate(
+            :param_comparison_operator,
+            :param_comparison_value,
+            :param_id,
+            :observation_description_code,
+            to: :rule
+          )
 
           def observation_required_for_patient?
             return true if observation.blank?
@@ -63,7 +75,7 @@ module Renalware
               # The call returns eg { "result" => "123", "observed_on" => "2019-01-01" }
               ObservationForPatientObservationDescriptionUsingSetQuery.new(
                 patient,
-                observation_description
+                observation_description_code
               ).call["result"]
 
               # ObservationForPatientObservationDescriptionQuery.new(
@@ -73,9 +85,9 @@ module Renalware
             end
           end
 
-          def observation_description
-            rule.observation_description ||= ObservationDescription.new(id: param_id)
-          end
+          # def observation_description_code
+          #   rule.observation_description_code # ||= ObservationDescription.new(id: param_id)
+          # end
         end
       end
     end

data/app/models/renalware/pathology/requests/global_rule/prescription_drug.rb

@@ -10,7 +10,7 @@ module Renalware
           validate :drug_present
 
           def observation_required_for_patient?(patient, _date)
-            patient.drugs.exists?(id: param_id)
+            patient.current_drug_ids.include?(param_id.to_i)
           end
 
           def to_s

data/app/models/renalware/pathology/requests/global_rule/prescription_drug_category.rb

@@ -10,7 +10,7 @@ module Renalware
           validate :drug_category_present
 
           def observation_required_for_patient?(patient, _date)
-            (patient.drugs.pluck(&:id) & drug_ids).any?
+            (patient.current_drug_ids & drug_ids).any?
           end
 
           def to_s
@@ -20,7 +20,7 @@ module Renalware
           private
 
           def drug_ids
-            drug_category.drugs.pluck(&:id)
+            drug_category.drugs.pluck(:id)
           end
 
           def drug_category

data/app/models/renalware/pathology/requests/global_rule/prescription_drug_type.rb

@@ -11,9 +11,7 @@ module Renalware
 
           def observation_required_for_patient?(patient, _date)
             patient
-              .drugs
-              .select(:id)
-              .joins(:classifications)
+              .prescriptions.current.joins(drug: :classifications)
               .where("drug_types_drugs.drug_type_id = ?", param_id)
               .count > 0
           end

data/app/models/renalware/pathology/requests/global_rule/request_result.rb

@@ -36,7 +36,7 @@ module Renalware
           end
 
           def request_description
-            RequestDescription.find_by(id: param_id)
+            RequestDescription.eager_load(:required_observation_description).find_by(id: param_id)
           end
 
           def request_description_present

data/app/models/renalware/pathology/requests/global_rule_set/patient_rule_set_decision.rb

@@ -32,14 +32,14 @@ module Renalware
           end
 
           def last_request_still_being_processed?
-            return false if last_request.nil? || last_request_has_an_observation_result?
+            return false if last_request_date.nil? || last_request_has_an_observation_result?
 
             expiration_days = rule_set.request_description.expiration_days
             return false if expiration_days == 0
 
             # This subtraction works because ActiveSupport::TimeWithZone works in days
             # e.g. TimeWithZone1 - TimeWithZone2 = 3 days
-            requested_days_ago = date - last_request.requested_on
+            requested_days_ago = date - last_request_date.to_date
             requested_days_ago < expiration_days
           end
 
@@ -53,7 +53,7 @@ module Renalware
           # NB request.requested_on == request.created_at
           def last_request_has_an_observation_result?
             last_observation.present? &&
-              last_observation.observed_on > last_request.requested_on
+              last_observation.observed_on > last_request_date
           end
 
           def last_observation
@@ -64,8 +64,17 @@ module Renalware
               ).call
           end
 
-          def last_request
-            @last_request ||=
+          # def last_request
+          #   raise 'u'
+          #   @last_request ||=
+          #     RequestForPatientRequestDescriptionQuery.new(
+          #       patient,
+          #       rule_set.request_description
+          #     ).call
+          # end
+
+          def last_request_date
+            @last_request_date ||=
               RequestForPatientRequestDescriptionQuery.new(
                 patient,
                 rule_set.request_description

data/app/models/renalware/pd/create_regime.rb

@@ -14,9 +14,9 @@ module Renalware
       def call(by:, params:)
         regime = patient.pd_regimes.new(params)
         if regime.valid? && save_regime(regime, by)
-          return ::Renalware::Success.new(regime)
+          ::Renalware::Success.new(regime)
         else
-          return ::Renalware::Failure.new(regime)
+          ::Renalware::Failure.new(regime)
         end
       end