renalware-core 2.0.76 → 2.0.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 644e883f0c733d49ad49139eb2118a2387f3378db8a6fc9eb5b20eaf5dad4db2
-  data.tar.gz: 71cd0139f74aa162bbaedb783d6ce450270de74a64b74751cf1873ead4b9829a
+  metadata.gz: 9f31b746ef727f7d62c938bd6978058aabd3eb52ab5d24529b0e28706446b961
+  data.tar.gz: a510872302ae102f5f78d0f0a92645baace889986336ee55d337313db005a33b
 SHA512:
-  metadata.gz: 6dfe27f438b2f56ecaec02bda8abce84f8015ca5054f05b7e76bf6c405e6a0632f60013287e913b7e03aa0bf0a7f7ad8127742253fdecba60f3ce5277269abf0
-  data.tar.gz: a007bf5ef7be7ee91722e27ac434ed7d49e8edf32cc6408dd048b613272f0938c7073dff9990419d201d711ef574433cfe3faac4835b53e78d8265d2f1f9353b
+  metadata.gz: e3f44451da960cba27e7608f53ca1ab6172d1767106a974ab07ab7415450ab2a2e41f83620752bb3af568787134cc1d185021d1af159ad366965e1bb25f0052b
+  data.tar.gz: d1139a781f293dceac77f83703841b8a6a3d158d7e449fa786e72cdc6954ce0edef34ed5d04828dce3240865ffe68b9d0cbccb39dfe99d7f140e58d9a94e2986

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

@@ -1,3 +1,4 @@
+
 // On forms with more than one submit button, apply the disable-with label to
 // only the clicked button, and just disable the other buttons.
 // See for instance the HD Session form.

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

