Skip to content

fix upload accession using list #6120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ClayBirkett wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −17
Open

fix upload accession using list #6120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions js/source/legacy/CXGN/BreedersToolbox/Accessions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,11 +527,11 @@ jQuery(document).ready(function ($) {
alert('ERROR! Try again later.');
}
);
} else {
add_accessions(infoToAdd, speciesNames, emailAddress, email_option_enabled);
$('#review_absent_dialog').modal("hide");
}

add_accessions(infoToAdd, speciesNames, emailAddress, email_option_enabled);
$('#review_absent_dialog').modal("hide");

//window.location.href='/breeders/accessions';
});

Expand Down Expand Up @@ -581,7 +581,7 @@ jQuery(document).ready(function ($) {
}
else if (response.success) {
fullParsedData = response.full_data;
doFuzzySearch = jQuery('#fuzzy_check_upload_accessions').prop('checked');;
doFuzzySearch = jQuery('#fuzzy_check_upload_accessions').prop('checked');
review_verification_results(doFuzzySearch, response, response.list_id);
}
else {
Expand All @@ -593,15 +593,15 @@ jQuery(document).ready(function ($) {

$('[name="add_accessions_link"]').click(function () {
var list = new CXGN.List();
accessionList;
accession_list_id;
validSpecies;
fuzzyResponse;
fullParsedData;
infoToAdd;
accessionListFound;
speciesNames;
doFuzzySearch;
accessionList = [];
accession_list_id = undefined;
validSpecies = undefined;
fuzzyResponse = undefined;
fullParsedData = undefined;
infoToAdd = [];
accessionListFound = {};
speciesNames = [];
doFuzzySearch = undefined;
$('#add_accessions_dialog').modal("show");
$('#review_found_matches_dialog').modal("hide");
$('#review_fuzzy_matches_dialog').modal("hide");
Expand Down Expand Up @@ -645,7 +645,7 @@ function openWindowWithPost(fuzzyResponse) {
}

function verify_accession_list(accession_list_id) {
accession_list = JSON.stringify(list.getList(accession_list_id));
accessionList = JSON.stringify(list.getList(accession_list_id));
doFuzzySearch = jQuery('#fuzzy_check').prop('checked');

jQuery.ajax({
Expand All @@ -655,7 +655,7 @@ function verify_accession_list(accession_list_id) {
//async: false,
dataType: "json",
data: {
'accession_list': accession_list,
'accession_list': accessionList,
'do_fuzzy_search': doFuzzySearch,
},
beforeSend: function(){
Expand Down Expand Up @@ -712,7 +712,7 @@ function review_verification_results(doFuzzySearch, verifyResponse, accession_li

if (verifyResponse.fuzzy.length > 0 && doFuzzySearch) {
fuzzyResponse = verifyResponse.fuzzy;
var fuzzy_html = '<table id="add_accession_fuzzy_table" class="table"><thead><tr><th class="col-xs-4">Name in Your List</th><th class="col-xs-4">Existing Name(s) in Database</th><th class="col-xs-4">Options&nbsp;&nbsp;&nbsp&nbsp;<input type="checkbox" id="add_accession_fuzzy_option_all"/> Use Same Option for All</th></tr></thead><tbody>';
var fuzzy_html = '<table id="add_accession_fuzzy_table" class="table"><thead><tr><th class="col-xs-4">Name in Your List</th><th class="col-xs-4">Existing Name(s) in Database</th><th class="col-xs-4">Options&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" id="add_accession_fuzzy_option_all"/> Use Same Option for All</th></tr></thead><tbody>';
for( i=0; i < verifyResponse.fuzzy.length; i++) {
fuzzy_html = fuzzy_html + '<tr id="add_accession_fuzzy_option_form'+i+'"><td>'+ verifyResponse.fuzzy[i].name + '<input type="hidden" name="fuzzy_name" value="'+ verifyResponse.fuzzy[i].name + '" /></td>';
fuzzy_html = fuzzy_html + '<td><select class="form-control" name ="fuzzy_select">';
Expand Down Expand Up @@ -758,7 +758,7 @@ function review_verification_results(doFuzzySearch, verifyResponse, accession_li
}
});

jQuery(document).on('click', '#review_fuzzy_matches_continue', function(){
jQuery(document).off('click', '#review_fuzzy_matches_continue').on('click', '#review_fuzzy_matches_continue', function(){
process_fuzzy_options(accession_list_id);
});

Expand Down
Loading