renalware-core 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03a33697674a37e0920fd04ad84fd5660c6b526e9084ff923e5ec277d8914a27
-  data.tar.gz: 138b635e40913eba766e0f995b38d14cecbcdf3054a330e35e372a40893a3d5c
+  metadata.gz: 99997d94596ca620e3d8aa825949bfab11b9e7d6c3c09249eb66c57a43ae61f9
+  data.tar.gz: 2f0945104f2bc36f0fb0e01583ae62ac48b86c53533faf5e83dc149216154d5c
 SHA512:
-  metadata.gz: 19b2535e3b70433394f48cf4f74e714b3ca033c38d67cb43ea09a37a6070ea3bc32f678e1af665118d803615da213bec6241a80c8d101b336f5bdbdd43600718
-  data.tar.gz: f4ac2e6ef943e8c77e0c9f6b4ac8b0b860327fb19f7e3dc49f14c7ac2fe20c2e88ae6061facc707ef7040b01d4e0fa0ae5cbb8deda01b8228bf3ac6df7e400e8
+  metadata.gz: 5066afacd3a1591643cd489cb4b5711fa864061c2751c60fefa78814031088ccc513b8360c4e0f3db2575932708cca253032bf8507682fe743cbe886bd7a497a
+  data.tar.gz: 1f3f7ae72253ad1d0805f7e9b03b661c3e39f84caccb0faf343e6b4f591104c2b37001f44b8f44a7963e52e1966660be10d56e1fd3ef9be9dae762eb15e16ef0

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

@@ -218,6 +218,29 @@ ul.provider {
         }
       }
     }
