renalware-core 2.0.101 → 2.0.102

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be1dd365f062fce54445146b4623f13ae28d5ccc97c0530d78b8c4f9e57a4dc5
-  data.tar.gz: 1b610c630f72fdb4f66585eeb3fbaf6d659ea5ea8f5b3effbbc2d5d12d64f898
+  metadata.gz: e133555ef2e268c6afe1886268f93c58e83e894946580483a919e39d93f1b077
+  data.tar.gz: 6f95064fe71e9d753935ce21c44cd46486e973f940777ff065be97fe502fa7bb
 SHA512:
-  metadata.gz: ac5d3ea6f737b6bd9b2fef873c0caf1385747eedc1a010c1b7cb136b63422d223ea648e13cb73a6ae05c8afe9504efdb28f851644e131abf6e047c0908dd2ec7
-  data.tar.gz: 535b8985590dc9ee936a504371a0807d4396c8a5e95c3e616217bd3646751de4ccf2cf5a91609a928abbc0395f33b824e0ff71947d761c43f6413626a026ba15
+  metadata.gz: c3e4ce78a878dd8933d791d30c7692056997b4194468c53924d2620f126192296e117c5b1d7db72b74e6fdd7a69ec63e3d95913497e43291038409ce1fcfa917
+  data.tar.gz: 3a377a342f2585c1341860e233dc7af417cd66d9cc43306bb3648fd9ca8f572cd01938134494a5b96b7d5734a032c00944e109dde7dfe08211f1f6ce57f1ec2d

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

@@ -85,6 +85,7 @@ module Renalware
           :tidal_indicator, :tidal_percentage, :no_cycles_per_apd,
           :apd_machine_pac, :dwell_time, :therapy_time, :fill_volume, :delivery_interval,
           :system_id, :last_fill_volume, :additional_manual_exchange_volume,
