Skip to content

Commit

Permalink
Merge pull request #4352 from solgenomics/topic/xlsx_download_fix
Browse files Browse the repository at this point in the history 
Topic/xlsx download fix
  • Loading branch information
@lukasmueller
lukasmueller authored Dec 14, 2022
2 parents efba125 + 1bbd2cf commit c004e7d
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions mason/breeders_toolbox/breeder_search_page.mas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ $dataset_id => undef
<select class="wizard-download-tmetadata-format form-control input-sm">
<option value="" disabled>Format</option>
<option selected value="csv">CSV</option>
<option value="xls">XLS</option>
<option value="xlsx">XLSX</option>
</select>
</td>
</tr>
Expand Down Expand Up @@ -364,7 +364,7 @@ $dataset_id => undef
<select class="wizard-download-phenotypes-format form-control input-sm">
<option value="" disabled>Download Format</option>
<option selected value="csv">CSV</option>
<option value="xls">XLS</option>
<option value="xlsx">XLSX</option>
</select>
</td>
<td colspan="1">
Expand Down
6 changes: 3 additions & 3 deletions mason/breeders_toolbox/genotyping_trials/create_genotyping_trial_dialogs.mas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ $facilities => ();
<div class="col-sm-9">
<select class="form-control" id="genotyping_trial_well_input_option">
<option value="">Select a file format that you want to upload</option>
<option value="xls">I am uploading a plate design I made in Excel</option>
<option value="xlsx">I am uploading a plate design I made in Excel</option>
<option value="coordinate">I am uploading a Default Coordinate Android Application plate design</option>
<option value="coordinate_template">I am uploading a Custom Coordinate Android Application plate design</option>
<option value="design">I need to design a completely new plate</option>
Expand All @@ -124,7 +124,7 @@ $facilities => ();
<div class="panel panel-default">
<div class="panel-body">
<div class="form-group">
<label class="col-sm-6 control-label">Select Plate Layout XLS File: </label>
<label class="col-sm-6 control-label">Select Plate Layout XLSX File: </label>
<div class="col-sm-6">
<input type="file" name="genotyping_trial_layout_upload" id="genotyping_trial_layout_upload" encoding="multipart/form-data" />
</div>
Expand Down Expand Up @@ -557,7 +557,7 @@ jQuery(document).ready(function(){
});

jQuery('#genotyping_trial_well_input_option').change(function(){
if (jQuery(this).val() == 'xls'){
if (jQuery(this).val() == 'xlsx'){
jQuery("#genotyping_trial_well_upload_section").show();
jQuery('#next_upload_button').show();
jQuery("#genotyping_trial_well_design_section").hide();
Expand Down
2 changes: 1 addition & 1 deletion mason/breeders_toolbox/genotyping_trials/upload_genotyping_data_dialogs.mas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ $facilities
<div class="panel panel-default">
<div class="panel-body">
<div class="form-group">
<label class="col-sm-4 control-label">Select an XLS File: </label>
<label class="col-sm-4 control-label">Select an XLSX (or XLS) File: </label>
<div class="col-sm-4">
<input type="file" name="xls_ssr_protocol_file" id="xls_ssr_protocol_file" encoding="multipart/form-data" />
</div>
Expand Down
8 changes: 4 additions & 4 deletions mason/breeders_toolbox/program/upload_profile_dialog.mas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ $program_name
<ul>
<li>Product profiles can be stored in the database for downstream variety selection process for each breeding program.</li>
<li>To facilitate data curation, targeted trait names and trait IDs can be retrieved directly from the database.</li>
<li>Please use the product profile template generated from our database to fill out product profile details.</l>
<li>You can find the link for creating the template in the product profile section, simply provide a file name and a list of traits.</l>
<li>Instructions for filling out the form are on the next page</l>
<li>Please use the product profile template generated from our database to fill out product profile details.</li>
<li>You can find the link for creating the template in the product profile section, simply provide a file name and a list of traits.</li>
<li>Instructions for filling out the form are on the next page</li>
</ul>
<br/><br/>
<center>
Expand Down Expand Up @@ -133,7 +133,7 @@ $program_name
Product Profile Template
</b>
<ul>
<li>Product profile template is an Excel file (.xls format)</li>
<li>Product profile template is an Excel file (.xls)</li>
<li>After filling out the product profile details, please also save the spreadsheet in the .xls format</li>
<li>Please do not modify or delete any column header in the template.
</ul>
Expand Down
2 changes: 1 addition & 1 deletion mason/breeders_toolbox/sampling_trials/create_sampling_trials_dialogs.mas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ $sampling_facilities => ();
<div class="panel panel-default">
<div class="panel-body">
<div class="form-group">
<label class="col-sm-6 control-label">Select Samples Layout XLS File: </label>
<label class="col-sm-6 control-label">Select Samples Layout XLSX (or XLS) File: </label>
<div class="col-sm-6">
<input type="file" name="sampling_trial_layout_upload" id="sampling_trial_layout_upload" encoding="multipart/form-data" />
</div>
Expand Down
2 changes: 1 addition & 1 deletion mason/breeders_toolbox/trial/download_phenotypes_dialog.mas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $dialog_name => undef
<div class="col-sm-9" >
<select class="form-control" id="download_trial_phenotypes_format">
<option value="csv">CSV</option>
<option value="xls">Excel (xls)</option>
<option value="xlsx">Excel (xlsx)</option>
</select>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion mason/breeders_toolbox/trial/download_trials_phenotypes_dialog.mas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<div class="col-sm-9" >
<select class="form-control" id="download_trials_phenotypes_format">
<option value="csv">CSV</option>
<option value="xls">Excel (xls)</option>
<option value="xlsx">Excel (xlsx)</option>
</select>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion t/selenium2/breeders/create_genotyping_trial.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ $t->while_logged_in_as("submitter", sub {
# SCREEN 4 /Well Info/
$t->find_element_ok('genotyping_trial_well_input_option', 'id', 'find "genotyping trial well input" select and click')->click();
sleep(1);
$t->find_element_ok('//select[@id="genotyping_trial_well_input_option"]/option[@value="xls"]', 'xpath', 'Select "xls" as value of trial well input formal (Excel)')->click();
$t->find_element_ok('//select[@id="genotyping_trial_well_input_option"]/option[@value="xlsx"]', 'xpath', 'Select "xlsx" as value of trial well input formal (Excel)')->click();
sleep(2);

my $file_upload = $t->find_element_ok("genotyping_trial_layout_upload", "id", "find trial file upload button");
Expand Down

0 comments on commit c004e7d

Please sign in to comment.