renalware-core 2.0.51 → 2.0.52

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

@@ -55,18 +55,6 @@ module Renalware
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
-      def gpg_encrypt(filepath, output_filepath)
-        path_to_key = File.open(Rails.root.join("key.gpg"))
-        # only needed if the key has not been imported previously
-        GPGME::Key.import(path_to_key)
-        crypto = GPGME::Crypto.new(always_trust: true)
-        File.open(filepath) do |in_file|
-          File.open(output_filepath, "wb") do |out_file|
-            crypto.encrypt in_file, output: out_file, recipients: "Patient View"
-          end
-        end
-      end
-
       def timestamp
         Time.zone.now.strftime("%Y%m%d%H%M%S%L")
       end
@@ -108,7 +96,7 @@ module Renalware
           keyring: config.ukrdc_gpg_keyring,
           homedir: config.ukrdc_gpg_homedir,
           filename_transform: lambda do |filename|
-            filename.to_s.gsub("/xml/", "/encrypted/") + ".enc"
+            filename.to_s.gsub("/xml/", "/encrypted/").gsub(".xml", ".gpg")
           end
         )
       end

data/app/models/renalware/user.rb

@@ -24,9 +24,11 @@ module Renalware
     }
 
     scope :unapproved, -> { where(approved: [nil, false]) }
+    scope :expired, -> { where.not(expired_at: nil) }
     scope :inactive, lambda {
       where("last_activity_at IS NOT NULL AND last_activity_at < ?", expire_after.ago)
     }
+    scope :excludable, -> { unapproved.or(inactive).or(expired) }
     scope :author, -> { where.not(signature: nil) }
     scope :ordered, -> { order(:family_name, :given_name) }
     scope :excluding_system_user, -> { where.not(username: SystemUser.username) }
@@ -44,8 +46,9 @@ module Renalware
       UserPolicy
     end
 
+    # So we can uses these scopes as Ransack predicates eg. { expired: true }
     def self.ransackable_scopes(_auth_object = nil)
-      %i(unapproved inactive)
+      %i(unapproved inactive expired)
     end
 
     # rubocop:disable Naming/PredicateName

data/app/presenters/renalware/letters/letter_presenter.rb

@@ -3,6 +3,7 @@
 require_dependency "renalware/letters"
 require "collection_presenter"
 
+# rubocop:disable Metrics/ClassLength
 module Renalware
   module Letters
     class LetterPresenter < DumbDelegator
@@ -88,12 +89,24 @@ module Renalware
       end
 
       def pdf_filename
-        [
-          patient.family_name,
-          patient.local_patient_id,
-          id,
-          state
-        ].join("-").upcase.concat(".pdf")
+        build_filename_from(
+          [
+            patient.family_name,
+            patient.local_patient_id,
+            id,
+            state
+          ]
+        )
+      end
+
+      def pdf_stateless_filename
+        build_filename_from(
+          [
+            patient.family_name,
+            patient.local_patient_id,
+            id
+          ]
+        )
       end
 
       def state_description
@@ -106,6 +119,10 @@ module Renalware
 
       private
 
+      def build_filename_from(arr)
+        Array(arr).join("-").upcase.concat(".pdf")
+      end
+
       # Include the counterpart cc recipients (i.e. patient and/or primary care physician)
       def build_cc_recipients
         determine_counterpart_ccs + __getobj__.cc_recipients
@@ -151,3 +168,4 @@ module Renalware
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

data/app/presenters/renalware/transplants/consent_presenter.rb

@@ -4,8 +4,9 @@ require_dependency "renalware/transplants"
 
 module Renalware
   module Transplants
+    # Extends a RecipientWorkupDocument::YesNoUnknownConsent document attribute
     class ConsentPresenter < SimpleDelegator
-      # This method smells of :reek:NilCheck
+      # Renders eg "12-Apr-2018 Yes"
       def to_s
         [I18n.l(consented_on), value&.text].compact.join(" ")
       end

data/app/values/renalware/address.rb

@@ -41,7 +41,7 @@ module Renalware
     end
 
     def street
-      [street_1, street_2, street_3].compact.join(", ")
+      [street_1, street_2, street_3].reject(&:blank?).join(", ")
     end
   end
 end

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

@@ -1,7 +1,9 @@
-dl.sub-nav
-  dd(class=("active" if params[:q].nil?))
+dl.sub-nav.no-js-selection
+  dd(class=("active" if params.fetch(:q, {}).empty?))
     = link_to "All", admin_users_path(q: nil)
   dd(class=("active" if params.fetch(:q, {})[:unapproved]))
     = link_to "Unapproved", admin_unapproved_users_path
