renalware-core 2.0.15 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69acb8bcbc66d26c57c3780bc3118754485ff7c396cf2b12250f66e700f3219c
-  data.tar.gz: 7b6a83a7af2942a923f54726d0e7b6e763e23e981811bc8fae70ebbe65bcbb63
+  metadata.gz: 48ebb9515ae94eb8fe4576bb06a5b5caffab683620a3a86baad31e571aeacbd1
+  data.tar.gz: 1dea69e84c15ff4b351b3d541edaae89ef01a20d2a702802ddbc0a3c3f34445f
 SHA512:
-  metadata.gz: 926445330b993a066666112259188829d7468c4ffe423340b6212dd541729e13fc0db5dd0364ac1bfa9dcdc316fb59703f407bb4bc08032cb2158d7e88b918c9
-  data.tar.gz: 501e734c35671bc8343825fc4aed03233e95ba8109e921f1a39cef5872d3e74eabc601f7db51f88b907f4f7834dff3f5632e06aba97dde8c2ada466120577015
+  metadata.gz: 3f71f9360fbed7a17f3c34b4adcbc8a6dd717d734d45741b13d30737dedcb4cbe520200885d0c3c46eb8f55eb93e73004240571a2a434351c854ed1d59c8c545
+  data.tar.gz: b9d76f685b3208666c869c0688d4cff3e706d6ef279411f58ff8984cf6d0a8263f4efef7780aa3fd49ea228b2c020bf30b2318ff0b2030aff9a599e959ca771f

data/app/controllers/renalware/concerns/pdf_renderable.rb

@@ -6,6 +6,8 @@ module Renalware
       extend ActiveSupport::Concern
 
       included do