+          :exchanges_done_by, :exchanges_done_by_if_other, :exchanges_done_by_notes,
           bags_attributes: [
             :id, :regime_id, :bag_type_id, :volume, :role, :capd_overnight_bag, :per_week,
             :monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday, :_destroy

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

@@ -8,6 +8,20 @@ module Renalware
       extend Enumerize
 
       enumerize :assistance_type, in: %i(none setup connect disconnect connect_and_disconnect)
+      enumerize(
+        :exchanges_done_by,
+        in: %i(
+          by_patient
+          predominantly_by_patient
+          equally_between_patient_and_others
+          predominantly_by_others
+          only_by_others
+        )
+      )
+      enumerize(
+        :exchanges_done_by_if_other,
+        in: %i(spouse daughter_son_in_law others_specify mix_specify)
+      )
 
       belongs_to :patient, class_name: "Renalware::Patient", touch: true
       belongs_to :system
@@ -25,8 +39,7 @@ module Renalware
       validates :start_date, presence: true, timeliness: { type: :date }
       validates :end_date,
                 timeliness: { type: :date, on_or_after: ->(regime) { regime.start_date } },
-                allow_blank: true,
-                allow_nil: true
+                allow_blank: true
       validates :treatment, presence: true
       validate :min_one_bag
 

data/app/models/renalware/renal/profile.rb

@@ -18,17 +18,15 @@ module Renalware
       has_document class_name: "Renalware::Renal::ProfileDocument"
 
       validates :patient, presence: true, uniqueness: true
-      validates :esrf_on, timeliness: { type: :date, allow_nil: true }, allow_blank: true
+      validates :esrf_on, timeliness: { type: :date }, allow_blank: true
       validates :first_seen_on,
                 timeliness: {
-                  type: :date,
-                  allow_nil: true
+                  type: :date
                 },
                 allow_blank: true
       validates :comorbidities_updated_on,
                 timeliness: {
-                  type: :date,
-                  allow_nil: true
+                  type: :date
                 },
                 allow_blank: true
 

data/app/models/renalware/ukrdc/transmission_log.rb

@@ -8,7 +8,7 @@ module Renalware
       validates :sent_at, presence: true
       validates :status, presence: true
       belongs_to :patient, class_name: "Renalware::Patient"
-      enum status: [:undefined, :error, :unsent_no_change_since_last_send, :sent]
+      enum status: { undefined: 0, error: 1, unsent_no_change_since_last_send: 2, sent: 3 }
       scope :ordered, -> { order(sent_at: :asc) }
 
       def self.with_logging(patient, request_uuid)

data/app/presenters/renalware/letters/letter_presenter.rb

@@ -91,6 +91,10 @@ module Renalware
         letterhead.site_code
       end
 
+      def hospital_unit_renal_registry_code
+        ::Renalware::Hospitals::Unit.find_by(unit_code: hospital_unit_code)&.renal_registry_code
+      end
+
       def title
         pdf_stateless_filename
       end

data/app/views/renalware/admin/feeds/files/index.html.slim

@@ -56,5 +56,3 @@
     - if defined?(delayed_job_path)
       br
       = "You can also see those jobs #{link_to("here", delayed_job_path)} if you have access.".html_safe
-
-

data/app/views/renalware/admin/users/index.html.slim

@@ -26,7 +26,6 @@
       th.col-width-medium.show-for-xlarge-up Telephone #
       th.col-width-date-time.show-for-xlarge-up= sort_link(user_search, :created_at, "Added")
 
-
     tbody
       - users.each do |user|
         = content_tag_for(:tr, user) do

data/app/views/renalware/admissions/consults/edit.html.slim

@@ -1,4 +1,3 @@
-
 = within_admin_layout( \
   title: "Edit",
   breadcrumbs: breadcrumb_for("Admission Consults", admissions_consults_path) \

data/app/views/renalware/admissions/consults/index.pdf.slim

@@ -7,4 +7,3 @@
     h2.muted= I18n.l(Time.zone.today)
   = render "filters"
   = render "table", consults: consults
-

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

@@ -20,9 +20,11 @@ xml.Documents do
         xml.Code letter.updated_by&.username
         xml.Description letter.updated_by
       end
-      xml.EnteredAt do
-        xml.CodingStandard "ODS"
-        xml.Code letter.hospital_unit_code
+      if letter.hospital_unit_renal_registry_code.present?
+        xml.EnteredAt do
+          xml.CodingStandard "LOCAL"
+          xml.Code letter.hospital_unit_renal_registry_code
+        end
       end
       xml.FileType "application/pdf"
       xml.FileName letter.pdf_stateless_filename

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

@@ -14,8 +14,7 @@ observation_times = {
   measurements = {
     "blood_pressure.systolic" => observations.blood_pressure&.systolic,
     "blood_pressure.diastolic" => observations.blood_pressure&.diastolic,
-    "weight" => observations.weight,
-    "bm_stix" => observations.bm_stix,
+    "weight" => observations.weight
   }
 
   if observations.temperature_measured == :yes

data/app/views/renalware/api/ukrdc/patients/lab_orders/_lab_order.xml.builder

@@ -21,6 +21,8 @@ xml.LabOrder do
   # end
   xml.OrderCategory do
     xml.Code request.description.code
+    # xml.CodingStandard "LOCAL"
+    # xml.Description "Standard Renal Tests"
   end
   xml.SpecimenCollectedTime request.requested_at&.iso8601
   # xml.SpecimenReceivedTime "TODO"

data/app/views/renalware/api/ukrdc/patients/treatments/_pd.xml.builder

@@ -3,7 +3,7 @@
 xml = builder
 
 xml.Treatment do
-  xml.EncounterNumber [treatment.modality_id,treatment.pd_regime_id].compact.join("-")
+  xml.EncounterNumber [treatment.modality_id, treatment.pd_regime_id].compact.join("-")
   xml.EncounterType "N"
   xml.FromTime treatment.started_on&.iso8601
   xml.ToTime(treatment.ended_on&.iso8601) if treatment.ended_on.present?

data/app/views/renalware/clinics/appointments/index.html.slim

@@ -14,7 +14,6 @@
         .medium-3.large-3.columns.actions.end
           = f.submit "Filter", class: "button"
 
-
 = content_for(:actions) do
   = link_to "Add",
           new_appointment_path,

data/app/views/renalware/devise/registrations/new.html.slim

@@ -20,7 +20,6 @@
               input_html: { autocomplete: "off" },
               wrapper: :horizontal_small
 
-
     .panel
       b
         | Check this box if you feel you should have full access to the database.

data/app/views/renalware/hd/mdm_patients/_filters.html.slim

@@ -1,4 +1,3 @@
-
 = simple_form_for filter_form,
                   as: :filter,
                   url: filter_form.url,

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

@@ -28,7 +28,6 @@ tr.hd-session-row(class=[session.state, stripe_class])
   td.print-only(rowspan=2)= session.notes
   td.print-only= session.signed_on_by
 
-
 tr(class=[session.state, stripe_class])
   td= tooltip(label: session.summarised_access_used, content: session.access_used)
   td= session.end_time

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

@@ -21,7 +21,6 @@ thead
     th.col-width-notes.text-center.print-only(rowspan=3)= t(".notes")
     th.col-width-user.text-center.print-only= t(".user")
 
-
   tr.row2
     th(rowspan=2)= t(".access")
     th.col-width-time= t(".start_time")

data/app/views/renalware/layouts/pdf.pdf.slim

@@ -4,7 +4,6 @@ html
     meta content=("text/html; charset=UTF-8") http-equiv="Content-Type" /
     meta charset="utf-8" /
 
-
     = yield(:head)
     = wicked_pdf_stylesheet_link_tag "renalware/pdf"
     = yield(:head2)

data/app/views/renalware/letters/contacts/_new_person.html.slim

@@ -24,4 +24,3 @@
     .large-12.columns
       = render "/renalware/letters/contacts/person_form", f: f,
           contact_descriptions: contact_descriptions
-

data/app/views/renalware/letters/contacts/_person_form.html.slim

@@ -48,5 +48,3 @@
     .row
       .columns.small-12
         = f.input :notes, as: :text, input_html: { rows: 2 }
-
-

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

@@ -25,7 +25,7 @@ article.main-recipient
 
     = fmr.input :id, as: :hidden
 
-    div#contact-selector(style="display: none")
+    #contact-selector(style="display: none")
       #contact-selector-input
         = fmr.input :addressee_id,
                     as: :select,

data/app/views/renalware/low_clearance/profiles/edit.html.slim

@@ -1,7 +1,6 @@
 = within_patient_layout(title: "Profile",
   breadcrumbs: breadcrumb_for("Low Clearance Summary", patient_low_clearance_dashboard_path(patient))) do
 
-
   / in show
   /        = render "renalware/shared/documents/attributes_group",
                    group: profile.document.low_clearance,

data/app/views/renalware/patients/clinical_summaries/show.html.slim

@@ -6,6 +6,5 @@
 -# Template Dependency: renalware/**/summary_part
 = within_patient_layout(title: "Clinical Summary") do
   .row
-    - patient = clinical_summary.patient
     - summary_parts = clinical_summary.summary_parts(current_user).each do |summary_part|
       = render summary_part

data/app/views/renalware/patients/patients/_form.html.slim

@@ -14,7 +14,7 @@
     = f.input :title, wrapper: :horizontal_tiny
     = f.input :family_name, wrapper: :horizontal_small
     = f.input :given_name, wrapper: :horizontal_small
-    = f.input :suffix, wrapper: :horizontal_small
+    /= f.input :suffix, wrapper: :horizontal_small
     = f.input :born_on, as: :date_picker, label: "DoB", wrapper: :horizontal_datepicker
     = f.input :sex,
         selected: patient.sex.code,

data/app/views/renalware/patients/patients/_patient.html.slim

@@ -6,7 +6,7 @@ tr
   td= patient.sex.code
   td= patient.born_on
   td= patient.age
-  - if(patient.send_to_rpv?)
+  - if patient.send_to_rpv?
     td(title="#{patient.rpv_decision}")
       i.fas.fa-check
   -else

data/app/views/renalware/patients/side_menu/_actions.html.slim

@@ -22,7 +22,6 @@
   li.link.action= render partial: "renalware/messaging/internal/messages/send_message_link",
                   locals: { patient: patient, link_text: t(".send_message") }
 
-
 li.link.action= render partial: "renalware/admissions/requests/create_request_link",
                 locals: { patient: patient, link_text: t(".request_admission") }
 

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

@@ -21,6 +21,9 @@
             wrapper: :horizontal_small
   = f.input :start_date, as: :date_picker, wrapper: :horizontal_datepicker
   = f.input :end_date, as: :date_picker, wrapper: :horizontal_datepicker
+  = f.input :exchanges_done_by, wrapper: :horizontal_small
+  = f.input :exchanges_done_by_if_other, wrapper: :horizontal_small
+  = f.input :exchanges_done_by_notes, as: :string, wrapper: :horizontal_medium
   = f.input :add_hd, as: :boolean, wrapper: :horizontal_small
 
 = render(partial: "pd_regime_bags", locals: { f: f })

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

@@ -7,7 +7,7 @@
     .columns.medium-6
       = article_tag "Treatment" do
 
-          dl.dl-horizontal
+          dl.dl-horizontal.xlarge
             dt Last Updated:
             dd= l regime.updated_at
             dt Start:
@@ -18,6 +18,12 @@
             dd= regime.treatment
             - if regime.apd?
               = render("renalware/pd/regimes/assistance_type", regime: regime)
+            dt= attr_name(regime, :exchanges_done_by)
+            dd= regime.exchanges_done_by&.text
+            dt= attr_name(regime, :exchanges_done_by_if_other)
+            dd= regime.exchanges_done_by_if_other&.text
+            dt= attr_name(regime, :exchanges_done_by_notes)
+            dd= regime.exchanges_done_by_notes
             dt On additional HD?:
             dd= yes_no(regime.add_hd)
             = render "renalware/pd/regimes/glucose", regime: regime

data/app/views/renalware/renal/aki_alerts/_filters.html.slim

@@ -37,7 +37,7 @@ scss:
           a.set_filter_date_to_any_date(href="") Clear
       .columns.medium-1.large-1
         = f.input :on_hotlist,
-                  collection: [["Yes",true],["No",false]],
+                  collection: [["Yes", true], ["No", false]],
                   label: "Hotlist"
       .columns.medium-2.large-2
         = f.input :action,

data/app/views/renalware/shared/documents/_year_dated_diagnosis_input.html.slim

@@ -7,7 +7,6 @@
           collection: Renalware::YearDatedConfirmation.valid_years.reverse,
           input_html: { class: "tiny-input" }
 
-
 = f.simple_fields_for attribute, renderable do |fd|
   .row(class=attribute)
     .columns.small-12.medium-3.large-3

data/app/views/renalware/system/messages/_message.html.slim

@@ -1,4 +1,4 @@
-div.system-message.alert-box.radius(class=message.severity)
+.system-message.alert-box.radius(class=message.severity)
   - if message.title.present?
     h1= message.title
   = simple_format(message.body)

data/app/views/renalware/transplants/recipient_followups/_form.html.slim

@@ -82,7 +82,7 @@ ruby:
       / unsaved ones that cocoon has kept around for us. So instead use #sort_by, allowing for
       / a nil recorded_on date if that value in a newly added and unsaved episode has not yet been
       / entered.
-      - episodes = f.object.rejection_episodes.sort_by{ |ep| ep.recorded_on || Time.zone.today }
+      - episodes = f.object.rejection_episodes.sort_by { |ep| ep.recorded_on || Time.zone.today }
       = f.simple_fields_for :rejection_episodes, episodes do |episode|
         = render "rejection_episode_fields", f: episode
 
@@ -92,7 +92,6 @@ ruby:
               as: :text,
               input_html: { rows: 5 }
 
-
 .row
   .large-12.columns
     = f.submit "Save", class: "button save-button"

data/app/views/renalware/transplants/recipient_operations/new.html.slim

@@ -1,6 +1,6 @@
 = within_patient_layout(title: "New Recipient Operation",
-                         breadcrumbs: [ \
-                           recipient_summary_breadcrumb(patient)]) do
+                        breadcrumbs: [\
+                          recipient_summary_breadcrumb(patient)]) do
 
   .document
     = simple_form_for recipient_operation,

data/app/views/renalware/ukrdc/summary_mailer/export_summary.html.slim

@@ -9,5 +9,4 @@ p= "Count of patients changed since the last time they were sent: #{summary.num_
     - summary.results.each do |key, value|
       li= "#{key.to_s.humanize}: #{value}"
 
-
 p= "Count of files waiting in outgoing folder: #{summary.count_of_files_in_outgoing_folder}"

data/config/initializers/inflections.rb

@@ -17,6 +17,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym "AKI"
   inflect.acronym "APD"
   inflect.acronym "API"
+  inflect.acronym "BLT"
   inflect.acronym "BMI"
   inflect.acronym "CAPD"
   inflect.acronym "CC"

data/config/locales/renalware/pd/regime.en.yml

@@ -29,6 +29,9 @@ en:
         delivery_interval: Delivery interval
         start_date: Start date
         end_date: End date
+        exchanges_done_by: Exchanges done by
+        exchanges_done_by_if_other: Exchanges done by (if other)
+        exchanges_done_by_notes: Exchanges done by (if specify)
       renalware/pd/regime_bag:
         sunday: Sun
         monday: Mon
@@ -78,3 +81,15 @@ en:
         ordinary: Ordinary bag
         last_fill: Last fill
         additional_manual_exchange: Additional manual exchange
+    renalware/pd/regime:
+      exchanges_done_by:
+        by_patient: By patient
+        predominantly_by_patient: Predominantly by patient
+        equally_between_patient_and_others: Equally between patient and others
+        predominantly_by_others: Predominantly by others
+        only_by_others: Only by others
+      exchanges_done_by_if_other:
+        spouse: Spouse
+        daughter_son_in_law: Daughter/son/in-law
+        others_specify: Others - specify
+        mix_specify: Mix - specify

data/db/migrate/20190830082736_add_pd_regime_columns_for_blt.rb

@@ -0,0 +1,9 @@
+class AddPDRegimeColumnsForBLT < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_column :pd_regimes, :exchanges_done_by, :string
+      add_column :pd_regimes, :exchanges_done_by_if_other, :string
+      add_column :pd_regimes, :exchanges_done_by_notes, :text
+    end
+  end
+end

data/lib/renalware/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.101
+  version: 2.0.102
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -3546,6 +3546,7 @@ files:
 - db/migrate/20190823044107_add_outcome_columns_to_clinic_appointments.rb
 - db/migrate/20190823051014_add_hidden_colum_to_event_types.rb
 - db/migrate/20190823105642_add_asked_for_write_access_to_users.rb
+- db/migrate/20190830082736_add_pd_regime_columns_for_blt.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb