RubyGems - renalware-core - Versions diffs - 2.0.146 → 2.0.152 - Mend

renalware-core 2.0.146 → 2.0.152

Files changed (449) hide show

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

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

@@ -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 CHANGED

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

@@ -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/ukrdc/patient_presenter.rb CHANGED

@@ -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 ADDED

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+require_dependency "renalware"
+module Renalware
+  class UserSessionPresenter
+    # Returns a hash to be splatted into the body attributes in a layout e.g. application.html.slim
+    # e.g.
+    #
+    #  body(class="..." *Renalware::UserSessionPresenter.session_controller_data_attributes)
+    #
+    # renders:
+    #
+    # <body class="..."
+    #       data-controller="session"
+    #       data-session-check-alive-path="/check_session_expired"
+    #       data-session-debug="true"
+    #       data-session-keep-alive-path="/keep_session_alive"
+    #       data-session-login-path="/users/sign_in"
+    #       data-session-polling-interval="60"
+    #       data-session-timeout="3600">
+    # rubocop:disable Metrics/MethodLength
+    def self.session_controller_data_attributes
+      return {} if Renalware.config.session_expiry_use_previous_mechansim
+      urls = Renalware::Engine.routes.url_helpers
+      {
+        data: {
+          controller: "session",
+          session: {
+            "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, # eg "true" or "false"
+            "register-user-activity-after":
+              Renalware.config.session_register_user_user_activity_after.to_i,
+            timeout: ::Devise.timeout_in
+          }
+        }
+      }
+    end
+  end
+  # rubocop:enable Metrics/MethodLength
+end

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

@@ -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 CHANGED

@@ -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/_form.html.slim CHANGED

@@ -4,7 +4,7 @@ ruby:
 .row.top
   .medium-6.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path
 .form-content
@@ -39,5 +39,5 @@ ruby:
   .row
     .large-12.columns
       = f.button :submit
-      span= " or "
+      '  or
       = link_to "cancel", back_path

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

@@ -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/plans/new.html.slim CHANGED

@@ -18,5 +18,5 @@
                       wrapper: :horizontal_medium
       = f.submit "Save", class: "button"
-      span= " or "
+      '  or
       = link_to "cancel", patient_accesses_dashboard_path(patient)

data/app/views/renalware/accesses/procedures/_form.html.slim CHANGED

@@ -4,7 +4,7 @@ ruby:
 .row.top
   .medium-6.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path
 .form-content
@@ -41,5 +41,5 @@ ruby:
 .row
   .large-12.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path

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

@@ -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/_form.html.slim CHANGED

@@ -4,7 +4,7 @@ ruby:
 .row.top
   .medium-6.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path
 .form-content
@@ -31,5 +31,5 @@ ruby:
 .row
   .large-12.columns
     = f.button :submit
-    span= " or "
+    '  or
     = link_to "cancel", back_path

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

@@ -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 CHANGED

@@ -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/pathology_chart_data.js.erb ADDED

	@@ -0,0 +1 @@
1	+ console.log("as")

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

@@ -0,0 +1,62 @@
+css:
+  .chart {
+    width: 500px;
+    height: 200px;
+  }
+  #patient_id {
+    width:300px;
+    display: block
+  }
+  #patient_id input {
+    width:200px;
+    display:inline;
+  }
+  #patient_id a {
+    width: 90px;
+    display:inline;
+    padding: 5px;
+    margin-left: 5px;
+  }
+= within_new_admin_layout(title: "Admin Playground") do
+  article
+    header
+      h2 Pathology Charts
+    span A testbed for trying out highchart linecharts
+    br
+    br
+    .chart-container(data-controller="charts"
+                    data-charts-url=pathology_chart_data_admin_playground_path)
+      .row
+        .columns.small-12.medium-6.large-4
+          = simple_form_for(form,
+                            remote: true,
+                            as: :chart,
+                            url: pathology_chart_data_admin_playground_path,
+                            wrapper: nil,
+                            method: :get,
+                            data: { target: "charts.form", action: "ajax:success->charts#redisplay" }) do |f|
+            = f.input :patient_id,
+                      collection: [[form.patient_id, form.patient_id]],
+                      selected: 1,
+                      input_html: { \
+                        class: "patient-id-select2 patient-ajax-search",
+                        data: { "ajax--url" => search_patients_path(format: :json),
+                                placeholder: "Search by patient name or hospital/NHS no." } \
+                      }
+            = f.input :obx_code,
+                      collection: Renalware::Pathology::ObservationDescription.order(:code).pluck(:code),
+                      input_html: {  class: "searchable_select" }
+            = f.input :period,
+                      collection: %w(all yr 6m 3m 1m wk),
+                      include_blank: false
+            = 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 &nbsp;

data/app/views/renalware/admin/users/_filters.html.slim CHANGED

@@ -7,5 +7,5 @@
           = f.search_field :family_name_or_given_name_or_username_or_email_cont
         .small-3.large-4.columns.actions.end
           = f.submit t("helpers.submit.filter"), class: "button"
-          span= " or "
+          '  or
           = link_to t("helpers.reset"), admin_users_path

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

@@ -54,5 +54,5 @@
               wrapper: :horizontal_small
     - msg = user.approved? ? "Update" : "Approve"
     = f.submit msg, class: "button"
-    span= " or "
+    '  or
     = link_to "cancel", admin_users_path

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

@@ -19,5 +19,5 @@
                   include_blank: "Any"
       .columns.medium-2.large-2.actions.end
         = f.submit "Filter", class: "button"
-        span= " or "
+        '  or
         = link_to t("helpers.reset"), admissions_admissions_path

data/app/views/renalware/admissions/admissions/_form.html.slim CHANGED

@@ -45,5 +45,5 @@
     = f.input :discharge_summary, as: :trix_editor, class: "discharge-summary", wrapper: :zilch
   = f.submit class: :button
-  span= " or "
+  '  or
   = link_to "Cancel", admissions_admissions_path