renalware-core 2.0.112 → 2.0.118

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5ca791105ad77524bc53a491d593ca9871363fdd5b3c3b874755f1a3898ca8c
-  data.tar.gz: 770c7beab9d9369f637cf067ff7fe9a068a579805690aeb76ef77a080be3bf6d
+  metadata.gz: 362a3539cb21366fb7702b1e0e6131abbe433e9e6212898ad9a599c80ed67ba7
+  data.tar.gz: eb33cd22ab7bbda713cfefe9d9cf007eb79bff1ed3dcac72b7a7edb09781a85f
 SHA512:
-  metadata.gz: a10238b66a41f3a73e924acf31ac1691194fefd2738764a52bc3bcef8a75872288f0dbb55835ceed2579a50f2357b214641c55cc5d37a89ffab289af065a8514
-  data.tar.gz: 1f17f033bd3a78c003e385500b4505bb3eb1ec452adcc6c8850a210f79d0a2a5616065581a5eb2f891553dcbc9cbc409abfcf2f2f95be707ce59ff8843ac1fb0
+  metadata.gz: e502880f5d989ea8741e218033bf9f5235ffd9be6ce2c05229f8da46f06c2f509f254014dfc0363b637b5c6a6fc5e46532af3e2c922bc4e373a352602ca5f115
+  data.tar.gz: 120370c1f5c9fb3ece4f87f30cae88a33f07d4c2de6077de0a4c5a7adff832b4df862bdefd08459d579ff00c2ffb3d736fa81cd15c7160cee3bde5de6869bc0f

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.html.slim

@@ -0,0 +1,7 @@
+ul.side-nav
+  = render "renalware/patients/side_menu/general", patient: patient
+  = render "renalware/patients/side_menu/site_specific_links", patient: patient
+  = render "renalware/patients/side_menu/modalities", patient: patient
+  = render "renalware/patients/side_menu/transplants", patient: patient
+  = render "renalware/patients/side_menu/actions", patient: patient
+  = render "renalware/patients/side_menu/site_specific_actions", patient: patient

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,59 @@
+# frozen_string_literal: true
+
+require_dependency "renalware/admin"
+
+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