renalware-core 2.0.125 → 2.0.126

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f02d9c6095c5d84a50a76fb8b2b1a5c0167a5fbad53fbfdf886ac610e162dca3
-  data.tar.gz: fd8ac6bdca0f0b55ebb66c490ef77db34efca9f644ea88594d38fd74bb30d593
+  metadata.gz: c1b4b5e0615d605d093018e57c295da81fa8b2c7b51bd83b8ab02065ce357c91
+  data.tar.gz: f78640822218ff8dfbae7ef9281d0cb9c5636791222fbb06a37cd36001b41ee8
 SHA512:
-  metadata.gz: 8ec5256950daad498967c57453f259a84fcace23c47006316c1e1a838d93db7edf0ea70353a875bece3dbd3c60c9fcafeab3c13c68a91f3ae3bb9897eab70da0
-  data.tar.gz: ac3ceff3c0f484bab79c5b00ca2bb78d64b6132455bb39e0eedad01163717be0b488c4107596ab0d93e8a0280fd835b3ad4940d80f37b147621b0780df294b67
+  metadata.gz: a4074e24c734e3c38efb99687920d41ab1ac0e555dc6663a7cc356fc8035465b94ffa18be1ddcf8c2bbafd2e347a77caf0cf7806cd7d201980e699d8077bfcb6
+  data.tar.gz: 680f524d251700a637fec7a8900a4c242cc691fad41d868254a773bd8de314859fbd7510bcb67fc01481cb300456b1bbebfee17aac0df95f0d86b63671ddd18e

data/app/assets/javascripts/renalware/components/masonry.run.js

@@ -1,3 +1,28 @@
-$('.grid > .row').masonry({
-  itemSelector: '.columns'
-});
+var Renalware = typeof Renalware === 'undefined' ? {} : Renalware;
+
+Renalware.MasonryHelper = (function() {
+  var setupMasonry = function() {
+    $('.grid > .row').masonry({ itemSelector: '.columns' });
+  }
+
+  var refreshMasonry = function() {
+    $('.grid > .row').masonry('layout');
+  }
+
+  var triggerMasonryRefresh = function() {
+    setTimeout(refreshMasonry, 100);
+  }
+
+  var createHandlerToTriggerMasonryRefresh = function() {
+    $("[data-trigger-masonry-refresh]").on("click", triggerMasonryRefresh);
+  }
+
+  return {
+    init: function () {
+      setupMasonry();
+      createHandlerToTriggerMasonryRefresh();
+    }
+  };
+}());
+
+$(document).ready(Renalware.MasonryHelper.init);

data/app/assets/javascripts/renalware/components/tabs.js

@@ -1,13 +1,16 @@
 function initTabs() {
-  function masonryLayoutRefresh() {
-    $('.grid > .row').masonry('layout');
-  }
-
-  function triggerMasonryLayoutRefresh() {
-    setTimeout(masonryLayoutRefresh, 200)
-  }
-
-  $(".tab-strip a").on("click", triggerMasonryLayoutRefresh);
+  $(".sub-nav.with-tabs dl a").on("click", function(e) {
+    e.preventDefault();
+    var anchor = e.target
+    var dl = $(anchor).closest("dl");
+    var dd = $(anchor).closest("dd");
+    var idToDeactivate = $("dd.active a", dl).attr("href");
+    $("dd.active", dl).removeClass("active")
+    $(dd).addClass("active");
+    var idToActivate = anchor.getAttribute("href");
+    $(idToDeactivate).hide();
+    $(idToActivate).show();
+  })
 }
 
 $(function() {

data/app/assets/javascripts/renalware/components/toggler.js

@@ -57,6 +57,35 @@ function initTogglers() {
       triggerMasonryLayoutRefresh();
     })
   }
