renalware-core 2.0.113 → 2.0.115

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 687a7e98c92f0c23e54e6f9bc7ea2022f2684a0ab834120b229ded600238c379
-  data.tar.gz: ec3be7afa54d14dce47cc4adf4b90fe6abc0fb2e672fbaf84b1612affc505749
+  metadata.gz: d4138b40704044a6a0006492eba54b24dc92c31012e2da599b346a720c00ee9b
+  data.tar.gz: edfd0a9655c555f6bb23c1011a8f15e7581fb24026d06df04a01489b37c22e5d
 SHA512:
-  metadata.gz: ae657bd523863a435852cb121d625f5880d34187a655dc3b6d3a7e277a72cd09a118413256ea9347dcdb5b56c1064d012e7e826fda467e2fac9002a499dcefc5
-  data.tar.gz: 04e868337e7b680ee1306e322e48405f44db5defba53fd92ebbaf215c5436f889d6941b9a1eafe8f447ab6ab2f8d1e8354824213f9869022dcbe41996417d7e8
+  metadata.gz: 95d680af0d7c7d983e7ca5f0c41ec7f212de25fe20444ffd38fcfabecce2fbc2388f0eaa7062c7783df2eafb707dbab9865b394197fc24f0fd0e5d19d11a20a7
+  data.tar.gz: 300b19a9ba904f2530a67c2c77de95fc887345e43101b6fa4ea1f84ac80c18cf0eff12229ced1a69fe5afe3ddb2fe1be520459f806472a7af20e3916657c0b22

data/Rakefile

@@ -35,9 +35,7 @@ namespace :assets do
 
   desc "Precompile assets within dummy app"
   task :precompile do
-    p "Here"
     Rake::Task["app:yarn:install"].invoke
-    p "There"
     Rake::Task["app:assets:precompile"].invoke
   end
 

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

@@ -15,7 +15,6 @@
 //= require jquery-readyselector
 //= require jquery_ujs
 //= require jquery-ui/core
-//= require jquery-ui/widgets/autocomplete
 //= require jquery-ui/widgets/sortable
 //= require jquery-ui/effects/effect-highlight
 //= require dataTables/jquery.dataTables

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

@@ -0,0 +1,26 @@
+var Renalware = typeof Renalware === 'undefined' ? {} : Renalware;
+
+Renalware.FeedOnlyInputs = (function() {
+  // Disable any input/textarea/selects having a data attribute suggesting it is controlled by an
+  // external feed. The data in these inouts can be overwritten by the feed at any time so it
+  // makes sense not to allow user input.
+  // Note that this js file is only re-parsed when it changes, so if you change the value of
+  // e.g. disable_inputs_controlled_by_tissue_typing_feed in an initializer, it will not
+  // take affect until you clear the assets, or make a change to this file etc.
+  var disableFeedOnlyInputs = function() {
+    <% if Renalware.config.disable_inputs_controlled_by_tissue_typing_feed %>
+      $("input,textarea,select").filter("[data-controlled-by-tissue-typing-feed]").prop("disabled", true);
+    <% end %>
+    <% if Renalware.config.disable_inputs_controlled_by_demographics_feed %>
+      $("input,textarea,select").filter("[data-controlled-by-demographics-feed]").prop("disabled", true);
+    <% end %>
+  };
+
+  return {
+    init: function () {
+      disableFeedOnlyInputs();
+    }
+  };
+}());
+
+$(document).ready(Renalware.FeedOnlyInputs.init);

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

@@ -0,0 +1,50 @@
+$(document).ready(function(){
+  $(".hl7-file-browser a").on("click", function(e) {
+    console.log($(this).data("body"));
+    $("#feeds_hl7_test_form_body").val($(this).data("body"))
+  });
+
+//   $(".file-viewer form").on("submit", function(event) {
+//     console.log("asassas");
+//     event.preventDefault();
+//     console.log(this)
+
+//     var valuesToSubmit = this.el.serialize();
+//     var self = this;
+// //#url: self.el.attr("action"), //submits it to the given url of the form
+
+//     $.ajax({
+//       type: "POST",
+//       data: valuesToSubmit,
+//       dataType: "JSON",
+//       statusCode: {
+//         201: function(contact) {
+//           // self._onSuccess(contact);
+//           console.log("asass")
+//         },
+//         400: function(jqXHR) {
+//           var errors = jqXHR.responseJSON;
+//           // self._onErrors(errors);
+//           console.log("error")
+//         }
+//       }
+//     });
+//   });
+
+  // this.el.on("submit", function(event) { self._onSubmit(event) });
+  // $.ajax({
+  //   type: "POST",
+  //   url: self.el.attr("action"), //submits it to the given url of the form
+  //   data: valuesToSubmit,
+  //   dataType: "JSON",
+  //   statusCode: {
+  //     201: function(contact) {
+  //       self._onSuccess(contact);
+  //     },
+  //     400: function(jqXHR) {
+  //       var errors = jqXHR.responseJSON;
+  //       self._onErrors(errors);
+  //     }
+  //   }
+  // });
+});

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

@@ -0,0 +1,43 @@
+var Renalware = typeof Renalware === 'undefined' ? {} : Renalware;
+
+Renalware.PersonSearch = (function() {
+
+  var initPersonSearch = function(){
+    var dropDown = $(".person-ajax-search");
+
+    $(dropDown).select2({
+      language: {
+        inputTooShort: function(args) {
+          return $(dropDown).data("hint");
+        }
+      },
+      ajax: {
+        dataType: 'json',
+        delay: 250,
+        data: function (params) {
+          return {
+            term: params.term
+          };
+        },
+        processResults: function (data, params) {
+          return {
+            results: data
+          };
+        },
+        cache: true
+      },
+      minimumInputLength: 2
+    });
+  };
+
+  return {
+    init: function () {
+      initPersonSearch()
+    }
+  };
+}());
+
+$(document).ready(Renalware.PersonSearch.init);
+$(document).on('opened.fndtn.reveal', '[data-reveal]', function() {
+  Renalware.PersonSearch.init();
+});

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

