renalware-core 2.0.0.pre.beta12 → 2.0.0.pre.rc1

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

@@ -1,3 +1,5 @@
+require_dependency "renalware"
+
 module Renalware
   module HD
     class MDMPresenter < Renalware::MDMPresenter

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

@@ -26,7 +26,7 @@ module Renalware
       attr_reader :session
 
       def info
-        @info ||= session.try!(:document).try!(:info)
+        @info ||= session&.document&.info
       end
 
       def abbreviated_type

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

@@ -25,11 +25,6 @@ module Renalware
                :renal_registry_code,
                to: :hospital_unit,
                prefix: true, allow_nil: true
-
-      def state
-        self.class.to_s.demodulize.downcase
-      end
-
       delegate :class, to: :__getobj__
 
       def initialize(session, view_context = nil)
@@ -38,6 +33,10 @@ module Renalware
         super(session)
       end
 
+      def state
+        self.class.to_s.demodulize.downcase
+      end
+
       def performed_on
         url = view_context.patient_hd_session_path(session.patient, session)
         text = ::I18n.l(super)

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

@@ -2,7 +2,7 @@ module Renalware
   module HD
     class StationPresenter < SimpleDelegator
       def name
-        super.blank? ? "Unnamed Station" : super
+        super.presence || "Unnamed Station"
       end
 
       def css

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

@@ -41,11 +41,13 @@ module Renalware
       end
 
       def parts
-        letter_event.part_classes.values.map { |part_class| part_class.new(patient, letter_event) }
+        letter_event.part_classes.values.map do |part_class|
+          part_class.new(patient, self, letter_event)
+        end
       end
 
       def part_for(part_name)
-        letter_event.part_classes[part_name].new(patient, letter_event)
+        letter_event.part_classes[part_name].new(patient, self, letter_event)
       end
 
       def to_html

data/app/presenters/renalware/mdm_presenter.rb

@@ -21,9 +21,9 @@ module Renalware
       OpenStruct.new(table: pathology_table_view, rows: presenter.view_model)
     end
 
-    def latest_pathology_for(code)
-      code
-    end
+    # def latest_pathology_for(code)
+    #   code
+    # end
 
     def clinic_visits(limit: 6)
       @clinic_visits ||= Clinics::ClinicVisit.for_patient(patient)

data/app/presenters/renalware/pathology/observations_diff.rb

@@ -0,0 +1,110 @@
+require "attr_extras"
+require_dependency "renalware/pathology"
+
+# Uses Rails 5 `render anywhere` feature.
+module Renalware
+  module Pathology
+    class ObservationsDiff
+      def initialize(patient:, between_dates:, descriptions:)
+        @patient = patient
+        @descriptions = descriptions
+        @between_dates = Array(between_dates)
+        if between_dates.length != 2
+          raise ArgumentError, "between_dates argument must be an array of 2 dates"
+        end
+      end
+
+      def to_html
+        render
+      end
+
+      def to_h
+        @to_h ||= build_diff_hash
+      end
+
+      private
+
+      attr_reader :patient, :between_dates, :descriptions
+
+      def render
+        renderer.render(
+          partial: "renalware/pathology/observations/diff",
+          locals: {
+            patient: patient,
+            diffs: to_h
+          }
+        )
+      end
+
+      def renderer
+        ApplicationController.renderer
+      end
+
+      def observations1
+        @observations1 ||= begin
+          observations_in_daterange(Time.zone.at(1)..between_dates.first)
+        end
+      end
+
+      def observations2
+        @observations2 ||= begin
+          obs1_ids = observations1.map(&:id)
+          observations_in_daterange(between_dates.first..between_dates.last)
+            .reject{ |obs| obs1_ids.include?(obs.id) }
+        end
+      end
+
+      def observations_in_daterange(range)
+        Pathology::CurrentObservationsForDescriptionsQuery.new(
+          patient: patient,
+          descriptions: descriptions
+        ).call.where(observed_at: range).reject{ |obs| obs.id.nil? }.to_a
+      end
+
+      class ObsWithDiff
+        include Virtus.model
+        attribute :observed_at
+        attribute :result, Float
+        attribute :result_diff
+
+        def result_diff(more_recent)
+          more_recent && result && (result.to_f - more_recent.result&.to_f)
+        end
+      end
+
+      # Build
+      # [
+      #   { "HGB" => [
+      #       { observed_at:, value: },
+      #       { observed_at:, value:, diff: }
+      #     ]
+      #   }
+      # ]
+      # Note this could be done with a SQL window function
+      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/AbcSize
+      def build_diff_hash
+        result = {}
+
+        observations1.each do |older_obs|
+          result[older_obs.description.code] = [
+            ObsWithDiff.new(older_obs.attributes.symbolize_keys),
+            nil
+          ]
+        end
+
+        observations2.each do |newer_obs|
+          arr = result[newer_obs.description.code] || Array(2)
+          older_obs = arr[0]
+          args = newer_obs.attributes.symbolize_keys
+                                     .merge(result_diff: older_obs&.result_diff(newer_obs))
+          arr[1] = ObsWithDiff.new(args)
+        end
+
+        result
+      end
+      # rubocop:enable Metrics/MethodLength Metrics/AbcSize
+      # rubocop:enable Metrics/AbcSize
+    end
+  end
+end