+
+  // These two handlers mimic the row-toggler stimulus stimulus controller methods which
+  // are not ywt wired up because of lack of stimulus polyfill support in the asset pipline
+  // which means stimulus will not work with IE11. Hence the use of data-action etc here so
+  // once stimulus is working we can remove these 2 handlers without changing any markup.
+
+  // This handler toggles the last tr in the current tbody. We use multiple tbodys in each table
+  // to make toggling like this simpler, and to group the related (visible and toggleable) rows
+  // together.
+  // Note table must have the .toggleable class
+  $("a[data-action='row-toggler#toggleRow']").on("click", function(event) {
+    event.preventDefault();
+    $(event.target).closest("tbody").toggleClass("toggleable--open");
+    triggerMasonryLayoutRefresh();
+  });
+
+  // This handler toggles the last tr in each tbody in the current table.
+  // The link will probably sit in a thead < th
+  $("a[data-action='row-toggler#toggleTable']").on("click", function(event) {
+    event.preventDefault();
+    var link = event.target;
+    var table = $(link).closest("table");
+    var thead = $(link).closest("thead");
+    var tbodies = $("tbody", table);
+    var hide = thead.hasClass("toggleable--open");
+    thead.toggleClass("toggleable--open");
+    $(tbodies).toggleClass("toggleable--open", !hide);
+    triggerMasonryLayoutRefresh();
+  });
 }
 
 $(function() {

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

@@ -254,7 +254,7 @@ label#toggle-full-hd-profile {
 .full-hd-profile {
   max-height: 0;
   overflow-y: hidden;
-  transition: max-height .3s ease 0s;
+  //transition: max-height .3s ease 0s;
 }
 
 input#toggle-full-hd-profile-input {
@@ -268,8 +268,9 @@ input#toggle-full-hd-profile-input {
 // End CSS-only toggle of full HD Profile
 
 table.hd-sessions {
-  border-collapse: collapse;
   border-spacing: 0;
+  border-collapse: collapse;
+
   td {
     height: 2rem;
   }
@@ -279,13 +280,11 @@ table.hd-sessions {
   }
 
   thead {
-    tr {
-      &:nth-of-type(even) {
-        background-color: #f5f5f5;
-      }
+    border-bottom: solid 1px #222;
 
+    tr {
       th {
-        border: 1px solid #ddd;
+        border-bottom: none;
         padding: 3px;
         vertical-align: top;
       }
@@ -300,41 +299,38 @@ table.hd-sessions {
   }
 
   tbody {
-    tr {
-      &:nth-of-type(even) {
-        background-color: $white;
-      }
+    border-top: solid 1px #555;
 
-      &:nth-of-type(odd) {
-        background-color: $white;
-      }
+    &:last-child {
+      border-bottom: solid 1px #BBB;
+    }
 
-      &.even{
-        background-color: #f9f9f9;
-      }
+    &:hover {
+      background-color: $table-row-hover-colour !important;
+    }
 
-      &.open {
-        td {
-          background-color: #ffffc8;
-        }
+    &.dna {
+      td {
+        background-color: #E6EFF8;
       }
+    }
 
-      &.dna {
-        td {
-          background-color: #ccc;
-        }
+    &.open {
+      td {
+        background-color: #FFF1CC; // #FFF1CC; // #ffffc8;
       }
+    }
 
+    &.dna {
       td {
-        border-right: 1px solid #ddd;
-
-        &:first-child {
-          border-left: 1px solid #ddd;
-        }
+        // background-color: #eee;
+        background-color: #E6EFF8;
+      }
+    }
 
-        &.derived {
-          font-style: italic;
-        }
+    td {
+      &.derived {
+        font-style: italic;
       }
     }
   }
@@ -598,3 +594,26 @@ use flexbox to layout items inside each prescription.
     }
   }
 }
+
+table.hd-session-drugs {
+  thead {
+    border-bottom: solid 1px #222;
+  }
+
+  tr {
+    span.given {
+      @include badge;
+    }
+    &.administered-true {
+      span.given {
+        background-color: $nhs-light-green;
+      }
+    }
+
+    &.administered-false {
+      span.given {
+        background-color: $nhs-red;
+      }
+    }
+  }
+}

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

@@ -81,3 +81,29 @@
     }
   }
 }
+
+
+.sub-nav {
+  &.with-tabs {
+    position: relative;
+    margin: 0;
+    padding: 0;
+
+    dl {
+      position: relative;
+      top: 1px;
+      z-index: 2; // So we can overlap .tab-bottom-border
+    }
+
+    .tab-bottom-border {
+      position: relative;
+      display: block;
+      z-index: 0;
+      color: $table-border-colour;
+      background-color: $table-border-colour;
+      padding: 0;
+      margin: 0;
+      margin-bottom: 1rem;
+    }
+  }
+}

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

@@ -36,3 +36,26 @@ th.togglers .toggler {
 th.togglers {
   width: 1rem;
 }
+
+// row-toggler-controller classes
+.toggleable {
+  .toggleable--open {
+    td .toggler i:before {
+      content: asset-data-url("renalware/icons/chevron-up.svg");
+    }
+
+    th .toggler i:before {
+      content: asset-data-url("renalware/icons/chevrons-up.svg");
+    }
+  }
+
+  tbody {
+    tr:last-child {
+      display: none
+    }
+
+    &.toggleable--open tr:last-child {
+      display: table-row;
+    }
+  }
+}

data/app/controllers/renalware/events/lists_controller.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/events"
+
+module Renalware
+  module Events
+    class ListsController < BaseController
+      include Renalware::Concerns::Pageable
+
+      def show
+        query = EventListQuery.new(params: form.attributes)
+        events = query.call.page(page).per(per_page)
+        authorize events
+        render locals: { events: events, q: query.search, form: form }
+      end
+
+      private
+
+      def form
+        @form ||= form_for(named_filter)
+      end
+
+      # Get requests to #show may have a filter param {} if filters where selectec (eg an event
+      # type) and if any sorting was done there will also be e.g. params[:q][:s] = "something asc"
+      # The EventListQuery just accepts our form object, from which it attributes to ransack, so
+      # here we need to make sure the search
+      def form_for(named_filter)
+        Lists::Form.new(
+          named_filter: named_filter,
+          params: add_ransack_search_param_to_filter_parameters
+        )
+      end
+
+      def named_filter
+        @named_filter ||= params.fetch(:named_filter, "all").to_sym
+      end
+
+      def add_ransack_search_param_to_filter_parameters
+        filter_parameters.merge(s: params.dig(:q, :s))
+      end
+
+      def filter_parameters
+        return {} unless params.key?(:filters)
+
+        params
+          .require(:filters)
+          .permit(
+            :event_type_id_eq,
+            :created_by_id_eq,
+            :created_at_gteq,
+            :created_at_lteq,
+            :from,
+            :to
+          )
+      end
+    end
+  end
+end

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

@@ -16,7 +16,19 @@ module Renalware
         query = sessions_query
         sessions = query
           .call
-          .includes(:hospital_unit, :patient, :signed_on_by, :signed_off_by)
+          .eager_load(
+            :hospital_unit,
+            :patient,
+            :signed_on_by,
+            :signed_off_by,
+            prescription_administrations: [
+              {
+                prescription: [:medication_route, :drug]
+              },
+              :administered_by,
+              :reason
+            ])
+          .merge(PrescriptionAdministration.ordered)
           .page(page)
           .per(per_page || 15)
         authorize sessions

data/app/helpers/renalware/toggle_helper.rb

@@ -42,5 +42,30 @@ module Renalware
         toggler(row_selector)
       end
     end
+
+    # Create a link in a thead > tr > th that will toggle the last row in all tbodies in the table.
+    def rows_toggler(link_title: "Toggle all rows")
+      link_to(
+        "#",
+        data: { action: "row-toggler#toggleTable" },
+        class: "toggler",
+        title: link_title
+      ) do
+        content_tag(:i)
+      end
+    end
+
+    # Create a link to be used in a tbody > tr > td that will toggle the last row in the current
+    # tbody.
+    def row_toggler(link_title: "Toggle")
+      link_to(
+        "#",
+        data: { action: "row-toggler#toggleRow" },
+        class: "toggler",
+        title: link_title
+      ) do
+        content_tag(:i)
+      end
+    end
   end
 end

data/app/models/renalware/events/event_list_query.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/clinics"
+
+module Renalware
+  module Events
+    class EventListQuery
+      attr_reader :params
+
+      def initialize(params: {})
+        @params = params
+        @params[:s] = "created_at DESC" if @params[:s].blank?
+      end
+
+      def call
+        search
+          .result
+          .eager_load(:event_type, :created_by, :patient)
+          .ordered
+      end
+
+      def search
+        @search ||= Event.include(Ransackers).ransack(params)
+      end
+
+      # Create ransackers to mixin to Event at runtime.
+      # These for instance cast created_at to a date so that for instance the predicate
+      # created_gteq excludes any time references - using created_gteq and created_lteq without
+      # this creates SQL that cannot find an event on one day, because of the way Ransack adds
+      # start of date and end of day times.
+      module Ransackers
+        extend ActiveSupport::Concern
+        included do
+          ransacker :created_at, type: :date do
+            Arel.sql("DATE(events.created_at)")
+          end
+
+          ransacker :created_at, type: :date do
+            Arel.sql("DATE(events.created_at)")
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/renalware/events/lists/form.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Events
+    module Lists
+      # Form object to help us build and parse the appropriate filters for the
+      # events_lists controller
+      class Form
+        delegate_missing_to :@handler
+
+        def initialize(named_filter:, params: {})
+          @handler = create_filter_specific_object_to_handle_all_requests(named_filter, params)
+        end
+
+        def create_filter_specific_object_to_handle_all_requests(named_filter, params)
+          handler_klass = "#{self.class.name}::#{named_filter.to_s.classify}Events"
+          handler_klass.constantize.new(params)
+        end
+
+        class AllEvents
+          include ActiveModel::Model
+          include Virtus::Model
+
+          attribute :s, String # sort order, not really part of the form
+          attribute :event_type_id_eq, Integer
+          attribute :created_by_id_eq, Integer
+          attribute :created_at_gteq, Date
+          attribute :created_at_lteq, Date
+
+          def event_type_options
+            Events::Type.order(:name).pluck(:name, :id)
+          end
+
+          def created_by_options
+            User.excluding_system_user.ordered
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -24,6 +24,7 @@ module Renalware
       validates :witnessed_by, presence: true, if: :validate_administrator_and_witness?
       validate :check_administrator_authorisation_token
       validate :check_witness_authorisation_token
+      scope :ordered, -> { order(created_at: :desc) }
 
       private
 

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

@@ -45,14 +45,25 @@ module Renalware
         end
       end
 
+      # rubocop:disable Metrics/MethodLength
       def sessions
         @sessions ||= begin
-          hd_sessions = Session.includes(:hospital_unit, :patient, :signed_on_by, :signed_off_by)
-                               .for_patient(patient)
-                               .limit(10).ordered
+          hd_sessions = Session
+            .eager_load(
+              :hospital_unit,
+              :patient,
+              :signed_on_by,
+              :signed_off_by,
+              prescription_administrations: [
+                { prescription: [:medication_route, :drug] }, :administered_by, :reason
+              ]
+            )
+            .for_patient(patient)
+            .limit(10).ordered.merge(PrescriptionAdministration.ordered)
           CollectionPresenter.new(hd_sessions, SessionPresenter, view_context)
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       def can_add_hd_profile?
         profile.new_record? && policy_for(profile).edit? && has_ever_been_on_hd?

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

@@ -153,9 +153,9 @@ module Renalware
       end
 
       # Ensure drug administrations are always in the same order.
-      def prescription_administrations
-        __getobj__.prescription_administrations.order(created_at: :asc)
-      end
+      # def prescription_administrations
+      #   __getobj__.prescription_administrations.order(created_at: :asc)
+      # end
 
       protected
 

data/app/presenters/renalware/medications/prescription_presenter.rb

@@ -38,6 +38,15 @@ module Renalware
         administer_on_hd ? "Yes" : "No"
       end
 
+      def to_s
+        [
+          drug,
+          "DOSE #{dose}",
+          route_code,
+          frequency
+        ].compact.join(" - ")
+      end
+
       private
 
       def translated_dose_unit

data/app/views/renalware/events/events/_event.html.slim

@@ -8,6 +8,8 @@ tr
   td.nowrap= l event.created_at.to_date
   - unless local_assigns[:exclude_type_column] == true
     td= event.event_type
+  - if local_assigns[:include_patient_column] == true
+    td= default_patient_link(event.patient)
   td.col-width-medium-with-ellipsis
     = render partial: event.to_cell_partial_path,
                locals: { event: event }

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

@@ -9,6 +9,8 @@ table.has-togglable-rows.events-table
       th.col-width-date=t(".created_at")
       - unless local_assigns.fetch(:exclude_type_column, false)
         th.col-width-large= t(".type")
+      - if local_assigns.fetch(:include_patient_column, false)
+        th.col-width-large= t(".patient")
       th= t(".description")
       th.created_at.col-width-date-time= t(".date_time")
       th.created_by.col-width-medium= t(".created_by")
@@ -18,6 +20,9 @@ table.has-togglable-rows.events-table
     / an Edit link or Type column in certain circumstances.
     = render partial: "renalware/events/events/event",
              collection: events,
-             locals: { exclude_type_column: local_assigns[:exclude_type_column],
-                       edit_proc: local_assigns[:edit_proc],
-                       toggle_prefix: toggle_prefix }
+             locals: { \
+              exclude_type_column: local_assigns[:exclude_type_column],
+              include_patient_column: local_assigns[:include_patient_column],
+              edit_proc: local_assigns[:edit_proc],
+              toggle_prefix: toggle_prefix \
+            }

data/app/views/renalware/events/lists/_filters.html.slim

@@ -0,0 +1,29 @@
+.search-form.filters
+  = simple_form_for form,
+                    as: :filters,
+                    url: renalware.events_filtered_list_path(named_filter: :all),
+                    html: { autocomplete: "off" },
+                    method: :get do |f|
+    .row
+      .small-6.medium-3.large-2.columns
+        = f.input :event_type_id_eq,
+              collection: form.event_type_options,
+              input_html: { class: "searchable_select" },
+              label: "Event type"
+      .small-6.medium-3.large-2.columns
+        = f.input :created_by_id_eq,
+                  as: :user_picker,
+                  collection: form.created_by_options,
+                  label: "Created by"
+      .small-6.medium-2.large-2.columns
+        = f.input :created_at_gteq,
+                  as: :date_picker,
+                  label: "From"
+      .small-6.medium-2.large-2.columns
+        = f.input :created_at_lteq,
+                  as: :date_picker,
+                  label: "To"
+      .small-12.medium-2.large-2.columns.actions.end
+        = f.submit t("helpers.submit.filter"), class: "button secondary"
+        span= " or "
+        = link_to t("helpers.reset"), renalware.events_filtered_list_path(named_filter: :all)

data/app/views/renalware/events/lists/_table.html.slim

@@ -0,0 +1,29 @@
+/= render "renalware/events/events/table", events: events, include_patient_column: true
+
+- toggle_prefix ||= "event"
+
+table.has-togglable-rows.events-table
+  thead
+    tr
+      th.noprint.togglers= table_toggler
+      - if local_assigns[:edit_proc]
+        th.col-width-tiny
+      th.col-width-date= sort_link(q, :created_at, "Added", default_order: :desc)
+      th.col-width-large= sort_link(q, :event_type_name, "Type", default_order: :asc)
+      th.col-width-large= sort_link(q, :patient_family_name, ["patient_family_name", "patient_given_name asc"], "Patient")
+      th Desscription
+      th.created_at.col-width-date-time= sort_link(q, :date_time, "Date/Time", default_order: :desc)
+      th.created_by.col-width-medium= sort_link(q, :created_by_family_name, ["created_by_family_name", "created_by_given_name asc"], "Created by", default_order: :asc)
+  tbody
+    / Note we can't use cached: true yet when rendering the events collection, as each row is
+    / used in a different context and displays there slightly differently, for example showing
+    / an Edit link or Type column in certain circumstances.
+    = render partial: "renalware/events/events/event",
+             collection: events,
+             locals: { \
+              exclude_type_column: false,
+              include_patient_column: true,
+              toggle_prefix: toggle_prefix \
+            }
+
+= paginate events

data/app/views/renalware/events/lists/show.slim

@@ -0,0 +1,9 @@
+
+= content_for(:tabs) do
+  = render "tabs"
+
+= content_for(:filters) do
+  = render "filters", form: form
+
+= within_admin_layout(title: "Events") do
+  = render "table", events: events, q: q

data/app/views/renalware/hd/current_profile/_summary.html.slim

@@ -5,7 +5,7 @@ article.hd-profile-summary
       li= link_to "View", patient_hd_current_profile_path(patient), class: "button"
       li= link_to "Edit", edit_patient_hd_current_profile_path(patient), class: "button"
       li
-        label#toggle-full-hd-profile(for="toggle-full-hd-profile-input") Toggle full profile
+        label.trigger-masonry-refresh#toggle-full-hd-profile(for="toggle-full-hd-profile-input") Toggle full profile
 
   input#toggle-full-hd-profile-input(type="checkbox")
 

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

@@ -10,7 +10,7 @@ table
         - else
           th.col-width-date-time Started
           th.col-width-date-time.at-least Stopped
-        th.col-width-tiny Type
+        th Type
         th.col-width-tiny Time
         - unless compact
           th.col-width-medium Schedule

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

@@ -0,0 +1,27 @@
+- drugs_count = session.prescription_administrations.length
+- rows_span = drugs_count + 1
+tbody.hd-session-row(class=[session.state, stripe_class])
+  tr
+    td.noprint(rowspan=rows_span)= row_toggler
+    td(rowspan=rows_span)= session.edit_or_view_url
+    td(rowspan=rows_span)= session.performed_on
+    td.col-width-medium-with-ellipsis(rowspan=rows_span)= session.hospital_unit_unit_code
+    - if drugs_count.zero?
+      td
+      td
+      td
+      td
+      td
+  - session.prescription_administrations.each do |da|
+    tr(class="administered-#{da.administered?}")
+      td= Renalware::Medications::PrescriptionPresenter.new(da.prescription).to_s
+      td
+        span.given= yes_no da.administered?
+      td.col-width-medium-with-ellipsis= da.administered_by
+      td.col-width-medium-with-ellipsis= da.reason&.name
+      td= da.notes
+  tr
+    td(colspan=9)
+      .quick-preview
+        = definition_list_for(session, size: :large) do |list|
+          = list.definition(:notes){ |value| simple_format(value) }

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

@@ -0,0 +1,11 @@
+thead
+  tr
+    th.togglers.noprint= rows_toggler
+    th.noprint.col-width-small
+    th.col-width-date= t(".date")
+    th.col-width-small= t(".site")
+    th.col-width-large Prescription
+    th.col-width-tiny Given
+    th.col-width-small Given by
+    th.col-width-medium Reason not given
+    th Notes

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

@@ -1,44 +1,44 @@
-tr.hd-session-row(class=[session.state, stripe_class])
-  td.noprint(rowspan=2)= toggler("#hd-session-#{session.id}")
-  td.noprint(rowspan=2)
-    = session.edit_or_view_url
-  td.col-width-date(rowspan=2)= session.performed_on
-  td= session.hospital_unit_unit_code
-  td= session.start_time
-  td.derived(rowspan=2)= session.duration
-  td= session.before_measurement_for(:weight)
-  td= session.before_measurement_for(:pulse)
-  td= session.before_measurement_for(:temperature)
-  td= session.before_measurement_for(:respiratory_rate)
-  td.nowrap= session.before_measurement_for(:bm_stix)
-  td.nowrap= session.before_measurement_for(:blood_pressure)
-  td.nowrap(rowspan=2)= session.arterial_pressure
-  td.nowrap(rowspan=2)= session.venous_pressure
-  td.nowrap(rowspan=2)= session.blood_flow
-  td.nowrap(rowspan=2)= session.litres_processed
-  td.nowrap(rowspan=2)= session.fluid_removed
-  td.nowrap(rowspan=2)= session.machine_no
-  td.nowrap(rowspan=2)= session.machine_ktv
-  td.nowrap(rowspan=2)= session.machine_urr
-  td.print-only(rowspan=2)
-  td.print-only(rowspan=2)= session.notes
-  td.print-only= session.signed_on_by
+tbody.hd-session-row(class=[session.state, stripe_class])
+  tr
+    td.noprint(rowspan=2)= row_toggler
+    td.noprint(rowspan=2)= session.edit_or_view_url
+    td.col-width-date(rowspan=2)= session.performed_on
+    td= session.hospital_unit_unit_code
+    td= session.start_time
+    td.derived(rowspan=2)= session.duration
+    td= session.before_measurement_for(:weight)
+    td= session.before_measurement_for(:pulse)
+    td= session.before_measurement_for(:temperature)
+    td= session.before_measurement_for(:respiratory_rate)
+    td.nowrap= session.before_measurement_for(:bm_stix)
+    td.nowrap= session.before_measurement_for(:blood_pressure)
+    td.nowrap(rowspan=2)= session.arterial_pressure
+    td.nowrap(rowspan=2)= session.venous_pressure
+    td.nowrap(rowspan=2)= session.blood_flow
+    td.nowrap(rowspan=2)= session.litres_processed
+    td.nowrap(rowspan=2)= session.fluid_removed
+    td.nowrap(rowspan=2)= session.machine_no
+    td.nowrap(rowspan=2)= session.machine_ktv
+    td.nowrap(rowspan=2)= session.machine_urr
+    td.print-only(rowspan=2)
+    td.print-only(rowspan=2)= session.notes
+    td.print-only= session.signed_on_by
 
-tr(class=[session.state, stripe_class])
-  td= tooltip(label: session.summarised_access_used, content: session.access_used)
-  td= session.end_time
-  td.nowrap
-    = session.after_measurement_for(:weight)
-    - if (change = session.change_in(:weight))
-      i=" (#{change})"
-  td.nowrap= session.after_measurement_for(:pulse)
-  td.nowrap= session.after_measurement_for(:temperature)
-  td.nowrap= session.after_measurement_for(:respiratory_rate)
-  td.nowrap= session.after_measurement_for(:bm_stix)
-  td.nowrap= session.after_measurement_for(:blood_pressure)
-  td.print-only= session.signed_off_by
-= content_tag(:tr, id: "hd-session-#{session.id}", style: "display: none")
-  td(colspan=20)
-    .quick-preview
-      = definition_list_for(session, size: :large) do |list|
-        = list.definition(:notes){ |value| simple_format(value) }
+  tr(class=[session.state, stripe_class])
+    td= tooltip(label: session.summarised_access_used, content: session.access_used)
+    td= session.end_time
+    td.nowrap
+      = session.after_measurement_for(:weight)
+      - if (change = session.change_in(:weight))
+        i=" (#{change})"
+    td.nowrap= session.after_measurement_for(:pulse)
+    td.nowrap= session.after_measurement_for(:temperature)
+    td.nowrap= session.after_measurement_for(:respiratory_rate)
+    td.nowrap= session.after_measurement_for(:bm_stix)
+    td.nowrap= session.after_measurement_for(:blood_pressure)
+    td.print-only= session.signed_off_by
+  tr
+    td(colspan=20)
+      .quick-preview
+        = definition_list_for(session, size: :large) do |list|
+          = list.definition(:notes){ |value| simple_format(value) }

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

@@ -1,9 +1,27 @@
-table.auto-layout.hd-sessions
+
+.sub-nav.with-tabs
+  dl
+    dd.active
+      = link_to "Details", "#hd-sessions", data: { "trigger-masonry-refresh" => true }
+    dd
+      = link_to "Drugs given", "#hd-session-drugs", data: { "trigger-masonry-refresh" => true }
+  hr.tab-bottom-border
+/ .column_hover
+table.toggleable.auto-layout.hd-sessions#hd-sessions
   = render "renalware/hd/sessions/thead"
 
-  tbody
-    - sessions.each_with_index do |session, index|
-      - stripe_class = index % 2 == 0 ? "even" : "odd"
-      = render "renalware/hd/sessions/#{session.state}/row",
-              session: session,
-              stripe_class: stripe_class
+  - sessions.each_with_index do |session, index|
+    - stripe_class = index % 2 == 0 ? "even" : "odd"
+    = render "renalware/hd/sessions/#{session.state}/row",
+            session: session,
+            stripe_class: stripe_class
+
+/.column_hover
+table.toggleable.auto-layout.hd-sessions.hd-session-drugs#hd-session-drugs(style="display: none")
+  = render "renalware/hd/sessions/administered_drugs_thead"
+
+  - sessions.each_with_index do |session, index|
+    - stripe_class = index % 2 == 0 ? "even" : "odd"
+    = render "renalware/hd/sessions/#{session.state}/administered_drugs_row",
+            session: session,
+            stripe_class: stripe_class

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

@@ -1,10 +1,12 @@
 thead
+  / - 20.times do
+  /   colgroup
   tr
-    th.togglers.noprint(rowspan=3)= table_toggler
+    th
     th.noprint.col-width-small(rowspan=3)
     th.col-width-date(rowspan=3 valign="top")= t(".date")
     th.col-width-small= t(".site")
-    th.col-width-time.text-center= t(".time")
+    th.col-width-time= t(".time")
     th.col-width-time(rowspan=3)= t(".duration")
     th.col-width-tiny= t(".weight")
     th.col-width-tiny= t(".pulse")
@@ -23,6 +25,7 @@ thead
     th.col-width-user.text-center.print-only= t(".user")
 
   tr.row2
+    th.togglers.noprint(rowspan=2)= rows_toggler
     th(rowspan=2)= t(".access")
     th.col-width-time= t(".start_time")
     th.col-width-small= t(".pre")

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

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

data/app/views/renalware/hd/sessions/dna/_administered_drugs_row.html.slim

@@ -0,0 +1,11 @@
+tbody(class=[session.state, stripe_class])
+  tr
+    td.noprint= row_toggler
+    td= session.performed_on
+    td= session.hospital_unit_unit_code
+    td(colspan=6) Did not attend
+  tr
+    td(colspan=10)
+      .quick-preview
+        = definition_list_for(session, size: :large) do |list|
+          = list.definition(:notes){ |value| simple_format(value) }

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

@@ -1,14 +1,12 @@
-tr(class=[session.state, stripe_class])
-  td.noprint= toggler("#hd-session-#{session.id}")
-  td.noprint
-    = session.edit_or_view_url
-  td= session.performed_on
-  td= session.hospital_unit_unit_code
-  td(colspan=3) Did not attend
-  td(colspan=13)
-   i= session.truncated_notes
-= content_tag(:tr, id: "hd-session-#{session.id}", style: "display: none")
-  td(colspan=20)
-    .quick-preview
-      = definition_list_for(session, size: :large) do |list|
-        = list.definition(:notes) { |value| simple_format(value) }
+tbody(class=[session.state, stripe_class])
+  tr
+    td.noprint= row_toggler
+    td.noprint= session.edit_or_view_url
+    td= session.performed_on
+    td= session.hospital_unit_unit_code
+    td(colspan=16) Did not attend
+  tr
+    td(colspan=20)
+      .quick-preview
+        = definition_list_for(session, size: :large) do |list|
+          = list.definition(:notes){ |value| simple_format(value) }

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

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

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

@@ -10,8 +10,8 @@ article
     - if local_assigns[:with_esa] == true
 
       ul.tab-strip(data-tab)
-        li.tab-title.active= link_to "Current", "#current"
-        li.tab-title= link_to "EPO History", "#epo-history"
+        li.tab-title.active= link_to "Current", "#current", data: { "trigger-masonry-refresh" => true }
+        li.tab-title= link_to "EPO History", "#epo-history", data: { "trigger-masonry-refresh" => true }
 
       .tabs-content
         #current.content.active

data/app/views/renalware/navigation/_renal.html.slim

@@ -3,6 +3,7 @@ li.has-dropdown
   ul.dropdown
     li= link_to t(".appointments"), appointments_path
     li= link_to t(".clinic_visits"), clinic_visits_path
+    li= link_to t(".events"), events_filtered_list_path
     li= link_to t(".tx_wait_list"), transplants_wait_list_path(named_filter: "active")
     li= link_to t(".live_donors"), transplants_live_donors_path
     li= link_to t(".ongoing_hd_sessions"), hd_ongoing_sessions_path

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

@@ -8,10 +8,10 @@ article
   #prescriptions.expandable
 
     ul.tab-strip(data-tab)
-      li.tab-title.active= link_to "Current", "#current"
-      li.tab-title= link_to "Current Immunosuppressant", "#current_immunosuppressant"
-      li.tab-title= link_to "Historical", "#historical"
-      li.tab-title= link_to "Historical Immunosuppressant", "#historical_immunosuppressant"
+      li.tab-title.active= link_to "Current", "#current", data: { "trigger-masonry-refresh" => true }
+      li.tab-title= link_to "Current Immunosuppressant", "#current_immunosuppressant", data: { "trigger-masonry-refresh" => true }
+      li.tab-title= link_to "Historical", "#historical", data: { "trigger-masonry-refresh" => true }
+      li.tab-title= link_to "Historical Immunosuppressant", "#historical_immunosuppressant", data: { "trigger-masonry-refresh" => true }
 
     .tabs-content
       #current.content.active

data/config/locales/renalware/events/events.yml

@@ -8,6 +8,7 @@ en:
           description: Description
           date_time: Date/Time
           created_by: Created by
+          patient: Patient
   activerecord:
     attributes:
       renalware/events/event:

data/config/locales/renalware/hd/session.en.yml

@@ -265,3 +265,6 @@ en:
             edit: Edit
           dna:
             edit: Edit
+        administered_drugs_thead:
+          date: Date
+          site: Site

data/config/locales/renalware/navigation/renal.en.yml

@@ -5,6 +5,7 @@ en:
         menu_title: Renal
         appointments: Appointments
         clinic_visits: Clinic Visits
+        events: Events
         tx_wait_list: Tx Wait List
         live_donors: Live Donors
         ongoing_hd_sessions: Ongoing HD Sessions

data/config/routes/events.rb

@@ -26,4 +26,12 @@ end
 
 namespace :events do
   resources :types, except: :show
+  constraints(named_filter: /all/) do
+    get(
+      "list/:named_filter",
+      to: "lists#show",
+      as: :filtered_list,
+      defaults: { named_filter: "all" }
+    )
+  end
 end

data/db/migrate/20191203112310_add_pg_stat_statements_extension.rb

@@ -0,0 +1,6 @@
+class AddPgStatStatementsExtension < ActiveRecord::Migration[5.2]
+  def change
+    enable_extension "pg_stat_statements"
+    enable_extension "plpgsql"
+  end
+end

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.125"
+  VERSION = "2.0.126"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.125
+  version: 2.0.126
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview-component
@@ -1171,6 +1171,7 @@ files:
 - app/controllers/renalware/drugs/drugs_controller.rb
 - app/controllers/renalware/events/events_controller.rb
 - app/controllers/renalware/events/investigations_controller.rb
+- app/controllers/renalware/events/lists_controller.rb
 - app/controllers/renalware/events/swabs_controller.rb
 - app/controllers/renalware/events/types_controller.rb
 - app/controllers/renalware/feeds/hl7_test_messages_controller.rb
@@ -1496,9 +1497,11 @@ files:
 - app/models/renalware/events/biopsy.rb
 - app/models/renalware/events/create_event.rb
 - app/models/renalware/events/event.rb
+- app/models/renalware/events/event_list_query.rb
 - app/models/renalware/events/event_query.rb
 - app/models/renalware/events/investigation.rb
 - app/models/renalware/events/line_change_event_query.rb
+- app/models/renalware/events/lists/form.rb
 - app/models/renalware/events/simple.rb
 - app/models/renalware/events/swab.rb
 - app/models/renalware/events/type.rb
@@ -2365,6 +2368,10 @@ files:
 - app/views/renalware/events/events/toggled_cell/_swab.html.slim
 - app/views/renalware/events/investigations/_list.html.slim
 - app/views/renalware/events/investigations/edit.html.slim
+- app/views/renalware/events/lists/_filters.html.slim
+- app/views/renalware/events/lists/_table.html.slim
+- app/views/renalware/events/lists/_tabs.html.slim
+- app/views/renalware/events/lists/show.slim
 - app/views/renalware/events/swabs/_list.html.slim
 - app/views/renalware/events/swabs/edit.html.slim
 - app/views/renalware/events/swabs/new.html.slim
@@ -2444,6 +2451,8 @@ files:
 - app/views/renalware/hd/scheduling/diary_slots/update.js.erb
 - app/views/renalware/hd/session_forms/batches/_create.html.slim
 - app/views/renalware/hd/session_forms/batches/create.js.erb
+- app/views/renalware/hd/sessions/_administered_drugs_row.html.slim
+- app/views/renalware/hd/sessions/_administered_drugs_thead.html.slim
 - app/views/renalware/hd/sessions/_empty_row.html.slim
 - app/views/renalware/hd/sessions/_form.html.slim
 - app/views/renalware/hd/sessions/_form_actions.html.slim
@@ -2454,9 +2463,11 @@ files:
 - app/views/renalware/hd/sessions/_show.html.slim
 - app/views/renalware/hd/sessions/_table.html.slim
 - app/views/renalware/hd/sessions/_thead.html.slim
+- app/views/renalware/hd/sessions/closed/_administered_drugs_row.html.slim
 - app/views/renalware/hd/sessions/closed/_form.html.slim
 - app/views/renalware/hd/sessions/closed/_row.html.slim
 - app/views/renalware/hd/sessions/closed/_show.html.slim
+- app/views/renalware/hd/sessions/dna/_administered_drugs_row.html.slim
 - app/views/renalware/hd/sessions/dna/_form.html.slim
 - app/views/renalware/hd/sessions/dna/_row.html.slim
 - app/views/renalware/hd/sessions/dna/_show.html.slim
@@ -2464,6 +2475,7 @@ files:
 - app/views/renalware/hd/sessions/form/_drugs_to_be_administered.html.slim
 - app/views/renalware/hd/sessions/index.html.slim
 - app/views/renalware/hd/sessions/new.html.slim
+- app/views/renalware/hd/sessions/open/_administered_drugs_row.html.slim
 - app/views/renalware/hd/sessions/open/_form.html.slim
 - app/views/renalware/hd/sessions/open/_hd_prescriptions.html.slim
 - app/views/renalware/hd/sessions/open/_row.html.slim
@@ -3706,6 +3718,7 @@ files:
 - db/migrate/20191029095202_add_deleted_at_to_problem_notes.rb
 - db/migrate/20191105095304_update_views_to_exclude_deleted_sessions.rb
 - db/migrate/20191108105923_add_named_consultant_to_patients.rb
+- db/migrate/20191203112310_add_pg_stat_statements_extension.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb