renalware-core 2.0.82 → 2.0.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6613bac66d543d656dddf19f744820d1f690e2cdd589e195840d082953dc3874
-  data.tar.gz: 0c5b7dfdae841138413bec257656832e2dc7195839b62ee4d6c8171416415fff
+  metadata.gz: ea36b70295976ad3764e8988b21a0160126325d05e82494067da8df9d8d22f3d
+  data.tar.gz: '0805c5b0363012e45a99f006a45780a15975e910abb553da28dda14e0e2e2adf'
 SHA512:
-  metadata.gz: d79d1f367aeed4cccecb278348334fe34c8bca99b4f8833fd1d7e27577007db9d0c556457b6cf6f4d17d6168626df8c5b44738a179d10bedd0fc058cbd9c5c52
-  data.tar.gz: 714b2db5c4a39955fc102652c3023ed9ad94a12a9c9eb00cc52456d513d9106b3f4b3afe69671b4e34b2f2d0b154cbfddf3d1b390bf6d48b49879c1561e4cfac
+  metadata.gz: a7b2e1287fde1f498844038df58db88456ff9db4195e0e288a442b1da3663bc8c3a69c830d83354c0f72deab19a61a7a08ee778c70e2bf2c68f416f412093082
+  data.tar.gz: 9bd91cf49ba364a0126ecc37f13ac9b92f7bf93ddafce8a25a5b2e69afa9b1d9566ed33a6d05f20c2821247c093f6990768c570179729ce36489e942ab7a72ef

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

@@ -300,9 +300,6 @@ table.hd-sessions {
         }
       }
 
