From ba120c0618fed177635660cf8eda3b896bea25b1 Mon Sep 17 00:00:00 2001 From: Dariusz Bienkowski Date: Thu, 11 May 2023 15:13:51 -0400 Subject: [PATCH 1/3] download all traits from phenotype dialog box fixed --- .../download_stock_phenotypes_dialog.mas | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/mason/stock/download_stock_phenotypes_dialog.mas b/mason/stock/download_stock_phenotypes_dialog.mas index e80bd6a839..3bced2679f 100644 --- a/mason/stock/download_stock_phenotypes_dialog.mas +++ b/mason/stock/download_stock_phenotypes_dialog.mas @@ -60,20 +60,24 @@ $stock_name => undef
- +
+
+
Select all traits
+
Unselect all traits
+

- - + +
@@ -92,6 +96,20 @@ jQuery(document).ready(function() { data_level_change_traits(); }); + jQuery(document).on('click', "#download_stock_phenotypes_select_all", function() { + var trait_collection = document.getElementById('download_stock_phenotypes_traits_select').options; + for (var index = 0; index < trait_collection.length; index += 1) { + trait_collection[index].selected = true; + }; + }); + + jQuery(document).on('click', "#download_stock_phenotypes_select_reset", function() { + var trait_collection = document.getElementById('download_stock_phenotypes_traits_select').options; + for (var index = 0; index < trait_collection.length; index += 1) { + trait_collection[index].selected = false; + }; + }); + jQuery('#download_stock_phenotypes_submit_button').click( function () { var stock_type = "<% $stock_type %>"; var stock_id = ["<% $stock_id %>"]; @@ -101,7 +119,7 @@ jQuery(document).ready(function() { if (! Array.isArray(traits) ) { traits = [ traits ]; } - + var datalevel = jQuery("#download_stock_phenotypes_level_option").val(); var exclude_phenotype_outlier = jQuery("#download_stock_phenotypes_exclude_outliers").val(); window.open("/breeders/trials/phenotype/download?"+stock_type+"_list="+JSON.stringify(stock_id)+"&dataLevel="+datalevel+"&format="+format+"×tamp="+timestamp+"&trait_list="+JSON.stringify(traits)+"&exclude_phenotype_outlier="+exclude_phenotype_outlier); @@ -111,6 +129,6 @@ jQuery(document).ready(function() { function data_level_change_traits() { var stock_type = "<% $stock_type %>"; - get_select_box('traits', 'download_stock_phenotypes_traits', { 'name' : 'download_stock_phenotypes_traits_select', 'id' : 'download_stock_phenotypes_traits_select', 'stock_id':<% $stock_id %>, 'stock_type': stock_type }); + get_select_box('traits', 'download_stock_phenotypes_traits', { 'name' : 'download_stock_phenotypes_traits_select', 'id' : 'download_stock_phenotypes_traits_select', 'stock_id':<% $stock_id %>, 'stock_type': stock_type , 'multiple': true}); } From b34c50a7bee67539b1872773da5a6160fef6c1df Mon Sep 17 00:00:00 2001 From: Dariusz Bienkowski Date: Thu, 11 May 2023 20:23:54 -0400 Subject: [PATCH 2/3] added extended trait list for multiple select / full dropdown list --- .../legacy/CXGN/BreedersToolbox/HTMLSelect.js | 4 ++++ .../stock/download_stock_phenotypes_dialog.mas | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/js/source/legacy/CXGN/BreedersToolbox/HTMLSelect.js b/js/source/legacy/CXGN/BreedersToolbox/HTMLSelect.js index 7d803d6d79..8da7d213df 100644 --- a/js/source/legacy/CXGN/BreedersToolbox/HTMLSelect.js +++ b/js/source/legacy/CXGN/BreedersToolbox/HTMLSelect.js @@ -26,6 +26,10 @@ function get_select_box(type, div_id, options) { // console.log(JSON.stringify(response.select)); var select = jQuery("#"+options.id).attr('onChange', 'Workflow.complete(this);'); } + if (options.full_dropdown) { + var select_collection = document.getElementById(options.id).options; + document.getElementById(options.id).setAttribute("size", select_collection.length); + } }, error: function(response) { alert("An error occurred"); diff --git a/mason/stock/download_stock_phenotypes_dialog.mas b/mason/stock/download_stock_phenotypes_dialog.mas index 3bced2679f..16956b43e2 100644 --- a/mason/stock/download_stock_phenotypes_dialog.mas +++ b/mason/stock/download_stock_phenotypes_dialog.mas @@ -70,6 +70,13 @@ $stock_name => undef
Select all traits
Unselect all traits
+ +
@@ -129,6 +136,15 @@ jQuery(document).ready(function() { function data_level_change_traits() { var stock_type = "<% $stock_type %>"; - get_select_box('traits', 'download_stock_phenotypes_traits', { 'name' : 'download_stock_phenotypes_traits_select', 'id' : 'download_stock_phenotypes_traits_select', 'stock_id':<% $stock_id %>, 'stock_type': stock_type , 'multiple': true}); + get_select_box( + 'traits', + 'download_stock_phenotypes_traits', + { 'name' : 'download_stock_phenotypes_traits_select', + 'id' : 'download_stock_phenotypes_traits_select', + 'stock_id':<% $stock_id %>, + 'stock_type': stock_type , + 'multiple': true, + 'full_dropdown':true} + ); } From 94aae0c61086d81537eb8baf2114366ff9245e3b Mon Sep 17 00:00:00 2001 From: Dariusz Bienkowski Date: Thu, 11 May 2023 20:52:30 -0400 Subject: [PATCH 3/3] Fixed previous type="button" removal. Just for transparency in commits. --- mason/stock/download_stock_phenotypes_dialog.mas | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mason/stock/download_stock_phenotypes_dialog.mas b/mason/stock/download_stock_phenotypes_dialog.mas index 16956b43e2..6c58e339e3 100644 --- a/mason/stock/download_stock_phenotypes_dialog.mas +++ b/mason/stock/download_stock_phenotypes_dialog.mas @@ -83,8 +83,8 @@ $stock_name => undef
- - + +