renalware-core 2.0.5 → 2.0.7

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

@@ -38,9 +38,11 @@ module Renalware
         Letter::Draft.new(params.merge!(type: Letter::Draft.name, patient: patient))
       end
 
+      # note both practice and gp need to be present before we can the pcp - we'll use the
+      # practice address but the GP's name as the salutation.
       def include_primary_care_physician_as_default_main_recipient
         return if letter.main_recipient.present?
-        if patient.primary_care_physician.present?
+        if patient.primary_care_physician.present? && patient.practice_id.present?
           letter.build_main_recipient(person_role: :primary_care_physician)
         else
           letter.build_main_recipient(person_role: :patient)

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

@@ -32,13 +32,9 @@ module Renalware
       end
 
       def current_address
-        if patient?
-          letter.patient.current_address
-        elsif primary_care_physician?
-          address_for_primary_care_physician
-        else
-          addressee.address
-        end
+        return address_for_patient if patient?
+        return practice_address_for_patient if primary_care_physician?
+        address_for_addressee_eg_contact
       end
 
       def for_contact?(contact)
@@ -48,17 +44,46 @@ module Renalware
 
       private
 
-      def address_for_primary_care_physician
+      def address_for_patient
+        letter.patient.current_address.tap do |address|
+          ensure_address_has_a_name_required_when_displaying_letters(
+            address,
+            letter.patient.full_name
+          )
+        end
+      end
+
+      def practice_address_for_patient
         address = letter.patient&.practice&.address
         if address.present? && letter.primary_care_physician.present?
-          address.name = letter.primary_care_physician.salutation
+          ensure_address_has_a_name_required_when_displaying_letters(
+            address,
+            letter.primary_care_physician.salutation
+          )
         end
         address
       end
 
+      def address_for_addressee_eg_contact
+        addressee.address.tap do |address|
+          ensure_address_has_a_name_required_when_displaying_letters(address, addressee.to_s)
+        end
+      end
+
       def patient_or_primary_care_physician?
         patient? || primary_care_physician?
       end
+
+      # Make sure we have a 'name' set in the address record set as this is used in the letter
+      # e.g. Roger Robar <- address.name
+      #      123 Toon Town
+      #      ...
+      # Note address.name is a redundant field not consistently populated in the app
+      # and should be removed. However its consumed in a quite a few laces building letters
+      # and displaying the letter form, hence this hack.
+      def ensure_address_has_a_name_required_when_displaying_letters(address, name)
+        address.name = name if address.present? && address.name.blank?
+      end
     end
   end
 end

data/app/models/renalware/patients/patient_hospital_identifiers.rb

@@ -49,6 +49,10 @@ module Renalware
         all.map{ |name, hosp_no| "#{name}: #{hosp_no}" }.join(" ")
       end
 
+      def to_s_multiline
+        all.map{ |name, hosp_no| "#{name}: #{hosp_no}" }.join("<br>").html_safe
+      end
+
       # Returns true if the  patient has a hospital number at the requested hospital.
       # Example usage
       #   PatientHospitalIdentifiers.new(patient).patient_at?(:KCH) # => true

data/app/models/renalware/patients/practice_search_query.rb

@@ -13,8 +13,11 @@ module Renalware
         term = "%#{search_term}%"
         Practice.select(:id, :name)
                 .left_outer_joins(:address)
-                .where("patient_practices.name ILIKE ? OR addresses.postcode ILIKE ?", term, term)
-        # .select("patient_practices.id", "patient_practices.name")
+                .includes(:address)
+                .where("patient_practices.name ILIKE ? "\
+                       "OR addresses.street_1 ILIKE ? " \
+                       "OR addresses.postcode ILIKE ?", term, term, term)
+                .limit(50)
       end
     end
   end

data/app/models/renalware/transplants/registration_status.rb

@@ -26,7 +26,7 @@ module Renalware
       end
 
       def to_s
-        description.to_s if description
+        description&.to_s
       end
     end
   end

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

@@ -73,7 +73,8 @@ module Renalware
         when ::Float; (post - pre).round(1)
         when ::Integer; (post - pre)
         end
-        # raise "Unsupported class '#{pre.class}'' - cannot calculate the change"
+      rescue StandardError => exception
+        nil
       end
 
       def summarised_access_used

