renalware-core 2.0.0.pre.rc4 → 2.0.0.pre.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2adae7283349900967b688b6e5540a25f5f92bedfd851bc4c1ee4867d714cb9c
-  data.tar.gz: 1f294a120860167a97636ff519da463df2503391821c9ca8129dc60177796dcc
+  metadata.gz: '029ce152132118a328d4531c385ef69f1099851f896560c5c229f78597c40b06'
+  data.tar.gz: 48865c348da03e90d9107edf4d94a010f6ba5ae4318cc150d9c71cfbdf753e96
 SHA512:
-  metadata.gz: df23ef342eff7ef9344655965caae92a6bb1350936ffef3dacbf4f5889db2a2cfeb7453349383d6f58c3d0f9df8c0a4397cbf9cd0d1d9e8413c3581a051dcdc7
-  data.tar.gz: 7b618ddc3af4f1b0359001feaad0c3ae535b49dd1f5072a967e920f267038e6fdc6e7bd879cdf234c05d3a41183c6fd1d1ee3f4bc41aef163c5d95f9e2ae18e1
+  metadata.gz: a83a65471cc274aed97ce173dd41d34dcb674b48ea7b71887dbd712e2a1610ce6ceaea9952e1243f22448724e7e2a3b557b569dddd835e7d0c31b733f018a096
+  data.tar.gz: 11534fdc42c9af7b7789ae428d46f1ccd0b88d441aaf0332e953eb42174d958cb1b76f99f7fbbbc7f5732355840aa18b26abbab422effdf34a20a36967f612b3

data/app/models/concerns/renalware/patient_pathology_scopes.rb

@@ -27,7 +27,7 @@ module Renalware
         base.ransacker(:"#{code}_date") { pathology_date_sort_predicate(code) }
       end
 
-      %i(mdrd).each do |code|
+      %i(egfr).each do |code|
         base.ransacker(code) { pathology_result_sort_predicate(code) }
       end
     end

data/app/models/renalware/pathology/message_param_parser.rb

@@ -21,7 +21,7 @@ module Renalware
         if renalware_patient?
           build_patient_params
         else
-          logger.warn("Did not process pathology for #{internal_id}: not a renalware patient")
+          logger.debug("Did not process pathology for #{internal_id}: not a renalware patient")
           nil
         end
       end

data/app/presenters/renalware/mdm_presenter.rb

@@ -21,10 +21,6 @@ module Renalware
       OpenStruct.new(table: pathology_table_view, rows: presenter.view_model)
     end
 
-    # def latest_pathology_for(code)
-    #   code
-    # end
-
     def clinic_visits(limit: 6)
       @clinic_visits ||= Clinics::ClinicVisit.for_patient(patient)
                                              .includes(:clinic)

data/app/values/renalware/address.rb

@@ -15,6 +15,7 @@ module Renalware
     end
 
     def copy_from(source)
+      return self if source.blank?
       self.name = source.name
       self.organisation_name = source.organisation_name
       self.street_1 = source.street_1

data/app/views/renalware/clinics/clinic_visits/_clinic_visit.html.slim

@@ -20,8 +20,8 @@ article
     dt= attr_name(clinic_visit, :bmi)
     dd= clinic_visit.bmi
     dt= attr_name(clinic_visit, :urine_blood)
-    dd= clinic_visit.urine_blood
+    dd= clinic_visit.urine_blood&.text
     dt= attr_name(clinic_visit, :urine_protein)
-    dd= clinic_visit.urine_protein
+    dd= clinic_visit.urine_protein&.text
     dt= attr_name(clinic_visit, :notes)
     dd= clinic_visit.notes&.html_safe

data/app/views/renalware/clinics/clinic_visits/_table.html.slim

@@ -5,14 +5,16 @@ table.clinics.auto-layout
       th.col-width-date Date
       th.col-width-tiny DNA
       th Clinic Type
-      th.col-width-tinyish Height
-      th.col-width-tinyish Weight
-      th.col-width-tinyish BMI
+      th.col-width-tiny Height
+      th.col-width-tiny Weight
+      th.col-width-tiny BMI
       th.col-width-tinyish BP
       th.col-width-tinyish Standing BP
-      th.col-width-tinyish Pulse
-      th.col-width-tinyish Temp
-      th Created by
+      th.col-width-tiny Pulse
+      th.col-width-tiny Temp
+      th.col-width-tiny Urine blood
+      th.col-width-tiny Urine protein
+      th.col-width-medium Created by
 
   tbody
     = render partial: "renalware/clinics/clinic_visits/table_row",

data/app/views/renalware/clinics/clinic_visits/_table_row.html.slim

@@ -19,4 +19,6 @@ tr(class="#{'dna' if clinic_visit.did_not_attend?}")
   td.bp= clinic_visit.standing_bp
   td.bp= clinic_visit.pulse
   td.bp= clinic_visit.temperature
+  td= clinic_visit.urine_blood&.text
+  td= clinic_visit.urine_protein&.text
   td.created-by= clinic_visit.created_by

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

@@ -1,3 +1,4 @@
+- observation_set = patient.current_observation_set
 tr
   td.full-name= link_to patient.to_s(:default), view_proc.call(patient)
   td.nowrap= patient.nhs_number
@@ -5,12 +6,12 @@ tr
   td= patient.sex.code
   td= patient.age
   td= patient.modality_description&.name
-  td= patient.current_observation_set.hgb_result
-  td= l(patient.current_observation_set.hgb_observed_at)
-  td= patient.current_observation_set.ure_result
-  td= l(patient.current_observation_set.ure_observed_at)
-  td= patient.current_observation_set.cre_result
-  td= l(patient.current_observation_set.cre_observed_at)
-  td= patient.current_observation_set.mdrd_result
+  td= observation_set.hgb_result
+  td= l(observation_set.hgb_observed_at)
+  td= observation_set.ure_result
+  td= l(observation_set.ure_observed_at)
+  td= observation_set.cre_result
+  td= l(observation_set.cre_observed_at)
+  td= observation_set.egfr_result
   td= l(patient.esrf_date)
   td.actions= link_to t(".view"), view_proc.call(patient)

data/app/views/renalware/mdm_patients/_table.html.slim

@@ -11,7 +11,7 @@ table#patients.mdm-patients.columns
       - %i(hgb ure cre).each do |code|
         th.col-width-tiny= sort_link(path, code, t(".#{code}"))
         th.col-width-date= sort_link(path, :"#{code}_date", t(".#{code}_date"))
-      th.col-width-tiny= sort_link(path, :mdrd, t(".mdrd"))
+      th.col-width-tiny= sort_link(path, :egfr, t(".egfr"))
       th.col-width-date= t(".esrf")
       th.col-width-small
 

data/config/locales/renalware/hd/mdm_patients.yml

@@ -27,4 +27,4 @@ en:
           ure_date: URE Date
           cre: CRE
           cre_date: CRE Date
-          mdrd: MDRD
+          egfr: EGFR

data/config/locales/renalware/mdm.yml

@@ -18,7 +18,7 @@ en:
         ure_date: URE Date
         cre: CRE
         cre_date: CRE Date
-        mdrd: MDRD
+        egfr: EGFR
     mdm:
       problems:
         view_all: View All

data/lib/renalware/version.rb

@@ -1,3 +1,3 @@
 module Renalware
-  VERSION = "2.0.0.pre.rc4".freeze
+  VERSION = "2.0.0.pre.rc5".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.rc4
+  version: 2.0.0.pre.rc5
 platform: ruby
 authors:
 - Airslie