+        protected
+
         def default_pdf_options
           {
             page_size: "A4",

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

@@ -3,12 +3,6 @@ require_dependency "renalware/hd"
 module Renalware
   module HD
     class MDMPatientsController < Renalware::MDMPatientsController
-      def render_index(**args)
-        presenter = build_presenter(params: params, **args)
-        authorize presenter.patients
-        render :index, locals: { presenter: presenter }
-      end
-
       def index
         query = HD::MDMPatientsQuery.new(
           relation: HD::Patient.eager_load(hd_profile: [:hospital_unit]),
@@ -19,6 +13,14 @@ module Renalware
                      view_proc: ->(patient) { patient_hd_mdm_path(patient) },
                      patient_presenter_class: HD::PatientPresenter)
       end
+
+      private
+
+      def render_index(**args)
+        presenter = build_presenter(params: params, **args)
+        authorize presenter.patients
+        render :index, locals: { presenter: presenter }
+      end
     end
   end
 end

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

@@ -3,59 +3,71 @@ require_dependency "renalware/hospitals"
 module Renalware
   module Hospitals
     class UnitsController < BaseController
-      before_action :load_hospital_unit, only: [:edit, :update]
-
       def new
-        @hospital_unit = Unit.new
-        authorize @hospital_unit
+        hospital_unit = Unit.new
+        authorize hospital_unit
+        render_new(hospital_unit)
       end
 
       def create
-        @hospital_unit = Unit.new(hospital_unit_params)
-        authorize @hospital_unit
+        hospital_unit = Unit.new(hospital_unit_params)
+        authorize hospital_unit
 
-        if @hospital_unit.save
-          redirect_to hospitals_units_path,
-            notice: t(".success", model_name: "hospital unit")
+        if hospital_unit.save
+          redirect_to hospitals_units_path, notice: success_msg_for("hospital unit")
         else
-          flash.now[:error] = t(".failed", model_name: "hospital unit")
-          render :new
+          flash.now[:error] = failed_msg_for("hospital unit")
+          render_new(hospital_unit)
         end
       end
 
       def index
-        @hospital_units = Unit.all
-        authorize @hospital_units
+        hospital_units = Unit.all
+        authorize hospital_units
+        render locals: { hospital_units: hospital_units }
+      end
+
+      def edit
+        render_edit(find_and_authorize_hospital_unit)
       end
 
       def update
-        if @hospital_unit.update(hospital_unit_params)
-          redirect_to hospitals_units_path,
-            notice: t(".success", model_name: "hospital unit")
+        hospital_unit = find_and_authorize_hospital_unit
+        if hospital_unit.update(hospital_unit_params)
+          redirect_to hospitals_units_path, notice: success_msg_for("hospital unit")
         else
-          flash.now[:error] = t(".failed", model_name: "hospital unit")
-          render :edit
+          flash.now[:error] = failed_msg_for("hospital unit")
+          render_edit(hospital_unit)
         end
       end
 
       def destroy
-        authorize Unit.destroy(params[:id])
-        redirect_to hospitals_units_path,
-          notice: t(".success", model_name: "hospital unit")
+        hospital_unit = find_and_authorize_hospital_unit
+        hospital_unit.destroy!
+        redirect_to hospitals_units_path, notice: success_msg_for("hospital unit")
       end
 
       private
 
+      def render_new(hospital_unit)
+        render :new, locals: { hospital_unit: hospital_unit }
+      end
+
+      def render_edit(hospital_unit)
+        render :edit, locals: { hospital_unit: hospital_unit }
+      end
+
+      def find_and_authorize_hospital_unit
+        hospital_unit = Unit.find(params[:id])
+        authorize hospital_unit
+        hospital_unit
+      end
+
       def hospital_unit_params
         params.require(:hospitals_unit).permit(
           :name, :unit_code, :renal_registry_code, :unit_type, :hospital_centre_id, :is_hd_site
         )
       end
-
-      def load_hospital_unit
-        @hospital_unit = Unit.find(params[:id])
-        authorize @hospital_unit
-      end
     end
   end
 end

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

@@ -19,7 +19,8 @@ module Renalware
         authorize letters
         render locals: {
           author: author,
-          letters: present_letters(letters)
+          letters: present_letters(letters),
+          columns: %i(patient)
         }
       end
 

data/app/controllers/renalware/mdm_controller.rb

@@ -2,6 +2,8 @@ require_dependency "renalware"
 
 module Renalware
   class MDMController < BaseController
+    protected
+
     def render_show(mdm_presenter:)
       render :show, locals: {
         mdm: mdm_presenter

data/app/controllers/renalware/mdm_patients_controller.rb

@@ -9,6 +9,8 @@ module Renalware
     include PresenterHelper
     include Renalware::Concerns::Pageable
 
+    protected
+
     def render_index(**args)
       presenter = build_presenter(params: params, **args)
       authorize presenter.patients

data/app/controllers/renalware/messaging/internal/messages_controller.rb

@@ -7,12 +7,6 @@ module Renalware
         include Renalware::Concerns::Pageable
         include PresenterHelper
 
-        def sent
-          messages = author.messages.page(page).per(per_page)
-          authorize messages
-          render locals: { messages: present(messages, MessagePresenter) }
-        end
-
         def new
           authorize Message, :new?
           form = MessageFormBuilder.new(patient: patient, params: params).call

data/app/controllers/renalware/pd/regimes_controller.rb

@@ -3,8 +3,6 @@ require_dependency "renalware/hd/base_controller"
 module Renalware
   module PD
     class RegimesController < BaseController
-      include Renalware::Concerns::NestedActionsControllerMethods
-
       before_action :load_patient
 
       def new
@@ -16,6 +14,7 @@ module Renalware
         }
       end
 
+      # rubocop:disable Metrics/AbcSize
       def create
         result = CreateRegime.new(patient: patient)
                              .call(by: current_user, params: pd_regime_params)
@@ -30,6 +29,7 @@ module Renalware
           }
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       def edit
         render :edit, locals: {
@@ -38,6 +38,7 @@ module Renalware
         }
       end
 
+      # rubocop:disable Metrics/AbcSize
       def update
         result = ReviseRegime.new(pd_regime).call(by: current_user, params: pd_regime_params)
 