+  dd(class=("active" if params.fetch(:q, {})[:expired]))
+    = link_to "Expired", admin_expired_users_path
   dd(class=("active" if params.fetch(:q, {})[:inactive]))
     = link_to "Inactive", admin_inactive_users_path

data/app/views/renalware/admissions/consults/_table.html.slim

@@ -12,7 +12,7 @@
         th.col-width-date.noprint= sort_link(query, :started_on, "Started")
         th.col-width-date.noprint= sort_link(query, :ended_on, "Ended")
         th.col-width-small.show-for-large-up
-          = sort_link([:renalware, query], :patient_current_modality_description_name, "Modality")
+          = sort_link([:renalware, query], :modality_desc, "Modality")
         th.col-width-tiny.show-for-large-up Sex
         th.col-width-date.show-for-large-up= sort_link(query, :patient_born_on, "DOB")
         th.col-width-tiny.show-for-large-up Age
@@ -82,4 +82,3 @@
         / When printing we just show the notes on the second row
         tr.print-only.child-row
           td(colspan=12)= simple_format consult.description
-

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

@@ -10,7 +10,7 @@ xml.Allergies do
   patient.allergies.includes(:updated_by).each do |allergy|
     xml.Allergy do
       xml.Allergy do
-        xml.comment! "We don't have snomed code for allergies..?"
+        xml.comment! "Not available"
       end
       xml.Clinician do
         xml.Description allergy.updated_by&.to_s

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

@@ -4,9 +4,14 @@
 # This is snomed-based, so might not be possible?
 xml = builder
 xml.Diagnoses do
+  xml.Diagnosis
   if patient.dead?
-    [patient.first_cause, patient.second_cause].compact.each do |cause|
-      render "renalware/api/ukrdc/patients/diagnoses/cause_of_death", builder: xml, cause: cause
-    end
+    # Only 1 CauseOfDeath element is allowed so we ignore patient.second_cause
+    render(
+      "renalware/api/ukrdc/patients/diagnoses/cause_of_death",
+      builder: xml,
+      cause: patient.first_cause
+    )
   end
+  xml.RenalDiagnosis
 end

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

@@ -26,7 +26,7 @@ xml.Documents do
         xml.Description ""
       end
       xml.FileType "application/pdf"
-      xml.FileName "tbc"
+      xml.FileName letter.pdf_stateless_filename
       xml.Stream Base64.encode64(Renalware::Letters::PdfRenderer.call(letter))
       xml.DocumentURL
     end

data/app/views/renalware/events/swabs/_list.html.slim

@@ -21,4 +21,4 @@ article.swabs
           td= swab.document.type&.text
           td= swab.document.result&.text
           td= swab.document.location
-          td= swab.notes
+          td= swab.notes&.html_safe

data/app/views/renalware/hd/current_profile/_form.html.slim

@@ -95,38 +95,42 @@ ruby:
 
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Anticoagulant", name: "anticoagulant" } do
-      = fd.simple_fields_for :anticoagulant, profile.document.anticoagulant do |fcm|
-        = fcm.input :type, wrapper: :horizontal_small
-        = fcm.input :loading_dose, wrapper: :horizontal_tiny
-        = fcm.input :hourly_dose, wrapper: :horizontal_tiny
-        = fcm.input :stop_time, collection: fcm.object.class.stop_times, wrapper: :horizontal_tiny
+      .hd-profile-form-anticoagulant
+        = fd.simple_fields_for :anticoagulant, profile.document.anticoagulant do |fcm|
+          = fcm.input :type, wrapper: :horizontal_small
+          = fcm.input :loading_dose, wrapper: :horizontal_tiny
+          = fcm.input :hourly_dose, wrapper: :horizontal_tiny
+          = fcm.input :stop_time, collection: fcm.object.class.stop_times, wrapper: :horizontal_tiny
 
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Drugs", name: "drugs" } do
       = fd.simple_fields_for :drugs, profile.document.drugs do |fcm|
