renalware-core 2.0.149 → 2.0.156

data/app/policies/renalware/renal/registry_preflight_check_policy.rb

@@ -12,6 +12,10 @@ module Renalware
       def patients?
         index?
       end
+
+      def missing_esrf?
+        index?
+      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/clinical/profile_presenter.rb

@@ -6,6 +6,7 @@ module Renalware
   module Clinical
     class ProfilePresenter
       attr_reader :patient, :params
+
       delegate :allergies, :document, to: :patient
 
       def initialize(patient:, params:)

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/hd/dashboard_presenter.rb

@@ -6,6 +6,7 @@ module Renalware
   module HD
     class DashboardPresenter
       attr_accessor :patient
+
       delegate :has_ever_been_on_hd?, to: :patient
 
       def initialize(patient, view_context, current_user)

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

@@ -4,6 +4,7 @@ module Renalware
   module HD
     class ProfilePresenter < DumbDelegator
       attr_reader :preference_set
+
       delegate :dialysis,
                :anticoagulant,
                :transport,

data/app/presenters/renalware/hd/scheduling/diary_presenter.rb

@@ -8,6 +8,7 @@ module Renalware
     module Scheduling
       class DiaryPresenter
         attr_reader :user, :weekly_diary, :master_diary, :null_diary
+
         delegate :id, :hospital_unit_id, :to_s, :week, :created_at, to: :weekly_diary
 
         # https://github.com/avdi/naught

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

@@ -10,6 +10,7 @@ module Renalware
       }.freeze
 
       attr_reader :preference_set
+
       delegate :info,
                :observations_before,
                :observations_after,

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

@@ -28,7 +28,7 @@ module Renalware
         value = yield(value) if block_given?
         return value if preference_satisfied?(attribute)
 
-        content_tag(:b, value)
+        tag.b(value)
       end
 
       def preference_satisfied?(attribute)

data/app/presenters/renalware/mdm_patients_presenter.rb

@@ -5,6 +5,7 @@ module Renalware
   class MDMPatientsPresenter
     include PresenterHelper
     attr_reader :patients, :view_proc, :page_title, :q