data/app/presenters/renalware/summary_part.rb

@@ -7,7 +7,7 @@ module Renalware
   # reporting dashboards or summary pages. The Clinical Summary for instance comprises an array
   # of various SummaryParts
   class SummaryPart
-    DATE_FORMAT = "%Y%m%d%H%M%S%L".freeze
+    DATE_FORMAT = "%Y%m%d%H%M%S%L"
     rattr_initialize :patient
     attr_implement :to_partial_path
 

data/app/views/renalware/addresses/_address.html.slim

@@ -1,6 +1,6 @@
 dl.dl-horizontal
-  dt Name
-  dd= address.name
+  / dt Name
+  / dd= address.name
 
   dt Organisation Name
   dd= address.organisation_name

data/app/views/renalware/addresses/_form.html.slim

@@ -1,6 +1,6 @@
-= a.input :name,
-          placeholder: "If different than above (optional)",
-          wrapper: :horizontal_medium
+/ = a.input :name,
+/           placeholder: "If different than above (optional)",
+/           wrapper: :horizontal_medium
 = a.input :street_1, wrapper: :horizontal_large
 = a.input :street_2, wrapper: :horizontal_large
 = a.input :street_3, wrapper: :horizontal_large

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

@@ -13,7 +13,7 @@
     / at option index 1.
     = f.input :patient_id,
               wrapper: :horizontal_medium,