-      &.closed {
-      }
-
       &.dna {
         td {
           background-color: #ccc;
@@ -311,6 +308,11 @@ table.hd-sessions {
 
       td {
         border-right: 1px solid #ddd;
+
+        &:first-child {
+          border-left: 1px solid #ddd;
+        }
+
         &.derived {
           font-style: italic;
         }

data/app/controllers/renalware/transplants/recipient_followups_controller.rb

@@ -79,6 +79,9 @@ module Renalware
           :transplant_failure_cause_other,
           :transplant_failure_notes,
           :graft_nephrectomy_on,
+          :graft_function_onset,
+          :last_post_transplant_dialysis_on,
+          :return_to_regular_dialysis_on,
           document: []
         ]
       end

data/app/models/renalware/transplants/recipient_followup.rb

@@ -9,6 +9,8 @@ module Renalware
       include Document::Base
       extend Enumerize
 
+      enumerize :graft_function_onset, in: %w(immediate delayed primary_non_function)
+
       belongs_to :operation,
                  class_name: "RecipientOperation",
                  foreign_key: "operation_id",

data/app/presenters/renalware/hd/session_presenter.rb

@@ -3,6 +3,12 @@
 module Renalware
   module HD
     class SessionPresenter < SimpleDelegator
+      RR40_ACCESS_SIDE_MAP = {
+        "left" => "L",
+        "right" => "R",
+        "unknown" => "U"
+      }.freeze
+
       attr_reader :preference_set
       delegate :info,
                :observations_before,
@@ -11,7 +17,7 @@ module Renalware
                :complications,
                to: :document, allow_nil: true
       delegate :access_type,
-               :access_type_abbreviation,
+               :access_type_abbreviation, # a concatenation of rr02 and rr41
                :access_side,
                :machine_no,
                to: :info, allow_nil: true
@@ -125,6 +131,10 @@ module Renalware
         end
       end
 
+      def access_side_rr40_code
+        RR40_ACCESS_SIDE_MAP[access_side] || RR40_ACCESS_SIDE_MAP["unknown"]
+      end
+
       protected
 
       attr_reader :session, :view_context

data/app/presenters/renalware/ukrdc/patient_presenter.rb

@@ -39,7 +39,7 @@ module Renalware
       end
 
       def modalities
-        __getobj__.modalities.includes(:description).order(started_on: :asc)
+        __getobj__.modalities.includes(:description).order(started_on: :asc, created_at: :asc)
       end
 
       def dead?

data/app/views/renalware/api/ukrdc/patients/procedures/_dialysis_session.xml.builder

@@ -31,8 +31,8 @@ xml.DialysisSession(
   xml.ExternalId session.uuid
   xml.Attributes do
     xml.QHD19 session.had_intradialytic_hypotension?
-    xml.QHD20 session.access_type
-    xml.QHD21 session.access_side
+    xml.QHD20 session.access_type_abbreviation
+    xml.QHD21 session.access_side_rr40_code
     xml.QHD22 "N" # Access in two sites simultaneously
     xml.QHD30 session.blood_flow
     xml.QHD31 session.duration_in_minutes # Time Dialysed in Minutes

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

@@ -13,6 +13,7 @@ tr.hd-session-row(class=[session.state, stripe_class])
   td= session.before_measurement_for(:weight)
   td= session.before_measurement_for(:pulse)
   td= session.before_measurement_for(:temperature)
+  td= session.before_measurement_for(:respiratory_rate)
   td= session.before_measurement_for(:bm_stix)
   td= session.before_measurement_for(:blood_pressure)
   td(rowspan=2)= session.arterial_pressure
@@ -37,11 +38,12 @@ tr(class=[session.state, stripe_class])
       i=" (#{change})"
   td= session.after_measurement_for(:pulse)
   td= session.after_measurement_for(:temperature)
+  td= session.after_measurement_for(:respiratory_rate)
   td= session.after_measurement_for(:bm_stix)
   td= session.after_measurement_for(:blood_pressure)
   td.print-only= session.signed_off_by
 = content_tag(:tr, id: "hd-session-#{session.id}", style: "display: none")
-  td(colspan=18)
+  td(colspan=19)
     .quick-preview
       = definition_list_for(session, size: :large) do |list|
         = list.definition(:notes){ |value| simple_format(value) }

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

@@ -8,6 +8,7 @@ thead
     th.col-width-tiny= t(".weight")
     th.col-width-tiny= t(".pulse")
     th.col-width-tiny= t(".temperature")
+    th.col-width-tiny= t(".respiratory_rate")
     th.col-width-tiny= t(".bm_stix")
     th.col-width-bp= t(".blood_pressure")
     th.col-width-minute.col-width-tiny(rowspan=3)= t(".arterial_pressure")
@@ -29,6 +30,7 @@ thead
     th.col-width-tiny= t(".pre")
     th.col-width-tiny= t(".pre")
     th.col-width-tiny= t(".pre")
+    th.col-width-tiny= t(".pre")
     th.col-width-minute.col-width-tiny(rowspan=2)=t(".machine_no")
     th.col-width-minute.col-width-tiny(rowspan=2)=t(".machine_ktv")
     th.col-width-minute.col-width-tiny(rowspan=2)=t(".machine_urr")
@@ -40,4 +42,5 @@ thead
     th= t(".post")
     th= t(".post")
     th= t(".post")
+    th= t(".post")
     th.print-only= t(".taken_off_by")

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

@@ -8,10 +8,10 @@ tr(class=[session.state, stripe_class])
   td= session.performed_on
   td= session.hospital_unit_unit_code
   td(colspan=3) Did not attend
-  td(colspan=12)
+  td(colspan=13)
    i= session.truncated_notes
 = content_tag(:tr, id: "hd-session-#{session.id}", style: "display: none")
-  td(colspan=18)
+  td(colspan=19)
     .quick-preview
       = definition_list_for(session, size: :large) do |list|
-        = list.definition(:notes){ |value| simple_format(value) }
+        = list.definition(:notes) { |value| simple_format(value) }

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

@@ -11,8 +11,11 @@ ruby:
   = f.simple_fields_for :document, f.object.document do |fd|
 
     = render layout: "renalware/shared/fieldset",
-        locals: { legend: "Transplant Failure", name: "transplant_failure" } do
+        locals: { legend: "Transplant Outcomes", name: "transplant_failure" } do
+      = f.input :graft_function_onset, wrapper: :horizontal_small
+      = f.input :last_post_transplant_dialysis_on, as: :date_picker, wrapper: :horizontal_datepicker
       = f.input :stent_removed_on, as: :date_picker, wrapper: :horizontal_datepicker
+      = f.input :return_to_regular_dialysis_on, as: :date_picker, wrapper: :horizontal_datepicker
       / readonly: nil here is required to prevent the No option being created with readonly=readonly
       / which causes Capybara to fail because it cannot change the value of read-only element
       = f.input :transplant_failed,

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

@@ -13,13 +13,16 @@
     .grid
       .row
         = render "renalware/shared/attributes_group",
-            legend: "Transplant Failure", destination: "transplant_failure",
-            models: { recipient_followup => [:stent_removed_on,
-                                              :transplant_failed, :transplant_failed_on,
-                                              :transplant_failure_cause_description,
-                                              :transplant_failure_cause_other,
-                                              :transplant_failure_notes,
-                                              :graft_nephrectomy_on] }
+            legend: "Transplant Outcomes", destination: "transplant_failure",
+            models: { recipient_followup => [:graft_function_onset,
+                                             :last_post_transplant_dialysis_on,
+                                             :stent_removed_on,
+                                             :return_to_regular_dialysis_on,
+                                             :transplant_failed, :transplant_failed_on,
+                                             :transplant_failure_cause_description,
+                                             :transplant_failure_cause_other,
+                                             :transplant_failure_notes,
+                                             :graft_nephrectomy_on] }
 
         = render "renalware/shared/documents/attributes_group",
             group: recipient_followup.document.cardiovascular_complication,

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

@@ -214,6 +214,7 @@ en:
           weight: Weight
           pulse: Pulse
           temperature: Temp
+          respiratory_rate: RR
           bm_stix: BM
           blood_pressure: BP
           arterial_pressure: AP

data/config/locales/renalware/transplants/recipient_followup.yml

@@ -2,8 +2,11 @@ en:
   activerecord:
     attributes:
       renalware/transplants/recipient_followup:
+        graft_function_onset: Graft Function Onset
+        last_post_transplant_dialysis_on: Date of last Dialysis Post-Transplant
         stent_removed_on: Stent Removal Date
         graft_nephrectomy_on: Date of Graft Nephrectomy
+        return_to_regular_dialysis_on: Date of Return to Regular Dialysis
         transplant_failed: Transplant Failed
         transplant_failed_on: Date of Transplant Failure
         transplant_failure_cause_description_id: Cause of Transplant Failure
@@ -23,3 +26,9 @@ en:
         peripheral_vascular_disease: Peripheral vascular disease
         stroke: Stroke
         transient_ischaemic_attack: Transient ischaemic attack
+  enumerize:
+    renalware/transplants/recipient_followup:
+      graft_function_onset:
+        immediate: Immediate (1)
+        delayed: Delayed (2)
+        primary_non_function: Primary Non-Function (3)

data/db/migrate/20190611152859_add_fields_to_transplant_recipient_workup.rb

@@ -0,0 +1,9 @@
+class AddFieldsToTransplantRecipientWorkup < ActiveRecord::Migration[5.2]
+  def change
+    within_renalware_schema do
+      add_column :transplant_recipient_followups, :graft_function_onset, :string
+      add_column :transplant_recipient_followups, :last_post_transplant_dialysis_on, :date
+      add_column :transplant_recipient_followups, :return_to_regular_dialysis_on, :date
+    end
+  end
+end

data/db/seeds/default/accesses/access_types.csv

@@ -1,8 +1,49 @@
-"code","name","abbreviation"
-"01","Non-tunnelled line","NTL"
-"02","Tunnelled Line","TL"
-"03","Arteriovenous fistula (AVF)","AVG"
-"04","Arteriovenous graft (AVG)","AVF"
-"05","Vein loop","VL"
-"06","PD catheter","PD"
-"07","PD catheter temp","PDTmp"
+"name","rr02_description","rr02_code","rr41_description","rr41_code"
+"Radial cephalic fistula","Arteriovenous fistula","AVF","Radio-cephalic wrist","RC"
+"Radial Basilic fistula","Arteriovenous fistula","AVF","Radio-cephalic wrist","RC"
+"Brachial Cephalic fistula","Arteriovenous fistula","AVF","Brachio-cephalic","BC"
+"Brachial Basilic fistula","Arteriovenous fistula","AVF","Brachio-basilic","BB"
+"Brachial Brachial fistula","Arteriovenous fistula","AVF","Brachio-basilic","BB"
+"Basilic vein transposition","","","",""
+"Brachial vein transposition","","","",""
+"Cephalic vein transposition","","","",""
+"Radial cephalic PTFE graft","Arteriovenous graft","AVG","Radio-cephalic wrist","RC"
+"Radial basilic PTFE graft","Arteriovenous graft","AVG","Forearm NOS","UF"
+"Brachial axillary PTFE graft","Arteriovenous graft","AVG","Brachio-basilic","BB"
+"Axillary axillary PTFE graft","Arteriovenous graft","AVG","Other","UO"
+"Axillary axillary cross-over PTFE Graft","Arteriovenous graft","AVG","Other","UO"
+"CFA CFV PTFE graft","Arteriovenous graft","AVG","Other","UO"
+"SFA CFV PTFE Graft","Arteriovenous graft","AVG","Other","UO"
+"Popliteal CFV PTFE Graft","Arteriovenous graft","AVG","Popliteal-long saphenous","PS"
+"Vein patch angioplasty","","","",""
+"PTFE Jump graft","Arteriovenous graft","AVG","Other","UO"
+"AVF Pseudoaneurysm repair","","","",""
+"AVF Aneurysm excision","","","",""
+"AVF Aneurysm exclusion + bypass graft","","","",""
+"Aneurysmorrhaphy","","","",""
+"DRIL","","","",""
+"PAI","","","",""
+"Banding","","","",""
+"Tenckhoff Insertion (GA)Open","PD catheter","PDC","",""
+"Tenckhoff Insertion (GA) Open Buried","PD Embedded Catheter","PDE","",""
+"Tenckhoff Insertion (GA) Laparoscopic","PD catheter","PDC","",""
+"Tenckhoff Insertion (GA) Laparoscopic Buried","PD Embedded Catheter","PDE","",""
+"Tenckhoff Insertion (LA)","PD catheter","PDC","",""
+"Tenckhoff Insertion (LA) Buried","PD Embedded Catheter","PDE","",""
+"Tenckhoff Removal (GA)","","","",""
+"Tenckhoff Removal (LA)","","","",""
+"Tenckhoff Reposition (GA) Open","PD catheter","PDC","",""
+"Tenckhoff Reposition (GA) Laparoscopic","PD catheter","PDC","",""
+"Tenckhoff Reposition (LA)","PD catheter","PDC","",""
+"Tenckhoff New Exit Site (LA)","","","",""
+"Tenckhoff Removal & Re-Insertion (GA) Open","PD catheter","PDC","",""
+"Tenckhoff Removal & Re-Insertion (GA)Laparoscopic","PD catheter","PDC","",""
+"Tenckhoff Removal & Re-Insertion (LA)","PD catheter","PDC","",""
+"Vascath int jug","Non-tunnelled line","NLN","Internal jugular line","LJ"
+"Vascath subclav","Non-tunnelled line","NLN","Subclavian line","LS"
+"Vascath fem","Non-tunnelled line","NLN","Femoral vein line","LF"
+"Tunnelled int jug","Tunnelled line","TLN","Internal jugular line","LJ"
+"Tunnelled subclav","Tunnelled line","TLN","Subclavian line","LS"
+"Tunnelled fem","Tunnelled line","TLN","Femoral vein line","LF"
+"Renal Biopsy Native","","","",""
+"Renal Biopsy Transplant","","","",""

data/db/seeds/default/accesses/access_types.rb

@@ -2,13 +2,23 @@
 
 module Renalware
   log "Adding Access Types" do
-
     file_path = File.join(File.dirname(__FILE__), "access_types.csv")
 
     CSV.foreach(file_path, headers: true) do |row|
-      Accesses::Type.find_or_create_by!(code: row["code"]) do |type|
-        type.name = row["name"]
-        type.abbreviation = row["abbreviation"]
+      if row["rr02_code"].present?
+        rr02_code = row["rr02_code"]
+        abbreviation = rr02_code
+      end
+
+      if row["rr41_code"].present?
+        rr41_code = row["rr41_code"]
+        abbreviation = "#{rr02_code} #{rr41_code}"
+      end
+
+      Accesses::Type.find_or_create_by!(name: row["name"]) do |type|
+        type.rr02_code = rr02_code
+        type.rr41_code = rr41_code
+        type.abbreviation = abbreviation
       end
     end
   end

data/db/seeds/default/accesses/seeds.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 require_relative "./access_sites"
-require_relative "./access_types_procedures"
+require_relative "./access_types"
 require_relative "./access_plan_types"
 require_relative "./access_pd_catheter_insertion_techniques"

data/lib/renalware/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.82
+  version: 2.0.83
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -3492,6 +3492,7 @@ files:
 - db/migrate/20190603143834_update_import_practice_memberships_csv.rb
 - db/migrate/20190603165812_drop_import_practices_csv_function.rb
 - db/migrate/20190607134717_add_ukrdc_modality_code_id_to_modality_descriptions.rb
+- db/migrate/20190611152859_add_fields_to_transplant_recipient_workup.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb
@@ -3501,8 +3502,6 @@ files:
 - db/seeds/default/accesses/access_sites.rb
 - db/seeds/default/accesses/access_types.csv
 - db/seeds/default/accesses/access_types.rb
-- db/seeds/default/accesses/access_types_procedures.csv
-- db/seeds/default/accesses/access_types_procedures.rb
 - db/seeds/default/accesses/seeds.rb
 - db/seeds/default/clinics/clinics.rb
 - db/seeds/default/clinics/seeds.rb

data/db/seeds/default/accesses/access_types_procedures.csv

@@ -1,49 +0,0 @@
-"name","rr02_description","rr02_code","rr41_description","rr41_code"
-"Radial cephalic fistula","Arteriovenous fistula","AVF","Radio-cephalic wrist","RC"
-"Radial Basilic fistula","Arteriovenous fistula","AVF","Radio-cephalic wrist","RC"
-"Brachial Cephalic fistula","Arteriovenous fistula","AVF","Brachio-cephalic","BC"
-"Brachial Basilic fistula","Arteriovenous fistula","AVF","Brachio-basilic","BB"
-"Brachial Brachial fistula","Arteriovenous fistula","AVF","Brachio-basilic","BB"
-"Basilic vein transposition","","","",""
-"Brachial vein transposition","","","",""
-"Cephalic vein transposition","","","",""
-"Radial cephalic PTFE graft","Arteriovenous graft","AVG","Radio-cephalic wrist","RC"
-"Radial basilic PTFE graft","Arteriovenous graft","AVG","Forearm NOS","UF"
-"Brachial axillary PTFE graft","Arteriovenous graft","AVG","Brachio-basilic","BB"
-"Axillary axillary PTFE graft","Arteriovenous graft","AVG","Other","UO"
-"Axillary axillary cross-over PTFE Graft","Arteriovenous graft","AVG","Other","UO"
-"CFA CFV PTFE graft","Arteriovenous graft","AVG","Other","UO"
-"SFA CFV PTFE Graft","Arteriovenous graft","AVG","Other","UO"
-"Popliteal CFV PTFE Graft","Arteriovenous graft","AVG","Popliteal-long saphenous","PS"
-"Vein patch angioplasty","","","",""
-"PTFE Jump graft","Arteriovenous graft","AVG","Other","UO"
-"AVF Pseudoaneurysm repair","","","",""
-"AVF Aneurysm excision","","","",""
-"AVF Aneurysm exclusion + bypass graft","","","",""
-"Aneurysmorrhaphy","","","",""
-"DRIL","","","",""
-"PAI","","","",""
-"Banding","","","",""
-"Tenckhoff Insertion (GA)Open","PD catheter","PDC","",""
-"Tenckhoff Insertion (GA) Open Buried","PD Embedded Catheter","PDE","",""
-"Tenckhoff Insertion (GA) Laparoscopic","PD catheter","PDC","",""
-"Tenckhoff Insertion (GA) Laparoscopic Buried","PD Embedded Catheter","PDE","",""
-"Tenckhoff Insertion (LA)","PD catheter","PDC","",""
-"Tenckhoff Insertion (LA) Buried","PD Embedded Catheter","PDE","",""
-"Tenckhoff Removal (GA)","","","",""
-"Tenckhoff Removal (LA)","","","",""
-"Tenckhoff Reposition (GA) Open","PD catheter","PDC","",""
-"Tenckhoff Reposition (GA) Laparoscopic","PD catheter","PDC","",""
-"Tenckhoff Reposition (LA)","PD catheter","PDC","",""
-"Tenckhoff New Exit Site (LA)","","","",""
-"Tenckhoff Removal & Re-Insertion (GA) Open","PD catheter","PDC","",""
-"Tenckhoff Removal & Re-Insertion (GA)Laparoscopic","PD catheter","PDC","",""
-"Tenckhoff Removal & Re-Insertion (LA)","PD catheter","PDC","",""
-"Vascath int jug","Non-tunnelled line","NLN","Internal jugular line","LJ"
-"Vascath subclav","Non-tunnelled line","NLN","Subclavian line","LS"
-"Vascath fem","Non-tunnelled line","NLN","Femoral vein line","LF"
-"Tunnelled int jug","Tunnelled line","TLN","Internal jugular line","LJ"
-"Tunnelled subclav","Tunnelled line","TLN","Subclavian line","LS"
-"Tunnelled fem","Tunnelled line","TLN","Femoral vein line","LF"
-"Renal Biopsy Native","","","",""
-"Renal Biopsy Transplant","","","",""

data/db/seeds/default/accesses/access_types_procedures.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Renalware
-  log "Adding Access Types & Procedures" do
-
-    file_path = File.join(File.dirname(__FILE__), "access_types_procedures.csv")
-
-    CSV.foreach(file_path, headers: true) do |row|
-      if row["rr02_code"].present?
-        rr02_code = row["rr02_code"]
-        abbreviation = rr02_code
-      end
-
-      if row["rr41_code"].present?
-        rr41_code = row["rr41_code"]
-        abbreviation = "#{rr02_code} #{rr41_code}"
-      end
-
-      Accesses::Type.find_or_create_by!(name: row["name"]) do |type|
-        type.rr02_code = rr02_code
-        type.rr41_code = rr41_code
-        type.abbreviation = abbreviation
-      end
-    end
-  end
-end