renalware-core 2.0.153 → 2.0.155

data/app/assets/stylesheets/renalware/lib/_select2-foundation5-overrides.scss

@@ -4,7 +4,7 @@ span.select2 {
 }
 
 .grouped_select {
-  margin-bottom: 0.7rem;
+   // margin-bottom: 0.7rem;
 
   label {
     margin-bottom: 0;

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

@@ -57,15 +57,15 @@ tbody tr {
 }
 
 .medications-filter {
-  select {
-    width: 250px;
-  }
-
-  .button {
-    border-bottom-left-radius: 0 !important;
-    border-top-left-radius: 0 !important;
-    padding: .53rem 1rem;
-  }
+  // select {
+  //   width: 250px;
+  // }
+
+  // .button {
+  //   border-bottom-left-radius: 0 !important;
+  //   border-top-left-radius: 0 !important;
+  //   padding: .53rem 1rem;
+  // }
 }
 
 .find-drug-list ul.drug-results-admin {

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

@@ -354,6 +354,10 @@ form {
 }
 
 .page--patients-clinical_summaries {
+  .summary-part--messages {
+    @include grid-column(12);
+  }
+
   .summary-part--letters {
     @include grid-column(12);
   }

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

@@ -1,4 +1,5 @@
-.admin-users {
+.admin-users,
+.all-users {
   td.approved {
     color: $nhs-light-green;
     text-align: center;

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

@@ -29,6 +29,17 @@ textarea.monospace {
     display: none;
   }
 }
+.filters--flex {
+  .flex {
+    input, select, .select2 {
+      margin: 0;
+    }
+
+    .button {
+      padding: .5rem 1rem
+    }
+  }
+}
 
 // Hide up down arrows on number inputs
 input[type="number"]::-webkit-inner-spin-button,

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

@@ -49,11 +49,6 @@ dd.patient-name {
   display: none;
 }
 
-[data-magellan-expedition],
-[data-magellan-expedition-clone] {
-  padding: 5px 0;
-}
-
 .sub-nav.fixed {
   left: auto;
 }
@@ -212,7 +207,9 @@ dd.patient-name {
   color: rgba(255, 255, 255, 0.5);
   font-size: 0.8em;
   line-height: 45px;
-  padding: 0 15px;
+  padding: 0 8px;
+  border-top: solid 1px #666;
+  text-transform: uppercase;
 }
 
 .dropdown.button {
@@ -255,7 +252,8 @@ dd.patient-name {
   width: 100%;
 }
 
-.sub-nav dd {
+.sub-nav dd,
+.sub-nav li {
   margin: 0 0.25rem 0 0;
 }
 
@@ -276,7 +274,8 @@ dd.patient-name {
   }
 }
 
-.sub-nav dd a {
+.sub-nav dd a,
+.sub-nav li a {
   background-color: transparent;
   border: solid transparent;
   border-radius: 3px 3px 0 0;
@@ -288,22 +287,26 @@ dd.patient-name {
   white-space: nowrap;
 }
 
-.sub-nav dd a:hover {
+.sub-nav dd a:hover,
+.sub-nav li a:hover {
   color: $dark-grey;
 }
 
-.sub-nav dd.active a {
+.sub-nav dd.active a,
+.sub-nav li.active a {
   background-color: $white;
   border-color: $nhs-orange $tab-border-color transparent;
   color: $dark-grey;
   padding: 0.3rem 1.3rem;
 }
 
-.sub-nav dd.active {
+.sub-nav dd.active,
+.sub-nav li.active {
   font-weight: bold;
 }
 
-.sub-nav dd.active a:hover {
+.sub-nav dd.active a:hover,
+.sub-nav li.active a:hover {
   background-color: $white;
   color: $dark-grey;
 }

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

@@ -61,7 +61,7 @@
   }
 
   .hint {
-    color: $form-hint-colour;
+    color: $form-hint-colour-strong;
     display: block;
     font-size: 0.75rem;
     font-style: italic;

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

@@ -228,6 +228,21 @@ table {
   }
 
   tr td {
+    &.with-ellipsis {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      max-width: 0;
+    }
+
+    &.col-width-small-with-ellipsis {
+      min-width: 5.1rem;
+      max-width: 5.1rem;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
     &.col-width-medium-with-ellipsis {
       max-width: 7rem;
       min-width: 5rem;
@@ -427,14 +442,6 @@ td {
       font-size: 0.9em;
     }
 
-    .accordion dd > a.toggle-info {
-      background: none;
-      border-radius: 0.5em;
-      color: $link-colour;
-      font-size: 0.9em;
-      padding: 0 0.3em 0 0.3em;
-    }
-
     thead,
     tbody,
     th,

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

@@ -1,62 +1,3 @@
-.accordion .accordion-navigation > .content,
-.accordion dd > .content {
-  color: $nhs-dark-red;
-  font-weight: normal;
-  padding: 0.25rem 0.5rem;
-}
-
-.accordion-navigation.active {
-  background-color: $white;
-  border-radius: 3px;
-}
-
-.accordion .accordion-navigation > a,
-.accordion dd > a {
-  border-radius: 0.5em;
-  font-size: 1rem;
-  padding: 0 0.5em 0 0;
-  text-decoration: none;
-}
-
-.accordion-navigation a span {
-  color: $dark-grey;
-}
-
-.accordion-navigation a .when {
-  font-weight: bold;
-}
-
-.accordion-navigation a .what,
-.accordion-navigation a .about {
-  color: $link-colour;
-  text-decoration: underline;
-}
-
-.accordion-navigation a .whom {
-  color: $nhs-dark-blue;
-  font-weight: bold;
-}
-
-.accordion .accordion-navigation.active > a,
-.accordion dd.active > a {
-  background-color: $white;
-}
-
-.accordion a.toggle-info:hover {
-  background-color: $link-colour;
-  color: $white;
-}
-
-.accordion a.toggle-info:hover span,
-.accordion a.toggle-info:hover:before {
-  color: $white;
-}
-
-.accordion .active a.toggle-info:hover {
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
 .hide-button {
   display: none;
 }
@@ -115,13 +56,6 @@
   display: none;
 }
 
-.accordion dd > a.toggle-info {
-  background: none;
-  border-radius: 3px;
-  color: $link-colour;
-  padding: 0 0.3em 0 0.3em;
-}
-
 .toggle-text {
   font-size: 0.8em;
 }

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

@@ -66,6 +66,24 @@ th.togglers {
     }
   }
 
+  &.easy-read {
+    .toggleable--open {
+      tr,
+      tr:hover {
+        background-color: #fffeee;
+
+        td {
+          border-bottom-color: #eee;
+        }
+
+        p {
+          margin-left: 0;
+          padding-left: 0;
+        }
+      }
+    }
+  }
+
   tbody {
     tr:last-child {
       display: none

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

@@ -1,3 +1,15 @@
+
+// TailwindCSS overides and set all li to have no style - which is pretty mean - so reverting here
+.trix-content {
+  ul li {
+    list-style: initial;
+  }
+
+  ol li {
+    list-style: decimal;
+  }
+}
+
 trix-toolbar {
   display: inline-block;
 

data/app/components/renalware/admissions/active_consult_alert_component.html.slim

@@ -0,0 +1,4 @@
+li.patient-alert.bg-pink-200.text-gray-700
+  i.fas.fa-exclamation-triangle
+  span.title
+    = link_to "Active Consult", renalware.edit_admissions_consult_path(id: consult_id)

data/app/components/renalware/admissions/active_consult_alert_component.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Admissions
+    # rubocop:disable Rails/Pick
+    class ActiveConsultAlertComponent < ApplicationComponent
+      pattr_initialize [:current_user, :patient!]
+
+      def consult_id
+        @consult_id ||= begin
+          Consult
+            .where(patient_id: patient.id, ended_on: nil)
+            .order(started_on: :desc)
+            .pluck(:id)
+            .first
+        end
+      end
+
+      def render?
+        consult_id.present?
+      end
+    end
+    # rubocop:enable Rails/Pick
+  end
+end

data/app/components/renalware/article_component.html.slim

@@ -0,0 +1,5 @@
+article
+  header.flex.flex-row
+    h2.flex-grow== title || title_link
+    .flex-row= actions
+  = content

data/app/components/renalware/article_component.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Renalware
+  # Renders article markup with ttle and optional actions etc.
+  # We use <article> extensively so this is a useful component that lets us
+  # build more and more useful components. Other components can use this component
+  # in their markup.
+  class ArticleComponent < ApplicationComponent
+    pattr_initialize [:title]
+    with_content_areas :title_link, :actions
+  end
+end

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

@@ -36,7 +36,12 @@ module Renalware
 
       # This assumes the event class has a scope called #ordered
       def events
-        @events ||= relation.includes(:created_by).ordered.limit(limit)
+        @events ||= begin
+          CollectionPresenter.new(
+            relation.includes(:created_by).ordered.limit(limit),
+            Events::EventPresenter
+          )
+        end
       end
 
       def event_count

data/app/components/renalware/medications/tabbed_prescriptions_list_component.html.slim

@@ -0,0 +1,41 @@
+div(data-controller="tabs" data-tabs-active-tab="active")
+  .tabs-container
+    ul.list-reset.sub-nav
+      - groups.each do |group|
+        li(data-target="tabs.tab" data-action="click->tabs#change")
+          a(class="" href="#" data-trigger-masonry-refresh="true")= group.title
+
+  - groups.each do |group|
+    .hidden(data-target="tabs.panel")
+      table.prescriptions-list
+        thead
+          tr
+            th.at-least.col-width-mediumish= t(".drug_name")
+            - if group.show_drug_types
+              th.col-width-small= t(".drug_type")
+            th.col-width-small= t(".dose")
+            th.col-width-tiny= t(".frequency")
+            th.col-width-tiny= t(".route")
+            - if group.show_administer_on_hd
+              th.col-width-small= t(".administer_on_hd")
+            th.col-width-tiny=t(".provider")
+            th.col-width-date= t(".started_on")
+            - if group.show_terminated_on
+              th.col-width-date= t(".terminated_on")
+        tbody
+          - group.prescriptions.each do |prescription|
+            tr class="drug-#{drug_types_colour_tag(prescription.drug_types)}"
+              td= prescription.drug.name
+              - if group.show_drug_types
+                td= prescription.drug_type_names
+              td= prescription.dose
+              td= prescription.frequency
+              td= prescription.route_code
+              - if group.show_administer_on_hd
+                td= prescription.administer_on_hd?
+              td
+                /- byebug
+                = prescription.provider
+              td= I18n.l prescription.prescribed_on
+              - if group.show_terminated_on
+                td= l(prescription.terminated_on)

data/app/components/renalware/medications/tabbed_prescriptions_list_component.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Medications
+    # Accepts a group of prescriptions -  see example usage - and renders a tabs for each of the
+    # group names with their corresponding tablular content.
+    # Various options - see PrescriptionGroup - drive what columns are shown.
+    #
+    # Example usage:
+    #
+    # = render Renalware::Medications::TabbedPrescriptionsListComponent.new(
+    #   [
+    #      { title: "Current", prescriptions: list1, show_administer_on_hd: true },
+    #      { title: "EPO", prescriptions: list2, show_terminated_on: true }
+    #   ]
+    class TabbedPrescriptionsListComponent < ApplicationComponent
+      include DrugsHelper
+      attr_reader :groups
+
+      class PrescriptionGroup
+        attr_reader_initialize [
+          :title,
+          :prescriptions,
+          show_terminated_on: true,
+          show_administer_on_hd: true,
+          show_drug_types: false
+        ]
+
+        # The markup expects each prescription to have been decorated with a PresriptionPresenter.
+        # However there may be cases where they might have been, so we check by
+        # (looking for a method which is defined by the presenter) and decorate them if necessary.
+        def prescriptions
+          @prescriptions.map do |presc|
+            presc.respond_to?(:drug_type_names) ? presc : PrescriptionPresenter.new(presc)
+          end
+        end
+      end
+
+      # Map the incoming array of hashes to an array of PrescriptionGroup objects to make
+      # interrogation easier in the html.
+      def initialize(prescription_groups)
+        @groups = Array(prescription_groups).map { |options| PrescriptionGroup.new(options) }
+        super
+      end
+    end
+  end
+end