-              collection: [[admission.patient&.to_s, admission.patient&.id]],
+              collection: [[admission.patient&.to_s(:long), admission.patient&.id]],
               selected: 1,
               input_html: { \
                 class: "patient-id-select2 patient-ajax-search",

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

@@ -3,6 +3,8 @@
   table
     thead
       tr
+        - unless compact
+          th.col-width-tiny(rowspan=2)
         th.col-width-medium(rowspan=2) Site/Ward
         - unless compact
           th.at-least.col-width-medium(rowspan=2) Patient
@@ -13,8 +15,6 @@
           th.col-width-tiny(rowspan=2) Age
         th.admission.subhead(colspan=3) Admission
         th.discharge.subhead(colspan=4) Discharge
-        - unless compact
-          th.col-width-tiny(rowspan=2)
 
       tr
         th.col-width-date Date
@@ -29,6 +29,10 @@
     tbody
       - admissions.each do |admission|
         tr
+          - unless compact
+            td
+              - if policy(admission).edit?
+                = link_to "Edit", edit_admissions_admission_path(admission)
           td= admission.unit_and_ward
           - unless compact
             td= default_patient_link(admission.patient)
@@ -51,11 +55,6 @@
             - else
               | -
 
-          - unless compact
-            td
-              - if policy(admission).edit?
-                = link_to "Edit", edit_admissions_admission_path(admission)
-
         = content_tag(:tr, id: "admission-quick-preview-#{admission.id}", style: "display: none")
           td
           td(colspan=13)

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

@@ -5,29 +5,32 @@
       method: :get do |f|
     .row
       .columns.medium-3.large-2
+        = f.input :identity_match, label: "Hosp/NHS no. or name"
+
+      .columns.medium-2.large-2
         = f.input :consult_site_id_eq,
                   collection: Renalware::Admissions::ConsultSite.pluck(:name, :id),
                   label: "Site"
-      .columns.medium-2.large-1
+      .columns.medium-1.large-1
         = f.input :requires_aki_nurse_eq,
                   collection: [["Yes", true], ["No", false]],
-                  label: "AKI Nurse req."
+                  label: "AKI Nurse?"
       .columns.medium-2.large-1
         = f.input :seen_by_id_eq,
                   include_blank: false,
                   collection: [["Anyone", nil], ["Me", current_user.id]],
                   label: "Seen by"
-      .columns.medium-2.large-1
+      .columns.medium-1.large-1
         = f.input :aki_risk_eq,
                   include_blank: true,
                   collection: Renalware::Admissions::Consult.aki_risk.values.map{ |value| [value.text, value] },
                   label: "AKI Risk"
-      / .columns.medium-2.large-1
-      /   = f.input :stopped_on_eq_nil,
-      /             include_blank: false,
-      /             collection: [["Yes", true], ["No", false]],
-      /             label: "Active"
+      .columns.medium-1.large-1
+        = f.input :ended_on_null,
+                  include_blank: true,
+                  collection: [["Yes", true], ["No", false]],
+                  label: "Active"
       .columns.medium-2.large-2.actions.end
         = f.submit "Filter", class: "button"
         span= " or "
-        = link_to t("helpers.reset"), admissions_consults_path
+        = link_to t("helpers.reset"), admissions_consults_path(reset: 1)

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

@@ -9,7 +9,7 @@
   / at option index 1.
   = f.input :patient_id,
             wrapper: :horizontal_medium,
-            collection: [[consult.patient&.to_s, consult.patient&.id]],
+            collection: [[consult.patient&.to_s(:long), consult.patient&.id]],
             selected: 1,
             input_html: { \
               class: "patient-id-select2 patient-ajax-search",
@@ -45,7 +45,7 @@
 
   = 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 :description, wrapper: :horizontal_large, input_html: { rows: 10 }
 
   = f.submit class: :button
   span= " or "

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

@@ -2,38 +2,30 @@
   table
     thead
       tr
-        th= sort_link(query, :consult_site_id, "Location")
-        th.at-least.col-width-medium Patient
+        th.col-width-medium
+        th.col-width-medium= sort_link(query,
+                                      :location,
+                                      [:consult_site_name, :hospital_ward_name],
+                                      "Location")
+        th.col-width-large
+          = sort_link(query, :patient, ["patient_family_name", "patient_given_name asc"], "Patient")
         th.col-width-nhs-no NHS No.
         th.col-width-reference-no Hosp Nos.
-        th.col-width-date Started
-        th.col-width-date Ended
-        th.col-width-medium Modality
-        th.col-width-tiny Sex
-        th.col-width-tiny Age
+        th.col-width-date= sort_link(query, :started_on, "Started")
+        th.col-width-date= sort_link(query, :ended_on, "Ended")
+        th.col-width-small.show-for-large-up Modality
+        th.col-width-tiny.show-for-large-up Sex
+        th.col-width-tiny.show-for-large-up Age
         th.col-width-tiny= sort_link(query, :aki_risk, "AKI Risk")
         th.col-width-tiny= sort_link(query, :requires_aki_nurse, " AKI Nurse?")
-        th.show-for-large-up Author
-        th.col-width-medium Description
-        th.col-width-tiny
+        /th.show-for-large-up Author
+        /th.col-width-medium.show-for-xlarge-up Description
+
     tbody
       - consults.each do |consult|
         - uid = "consult-#{consult.id}"
         tr
-          td= consult.location
-          td= consult.patient_name
-          td= consult.patient_nhs_number
-          td= consult.patient_hospital_identifiers
-          td= l(consult.started_on)
-          td= l(consult.ended_on)
-          td= consult.patient_current_modality
-          td= consult.patient_sex
-          td= consult.patient_age
-          td= consult.aki_risk&.text
-          td= yes_no(consult.requires_aki_nurse)
-          td.show-for-large-up.consult-author.col-width-medium-with-ellipsis(title=consult.created_by)= consult.created_by
-          td.col-width-medium-with-ellipsis(title=consult.description)= consult.description
-          td.actions-dropdown
+          td.actions-dropdown.going-right
             / As we have lots of possible actions, group them in a button group.
             / A wrapping div is required for now in order for the button group display correctly
             / (though we could style the td like a div I guess).
@@ -42,7 +34,7 @@
                                                data-dropdown=uid
                                                aria-controls=uid
                                                aria-expanded="false")
-                | Actions…
+                | Actions
               ul.f-dropdown(id="#{uid}" data-dropdown-content aria-hidden="true")
 
                 = dropdown_btn_item(icon: "fa-edit",
@@ -61,3 +53,31 @@
                   li= render "renalware/admissions/requests/create_request_link",
                              patient: consult.patient,
                              link_text: "Request Admission"
+            |   
+            = link_to("Toggle",
+                      "#consult-quick-preview-#{consult.id}",
+                      data: { behaviour: "toggler" })
+          td= consult.location
+          td= default_patient_link(consult.patient)
+          td= consult.patient_nhs_number
+          td= consult.patient_hospital_identifiers&.to_s_multiline
+          td= l(consult.started_on)
+          td= l(consult.ended_on)
+          td.show-for-large-up= consult.patient_current_modality
+          td.show-for-large-up= consult.patient_sex
+          td.show-for-large-up= consult.patient_age
+          td= consult.aki_risk&.text
+          td= yes_no(consult.requires_aki_nurse)
+          /td.show-for-xlarge-up.consult-author.col-width-medium-with-ellipsis(title=consult.created_by)= consult.created_by
+          /td.col-width-medium-with-ellipsis(title=consult.description)= consult.description
+        = content_tag(:tr, id: "consult-quick-preview-#{consult.id}", style: "display: none")
+          td(colspan=12)
+            .quick-preview
+              dl.dl-horizontal
+                dt Author
+                dd=consult.created_by
+                dt Modality
+                dd= consult.patient_current_modality
+                dt Description
+                dd= simple_format consult.description
+          td

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

@@ -4,7 +4,7 @@ xml = builder
 xml.LabOrders(
   start: patient.changes_since.to_date.iso8601,
   stop: patient.changes_up_until.to_date.iso8601
-  ) do
+) do
   render partial: "renalware/api/ukrdc/patients/lab_orders/lab_order",
          collection: patient.observation_requests,
          as: :request,

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

@@ -7,7 +7,7 @@ xml = builder
 xml.Observations(
   start: patient.changes_since.to_date.iso8601,
   stop: patient.changes_up_until.to_date.iso8601
-  ) do
+) do
   patient.clinic_visits.each do |visit|
     render "clinic_visit_observation",
            visit: visit,

