renalware-core 2.0.105 → 2.0.106

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b9b42c69084c04d467667d66060481ae92e81db155c9324f76b23b952314c9d
-  data.tar.gz: 45fc5ad4564fd35587d7b87a2fd0f578ddd8849b07a84e8818da7d2234ece38f
+  metadata.gz: efb794ae27f5828ca612778342c373a1c21523c321b8d128fc375b599c73e6f5
+  data.tar.gz: 193b964ca2a0d8dddbe61fdf32ca7dec8a30b13d775d4f711e84f1d348adb0c5
 SHA512:
-  metadata.gz: dda5b2284b0a3fc51cd33c5df151d1949f4ac40671ef086b55fc25672259ea52f280dd59fcca51aa213b98df726306ed0fbde98560797014f2f3ca5215a82b61
-  data.tar.gz: e093eb880bb2c8b5e0c36ead99dac1736a33bdc6fa9e0e26098317714fdd55d18abf3bc25e8eb5d91c1a8879327a6b1ccb05cd32e4bfece83c8d0c1fb904c9aa
+  metadata.gz: 7897419fac1a376460c4f7e696ca853686845ba2a4c3918928dfc85964c1a3e2bede291f6db07fa7a3fef179e335fe9b0df62d8cf353278fb18a23d84b89d3fc
+  data.tar.gz: 61043d951f2a2c2194679f0ac9682ee7cb22181ebe3bbc8f51e01f2832facaaef79b8632ef34df056aa7db6c37d2ed4bc3fb2e39af17de9352ae4dbe8353ff9f

data/README.md