@@ -32,9 +32,21 @@ table.contacts tbody td{
 }
 
 .letters {
-  .quick-preview p {
-    font-size: 0.9rem;
-    line-height: 1rem;
+  .quick-preview {
+    font-size: .9rem;
+
+    p {
+      font-size: .9rem;
+      line-height: 1rem;
+    }
+
+    .admin-notes {
+      display: inline-block;
+      background-color: darken($table-even-row-colour, 10);
+      padding: .2rem;
+      margin: .5rem 0 0 0;
+      font-size: .9rem;
+    }
   }
 
   td {

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

@@ -1,4 +1,22 @@
 .simple_form {
+  /*
+  This class repositions the hint to the right of the input and adds a ? icon to the anchor.
+  Used for example in help popups/tooltips on forms.
+  */
+  .hint.hint-help-link {
+    display: inline-block;
+    margin-left: 1rem;
+
+    a {
+      font-size: 1.5rem;
+      @extend %fa-icon;
+      @extend .far;
+
+      &:before {
+        content: fa-content($fa-var-question-circle);
+      }
+    }
+  }
 
   fieldset {
     border: 0;

data/app/controllers/renalware/pd/pet_adequacy_results_controller.rb

@@ -14,6 +14,7 @@ module Renalware
         render locals: { pet_adequacy_result: result, patient: patient }
       end
 
+      # rubocop:disable Metrics/AbcSize
       def create
         result = patient.pet_adequacy_results.new(pet_adequacy_result_params)
         authorize result
@@ -24,11 +25,13 @@ module Renalware
           render :new, locals: { pet_adequacy_result: result, patient: patient }
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       def edit
         render locals: { pet_adequacy_result: pet_adequacy_result, patient: patient }
       end
 
+      # rubocop:disable Metrics/AbcSize
       def update
         pet_adequacy_result.assign_attributes(pet_adequacy_result_params)
         if pet_adequacy_result.save
@@ -38,6 +41,7 @@ module Renalware
           render :edit, locals: { pet_adequacy_result: pet_adequacy_result, patient: patient }
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
       def show
         render locals: { pet_adequacy_result: pet_adequacy_result, patient: patient }
@@ -62,7 +66,7 @@ module Renalware
                       :crcl_total, :crcl_dialysate, :crcl_rrf,
                       :daily_uf, :daily_urine, :date_rff, :creat_value, :dialysate_effluent_volume,
                       :date_creat_clearance, :date_creat_value,
-                      :urine_urea_conc, :urine_creat_conc)
+                      :urine_urea_conc, :urine_creat_conc, :dietry_protein_intake)
               .merge!(by: current_user)
       end
     end

data/app/models/renalware/hd/session/closed.rb

@@ -40,8 +40,8 @@ module Renalware
           validates :blood_pressure, presence: true
           validates :weight_measured, presence: true
           validates :temperature_measured, presence: true
-          validates :weight, presence: { if: ->{ weight_measured&.yes? } }
-          validates :temperature, presence: { if: ->{ temperature_measured&.yes? } }
+          validates :weight, presence: { if: -> { weight_measured&.yes? } }
+          validates :temperature, presence: { if: -> { temperature_measured&.yes? } }
           validates :blood_pressure, "renalware/patients/blood_pressure_presence" => true
         end
         attribute :observations_before, Observations
@@ -57,6 +57,11 @@ module Renalware
         end
         attribute :dialysis, Dialysis
 
+        class Complications < Renalware::HD::SessionDocument::Complications
+          validates :line_exit_site_status, presence: true
+        end
+        attribute :complications, Complications
+
         validates :hdf, "renalware/patients/hdf_presence" => true, if: :hd_type_is_hdf?
 
         def hd_type_is_hdf?

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

@@ -32,7 +32,8 @@ module Renalware
         creat_value: 9999,
         dialysate_effluent_volume: 5,
         urine_urea_conc: 999,
-        urine_creat_conc: 9999
+        urine_creat_conc: 9999,
+        dietry_protein_intake: 2
       }.freeze
 
       # This map is currently for documentation purposes but may be useful when exporting
@@ -155,6 +156,11 @@ module Renalware
                   only_integer: true
                 },
                 allow_nil: true
+      validates :dietry_protein_intake,
+                numericality: {
+                  less_than_or_equal_to: MAXIMUMS[:dietry_protein_intake]
+                },
+                allow_nil: true
     end
   end
 end

data/app/views/renalware/dashboard/letters/_letter.html.slim

@@ -16,4 +16,9 @@ tr(class=letter.state.dasherize)
   td
   td(colspan=7)
     .quick-preview
-      = simple_format letter.body
+      p
+        = simple_format letter.body
+      - if letter.notes.present?
+        .admin-notes
+          i Notes:  
+          = letter.notes

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

@@ -47,12 +47,18 @@ ruby:
               wrapper: :horizontal_small
           = fcm.input :access_side, wrapper: :horizontal_small
           = fcm.input :access_confirmed, as: :boolean, wrapper: :horizontal_medium
-        = fcm.input :is_access_first_use, as: :inline_radio_buttons, wrapper: :horizontal_medium
-        = fcm.input :fistula_plus_line, as: :inline_radio_buttons, wrapper: :horizontal_medium
-        = fcm.input :single_needle, as: :inline_radio_buttons, wrapper: :horizontal_medium
-        = fcm.input :lines_reversed, as: :inline_radio_buttons, wrapper: :horizontal_medium
-        = fcm.input :machine_no, wrapper: :horizontal_tiny
-        = f.association :dialysate, wrapper: :horizontal_small
+          = fcm.input :is_access_first_use, as: :inline_radio_buttons, wrapper: :horizontal_medium
+          = fcm.input :fistula_plus_line, as: :inline_radio_buttons, wrapper: :horizontal_medium
+          = fcm.input :single_needle, as: :inline_radio_buttons, wrapper: :horizontal_medium
+          = fcm.input :lines_reversed, as: :inline_radio_buttons, wrapper: :horizontal_medium
+
+          = fd.simple_fields_for :complications, fd.object.complications do |fcm|
+            = fcm.input :access_site_status, wrapper: :horizontal_small
+            = fcm.input :line_exit_site_status,
+                        wrapper: :horizontal_tiny,
+                        hint: link_to("", asset_path("renalware/hd/mr_victor.jpg"),
+                                      data: {"reveal-id" => "mr-vistor-help-modal" }),
+                        hint_html: { class: "hint-help-link" }
 
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Pre-Dialysis Observations", name: "before" } do
@@ -86,8 +92,11 @@ ruby:
         = fcm.input :flow_rate, collection: fcm.object.class.flow_rates, wrapper: :horizontal_tiny
         = fcm.input :blood_flow, wrapper: :horizontal_tiny
         = fcm.input :machine_urr, wrapper: :horizontal_tiny
-        = fcm.input :machine_ktv, wrapper: :horizontal_tiny
         = fcm.input :litres_processed, wrapper: :horizontal_tiny
+        = f.association :dialysate, wrapper: :horizontal_small
+        = fcm.input :machine_ktv, wrapper: :horizontal_tiny
+        = fd.simple_fields_for :info, fd.object.info do |fi|
+          = fi.input :machine_no, wrapper: :horizontal_tiny
 
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "HDF", name: "hdf" } do
@@ -113,8 +122,8 @@ ruby:
     = render layout: "renalware/shared/fieldset",
         locals: { legend: "Notes/Complications", name: "complications" } do
       = fd.simple_fields_for :complications, fd.object.complications do |fcm|
-        = fcm.input :access_site_status, wrapper: :horizontal_small
-        = fcm.input :line_exit_site_status, wrapper: :horizontal_small
+        / = fcm.input :access_site_status, wrapper: :horizontal_small
+        / = fcm.input :line_exit_site_status, wrapper: :horizontal_small
         = fcm.input :was_dressing_changed, as: :inline_radio_buttons, wrapper: :horizontal_small
         = fcm.input :had_mrsa_swab, as: :inline_radio_buttons, wrapper: :horizontal_small
         = fcm.input :had_mssa_swab, as: :inline_radio_buttons, wrapper: :horizontal_small
@@ -130,3 +139,18 @@ ruby:
 .row
   .large-12.columns
     = render "form_actions", f: f, back_path: back_path, session: session, patient: @patient