+
     def initialize(patients:,
                    view_proc:,
                    page_title:,

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/pd/dashboard_presenter.rb

@@ -29,13 +29,21 @@ module Renalware
 
       def peritonitis_episodes
         @peritonitis_episodes ||= begin
-          episodes = PeritonitisEpisode.for_patient(patient).ordered.includes(:episode_types)
+          episodes = PeritonitisEpisode
+            .for_patient(patient)
+            .ordered
+            .includes(:episode_types, infection_organisms: :organism_code)
           present(episodes, PeritonitisEpisodePresenter)
         end
       end
 
       def exit_site_infections
-        @exit_site_infections ||= ExitSiteInfection.for_patient(patient).ordered
+        @exit_site_infections ||= begin
+          ExitSiteInfection
+            .for_patient(patient)
+            .includes(infection_organisms: :organism_code)
+            .ordered
+        end
       end
 
       def pet_adequacies

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/presenters/renalware/ukrdc/patient_presenter.rb

@@ -9,6 +9,7 @@ module Renalware
       UKRDC_MAX_PHONE_LEN = 80
 
       attr_reader :changes_since, :changes_up_until
+
       delegate :prd_description, to: :profile, allow_nil: true
       delegate :code, :term, to: :prd_description, allow_nil: true, prefix: true
 

data/app/presenters/renalware/user_session_presenter.rb

@@ -31,7 +31,7 @@ module Renalware
             "login-path": urls.new_user_session_path,
             "check-alive-path": urls.check_session_expired_path,
             "keep-alive-path": urls.keep_session_alive_path,
-            debug: Rails.env.development?.to_s,
+            debug: Rails.env.development?.to_s, # eg "true" or "false"
             "register-user-activity-after":
               Renalware.config.session_register_user_user_activity_after.to_i,
             timeout: ::Devise.timeout_in

data/app/validators/renalware/patients/nhs_number_validator.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Patients
+    # Validates an NHS number which should be 10 characters long and confirm to the modulo 11
+    # algorithm where the 10th character is a check digit.
+    class NHSNumberValidator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        return if value.blank?
+
+        Validator.new(record, attribute, value).validate
+      end
+
+      class Validator
+        pattr_initialize :record, :attribute, :number
+        LENGTH = 10
+
+        def validate
+          strip_spaces_from_nhs_number
+          validate_length
+          validate_numeric
+          validate_using_modulus_11
+        end
+
+        private
+
+        def strip_spaces_from_nhs_number
+          @record[attribute] = @number = @number.delete(" ")
+        end
+
+        def validate_length
+          ActiveModel::Validations::LengthValidator.new(
+            is: LENGTH,
+            attributes: [attribute]
+          ).validate(record)
+        end
+
+        def validate_numeric
+          return if record.errors[attribute].any?
+
+          unless number =~ /\d{10}/
+            record.errors.add(attribute, :nhs_number_not_numeric)
+          end
+        end
+
+        # See https://www.datadictionary.nhs.uk/data_dictionary/attributes/n/nhs/nhs_number_de.asp
+        # rubocop:disable Metrics/AbcSize
+        def validate_using_modulus_11
+          return if record.errors[attribute].any?
+
+          # Step 1 Multiply each of the first nine digits by a weighting factor
+          # Digit Position  Factor
+          # 1                10
+          # 2                9
+          # 3                8
+          # 4                7
+          # 5                6
+          # 6                5
+          # 7                4
+          # 8                3
+          # 9                2
+          weighting_factors = [10, 9, 8, 7, 6, 5, 4, 3, 2]
+          first_9_digits = number.chars.map(&:to_i).take(9)
+          first_9_digits_weighted = first_9_digits.each_with_index.map do |num, idx|
+            num * weighting_factors[idx]
+          end
+
+          # Step 2 Add the results of each multiplication together.
+          # Step 3 Divide the total by 11 and establish the remainder.
+          # Step 4 Subtract the remainder from 11 to give the check digit.
+          checkdigit = 11 - (first_9_digits_weighted.sum % 11)
+
+          # If the result is 11 then a check digit of 0 is used.
+          checkdigit = 0 if checkdigit == 11
+
+          # If the result is 10 then the NHS NUMBER is invalid and not used.
+          # Step 5 Check the remainder matches the check digit. Otherwise the NHS NUMBER is invalid.
+          if checkdigit == 10 || number[9].to_i != checkdigit
+            # record.errors[attribute] << "Invalid NHS number (checkdigit mismatch)"
+            record.errors.add(attribute, :nhs_number_invalid_checkdigit)
+          end
+        end
+        # rubocop:enable Metrics/AbcSize
+      end
+      private_constant :Validator
+    end
+  end
+end

data/app/values/renalware/address.rb

@@ -11,6 +11,7 @@ module Renalware
     # Set to true to avoid address validation - useful when archiving a letter with a migrated
     # address that might not have a postcode for instance
     attr_accessor :skip_validation
+
     validates_with AddressValidator, unless: :skip_validation
 
     def self.reject_if_blank

data/app/views/renalware/accesses/assessments/show.html.slim

@@ -8,7 +8,7 @@
   - return unless assessment
 
   .document-view
-    .grid
+    .mgrid
       .row
         - attributes_list = assessment.document.results.class.attributes_list
         = render "renalware/shared/attributes_group",

data/app/views/renalware/accesses/procedures/show.html.slim

@@ -8,7 +8,7 @@
   - return unless procedure
 
   .document-view
-    .grid
+    .mgrid
       .row
         .columns.small-12.large-6
           = article_tag "Access Procedure" do

data/app/views/renalware/accesses/profiles/show.html.slim

@@ -8,7 +8,7 @@
   - return unless profile
 
   .document-view
-    .grid
+    .mgrid
       .row
         = render "renalware/shared/attributes_group",
             legend: "Access Profile", destination: "profile",

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

@@ -42,3 +42,39 @@
             method: :delete,
             data: { confirm: "Are you sure you want to clear the PDF letter cache?\n" },
             class: "button alert"
+
+  <label class="block">
+    <span class="text-gray-700">Name</span>
+    <input class="form-input mt-1 block w-full" placeholder="Jane Doe">
+  </label>
+
+  <div class="mt-4">
+    <span class="text-gray-700">Account Type</span>
+    <div class="mt-2">
+      <label class="inline-flex items-center">
+        <input type="radio" class="form-radio" name="accountType" value="personal">
+        <span class="ml-2">Personal</span>
+      </label>
+      <label class="inline-flex items-center ml-6">
+        <input type="radio" class="form-radio" name="accountType" value="busines">
+        <span class="ml-2">Business</span>
+      </label>
+    </div>
+  </div>
+
+  <label class="block mt-4">
+    <span class="text-gray-700">Requested Limit</span>
+    <select class="form-select mt-1 block w-full">
+      <option>$1,000</option>
+      <option>$5,000</option>
+      <option>$10,000</option>
+      <option>$25,000</option>
+    </select>
+  </label>
+
+  <div class="flex mt-6">
+    <label class="flex items-center">
+      <input type="checkbox" class="form-checkbox">
+      <span class="ml-2">I agree to the <span class="underline">privacy policy</span></span>
+    </label>
+  </div>

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)
@@ -57,3 +53,6 @@ css:
             = f.submit "Refresh", class: :button
 
       #chart1 style="height: 300px; width: 500px" data-target="charts.chart"
+
+    / To test tailwindcss
+    .max-w-sm.rounded.overflow-hidden.shadow-lg  

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