@@ -52,6 +53,7 @@ module Renalware
           }
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       def show
         render :show, locals: {

data/app/controllers/renalware/transplants/wait_lists_controller.rb

@@ -10,7 +10,7 @@ module Renalware
         authorize registrations
         render locals: {
           path_params: path_params,
-          registrations: registrations,
+          registrations: CollectionPresenter.new(registrations, WaitListRegistrationPresenter),
           q: query.search
         }
       end

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

@@ -8,6 +8,33 @@ module Renalware
       def to_sym
         :hd
       end
+
+      def augmented_name_for(patient)
+        AugmentedModalityName.new(name, patient).to_s
+      end
+
+      # This class might be better as a presenter but leaving here for now.
+      # #to_s returns e.g. "HD (HOSPCODE)" if patient's HD profile indicates they dialyse at
+      # HOSPCODE, otherwise returns "HD".
+      class AugmentedModalityName
+        delegate :hd_profile, to: :patient, allow_nil: true
+        delegate :hospital_unit, to: :hd_profile, allow_nil: true
+        delegate :unit_code, to: :hospital_unit, allow_nil: true
+
+        def initialize(default_name, patient)
+          @patient = HD.cast_patient(patient)
+          @default_name = default_name
+        end
+
+        def to_s
+          return default_name if patient.blank? || unit_code.blank?
+          "#{default_name} (#{unit_code})"
+        end
+
+        private
+
+        attr_reader :patient, :default_name
+      end
     end
   end
 end

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

@@ -8,7 +8,14 @@ module Renalware
       has_one :hd_profile, class_name: "Profile"
       has_one :hd_preference_set, class_name: "PreferenceSet"
       has_many :hd_sessions, class_name: "Session"
-      scope :with_profile, -> { includes(:hd_profile) }
+      scope :with_profile, lambda {
+        includes(hd_profile: :hospital_unit)
+        .joins(<<-SQL)
+          LEFT OUTER JOIN hd_profiles ON hd_profiles.patient_id = patients.id
+          LEFT OUTER JOIN hospital_units ON hd_profiles.hospital_unit_id = hospital_units.id
+        SQL
+        .where("hd_profiles.deactivated_at is NULL")
+      }
 
       def treated?
         modality_descriptions.exists?(type: "Renalware::HD::ModalityDescription")

data/app/models/renalware/hd/sessions/auditable_session.rb

@@ -61,8 +61,7 @@ module Renalware
         # This is fluid removed (ml) / HD time in hours eg 3.75 / dry weight (kg)
         # The result is in ml/hr/kg
         def ufr
-          return nil unless measured_dry_weight > 0 && duration > 0
-          return nil unless (fluid_removed = document.dialysis.fluid_removed) > 0
+          return nil unless measured_dry_weight > 0 && duration > 0 && fluid_removed > 0
 
           fluid_removed / duration_as_hours / measured_dry_weight
         end
@@ -80,6 +79,10 @@ module Renalware
         def duration_as_hours
           duration.to_f / 60.0
         end
+
+        def fluid_removed
+          document.dialysis.fluid_removed.to_f
+        end
       end
     end
   end

data/app/models/renalware/hd/sessions/auditable_session_collection.rb

@@ -151,7 +151,7 @@ module Renalware
           end
 
           def total
-            @total ||= values.inject(0){ |sum, value| sum + value }
+            @total ||= values.inject(0.0){ |sum, value| sum + value.to_f }
           end
 
           def mean

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

@@ -20,8 +20,16 @@ module Renalware
           .merge(Letter::Approved.all)
           .where(letter_letters: { author_id: user_id })
       }
-      scope :unread, -> { where(read_at: nil).joins(:letter).merge(Letter::Approved.all) }
-      scope :read, -> { where.not(read_at: nil).joins(:letter).merge(Letter::Approved.all) }
+      scope :unread, lambda {
+        where(read_at: nil)
+          .joins(:letter)
+          .merge(Letter.approved_or_completed)
+      }
+      scope :read, lambda {
+        where.not(read_at: nil)
+          .joins(:letter)
+          .merge(Letter.approved_or_completed)
+      }
       scope :for_recipient, ->(user_id) { where(recipient_id: user_id) }
       scope :ordered, -> { order(created_at: :desc) }
 

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

@@ -63,6 +63,9 @@ module Renalware
       scope :with_patient, -> { includes(patient: :primary_care_physician) }
       scope :with_event, -> { includes(:event) }
       scope :with_cc_recipients, -> { includes(cc_recipients: { addressee: { person: :address } }) }
+      scope :approved_or_completed, lambda {
+        where(type: [state_class_name(:approved), state_class_name(:completed)])
+      }
 
       delegate :primary_care_physician, to: :patient
 

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

@@ -20,6 +20,12 @@ module Renalware
       def self.policy_class
         Modalities::DescriptionPolicy
       end
+
+      # Modalities::Description subclasses can override this to for instance add
+      # the patient's 'HD Site' add after 'HD'
+      def augmented_name_for(_patient)
+        name
+      end
     end
   end
 end

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

@@ -9,6 +9,9 @@ module Renalware
       scope :having_no_primary_renal_diagnosis, lambda {
         where(renal_profile: nil)
       }
+      scope :with_profile, lambda {
+        joins("LEFT OUTER JOIN renal_profiles ON renal_profiles.patient_id = patients.id")
+      }
     end
   end
 end

data/app/models/renalware/transplants/registrations/wait_list_query.rb

@@ -23,7 +23,11 @@ module Renalware
             query = query_for_filter(named_filter).merge(q)
             QueryableRegistration
               .includes(patient: [current_modality: :description])