+
+/ Failed in all attempts to override close_on_background_click using eg data-options or any
+/ variation of e.g. data-options="closeOnBackgroundClick:false"
+/ data-options="close_on_background_click:false"
+/ I can only assume its not possible so we would need to use another handler top initialize modals
+/ that allow a bg click to close.
+#mr-vistor-help-modal.reveal-modal.medium(data-reveal style="width: 600px")
+  .modal
+    .modal__header
+      h2 MR VICTOR
+      |  
+      span Multi Racial Visual Inspection Catheter Tool Observation Record
+      = render "renalware/shared/modal_close_link"
+    .modal__body(style="text-align: center")
+      = image_tag(asset_path("renalware/hd/mr_victor.jpg"))

data/app/views/renalware/letters/letters/_letter.html.slim

@@ -30,3 +30,7 @@
     td(colspan=8)
       .quick-preview
         = simple_format letter.body
+        - if letter.notes.present?
+          .admin-notes
+            i Notes:  
+            = letter.notes

data/app/views/renalware/letters/lists/_letter.html.slim

@@ -47,6 +47,11 @@ tr(class=letter.state.dasherize)
   td.col-width-medium-with-ellipsis= letter.description
 = content_tag(:tr, id: "quick-preview-#{letter.id}", style: "display: none")
   td
-  td(colspan=10)
+  td(colspan=11)
     .quick-preview
       = simple_format letter.body
+      - if letter.notes.present?
+        .admin-notes
+          p
+            | Notes:  
+            = letter.notes

data/app/views/renalware/pd/pet_adequacy_results/_form.html.slim

@@ -26,6 +26,7 @@
   = f.input :date_creat_value, as: :date_picker, wrapper: :horizontal_datepicker
   = f.input :urine_urea_conc, wrapper: :horizontal_small
   = f.input :urine_creat_conc, wrapper: :horizontal_small
+  = f.input :dietry_protein_intake, wrapper: :horizontal_small
 
   = submit_tag "Save", class: "button"
   span= " or "

data/app/views/renalware/pd/pet_adequacy_results/show.html.slim

@@ -28,3 +28,4 @@
     = list.definition(:date_creat_value) { |value| l value }
     = list.definition(:urine_urea_conc)
     = list.definition(:urine_creat_conc)
+    = list.definition(:dietry_protein_intake)

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

@@ -104,6 +104,7 @@ en:
         erythema: Erythema
         purulent: Purulent
       line_exit_site_status:
+        99: Not Applicable
         0: 0
         1: 1
         2: 2

data/db/migrate/20190424101709_add_dietry_protein_intake_to_pet_adequacy_results.rb

@@ -0,0 +1,13 @@
+class AddDietryProteinIntakeToPETAdequacyResults < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_column(
+        :pd_pet_adequacy_results,
+        :dietry_protein_intake,
+        :decimal,
+        scale: 2,
+        precision: 8
+      )
+    end
+  end
+end

data/lib/renalware/engine.rb

@@ -145,6 +145,7 @@ module Renalware
         renalware/favicon/safari-pinned-tab.svg
         renalware/clippy.svg
         renalware/print-button-example.png
+        renalware/hd/mr_victor.jpg
       )
       app.config.assets.paths <<
         Rails.root.join(config.root, "vendor", "assets", "javascripts", "renalware")

data/lib/renalware/version.rb

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

data/spec/factories/hd/hd_session_document.rb

@@ -61,10 +61,15 @@ FactoryBot.define do
     blood_pressure factory: :blood_pressure, strategy: :marshal_dump
   end
 
+  factory :hd_session_document_complications, class: OpenStruct do
+    line_exit_site_status { "0" }
+  end
+
   factory :hd_session_document, class: OpenStruct do
     info factory: :hd_session_document_info, strategy: :marshal_dump
     dialysis factory: :hd_session_document_dialysis, strategy: :marshal_dump
     observations_before factory: :hd_session_document_observations_before, strategy: :marshal_dump
     observations_after factory: :hd_session_document_observations_after, strategy: :marshal_dump
+    complications factory: :hd_session_document_complications, strategy: :marshal_dump
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.76
+  version: 2.0.77
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -965,6 +965,7 @@ files:
 - app/assets/images/renalware/favicon/manifest.json
 - app/assets/images/renalware/favicon/mstile-150x150.png
 - app/assets/images/renalware/favicon/safari-pinned-tab.svg
+- app/assets/images/renalware/hd/mr_victor.jpg
 - app/assets/images/renalware/kidney.png
 - app/assets/images/renalware/nhs_a4_letter_logo_black.png
 - app/assets/images/renalware/nhs_a4_letter_logo_blue.png
@@ -3447,6 +3448,7 @@ files:
 - db/migrate/20190315125638_add_timestamps_to_pathology_description_tables.rb
 - db/migrate/20190401105149_create_function_for_hl7_insertion_from_mirth.rb
 - db/migrate/20190422095620_streamline_daily_summary_reports.rb
+- db/migrate/20190424101709_add_dietry_protein_intake_to_pet_adequacy_results.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb