From e203a0b2711bb15c3c336a356ae4d62dba4c9ddb Mon Sep 17 00:00:00 2001 From: Leandro Radusky Date: Fri, 7 Jul 2023 16:29:51 +0200 Subject: [PATCH] Fixes PR review --- app/controllers/nih_tables_controller.rb | 1 + app/views/samples_reports/nih_challenge.csv.csvbuilder | 6 +++--- app/views/samples_reports/nih_lod.csv.csvbuilder | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/controllers/nih_tables_controller.rb b/app/controllers/nih_tables_controller.rb index 472b845cb..53dcddf76 100644 --- a/app/controllers/nih_tables_controller.rb +++ b/app/controllers/nih_tables_controller.rb @@ -1,6 +1,7 @@ class NihTablesController < ApplicationController def show @samples_report = SamplesReport.find(params[:id]) + @target_batch = @samples_report.target_batch return unless authorize_resource(@samples_report, READ_SAMPLES_REPORT) zip_data = create_zip_file diff --git a/app/views/samples_reports/nih_challenge.csv.csvbuilder b/app/views/samples_reports/nih_challenge.csv.csvbuilder index 315690619..8abfc22ad 100644 --- a/app/views/samples_reports/nih_challenge.csv.csvbuilder +++ b/app/views/samples_reports/nih_challenge.csv.csvbuilder @@ -33,9 +33,9 @@ csv << [ "#{sample.box.purpose}-panel", 'inactivated virus', 'SARS-CoV-2', - @samples_report.target_batch.target_organism_taxonomy_id, - @samples_report.target_batch.pango_lineage, - @samples_report.target_batch.who_label, + @target_batch.target_organism_taxonomy_id, + @target_batch.pango_lineage, + @target_batch.who_label, @samples_report.threshold, 'copies/ml', params[:true_positives], diff --git a/app/views/samples_reports/nih_lod.csv.csvbuilder b/app/views/samples_reports/nih_lod.csv.csvbuilder index 0c1265067..ab093fd00 100644 --- a/app/views/samples_reports/nih_lod.csv.csvbuilder +++ b/app/views/samples_reports/nih_lod.csv.csvbuilder @@ -28,13 +28,13 @@ csv << [ "#{sample.box.purpose}-panel", 'inactivated virus', 'SARS-CoV-2', - @samples_report.target_batch.target_organism_taxonomy_id, - @samples_report.target_batch.pango_lineage, - @samples_report.target_batch.who_label, + @target_batch.target_organism_taxonomy_id, + @target_batch.pango_lineage, + @target_batch.who_label, @samples_report.lob, nil, @samples_report.lod, - @samples_report.target_batch.reference_gene, + @target_batch.reference_gene, nil, nil, "90",