renalware-core 2.0.134 → 2.0.135

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b308604c578950cd16e772e2d2f7a6dbfb86dfbcafb84f8aa01b16ffa0d8d9c7
-  data.tar.gz: 7f0eac255cb6e8f039202b60212f7b2b9b7c38eeaffd0f0a7f7844a41d198ca3
+  metadata.gz: 1dd66726ab2f121aa82adb08e1394ac8ff1756942f8d449b9c836515ef15c036
+  data.tar.gz: 7ca005b27ddfc4a1cd1e26991af6919fccbe6da98b2bd9dffb7acb0a31315f53
 SHA512:
-  metadata.gz: 82528a4b57e270d3f1668ed007c07aa3f4a81c15b30ac70aab0e44c6a037b0779cd2dc3d5007427907740f51d4b3e3e5f087332df26f0de55ce368444627148e
-  data.tar.gz: c675b81757960c0f4f975c997b70437e97126578ed69d4d7c333ed539bf8873156f0e11c0639b2fd60badbe29177dcc4040c586da580f8d83a6a2336c005194c
+  metadata.gz: 6f7b907624c1f47c6aababef3e08aa301f8fed2e06f16edea73d7dfb1d291ed656904e37ed3295fd4a8adb897ab9288f721f14e665b59f84a2060d10abafc8c2
+  data.tar.gz: 717795f78c80e5f23cad39a20ecbc0395029f77fde81a738043fc67c8c71bf06f3bda2e0f6d18b682b63d8a26bf2c9e10386839b273219b40c39410db9fff6fc

data/app/controllers/renalware/deaths_controller.rb

@@ -7,8 +7,12 @@ module Renalware
 
     def index
       patients = Patient.dead.page(page).per(per_page)
+      search = patients.ransack(params[:q])
       authorize patients
-      render locals: { patients: present(patients, PatientPresenter) }
+      render locals: {
+        patients: present(search.result, PatientPresenter),
+        q: search
+      }
     end
 
     def edit

data/app/models/renalware/accesses/patient.rb

@@ -27,11 +27,18 @@ module Renalware
         SQL
       }
 
+      # Because the database allows multiple current access profiles, this scope
+      # needs to choose just one, otherwise queries that merge in this scope 
+      # can have duplicates, or worse, broken pagination.
       scope :with_profile, lambda {
         joins(<<-SQL)
-          left outer join access_profiles on (access_profiles.patient_id = patients.id
-            and access_profiles.terminated_on is null
-            and access_profiles.started_on <= current_date)
+          left outer join (
+            select distinct on (patient_id) * from access_profiles 
+              where
+                access_profiles.terminated_on is null
+                and access_profiles.started_on <= current_date
+              order by patient_id, updated_at desc
+          ) access_profiles on (access_profiles.patient_id = patients.id)
           left outer join access_types on access_types.id = access_profiles.type_id
         SQL
       }

data/app/models/renalware/patients/clear_patient_ukrdc_data.rb

@@ -16,6 +16,7 @@ module Renalware
         patient.send_to_rpv = false
         patient.rpv_decision_on = Time.zone.today
         patient.rpv_recorded_by = by.to_s
+        patient.skip_death_validations = true
         patient.save_by!(by)
       end
     end

data/app/views/renalware/deaths/index.html.slim

@@ -13,8 +13,8 @@
         th.col-width-nhs-no NHS No.
         th.col-width-reference-no Hosp No.
         th.col-width-tiny Sex
-        th.col-width-date Date of Birth
-        th.col-width-date Date of Death
+        th.col-width-date= sort_link([:renalware, q], :born_on, "Date of Birth")
+        th.col-width-date-time= sort_link([:renalware, q], :died_on, "Date of Death")
         th.col-width-tiny Age
         th.col-width-medium
 

data/lib/renalware/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.134
+  version: 2.0.135
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview-component