renalware-core 2.0.152 → 2.0.158

data/app/models/renalware/transplants/registration.rb

@@ -10,9 +10,7 @@ module Renalware
       include PatientScope
 
       belongs_to :patient, touch: true
-      has_many :statuses,
-               class_name: "RegistrationStatus",
-               foreign_key: "registration_id"
+      has_many :statuses, class_name: "RegistrationStatus"
       has_one :current_status,
               -> { where(terminated_on: nil).order([:started_on, :created_at]) },
               class_name: "RegistrationStatus",

data/app/models/renalware/transplants/registrations/wait_list_query.rb

@@ -42,7 +42,7 @@ module Renalware
           def having_ukt_recipient_number(number)
             return all if number.blank?
 
-            where(<<-SQL, number)
+            where(<<-SQL.squish, number)
               transplant_registrations.document -> 'codes' ->> 'uk_transplant_patient_recipient_number' = ?
             SQL
           end
@@ -83,7 +83,7 @@ module Renalware
 
         attr_reader :q, :named_filter, :ukt_recipient_number
 
-        # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
+        # rubocop:disable Metrics/MethodLength
         def query_for_filter(filter)
           case filter
           when :all
@@ -102,7 +102,7 @@ module Renalware
             {} # See Scopes
           end
         end
-        # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength
+        # rubocop:enable Metrics/MethodLength
 
         class QueryableRegistration < ActiveType::Record[Registration]
           scope :current_status_in, lambda { |codes|
@@ -136,7 +136,7 @@ module Renalware
           end
 
           ransacker :ukt_status do
-            Arel.sql(<<-SQL)
+            Arel.sql(<<-SQL.squish)
               COALESCE(
                 transplant_registrations.document -> 'uk_transplant_centre' ->> 'status',
                 ''

data/app/models/renalware/ukrdc/measurement_unit.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/ukrdc"
+
+module Renalware
+  module UKRDC
+    # Represents a valid UKRDC pathology test result measurement unit e.g. "mg".
+    # See https://github.com/renalreg/ukrdc/blob/master/Schema/Types/CF_RR23.xsd
+    class MeasurementUnit < ApplicationRecord
+      validates :name, presence: true
+
+      # A friendly string containing the name folllowed by the description (if present)
+      # in parentheses e.g. "l (litres)"
+      def title
+        return name if description.blank? || name == description
+
+        "#{name} (#{description})"
+      end
+    end
+  end
+end

data/app/models/renalware/ukrdc/outgoing/rendering/lab_order.rb

@@ -16,12 +16,16 @@ module Renalware
 
           def lab_order_element
             Ox::Element.new("LabOrder").tap do |lab_order|
+              lab_order << receiving_location_element
               lab_order << create_node("PlacerId", request.placer_id)
               lab_order << order_category_element
               lab_order << create_node("SpecimenCollectedTime", request.requested_at&.iso8601)
               lab_order << create_node("SpecimenSource", request.description.bottle_type)
               lab_order << result_items_element
               lab_order << create_node("EnteredOn", request.requested_at.iso8601)
+              lab_order << entered_at_element
+              lab_order << entering_organisation_element
+              lab_order << create_node("ExternalId", request.placer_id)
             end
           end
 
@@ -63,15 +67,39 @@ module Renalware
           end
 
           # If the rr_type of the observation_description is interpretation (ie an interpretted
-          # result like POS NEG the out
+          # result like POS NEG then output the interpretation_code
           def rr_type_value_elements_for(observation, append_to:)
             if observation.rr_type_interpretation?
               append_to << create_node("InterpretationCodes", observation.interpretation_code)
             else
-              append_to << create_node("ResultValue", observation.result)
+              append_to << create_node("ResultValue", observation.result.strip)
               append_to << create_node("ResultValueUnits", observation.measurement_unit_name)
             end
           end
+
+          def entered_at_element
+            create_node("EnteredAt").tap do |elem|
+              elem << create_node("CodingStandard", "RR1+")
+              elem << create_node("Code", Renalware.config.ukrdc_sending_facility_name)
+              elem << create_node("Description", Renalware.config.ukrdc_sending_facility_name)
+            end
+          end
+
+          def entering_organisation_element
+            create_node("EnteringOrganization").tap do |elem|
+              elem << create_node("CodingStandard", "RR1+")
+              elem << create_node("Code", Renalware.config.ukrdc_sending_facility_name)
+              elem << create_node("Description", Renalware.config.ukrdc_sending_facility_name)
+            end
+          end
+
+          def receiving_location_element
+            create_node("ReceivingLocation").tap do |elem|
+              elem << create_node("CodingStandard", "RR1+")
+              elem << create_node("Code", Renalware.config.ukrdc_sending_facility_name)
+              elem << create_node("Description", Renalware.config.ukrdc_sending_facility_name)
+            end
+          end
         end
       end
     end

data/app/models/renalware/ukrdc/paths.rb

@@ -7,7 +7,7 @@ module Renalware
     class Paths
       attr_reader :timestamp, :batch_number, :working_path
 
-      def initialize(timestamp: nil, batch_number:, working_path:)
+      def initialize(batch_number:, working_path:, timestamp: nil)
         raise(ArgumentError, "Invalid working_path") if working_path.blank?
 
         @timestamp = timestamp

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

@@ -15,7 +15,7 @@ module Renalware
         def self.call
           Treatment.delete_all
           connection = ActiveRecord::Base.connection
-          result = connection.execute(<<-SQL)
+          result = connection.execute(<<-SQL.squish)
             select 1 where exists(select 1 from pg_proc where proname = 'ukrdc_prepare_tables');
           SQL
           if result.ntuples == 1

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

@@ -56,7 +56,7 @@ module Renalware
         end
 
         def table_exists?(table_name)
-          result = connection.execute(<<-SQL)
+          result = connection.execute(<<-SQL.squish)
             SELECT 1
             WHERE EXISTS (
               SELECT 1 FROM information_schema.tables WHERE table_name = '#{table_name}')

data/app/models/renalware/virology/vaccination.rb

@@ -18,7 +18,12 @@ module Renalware
 
       class Document < Document::Embedded
         attribute :type, ::Document::Enum # See i18n for options
+        attribute :drug, String
         validates :type, presence: true
+
+        def to_s
+          [type&.text, drug].reject(&:blank?).join(" - ")
+        end
       end
       has_document
     end

data/app/policies/application_policy.rb

@@ -13,7 +13,7 @@ class ApplicationPolicy
   end
 
   def show?
-    scope.where(id: record.id).exists?
+    scope.exists?(id: record.id)
   end
 
   def new?

data/app/policies/renalware/medications/prescription_policy.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Medications
+    class PrescriptionPolicy < BasePolicy
+      def new?
+        super && user_is_a_prescriber?
+      end
+
+      def create?
+        super && user_is_a_prescriber?
+      end
+
+      def edit?
+        super && user_is_a_prescriber?
+      end
+
+      def update?
+        super && user_is_a_prescriber?
+      end
+
+      def destroy?
+        super && user_is_a_prescriber?
+      end
+
+      private
+
+      def user_is_a_prescriber?
+        return true unless Renalware.config.enforce_user_prescriber_flag
+
+        user.prescriber?
+      end
+    end
+  end
+end

data/app/policies/renalware/system/view_metadata_policy.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/system"
+
+module Renalware
+  module System
+    class ViewMetadataPolicy < BasePolicy
+      def edit?
+        user_is_super_admin?
+      end
+
+      def restore?
+        edit?
+      end
+    end
+  end
+end

data/app/presenters/concerns/renalware/accountable_presentation.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_dependency "renalware"
+
+module Renalware
+  # Helper methods to mix in to a Presenter class when displaying objects which include
+  # the Accountable module - ie they have updated_by/at properties.
+  module AccountablePresentation
+    extend ActiveSupport::Concern
+
+    def effective_updated_by
+      return unless been_updated?
+
+      updated_by&.full_name
+    end
+
+    def effective_updated_at_date
+      return unless been_updated?
+
+      updated_at&.to_date
+    end
+
+    def effective_updated_at
+      return unless been_updated?
+
+      updated_at
+    end
+
+    def been_updated?
+      updated_at > created_at
+    end
+  end
+end

data/app/presenters/renalware/clinics/visit_presenter.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/clinics"
+
+module Renalware
+  module Clinics
+    class VisitPresenter < DumbDelegator
+      include ::Renalware::AccountablePresentation
+    end
+  end
+end

data/app/presenters/renalware/events/event_presenter.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/events"
+
+module Renalware
+  module Events
+    class EventPresenter < DumbDelegator
+      include ::Renalware::AccountablePresentation
+    end
+  end
+end

data/app/presenters/renalware/mdm_presenter.rb

@@ -90,6 +90,17 @@ module Renalware
       end
     end
 
+    # Note we sort prescriptions by prescribed_on desc here manually because the
+    # prescriptions query is currently too complex to add another sql sort into (defaults)
+    # to sorting by drug name
+    def bone_prescriptions
+      @bone_prescriptions ||= begin
+        execute_prescriptions_query(
+          patient.prescriptions.having_drug_of_type("bone/Ca/PO4")
+        ).sort_by(&:prescribed_on).reverse!
+      end
+    end
+
     def current_problems
       @current_problems ||= patient.problems.current.limit(6).with_created_by.ordered
     end

data/app/presenters/renalware/pathology/results_presenter.rb

@@ -8,8 +8,7 @@ module Renalware
     # view model for Observation results.
     #
     class ResultsPresenter
-      attr_reader :paginator
-      attr_reader :view_model
+      attr_reader :paginator, :view_model
 
       def present(results, paginator)
         @results = results

data/app/presenters/renalware/renal/clinical_summary_presenter.rb

@@ -10,12 +10,15 @@ module Renalware
 
       # Host application may override the order or add other summary presenters
       def summary_parts(current_user)
-        Renalware
-          .config
-          .page_layouts[:clinical_summary]
-          .map(&:constantize)
-          .map { |klass| klass.new(patient, current_user) }
-          .select(&:render?)
+        part_class_names = Renalware.config.page_layouts[:clinical_summary]
+        part_class_names.each_with_object([]) do |class_name, arr|
+          klass = class_name.constantize
+          arr << if class_name.end_with?("Component")
+                   klass.new(patient: patient, current_user: current_user)
+                 else
+                   klass.new(patient, current_user)
+                 end
+        end.select(&:render?)
       end
     end
   end

data/app/views/renalware/admin/playgrounds/show.html.slim

@@ -21,12 +21,8 @@ css:
 
 = within_new_admin_layout(title: "Admin Playground") do
 
-  article
-    header
-      h2 Pathology Charts
-    span A testbed for trying out highchart linecharts
-    br
-    br
+  = render(Renalware::ArticleComponent.new(title: "Pathology Charts")) do
+    p A testbed for trying out highchart linecharts
 
     .chart-container(data-controller="charts"
                     data-charts-url=pathology_chart_data_admin_playground_path)

data/app/views/renalware/admin/users/edit.html.slim

@@ -52,6 +52,15 @@
               checked_value: "true",
               unchecked_value: "false",
               wrapper: :horizontal_small
+
+    - if current_user.has_role?(:super_admin)
+      = f.input :prescriber,
+                as: :boolean,
+                hint: " User will able to add/edit/terminate prescriptions".html_safe,
+                checked_value: "true",
+                unchecked_value: "false",
+                wrapper: :horizontal_small
+
     - msg = user.approved? ? "Update" : "Approve"
     = f.submit msg, class: "button"
     '  or

data/app/views/renalware/admin/users/index.html.slim

@@ -20,6 +20,7 @@
       th.col-width-tiny= sort_link(user_search, :approved, "Approved")
       th.col-width-tiny= sort_link(user_search, :hidden, "Hidden")
       th.col-width-tiny= sort_link(user_search, :consultant, "Consultant")
+      th.col-width-tiny= sort_link(user_search, :prescriber, "Prescriber")
       th.col-width-date= sort_link(user_search, :expired_at, "Expired On")
       th.col-width-date-time.show-for-large-up= sort_link(user_search, :current_sign_in_at, "Current sign in")
       th.col-width-date-time.show-for-large-up= sort_link(user_search, :last_sign_in_at, "Last sign in")
@@ -58,6 +59,11 @@
               i.far.fa-check-square
             - else
               i.muted.unapproved.far.fa-square
+          td
+            - if user.prescriber?
+              i.far.fa-check-square
+            - else
+              i.muted.unapproved.far.fa-square
           td.expired= l(user.expired_at&.to_date)
           td.show-for-large-up= l(user.current_sign_in_at)
           td.show-for-large-up= l(user.last_sign_in_at)

data/app/views/renalware/admissions/admissions/_filters.html.slim

@@ -1,23 +1,15 @@
-.search-form.filters
+.search-form.filters.filters--flex.max-w-screen-md
   = simple_form_for form,
       as: :query,
       url: admissions_admissions_path,
       method: :get do |f|
 
-    .row
-      .columns.medium-2.large-3
-        = f.input :term
-
-      .columns.medium-3.large-2
-        = f.input :hospital_unit_id,
-                  collection: Renalware::Hospitals::Unit.pluck(:name, :id)
-      .columns.medium-2.large-2
-        = ward_dropdown_grouped_by_hospital_unit(f, :hospital_ward_id, label: "Ward", wrapper: nil)
-      .columns.medium-3.large-3
-        = f.input :status,
-                  collection: form.status_dropdown_options,
-                  include_blank: "Any"
-      .columns.medium-2.large-2.actions.end
-        = f.submit "Filter", class: "button"
+    .flex.flex-col.sm:flex-row.items-end.pb-4
+      .w-full.sm:max-w-xs.pr-2= f.input :term
+      .w-full.pr-2= f.input :hospital_unit_id, collection: Renalware::Hospitals::Unit.pluck(:name, :id)
+      .w-full.sm:min-w-md.pr-2= ward_dropdown_grouped_by_hospital_unit(f, :hospital_ward_id, label: "Ward", wrapper: nil)
+      .w-full.sm:min-w-xs.pr-2= f.input :status, collection: form.status_dropdown_options, include_blank: "Any"
+      .flex-shrink-0.pt-4.filters--actions
+        = f.submit "Filter", class: "button", style: "margin: 0"
         '  or
         = link_to t("helpers.reset"), admissions_admissions_path

data/app/views/renalware/clinical/allergies/_list.html.slim

@@ -16,6 +16,7 @@ article.clinical-allergies
       tr
         th.col-width-large= t(".description")
         th.col-width-date-time= t(".recorded_at")
+        th.col-width-medium= t(".recorded_by")
         th.col-width-tiny
     tbody
       - delete_confirmation_msg = I18n.t("prompts.confirm_delete_with_model", model: "allergy")
@@ -23,7 +24,8 @@ article.clinical-allergies
         tr data-allergy-id=allergy.id
           td= allergy.description
           td = l(allergy.recorded_at)
-          td.right
+          td = allergy.created_by
+          td.actions
             = link_to t(".delete"),
                       patient_clinical_allergy_path(patient_id: patient, id: allergy),
                       method: :delete,