data/app/presenters/renalware/renal/clinical_summary_presenter.rb

@@ -27,17 +27,45 @@ module Renalware
       end
 
       def current_events
-        @current_events ||= Events::Event.includes([:created_by, :event_type])
-                                         .for_patient(@patient)
-                                         .ordered
+        @current_events ||= begin
+          Events::Event.includes([:created_by, :event_type])
+                       .for_patient(@patient)
+                       .limit(Renalware.config.clinical_summary_max_events_to_display)
+                       .ordered
+        end
+      end
+
+      def current_events_count
+        title_friendly_collection_count(
+          actual: current_events.size,
+          total: patient.summary.events_count
+        )
       end
 
       def letters
         present_letters(find_letters)
       end
 
+      def letters_count
+        title_friendly_collection_count(
+          actual: letters.size,
+          total: patient.summary.letters_count
+        )
+      end
+
       private
 
+      attr_reader :patient
+
+      # Retuns e.g. "9" or "10 of 11"
+      def title_friendly_collection_count(actual:, total:)
+        if total > actual
+          "#{actual} of #{total}"
+        else
+          actual
+        end
+      end
+
       def find_letters
         patient = Renalware::Letters.cast_patient(@patient)
         patient.letters
@@ -45,7 +73,7 @@ module Renalware
                .with_letterhead
                .with_author
                .with_patient
-               .limit(10)
+               .limit(Renalware.config.clinical_summary_max_letters_to_display)
                .order(issued_on: :desc)
       end
 

data/app/presenters/renalware/renal/low_clearance/mdm_presenter.rb

@@ -0,0 +1,14 @@
+module Renalware
+  module Renal
+    module LowClearance
+      class MDMPresenter < Renalware::MDMPresenter
+        def low_clearance
+          @low_clearance ||= begin
+            Renal.cast_patient(patient).profile&.document&.low_clearance ||
+              Renalware::Renal::ProfileDocument::LowClearance.new
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  =link_to "Edit",
+  = link_to "Edit",
           edit_patient_accesses_assessment_path(patient, assessment),
           class: "button"
 

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

@@ -11,7 +11,7 @@
              patient: @patient,
              plans: @plans,
              current_plan: @current_plan
-    -if @procedures.any?
+    - if @procedures.any?
       = render "renalware/accesses/procedures/list"
     - if @assessments.any?
       = render "renalware/accesses/assessments/list",

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

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  =link_to "Edit",
+  = link_to "Edit",
            edit_patient_accesses_procedure_path(patient, procedure),
            class: "button"
 

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

