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

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2adae7283349900967b688b6e5540a25f5f92bedfd851bc4c1ee4867d714cb9c
4
- data.tar.gz: 1f294a120860167a97636ff519da463df2503391821c9ca8129dc60177796dcc
3
+ metadata.gz: '029ce152132118a328d4531c385ef69f1099851f896560c5c229f78597c40b06'
4
+ data.tar.gz: 48865c348da03e90d9107edf4d94a010f6ba5ae4318cc150d9c71cfbdf753e96
5
5
  SHA512:
6
- metadata.gz: df23ef342eff7ef9344655965caae92a6bb1350936ffef3dacbf4f5889db2a2cfeb7453349383d6f58c3d0f9df8c0a4397cbf9cd0d1d9e8413c3581a051dcdc7
7
- data.tar.gz: 7b618ddc3af4f1b0359001feaad0c3ae535b49dd1f5072a967e920f267038e6fdc6e7bd879cdf234c05d3a41183c6fd1d1ee3f4bc41aef163c5d95f9e2ae18e1
6
+ metadata.gz: a83a65471cc274aed97ce173dd41d34dcb674b48ea7b71887dbd712e2a1610ce6ceaea9952e1243f22448724e7e2a3b557b569dddd835e7d0c31b733f018a096
7
+ data.tar.gz: 11534fdc42c9af7b7789ae428d46f1ccd0b88d441aaf0332e953eb42174d958cb1b76f99f7fbbbc7f5732355840aa18b26abbab422effdf34a20a36967f612b3
@@ -27,7 +27,7 @@ module Renalware
27
27
  base.ransacker(:"#{code}_date") { pathology_date_sort_predicate(code) }
28
28
  end
29
29
 
30
- %i(mdrd).each do |code|
30
+ %i(egfr).each do |code|
31
31
  base.ransacker(code) { pathology_result_sort_predicate(code) }
32
32
  end
33
33
  end
@@ -21,7 +21,7 @@ module Renalware
21
21
  if renalware_patient?
22
22
  build_patient_params
23
23
  else
24
- logger.warn("Did not process pathology for #{internal_id}: not a renalware patient")
24
+ logger.debug("Did not process pathology for #{internal_id}: not a renalware patient")
25
25
  nil
26
26
  end
27
27
  end
@@ -21,10 +21,6 @@ module Renalware
21
21
  OpenStruct.new(table: pathology_table_view, rows: presenter.view_model)
22
22
  end
23
23
 
24
- # def latest_pathology_for(code)
25
- # code
26
- # end
27
-
28
24
  def clinic_visits(limit: 6)
29
25
  @clinic_visits ||= Clinics::ClinicVisit.for_patient(patient)
30
26
  .includes(:clinic)
@@ -15,6 +15,7 @@ module Renalware
15
15
  end
16
16
 
17
17
  def copy_from(source)
18
+ return self if source.blank?
18
19
  self.name = source.name
19
20
  self.organisation_name = source.organisation_name
20
21
  self.street_1 = source.street_1
@@ -20,8 +20,8 @@ article
20
20
  dt= attr_name(clinic_visit, :bmi)
21
21
  dd= clinic_visit.bmi
22
22
  dt= attr_name(clinic_visit, :urine_blood)
23
- dd= clinic_visit.urine_blood
23
+ dd= clinic_visit.urine_blood&.text
24
24
  dt= attr_name(clinic_visit, :urine_protein)
25
- dd= clinic_visit.urine_protein
25
+ dd= clinic_visit.urine_protein&.text
26
26
  dt= attr_name(clinic_visit, :notes)
27
27
  dd= clinic_visit.notes&.html_safe
@@ -5,14 +5,16 @@ table.clinics.auto-layout
5
5
  th.col-width-date Date
6
6
  th.col-width-tiny DNA
7
7
  th Clinic Type