+              .includes(current_status: :description)
+              .merge(HD::Patient.with_profile)
+              .merge(Renal::Patient.with_profile)
               .search(query).tap do |s|
+
               s.sorts = ["patient_family_name, patient_given_name"]
             end
           end
@@ -80,10 +84,6 @@ module Renalware
               .where.not(transplant_registration_status_descriptions: { code: codes })
           }
 
-          ransacker :uk_transplant_centre_code do
-            Arel.sql("transplant_registrations.document -> 'codes' ->> 'uk_transplant_centre_code'")
-          end
-
           ransacker :crf_highest_value do
             Arel.sql("transplant_registrations.document -> 'crf' -> 'highest' ->> 'result'")
           end
@@ -92,6 +92,16 @@ module Renalware
             Arel.sql("transplant_registrations.document -> 'crf' -> 'latest' ->> 'result'")
           end
 
+          # TODO: move ransacker to HD namespace
+          ransacker :hd_site do
+            Arel.sql("hospital_units.unit_code")
+          end
+
+          # TODO: move ransacker to Renal namespace
+          ransacker :esrf_on do
+            Arel.sql("renal_profiles.esrf_on")
+          end
+
           scope :ukt_status_is, lambda { |status|
             where(
               "transplant_registrations.document -> 'uk_transplant_centre' ->> 'status' ilike ?",

data/app/policies/renalware/letters/electronic_receipt_policy.rb

@@ -6,7 +6,7 @@ module Renalware
   module Letters
     class ElectronicReceiptPolicy < BasePolicy
       def mark_as_read?
-        !record.read? && record.letter.approved?
+        !record.read? && (record.letter.approved? || record.letter.completed?)
       end
 
       def unread?

data/app/presenters/renalware/patients/banner_presenter.rb

@@ -0,0 +1,15 @@
+require_dependency "renalware/patients"
+
+module Renalware
+  module Patients
+    class BannerPresenter < SimpleDelegator
+      def current_modality_description
+        if current_modality.blank? || current_modality.new_record?
+          I18n.t("renalware.modalities.none")
+        else
+          current_modality.description.augmented_name_for(__getobj__)
+        end
+      end
+    end
+  end
+end

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

@@ -5,13 +5,57 @@ require_dependency "renalware/transplants"
 module Renalware
   module Transplants
     class WaitListRegistrationPresenter < SimpleDelegator
-      delegate :uk_transplant_centre, to: :document
-      delegate :status, :status_updated_on, to: :uk_transplant_centre, prefix: true, allow_nil: true
+      delegate :uk_transplant_centre,
+               :transplant,
+               :organs,
+               :crf,
+               to: :document
+      delegate :status,
+               :status_updated_on,
+               to: :uk_transplant_centre, prefix: true, allow_nil: true
+      delegate :highest,
+               :latest,
+               to: :crf, prefix: true, allow_nil: true
+      delegate :recorded_on,
+               :result,
+               to: :crf_highest, prefix: true, allow_nil: true
+      delegate :recorded_on,
+               :result,
+               to: :crf_latest, prefix: true, allow_nil: true
+      delegate :blood_group,
+               :nb_of_previous_grafts,
+               to: :transplant, prefix: true, allow_nil: true
+      delegate :transplant_type,
+               to: :organs,
+               prefix: true, allow_nil: true
+      delegate :hospital_identifier,
+               :age,
+               :sex,
+               :current_modality,
+               to: :patient,
+               prefix: true, allow_nil: true
 
       def uk_transplant_centre_summary
         return if uk_transplant_centre_status.blank?
         "#{uk_transplant_centre_status} (#{I18n.l(uk_transplant_centre_status_updated_on)})"
       end
+
+      def hd_hospital_unit_code
+        Renalware::HD.cast_patient(patient).hd_profile&.hospital_unit&.unit_code
+      end
+
+      def esrf_date
+        Renalware::Renal.cast_patient(patient).profile&.esrf_on
+      end
+
+      def dol
+        entered_on && (Time.zone.today - entered_on).to_i
+      end
+
+      def sens
+        return if crf_latest_result.blank?
+        crf_latest_result.to_i > 60 ? "Sens" : "Unsens"
+      end
     end
   end
 end

data/app/views/renalware/hd/protocols/show.pdf.slim

@@ -5,7 +5,6 @@
 
 - protocol.with_format("html") do
   .protocol
-
     = render "renalware/patients/header", patient: protocol.patient
     table.protocol-patient-summary
       thead

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

@@ -1,6 +1,6 @@
-= render "renalware/shared/errors", model: @hospital_unit
+= render "renalware/shared/errors", model: hospital_unit
 
-= simple_form_for @hospital_unit,
+= simple_form_for hospital_unit,
                   wrapper: :horizontal_form,
                   html: { autocomplete: "off" } do |f|
   = f.association :hospital_centre,

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

@@ -1,3 +1,3 @@
 = within_admin_layout(title: "Edit",
                       breadcrumbs: breadcrumb_for("Hospital Units", hospitals_units_path)) do
-  = render "form"
+  = render "form", hospital_unit: hospital_unit

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

@@ -16,14 +16,14 @@
         th.col-width-tiny Stations
         th.col-width-medium
     tbody
-      - @hospital_units.each do |unit|
+      - 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),
-                      RecipientFollowupmethod: :delete,
+                      method: :delete,
                       data: { confirm: I18n.t("prompts.confirm_delete") }
           td= unit.unit_code
           td= unit.name

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

@@ -1,3 +1,3 @@
 = within_admin_layout(title: "Add",
                       breadcrumbs: breadcrumb_for("Hospital Units", hospitals_units_path)) do
-  = render "form"
+  = render "form", hospital_unit: hospital_unit

data/app/views/renalware/letters/electronic_receipts/_table.html.slim

@@ -1,6 +1,7 @@
 table.letters.electronic-ccs.has-togglable-rows
   thead
     tr
+      th.col-width-tiny State
       th.col-width-date Date
       th.col-width-date-time Read at
       th.col-width-medium Author
@@ -15,7 +16,9 @@ table.letters.electronic-ccs.has-togglable-rows
       - letter = Renalware::Letters::LetterPresenter.new(receipt.letter)
       - patient = letter.patient
 
-      tr(id=receipt.html_identifier)
+      tr(id=receipt.html_identifier class=letter.state.dasherize)
+        td.state
+          span= letter.state_description
         td= l(letter.issued_on)
         td= l(receipt.read_at)
         td= letter.author
@@ -31,7 +34,7 @@ table.letters.electronic-ccs.has-togglable-rows
 
       = content_tag(:tr, id: receipt.html_preview_identifier, style: "display: none")
         td
-        td(colspan=6)
+        td(colspan=7)
           .quick-preview
             = simple_format letter.body
 

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

@@ -1,3 +1,5 @@
+- columns = local_assigns[:columns] || []
+
 tr(class=letter.state.dasherize)
   td
     = link_to "Toggle", "#quick-preview-#{letter.id}", data: { behaviour: "toggler" }
@@ -16,12 +18,15 @@ tr(class=letter.state.dasherize)
   td.state
     span= letter.state_description
   td= l(letter.issued_on)
-  td= letter.author
+  - if columns.include?(:author)
+    td.col-width-medium-with-ellipsis= letter.author
+  - if columns.include?(:patient)
+    td.col-width-medium-with-ellipsis= default_patient_link(letter.patient)
   td.recipient= letter.main_recipient.address
-  td= letter.description
+  td.col-width-medium-with-ellipsis= letter.description
 
 = content_tag(:tr, id: "quick-preview-#{letter.id}", style: "display: none")
   td
-  td(colspan=7)
+  td(colspan=8)
     .quick-preview
       = simple_format letter.body

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

@@ -1,14 +1,20 @@
+- columns = local_assigns[:columns] || [:author]
+
 table.auto-layout.letters.has-togglable-rows
   thead
     tr
-      th.col-width-medium
-      th State
+      th.col-width-small
+      th.col-width-tiny State
       th.col-width-date Date
-      th Author
-      th Recipient
-      th Description
+      - if columns.include?(:author)
+        th.col-width-medium Author
+      - if columns.include?(:patient)
+        th.col-width-medium Patient
+      th.col-width-medium Recipient
+      th.col-width-medium Description
 
   tbody
     = render partial: "renalware/letters/letters/letter",
              collection: letters,
-             cached: true
+             cached: true,
+             locals: { columns: columns }

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

@@ -1,4 +1,3 @@
 = within_admin_layout(title: "#{author.full_name}'s letters") do
-
-  = render "table", letters: letters
+  = render "table", letters: letters, columns: columns
   = paginate letters

data/app/views/renalware/mdm/_prescriptions.html.slim

@@ -7,21 +7,27 @@ article
                 patient_prescriptions_path(mdm.patient),
                 class: "button secondary"
 
-  - if local_assigns[:with_esa] == true
+      = link_to "Toggle",
+                "#prescriptions",
+                class: "button secondary",
+                data: { behaviour: "css-toggler" }
 
-    ul.tab-strip(data-tab)
-      li.tab-title.active= link_to "Current", "#current"
-      li.tab-title= link_to "EPO History", "#epo-history"
+  #prescriptions.expandable
+    - if local_assigns[:with_esa] == true
 
-    .tabs-content
-      #current.content.active
-        = render "renalware/mdm/prescriptions/table",
-                 prescriptions: mdm.current_prescriptions,
-                 show_administer_on_hd: true
-      #epo-history.content
-        = render "renalware/mdm/prescriptions/table",
-                 prescriptions: mdm.esa_prescriptions,
-                 show_terminated_on: true,
-                 show_administer_on_hd: true
-  - else
-    = render "current_prescriptions", mdm: mdm
+      ul.tab-strip(data-tab)
+        li.tab-title.active= link_to "Current", "#current"
+        li.tab-title= link_to "EPO History", "#epo-history"
+
+      .tabs-content
+        #current.content.active
+          = render "renalware/mdm/prescriptions/table",
+                   prescriptions: mdm.current_prescriptions,
+                   show_administer_on_hd: true
+        #epo-history.content
+          = render "renalware/mdm/prescriptions/table",
+                   prescriptions: mdm.esa_prescriptions,
+                   show_terminated_on: true,
+                   show_administer_on_hd: true
+    - else
+      = render "current_prescriptions", mdm: mdm

data/app/views/renalware/mdm_patients/_patient.html.slim

@@ -1,4 +1,5 @@
 - observation_set = patient.current_observation_set
+- transplant_patient = Renalware::Transplants::PatientPresenter.new(patient)
 tr
   td.full-name= link_to patient.to_s(:default), view_proc.call(patient)
   td.nowrap= patient.nhs_number
@@ -6,6 +7,7 @@ tr
   td= patient.sex.code
   td= patient.age
   td= patient.modality_description&.name
+  td= transplant_patient.current_registration_status
   td= observation_set.hgb_result
   td= l(observation_set.hgb_observed_at)
   td= observation_set.ure_result

data/app/views/renalware/mdm_patients/_table.html.slim

@@ -8,6 +8,7 @@ table#patients.mdm-patients.columns
       th.col-width-tiny= t(".sex")
       th.col-width-tiny= t(".age")
       th.col-width-medium= t(".modality")
+      th.col-width-date= t(".registration_status")
       - %i(hgb ure cre).each do |code|
         th.col-width-tiny= sort_link(path, code, t(".#{code}"))
         th.col-width-date= sort_link(path, :"#{code}_date", t(".#{code}_date"))

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

@@ -1,4 +1,5 @@
 - back_path ||= nil
+- patient = Renalware::Patients::BannerPresenter.new(patient)
 
 .header.patient-header
   / If screen-is-mobile-size is visible then we collapse the patient LH nav
@@ -31,4 +32,4 @@
     dt= t(".born_on")
     dd= "#{l(patient.born_on)} (#{patient.age}y)"
     dt= t(".modality")
-    dd= modality_description_for(patient.current_modality)
+    dd= patient.current_modality_description

data/app/views/renalware/patients/side_menu/_actions.html.slim

@@ -1,20 +1,22 @@
 - bookmark = find_user_bookmark_for_patient(patient)
 
-- cache([patient, current_user, bookmark || "bookmarks/"]) do
-  - if bookmark.present?
-    li.link.action= render partial: "renalware/patients/bookmarks/delete",
-                    locals: { bookmark: bookmark, link_text: t(".delete_bookmark") }
-  - else
-    li.link.action= render partial: "renalware/patients/bookmarks/new",
-                    locals: { patient: patient, link_text: t(".create_bookmark") }
-
-- cache([patient, patient.worry || "worries/"]) do
-  - if patient.worry.present?
-    li.link.action= render partial: "renalware/patients/worries/delete",
-                    locals: { patient: patient }
-  - else
-    li.link.action= render partial: "renalware/patients/worries/new",
-                    locals: { patient: patient }
+/ Don't cache fragments that contain a form
+/- cache([patient, current_user, bookmark || "bookmarks/"]) do
+- if bookmark.present?
+  li.link.action= render partial: "renalware/patients/bookmarks/delete",
+                  locals: { bookmark: bookmark, link_text: t(".delete_bookmark") }
+- else
+  li.link.action= render partial: "renalware/patients/bookmarks/new",
+                  locals: { patient: patient, link_text: t(".create_bookmark") }
+
+/ Don't cache fragments that contain a form
+/- cache([patient, patient.worry || "worries/"]) do
+- if patient.worry.present?
+  li.link.action= render partial: "renalware/patients/worries/delete",
+                  locals: { patient: patient }
+- else
+  li.link.action= render partial: "renalware/patients/worries/new",
+                  locals: { patient: patient }
 
 - cache([patient, "send_message_link"]) do
   li.link.action= render partial: "renalware/messaging/internal/messages/send_message_link",

data/app/views/renalware/transplants/wait_lists/_registration.html.slim

@@ -5,27 +5,21 @@ tr
   td.full-name
     = link_to registration.patient.to_s,
               patient_clinical_summary_path(registration.patient)
-  td= registration.patient.hospital_identifier
-  td= registration.patient.age
-  td= registration.patient.sex.code
-  td= registration.patient.current_modality
-  td= registration.document.codes.uk_transplant_centre_code
+  td= registration.patient_hospital_identifier
+  td= registration.patient_age
+  td= registration.patient_sex.code
+  td= registration.patient_current_modality
+  td= registration.hd_hospital_unit_code
   td= registration.current_status
-  td= registration.document.uk_transplant_centre&.status
-  td
-    - Renalware::Renal.cast_patient(registration.patient).tap do |patient|
-      = I18n.l(patient.profile&.esrf_on)
-  td= I18n.l registration.entered_on
-  td
-    - if registration.entered_on
-      = (Time.zone.today - registration.entered_on).to_i
-  td= registration.document.transplant.blood_group.to_s
-  td= registration.document.crf.highest.result
-  td= I18n.l registration.document.crf.highest.recorded_on
-  td= registration.document.crf.latest.result
-  td= I18n.l registration.document.crf.latest.recorded_on
-  td
-    - if registration.document.crf.latest.result.present?
-      = (registration.document.crf.latest.result.to_i > 60 ? "Sens" : "Unsens")
-  td= registration.document.transplant.nb_of_previous_grafts
-  td= registration.document.organs.transplant_type.try(:text)
+  td= registration.uk_transplant_centre_status
+  td= l(registration.esrf_date)
+  td= l(registration.entered_on)
+  td= registration.dol
+  td= registration.transplant_blood_group.to_s
+  td= registration.crf_highest_result
+  td= l(registration.crf_highest_recorded_on)
+  td= registration.crf_latest_result
+  td= l(registration.crf_latest_recorded_on)
+  td= registration.sens
+  td= registration.transplant_nb_of_previous_grafts
+  td= registration.organs_transplant_type&.text

data/app/views/renalware/transplants/wait_lists/show.html.slim

@@ -25,13 +25,10 @@
         th= sort_link([:renalware, q], :patient_born_on, "Age")
         th= sort_link([:renalware, q], :patient_sex, "Sex")
         th Modal
-        th= sort_link([:renalware, q], :uk_transplant_centre_code, "Site")
+        th= sort_link([:renalware, q], :hd_site, "HD Site")
         th Status
         th UKT Status
-        / Note patient_profile_esrf_on sorting not yet working because patient is not a
-        / Renal::Patient so patient#profile does not exist. We may need to add a ransacker
-        / in WaitListQuery
-        th.col-width-date= sort_link([:renalware, q], :patient_profile_esrf_on, "ESRF Date")
+        th.col-width-date= sort_link([:renalware, q], :esrf_on, "ESRF Date")
         th.col-width-date= sort_link([:renalware, q], :entered_on, "Entry Date")
         th DOL
         th Bld Grp

data/config/locales/renalware/mdm.yml

@@ -19,6 +19,7 @@ en:
         cre: CRE
         cre_date: CRE Date
         egfr: EGFR
+        registration_status: Tx Status
     mdm:
       problems:
         view_all: View All

data/config/routes.rb

@@ -36,16 +36,16 @@ Renalware::Engine.routes.draw do
   resources :mock_errors, only: [:index], controller: "system/mock_errors"
 
   namespace :reporting do
-    resources :audits, except: [:destroy]
+    resources :audits, except: [:destroy, :create, :new]
     resources :audit_refreshments, only: [:create]
   end
 
   namespace :admissions do
-    resources :requests do
+    resources :requests, except: :show do
       post :sort, on: :collection
     end
-    resources :consults
-    resources :admissions
+    resources :consults, except: :show
+    resources :admissions, except: :show
   end
 
   namespace :messaging do
@@ -110,11 +110,11 @@ Renalware::Engine.routes.draw do
 
   resources :bookmarks, controller: "patients/bookmarks", only: :destroy
   resource :dashboard, only: :show, controller: "dashboard/dashboards"
-  resource :worryboard, :show, controller: "patients/worryboard"
+  resource :worryboard, only: :show, controller: "patients/worryboard"
 
   # Clinics
   resources :appointments, controller: "clinics/appointments", only: [:index]
-  resources :clinic_visits, controller: "clinics/visits"
+  resources :clinic_visits, only: :index, controller: "clinics/visits"
 
   resources :deaths, only: :index, as: :patient_deaths
 
@@ -453,21 +453,27 @@ Renalware::Engine.routes.draw do
       scope "/donor" do
         resource :donor_dashboard, only: :show, path: "/dashboard"
         resource :donor_workup, only: [:show, :edit, :update], path: "/workup"
-        resources :donor_operations, expect: [:index, :destroy], path: "/operations" do
-          resource :followup, controller: "donor_followups", path: "/follow_up"
+        resources :donor_operations, except: [:index, :destroy], path: "/operations" do
+          resource :followup,
+                   except: :destroy,
+                   controller: "donor_followups",
+                   path: "/follow_up"
         end
-        resources :donations, expect: [:index, :destroy]
-        resource :donor_stage, expect: [:index, :destroy], path: "/stage"
+        resources :donations, except: [:index, :destroy]
+        resource :donor_stage, only: [:new, :create], path: "/stage"
       end
 
       scope "/recipient" do
         resource :recipient_dashboard, only: :show, path: "/dashboard"
         resource :recipient_workup, only: [:show, :edit, :update], path: "/workup"
-        resources :recipient_operations, expect: [:index, :destroy], path: "/operations" do
-          resource :followup, controller: "recipient_followups", path: "/follow_up"
+        resources :recipient_operations, except: [:index, :destroy], path: "/operations" do
+          resource :followup,
+                   except: :destroy,
+                   controller: "recipient_followups",
+                   path: "/follow_up"
         end
-        resource :registration, expect: [:index, :destroy] do
-          resources :statuses, controller: "registration_statuses"
+        resource :registration, only: [:show, :edit, :update] do
+          resources :statuses, except: [:index, :show], controller: "registration_statuses"
         end
       end
     end

data/lib/renalware/version.rb

@@ -1,3 +1,3 @@
 module Renalware
-  VERSION = "2.0.15".freeze
+  VERSION = "2.0.16".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.15
+  version: 2.0.16
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1059,7 +1059,6 @@ files:
 - app/controllers/renalware/clinics/visits_controller.rb
 - app/controllers/renalware/concerns/cache_busting.rb
 - app/controllers/renalware/concerns/devise_controller_methods.rb
-- app/controllers/renalware/concerns/nested_actions_controller_methods.rb
 - app/controllers/renalware/concerns/pageable.rb
 - app/controllers/renalware/concerns/pdf_renderable.rb
 - app/controllers/renalware/dashboard.rb
@@ -1875,6 +1874,7 @@ files:
 - app/presenters/renalware/pathology/requests/sample_description.rb
 - app/presenters/renalware/pathology/results_presenter.rb
 - app/presenters/renalware/patient_presenter.rb
+- app/presenters/renalware/patients/banner_presenter.rb
 - app/presenters/renalware/pd/dashboard_presenter.rb
 - app/presenters/renalware/pd/delivery_interval_presenter.rb
 - app/presenters/renalware/pd/mdm_presenter.rb

data/app/controllers/renalware/concerns/nested_actions_controller_methods.rb

@@ -1,30 +0,0 @@
-require "active_support/concern"
-
-module Renalware
-  module Concerns::NestedActionsControllerMethods
-    extend ActiveSupport::Concern
-
-    included do
-      # Allows add and remove form submissions for a nested collection
-      #
-      # @params
-      # nested - the nested collection where items are added or removed
-      # default_action - the update or save action wrapped in a proc
-      # build_attrs - attributes to pass to collection#build when adding to the collection
-      #
-      def perform_action(nested, default_action, build_attrs = {})
-        if (actions = params[:actions]).present?
-          if actions.key?(:remove)
-            index = actions[:remove].keys.first.to_i
-            nested.destroy(nested[index])
-          else
-            nested.build(build_attrs)
-          end
-          false
-        else
-          default_action.call
-        end
-      end
-    end
-  end
-end