renalware-core 2.0.149 → 2.0.151

data/app/assets/stylesheets/renalware/core.scss

@@ -1,4 +1,5 @@
 /*
+    *= require "renalware/rollup_compiled.css"
     *= require jquery-ui/core
     *= require jquery-ui/sortable
     *= require jquery-ui/tabs

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

@@ -411,19 +411,23 @@ use flexbox to layout items inside each prescription.
       .hd-drug--name {
         font-weight: bold;
       }
+
       .hd-drug--name,
       .hd-drug--dose,
       .hd-drug--route,
       .hd-drug--prescribed-on,
-      .hd-drug--frequency {
+      .hd-drug--frequency,
+      .hd-drug--prescriber-name,
+      .hd-drug--prescriber-position {
         display: inline-block;
         padding-right: .5rem;
         color: $dark-grey;
       }
 
-      .hd-drug--prescriber-name {
-        display: inline-block;
-        color: $mid-grey;
+      .hd-drug--prescriber-name,
+      .hd-drug--prescriber-position {
+        color: $muted-dark-grey;
+        padding-right: .3rem;
       }
 
       .hd-drug--termination {

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

@@ -37,10 +37,17 @@ table#observations {
 
     td {
       height: 2rem;
-      overflow: visible;
+      overflow: hidden;
       padding: 0 .2rem;
       position: relative;
       text-align: center;
+      text-overflow: ellipsis;
+      max-width: 4rem;
+
+      &.triangle_in_corner {
+        overflow: visible;
+        max-width: unset;
+      }
 
       // Generated with http://triangle.designyourcode.io/
       .triangle-top-right {

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

@@ -1,3 +1,38 @@
+.pet-results--samples-table,
+.adequacy-results--samples-table {
+  max-width: 640px;
+
+  th {
+    width: 14.3%;
+  }
+
+  thead, tbody, th, td {
+    border: none;
+    text-align: center;
+  }
+
+  input {
+    margin: 0;
+  }
+}
+
+.adequacy-path-table {
+  background-color: transparent;
+  thead, tbody, th, td {
+    border: none;
+    text-align: center;
+  }
+
+  thead tr:first-child th {
+    font-style: italic;
+    text-align: center;
+  }
+
+  .bottom-border {
+    border-bottom: 1px solid #ccc;
+  }
+}
+
 .current-regime {
   h3 {
     font-size: 1rem;

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

@@ -0,0 +1,17 @@
+.bart-chart-icon {
+  position: relative; // required for safari otherwise user cannot click on :before content
+  display: inline-block; // required otherwise IE11 will not be able to click on it
+
+  i {
+    @extend %fa-icon;
+    @extend .fas;
+    font-weight: 600;
+    pointer-events: none;
+    text-align: center;
+    width: 1.2rem;
+
+    &:before {
+      content: asset-data-url("renalware/icons/bar-chart.svg");
+    }
+  }
+}

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

@@ -182,6 +182,10 @@ article {
         display: inline-block;
         margin-right: .5rem;
       }
+
+      &.right {
+        text-align: right;
+      }
     }
 
     h3 {
@@ -205,7 +209,7 @@ article {
       color: $white;
       display: block;
       float: right;
-      padding: 0.3rem 0.4rem;
+      padding: 0.2rem 0.4rem;
       text-decoration: none;
       margin-left: 0.5rem;
 

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

@@ -140,5 +140,13 @@
         }
       }
     }
+
+    &.wrapper_size_xs {
+      > .wrapper__input {
+        @media #{$small-up} {
+          @include grid-column(2, $last-column: false);
+        }
+      }
+    }
   }
 }

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

@@ -31,3 +31,15 @@
   height: 1px; width: 1px;
   margin: -1px; padding: 0; border: 0;
 }
+
+a.reset {
+  &:hover,
+  &:visited,
+  &:focus,
+  &:active,
+  &:link
+  {
+    color: unset;
+    background-color: unset;
+  }
+}

data/app/assets/stylesheets/tailwind/tailwind.css

@@ -0,0 +1,3 @@
+@import "tailwindcss/base";
+@import "tailwindcss/components";
+@import "tailwindcss/utilities";

data/app/components/renalware/application_component.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 module Renalware
-  class ApplicationComponent < ActionView::Component::Base
+  class ApplicationComponent < ViewComponent::Base
     include Renalware::Engine.routes.url_helpers
     include Pundit::Helper
+    delegate :current_user, :policy, to: :helpers
 
     # Not sure why include Renalware::Engine.routes.url_helpers does not make the
     # engine urls visible in the views (seems to resolve alwatys to /assets?..)

data/app/components/renalware/events/{biopsies_component.html.slim → event_list_component.html.slim}

@@ -1,14 +1,15 @@
 article.events
   header
-    h2 Biopsies
+    h2= title
     .supplemental
-      span= "#{biopsies.length} of #{total_biopsies}"
+      span= "#{event_count} of #{total_event_count}"
       span.noprint
         = link_to "View All",
                   renalware.patient_events_path(patient),
                   class: "button secondary"
 
+  / NB: Perhaps this component should not lean on external partials?
   = render "renalware/events/events/table",
-           events: biopsies,
+           events: events,
            exclude_type_column: true,
-           toggle_prefix: "biopsy"
+           description_column_title: description_column_title

data/app/components/renalware/events/event_list_component.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Events
+    # A generic view component for displaying a summarised list of events of a certain
+    # type - for example Biopsy events - to add to a dashboard or MDM.
+    # Once we have configurable dashboards and MDMs it should be possible to
+    # drop this component onto a dashboard and configure the event class and perhaps
+    # some other custom parameters, and at run time the dashboard is constructed
+    # and will include the requested component. In this way you could choose to
+    # add say list components which each display a different class of event.
+    # Obviously some more thought needs to go into this but as a direction of
+    # travel it has many advantages - for example a hospital can configure the default
+    # dashboards and MDMs, perhaps depending on the user's role, but an individual user
+    # could override and build their own.
+    # Some parameters to think about when configuring an event component
+    # - event class or description - where does the event_type fit in?
+    # - the AR scope to use and whether this affects sorting
+    # - the title displayed above the list of events - is this i18n, derived from the
+    #   event type/class, or configured when the dashboard is designed?
+    # - to what extent to the event partials affect display? We have these to help us
+    #   build form inputs and display content in table cell/toggled cells, but is this flexible
+    #   enough - e.g. is only have a Description HTML table column sufficient for displaying
+    #   multiple custom event properties (defined in the event's document) or do we need to allow
+    #   partials that control table structure?
+    #
+    # Perhaps a datavase-backed component configuration model could be passed into this component to
+    # drive the display - eg hide_if_no_data of not.
+    class EventListComponent < ApplicationComponent
+      pattr_initialize [
+        :patient!,
+        :event_class!,
+        limit: 6,
+        hide_if_no_data: false # if true and there are no events, nothing will be rendered
+      ]
+
+      # This assumes the event class has a scope called #ordered
+      def events
+        @events ||= relation.includes(:created_by).ordered.limit(limit)
+      end
+
+      def event_count
+        @event_count ||= events.length
+      end
+
+      def total_event_count
+        @total_event_count ||= relation.count
+      end
+
+      def title
+        t(:title)
+      end
+
+      def description_column_title
+        t(:description_column_title)
+      end
+
+      # There is the option to prevent anything from displaying if we expose the
+      # render? method and return false
+      def render?
+        return true unless hide_if_no_data
+
+        event_count > 0
+      end
+
+      private
+
+      def relation
+        @relation ||= event_class.for_patient(patient)
+      end
+
+      def t(str)
+        I18n.t(str, scope: event_class.name.underscore, default: "Description")
+      end
+    end
+  end
+end

data/app/components/renalware/hd/administer_prescription_dropdown_component.rb

@@ -5,11 +5,7 @@ module Renalware
     class AdministerPrescriptionDropdownComponent < ApplicationComponent
       include DropdownButtonHelper
       include PresenterHelper
-      attr_reader :patient
-
-      def initialize(patient:)
-        @patient = patient
-      end
+      pattr_initialize [:patient!]
 
       def prescriptions_to_give_on_hd
         @prescriptions_to_give_on_hd ||= begin

data/app/components/renalware/hd/prescription_last_administration_component.html.slim

@@ -1,4 +1,3 @@
-- return unless last_administration
 .panel
   b= "Last given on #{l(last_administration.recorded_on, format: :long)} by #{last_administration.administered_by}"
   - if last_administration.notes.present?

data/app/components/renalware/hd/prescription_last_administration_component.rb

@@ -3,16 +3,17 @@
 module Renalware
   module HD
     class PrescriptionLastAdministrationComponent < ApplicationComponent
-      attr_reader :prescription
-      validates :prescription, presence: true
-
-      def initialize(prescription:)
-        @prescription = prescription
-      end
+      pattr_initialize [:prescription!]
 
       def last_administration
+        return if prescription.blank?
+
         @last_administration ||=
-          PrescriptionLastAdministrationQuery.new(prescription: prescription).call
+          PrescriptionLastAdministrationQuery.call(prescription: prescription)
+      end
+
+      def render?
+        last_administration.present?
       end
     end
   end

data/app/components/renalware/letters/unread_electronic_ccs_component.rb

@@ -3,6 +3,7 @@
 module Renalware
   module Letters
     class UnreadElectronicCCsComponent < ApplicationComponent
+      include Pundit::Helper
       attr_reader :current_user
 
       def initialize(current_user:)

data/app/components/renalware/pathology/chart_component.html.slim

@@ -0,0 +1,5 @@
+- cache(self, expires_in: 1.day) do
+  - if chart_data.any?
+    = area_chart chart_data, options.merge(id: dom_id,  width: 350)
+  - else
+    h4 No data

data/app/components/renalware/pathology/chart_component.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Pathology
+    class ChartComponent < ApplicationComponent
+      pattr_initialize [:current_user!, :patient!, :observation_description!]
+
+      def chart_data
+        @chart_data ||= begin
+          Pathology.cast_patient(patient)
+            .observations
+            .where(description_id: observation_description.id)
+            .order(:observed_at)
+            .pluck([:observed_at, :result])
+        end
+      end
+
+      # TODO: cache key should expire when a new observation arrives of this type
+      def cache_key
+        "#{patient.cache_key}/chart/#{observation_description.id}"
+      end
+
+      # Because we cache the component html inside the view sidecar, we want to
+      # avoid implementing this method properly - ie checking if there anything
+      # to render - as that would involve querying the database, thus negating
+      # the befit of any caching.
+      def render?
+        true
+      end
+
+      def options
+        {}
+      end
+
+      def dom_id
+        @dom_id ||= ActionView::RecordIdentifier.dom_id(observation_description)
+      end
+    end
+  end
+end

data/app/components/renalware/pathology/sparkline_component.html.slim

@@ -0,0 +1,15 @@
+- cache(self, expires_in: 1.day) do
+  - if chart_data.any?
+    - use_stimulus = false
+
+    - if use_stimulus
+      / This is the stimulusjs version. See sparklines_controller.js
+      div(data-controller="pathology-sparklines"
+          data-pathology-sparklines-chart-data='[["2010-06-03T16:37:00.000+01:00","106"], ["2011-06-03T16:37:00.000+01:00","110"]]')
+        div(data-target="pathology-sparklines.chart")
+    - else
+      / This implementation uses ChartKick to insert the chart javascript into the
+      / page. It works fine, but when there are 50 path results on screen, we are
+      / inserting 50 copies of the chart defition and options. Hence a stimulusjs
+      / approach might be better.
+      = area_chart chart_data, options.merge(height: 15, width: 80, id: dom_id)

data/app/components/renalware/pathology/sparkline_component.rb

@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+
+# rubocop:disable Metrics/ClassLength
+module Renalware
+  module Pathology
+    # Renders a pathology sparkline - a small graph of patient results for a particular
+    # OBX (observation_description) over time.
+    # TODO: Move the graph config into JS. Possibly use a stimulus controller
+    class SparklineComponent < ApplicationComponent
+      pattr_initialize [:current_user!, :patient!, :observation_description!]
+
+      CHART_OPTIONS = {
+        library: {
+          chart: {
+            type: "area",
+            margin: [0, 0, 0, 0],
+            height: 20,
+            width: 80,
+            skipClone: true,
+            style: {
+              overflow: "visible"
+            }
+          },
+          credits: {
+            enabled: false
+          },
+          title: "",
+          xAxis: {
+            type: "datetime",
+            tickPositions: [],
+            labels: {
+              enabled: false
+            },
+            startOnTick: false,
+            endOnTick: false,
+            title: {
+              text: nil
+            }
+          },
+          legend: {
+            enabled: false
+          },
+          yAxis: {
+            tickPositions: [0],
+            endOnTick: false,
+            startOnTick: false,
+            title: {
+              text: nil
+            },
+            min: 0,
+            labels: {
+              enabled: false
+            }
+          },
+          tooltip: {
+            hideDelay: 0,
+            outside: true,
+            shared: true,
+            xDateFormat: "%d-%b-%Y"
+          },
+          plotOptions: {
+            area: {
+              fillColor: {
+                linearGradient: {
+                  x1: 0,
+                  y1: 0,
+                  x2: 0,
+                  y2: 1
+                },
+                stops: [
+                  [0, "#eee"],
+                  [0.5, "#fff"]
+                ]
+              }
+            },
+            series: {
+              animation: false,
+              lineWidth: 1,
+              shadow: false,
+              states: {
+                hover: {
+                  lineWidth: 1
+                }
+              },
+              marker: {
+                radius: 1,
+                states: {
+                  hover: {
+                    radius: 2
+                  }
+                }
+              },
+              fillOpacity: 0.25
+            },
+            column: {
+              negativeColor: "#910000",
+              borderColor: "silver"
+            }
+          }
+        }
+      }.freeze
+
+      def chart_data
+        @chart_data ||= begin
+          patient
+            .observations
+            .where(description_id: observation_description.id)
+            .order(:observed_at)
+            .pluck([:observed_at, :result])
+        end
+      end
+
+      def cache_key
+        "#{patient.cache_key}/sparkline/#{observation_description.id}"
+      end
+
+      # Because we cache the component html inside the view sidecar, we want to
+      # avoid implementing this method properly - ie checking if there anything
+      # to render - as that would involve querying the database, thus negating
+      # the befit of any caching.
+      def render?
+        true
+      end
+
+      def options
+        CHART_OPTIONS
+      end
+
+      def dom_id
+        @dom_id ||= ActionView::RecordIdentifier.dom_id(observation_description)
+      end
+    end
+  end
+end
+# rubocop:enable Metrics/ClassLength