renalware-core 2.0.123 → 2.0.124

data/app/assets/stylesheets/renalware/partials/_tables.scss

@@ -18,6 +18,51 @@ table.column_hover .hover { // for js column hovering see table.js
   background-color: $table-row-hover-colour;
 }
 
+.no-permission {
+  color: $disabled-colour;
+}
+
+.actions-dropdown {
+  .no-permission {
+    padding: 0.5rem;
+    display: inline-block;
+    line-height: inherit;
+  }
+}
+
+/*
+  Add a pipe between action links (Edit, Delete etc) in tables
+*/
+td.actions {
+  padding-left: 0;
+  white-space: nowrap;
+
+  > a, > span {
+    &:after {
+      color: $pipe-separator-colour;
+      content: "|";
+      padding-right: 0;
+      padding-left: .3rem;
+    }
+
+    &:last-child:after {
+      content: "";
+    }
+
+    &:before {
+      display: inline-block;
+      color: $pipe-separator-colour;
+      content: "";
+      padding-right: 0;
+      padding-right: .3rem;
+    }
+
+    &:first-child:before {
+      padding-right: 0;
+    }
+  }
+}
+
 table.stripeless {
   tr:nth-of-type(even),
   tr:nth-of-type(odd) {
@@ -167,6 +212,13 @@ table {
 
       &.actions {
         text-align: right;
+        white-space: nowrap;
+      }
+    }
+
+    &:first-child {
+      &.actions {
+        white-space: nowrap;
       }
     }
   }
@@ -197,7 +249,7 @@ table {
     }
 
     &.actions {
-      text-align: right;
+      text-align: left;
     }
   }
 
@@ -250,6 +302,10 @@ table {
       width: 9.7rem;
     }
 
+    &.col-width-actions-dropdown {
+      width: 2rem;
+    }
+
     &.col-width-tiny {
       min-width: 2rem;
       width: 3rem;
@@ -299,12 +355,18 @@ table {
 
     &.col-width-11 {
       width: 11rem;
+      min-width: 11rem;
     }
 
     &.col-width-13 {
       width: 13rem;
     }
 
+    &.col-width-15 {
+      min-width: 15rem;
+      width: 15rem;
+    }
+
     &.col-width-17 {
       min-width: 17rem;
       width: 17rem;

data/app/assets/stylesheets/renalware/partials/_toggling.scss

@@ -0,0 +1,38 @@
+.toggler {
+  position: relative; // required for safari otherwise user cannot click on :before content
+  display: inline-block; // required otherwise IE11 will not be able to click on it
+
+  i {
+    @extend %fa-icon;
+    @extend .fas;
+    font-weight: 600;
+    pointer-events: none;
+    text-align: center;
+    width: 1.2rem;
+
+    &:before {
+      content: asset-data-url("renalware/icons/chevron-down.svg");
+    }
+  }
+}
+
+th.togglers .toggler {
+  i:before {
+    content: asset-data-url("renalware/icons/chevrons-down.svg");
+  }
+
+  &.toggled i:before {
+    content: asset-data-url("renalware/icons/chevrons-up.svg");
+  }
+}
+
+.content-toggled .toggler i,
+.toggler.toggled i  {
+  &:before {
+    content: asset-data-url("renalware/icons/chevron-up.svg");
+  }
+}
+
+th.togglers {
+  width: 1rem;
+}

data/app/controllers/renalware/letters/letters_controller.rb

@@ -31,12 +31,12 @@ module Renalware
         letter = LetterFactory.new(
           @patient,
           event: find_event,
-          author: current_user,
           clinical: clinical?
         )
           .with_contacts_as_default_ccs
           .build
         RememberedLetterPreferences.new(session).apply_to(letter)
+        letter.author_id ||= current_user.id
         render_form(letter, :new)
       end
 

data/app/controllers/renalware/problems/notes_controller.rb

@@ -49,6 +49,12 @@ module Renalware
         end
       end
 
+      def destroy
+        authorize note
+        note.destroy!
+        render_index
+      end
+
       private
 
       def problem

data/app/helpers/renalware/application_helper.rb

@@ -3,17 +3,10 @@
 require "inline_image"
 require "git_commit_sha"
 require "breadcrumb"
-require "webpacker/helper"
 
 module Renalware
   module ApplicationHelper
     include Renalware::Engine.routes.url_helpers
-    include ::Webpacker::Helper
-
-    # See https://github.com/rails/webpacker/blob/master/docs/engines.md
-    def current_webpacker_instance
-      Renalware.webpacker
-    end
 
     def default_patient_link(patient)
       link_to(patient.to_s(:default), patient_clinical_summary_path(patient))

data/app/helpers/renalware/link_helper.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Renalware
+  module LinkHelper
+    # A wrapper around link_to_if that will output greyed-out text to indicate the option is
+    # not permitted if condition is falsey.
+    def link_to_if_allowed(condition, name, options = {}, html_options = {})
+      link_to_if(condition, name, options, html_options) do
+        content_tag(:span, class: "no-permission") { name }
+      end
+    end
+  end
+end

data/app/helpers/renalware/mdm_helper.rb

@@ -45,7 +45,8 @@ module Renalware
       end
 
       def mdm_name
-        "#{modality_description_name} MDM"
+        # "#{modality_description_name} MDM"
+        "MDM"
       end
 
       def modality_description_symbol

data/app/helpers/renalware/toggle_helper.rb

@@ -8,5 +8,27 @@ module Renalware
               class: "button compact low-key",
               data: { behaviour: "css-toggler" }
     end
+
+    def toggler(row_selector, link_title: "Toggle")
+      link_to(
+        row_selector,
+        data: { behaviour: "toggler" },
+        class: "toggler",
+        title: link_title
+      ) do
+        content_tag(:i)
+      end
+    end
+
+    def table_toggler(link_title: "Toggle all rows")
+      link_to(
+        "#",
+        data: { behaviour: "table-toggler" },
+        class: "toggler",
+        title: link_title
+      ) do
+        content_tag(:i)
+      end
+    end
   end
 end

data/app/models/concerns/renalware/transaction_retry.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_dependency "renalware"
+
+module Renalware
+  module TransactionRetry
+    extend ActiveSupport::Concern
+
+    included do
+      # Retry a transaction automatically when an ActiveRecord::PreparedStatementCacheExpired error
+      # is raised. This handles a specific scenario where there is a migration run during a deploy
+      # that changes one or more columns used in a cached PostgreSQL prepared statement.
+      # We rescue it here and retry (once) the txn to prevent users getting an error when they try
+      # to select/update data moments after the deploy.
+      #
+      # Do not use this for transactions with side-effects unless it is acceptable
+      # for these side-effects to occasionally happen twice.
+      #
+      # Note we define this method in the included block (not the class_methods block as you would
+      # expect) becuase in the latter case a client calling #transaction would get the including
+      # class's transaction method, not the overriding one defined here. Using 'included' allows
+      # use to get around this. See comments in
+      # https://github.com/rails/rails/blob/master/activesupport/lib/active_support/concern.rb
+      #
+      def self.transaction(*args, &block)
+        retried ||= false
+        super
+      rescue ActiveRecord::PreparedStatementCacheExpired
+        if retried
+          raise
+        else
+          retried = true
+          retry
+        end
+      end
+    end
+  end
+end

data/app/models/renalware/accesses/patient.rb

@@ -30,7 +30,7 @@ module Renalware
       scope :with_profile, lambda {
         joins(<<-SQL)
           left outer join access_profiles on (access_profiles.patient_id = patients.id
-            and access_profiles.terminated_on is not null
+            and access_profiles.terminated_on is null
             and access_profiles.started_on <= current_date)
           left outer join access_types on access_types.id = access_profiles.type_id
         SQL

data/app/models/renalware/hd/session.rb

@@ -9,6 +9,7 @@ module Renalware
       include PatientScope
       include Accountable
       include ExplicitStateModel
+      include TransactionRetry
 
       acts_as_paranoid
 

data/app/models/renalware/letters/letter.rb

@@ -6,6 +6,7 @@ module Renalware
   module Letters
     class Letter < ApplicationRecord
       include Accountable
+      include TransactionRetry
       extend Enumerize
       # The letterhead is the only site-specific element in the letter, so we use this
       # to determine site-specific settings - in this case whether the letter should contain

data/app/models/renalware/modalities/modality.rb

@@ -19,7 +19,7 @@ module Renalware
       validates :patient, presence: true
       validates :started_on, presence: true
       validates :description, presence: true
-      validates :started_on, timeliness: { type: :date }
+      validates :started_on, timeliness: { type: :date, on_or_before: -> { Date.current } }
       validate :validate_modality_starts_later_than_previous, on: :create, if: :patient
 
       def terminate_by(user, on:)

data/app/models/renalware/patient.rb

@@ -99,10 +99,11 @@ module Renalware
     validates :born_on, timeliness: { type: :date }
     validates :email, email: true, allow_blank: true
 
-    with_options if: :current_modality_death?, on: :update do |death|
-      death.validates :died_on, presence: true
-      death.validates :died_on, timeliness: { type: :date }
-      death.validates :first_cause_id, presence: true
+    attr_accessor :skip_death_validations
+    with_options if: :validate_death_attributes?, on: :update do
+      validates :died_on, presence: true
+      validates :died_on, timeliness: { type: :date }
+      validates :first_cause_id, presence: true
     end
 
     scope :dead, -> { where.not(died_on: nil) }
@@ -137,6 +138,10 @@ module Renalware
       self.primary_care_physician == primary_care_physician
     end
 
+    def validate_death_attributes?
+      current_modality_death? && !skip_death_validations
+    end
+
     def current_modality_death?
       return false if current_modality.blank?
 

data/app/models/renalware/patients/ingestion/commands/add_or_update_patient.rb

@@ -49,6 +49,12 @@ module Renalware
 
             patient = mapper_factory.new(message, patient).fetch
             patient.by = SystemUser.find
+            # If we update a patient who has the Death modality, and they do not have certain
+            # fields set yet like cause of death, we don't want those validations so stop us
+            # updating - so we set a flag here to effectively skip death attribute validations
+            # e.g. Died on can't be blank, Died on is not a valid date, First cause can't be blank
+            patient.skip_death_validations = true
+
             patient.save!
             patient
           end

data/app/views/renalware/clinical/body_compositions/_table.html.slim

@@ -1,6 +1,7 @@
 table
   thead
     tr
+      th.togglers= table_toggler
       th.col-width-tiny
       th.col-width-date= t(".assessed_on")
       th= t(".modality_description")
@@ -21,9 +22,9 @@ table
   tbody
     - body_compositions.each do |body_composition|
       tr
-        td
+        td= toggler("#bcm-quick-preview-#{body_composition.id}")
+        td.actions
           = link_to "View", patient_clinical_body_composition_path(patient, body_composition)
-          = pipe_separator
           = link_to "Edit", edit_patient_clinical_body_composition_path(patient, body_composition)
         td= body_composition.assessed_on
         td= body_composition.modality_description&.name
@@ -40,3 +41,9 @@ table
         td= body_composition.adipose_tissue_mass
         td= body_composition.body_cell_mass
         td= body_composition.quality_of_reading
+
+      = content_tag(:tr, id: "bcm-quick-preview-#{body_composition.id}", style: "display: none")
+        td(colspan=16)
+          .quick-preview
+            = definition_list_for(body_composition, size: :large) do |list|
+              = list.definition(:notes){ |value| simple_format(value) }

data/app/views/renalware/clinics/clinic_visits/_table.html.slim

@@ -1,7 +1,8 @@
 table.clinics.auto-layout
   thead
     tr
-      th.col-width-large
+      th.noprint.togglers= table_toggler
+      th.noprint.col-width-medium
       th.col-width-date Date
       th.col-width-tiny DNA
       th Clinic Type

data/app/views/renalware/clinics/clinic_visits/_table_row.html.slim

@@ -1,19 +1,14 @@
 tr(class="#{'dna' if clinic_visit.did_not_attend?}")
-  td
+  td.noprint= toggler("#clinic_visit-quick-preview-#{clinic_visit.id}")
+  td.noprint.actions
     - if policy(clinic_visit).edit?
       = link_to "Edit",
                 edit_patient_clinic_visit_path(patient, clinic_visit)
-      = pipe_separator
-    = link_to("Toggle",
-              "#clinic_visit-quick-preview-#{clinic_visit.id}",
-              data: { behaviour: "toggler" })
-    = pipe_separator
     - if policy(clinic_visit).destroy?
       = link_to "Delete",
                 patient_clinic_visit_path(patient, clinic_visit),
                 method: :delete,
                 data: { confirm: I18n.t("prompts.confirm_delete") }
-      = pipe_separator
     = link_to_clinic_visit_letter(patient, clinic_visit)
   td.date-time= l(clinic_visit.date)
   td= yes_no(clinic_visit.did_not_attend)
@@ -29,7 +24,7 @@ tr(class="#{'dna' if clinic_visit.did_not_attend?}")
   td= clinic_visit.urine_protein&.text
   td.created-by= clinic_visit.created_by
 = content_tag(:tr, id: "clinic_visit-quick-preview-#{clinic_visit.id}", style: "display: none")
-  td(colspan=14)
+  td(colspan=15)
     .quick-preview
       = definition_list_for(clinic_visit, size: :large) do |list|
         = list.definition(:notes){ |value| simple_format(value) }

data/app/views/renalware/clinics/visits/_table.html.slim

@@ -1,19 +1,20 @@
 table.global-clinic-visits
   thead
     tr
-      th.col-width-medium-plus.no-print
+      th.togglers= table_toggler
+      th.col-width-actions-dropdown.no-print
       th.col-width-date Date
       th.col-width-tiny DNA
-      th.col-width-medium Patient
+      th.col-width-large Patient
       th.col-width-nhs-no NHS Number
       th.col-width-tiny Sex
       th.col-width-tiny Age
-      th.col-width-medium Modality
-      th.col-width-medium Clinic Type
+      th Modality
+      th Clinic Type
       th.col-width-tiny BMI
       th.col-width-tiny BP
       th.col-width-small.no-print
-      th.col-width-medium Created by
+      th Created by
   tbody
     / Note we can't use cached: true yet when rendering the events collection, as each row is
     / used in a different context and displays there slightly differently, for example showing