-        = fcm.input :on_esa, as: :inline_radio_buttons, wrapper: :horizontal_medium
-        = fcm.input :on_iron, as: :inline_radio_buttons, wrapper: :horizontal_medium
-        = fcm.input :on_warfarin, as: :inline_radio_buttons, wrapper: :horizontal_medium
+        .hd-profile-form-drugs
+          = fcm.input :on_esa, as: :inline_radio_buttons, wrapper: :horizontal_medium
+          = fcm.input :on_iron, as: :inline_radio_buttons, wrapper: :horizontal_medium
+          = fcm.input :on_warfarin, as: :inline_radio_buttons, wrapper: :horizontal_medium
 
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Transport", name: "transport" } do
-      = fd.simple_fields_for :transport, profile.document.transport do |fcm|
-        = fcm.input :has_transport, as: :inline_radio_buttons, wrapper: :horizontal_medium
-        = fcm.input :type, wrapper: :horizontal_small
-        = fcm.input :decided_on, as: :date_picker, wrapper: :horizontal_datepicker
-      = f.association :transport_decider,
-                      as: :user_picker,
-                      collection: Renalware::User.ordered,
-                      wrapper: :horizontal_medium
+      .hd-profile-form-transport
+        = fd.simple_fields_for :transport, profile.document.transport do |fcm|
+          = fcm.input :has_transport, as: :inline_radio_buttons, wrapper: :horizontal_medium
+          = fcm.input :type, wrapper: :horizontal_small
+          = fcm.input :decided_on, as: :date_picker, wrapper: :horizontal_datepicker
+        = f.association :transport_decider,
+                        as: :user_picker,
+                        collection: Renalware::User.ordered,
+                        wrapper: :horizontal_medium
 
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Care Level", name: "care_level" } do
-      = fd.simple_fields_for :care_level, profile.document.care_level do |fcm|
-        table
-          = fcm.input :level, wrapper: :horizontal_medium
-          = fcm.input :assessed_on, as: :date_picker, wrapper: :horizontal_datepicker
+      .hd-profile-form-care-level
+        = fd.simple_fields_for :care_level, profile.document.care_level do |fcm|
+          table
+            = fcm.input :level, wrapper: :horizontal_medium
+            = fcm.input :assessed_on, as: :date_picker, wrapper: :horizontal_datepicker
 
-.row
+.row.form-actions
   .large-12.columns
     = f.button :submit
     span= " or "

data/app/views/renalware/hd/mdm_patients/_filters.html.slim

@@ -5,21 +5,26 @@
                   html: { autocomplete: "off" },
                   wrapper: :horizontal_form do |f|
   .row
-    .medium-4.columns
+    .medium-3.columns
       = f.input :hospital_unit_id,
           collection: Renalware::Hospitals::Centre.with_hd_sites.ordered,
           as: :grouped_select, group_method: :hd_sites,
           label: t(".hospital_unit")
 
-    .medium-4.columns
+    .medium-3.columns
       = f.input :schedule_definition_ids,
           collection: Renalware::HD::ScheduleDefinitionFilter.all,
           label_method: :days,
           value_method: :ids,
           include_blank: true,
-          label:  t(".schedule")
+          label: t(".schedule")
+
+    .medium-4.columns
+      = f.input :named_nurse_id,
+                as: :user_picker,
+                collection: Renalware::User.ordered.select(:id, :given_name, :family_name)
 
-    .medium-4.columns.actions
+    .medium-2.columns.actions
       = f.submit t("helpers.submit.filter"), class: "button", name: nil
       span= " or "
       = link_to t("helpers.reset"), hd_mdm_patients_path

data/app/views/renalware/letters/letters/_additional_ccs.html.slim

@@ -6,10 +6,11 @@ article
     .small-12.columns
       #letter-ccs
         table.auto-layout
-          = render partial: "cc_recipient_form",
-                   collection: contacts,
-                   as: :contact,
-                   locals: { letter: letter }
+          tbody
+            = render partial: "cc_recipient_form",
+                    collection: contacts,
+                    as: :contact,
+                    locals: { letter: letter }
 
         = link_to(t(".add_contact_as_cc"),
                   "#",

data/app/views/renalware/letters/letters/edit.html.slim

@@ -10,6 +10,7 @@
       wrapper: "horizontal_form",
       html: { id: "letter-form", autocomplete: "off" } do |f|
 
+    = render "renalware/shared/errors", model: letter
     = render "form",
              f: f,
              patient: patient,

data/app/views/renalware/letters/letters/new.html.slim

@@ -8,7 +8,7 @@
         as: :letter,
         wrapper: "horizontal_form",
         html: { id: "letter-form", autocomplete: "off" } do |f|
-
+      = render "renalware/shared/errors", model: letter
       = render "form",
                f: f,
                patient: patient,

data/app/views/renalware/patients/patients/edit.html.slim

@@ -1,11 +1,11 @@
 = within_patient_layout(title: "Edit", breadcrumbs: breadcrumb_for("Demographics", patient)) do
   .row.document
-    .columns.small-12= render "renalware/shared/errors", model: patient
+    .columns.small-12
+      = render "renalware/shared/errors", model: patient
     = simple_form_for patient,
                       wrapper: "horizontal_form",
                       html: { autocomplete: "off" } do |f|
 
-      = render "renalware/shared/errors", model: patient
       = render "form", f: f, patient: patient
 
       .columns.large-12

data/app/views/renalware/renal/registry_preflight_checks/_filters.html.slim

@@ -8,17 +8,17 @@
         = f.input :profile_esrf_on_gteq, as: :date_picker, label: "ESRF after"
 
       -if defined?(display_modality_filter) && display_modality_filter
-        .medium-4.large-3.columns
+        .medium-3.columns
           = f.input :current_modality_description_id_eq,
                     collection: Renalware::Modalities::Description.pluck("name", "id"),
                     label: "Modality"
 
-        .medium-4.large-3.columns
+        .medium-3.columns
           = f.input :hd_profile_unit_id_eq,
                     collection: Renalware::Hospitals::Unit.pluck("name", "id"),
                     label: "HD Site"
 
-      .medium-4.columns.actions.end
+      .medium-3.columns.actions.end
         = f.submit t("helpers.submit.filter"), class: "button", name: nil
         span= " or "
         = link_to t("helpers.reset"), url

data/app/views/renalware/renal/registry_preflight_checks/_table.html.slim

@@ -1,3 +1,5 @@
+- death_configuration = local_assigns[:death_configuration] || false
+
 table.renal-registry-preflight-checks
   thead
     tr
@@ -9,10 +11,11 @@ table.renal-registry-preflight-checks
                      :modality_descriptions_name,
                       "Modality",
                       default_order: :asc)
-      td.col-width-small
-       = sort_link([:renalware, query],
-                    :hd_profile_unit_name,
-                    "HD Site")
+      - unless death_configuration
+        td.col-width-small
+          = sort_link([:renalware, query],
+                      :hd_profile_unit_name,
+                      "HD Site")
       td.col-width-date
         = sort_link([:renalware, query],
                     :profile_esrf_on,
@@ -25,7 +28,8 @@ table.renal-registry-preflight-checks
         td= patient.nhs_number
         td= patient.hospital_identifiers
         td= patient.current_modality
-        td= patient.hd_unit
+        - unless death_configuration
+          td= patient.hd_unit
         td= l(patient.renal_profile&.esrf_on)
         td.missing-data
           - patient.missing_data.map do |data_item|

data/app/views/renalware/renal/registry_preflight_checks/deaths.html.slim

@@ -8,5 +8,5 @@
   = render "navigation"
 
 = within_admin_layout(title: "Renal Registry Return: Preflight Checks") do
-  = render "table", patients: patients, query: query
+  = render "table", patients: patients, query: query, death_configuration: true
   = paginate patients

data/app/views/renalware/reporting/report_mailer/daily_summary.html.slim

@@ -2,7 +2,8 @@ h4= l(Time.zone.now)
 
 - view_data.each do |view_name, data|
   - rows = data["data"].first
-  h3= t(:title, scope: "renalware.reporting.#{view_name}", default: view_name)
+
+  h3= view_name.gsub("reporting_daily_", "").humanize
   table
     - rows.each do |row|
       - description = row[0]

data/app/views/renalware/research/studies/_filters.html.slim

@@ -0,0 +1,14 @@
+.search-form.filters
+  = simple_form_for query,
+      as: :q,
+      url: research_studies_path,
+      method: :get do |f|
+    .row
+      .columns.medium-5
+        = f.input :code_or_description_or_leader_cont,
+                  label: "Search by any part of the code, description or leader's name"
+
+      .columns.medium-4.actions.end
+        = f.submit t("helpers.submit.filter"), class: "button", name: nil
+        span= " or "
+        = link_to t("helpers.reset"), research_studies_path

data/app/views/renalware/research/studies/index.html.slim

@@ -1,15 +1,18 @@
 = content_for(:actions) do
   = link_to("Add", new_research_study_path, class: :button)
 
+= content_for(:filters) do
+  = render "filters", query: query
+
 = within_admin_layout(title: "Clinical Studies") do
   table
     thead
       tr
-        th.col-width-date Started
-        th.col-width-date Terminated
-        th.col-width-small Code
+        th.col-width-date= sort_link(query, :started_on, "Started")
+        th.col-width-date= sort_link(query, :terminated_on, "Terminated")
+        th.col-width-small= sort_link(query, :code, "Code")
         th Description
-        th Leader
+        th= sort_link(query, :code, "Leader")
         th Participants
         th
     tbody