renalware-core 2.0.11 → 2.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aaf95664c515c88272128f354f13acdee13fc37b35108a59c0a8717bedafa60b
-  data.tar.gz: 5a6a3748e17a2b5b47e0c130d3959b1d03eeb47be6f00698e3692ac5581668d2
+  metadata.gz: c7c6d5676c20af6cae4347f70aab29e6f156d4280ab6d650c6e13633178cb128
+  data.tar.gz: ffaebb9b45c7820ae5a711ab2e203093a05d179268ca7240c50605db69fc96e3
 SHA512:
-  metadata.gz: f2cf400155b462ecc8884cd3746ab505e240d4e1b4d8593745b194675a802969e38d20e42d0b7de45bd3c24280ac6cacdeae9f857accbc0231a7f7fd8734719d
-  data.tar.gz: b9b2881a5e49a90d69d130b2facaa77b8eed767a64f06ed3e00f71723110be2c928daba4c084574265898d5ff93afa6f5336503c483875a0d2af7d0edb71ea9e
+  metadata.gz: 58f4bda8f4695d56e1c63be933ee5c7a0fa9cb70a177ea539ae6d6256a6191482687a18303eee0c85cf56eb44e688ed3ff1e45e43c4ae7d7b409eac8fe1933f4
+  data.tar.gz: 121933949b237cdbfc7b3c3b9ea4e9f516f8d55394353d15a8e119a3202189b9c4130e4cb9e086b69628b109c43afe7fcb20c3c0b95ed4e636610a1f696fc9a5

data/app/assets/stylesheets/renalware/modules/_admissions.scss

@@ -59,3 +59,11 @@
   }
 }
 
+.consults-list {
+  @media print {
+    .panel {
+      display: none;
+    }
+  }
+}
+

data/app/assets/stylesheets/renalware/modules/_clinical.scss