@@ -1,7 +1,7 @@
 article.access-profiles
   header
     h2 Access Profile History
-    =link_to "Add Profile",
+    = link_to "Add Profile",
             new_patient_accesses_profile_path(@patient),
             class: "button"
 

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

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  =link_to "Edit",
+  = link_to "Edit",
           edit_patient_accesses_profile_path(patient, profile),
           class: "button"
 

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

@@ -70,24 +70,24 @@
             include_blank: true,
             wrapper: :horizontal_medium
 
-  =f.association :hospital_ward,
+  = f.association :hospital_ward,
                  collection: Renalware::Hospitals::Ward.where(hospital_unit_id: consult.hospital_unit_id),
                  wrapper: :horizontal_medium
-  =f.input :started_on, as: :date_picker, wrapper: :horizontal_datepicker
-  =f.input :consult_type, wrapper: :horizontal_medium
-  =f.input :decided_on, as: :date_picker, wrapper: :horizontal_datepicker
-  =f.input :transfer_priority, include_blank: false, wrapper: :horizontal_small
-  =f.input :transferred_on, as: :date_picker, wrapper: :horizontal_datepicker
-  =f.association :seen_by,
+  = f.input :started_on, as: :date_picker, wrapper: :horizontal_datepicker
+  = f.input :consult_type, wrapper: :horizontal_medium
+  = f.input :decided_on, as: :date_picker, wrapper: :horizontal_datepicker
+  = f.input :transfer_priority, include_blank: false, wrapper: :horizontal_small
+  = f.input :transferred_on, as: :date_picker, wrapper: :horizontal_datepicker
+  = f.association :seen_by,
                   as: :user_picker,
                   collection: Renalware::User.ordered,
                   wrapper: :horizontal_medium
-  =f.input :contact_number, wrapper: :horizontal_medium
+  = f.input :contact_number, wrapper: :horizontal_medium
 
-  =f.input :aki_risk, include_blank: "Please select", wrapper: :horizontal_small
-  =f.input :requires_aki_nurse, as: :inline_radio_buttons, wrapper: :horizontal_small
-  =f.input :description, wrapper: :horizontal_large, input_html: { rows: 5 }
+  = f.input :aki_risk, include_blank: "Please select", wrapper: :horizontal_small
+  = f.input :requires_aki_nurse, as: :inline_radio_buttons, wrapper: :horizontal_small
+  = f.input :description, wrapper: :horizontal_large, input_html: { rows: 5 }
 
   = f.submit class: :button
   span= " or "
-  =link_to "Cancel", admissions_consults_path
+  = link_to "Cancel", admissions_consults_path

data/app/views/renalware/admissions/requests/_create_request_link.html.slim

@@ -3,7 +3,7 @@
 - url = new_admissions_request_path(patient_id: patient, format: :html)
 
 / Link to launch the modal dialog
-=link_to(url,
+= link_to(url,
          id: "create-admissions-request",
          data: { "reveal-id" => "admissions-request-modal", "reveal-ajax" => "true" }) do
   - if local_assigns.fetch(:use_icon, true)

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

@@ -23,7 +23,7 @@
       = f.input :notes, as: :text, wrapper: :horizontal_large, input_html: { rows: 5 }
       = f.submit class: :button
       span= " or "
-      =link_to "Cancel",
+      = link_to "Cancel",
                "#",
                "aria-label" => "Close",
                 class: "reveal-modal-close"

data/app/views/renalware/clinical/allergies/_new.html.slim

@@ -5,10 +5,10 @@
                     html: { autocomplete: "off" },
                     validate: true do |f|
     h2= t(".title")
-    =f.input :description, as: :text, autofocus: true
-    =f.submit t(".save"), class: :button, data: { disable_with: t(".save_disable_with") }
+    = f.input :description, as: :text, autofocus: true
+    = f.submit t(".save"), class: :button, data: { disable_with: t(".save_disable_with") }
     span= " or "
-    =link_to t(".cancel"),
+    = link_to t(".cancel"),
              "#",
              "aria-label" => "Close",
              class: "reveal-modal-close"

data/app/views/renalware/clinical/allergy_statuses/_form.html.slim

@@ -8,6 +8,6 @@
                     method: :put do |f|
     .flex-container(class="#{ "disabled" if patient.allergies.count > 0}")
 
-      =f.check_box :no_known_allergies
-      =f.label :no_known_allergies, t(".no_known_allergies")
-      =f.submit t(".save"), class: "button", data: { disable_with: t(".save_disable_with") }
+      = f.check_box :no_known_allergies
+      = f.label :no_known_allergies, t(".no_known_allergies")
+      = f.submit t(".save"), class: "button", data: { disable_with: t(".save_disable_with") }

data/app/views/renalware/clinical/dry_weights/_list.html.slim

@@ -19,5 +19,4 @@ article.dry-weights.simple.simple-table
       th.col-width-small= t(".weight")
       th= t(".assessor")
     tbody
-      - presenter.dry_weights.each do |dry_weight|
-        = render "renalware/clinical/dry_weights/row", dry_weight: dry_weight
+      = render presenter.dry_weights

data/app/views/renalware/clinical/dry_weights/index.html.slim

@@ -7,7 +7,6 @@
         th Assessor
 
       tbody
-        - dry_weights.each do |dry_weight|
-          = render "row", dry_weight: dry_weight
+        = render dry_weights
 
     = paginate dry_weights

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

@@ -1,5 +1,5 @@
 = content_for(:actions) do
-  =link_to "Edit", edit_patient_clinical_profile_path(patient), class: "button"
+  = link_to "Edit", edit_patient_clinical_profile_path(patient), class: "button"
 
 = within_patient_layout(title: "Clinical Profile") do
   .grid

data/app/views/renalware/events/types/index.html.slim

@@ -4,4 +4,4 @@
             class: "button"
 
 = within_admin_layout(title: "Patient Event Types") do
-  =render "table", event_types: event_types
+  = render "table", event_types: event_types

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

@@ -30,3 +30,4 @@
                         = slot.patient.family_name
                         br
                         = slot.patient.given_name
+        .page-break

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

@@ -7,9 +7,9 @@
                   method: :post,
                   wrapper: :horizontal_form) do |f|
 
-  =f.input :station_id, as: :hidden
-  =f.input :diurnal_period_code_id, as: :hidden
-  =f.input :day_of_week, as: :hidden
+  = f.input :station_id, as: :hidden
+  = f.input :diurnal_period_code_id, as: :hidden
+  = f.input :day_of_week, as: :hidden
 
   .row
     .col-small-4
@@ -24,7 +24,7 @@
       / The value selected in in change_type above will determine which one to choose.
       #patient_select2s
         #dialysing_on_day_and_period
-          =f.input :patient_id,
+          = f.input :patient_id,
                    collection: slot.patients_preferring_to_dialyse_today_in_this_period,
                    label_method: :text,
                    value_method: :id,
@@ -33,7 +33,7 @@
                                  name: "hd_diary_slot[patient_id][]" }
 
         #dialysing_on_day(style="display:none")
-          =f.input :patient_id,
+          = f.input :patient_id,
                    collection: slot.patients_preferring_to_dialyse_today,
                    label_method: :text,
                    value_method: :id,
@@ -47,7 +47,7 @@
                       class: "patient-id-select2 patient-ajax-search",
                       name: "hd_diary_slot[patient_id][]",
                       data: { "ajax--url" => hd_patients_dialysing_at_unit_path(unit_id: slot.diary.hospital_unit_id, format: :json),
-                              placeholder: "Type 3 or more characters" }\
+                              placeholder: "Search by patient name or NHS/hosp no." }\
                     }
 
         #dialysing_at_hospital(style="display:none")
@@ -57,14 +57,14 @@
                       class: "patient-id-select2 patient-ajax-search",
                       name: "hd_diary_slot[patient_id][]",
                       data: { "ajax--url" => hd_patients_dialysing_at_hospital_path(format: :json),
-                              placeholder: "Type 3 or more characters" }\
+                              placeholder: "Search by patient name or NHS/hosp no." }\
                     }
-  =f.submit "Add for this week only", class: "button save weekly"
+  = f.submit "Add for this week only", class: "button save weekly"
   |  
-  =f.submit "Add to this and all future weeks", class: "button secondary master", name: "master"
+  = f.submit "Add to this and all future weeks", class: "button secondary master", name: "master"
 
   = blank_separator
-  =link_to "Cancel",
+  = link_to "Cancel",
            "#",
            "aria-label" => "Close",
            class: "reveal-modal-close"

data/app/views/renalware/hd/diary_slots/_tab.html.slim

@@ -5,8 +5,8 @@
                   remote: true,
                   wrapper: :horizontal_form) do |f|
 
-  -if scheduled_only
-    =f.input :patient_id,
+  - if scheduled_only
+    = f.input :patient_id,
              collection: patients,
              label_method: ->(item){ item.to_s(:long) },
              value_method: :id,
@@ -19,9 +19,9 @@
                 data: { "ajax--url" => search_patients_path(format: :json) }\
               }
 
-  =f.submit "Select", class: :button
+  = f.submit "Select", class: :button
   = blank_separator
-  =link_to "Cancel",
+  = link_to "Cancel",
            "#",
            "aria-label" => "Close",
            class: "reveal-modal-close"

data/app/views/renalware/hd/mdm/_sessions.html.slim

@@ -3,4 +3,4 @@ fieldset.simple
     span.title= t(".title")
     span.actions.action-links
       = link_to t(".view_all"), patient_hd_sessions_path(mdm.patient)
-  =render "renalware/hd/sessions/table", sessions: mdm.sessions
+  = render "renalware/hd/sessions/table", sessions: mdm.sessions

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

@@ -1,7 +1,8 @@
+- path = [:renalware, presenter.q]
 table#patients.mdm-patients.columns
   thead
     tr
-      th.col-width-large= sort_link([:renalware, presenter.q], :family_name, t(".name"))
+      th.col-width-large= sort_link(path, :family_name, t(".name"))
       th.col-width-nhs-no= t(".nhs_no")
       th.col-width-reference-no= t(".hosp_no")
       th.col-width-tiny= t(".sex")
@@ -13,12 +14,10 @@ table#patients.mdm-patients.columns
       th.col-width-date= t(".dialysing_at")
       th.col-width-date= t(".registration_status")
       th.at-least.col-width-small= t(".transport_type")
-      th.col-width-tiny= t(".hgb")
-      th.col-width-date= t(".hgb_date")
+      th.col-width-tiny= sort_link(path, :hgb, t(".hgb"))
+      th.col-width-date= sort_link(path, :hgb_date, t(".hgb_date"))
       th.col-width-tiny
   tbody
-    - presenter.patients.each do |patient|
-      = render "patient",
-               patient: patient,
-               view_proc: presenter.view_proc,
-               q: presenter.q
+    = render partial: "patient",
+             collection: presenter.patients,
+             locals: { view_proc: presenter.view_proc, q: presenter.q }

data/app/views/renalware/hd/ongoing_sessions/_table.html.slim

@@ -15,7 +15,6 @@ table.report
       td= sort_link([:renalware, query], :signed_off_by_family_name, "Signed Off By")
 
   tbody
-    - sessions.each do |session|
-      = render "session", session: session
+    = render partial: "session", collection: sessions
 
 = paginate sessions

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

@@ -4,7 +4,7 @@ ruby:
 = f.input :type, as: :hidden
 .row.top
   .large-12.columns