+
+    &.hospital_no {
+      display: inline-block;
+      margin-right: .6em;
+      margin-left: 0;
+      margin-top: .1rem;
+
+      dt, dd {
+        display: block;
+        padding: 0;
+        margin: 0;
+      }
+      dd {
+        font-size: 1em;
+        line-height: 0.9rem;
+      }
+
+      @media #{$medium-only} {
+        dd {
+          line-height: 0.7rem;
+        }
+      }
+    }
   }
 
   .menu-icon {

data/app/controllers/renalware/admissions/consults_controller.rb

@@ -33,6 +33,7 @@ module Renalware
       end
 
       def edit
+        session[:consults_results] = request&.referer # for back link
         render_edit(find_and_authorize_consult)
       end
 
@@ -46,7 +47,7 @@ module Renalware
       end
 
       def destroy
-        find_and_authorize_consult.destroy!
+        find_and_authorize_consult.update!(ended_on: Time.zone.now, by: current_user)
         redirect_to admissions_consults_path, notice: success_msg_for("consult")
       end
 

data/app/models/renalware/admissions/consult.rb

@@ -5,7 +5,6 @@ module Renalware
     class Consult < ApplicationRecord
       include Accountable
       extend Enumerize
-      acts_as_paranoid
       validates :patient_id, presence: true
       validates :started_on, presence: true
       validates :description, presence: true
@@ -21,6 +20,9 @@ module Renalware
 
       enumerize :transfer_priority, in: %i(unknown necessary desirable potential unnecessary)
       enumerize :aki_risk, in: %i(yes no unknown)
+
+      scope :active, ->{ where(ended_on: nil) }
+
     end
   end
 end

data/app/models/renalware/admissions/consult_query.rb

@@ -14,7 +14,7 @@ module Renalware
       end
 
       def search
-        @search ||= Consult.order(created_at: :desc).ransack(query)
+        @search ||= Consult.active.order(created_at: :desc).ransack(query)
       end
     end
   end

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

@@ -46,7 +46,7 @@ module Renalware
 
         class Dialysis < Renalware::HD::SessionDocument::Dialysis
           # rubocop:disable Rails/Validation
-          validates_presence_of attribute_set.map(&:name)
+          validates_presence_of attribute_set.map(&:name).reject{ |att| att == :machine_ktv }
           # rubocop:enable Rails/Validation
         end
         attribute :dialysis, Dialysis

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

@@ -21,17 +21,18 @@ module Renalware
       has_document class_name: "Renalware::Transplants::RecipientOperationDocument"
 
       validates :performed_on, presence: true
-      validates :theatre_case_start_time, presence: true
-      validates :donor_kidney_removed_from_ice_at, presence: true
-      validates :kidney_perfused_with_blood_at, presence: true
       validates :operation_type, presence: true
       validates :hospital_centre, presence: true
-      validates :cold_ischaemic_time_formatted, presence: true
-      validates :warm_ischaemic_time_formatted, presence: true
 
-      validates :donor_kidney_removed_from_ice_at, timeliness: { type: :datetime }
-      validates :kidney_perfused_with_blood_at, timeliness: { type: :datetime }
-      validates :theatre_case_start_time, timeliness: { type: :time }
+      validates :donor_kidney_removed_from_ice_at,
+                timeliness: { type: :datetime },
+                allow_blank: true
+      validates :kidney_perfused_with_blood_at,
+                timeliness: { type: :datetime },
+                allow_blank: true
+      validates :theatre_case_start_time,
+                timeliness: { type: :time },
+                allow_blank: true
 
       enumerize :operation_type,
                 in: %i(kidney kidney_dual kidney_pancreas pancreas kidney_liver liver)

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

@@ -22,6 +22,11 @@
                   include_blank: true,
                   collection: Renalware::Admissions::Consult.aki_risk.values.map{ |value| [value.text, value] },
                   label: "AKI Risk"
+      / .columns.medium-2.large-1
+      /   = f.input :stopped_on_eq_nil,
+      /             include_blank: false,
+      /             collection: [["Yes", true], ["No", false]],
+      /             label: "Active"
       .columns.medium-2.large-2.actions.end
         = f.submit "Filter", class: "button"
         span= " or "

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

@@ -2,10 +2,12 @@
   table
     thead
       tr
-        th.col-width-large= sort_link(query, :consult_site_id, "Location")
+        th= sort_link(query, :consult_site_id, "Location")
         th.at-least.col-width-medium Patient
         th.col-width-nhs-no NHS No.
         th.col-width-reference-no Hosp Nos.
+        th.col-width-date Started
+        th.col-width-date Ended
         th.col-width-medium Modality
         th.col-width-tiny Sex
         th.col-width-tiny Age
@@ -22,6 +24,8 @@
           td= consult.patient_name
           td= consult.patient_nhs_number
           td= consult.patient_hospital_identifiers
+          td= l(consult.started_on)
+          td= l(consult.ended_on)
           td= consult.patient_current_modality
           td= consult.patient_sex
           td= consult.patient_age

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

@@ -1,6 +1,11 @@
+
 = within_admin_layout( \
   title: "Edit",
   breadcrumbs: breadcrumb_for("Admission Consults", admissions_consults_path) \
   ) do
 
+  = link_to "< Back to search results",
+            session[:consults_results] || admissions_consults_path,
+            class: "button secondary"
+  br
   = render "form", consult: consult

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

@@ -16,8 +16,14 @@
       a
         i.fa.fa-ellipsis-v
         = patient
-    dt= patient.hospital_identifier.name
-    dd= patient.hospital_identifier.id
+    - if patient.hospital_identifiers.all.count > 1
+      - patient.hospital_identifiers.all.each do |hospital_identifier|
+        dl.hospital_no
+          dt= hospital_identifier[0]
+          dd= hospital_identifier[1]
+    - else
+      dt= patient.hospital_identifier.name
+      dd= patient.hospital_identifier.id
     dt= t(".nhs_number")
     dd= formatted_nhs_number(patient)
     dt= t(".sex")

data/db/migrate/20180313114927_remove_deleted_at_from_admission_consults.rb

@@ -0,0 +1,5 @@
+class RemoveDeletedAtFromAdmissionConsults < ActiveRecord::Migration[5.1]
+  def change
+    remove_column :admission_consults, :deleted_at, :datetime
+  end
+end

data/db/migrate/20180313124819_remove_tx_operation_constraints.rb

@@ -0,0 +1,9 @@
+class RemoveTxOperationConstraints < ActiveRecord::Migration[5.1]
+  def change
+    change_column_null :transplant_recipient_operations, :theatre_case_start_time, true
+    change_column_null :transplant_recipient_operations, :donor_kidney_removed_from_ice_at, true
+    change_column_null :transplant_recipient_operations, :kidney_perfused_with_blood_at, true
+    change_column_null :transplant_recipient_operations, :warm_ischaemic_time, true
+    change_column_null :transplant_recipient_operations, :cold_ischaemic_time, true
+  end
+end

data/lib/renalware/version.rb

@@ -1,3 +1,3 @@
 module Renalware
-  VERSION = "2.0.3".freeze
+  VERSION = "2.0.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Airslie
@@ -3194,6 +3194,8 @@ files:
 - db/migrate/20180309140316_add_unique_constraint_to_obr_requestor.rb
 - db/migrate/20180311071146_update_patient_summaries_to_version6.rb
 - db/migrate/20180311104609_remove_unique_obr_requestor_order_number_index.rb
+- db/migrate/20180313114927_remove_deleted_at_from_admission_consults.rb
+- db/migrate/20180313124819_remove_tx_operation_constraints.rb
 - db/seeds.rb
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.csv
 - db/seeds/default/accesses/access_pd_catheter_insertion_techniques.rb