renalware-core 2.0.137 → 2.0.138

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

@@ -32,7 +32,7 @@
     }
     &.session_import_error {
       td.result {
-        background-color:lighten($nhs-pink, 50);
+        background-color: lighten($nhs-pink, 50);
       }
     }
   }
@@ -397,10 +397,6 @@ use flexbox to layout items inside each prescription.
 */
 .hd-drug-administration {
   display: flex;
-  border: solid 1px $light-grey;
-  margin: .7rem 0;
-  padding: .3rem .6rem;
-  border-right-width: 15px;
   flex-wrap: wrap;
 
   .summary {
@@ -408,7 +404,7 @@ use flexbox to layout items inside each prescription.
     display: flex; /* also a flex for items within it */
 
     .hd-drug {
-      flex: 1;
+      flex: 1 1 auto;
       padding-bottom: .5rem;
       color: $mid-grey;
 
@@ -439,21 +435,40 @@ use flexbox to layout items inside each prescription.
         }
       }
     }
+  }
+
+  /*
+  This is the checkox to indicate the drug was administered.
+  We fix its width as we never want it to shrink.
+  */
+  .hd-drug-administered {
+    width: 98%;
+    text-align: right;
+    display: flex;
+    margin-top: .3rem;
+
+    label, .radio_buttons {
+      display: flex;
+      flex: 0 1 9rem;
+    }
 
-    /*
-    This is the checkox to indicate the drug was administered.
-    We fix its width as we never want it to shrink.
-    */
-    .hd-drug-administered {
-      flex-basis: 220px;
-      text-align: right;
+    .radio {
+      display: inline-block !important;
 
-      .radio {
-        display: inline-block !important;
+      label {
+        width: 5rem;
       }
     }
   }
 
+  .recorded-on {
+    width: 98%;
+
+    .datepicker {
+      width: 140px !important;
+    }
+  }
+
   .reason-why-not-administered {
     display: none;
   }
@@ -488,7 +503,7 @@ use flexbox to layout items inside each prescription.
   }
 
   .notes {
-    flex: 1;
+    flex: 1 1 auto;
     margin-right: 1rem;
 
     textarea {
@@ -595,11 +610,19 @@ use flexbox to layout items inside each prescription.
   }
 }
 
-table.hd-session-drugs {
+table#hd-session-drugs {
   thead {
     border-bottom: solid 1px #222;
   }
 
+  .unauthorised tr {
+    background-color: lighten($nhs-pink, 55);
+
+    td {
+      border-color: lighten($nhs-pink, 55);;
+    }
+  }
+
   tr {
     span.given {
       @include badge;

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

@@ -8,7 +8,7 @@
     article {
       background-color: #fff;
       padding: 0.3rem .5rem .5rem;
-      border-top-width: 2px;
+      border-top-width: 1px;
       border-top-color: $nhs-bright-blue;
     }
   }

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

@@ -39,6 +39,7 @@
   .modal__body {
     // Ensure the content can be scrolled if drops of the bottom of the page
     overflow-y: auto;
+    overflow-x: hidden;
     max-height: calc(100vh - 200px);
 
     // remove excessive l and r padding in modals

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

@@ -66,12 +66,14 @@ dd.patient-name {
   left: -$patient-side-nav-width;
 }
 
-.patient-side-nav {
+.patient-side-nav,
+.admin-side-nav {
   @media print {
     display: none;
   }
 
   background-color: $patient-menu-background-colour;
+
   min-width: $patient-side-nav-width;
   padding: 0.3rem 0 2rem 0.4rem;
   width: $patient-side-nav-width;
@@ -131,6 +133,23 @@ dd.patient-name {
   }
 }
 
+.admin-side-nav {
+  background-color: $muted-dark-grey;
+  color: #fff;
+
+  .side-nav--admin {
+    li a,
+    li.heading {
+      color: #fff !important;
+      text-decoration: none !important;
+    }
+
+    li.active a {
+      color: $dark-grey !important;
+    }
+  }
+}
+
 .patient-side-nav li:last-child {
   margin-bottom: 0;
 }
@@ -189,7 +208,7 @@ dd.patient-name {
   }
 }
 
-.top-bar-section  .dropdown li.info {
+.top-bar-section .dropdown li.info {
   color: rgba(255, 255, 255, 0.5);
   font-size: 0.8em;
   line-height: 45px;
@@ -204,6 +223,30 @@ dd.patient-name {
   }
 }
 
+#top-menu-bar {
+  li.menu-item a i{
+    font-weight: 600;
+    pointer-events: none;
+    text-align: center;
+    width: 1.2rem;
+    vertical-align: text-bottom;
+    margin-right: .3rem;
+    display: inline-block;
+    font-style: normal;
+    font-variant: normal;
+    text-rendering: auto;
+    line-height: 1;
+  }
+
+  li.menu-item--home a i:before {
+    content: asset-data-url("renalware/icons/home.svg");
+  }
+
+  li.menu-item--admin a i:before {
+    content: asset-data-url("renalware/icons/settings.svg");
+  }
+}
+
 .sub-nav {
   background-color: transparent;
   float: left;

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

@@ -0,0 +1,21 @@
+.pagy-foundation-nav {
+  padding-top: .5rem;
+
+  .pagination {
+    li {
+      &.current {
+        background:#008CBA;
+        color:#fff;
+        font-weight: bold;
+        border-radius: 3px;
+        transition: background-color 300ms ease-out;
+        padding: 0.0714285714rem 0.7142857143rem 0.0714285714rem;
+
+        a {
+          color: #fff;
+          background: none;
+        }
+      }
+    }
+  }
+}

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

@@ -221,6 +221,10 @@ table {
         white-space: nowrap;
       }
     }
+
+    &.no-wrap {
+      white-space: nowrap;
+    }
   }
 
   tr td {
@@ -341,6 +345,11 @@ table {
       width: 20rem;
     }
 
+    &.col-width-xlarge {
+      min-width: 25rem;
+      width: 30rem;
+    }
+
     &.column-6-width {
       width: 6%;
     }

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

@@ -24,7 +24,6 @@ h1 {
 }
 
 .protocol {
-
   .patient-header {
     clear: right;
     float: left;
@@ -74,14 +73,13 @@ h1 {
       th {
         font-size: 1.1rem;
         padding: 0;
-        padding-bottom: 0.4rem ;
 
         &.protocol-hd-profile {
           width: 42%;
         }
 
         &.protocol-allergies {
-          width: 18%;
+          width: 15%;
 
           .allergy_status_updated_at {
             font-weight: normal;
@@ -90,7 +88,8 @@ h1 {
         }
 
         &.protocol-prescriptions {
-          width: 25%;
+          width: 30%;
+          padding: 0;
         }
 
         &.protocol-recent-pathology {
@@ -103,7 +102,7 @@ h1 {
 
     td {
       margin: 0;
-      padding: 0 0.1rem;
+      // padding: 0 0.1rem;
       vertical-align: top;
     }
   }
@@ -218,10 +217,14 @@ h1 {
 
   table.recent-pathology {
     text-align: left;
+    border: none;
+    border-spacing: 0;
+    border-collapse: collapse;
 
     td,
     th {
-      padding-right: 0.2rem;
+      padding: 0 0.2rem !important;
+      border-bottom: solid 1px #ddd;
     }
 
     .result {
@@ -297,3 +300,39 @@ h1 {
 .nowrap {
   white-space: nowrap;
 }
+
+table.prescriptions {
+  border: none;
+  border-spacing: 0;
+  border-collapse: collapse;
+
+  thead tr th {
+    padding: 0 !important;
+  }
+  th, td {
+    padding: 0 .5rem 0 0;
+
+    &.col-width-date {
+      min-width: 7rem;
+      width: 7rem;
+    }
+  }
+  td {
+    border-top: solid 1px #ddd;
+  }
+}
+
+table.latest_dry_weight {
+  border: none;
+  border-spacing: 0;
+  border-collapse: collapse;
+  margin-top: .5rem;
+
+  thead tr th {
+    padding: 0 !important;
+  }
+
+  th, td {
+    padding: 0 .5rem 0 0;
+  }
+}

data/app/components/renalware/application_component.rb

@@ -14,7 +14,7 @@ module Renalware
     end
 
     # Added this helper as I can't seem to get the Pundit #policy helper to be included
-    # in the context when renderingt a component template.
+    # in the context when rendering a component template.
     def policy(record)
       current_user && Pundit.policy(current_user, record)
     end

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

@@ -0,0 +1,22 @@
+a.button.dropdown.with-icon(href="#"
+                            data-dropdown="hd-prescription-options"
+                            aria-controls="hd-prescription-options"
+                            aria-expanded="false")
+  i.fas.fa-capsules
+  | Record HD Drugs
+
+ul.f-dropdown#hd-prescription-options(data-dropdown-content aria-hidden="true")
+
+  - if prescriptions_to_give_on_hd.empty?
+    = dropdown_btn_item enabled: false,
+                        title: "Patient has no drugs to be given on HD",
+                        url: nil
+  - else
+    - prescriptions_to_give_on_hd.each do |prescription|
+      = dropdown_btn_item title: prescription.drug_name,
+                          url: renalware.new_hd_prescription_administration_path(prescription),
+                          data: { "reveal-id" => "hd-prescription-administration-modal",
+                          "reveal-ajax" => "true" }
+
+/ The modal dialog container for HD Prescription Administration
+#hd-prescription-administration-modal.reveal-modal.medium(data-reveal)

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Renalware
+  module HD
+    class AdministerPrescriptionDropdownComponent < ApplicationComponent
+      include DropdownButtonHelper
+      include PresenterHelper
+      attr_reader :patient
+
+      def initialize(patient:)
+        @patient = patient
+      end
+
+      def prescriptions_to_give_on_hd
+        @prescriptions_to_give_on_hd ||= begin
+          prescriptions = patient.prescriptions.includes([:drug]).to_be_administered_on_hd
+          present(prescriptions, Medications::PrescriptionPresenter)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+- 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?
+    br
+    span= "Notes: #{last_administration.notes}"

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Renalware
+  module HD
+    class PrescriptionLastAdministrationComponent < ApplicationComponent
+      attr_reader :prescription
+      validates :prescription, presence: true
+
+      def initialize(prescription:)
+        @prescription = prescription
+      end
+
+      def last_administration
+        @last_administration ||=
+          PrescriptionLastAdministrationQuery.new(prescription: prescription).call
+      end
+    end
+  end
+end

data/app/components/renalware/letters/letters_in_progress_component.html.slim

@@ -5,4 +5,4 @@ article.letters
     #letters-in-progress
       = render "renalware/dashboard/letters/table", letters: letters_in_progress
   - else
-    p.empty-section Letters in Progress
+    p.empty-section No letters in progress

data/app/components/renalware/system/admin_menu_component.html.slim

@@ -0,0 +1,25 @@
+
+ul.side-nav.side-nav--admin
+  li.heading Renalware Admin
+  = admin_menu_item "Dashboard", renalware.admin_dashboard_path, %r{admin/dashboard}
+  = admin_menu_item "Users", renalware.admin_users_path, %r{renalware/admin/users}
+  = admin_menu_item "Request Form Print History", renalware.pathology_requests_requests_path, %r{pathology/requests/requests}
+  = admin_menu_item "Pathology Request Config", renalware.pathology_requests_rules_path, %r{pathology/requests/rules}
+  = admin_menu_item "HD Transmission Logs", renalware.hd_transmission_logs_path, %r{hd/transmission_logs}
+
+  - unless Rails.env.production?
+    = super_admin_menu_item "Email Templates", renalware.system_email_templates_path, %r{system/email_templates}
+  = super_admin_menu_item "Event Types", renalware.events_types_path, %r{events/types}
+  = super_admin_menu_item "Drugs", renalware.drugs_drugs_path, %r{drugs/drugs}
+  = super_admin_menu_item "Modalities", renalware.modalities_descriptions_path, %r{modalities/descriptions}
+  = super_admin_menu_item "PD Bags", renalware.pd_bag_types_path, %r{pd/bag_types}
+  = super_admin_menu_item "Primary Care Physicians", renalware.patients_primary_care_physicians_path, %r{patients/primary_care_physicians}
+  = super_admin_menu_item "Cache", renalware.admin_cache_path, %r{admin/cache}
+  /li= link_to "File Imports", renalware.admin_feeds_files_path
+  = super_admin_menu_item "User Feedback", renalware.system_user_feedback_index_path, %r{system/user_feedback}
+  = super_admin_menu_item "System Messages", renalware.system_messages_path, %r{system/messages}
+  = super_admin_menu_item "HD Dialysates", renalware.hd_dialysates_path, %r{hd/dialysates}
+  = super_admin_menu_item "HD Dialysers", renalware.hd_dialysers_path, %r{hd/dialysers}
+  = super_admin_menu_item "HD Cannulation Types", renalware.hd_cannulation_types_path, %r{hd/cannulation_types}
+  = super_admin_menu_item "Print batches", renalware.letters_batches_path, %r{letters/batches}
+  = developer_menu_item "HL7 Test", renalware.new_feeds_hl7_test_message_path