Small changes after iterating correctness with the client

instedd · Nov 10, 2023 · 6a164ea · 6a164ea
1 parent ca5709d
commit 6a164ea
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/app/views/nih_tables/nih_challenge.csv.csvbuilder b/app/views/nih_tables/nih_challenge.csv.csvbuilder
@@ -15,11 +15,7 @@ csv << [
   'true_negatives',
   'false_negatives',
   'non_clinical_sensitivity',
-  'non_clinical_sensitivity_ci_percent',
-  'non_clinical_sensitivity_ci_min',
   'non_clinical_specificity',
-  'non_clinical_specificity_ci_percent',
-  'non_clinical_specificity_ci_min',
   'area_under_the_roc_curve',
   'roc_x_values',
   'roc_y_values'
@@ -30,8 +26,8 @@ csv << [
   nil,
   @target_box.uuid,
   "#{@target_box.purpose}-panel",
-  'inactivated virus',
-  'SARS-CoV-2',
+  @target_sample.original_batch.virus_sample_type,
+  @target_sample.original_batch.target_organism_name,
   @target_sample.original_batch.target_organism_taxonomy_id,
   @target_sample.original_batch.pango_lineage,
   @target_sample.original_batch.who_label,
@@ -42,11 +38,7 @@ csv << [
   params[:true_negatives],
   params[:false_negatives],
   params[:sensitivity],
-  nil,
-  nil,
   params[:specificity],
-  nil,
-  nil,
   params[:auc],
   params[:roc_x_values].to_s.gsub(",","|"),
   params[:roc_y_values].to_s.gsub(",","|")

diff --git a/app/views/nih_tables/nih_lod.csv.csvbuilder b/app/views/nih_tables/nih_lod.csv.csvbuilder
@@ -25,8 +25,8 @@ csv << [
   nil,
   @target_box.uuid,
   "#{@target_box.purpose}-panel",
-  'inactivated virus',
-  'SARS-CoV-2',
+  @target_sample.original_batch.virus_sample_type,
+  @target_sample.original_batch.target_organism_name,
   @target_sample.original_batch.target_organism_taxonomy_id,
   @target_sample.original_batch.pango_lineage,
   @target_sample.original_batch.who_label,

diff --git a/app/views/nih_tables/nih_samples.csv.csvbuilder b/app/views/nih_tables/nih_samples.csv.csvbuilder
@@ -33,8 +33,8 @@ csv << [
     sample.original_batch.reference_gene,
     sample.uuid,
     sample.batch_number,
-    'inactivated virus',
-    'SARS-CoV-2',
+    @target_sample.original_batch.virus_sample_type,
+    sample.original_batch.target_organism_name,
     sample.original_batch.target_organism_taxonomy_id,
     sample.original_batch.pango_lineage,
     sample.original_batch.who_label,