data/app/views/renalware/directory/people/_address_form.html.slim

@@ -1,7 +1,7 @@
 = f.simple_fields_for :address, wrapper: "horizontal_form" do |fa|
-  = fa.input :name,
-              placeholder: "If different than above (optional)",
-              wrapper: :horizontal_medium
+  / = fa.input :name,
+  /             placeholder: "If different than above (optional)",
+  /             wrapper: :horizontal_medium
   = fa.input :organisation_name,
               placeholder: "e.g. practice or hospital name (optional)",
               wrapper: :horizontal_medium

data/app/views/renalware/letters/contacts/_new.html.slim

@@ -1,11 +1,13 @@
-.row
-  .large-12.columns
+.modal
+  .modal__header
     h2= t(".title")
+    = render "renalware/shared/modal_close_link"
 
-section.person-from-directory
-  = render "/renalware/letters/contacts/person_from_directory", contact: contact,
-      patient: patient, contact_descriptions: contact_descriptions
+  .modal__body
+    section.person-from-directory
+      = render "/renalware/letters/contacts/person_from_directory", contact: contact,
+          patient: patient, contact_descriptions: contact_descriptions
 
-section.new-person
-  = render "/renalware/letters/contacts/new_person", contact: contact,
-      patient: patient, contact_descriptions: contact_descriptions
+    section.new-person
+      = render "/renalware/letters/contacts/new_person", contact: contact,
+          patient: patient, contact_descriptions: contact_descriptions

data/app/views/renalware/letters/contacts/_new_person.html.slim

@@ -1,16 +1,21 @@
-.row
-  .large-12.columns
-    .g-center
-      = link_to "Pick person from directory",
-                "#",
-                class: "button secondary",
-                data: { behaviour: "toggle-section" }
-
 = simple_form_for contact,
     url: patient_letters_contacts_path(patient),
-    html: { autocomplete: "off" },
-    wrapper: "horizontal_form" do |f|
+    html: { autocomplete: "off" } do |f|
 
+  .row
+    .large-12.columns
+      .left
+        = link_to "Cancel and go back to Pick person from directory",
+                  "#",
+                  class: "button secondary",
+                  data: { behaviour: "toggle-section" }
+      .right
+        = f.submit t(".save"), class: "button"
+        span= " or "
+        = link_to t(".cancel"),
+               "#",
+               "aria-label" => "Close",
+               class: "reveal-modal-close"
   .row.errors-container
     .large-12.columns
       ul.error-messages
@@ -20,12 +25,3 @@
       = render "/renalware/letters/contacts/person_form", f: f,
           contact_descriptions: contact_descriptions
 
-  .row
-    .large-12.columns
-      br
-      = f.submit t(".save"), class: "button"
-      span= " or "
-      = link_to t(".cancel"),
-               "#",
-               "aria-label" => "Close",
-               class: "reveal-modal-close"