Merge pull request #5290 from solgenomics/topic/fix_upload_pehno

fixing notes on phenotyping spreadsheet
solgenomics · Feb 6, 2025 · 597e8d8 · 597e8d8
2 parents 08ddd67 + cd625dd
commit 597e8d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/CXGN/Trial/Download/Plugin/ExcelBasic.pm b/lib/CXGN/Trial/Download/Plugin/ExcelBasic.pm
@@ -386,10 +386,11 @@ sub download {
     }
 
     #print STDERR "Self include notes is ".$self->include_notes."\n";
-    if ( $self->include_notes()) {
+    if ( $self->include_notes() && $self->include_notes() ne 'false') {
         push @trait_list, 'notes';
     }
 
+
     for (my $i = 0; $i < @trait_list; $i++) {
         #if (exists($cvinfo{$trait_list[$i]})) {
             #$ws->write(5, $i+6, $cvinfo{$trait_list[$i]}->display_name());

diff --git a/lib/CXGN/Trial/Download/Plugin/ExcelBasicSimple.pm b/lib/CXGN/Trial/Download/Plugin/ExcelBasicSimple.pm
@@ -201,10 +201,11 @@ sub download {
     }
 
     #print STDERR "Self include notes is ".$self->include_notes."\n";
-    if ( $self->include_notes()) {
+    if ( $self->include_notes() && $self->include_notes() ne 'false') {
         push @trait_list, 'notes';
     }
 
+
     for (my $i = 0; $i < @trait_list; $i++) {
         #if (exists($cvinfo{$trait_list[$i]})) {
             #$ws->write(5, $i+6, $cvinfo{$trait_list[$i]}->display_name());