-    =render "form_actions", f: f, back_path: back_path, session: session, patient: @patient
+    = render "form_actions", f: f, back_path: back_path, session: session, patient: @patient
 
 .form-content
   = f.simple_fields_for :document, f.object.document do |fd|
@@ -128,4 +128,4 @@ ruby:
 
 .row
   .large-12.columns
-    =render "form_actions", f: f, back_path: back_path, session: session, patient: @patient
+    = render "form_actions", f: f, back_path: back_path, session: session, patient: @patient

data/app/views/renalware/hd/sessions/_list.html.slim

@@ -14,4 +14,4 @@ article.hd-sessions
                     new_patient_hd_session_path(@patient),
                     class: "button"
 
-  =render "renalware/hd/sessions/table", sessions: sessions
+  = render "renalware/hd/sessions/table", sessions: sessions

data/app/views/renalware/hd/sessions/_row.html.slim

@@ -21,7 +21,7 @@ tr.hd-session-row(class=[session.state, stripe_class])
   td.print-only(rowspan=2)= session.notes
 
 tr(class=[session.state, stripe_class])
-  td=tooltip(label: session.summarised_access_used, content: session.access_used)
+  td= tooltip(label: session.summarised_access_used, content: session.access_used)
   td= session.end_time
   td
     = session.after_measurement_for(:weight)

data/app/views/renalware/hd/sessions/_session_nav.html.slim

@@ -2,5 +2,5 @@
   dl.sub-nav
     dd= link_to "HD Summary", patient_hd_dashboard_path(@patient)
     dd= link_to "View", patient_hd_session_path(@patient, session)
-    -if policy(session).edit?
+    - if policy(session).edit?
       dd= link_to "Edit", edit_patient_hd_session_path(@patient, session)

data/app/views/renalware/hd/sessions/_table.html.slim

@@ -4,6 +4,6 @@ table.auto-layout.hd-sessions
   tbody
     - sessions.each_with_index do |session, index|
       - stripe_class = index % 2 == 0 ? "even" : "odd"
-      =render "renalware/hd/sessions/#{session.state}/row",
+      = render "renalware/hd/sessions/#{session.state}/row",
               session: session,
               stripe_class: stripe_class

data/app/views/renalware/hd/sessions/closed/_row.html.slim

@@ -1,3 +1,3 @@
-=render "renalware/hd/sessions/row",
+= render "renalware/hd/sessions/row",
         session: session,
         stripe_class: stripe_class

data/app/views/renalware/hd/sessions/open/_row.html.slim

@@ -1,3 +1,3 @@
-=render "renalware/hd/sessions/row",
+= render "renalware/hd/sessions/row",
         session: session,
         stripe_class: stripe_class

data/app/views/renalware/hd/stations/edit.html.slim

@@ -1,6 +1,6 @@
 / We allow cross-module references in the UI but not in the controller hence:
 - unit = Renalware::Hospitals::Unit.find(unit_id)
-- breadcrumbs = [breadcrumb_for("Hospital Units", hospitals_units_path),
+- breadcrumbs = [breadcrumb_for("HD Units", hospitals_units_path),
                  breadcrumb_for(unit.unit_code, edit_hospitals_unit_path(unit)),
                  breadcrumb_for("Stations", hd_unit_stations_path(unit))]
 

data/app/views/renalware/hd/stations/index.html.slim

@@ -1,6 +1,6 @@
 / We allow cross-module references in the UI but not in the controller hence:
 - unit = Renalware::Hospitals::Unit.find(unit_id)
-- breadcrumbs = [breadcrumb_for("Hospital Units", hospitals_units_path),
+- breadcrumbs = [breadcrumb_for("HD Units", hospitals_units_path),
                  breadcrumb_for(unit.unit_code, edit_hospitals_unit_path(unit))]
 
 = content_for(:actions) do