@@ -1,6 +1,5 @@
 /*
     *= require jquery-ui/core
-    *= require jquery-ui/autocomplete
     *= require jquery-ui/sortable
     *= require jquery-ui/tabs
     *= require_self

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

@@ -0,0 +1,7 @@
+.hl7-file-browser {
+  .file-viewer {
+    textarea {
+      height: 30rem;
+    }
+  }
+}

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

@@ -138,5 +138,5 @@ table#observations {
 }
 
 #observation-requests {
-  height: 30em;
+  height: auto;
 }

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

@@ -436,3 +436,9 @@ form {
     }
   }
 }
+
+.add-patient-from-master-index {
+  table td a {
+    margin: 0;
+  }
+}

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

@@ -167,8 +167,8 @@
   }
 }
 
-.insert-snippet-button,
-.editor-toolbar-button {
+a.insert-snippet-button,
+a.editor-toolbar-button {
   margin-bottom: 5px !important;
   margin-left: 1rem;
   padding: 5px 8px;

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

@@ -174,7 +174,7 @@ article {
       span {
         color: $mid-grey;
         font-size: 1.1rem;
-        line-height: 1.78rem;
+        // line-height: 1.78rem;
         margin: 0 .5rem 0 0;
       }
 
@@ -475,3 +475,7 @@ legend .legend-note {
   font-size: .9rem;
   color: $steel;
 }
+
+.page-action-inline-form form {
+  display: inline-block;
+}

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

@@ -10,6 +10,10 @@ body {
   height: 100%;
 }
 
+body.staging {
+  border-top: 3px solid $nhs-yellow;
+}
+
 html {
   body {
     display: flex;

data/app/components/renalware/patients/side_menu_component.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Renalware
+  module Patients
+    # Experimental ActionView component
+    class SideMenuComponent < ActionView::Component::Base
+      validates :patient, presence: true
+
+      def initialize(patient:)
+        @patient = patient
+      end
+
+      private
+
+      attr_reader :patient
+    end
+  end
+end

data/app/controllers/renalware/clinical/body_compositions_controller.rb

@@ -6,8 +6,14 @@ require_dependency "renalware/clinical"
 module Renalware
   module Clinical
     class BodyCompositionsController < Clinical::BaseController
+      include Renalware::Concerns::Pageable
       before_action :load_patient
 
+      def index
+        body_compositions = BodyComposition.for_patient(patient).ordered.page(page).per(per_page)
+        render locals: { patient: patient, body_compositions: body_compositions }
+      end
+
       def show
         body_composition = find_body_composition
         render locals: { patient: patient, body_composition: body_composition }

data/app/controllers/renalware/feeds/hl7_test_messages_controller.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/admin"
+require "ap"
+
+module Renalware
+  module Feeds
+    class HL7TestMessagesController < BaseController
+      def new
+        authorize [:renalware, :admin, :devops], :show?
+        test_messages = HL7TestMessage.all
+        render locals: { form: HL7TestForm.new, test_messages: test_messages }
+      end
+
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      def create
+        authorize [:renalware, :admin, :devops], :create?
+        body = replace_placeholders_in_hl7_message(form_params[:body])
+        job = FeedJob.new(body)
+        job.perform
+        test_patient
+        version = test_patient.reload.versions.order(created_at: :desc).last&.object_changes
+        json_version = version && JSON.pretty_generate(version)
+        respond_to do |format|
+          format.js do
+            render locals: {
+              a: "asas",
+              test_patient: test_patient,
+              version: json_version
+            }
+          end
+        end
+        # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
+
+        # # Delayed::Job.enqueue job
+        # redirect_to(
+        #   renalware.new_feeds_hl7_test_message_path,
+        #   notice: "Hl7 message queued"
+        # )
+      end
+
+      private
+
+      def form_params
+        params.require(:feeds_hl7_test_form).permit(:body)
+      end
+
+      def test_patient
+        @test_patient ||= Patient.find_by!(local_patient_id: "Z100001")
+      end
+
+      def replace_placeholders_in_hl7_message(message)
+        message
+          .gsub("{{message_id}}", SecureRandom.hex(12))
+          .gsub("{{local_patient_id}}", test_patient.local_patient_id)
+          .gsub("\r\n", "\r")
+      end
+    end
+  end
+end

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

@@ -50,11 +50,6 @@ module Renalware
         params[:named_filter]
       end
 
-      def batch_print_form
-        patient_ids = query.call.pluck("patients.id").join(",")
-        SessionForms::Form.new(patient_ids: patient_ids)
-      end
-
       def render_index(filter_form:, **args)
         presenter = build_presenter(params: params, **args)
         authorize presenter.patients
@@ -63,10 +58,25 @@ module Renalware
           locals: {
             presenter: presenter,
             filter_form: filter_form,
-            batch_print_form: batch_print_form
+            batch_print_form: batch_print_form,
+            pathology_requests_form: pathology_requests_form
           }
         )
       end
+
+      # Form object behind the batch print session forms button
+      def batch_print_form
+        SessionForms::Form.new(patient_ids: patient_ids)
+      end
+
+      # Form object behind the 'generate request forms' button
+      def pathology_requests_form
+        OpenStruct.new(patient_ids: patient_ids)
+      end
+
+      def patient_ids
+        @patient_ids ||= query.call.pluck("patients.id")
+      end
     end
   end
 end

data/app/controllers/renalware/hd/scheduling/diaries_controller.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/hd/base_controller"
+
+# The route to the edit route for this controller takes /:year/:week_number segments
+# rather than an id. THat is because when we load the diary, and when we navigate back and forth
+# through diaries, we are concerned with the week more then an id. Its easier to navigate to the
+# next week with /2017/52 than by looking up the id of the next diary ahead of time.
+module Renalware
+  module HD
+    module Scheduling
+      class DiariesController < BaseController
+        include Renalware::Concerns::PdfRenderable
+        include Renalware::Concerns::Pageable
+
+        def edit
+          authorize weekly_diary, :show?
+          render locals: {
+            unit: unit,
+            diary: DiaryPresenter.new(current_user, weekly_diary)
+          }
+        end
+
+        # Renders a list of diaries for a hospital unit
+        def index
+          authorize WeeklyDiary, :index?
+          render locals: { unit: unit, diaries: weekly_diaries }
+        end
+
+        def show
+          diary = WeeklyDiary.find(params[:id])
+          respond_to do |format|
+            format.pdf do
+              authorize diary
+              options = default_pdf_options.merge!(
+                pdf: pdf_filename,
+                locals: { unit: unit, diary: DiaryPresenter.new(current_user, diary) }
+              )
+              render options
+            end
+          end
+        end
+
+        private
+
+        # TODO: give a sensible name
+        def pdf_filename
+          "hd_unit_diary"
+        end
+
+        def weekly_diary
+          @weekly_diary ||= begin
+            FindOrCreateDiaryByWeekQuery.new(
+              relation: WeeklyDiary.eager_load(
+                slots: [:patient, :station, :diurnal_period_code],
+                master_diary: { slots: [:patient, :station, :diurnal_period_code] }
+              ),
+              unit_id: unit_id,
+              week_period: week_period,
+              by: current_user
+            ).call
+          end
+        end
+
+        # The route segments are /:year/:week_number
+        # We use a WeekPeriod value object to wrap those two things.
+        def week_period
+          WeekPeriod.new(
+            week_number: params[:week_number],
+            year: params[:year]
+          )
+        end
+
+        def unit_id
+          params[:unit_id]
+        end
+
+        def unit
+          Hospitals::Unit.find(unit_id)
+        end
+
+        def weekly_diaries
+          WeeklyDiary
+            .where(hospital_unit_id: unit_id)
+            .ordered
+            .page(page).per(per_page)
+        end
+      end
+    end
+  end
+end

data/app/controllers/renalware/hd/scheduling/diary_slots_controller.rb

@@ -0,0 +1,169 @@
+# frozen_string_literal: true
+
+# rubocop:disable Metrics/ClassLength
+require_dependency "renalware/hd/base_controller"
+
+module Renalware
+  module HD
+    module Scheduling
+      class DiarySlotsController < BaseController
+        # GET html -  renders a form
+        # Here we will have been passed in the query string:
+        # - the unit id
+        # - the dirunal_period_code id
+        # - the week and year (and thus the diary)
+        # and from that lot we could look up the master and weekly diaries
+        def new
+          # Be default this assume we are going to add a slot to the weekly diary
+          # but in which button is clicked in the modal dialog determines which diary
+          # (master or weekly) the slot will be added to.
+          slot = DiarySlot.new(
+            diary: weekly_diary,
+            station_id: params[:station_id],
+            day_of_week: params[:day_of_week],
+            diurnal_period_code_id: params[:diurnal_period_code_id]
+          )
+          authorize slot
+          render locals: locals_for(slot), layout: false
+        end
+
+        # POST create js
+        # Here we may be adding a slot to the weekly or master diary.
+        # That should be transparent to us - we make the change and render
+        # create.js.erb which, on the client, will cause an ajax js call to #show.
+        # That secondary call is the one that refreshes the slot in the table with its latest state.
+        # We do this to avoid having to to a check (in each action in this controller) to see if we
+        # are on the master or weekly diary; if we always refresh the diary slot in the ui after any
+        # action, then it will always update correctly.
+        def create
+          diary = Diary.find(params[:diary_id])
+          slot = diary.slots.new(slot_params)
+          slot.patient_id = posted_patient_id
+          authorize slot
+          if slot.save_by(current_user)
+            render locals: { diary: diary, slot: diary.decorate_slot(slot) }
+          else
+            render :new, locals: { slot: DiarySlotPresenter.new(slot) }, layout: false
+          end
+        end
+
+        # GET .js refresh a slot in a *weekly* diary
+        # See comment on #create.
+        # See show.js.erb where we refresh the slot in the diary
+        # To get here we will have manufactured a url like this
+        #   hd/diaries/2/slots/day/1/period/1/station/1
+        # as those bit are will we know.
+        # Basically we are saying find for this weekly diary, find the matching
+        # slot for the station/day/period combo and render the weekly slot if there is
+        # one, or the master behind it if there is one of those, otherwise render an Add button.
+        def show
+          authorize DiarySlot, :show?
+          slot = weekly_then_master_then_empty_slot
+          render layout: false, locals: { slot: DiarySlotPresenter.new(slot) }
+        end
+
+        def edit
+          authorize slot
+          render layout: false, locals: { slot: DiarySlotPresenter.new(slot) }
+        end
+
+        # DELETE js
+        # Delete the slot (we don't know if its on the master or weekly diary).
+        # NB as per #create and #update, the rendered js file (destroy.js.erb) will make a secondary
+        # call back into #show to refresh the UI (i.e. we don't attempt to update the UI in
+        # destroy.js.erb)
+        def destroy
+          authorize slot
+          slot.destroy!
+          render locals: { slot: DiarySlotPresenter.new(slot) }
+        end
+
+        # PATCH js
+        # See also comments in #create and #destroy.
+        def update
+          authorize slot
+          slot.patient_id = slot_params[:patient_id]
+          slot.save_by!(current_user)
+          diary = slot.diary
+          render locals: { diary: diary, slot: diary.decorate_slot(slot) }
+        end
+
+        private
+
+        # Find the corresponding slot in the master if there is one, otherwise an empty slot
+        # with an 'Add' button ready to set up a new patient
+        def weekly_then_master_then_empty_slot
+          empty_slot = build_empty_weekly_slot
+          find_weekly_slot(empty_slot) || find_master_slot(empty_slot) || empty_slot
+        end
+
+        def find_master_slot(args)
+          slot = master_diary.slots.find_by(
+            diurnal_period_code_id: args.diurnal_period_code_id,
+            station_id: args.station_id,
+            day_of_week: args.day_of_week
+          )
+          slot && master_diary.decorate_slot(slot)
+        end
+
+        def find_weekly_slot(args)
+          slot = weekly_diary.slots.find_by(
+            diurnal_period_code_id: args.diurnal_period_code_id,
+            station_id: args.station_id,
+            day_of_week: args.day_of_week
+          )
+          slot && weekly_diary.decorate_slot(slot)
+        end
+
+        # Used for searching etc
+        def build_empty_weekly_slot
+          weekly_diary.slots.new(
+            day_of_week: params[:day_of_week],
+            station_id: params[:station_id],
+            diurnal_period_code_id: params[:diurnal_period_code_id]
+          )
+        end
+
+        def slot
+          @slot ||= DiarySlot.find(params[:id])
+        end
+
+        # In the url the :diary_id param is always the weekly diary id!
+        def weekly_diary
+          @weekly_diary ||= WeeklyDiary.find(params[:diary_id])
+        end
+
+        def master_diary
+          weekly_diary.master_diary
+        end
+
+        def locals_for(slot)
+          {
+            slot: DiarySlotPresenter.new(slot),
+            weekly_diary: weekly_diary
+          }
+        end
+
+        def posted_patient_id
+          slot_params[:patient_id]
+        end
+
+        def slot_params
+          params
+            .require(:slot)
+            .permit(
+              :master_slot,
+              :day_of_week,
+              :diurnal_period_code_id,
+              :station_id,
+              :target_diary_id,
+              :change_type,
+              :patient_id,
+              patient_ids: []
+            )
+        end
+      end
+    end
+  end
+  # rubocop:enable Metrics/ClassLength
+end

data/app/controllers/renalware/hd/session_forms/batches_controller.rb

@@ -70,7 +70,7 @@ module Renalware
         end
 
         def patient_ids
-          params.require(:batch).require(:patient_ids).split(",")
+          params.require(:batch).require(:patient_ids)
         end
 
         def find_and_authorize_batch(id = nil)