Skip to content

Commit e4b2505

Browse files
Blinding date_produced for samples and keeping samples order for send… (#2001)
* Blinding date_produced for samples and keeping samples order for sender institution * Fixes PR reviews * Fixes PR reviews
1 parent ea1f412 commit e4b2505

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

app/controllers/boxes_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def load_box
143143

144144
def load_box_samples
145145
samples = @box.samples.preload(:batch, :sample_identifiers)
146-
samples = if @box.blinded? && !params[:unblind]
146+
samples = if @box.blinded? && !params[:unblind] && @box.transferred?
147147
samples.scrambled
148148
else
149149
samples.order(:id)

app/documents/label_pdf.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def render_sample_details(sample)
4141
text_lines [
4242
"I.N. #{sample.isolate_name}".truncate(22),
4343
"I.M. #{sample.inactivation_method}".truncate(22),
44-
"P.D. #{sample.date_produced.strftime("%m/%d/%Y")}",
44+
"P.D. #{sample.blinded_attribute(:date_produced) { sample.date_produced.strftime("%m/%d/%Y") }}",
4545
], leading: -0.5
4646
end
4747

app/models/box.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def detach_from_context
8989

9090
# Returns the full list of sample attributes that can be blinded.
9191
def self.blind_attribute_names
92-
%i[batch_number concentration replicate virus_lineage isolate_name]
92+
%i[batch_number concentration replicate virus_lineage isolate_name date_produced]
9393
end
9494

9595
# Returns true if a sample attribute should be blinded for the current box.

app/views/boxes/inventory.csv.csvbuilder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ csv << [
2020
sample.virus_lineage,
2121
sample.replicate,
2222
sample.concentration,
23-
sample.date_produced.to_date,
23+
sample.blinded_attribute(:date_produced) { sample.date_produced.to_date },
2424
sample.inactivation_method,
2525
sample.media,
2626
]

app/views/samples/_barcode_card.haml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
.code
2020
%strong
2121
Production Date:
22-
#{@sample_form.date_produced.try{ strftime("%m/%d/%Y")}}
22+
#{@sample_form.blinded_attribute(:date_produced){ @sample_form.date_produced.try { strftime("%m/%d/%Y") } } }
2323
.logo
2424
= image_tag 'cdx-logo-bw.png'
2525
.label https://cdx.io

app/views/samples/_form.haml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
.row
3434
.col
3535
= f.form_field :date_produced do
36-
= f.date_field :date_produced, readonly: !@can_update
36+
- @sample_form.blinded_attribute(:date_produced) do
37+
= f.date_field :date_produced, readonly: !@can_update
3738

3839
= f.form_field :lab_technician do
3940
= f.text_field :lab_technician, :class => 'input-x-large', readonly: !@can_update

0 commit comments

Comments
 (0)