renalware-core 2.0.100 → 2.0.101

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa7d57a0adfff2d76fadc4c11c9442fa83d82ca6dd5f01dcca5cfbf4226e0a9
-  data.tar.gz: 7a7c0329c9a32aac0da27b4165ab2bb1f1c9dd111729d4d86cbfaacab46040d8
+  metadata.gz: be1dd365f062fce54445146b4623f13ae28d5ccc97c0530d78b8c4f9e57a4dc5
+  data.tar.gz: 1b610c630f72fdb4f66585eeb3fbaf6d659ea5ea8f5b3effbbc2d5d12d64f898
 SHA512:
-  metadata.gz: 8f73fec51538a54fa18a57c9f3d2b009f8f64ce1253d7c9a43eb5cc1d19164fcba654b9ec43a976733359a833873299c1c7b199abe75e54d3baf9f3bb8478118
-  data.tar.gz: f9117254aad358aa7d265db64cfeeba583be6a8cac7c707e33440e8827659abe75529c4c8bcf17e92f4532d1eb10790fb3a498aaba4018f9ed39b9f82a8ef1cd
+  metadata.gz: ac5d3ea6f737b6bd9b2fef873c0caf1385747eedc1a010c1b7cb136b63422d223ea648e13cb73a6ae05c8afe9504efdb28f851644e131abf6e047c0908dd2ec7
+  data.tar.gz: 535b8985590dc9ee936a504371a0807d4396c8a5e95c3e616217bd3646751de4ccf2cf5a91609a928abbc0395f33b824e0ff71947d761c43f6413626a026ba15

data/app/controllers/renalware/hd/stations_controller.rb

@@ -9,7 +9,7 @@ module Renalware
       include PresenterHelper
 
       def index