@@ -54,6 +54,10 @@ article.clinical-allergies {
   background-color: $table-border-colour;
   padding: 0em .2em .2em .6em;
 
+  @media print {
+    display: none;
+  }
+
   &.lozenge {
     background-color: $white;
     padding: 0 .3rem .2em .3rem;
@@ -133,6 +137,10 @@ article.clinical-allergies {
 }
 
 .patient-alerts {
+  @media pring {
+    display: none;
+  }
+
   &.lozenge {
     ul {
       margin: 0;

data/app/assets/stylesheets/renalware/modules/_pathology.scss

@@ -37,6 +37,7 @@ table#observations {
 .current-observations {
   float: left;
   margin-right: 1em;
+  width: auto;
 
   tbody {
     td, th {

data/app/assets/stylesheets/renalware/modules/_patients.scss

@@ -1,5 +1,9 @@
 // Patient summary contains renal mini profile and allergy summary
 .patient-summary {
+  @media print {
+    display: none;
+  }
+
   background-color: $mini-profile-backgound-colour;
   font-size: 0.9rem;
   margin: 0;
@@ -131,6 +135,11 @@ ul.provider {
 }
 
 .patient-header {
+  @media print {
+    font-weight: bold;
+    margin-bottom: 1rem;
+  }
+
   background-color: $nhs-blue;
   dl {
     font-size: 1.1rem;
@@ -187,6 +196,10 @@ ul.provider {
             font-size: 0.9em;
             font-weight: normal;
             color: lighten($nhs-blue, 35%);
+
+            @media print {
+              display: none;
+            }
           }
         }
       }

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

@@ -8,6 +8,10 @@
     margin-right: 0.8rem;
     margin-bottom: 0.4rem;
   }
+
+  @media print {
+    display: none;
+  }
 }
 
 .button {

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

@@ -14,6 +14,9 @@ textarea.monospace {
   .actions {
     margin-top: 0.7rem;
   }
+  @media print {
+    display: none;
+  }
 }
 
 .chosen-container-multi {

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

@@ -63,6 +63,10 @@ dd.patient-name {
 }
 
 .patient-side-nav {
+  @media print {
+    display: none;
+  }
+
   background-color: $patient-menu-background-colour;
   padding: 0.6rem 0 2rem 0.6rem;
   width: $patient-side-nav-width;

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

@@ -373,3 +373,13 @@ td {
     }
   }
 }
+
+table {
+  @media print {
+    th {
+      a {
+        text-decoration: none;
+      }
+    }
+  }
+}

data/app/controllers/renalware/admissions/consults_controller.rb

@@ -78,9 +78,13 @@ module Renalware
             :consult_site_id, :hospital_ward_id, :patient_id, :q, :other_site_or_ward,
             :decided_on, :transferred_on, :started_on, :ended_on, :decided_on,
             :aki_risk, :transfer_priority, :seen_by_id, :consult_type,
-            :requires_aki_nurse, :description, :contact_number
+            :requires_aki_nurse, :description, :contact_number, :rrt
           )
       end
+
+      def per_page
+        params[:per_page] || 30
+      end
     end
   end
 end

data/app/controllers/renalware/api/token_authenticated_api_controller.rb

@@ -1,3 +1,5 @@
+require_dependency "renalware"
+require "devise"
 #
 # From https://gist.github.com/josevalim/fb706b1e933ef01e4fb6
 #

data/app/controllers/renalware/api/ukrdc/patients_controller.rb

@@ -1,3 +1,5 @@
+require_dependency "renalware"
+
 module Renalware
   module API
     module UKRDC

data/app/controllers/renalware/medications/drug_types/prescriptions_controller.rb

@@ -1,5 +1,6 @@
 #
 # E.g. medications/esa_prescriptions
+# See routes.rb for how drug type name is set.
 #
 module Renalware
   module Medications

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

@@ -11,14 +11,15 @@ module Renalware
 
         # GET aka inbox
         def unread
-          render_receipts(receipts.unread)
+          render_receipts(unread_receipts)
         end
 
         # GET all read messages
         def read
-          render_receipts(receipts.read)
+          render_receipts(read_receipts)
         end
 
+        # GET all sent messages
         def sent
           render_receipts(sent_receipts)
         end
@@ -35,9 +36,11 @@ module Renalware
         private
 
         def render_receipts(receipts)
-          patient_filter = Patients::SearchFilter.new(search_term, request)
           receipts = receipts.joins(message: [:patient])
-          receipts = patient_filter.call(receipts).ordered.page(page).per(per_page)
+          if search_term.present?
+            receipts = patient_filter.call(receipts)
+          end
+          receipts = receipts.page(page).per(per_page)
           authorize receipts
 
           render locals: {
@@ -65,8 +68,20 @@ module Renalware
           params.fetch(:patient_search, {}).fetch(:term, nil)
         end
 
+        def unread_receipts
+          receipts.unread.order("messaging_messages.sent_at asc")
+        end
+
         def sent_receipts
-          Receipt.sent_by(current_user.id)
+          Receipt.sent_by(current_user.id).ordered
+        end
+
+        def read_receipts
+          receipts.read.ordered
+        end
+
+        def patient_filter
+          @patient_filter ||= Patients::SearchFilter.new(search_term, request)
         end
       end
     end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # rubocop:disable Metrics/ClassLength
 #
 # Decorates an array of session objects, adding methods that provide e.g. a mean measured value

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

@@ -84,7 +84,7 @@ module Renalware
         end
 
         def lookup_access_type_abbreviation(session)
-          return unless session.document && session.document.respond_to?(:info)
+          return unless session.document&.respond_to?(:info)
           access_type = Accesses::Type.find_by(name: session.document.info.access_type)
           return unless access_type
           session.document.info.access_type_abbreviation = access_type.abbreviation

data/app/models/renalware/letters/part/recent_pathology_results.rb

@@ -15,49 +15,67 @@ module Renalware
       end
 
       def results
-        @recent_pathology_results ||= begin
-          snapshot = letter.pathology_snapshot
+        @results ||= begin
+          snapshot = letter.pathology_snapshot.dup
           return if snapshot.blank?
-          group_snapshot_by_code_and_date(snapshot)
+          groups = group_snapshot_by_code_and_date(snapshot)
+          format_groups_into_string(groups)
         end
       end
 
       private
 
+      # Note that observation#letter_group determines the group each code falls into,
+      # and #letter_order the order codes are displayed within that group., h.g. HGB WBC and PLT
+      # are grouped together because they share letter group (1) and within that group the order
+      # is determined by letter_order (HGB=1 WBC=2 PLT=3).
+      # Results (OBX results) within a groups normally share an observed_at date - ie there is a
+      # 1 to 1 relationship between a group and d date output on the letter; most of the time
+      # they will arrive in the HL7 feed as part of the same OBR and therefore have the same date.
+      # However if, within a group, a code has come in separately with another date, we trigger
+      # a new sub group so it gets its own date.
       def group_snapshot_by_code_and_date(snapshot)
-        snapshot = snapshot_ordered_by_obx_codes_relevant_to_letters(snapshot)
-        snapshot_grouped_by_date = group_snapshot_by_date(snapshot)
-        format_pathology_string(snapshot_grouped_by_date)
+        groups = []
+        PathologyLayout.new.each_group do |_group_number, obs_desc_group|
+          groups << build_hash_of_snapshot_results_keyed_by_date(obs_desc_group, snapshot)
+        end
+        groups
       end
 
-      def snapshot_ordered_by_obx_codes_relevant_to_letters(snapshot)
-        RelevantObservationDescription.codes.each_with_object({}) do |code, hash|
-          hash[code.to_sym] = snapshot[code.to_sym]
+      def build_hash_of_snapshot_results_keyed_by_date(obs_desc_group, snapshot)
+        obs_desc_group.each_with_object({}) do |obs_desc, dates|
+          match = snapshot[obs_desc.code.to_sym]
+          next if match.nil?
+          next if match[:observed_at].nil?
+          date = I18n.l(Date.parse(match[:observed_at]))
+          dates[date] ||= {}
+          dates[date][obs_desc.code] = match[:result]
         end
       end
 
-      def group_snapshot_by_date(snapshot)
-        current_date = NullObject.instance
-        snapshot.each_with_object({}) do |observation, h|
-          code, obs = observation
-          next if obs.nil?
-          date = Time.zone.parse(obs[:observed_at])
-
-          if date != current_date
-            current_date = date
-            h[date] = []
+      # {"07-Jun-2017"=>{"HGB"=>"10.4", "WBC"=>"3.40", "PLT"=>"435"}
+      # rubocop:disable Rails/OutputSafety
+      def format_groups_into_string(groups)
+        str = ""
+        groups.each do |group|
+          group.each do |date, observations|
+            str += " <span>#{date}</span>: #{observations_as_string(observations)};"
           end
-
-          h[date] << "#{code} #{obs[:result]}"
+          str = str.strip
         end
+        str.html_safe
       end
+      # rubocop:enable Rails/OutputSafety
 
-      def format_pathology_string(grouped_snapshot)
-        str = ""
-        grouped_snapshot.each do |date, observations|
-          str += "#{I18n.l(date&.to_date)}: #{observations.join(', ')}; "
-        end
-        str.strip
+      def observations_as_string(observations)
+        observations.map do |code, result|
+          format_code_and_result_string(code, result)
+        end.join(", ")
+      end
+
+      def format_code_and_result_string(code, result)
+        return "(#{code} #{result})" if code.casecmp?("EGFR")
+        "#{code} #{result}"
       end
     end
   end

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

@@ -0,0 +1,22 @@
+require_dependency "renalware/letters"
+
+module Renalware
+  module Letters
+    class PathologyLayout
+      # This method helps us iterate over the pathology required in a letter.
+      # Path in letters should be grouped and ordered within that group.
+      # We might display a date only once a group for instance.
+      def each_group
+        Pathology::ObservationDescription
+          .select(:id, :code, :letter_group, :letter_order)
+          .where("letter_group is not null")
+          .order("letter_group asc, letter_order asc")
+          .group_by(&:letter_group)
+          .each do |group_number, descriptions|
+
+          yield(group_number, descriptions) if block_given?
+        end
+      end
+    end
+  end
+end

data/app/presenters/renalware/address_presenter/block.rb

@@ -21,7 +21,9 @@ module Renalware
         street_1,
         street_2,
         street_3,
-        [town, county, postcode].reject(&:blank?).join(", "),
+        town,
+        county,
+        postcode,
         country
       ]
     end

data/app/presenters/renalware/admissions/consult_presenter.rb

@@ -23,7 +23,7 @@ module Renalware
           consult_site&.name,
           hospital_ward&.name,
           other_site_or_ward
-        ].compact.join(", ")
+        ].reject(&:blank?).join(", ")
       end
 
       def patient_name

data/app/presenters/renalware/mdm_presenter.rb

@@ -50,14 +50,9 @@ module Renalware
       @historical_prescriptions ||= execute_prescriptions_query(patient.prescriptions)
     end
 
-    # Note we sort prescriptions by prescribed_on desc here manually because the
-    # prescriptions query is currently too complex to add another sql sort into (defaults)
-    # to sorting by drug name
     def current_prescriptions
       @current_prescriptions ||= begin
-        # TODO: maybe use #sort_by(:prescribed_on) here
         execute_prescriptions_query(patient.prescriptions.current)
-          .sort{ |presc1, presc2| presc2.prescribed_on <=> presc1.prescribed_on }
       end
     end
 
@@ -82,10 +77,9 @@ module Renalware
     # to sorting by drug name
     def esa_prescriptions
       @esa_prescriptions ||= begin
-        # TODO: maybe use #sort_by(:prescribed_on) here
         execute_prescriptions_query(
           patient.prescriptions.having_drug_of_type("esa")
-        ).sort{ |presc1, presc2| presc2.prescribed_on <=> presc1.prescribed_on }
+        ).sort_by(&:prescribed_on).reverse!
       end
     end
 

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

@@ -4,8 +4,8 @@
       url: admissions_consults_path,
       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 :identity_match, label: "Hosp/NHS no or name"
 
       .columns.medium-2.large-2
         = f.input :consult_site_id_eq,
@@ -30,6 +30,11 @@
                   include_blank: true,
                   collection: [["Yes", true], ["No", false]],
                   label: "Active"
+      .columns.medium-1.large-1
+        = f.input :rrt_eq,
+                  include_blank: true,
+                  collection: [["Yes", true], ["No", false]],
+                  label: "RRT"
       .columns.medium-2.large-2.actions.end
         = f.submit "Filter", class: "button"
         span= " or "

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

@@ -45,6 +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 :rrt, as: :inline_radio_buttons, wrapper: :horizontal_small
   = f.input :description, wrapper: :horizontal_large, input_html: { rows: 10 }
 
   = f.submit class: :button

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

@@ -2,22 +2,24 @@
   table
     thead
       tr
-        th.col-width-medium
+        th.col-width-medium.noprint
+        th.col-width-large
+          = sort_link(query, :patient, ["patient_family_name", "patient_given_name asc"], "Patient")
+        th.col-width-nhs-no.noprint NHS No.
+        th.col-width-reference-no Hosp Nos.
         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= sort_link(query, :started_on, "Started")
-        th.col-width-date= sort_link(query, :ended_on, "Ended")
+        th.col-width-date.noprint= sort_link(query, :started_on, "Started")
+        th.col-width-date.noprint= sort_link(query, :ended_on, "Ended")
         th.col-width-small.show-for-large-up 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.col-width-date.show-for-large-up= sort_link(query, :patient_born_on, "DOB")
+        th.col-width-tiny.show-for-large-up.noprint Age
+        th.col-width-tiny RRT?
+        th.col-width-tiny.noprint= sort_link(query, :aki_risk, "AKI Risk")
+        th.col-width-tiny.noprint= sort_link(query, :requires_aki_nurse, " AKI Nurse?")
         /th.show-for-large-up Author
         /th.col-width-medium.show-for-xlarge-up Description
 
@@ -25,7 +27,7 @@
       - consults.each do |consult|
         - uid = "consult-#{consult.id}"
         tr
-          td.actions-dropdown.going-right
+          td.actions-dropdown.going-right.noprint
             / 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).
@@ -57,17 +59,19 @@
             = 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.noprint= consult.patient_nhs_number
           td= consult.patient_hospital_identifiers&.to_s_multiline
-          td= l(consult.started_on)
-          td= l(consult.ended_on)
+          td= consult.location
+          td.noprint= l(consult.started_on)
+          td.noprint= 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-large-up= l(consult.patient.born_on)
+          td.show-for-large-up.noprint= consult.patient_age
+          td= yes_no(consult.rrt)
+          td.noprint= consult.aki_risk&.text
+          td.noprint= 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")

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

@@ -1,3 +1,5 @@
+- content_for(:body_class) { "consults-list" }
+
 = content_for(:actions) do
   = link_to("Add", new_admissions_consult_path, class: :button)
 

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

@@ -40,7 +40,7 @@
               dd= l(patient.died_on)
 
               dt 1st Death cause:
-              dd= patient.first_cause.description
+              dd= patient.first_cause&.description
 
               dt 2nd Death cause:
               dd= default_for_associated(patient.second_cause, :description, "N/A")

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

@@ -200,6 +200,10 @@ scss:
 
     .investigations {
       clear: both;
+
+      span {
+        white-space: nowrap;
+      }
     }
 
     ul.inline {

data/app/views/renalware/medications/drug_types/prescriptions/_filters.html.slim

@@ -4,13 +4,24 @@
 /         Note also we should really extend this so it searches all local_patient_ids
 - search_scope = :patient_given_name_or_patient_family_name_or_drug_name_or_patient_local_patient_id_cont
 - searching = search.send(search_scope).present?
-.filters
-  .row
-    = search_form_for(search, url: medications_esa_prescriptions_path) do |f|
-      .small-7.medium-7.large-5.columns
-        = f.search_field search_scope, placeholder: t(".search_prompt")
-      .small-5.medium-5.columns.end
-        = f.submit "Search", class: "button"
-        = link_to t(".clear-search"),
-                  medications_esa_prescriptions_path,
-                  class: "cancel-link #{'disabled' unless searching}"
+.search-form.filters
+  = simple_form_for search,
+    url: medications_esa_prescriptions_path,
+    method: :get do |f|
+    /= search_form_for(search, url: medications_esa_prescriptions_path) do |f|
+    .small-6.columns
+      /= f.search_field search_scope, placeholder: t(".search_prompt")
+      = f.input :patient_given_name_or_patient_family_name_or_drug_name_or_patient_local_patient_id_cont,
+                label: t(".search_prompt")
+    .small-3.columns
+      = f.input :provider_eq,
+                include_blank: true,
+                collection: Renalware::Medications::Provider.codes.each_with_index.map{ |x, i| [x.to_s.humanize, i] },
+                label: "Provider"
+    .small-3.columns.actions.end
+      = f.submit "Search", class: "button"
+      |  
+      span or
+      |  
+      = link_to "Reset", medications_esa_prescriptions_path
+      /class: "cancel-link #{'disabled' unless searching}"

data/app/views/renalware/medications/drug_types/prescriptions/_table.html.slim

@@ -1,33 +1,34 @@
-table#drug-type-prescriptions
-  thead
-    tr
-      th.hosp_no= sort_link([:renalware, search], :patient_local_patient_id, t(".patient_local_patient_id"))
-      th.patient_name= sort_link([:renalware, search], "patient_family_name", t(".patient_name"))
-      th.patient_age= sort_link([:renalware, search], "patient_born_on", t(".patient_age"))
-      th.patient_sex= t(".patient_sex")
-      th.modality= t(".modality")
-      th.col-width-date= sort_link([:renalware, search], "prescribed_on", t(".prescribed_on"))
-      th.col-width-date.hide-for-small-only
-        = sort_link([:renalware, search], "terminated_on", t(".terminated_on"))
-      th.drug_name= sort_link([:renalware, search], "drug_name", t(".drug_name"))
-      th.dose= t(".dose")
-      th.route_code= t(".route_code")
-      th.frequency= t(".frequency")
-      th.weekly_units= t(".weekly_units")
-  tbody
-    - prescriptions.each do |prescription|
+div
+  table#drug-type-prescriptions
+    thead
       tr
-        td= prescription.patient_local_patient_id
-        td= default_patient_link(prescription.patient)
-        td= prescription.patient_age
-        td= prescription.patient_sex
-        td= prescription.patient_current_modality_name
-        td= l(prescription.prescribed_on)
-        td= prescription.terminated_on && l(prescription.terminated_on)
-        td= prescription.drug_name
-        td= prescription.dose
-        td= prescription.route_code
-        td= prescription.frequency
-        td=
+        th.hosp_no= sort_link([:renalware, search], :patient_local_patient_id, t(".patient_local_patient_id"))
+        th.col-width-medium= sort_link([:renalware, search], "patient_family_name", t(".patient_name"))
+        th.patient_age= sort_link([:renalware, search], "patient_born_on", t(".patient_age"))
+        th.patient_sex= t(".patient_sex")
+        th.col-width-medium= t(".modality")
+        th.col-width-date= sort_link([:renalware, search], "prescribed_on", t(".prescribed_on"))
+        th.col-width-date.hide-for-small-only
+          = sort_link([:renalware, search], "terminated_on", t(".terminated_on"))
+        th.drug_name= sort_link([:renalware, search], "drug_name", t(".drug_name"))
+        th.col-width-small= t(".dose")
+        th.col-width-tiny= t(".route_code")
+        th.frequency= t(".frequency")
+        th.col-width-tiny= t(".weekly_units")
+    tbody
+      - prescriptions.each do |prescription|
+        tr
+          td= prescription.patient_local_patient_id
+          td= default_patient_link(prescription.patient)
+          td= prescription.patient_age
+          td= prescription.patient_sex
+          td= prescription.patient_current_modality_name
+          td= l(prescription.prescribed_on)
+          td= prescription.terminated_on && l(prescription.terminated_on)
+          td= prescription.drug_name
+          td= prescription.dose
+          td= prescription.route_code
+          td= prescription.frequency
+          td=
 
-= paginate prescriptions
+  = paginate prescriptions

data/app/views/renalware/messaging/internal/receipts/_receipt.html.slim

@@ -2,8 +2,7 @@
 - patient = Renalware::PatientPresenter.new(message.patient)
 
 tr(class="#{ "urgent" if message.urgent?}" id=message.html_identifier)
-  td
-    = pluralize(message.age_in_days, "day")
+  td= "#{message.age_in_days} #{'day'.pluralize(message.age_in_days)}"
   td= message.author
   td= l(message.sent_at)
   td= l(receipt.read_at)

data/app/views/renalware/pathology/current_observation_results/index.html.slim

@@ -1,11 +1,10 @@
 = within_patient_layout title: "Current Pathology Results",
                         navigation_partial: "renalware/pathology/navigation" do
   - observation_set.each_display_group do |observations, group_number|
-    .small-3.columns.end
-      table.current-observations.columns.auto-layout.last
-        tbody
-          - observations.each do |observation|
-            tr
-              th= observation.description
-              td= observation.result
-              td= l(observation.observed_at&.to_date)
+    table.current-observations.auto-layout
+      tbody
+        - observations.each do |observation|
+          tr
+            th= observation.description
+            td= observation.result
+            td= l(observation.observed_at&.to_date)

data/config/locales/renalware/admissions/consults.en.yml

@@ -11,6 +11,7 @@ en:
         consult_type: Type
         contact_number: Bleep/Ext
         other_site_or_ward: Other site or ward
+        rrt: RRT?
     errors:
       models:
         renalware/admissions/consult:

data/config/locales/renalware/medications/drug_types/esa_prescriptions.en.yml

@@ -20,4 +20,4 @@ en:
             prescribed_on: Started
             terminated_on: Terminated
             drug_name: Drug
-            weekly_units: "Units/Week"
+            weekly_units: "Units/Wk"

data/config/locales/renalware/transplants/recipient_operation.yml

@@ -135,7 +135,7 @@ en:
         liver_failure: "Liver failure (not self-poisoning)"
         meningitis: "Meningitis"
         multi_organ_failure: "Multi-organ failure"
-        noycardial_infarction: "Myocardial infarction"
+        myocardial_infarction: "Myocardial infarction"
         other: "Other, please specify"
         other_drug_overdose: "Other drug overdose, please specify"
         other_trauma_accident: "Other trauma - accident"

data/db/migrate/20180323150241_update_path_obs_descs_for_letter_groupings.rb

@@ -0,0 +1,27 @@
+class UpdatePathObsDescsForLetterGroupings < ActiveRecord::Migration[5.1]
+  def change
+    sql = <<-SQL.squish
+      UPDATE renalware.pathology_observation_descriptions set letter_group = NULL, letter_order = NULL;
+      UPDATE renalware.pathology_observation_descriptions set letter_group=1, letter_order=1 where code = 'HGB';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=1, letter_order=2 where code = 'WBC';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=1, letter_order=3 where code = 'PLT';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=2, letter_order=1 where code = 'URE';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=3, letter_order=1 where code = 'CRE';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=3, letter_order=2 where code = 'EGFR';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=4, letter_order=1 where code = 'NA';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=4, letter_order=2 where code = 'POT';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=5, letter_order=1 where code = 'BIC';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=6, letter_order=1 where code = 'CCA';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=6, letter_order=2 where code = 'PHOS';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=7, letter_order=1 where code = 'PTHI';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=8, letter_order=1  where code = 'ALB';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=9, letter_order=1 where code = 'BIL';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=9, letter_order=2 where code = 'AST';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=9, letter_order=3 where code = 'ALP';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=9, letter_order=4 where code = 'GGT';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=10, letter_order=1 where code = 'HBA';
+      UPDATE renalware.pathology_observation_descriptions set letter_group=11, letter_order=1 where code = 'CHOL';
+    SQL
+    connection.execute(sql)
+  end
+end

data/db/migrate/20180327100423_add_constraints_to_recipient_operations.rb

@@ -0,0 +1,5 @@
+class AddConstraintsToRecipientOperations < ActiveRecord::Migration[5.1]
+  def change
+    change_column_null(:transplant_recipient_operations, :patient_id, false)
+  end
+end

data/db/migrate/20180328210434_add_rrt_to_admission_consults.rb

@@ -0,0 +1,5 @@
+class AddRrtToAdmissionConsults < ActiveRecord::Migration[5.1]
+  def change
+    add_column :admission_consults, :rrt, :boolean, default: false, null: false
+  end
+end

data/lib/renalware/version.rb

@@ -1,3 +1,3 @@
 module Renalware
-  VERSION = "2.0.11".freeze
+  VERSION = "2.0.12".freeze
 end

data/lib/tasks/db.rake

@@ -0,0 +1,11 @@
+require "benchmark"
+
+namespace :db do
+  desc "Refreshes all materialized views e.g. audits. May take a while so only run overnight."
+  task refresh_all_materialized_views: :environment do
+    ms = Benchmark.ms do
+      ActiveRecord::Base.connection.execute("SELECT refresh_all_matierialized_views();")
+    end
+    puts "Refreshing materialized views took #{ms}"
+  end
+end

data/spec/support/devise_spec_helper.rb

@@ -25,7 +25,7 @@ RSpec.configure do |config|
     Warden.test_mode!
   end
 
-  config.after :each do
+  config.after do
     Warden.test_reset!
   end
 end

data/spec/support/travel.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.configure do |config|
-  config.after(:each) do
+  config.after do
     travel_back
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1480,6 +1480,7 @@ files:
 - app/models/renalware/letters/part/prescriptions.rb
 - app/models/renalware/letters/part/problems.rb
 - app/models/renalware/letters/part/recent_pathology_results.rb
+- app/models/renalware/letters/pathology_layout.rb
 - app/models/renalware/letters/patient.rb
 - app/models/renalware/letters/patient_listener.rb
 - app/models/renalware/letters/pdf_letter_cache.rb
@@ -3200,6 +3201,9 @@ files:
 - db/migrate/20180313114927_remove_deleted_at_from_admission_consults.rb
 - db/migrate/20180313124819_remove_tx_operation_constraints.rb
 - db/migrate/20180319191942_create_function_to_sort_without_failing_on_nonnumerics.rb
+- db/migrate/20180323150241_update_path_obs_descs_for_letter_groupings.rb
+- db/migrate/20180327100423_add_constraints_to_recipient_operations.rb
+- db/migrate/20180328210434_add_rrt_to_admission_consults.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -3350,6 +3354,7 @@ files:
 - lib/tasks/bundler_audit.rake
 - lib/tasks/cucumber.rake
 - lib/tasks/cucumber_web.rake
+- lib/tasks/db.rake
 - lib/tasks/feeds/files.rake
 - lib/tasks/ukrdc.rake
 - lib/templates/slim/scaffold/_form.html.slim