renalware-core 2.0.0.pre.rc3 → 2.0.0.pre.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c3c267233dd81ec4b3886e524d833d785dc3a371
-  data.tar.gz: cdcad7175c0fe8258a43f4dced4e0d3f159683bc
+SHA256:
+  metadata.gz: 2adae7283349900967b688b6e5540a25f5f92bedfd851bc4c1ee4867d714cb9c
+  data.tar.gz: 1f294a120860167a97636ff519da463df2503391821c9ca8129dc60177796dcc
 SHA512:
-  metadata.gz: f0ec0bdf814791b21874625beaa39075fdee412a80e615bb30c61b206ebcf90f79f7bae00a6c898c83b72af690be3d4a0f65b94fca139aba357fab10af1193c1
-  data.tar.gz: a06f5d25faccc97b6374a910b9d3cd4ecf8c23a493bf329dc85e3ab8920cd0c203fbfecb251d60c3ac833b7dce6adb510a7fbf54db9403807c2eab14bbbc6abe
+  metadata.gz: df23ef342eff7ef9344655965caae92a6bb1350936ffef3dacbf4f5889db2a2cfeb7453349383d6f58c3d0f9df8c0a4397cbf9cd0d1d9e8413c3581a051dcdc7
+  data.tar.gz: 7b618ddc3af4f1b0359001feaad0c3ae535b49dd1f5072a967e920f267038e6fdc6e7bd879cdf234c05d3a41183c6fd1d1ee3f4bc41aef163c5d95f9e2ae18e1

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2016 Airslie Ltd
+Copyright (c) 2017 Airslie Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -215,3 +215,4 @@ docker build -t renalware .
 docker-compose run web rake db:create
 docker-compose run web rake app:db:create
 ```
+

data/app/assets/javascripts/renalware/session_timeout_redirect.js.erb

@@ -18,7 +18,9 @@ $(document).ready(function() {
     if(window.location.pathname != login_path) {
       $.getScript("<%= Renalware::Engine.routes.url_helpers.session_timed_out_path %>")
        .fail(function(jqxhr, settings, exception) {
-         console.log("Failed to query for session timeout");
+         <% unless Rails.env.test? %>
+           console.log("Failed to query for session timeout");
+         <% end %>
        });
     }
   };

data/app/assets/stylesheets/renalware/base/_variables.scss

@@ -53,6 +53,8 @@ $mid-grey: #999;
 $very-light-grey: #f5f5f5;
 $error-background: $off-white;
 $almost-white: rgb(252, 252, 252);
+$light-yellow: #fff066;
+$light-green: #00e658;
 
 // Drug type colours
 $drug-type-default-colour: none;

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

@@ -1,3 +1,24 @@
+.admissions-table table {
+  td, th {
+    vertical-align: top;
+  }
+
+  th.subhead {
+    color: $black;
+    text-align: center;
+
+    &.admission {
+      background-color: $light-yellow;
+      text-shadow: lighten($light-yellow, 20) .05rem .05rem;
+    }
+
+    &.discharge {
+      background-color: $light-green;
+      text-shadow: lighten($light-green, 20) .05rem .05rem
+    }
+  }
+}
+
 #admissions-request-modal {
   .admissions-request-patient {
     margin-bottom: 1rem;
@@ -38,28 +59,3 @@
   }
 }
 
-.admissions-consults-table {
-  tbody tr td:last-child {
-    padding-top: 0.3rem;
-    padding-bottom: 0.3rem;
-    padding-right: 0;
-  }
-
-  td {
-    .button.dropdown {
-      padding: .2rem 2.3rem .2rem .4rem;
-      margin: 0;
-    }
-    .f-dropdown {
-      margin-left: -110px;
-
-      &.open::before,
-      &.open::after {
-        left: 160px;
-      }
-    }
-    .button-group {
-
-    }
-  }
-}

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

@@ -0,0 +1,27 @@
+.feeds-files {
+  td {
+    vertical-align: top;
+  }
+
+  .status span {
+    color: $white;
+    border-radius: 0.3rem;
+    padding: .2rem .5rem;
+  }
+
+  .waiting .status span {
+    background-color: $muted-dark-grey;
+  }
+
+  .processing .status span {
+    background-color: $nhs-warm-yellow;
+  }
+
+  .failure .status span {
+    background-color: $nhs-red;
+  }
+
+  .success .status span {
+    background-color: $nhs-green;
+  }
+}

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

@@ -1,3 +1,7 @@
+table.contacts tbody td{
+  vertical-align: top;
+}
+
 .electronic-ccs {
   ul.actions {
     list-style: none;

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

@@ -118,7 +118,7 @@ ul.provider {
 
 .page-heading {
   float: left;
-  margin: 1rem 0 1.5rem;
+  margin: 0.5rem 0 1rem;
   width: 100%;
 
   & > li {
@@ -299,16 +299,19 @@ ul.provider {
   clear: both;
   height: 2rem;
   padding: 0.4em 0.2em 0.5em 0.6em;
-  background-color: $table-toggled-content-colour;
-  border-bottom: dotted 1px $light-grey;
+  background-color: $nhs-orange;
+  color: $white;
 
   &:hover {
-    background-color: lighten($table-toggled-content-colour, 5);
+    background-color: lighten($nhs-orange, 5);
+  }
+
+  td, td.actions a {
+    color: inherit;
   }
 
   td {
     border: 0;
-    border-top: dotted 1px $light-grey;
   }
 
   .icon {
@@ -320,6 +323,10 @@ ul.provider {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+
+    &:before {
+      content: "Alert: ";
+    }
   }
 
   .author {
@@ -330,26 +337,20 @@ ul.provider {
   .actions {
     width: 3rem;
     padding-right: 1rem;
-
-    a {
-      color: $dark-grey;
-    }
   }
 
   &.urgent {
-    background-color: $nhs-yellow;
+    background-color: $nhs-red;
 
     &:hover {
-      background-color: lighten($nhs-yellow, 5);
+      background-color: lighten($nhs-red, 5);
     }
   }
 
-  &.urgent {
-    .icon {
-      @extend .fa;
-      @extend .fa-warning;
-      display: table-cell;
-    }
+  .icon {
+    @extend .fa;
+    @extend .fa-warning;
+    display: table-cell;
   }
 }
 

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

@@ -1,3 +1,11 @@
+.current-regime {
+  h3 {
+    font-size: 1rem;
+    font-weight: bold;
+    margin: 0.5rem 0 0.2em;
+  }
+}
+
 .regime-bags {
   dl {
     display: inline;

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

@@ -46,6 +46,9 @@
     dt {
       width: $dl-horizontal-dt-width + 5.5rem;
     }
+    dd {
+      margin-left: $dl-horizontal-dt-width + 6.5rem;
+    }
   }
 
   &.xxlarge {

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

@@ -3,10 +3,16 @@
     border-bottom: solid 1px $winter-sky;
     margin-bottom: 10px;
 
-    h1, h2 {
+    h1, h2, h3 {
       margin: 0 0 0.5rem 0;
       font-size: 1.3rem;
       color: $dark-grey;
+      display: inline-block;
+    }
+
+    h3 {
+      font-weight: normal;
+      color: $dashboard-muted-color;
     }
 
     .reveal-modal-close {

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

@@ -65,7 +65,7 @@ dd.patient-name {
 .patient-side-nav {
   background-color: $patient-menu-background-colour;
   padding: 0.6rem 0;
-  padding-bottom: 8rem;
+  padding-bottom: 11rem;
   position: absolute;
   width: $patient-side-nav-width;
   overflow-y: auto;
@@ -87,7 +87,7 @@ dd.patient-name {
 
       a {
         border-radius: 3px;
-        padding: 0.2rem 0.5rem;
+        padding: 0.1rem 0.5rem;
         text-decoration: underline;
         color: $nhs-blue;
       }

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

@@ -1,4 +1,24 @@
 
+table td.actions-dropdown {
+  padding-top: 0.3rem;
+  padding-bottom: 0.3rem;
+  padding-right: 0;
+
+  .button.dropdown {
+    padding: .2rem 2.3rem .2rem .4rem;
+    margin: 0;
+  }
+
+  .f-dropdown {
+    margin-left: -110px;
+
+    &.open::before,
+    &.open::after {
+      left: 160px;
+    }
+  }
+}
+
 table {
   // This will have to be removed at some point to comply with NHS table guidelines
   width: 100%;

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

@@ -61,3 +61,7 @@ span.note {
   padding: 0;
   font-size: 1rem;
 }
+
+.muted {
+  color: $dashboard-muted-color;
+}

data/app/controllers/renalware/admin/feeds/files_controller.rb

@@ -0,0 +1,49 @@
+require "fileutils"
+
+module Renalware
+  module Admin
+    module Feeds
+      class FilesController < BaseController
+        include Renalware::Concerns::Pageable
+
+        def index
+          authorize files
+          render locals: {
+            files: files,
+            uploaded_file: Renalware::Feeds::Files::FileUploadForm.new
+          }
+        end
+
+        def create
+          authorize Renalware::Feeds::File, :create?
+          form = Renalware::Feeds::Files::FileUploadForm.new(file_upload_params)
+
+          if form.valid?
+            file = Renalware::Feeds::Files::CreateFeedFile.call(
+              uploaded_file: Pathname.new(form.file.path),
+              file_type: Renalware::Feeds::FileType.find(form.file_type_id),
+              user: current_user
+            )
+            Renalware::Feeds::Files::EnqueueFileForBackgroundProcessing.call(file)
+            redirect_to(
+              admin_feeds_files_path,
+              notice: "File #{form.file.original_filename} queued for processing"
+            )
+          else
+            render :index, locals: { files: files, uploaded_file: form }
+          end
+        end
+
+        private
+
+        def files
+          @files ||= Renalware::Feeds::File.ordered.page(page).per(per_page)
+        end
+
+        def file_upload_params
+          params.require(:file_upload).permit(:file, :file_type_id)
+        end
+      end
+    end
+  end
+end

data/app/controllers/renalware/admissions/admissions_controller.rb

@@ -0,0 +1,101 @@
+require "renalware/admissions"
+require "collection_presenter"
+
+module Renalware
+  module Admissions
+    class AdmissionsController < BaseController
+      include Renalware::Concerns::Pageable
+
+      def index
+        admissions = search_form.submit.page(page).per(per_page)
+        authorize admissions
+
+        render locals: {
+          admissions: CollectionPresenter.new(admissions, AdmissionPresenter),
+          form: search_form
+        }
+      end
+
+      def new
+        admission = Admission.new(admitted_on: Time.zone.today)
+        authorize admission
+        render_new(admission)
+      end
+
+      def create
+        admission = build_admission
+        authorize admission
+        if admission.save_by(current_user)
+          redirect_to admissions_admissions_path, notice: success_msg_for("admission")
+        else
+          render_new(admission)
+        end
+      end
+
+      def edit
+        render_edit(find_and_authorize_admission)
+      end
+
+      def update
+        admission = find_and_authorize_admission
+        if admission.update_by(current_user, admission_params)
+          redirect_to admissions_admissions_path, notice: success_msg_for("admission")
+        else
+          render_edit(admission)
+        end
+      end
+
+      def destroy
+        find_and_authorize_admission.destroy!
+        redirect_to admissions_admissions_path, notice: success_msg_for("admission")
+      end
+
+      private
+
+      def build_admission
+        patient = Patient.find_by(id: admission_params[:patient_id])
+        args = admission_params.merge(modality_at_admission: patient&.current_modality)
+        Admission.new(args)
+      end
+
+      def search_form
+        @search_form ||= begin
+          options = params.key?(:query) ? search_params : {}
+          AdmissionSearchForm.new(options)
+        end
+      end
+
+      def find_and_authorize_admission
+        Admission.find(params[:id]).tap do |admission|
+          authorize admission
+        end
+      end
+
+      def render_new(admission)
+        render :new, locals: { admission: admission }
+      end
+
+      def render_edit(admission)
+        render :edit, locals: { admission: admission }
+      end
+
+      def search_params
+        params
+          .require(:query) {}
+          .permit(:hospital_unit_id, :hospital_ward_id, :status, :term)
+      end
+
+      def admission_params
+        params
+          .require(:admissions_admission)
+          .permit(
+            :hospital_ward_id, :patient_id, :q,
+            :admitted_on, :admission_type, :consultant, :modality,
+            :reason_for_admission, :notes, :transferred_on, :transferred_to,
+            :discharged_on, :discharge_destination, :destination_notes,
+            :discharge_summary, :summarised_on, :summarised_by_id, :modality_at_admission
+          )
+      end
+    end
+  end
+end

data/app/controllers/renalware/admissions/patient_admissions_controller.rb

@@ -0,0 +1,20 @@
+require "renalware/admissions"
+require "collection_presenter"
+
+module Renalware
+  module Admissions
+    class PatientAdmissionsController < BaseController
+      include Renalware::Concerns::Pageable
+
+      def index
+        admissions = Admission
+          .where(patient_id: patient.id).page(page).per(per_page)
+          .order(admitted_on: :desc)
+        authorize admissions
+        render locals: {
+          admissions: CollectionPresenter.new(admissions, AdmissionPresenter)
+        }
+      end
+    end
+  end
+end

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

@@ -19,6 +19,35 @@ module Renalware
       max_duration_has_passed ? dashboard_path : super
     end
 
+    # Important note: Since Devise 4.4.0 the gem's SessionsController#create will do an implicit
+    # check to see if the resource (User signing-in) is valid (or rather, I think it checks for the
+    # presence of anything in resource.errors). If the user is not valid it now
+    # skips the redirect to the path specified in .after_sign_in_path_for.
+    # The result for us was that the user _could_ log on, but they stayed on the login screen
+    # (the appearance of the menu indicated they were in fact logged in). The redirect was not
+    # happening because the user was invalid (ie there were validation errors and
+    # user.valid? == false).
+    # The reason for the validation errors is that we have some conditional validation in User;
+    # for instance only validate #signature during an update, not on
+    # a create - after all #signature is something they set up later in their 'profile'.
+    # So what we have to do here is stop Devise from thinking the user in invalid by skipping
+    # validations.
+    # See https://github.com/plataformatec/devise/issues/4742#issuecomment-355154023
+    # Note that ideally we should move signature, professional position etc to a Profile model
+    # and then we could remove the conditional validation.
+    def create
+      super do |resource|
+        # This first line clears any existing errors that prevent Devise redirecting on successful
+        # login. It does not negate any password validations however. Its just a workaround to get
+        # the redirect to work.
+        resource.errors.clear
+        # This second line means resource.valid? returns true ie conditional on: :update validations
+        # are skipped. This line is not necessary (clearing the error above actually solves the
+        # problem) but does no harm and is belt and braces.
+        resource.skip_validation = true
+      end
+    end
+
     private
 
     def last_sign_in_at

data/app/controllers/renalware/letters/approved_letters_controller.rb

@@ -8,7 +8,15 @@ module Renalware
       def create
         letter = @patient.letters.pending_review.find(params[:letter_id])
 
-        ApproveLetter.build(letter).call(by: current_user)
+        # See config.broadcast_subscription_map for ApproveLetter event subscribers
+        # We use an event subscription pattern to drive the delivery of letters at this point
+        # rather than hard-wiring in a call to DeliverLetter.call etc. This is because letter
+        # delivery is hospital-specific, and each might want to plumb in different or many classes
+        # to handle different aspects of letter processing - not just delivery but also EPR etc.
+        ApproveLetter
+          .build(letter)
+          .broadcasting_to_configured_subscribers
+          .call(by: current_user)
 
         redirect_to patient_clinical_summary_path(@patient), notice: t(".success")
       end

data/app/controllers/renalware/letters/contacts_controller.rb

@@ -23,8 +23,31 @@ module Renalware
         end
       end
 
+      def edit
+        contact = patient.contacts.find(params[:id])
+        render_edit(contact)
+      end
+
+      def update
+        contact = patient.contacts.find(params[:id])
+        if contact.update(update_contact_params)
+          flash.now[:notice] = success_msg_for("contact")
+          render locals: { patient: patient, contact: ContactPresenter.new(contact) }
+        else
+          render_edit(contact)
+        end
+      end
+
       private
 
+      def render_edit(contact)
+        render :edit, locals: {
+          patient: patient,
+          contact: contact,
+          contact_descriptions: find_contact_descriptions
+        }, layout: false
+      end
+
       def build_contact
         Contact.new.tap(&:build_person)
       end
@@ -55,6 +78,12 @@ module Renalware
           .tap { |p| try_merge_person_creator(p) }
       end
 
+      def update_contact_params
+        params
+          .require(:letters_contact)
+          .permit(:default_cc, :description_id, :other_description, :notes)
+      end
+
       def contact_attributes
         [
           :person_id, :default_cc, :description_id, :other_description,

data/app/controllers/renalware/low_clearance/base_controller.rb

@@ -0,0 +1,13 @@
+require_dependency "renalware/low_clearance"
+
+module Renalware
+  module LowClearance
+    class BaseController < Renalware::BaseController
+      protected
+
+      def patient
+        LowClearance.cast_patient(super)
+      end
+    end
+  end
+end

data/app/controllers/renalware/low_clearance/dashboards_controller.rb

@@ -0,0 +1,21 @@
+require_dependency "renalware/low_clearance"
+
+module Renalware
+  module LowClearance
+    class DashboardsController < LowClearance::BaseController
+      def show
+        authorize patient
+        render :show, locals: {
+          patient: patient,
+          dashboard: dashboard_presenter
+        }
+      end
+
+      private
+
+      def dashboard_presenter
+        DashboardPresenter.new(user: current_user, patient: patient)
+      end
+    end
+  end
+end

data/app/controllers/renalware/low_clearance/mdm_controller.rb

@@ -0,0 +1,13 @@
+require_dependency "renalware/renal"
+
+module Renalware
+  module LowClearance
+    class MDMController < Renalware::MDMController
+      def show
+        authorize patient
+        presenter = LowClearance::MDMPresenter.new(patient: patient, view_context: view_context)
+        render_show(mdm_presenter: presenter)
+      end
+    end
+  end
+end

data/app/controllers/renalware/low_clearance/mdm_patients_controller.rb

@@ -0,0 +1,27 @@
+require_dependency "renalware/renal"
+
+module Renalware
+  module LowClearance
+    class MDMPatientsController < Renalware::MDMPatientsController
+      def index
+        render_index(query: query,
+                     page_title: t(".page_title"),
+                     view_proc: ->(patient) { patient_low_clearance_mdm_path(patient) })
+      end
+
+      private
+
+      def query
+        LowClearance::MDMPatientsQuery.new(query: q, named_filter: named_filter)
+      end
+
+      def named_filter
+        params[:named_filter]
+      end
+
+      def q
+        params[:q]
+      end
+    end
+  end
+end