-        stations = Station.for_unit(unit_id).ordered
+        stations = Station.for_unit(unit_id).includes(:location).ordered
         authorize stations
         render locals: {
           unit_id: unit_id,

data/app/controllers/renalware/hospitals/units_controller.rb

@@ -24,7 +24,7 @@ module Renalware
       end
 
       def index
-        hospital_units = Unit.all
+        hospital_units = Unit.includes(:hospital_centre).all
         authorize hospital_units
         render locals: { hospital_units: hospital_units }
       end

data/app/helpers/renalware/policy_helper.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Renalware
+  module PolicyHelper
+    def pundit_policy_for(klass)
+      Pundit.policy(
+        current_user,
+        klass.new
+      )
+    end
+  end
+end

data/app/models/renalware/hospitals/centre.rb

@@ -5,7 +5,12 @@ require_dependency "renalware/hospitals"
 module Renalware
   module Hospitals
     class Centre < ApplicationRecord
-      has_many :units, class_name: "Hospitals::Unit", foreign_key: :hospital_centre_id
+      has_many(
+        :units,
+        class_name: "Hospitals::Unit",
+        foreign_key: :hospital_centre_id,
+        dependent: :restrict_with_exception
+      )
 
       scope :ordered, -> { order(:name) }
       scope :active, -> { where(active: true) }
@@ -19,6 +24,10 @@ module Renalware
         units.hd_sites.ordered
       end
 
+      def self.policy_class
+        BasePolicy
+      end
+
       def to_s
         if location.present?
           "#{name} (#{location})"

data/app/models/renalware/hospitals/ward.rb

@@ -13,10 +13,6 @@ module Renalware
       scope :ordered, -> { order(:name) }
       scope :active, -> { where(active: true) }
 
-      def self.policy_class
-        BasePolicy
-      end
-
       def to_s
         name
       end

data/app/policies/renalware/hd/station_policy.rb

@@ -6,6 +6,10 @@ module Renalware
       def sort?
         edit?
       end
+
+      def index
+        true
+      end
     end
   end
 end

data/app/policies/renalware/hospitals/ward_policy.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Hospitals
+    class WardPolicy < BasePolicy
+      def index?
+        true
+      end
+    end
+  end
+end

data/app/presenters/renalware/hd/station_presenter.rb

@@ -12,6 +12,10 @@ module Renalware
 
         "background-color: #{location&.colour}"
       end
+
+      def self.policy_class
+        StationPolicy
+      end
     end
   end
 end

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+xml = builder
+
+observation_times = {
+  pre: session.performed_on + session.start_time.seconds_since_midnight.seconds,
+  post: session.performed_on + session.end_time.seconds_since_midnight.seconds
+}
+
+{
+  pre: session.document.observations_before,
+  post: session.document.observations_after
+}.each do |pre_post, observations|
+  measurements = {
+    "blood_pressure.systolic" => observations.blood_pressure&.systolic,
+    "blood_pressure.diastolic" => observations.blood_pressure&.diastolic,
+    "weight" => observations.weight,
+    "bm_stix" => observations.bm_stix,
+  }
+
+  if observations.temperature_measured == :yes
+    measurements["temperature"] = observations.temperature
+  end
+
+  if observations.respiratory_rate_measured == :yes
+    measurements["respiratory_rate"] = observations.respiratory_rate
+  end
+
+  measurements.each do |i18n_key, value|
+    xml.Observation do
+      xml.ObservationTime observation_times[pre_post].iso8601
+      xml.ObservationCode do
+        xml.CodingStandard "PV"
+        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
+    end
+  end
+end

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

@@ -9,6 +9,10 @@ xml.Medications do
       if prescription.terminated_or_marked_for_termination?
         xml.ToTime prescription.terminated_on&.to_datetime
       end
+      xml.EnteringOrganization do
+        xml.CodingStandard "ODS"
+        xml.Code Renalware.config.ukrdc_site_code
+      end
       xml.Route do
         xml.CodingStandard "RR22"
         xml.Code prescription.medication_route&.rr_code

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

@@ -35,4 +35,7 @@ xml.Observations(
            i18n_key: "height",
            builder: builder
   end
+  patient.finished_hd_sessions.each do |session|
+    render "hd_session_observations", session: session, builder: builder
+  end
 end

data/app/views/renalware/api/ukrdc/patients/treatments/_hd.xml.builder

@@ -8,10 +8,12 @@ xml.Treatment do
   xml.FromTime treatment.started_on&.iso8601
   xml.ToTime(treatment.ended_on&.iso8601) if treatment.ended_on.present?
 
-  if treatment.hospital_unit.present?
-    xml.HealthCareFacility do
-      xml.CodingStandard "ODS"
+  xml.HealthCareFacility do
+    xml.CodingStandard "ODS"
+    if treatment.hospital_unit.present?
       xml.Code treatment.hospital_unit.renal_registry_code
+    else
+      xml.Code Renalware.config.ukrdc_site_code
     end
   end
 

data/app/views/renalware/hd/stations/_station.html.slim

@@ -1,6 +1,9 @@
 tr.sortable(id="hd-station-#{station.id}")
-  td= link_to "Edit", edit_hd_unit_station_path(station.hospital_unit_id, station)
+  td
+    - if policy(station).update?
+      = link_to "Edit", edit_hd_unit_station_path(station.hospital_unit_id, station)
   td= station.name
   td= station.location&.name
-  td.handle
-    i.fas.fa-bars
+  - if policy(station).sort?
+    td.handle
+      i.fas.fa-bars

data/app/views/renalware/hd/stations/_table.html.slim

@@ -4,6 +4,7 @@ table.hd-stations
       th.col-width-tiny
       th.col-width-large Name
       th Location
-      th.col-width-tiny Reorder
+      - if policy(Renalware::HD::Station.new).sort?
+        th.col-width-tiny Reorder
   tbody.sortables data-rel=sort_hd_unit_stations_path(unit_id: unit_id)
     = render stations

data/app/views/renalware/hd/stations/index.html.slim

@@ -4,9 +4,10 @@
                  breadcrumb_for(unit.unit_code, edit_hospitals_unit_path(unit))]
 
 = content_for(:actions) do
-  = link_to t("new_record.link_title"),
-            new_hd_unit_station_path(unit_id: unit.id),
-            class: "button"
+  - if policy(Renalware::HD::Station.new).create?
+    = link_to t("new_record.link_title"),
+              new_hd_unit_station_path(unit_id: unit.id),
+              class: "button"
 
 = within_admin_layout(title: "HD Stations", breadcrumbs: breadcrumbs) do
 

data/app/views/renalware/hospitals/units/index.html.slim

@@ -1,5 +1,6 @@
 = content_for(:actions) do
-  = link_to t("new_record.link_title"), new_hospitals_unit_path, class: "button"
+  - if pundit_policy_for(Renalware::Hospitals::Centre).create?
+    = link_to t("new_record.link_title"), new_hospitals_unit_path, class: "button"
 
 = within_admin_layout(title: "Hospital Units") do
 
@@ -19,12 +20,14 @@
       - hospital_units.each do |unit|
         tr
           td
-            = link_to "Edit", edit_hospitals_unit_path(unit.id)
-            = pipe_separator
-            = link_to "Delete",
-                      hospitals_unit_path(unit.id),
-                      method: :delete,
-                      data: { confirm: I18n.t("prompts.confirm_delete") }
+            - if policy(unit).edit?
+              = link_to "Edit", edit_hospitals_unit_path(unit.id)
+              = pipe_separator
+            - if policy(unit).destroy?
+              = link_to "Delete",
+                        hospitals_unit_path(unit.id),
+                        method: :delete,
+                        data: { confirm: I18n.t("prompts.confirm_delete") }
           td= unit.unit_code
           td= unit.name
           td= unit.hospital_centre
@@ -33,8 +36,11 @@
           td= yes_no unit.is_hd_site
           td= Renalware::HD::Station.where(hospital_unit_id: unit.id).count
           td.actions
-            = link_to("HD Stations", hd_unit_stations_path(unit))
-            = pipe_separator
-            = link_to("HD Diaries", hd_unit_diaries_path(unit))
-            = pipe_separator
-            = link_to("Wards", hospitals_unit_wards_path(unit))
+            - if pundit_policy_for(Renalware::HD::Station).index?
+              = link_to("HD Stations", hd_unit_stations_path(unit))
+              = pipe_separator
+            - if pundit_policy_for(Renalware::HD::Diary).index?
+              = link_to("HD Diaries", hd_unit_diaries_path(unit))
+            - if pundit_policy_for(Renalware::Hospitals::Ward).index?
+              = pipe_separator
+              = link_to("Wards", hospitals_unit_wards_path(unit))

data/app/views/renalware/hospitals/wards/index.html.slim

@@ -1,7 +1,8 @@
 = content_for(:actions) do
-  = link_to "Add",
-          new_hospitals_unit_ward_path(unit),
-          class: "button"
+  - if policy(Renalware::Hospitals::Ward.new).create?
+    = link_to "Add",
+            new_hospitals_unit_ward_path(unit),
+            class: "button"
 
 = within_admin_layout(title: "Wards", breadcrumbs: \
     breadcrumb_for(unit.name, hospitals_units_path)) do

data/app/views/renalware/navigation/_admin.html.slim

@@ -2,7 +2,6 @@ li.has-dropdown
   = link_to "Admin", "#"
   ul.dropdown
     li= link_to "Users", admin_users_path
-    li= link_to "Hospital Units", hospitals_units_path
     li= link_to "Request Form Print History", pathology_requests_requests_path
     li= link_to "Pathology Requesting Configuration", pathology_requests_rules_path
     li= link_to "HD Transmission Logs", hd_transmission_logs_path

data/app/views/renalware/navigation/_renal.html.slim

@@ -12,4 +12,5 @@ li.has-dropdown
     li= link_to t(".audits"), reporting_audits_path
     li= link_to t(".aki_alerts"), renal_aki_alerts_path
     li= link_to t(".studies"), research_studies_path
+    li= link_to t(".hospital_units"), hospitals_units_path
     li= link_to t(".renal_registry_checks"), patients_renal_registry_preflight_checks_path

data/config/locales/loinc_codes.yml

@@ -20,3 +20,15 @@ en:
       code: height
       description: Height Measured
       units: "cm"
+    temperature:
+      code: temperature
+      description: Temperature
+      units: "C"
+    bm_stix:
+      code: bm_stix
+      description: bm_stix
+      units: "?"
+    respiratory_rate:
+      code: respiratory_rate
+      description: respiratory_rate
+      units: "?"

data/config/locales/renalware/navigation/renal.en.yml

@@ -15,6 +15,7 @@ en:
         aki_alerts: AKI Alerts
         studies: Clinical Studies
         renal_registry_checks: Renal Registry Checks
+        hospital_units: Hospitals
       mdms:
         menu_title: MDMs
         hd: HD

data/config/permissions.yml

@@ -1,6 +1,8 @@
 super_admin:
   - Renalware::Role
   - Renalware::Hospitals::Ward
+  - Renalware::Hospitals::Centre
+  - Renalware::Hospitals::Unit
   - Renalware::HD::Dialysate
   - Renalware::HD::Dialyser
   - Renalware::HD::CannulationType
@@ -16,6 +18,5 @@ admin:
   - Renalware::Modality::Description
   - Renalware::OrganismCode
   - Renalware::PRDDescription
-  - Renalware::Hospitals::Unit
-  - Renalware::HD::Station
   - Renalware::HD::TransmissionLog
+  - Renalware::HD::Station

data/lib/renalware/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.100
+  version: 2.0.101
 platform: ruby
 authors:
 - Airslie
@@ -1324,6 +1324,7 @@ files:
 - app/helpers/renalware/pd_regime_bags_helper.rb
 - app/helpers/renalware/pd_regimes_helper.rb
 - app/helpers/renalware/pdf_helper.rb
+- app/helpers/renalware/policy_helper.rb
 - app/helpers/renalware/prescriptions_helper.rb
 - app/helpers/renalware/primary_care_physicians_helper.rb
 - app/helpers/renalware/problems_helper.rb
@@ -1895,6 +1896,7 @@ files:
 - app/policies/renalware/hd/open_session_policy.rb
 - app/policies/renalware/hd/session_policy.rb
 - app/policies/renalware/hd/station_policy.rb
+- app/policies/renalware/hospitals/ward_policy.rb
 - app/policies/renalware/letters/approved_letter_policy.rb
 - app/policies/renalware/letters/completed_letter_policy.rb
 - app/policies/renalware/letters/draft_letter_policy.rb
@@ -2148,6 +2150,7 @@ files:
 - app/views/renalware/api/ukrdc/patients/_documents.xml.builder
 - app/views/renalware/api/ukrdc/patients/_encounters.xml.builder
 - app/views/renalware/api/ukrdc/patients/_family_histories.xml.builder
+- app/views/renalware/api/ukrdc/patients/_hd_session_observations.xml.builder
 - app/views/renalware/api/ukrdc/patients/_lab_orders.xml.builder
 - app/views/renalware/api/ukrdc/patients/_medications.xml.builder
 - app/views/renalware/api/ukrdc/patients/_name.xml.builder