8
- th.col-width-tinyish Height
9
- th.col-width-tinyish Weight
10
- th.col-width-tinyish BMI
8
+ th.col-width-tiny Height
9
+ th.col-width-tiny Weight
10
+ th.col-width-tiny BMI
11
11
  th.col-width-tinyish BP
12
12
  th.col-width-tinyish Standing BP
13
- th.col-width-tinyish Pulse
14
- th.col-width-tinyish Temp
15
- th Created by
13
+ th.col-width-tiny Pulse
14
+ th.col-width-tiny Temp
15
+ th.col-width-tiny Urine blood
16
+ th.col-width-tiny Urine protein
17
+ th.col-width-medium Created by
16
18
 
17
19
  tbody
18
20
  = render partial: "renalware/clinics/clinic_visits/table_row",
@@ -19,4 +19,6 @@ tr(class="#{'dna' if clinic_visit.did_not_attend?}")
19
19
  td.bp= clinic_visit.standing_bp
20
20
  td.bp= clinic_visit.pulse
21
21
  td.bp= clinic_visit.temperature
22
+ td= clinic_visit.urine_blood&.text
23
+ td= clinic_visit.urine_protein&.text
22
24
  td.created-by= clinic_visit.created_by
@@ -1,3 +1,4 @@
1
+ - observation_set = patient.current_observation_set
1
2
  tr
2
3
  td.full-name= link_to patient.to_s(:default), view_proc.call(patient)
3
4
  td.nowrap= patient.nhs_number
@@ -5,12 +6,12 @@ tr
5
6
  td= patient.sex.code
6
7
  td= patient.age
7
8
  td= patient.modality_description&.name
8
- td= patient.current_observation_set.hgb_result
9
- td= l(patient.current_observation_set.hgb_observed_at)
10
- td= patient.current_observation_set.ure_result
11
- td= l(patient.current_observation_set.ure_observed_at)
12
- td= patient.current_observation_set.cre_result
13
- td= l(patient.current_observation_set.cre_observed_at)
14
- td= patient.current_observation_set.mdrd_result
9
+ td= observation_set.hgb_result
10
+ td= l(observation_set.hgb_observed_at)
11
+ td= observation_set.ure_result
12
+ td= l(observation_set.ure_observed_at)
13
+ td= observation_set.cre_result
14
+ td= l(observation_set.cre_observed_at)
15
+ td= observation_set.egfr_result
15
16
  td= l(patient.esrf_date)
16
17
  td.actions= link_to t(".view"), view_proc.call(patient)
@@ -11,7 +11,7 @@ table#patients.mdm-patients.columns
11
11
  - %i(hgb ure cre).each do |code|
12
12
  th.col-width-tiny= sort_link(path, code, t(".#{code}"))
13
13
  th.col-width-date= sort_link(path, :"#{code}_date", t(".#{code}_date"))
14
- th.col-width-tiny= sort_link(path, :mdrd, t(".mdrd"))
14
+ th.col-width-tiny= sort_link(path, :egfr, t(".egfr"))
15
15
  th.col-width-date= t(".esrf")
16
16
  th.col-width-small
17
17
 
@@ -27,4 +27,4 @@ en:
27
27
  ure_date: URE Date
28
28
  cre: CRE
29
29
  cre_date: CRE Date
30
- mdrd: MDRD
30
+ egfr: EGFR
@@ -18,7 +18,7 @@ en:
18
18
  ure_date: URE Date
19
19
  cre: CRE
20
20
  cre_date: CRE Date
21
- mdrd: MDRD
21
+ egfr: EGFR
22
22
  mdm:
23
23
  problems:
24
24
  view_all: View All
@@ -1,3 +1,3 @@
1
1
  module Renalware
2
- VERSION = "2.0.0.pre.rc4".freeze
2
+ VERSION = "2.0.0.pre.rc5".freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: renalware-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.pre.rc4
4
+ version: 2.0.0.pre.rc5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Airslie