@@ -223,3 +223,9 @@ docker build -t renalware .
 docker-compose run web rake db:create
 docker-compose run web rake app:db:create
 ```
+
+#### Browser testing
+
+<a href="https://www.browserstack.com">
+<img alt="Browserstack logo" src="doc/Browserstack-logo.svg" width="188" height="43">
+</a>

data/app/assets/javascripts/renalware/hd.js

@@ -0,0 +1,108 @@
+/*
+  These are functions relating to the authorisation by nurse + witness of prescriptions
+  within the HD Session form.
+  TODO: This needs refactoring.
+*/
+$(document).ready(function() {
+  /*
+  If enter is pressed in a password field (out of habit as enter is oftern used when logging in,
+  after entering their password) throw it away. We could map it to a tab but frankly that gets
+  a bit complicated - see here:
+  https://stackoverflow.com/questions/2335553/jquery-how-to-catch-enter-key-and-change-event-to-tab
+  */
+  $("input.user-password").on("keypress", function(e) {
+    if (e.keyCode == 13) { return false; }
+  });
+
+  $(".hd-drug-administered input[type='radio']").on("change", function(e) {
+    var checked = ($(this).val() == "true");
+    var container = $(this).closest(".hd-drug-administration");
+    $(container).toggleClass("administered", checked)
+    $(container).toggleClass("not-administered", !checked)
+    $(container).removeClass("undecided");
+    $(".authentication", container).toggle(checked)
+    $(".authentication", container).toggleClass("disabled-with-faded-overlay", !checked)
+    $(".reason-why-not-administered", container).toggle(!checked)
+  });
+
+  $(".hd-drug-administration .authentication-user-id").on("select2:select", function(e) {
+    var container = $(this).closest(".user-and-password");
+    var topContainer = $(container).closest(".hd-drug-administration")
+    $(container).find(".authentication-token").val("")
+    $("input.user-password", container).val("");
+    $(container).removeClass("authorised");
+    var tokenCount = $(topContainer).find(".authorised").length;
+    $(topContainer).attr("data-token-count", tokenCount);
+  });
+
+
+  // When a user clicks the link to clear the authorisation (they might have used the wrong user
+  // for instance) the clear the relevant token and password fields and classes.
+  $(".hd-drug-administration .user-and-password .user-and-password--clear").on("click", function(e) {
+    e.preventDefault();
+    var container = $(this).closest(".user-and-password");
+    var topContainer = $(container).closest(".hd-drug-administration")
+    $(container).find(".authentication-token").val("")
+    $("input.user-password", container).val("");
+    $(container).removeClass("authorised");
+    var tokenCount = $(topContainer).find(".authorised").length;
+    $(topContainer).attr("data-token-count", tokenCount);
+  });
+
+  // When the user has entered a password and leaves the password field, make an ajax POST to
+  // authenticate the user and on success return an authorisation token which is added to the html
+  // form - it will be validated when the form is submitted.
+  // TODO: also do this if enter pressed while in the password field.
+  $(".user-and-password input.user-password").on("blur", function(e) {
+    var container = $(this).closest(".user-and-password");
+    var topContainer = $(container).closest(".hd-drug-administration")
+    var authUrl = $(container).closest(".authentication").data("authentication-url");
+    var userSelect = $(container).find(".authentication-user-id");
+    var userId = $(userSelect).find("option:selected").val();
+    var authorisationTokenHiddenField = $(container).find(".authentication-token");
+    var password = $(this).val();
+
+    // Prevent the a 401 xhr code from redirecting us to the login page - see ajax_errors.js
+    $(document).off('ajaxError');
+
+    if (userId && password) {
+      $.ajax({
+        async: false, /* needed as if pwd field has focus and user clicks submit, it would not wait for ajax */
+        url: authUrl,
+        type: "POST",
+        data: "[user][id]=" + userId + "&[user][password]=" + password,
+        beforeSend: function() {
+          // Add a 'working' class during ajax operations so we can show a spinner for example
+          $(container).addClass("working");
+          $(container).removeClass("error");
+          // $(".hd-session-form button[type='submit]").prop("disabled", "disabled")
+        },
+        complete: function() {
+          $(container).removeClass("working");
+          // $(".hd-session-form input[type='submit']").removeProp("disabled")
+        },
+        statusCode: {
+          200: function (token) {
+            // The user id/password combination is valid and a token has been returned.
+            // We save the token to a hidden field so it wikll be submitted in the session form.
+            $(authorisationTokenHiddenField).val(token);
+            $(container).removeClass("unauthorised").addClass("authorised").removeClass("error");
+            // $(userSelect).prop("disabled", true);
+            var tokenCount = $(topContainer).find(".authorised").length;
+            $(topContainer).attr("data-token-count", tokenCount);
+
+          },
+          401: function (data) {
+            // The user id/password combination was not valid
+            console.log('401: Unauthenticated');
+            $(authorisationTokenHiddenField).prop("value", "");
+            $(container).removeClass("authorised").addClass("error");
+
+            var tokenCount = $(topContainer).find(".authorised").length;
+            $(topContainer).attr("data-token-count", tokenCount);
+          }
+        }
+      });
+    }
+  });
+});

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

@@ -375,3 +375,207 @@ table.hd-sessions {
     margin-bottom: 0.2rem;
   }
 }
+
+/*
+For the prescription administration section in the HD Session form
+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 {
+    flex-basis: 100%;
+    display: flex; /* also a flex for items within it */
+
+    .hd-drug {
+      flex: 1;
+      padding-bottom: .5rem;
+      color: $mid-grey;
+
+      .hd-drug--name {
+        font-weight: bold;
+      }
+      .hd-drug--name,
+      .hd-drug--dose,
+      .hd-drug--route,
+      .hd-drug--prescribed-on,
+      .hd-drug--frequency {
+        display: inline-block;
+        padding-right: .5rem;
+        color: $dark-grey;
+      }
+
+      .hd-drug--prescriber-name {
+        display: inline-block;
+        color: $mid-grey;
+      }
+
+      .hd-drug--termination {
+        .hd-drug--termination-date {
+          color: $dark-grey;
+          display: inline-block;
+          color: $dark-grey;
+          padding: 0 .3rem;
+        }
+      }
+    }
+
+    /*
+    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;
+      }
+    }
+  }
+
+  .reason-why-not-administered {
+    display: none;
+  }
+
+  &.undecided {
+    .authentication {
+      display: block;
+    }
+  }
+
+  &.administered {
+    border-right-color: $nhs-red;
+
+    /* The 'status' values for the prescription-administration */
+    &[data-token-count='2'] {
+      border-right-color: $nhs-green;
+    }
+  }
+
+  &.not-administered {
+    .authentication {
+      display: none;
+    }
+
+    .reason-why-not-administered {
+      display: block;
+    }
+  }
+
+  .small-input {
+    max-width: inherit !important;
+  }
+
+  .notes {
+    flex: 1;
+    margin-right: 1rem;
+
+    textarea {
+      height: 5.2rem;
+    }
+
+    @media screen and (max-width: 768px) {
+      // As the screen shrinks, put the user/password boxes under the notes
+      flex-basis: 100%;
+    }
+  }
+
+  /* this section contains select2 inputs and pwd fields for the 2 users */
+  .authentication {
+    flex-basis: 330px;
+    flex-grow: 0;
+
+    // Addinng the disabled-with-faded-overlay class to authentication adds a semi transparent overlay
+    // that indicates the section is no receiving input ie because the drug has been marked
+    // as not administered.
+    &.disabled-with-faded-overlay {
+      position: relative;
+    }
+
+    &.disabled-with-faded-overlay:after {
+      content: " ";
+      z-index: 10;
+      display: block;
+      position: absolute;
+      height: 100%;
+      top: 0;
+      left: 0;
+      right: 0;
+      background: rgba(255, 255, 255, 0.5);
+    }
+
+    .user-and-password {
+      display: inline-block;
+      width: 50%;
+      padding-right: 1rem;
+      vertical-align: top;
+
+      .select2-container--default.select2-container--disabled .select2-selection--single {
+        background-color: $white;
+      }
+
+      .spinner {
+        display: none;
+      }
+
+      &.working {
+        .spinner {
+          display: inline-block;
+        }
+
+        .user-password  {
+          background: $mid-grey;
+        }
+
+      }
+
+      .error.invalid-password {
+        display: none;
+      }
+
+      &.error {
+        small.error {
+          display: block;
+        }
+      }
+
+      .select2 {
+        // margin-bottom: 0.75rem;
+      }
+
+      .user-password {
+        margin-bottom: 0;
+      }
+
+      .confirmed {
+        display: none;
+        text-align: center;
+
+        i {
+          font-size: 1.6rem;
+          color: $nhs-green;
+        }
+
+        a {
+          margin-left: .4rem;
+        }
+      }
+
+      &.authorised {
+        .user-password {
+          display: none
+        }
+
+        .confirmed {
+          display: block;
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/hd/base_controller"
+
+module Renalware
+  module HD
+    class PrescriptionAdministrationAuthorisationsController < BaseController
+      skip_after_action :verify_authorized
+
+      def create
+        user = User.find(auth_params[:id])
+        if user.valid_password?(auth_params[:password])
+          render status: :ok, plain: user.auth_token
+        else
+          # head :bad_request
+          head :unauthorized
+        end
+      end
+
+      private
+
+      def auth_params
+        params.require(:user).permit(:id, :password)
+      end
+    end
+  end
+end

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

@@ -5,6 +5,7 @@ require "collection_presenter"
 
 module Renalware
   module HD
+    # rubocop:disable Metrics/ClassLength
     class SessionsController < BaseController
       include PresenterHelper
       include Renalware::Concerns::Pageable
@@ -45,6 +46,14 @@ module Renalware
 
       def edit
         session = Session.for_patient(patient).find(params[:id])
+        session.prescription_administrations.each do |a|
+          if a.administrator_authorised?
+            a.administrator_authorisation_token = a.administered_by&.auth_token
+          end
+          if a.witness_authorised?
+            a.witness_authorisation_token = a.witnessed_by&.auth_token
+          end
+        end
         authorize session
         render :edit, locals: locals(session)
       rescue Pundit::NotAuthorizedError
@@ -65,8 +74,7 @@ module Renalware
       end
 
       def save_session
-        command = Sessions::SaveSession.new(patient: patient,
-                                            current_user: current_user)
+        command = Sessions::SaveSession.new(patient: patient, current_user: current_user)
         command.subscribe(self)
         command.call(params: session_params,
                      id: params[:id],
@@ -124,7 +132,9 @@ module Renalware
          :hospital_unit_id, :notes, :dialysate_id,
          :signed_on_by_id, :signed_off_by_id, :type,
          prescription_administrations_attributes: [
-           :id, :hd_session_id, :prescription_id, :administered, :notes
+           :id, :hd_session_id, :prescription_id, :administered, :notes,
+           :administered_by_id, :administrator_authorisation_token,
+           :witnessed_by_id, :witness_authorisation_token, :reason_id
          ],
          document: []]
       end
@@ -136,5 +146,6 @@ module Renalware
           .try(:permit!)
       end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

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

@@ -7,7 +7,6 @@ module Renalware
     class MDMPatientsQuery
       include ModalityScopes
       include PatientPathologyScopes
-      MODALITY_NAMES = "HD"
       DEFAULT_SEARCH_PREDICATE = "hgb_date desc"
       attr_reader :params, :named_filter
 
@@ -35,7 +34,7 @@ module Renalware
             .extending(NamedFilterScopes)
             .with_current_pathology
             .with_registration_statuses
-            .with_current_modality_matching(MODALITY_NAMES)
+            .with_current_modality_of_class(Renalware::HD::ModalityDescription)
             .public_send(named_filter.to_s)
             .ransack(params)
         end

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

@@ -6,14 +6,62 @@ module Renalware
   module HD
     class PrescriptionAdministration < ApplicationRecord
       include Accountable
+      attr_accessor :administrator_authorisation_token
+      attr_accessor :witness_authorisation_token
 
       # Set to true by the parent hd_session if we are not signing off at this stage
       attr_accessor :skip_validation
 
       belongs_to :hd_session, class_name: "HD::Session", touch: true
       belongs_to :prescription, class_name: "Medications::Prescription"
+      belongs_to :administered_by, class_name: "User"
+      belongs_to :witnessed_by, class_name: "User"
+      belongs_to :reason, class_name: "PrescriptionAdministrationReason"
       validates :administered, inclusion: { in: [true, false] }, unless: :skip_validation
       validates :prescription, presence: true
+      validates :administered_by, presence: true, if: :validate_administrator_and_witness?
+      validates :witnessed_by, presence: true, if: :validate_administrator_and_witness?
+      validate :check_administrator_authorisation_token
+      validate :check_witness_authorisation_token
+
+      private
+
+      def validate_administrator_and_witness?
+        return false if skip_validation || not_administered?
+
+        true
+      end
+
+      def check_administrator_authorisation_token
+        verify_submitted_user_token(
+          administered_by,
+          administrator_authorisation_token,
+          :administrator_authorisation_token
+        )
+      end
+
+      def check_witness_authorisation_token
+        verify_submitted_user_token(
+          witnessed_by,
+          witness_authorisation_token,
+          :witness_authorisation_token
+        )
+      end
+
+      def verify_submitted_user_token(user, token, error_key)
+        return if skip_validation
+        return if user.blank? || not_administered?
+
+        if token.blank?
+          errors[error_key] << "can't be blank"
+        elsif user.auth_token != token
+          errors[error_key] << "invalid token"
+        end
+      end
+
+      def not_administered?
+        administered.nil? || administered == false
+      end
     end
   end
 end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/hd"
+
+module Renalware
+  module HD
+    class PrescriptionAdministrationReason < ApplicationRecord
+    end
+  end
+end

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

@@ -66,7 +66,10 @@ module Renalware
         return unless session.new_record?
 
         patient.prescriptions.to_be_administered_on_hd.map do |prescription|
-          session.prescription_administrations.build(prescription: prescription)
+          session.prescription_administrations.build(
+            prescription: prescription,
+            administered_by: user
+          )
         end
       end
 

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

@@ -26,6 +26,13 @@ module Renalware
           session = find_or_build_session(id)
           session = update_session_attributes(session, signing_off)
 
+          session.prescription_administrations.each do |pa|
+            pa.administrator_authorised =
+              (pa.administrator_authorisation_token == pa.administered_by&.auth_token)
+            pa.witness_authorised =
+              (pa.witness_authorisation_token == pa.witnessed_by&.auth_token)
+          end
+
           if session.save
             # Might be cleaner if something listened for this event and created this job there?
             UpdateRollingPatientStatisticsJob.perform_later(patient) unless session.open?

data/app/models/renalware/pd/mdm_patients_query.rb

@@ -5,7 +5,6 @@ module Renalware
     class MDMPatientsQuery
       include ModalityScopes
       include PatientPathologyScopes
-      MODALITY_NAMES = "PD"
       DEFAULT_SEARCH_PREDICATE = "hgb_date desc"
       attr_reader :q, :relation, :named_filter
 
@@ -28,7 +27,7 @@ module Renalware
             .extending(ModalityScopes)
             .extending(PatientPathologyScopes)
             .extending(NamedFilterScopes)
-            .with_current_modality_matching(MODALITY_NAMES)
+            .with_current_modality_of_class(Renalware::PD::ModalityDescription)
             .with_current_pathology
             .with_registration_statuses
             .left_outer_joins(:current_observation_set)

data/app/models/renalware/renal/registry/preflight_checks/deaths_query.rb

@@ -8,7 +8,6 @@ module Renalware
       module PreflightChecks
         class DeathsQuery
           include ModalityScopes
-          MODALITY_NAMES = %w(Death).freeze
 
           attr_reader :relation, :query_params
 
@@ -27,7 +26,7 @@ module Renalware
               .result
               .extending(ModalityScopes)
               .preload(current_modality: [:description])
-              .with_current_modality_matching(MODALITY_NAMES)
+              .with_current_modality_of_class(Renalware::Deaths::ModalityDescription)
               .where("patients.first_cause_id is NULL AND renal_profiles.esrf_on IS NOT NULL")
           end
 

data/app/models/renalware/transplants/mdm_patients_query.rb

@@ -9,7 +9,6 @@ module Renalware
     class MDMPatientsQuery
       include ModalityScopes
       include PatientPathologyScopes
-      MODALITY_NAMES = "Transplant"
       DEFAULT_SEARCH_PREDICATE = "hgb_date DESC"
       attr_reader :q, :relation, :named_filter
 
@@ -31,7 +30,7 @@ module Renalware
             .extending(ModalityScopes)
             .extending(PatientPathologyScopes)
             .extending(NamedFilterScopes)
-            .with_current_modality_matching(MODALITY_NAMES)
+            .with_current_modality_of_class(Transplants::RecipientModalityDescription)
             .with_current_pathology
             .left_outer_joins(:current_observation_set)
             .public_send(named_filter.to_s)

data/app/models/renalware/user.rb

@@ -75,6 +75,19 @@ module Renalware
       end
     end
 
+    # Create a sha that can be saved in another model to indicate a user has authenticated
+    # (or perhaps more correctly, authorised) an action - e.g. in HD Session form where a nurse
+    # and witness both enter their credentials against a prescription administered on HD.
+    # The idea is that we can check the token belongs to the user buy regenerating the token at any
+    # time and checking it still matches. Unlike Devise.friendly_token, we can always regenerate
+    # the same token here for any user as it is salted with the same secret. This secret is not
+    # stored git for staging and production environments.
+    def auth_token
+      digest = OpenSSL::Digest.new("sha256")
+      key = Rails.application.secrets.secret_key_base
+      OpenSSL::HMAC.hexdigest(digest, key, id.to_s)
+    end
+
     private
 
     def build_authentication_token

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

@@ -152,6 +152,11 @@ module Renalware
         return parts.last if parts.length > 1
       end
 
+      # Ensure drug administrations are always in the same order.
+      def prescription_administrations
+        __getobj__.prescription_administrations.order(created_at: :asc)
+      end
+
       protected
 
       attr_reader :session, :view_context

data/app/views/renalware/api/ukrdc/patients/_clinic_visit_observation.xml.builder

@@ -9,8 +9,7 @@ xml.Observation do
   xml.ObservationTime visit.datetime
 
   xml.ObservationCode do
-    # xml.CodingStandard "2.16.840.1.113883.4.642.2.115"
-    xml.CodingStandard "PV"
+    xml.CodingStandard "UKRR"
     xml.Code I18n.t("loinc.#{i18n_key}.code")
     xml.Description I18n.t("loinc.#{i18n_key}.description")
   end

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

@@ -124,18 +124,9 @@ ruby:
         = fcm.input :subs_goal, wrapper: :horizontal_tiny
         = fcm.input :subs_volume, wrapper: :horizontal_tiny
 
-    = render layout: "renalware/shared/fieldset",
-        locals: { legend: "HD Drugs", name: "hd_prescriptions" } do
-
-        = f.simple_fields_for :prescription_administrations,
-                              f.object.prescription_administrations do |fpa|
-
-          - presenter = Renalware::Medications::PrescriptionPresenter.new(fpa.object.prescription)
-          b= "#{presenter.drug_name}"
-          span= "#{presenter.dose} #{presenter.frequency}"
-          = fpa.input :prescription_id, as: :hidden
-          = fpa.input :administered, as: :inline_radio_buttons
-          = fpa.input :notes, input_html: { class: "small-input" }
+    = render "renalware/hd/sessions/form/drugs_to_be_administered",
+             f: f,
+             prescription_administrations: f.object.prescription_administrations
 
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Notes/Complications", name: "complications" } do

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

@@ -1,19 +1,20 @@
-= f.button :submit,
-            value: t(".save"),
-            data: { disable_with: t(".save_disable_with") },
-            class: "button secondary"
-|  
-= f.button :submit,
-          as: :ssdsdsd,
-           name: "signoff",
-           value: t(".signoff"),
-           data: { disable_with: t(".signoff_disable_with") }
-- if policy(session).destroy?
+.hd-session-form-actions
+  = f.button :submit,
+              value: t(".save"),
+              data: { disable_with: t(".save_disable_with") },
+              class: "button secondary"
   |  
-  = link_to("Delete", patient_hd_session_path(patient, session),
-            data: { confirm: t(".delete_confirmation") },
-            method: :delete,
-            class: "button alert")
-|  
-span= " or "
-= link_to "cancel", back_path
+  = f.button :submit,
+            as: :ssdsdsd,
+            name: "signoff",
+            value: t(".signoff"),
+            data: { disable_with: t(".signoff_disable_with") }
+  - if policy(session).destroy?
+    |  
+    = link_to("Delete", patient_hd_session_path(patient, session),
+              data: { confirm: t(".delete_confirmation") },
+              method: :delete,
+              class: "button alert")
+  |  
+  span= " or "
+  = link_to "cancel", back_path

data/app/views/renalware/hd/sessions/form/_drugs_to_be_administered.html.slim

@@ -0,0 +1,84 @@
+= render layout: "renalware/shared/fieldset",
+         locals: { legend: "HD Drugs", name: "hd_prescriptions" } do
+
+  .hd-drug-administrations
+    = f.simple_fields_for :prescription_administrations,
+                          prescription_administrations do |fpa|
+
+        - prescription = Renalware::Medications::PrescriptionPresenter.new(fpa.object.prescription)
+        - administration = fpa.object
+
+        / There are three possible states for a drug administration:
+        / 1. administration.administered == nil -> no decision has been made
+        / 2. administration.administered == false -> drug was not administered
+        / 3. administration.administered == true -> drug was administered
+        ruby:
+          administration_klass = case administration.administered
+                                 when true then "administered"
+                                 when false then "not-administered"
+                                 else "undecided"
+                                 end
+          # administration_klass = "not-administered" unless administration.administered?
+          #- administration_klass = "undecided" if administration.administered.nil?
+        .hd-drug-administration(
+          data-token-count="#{'2' if administration.administrator_authorised? && administration.witness_authorised?}"
+          class="#{administration_klass}"
+        )
+          .summary
+            .hd-drug
+              .hd-drug--name= prescription.drug_name
+              .hd-drug--dose= prescription.dose
+              .hd-drug--route= prescription.route_code
+              .hd-drug--frequency= prescription.frequency
+              .hd-drug--prescribed-on= l(prescription.prescribed_on)
+              .hd-drug--prescriber-name= prescription.updated_by
+
+              - if prescription.terminated_on.present?
+                .hd-drug--termination
+                  | Terminates
+                  .hd-drug--termination-date= l(prescription.terminated_on)
+
+            .hd-drug-administered
+              = fpa.input :administered, as: :inline_radio_buttons
+
+            = fpa.input :prescription_id, as: :hidden
+
+          .notes
+            = fpa.label :notes
+            = fpa.input :notes, label: false, wrapper: :zilch, input_html: { rows: 2 }
+
+          .reason-why-not-administered
+            = fpa.label :reason_id
+            = fpa.association :reason, wrapper: :zilch
+
+          .authentication(
+            class="#{'disabled-with-faded-overlay' unless administration.administered?}"
+            data-authentication-url=renalware.hd_prescription_administration_authorisations_path
+          )
+            / Output username and password fields for administrator and witness
+            - { administrator: :administered, witness: :witnessed }.each do |user_role, prefix|
+
+              - authorised = administration.public_send(:"#{user_role}_authorised?")
+              - token_symbol = :"#{user_role}_authorisation_token"
+              .user-and-password(
+                class="user-and-password--#{user_role} #{'authorised' if authorised} #{'error' if fpa.object.errors[token_symbol].any?}"
+              )
+                = fpa.hidden_field token_symbol, class: "authentication-token"
+                = fpa.label :"#{prefix}_by"
+                = fpa.association :"#{prefix}_by",
+                                  as: :user_picker,
+                                  collection: Renalware::User.ordered,
+                                  wrapper: :zilch,
+                                  label: false,
+                                  input_html: { class: "authentication-user-id" }
+
+                / Password is only visible as long as the user has not been authenticated
+                = password_field_tag :"#{prefix}_by_password",
+                                      "",
+                                      placeholder: "Password",
+                                      class: "user-password",
+                                      autocomplete: :off
+                small.error.invalid-password Invalid password
+                .confirmed
+                  i.fas.fa-check-circle
+                  = link_to "Clear", "#", class: "user-and-password--clear"

data/app/views/renalware/hospitals/units/index.html.slim

@@ -31,7 +31,7 @@
           td= unit.unit_code
           td= unit.name
           td= unit.hospital_centre
-          td= unit.unit_type.text
+          td= unit.unit_type&.text
           td= unit.renal_registry_code
           td= yes_no unit.is_hd_site
           td= Renalware::HD::Station.where(hospital_unit_id: unit.id).count

data/app/views/renalware/transplants/registration_statuses/_list.html.slim

@@ -19,14 +19,6 @@ article.status-history.secondary
       - registration.statuses.reversed.each do |status|
         tr
           td
-            = link_to "Edit",
-                edit_patient_transplants_registration_status_path(patient, status)
-            = pipe_separator
-            = link_to "Delete",
-                patient_transplants_registration_status_path(patient, status),
-                method: :delete,
-                data: { confirm: I18n.t("prompts.confirm_delete") }
-            = pipe_separator
             = link_to("Toggle",
                       "#status-quick-preview-#{status.id}",
                       data: { behaviour: "toggler" })

data/config/initializers/simple_form_foundation.rb

@@ -91,6 +91,24 @@ SimpleForm.setup do |config|
     end
   end
 
+  config.wrappers :zilch,
+                  tag: "div",
+                  hint_class: :field_with_hint,
+                  error_class: :error do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+
+    b.wrapper :right_input_wrapper, tag: :div, class: "" do |ba|
+      ba.use :input
+      ba.use :error, wrap_with: { tag: :small, class: ["error", "small-input"] }
+      ba.use :hint,  wrap_with: { tag: :span, class: ["hint", "small-input"] }
+    end
+  end
+
   config.wrappers :horizontal_medium,
                   tag: "div",
                   class: "row",

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

@@ -3,6 +3,11 @@ en:
     attributes:
       renalware/hd/prescription_administration:
         administered: Administered
+        administered_by: Nurse
+        witnessed_by: Witness
+        witnessed_by_password: Password
+        administered_by_password: Password
+        reason_id: Reason not administered
     errors:
       models:
         renalware/hd/prescription_administration:

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

@@ -15,7 +15,7 @@ en:
         aki_alerts: AKI Alerts
         studies: Clinical Studies
         renal_registry_checks: Renal Registry Checks
-        hospital_units: Hospitals
+        hospital_units: Dialysis Units
       mdms:
         menu_title: MDMs
         hd: HD

data/config/routes/hd.rb

@@ -26,6 +26,7 @@ namespace :hd do
     get "patients_dialysing_at_hospital" => "patients#dialysing_at_hospital"
   end
 
+  resources :prescription_administration_authorisations, only: :create
   resources :transmission_logs, only: [:show, :index]
   resources :cannulation_types, except: :show
   resources :dialysers, except: :show

data/db/migrate/20190624130020_add_authentication_to_hd_prescription_administrations.rb

@@ -0,0 +1,16 @@
+class AddAuthenticationToHDPrescriptionAdministrations < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_reference :hd_prescription_administrations,
+                    :administered_by,
+                    foreign_key: { to_table: :users },
+                    index: true,
+                    null: true
+      add_reference :hd_prescription_administrations,
+                    :witnessed_by,
+                    foreign_key: { to_table: :users },
+                    index: true,
+                    null: true
+    end
+  end
+end

data/db/migrate/20190627141751_add_tokens_to_hd_prescription_administrations.rb

@@ -0,0 +1,22 @@
+class AddTokensToHDPrescriptionAdministrations < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      # add_column :hd_prescription_administrations, :administrator_authorisation_token, :string
+      # add_column :hd_prescription_administrations, :witness_authorisation_token, :string
+      add_column(
+        :hd_prescription_administrations,
+        :administrator_authorised,
+        :boolean,
+        default: false,
+        null: false
+      )
+      add_column(
+        :hd_prescription_administrations,
+        :witness_authorised,
+        :boolean,
+        default: false,
+        null: false
+      )
+    end
+  end
+end

data/db/migrate/20190716125837_create_hd_prescription_administration_reasons.rb

@@ -0,0 +1,17 @@
+class CreateHDPrescriptionAdministrationReasons < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      create_table :hd_prescription_administration_reasons do |t|
+        t.string :name, null: false, index: { unique: true }
+        t.timestamps null: false
+      end
+
+      add_reference(
+        :hd_prescription_administrations,
+        :reason,
+        foreign_key: { to_table: :hd_prescription_administration_reasons },
+        index: true
+      )
+    end
+  end
+end

data/db/seeds/default/hd/prescription_administration_reasons.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Renalware
+  log "Adding HD Prescription Administration Reasons" do
+    [
+      "No supply available",
+      "Target HB exceeded",
+      "Patient refused",
+      "Patient unwell",
+      "Patient received blood transfusion",
+      "Wrong dose / route"
+    ].each do |reason|
+      HD::PrescriptionAdministrationReason.find_or_create_by!(name: reason)
+    end
+  end
+end

data/db/seeds/default/hd/seeds.rb

@@ -2,3 +2,4 @@
 
 require_relative "./cannulation_types"
 require_relative "./dialysers"
+require_relative "./prescription_administration_reasons.rb"

data/lib/renalware/version.rb

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

data/spec/factories/transplants/modality_descriptions.rb

@@ -6,7 +6,12 @@ FactoryBot.define do
     name { "Live Donor" }
   end
 
-  factory :transplant_modality_description, class: "Renalware::HD::ModalityDescription" do
-    initialize_with { Renalware::HD::ModalityDescription.find_or_create_by(name: "Transplant") }
+  factory(
+    :transplant_modality_description,
+    class: "Renalware::Transplants::RecipientModalityDescription"
+  ) do
+    initialize_with do
+      Renalware::Transplants::RecipientModalityDescription.find_or_create_by(name: "Transplant")
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.105
+  version: 2.0.106
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -999,6 +999,7 @@ files:
 - app/assets/javascripts/renalware/events.js
 - app/assets/javascripts/renalware/forms.js
 - app/assets/javascripts/renalware/full_screen.js
+- app/assets/javascripts/renalware/hd.js
 - app/assets/javascripts/renalware/iframe.js
 - app/assets/javascripts/renalware/keyboard_shortcuts.js
 - app/assets/javascripts/renalware/layout.js
@@ -1152,6 +1153,7 @@ files:
 - app/controllers/renalware/hd/ongoing_sessions_controller.rb
 - app/controllers/renalware/hd/patients_controller.rb
 - app/controllers/renalware/hd/preference_sets_controller.rb
+- app/controllers/renalware/hd/prescription_administration_authorisations_controller.rb
 - app/controllers/renalware/hd/protocols_controller.rb
 - app/controllers/renalware/hd/sessions_controller.rb
 - app/controllers/renalware/hd/stations_controller.rb
@@ -1497,6 +1499,7 @@ files:
 - app/models/renalware/hd/patients_with_unmet_preferences_query.rb
 - app/models/renalware/hd/preference_set.rb
 - app/models/renalware/hd/prescription_administration.rb
+- app/models/renalware/hd/prescription_administration_reason.rb
 - app/models/renalware/hd/profile.rb
 - app/models/renalware/hd/profile_for_modality.rb
 - app/models/renalware/hd/profiles_in_date_range_query.rb
@@ -2357,6 +2360,7 @@ files:
 - app/views/renalware/hd/sessions/dna/_row.html.slim
 - app/views/renalware/hd/sessions/dna/_show.html.slim
 - app/views/renalware/hd/sessions/edit.html.slim
+- 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/_form.html.slim
@@ -3534,9 +3538,12 @@ files:
 - db/migrate/20190611152859_add_fields_to_transplant_recipient_workup.rb
 - db/migrate/20190612124015_create_transplant_rejection_episodes.rb
 - db/migrate/20190617121528_create_transplant_rejection_treatments.rb
+- db/migrate/20190624130020_add_authentication_to_hd_prescription_administrations.rb
+- db/migrate/20190627141751_add_tokens_to_hd_prescription_administrations.rb
 - db/migrate/20190705083727_alter_ukrdc_treatments.rb
 - db/migrate/20190705105921_create_hd_profile_for_modalites.rb
 - db/migrate/20190709101610_create_pd_regime_for_modalities.rb
+- db/migrate/20190716125837_create_hd_prescription_administration_reasons.rb
 - db/migrate/20190718091430_add_code_to_modality_descriptions.rb
 - db/migrate/20190718095851_add_discharge_reason_code_to_ukrdc_treatments.rb
 - db/migrate/20190722145936_change_type_of_patients_ukrdc_external_id.rb
@@ -3572,6 +3579,7 @@ files:
 - db/seeds/default/hd/cannulation_types.rb
 - db/seeds/default/hd/dialysers.csv
 - db/seeds/default/hd/dialysers.rb
+- db/seeds/default/hd/prescription_administration_reasons.rb
 - db/seeds/default/hd/seeds.rb
 - db/seeds/default/housekeeping.rb
 - db/seeds/default/letters/seeds.rb