Skip to content

Partial #2237 #2368

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

Merged
merged 12 commits into from
Oct 23, 2017
Merged

Partial #2237 #2368

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cc97e89
fix calls to system_call and ebi submissions
antgonza Oct 12, 2017
292e193
fixing errors
antgonza Oct 12, 2017
6a553f6
fix if state == submitting:
antgonza Oct 12, 2017
f27c230
just raise error
antgonza Oct 12, 2017
d721f85
EBISubmissionError -> ComputeError
antgonza Oct 12, 2017
9e10d9c
Merge pull request #2345 from biocore/fix-ebi-1012
josenavas Oct 14, 2017
691ba3d
Fixing merge conflicts
josenavas Oct 20, 2017
259cbe3
Merge branch 'dev' of https://github.com/biocore/qiita into dev
josenavas Oct 20, 2017
bb0772f
Sorting values
josenavas Oct 20, 2017
4feaf8a
Merge branch 'dev' of https://github.com/biocore/qiita into partial-2237
josenavas Oct 20, 2017
55331a9
Case insensitive sorting
josenavas Oct 20, 2017
9fb4d33
Addressing @ElDeveloper's comments
josenavas Oct 23, 2017
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
23 changes: 16 additions & 7 deletions qiita_pet/templates/artifact_ajax/processing_artifact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@
}
}

options.sort(function(a, b){return a[0].localeCompare(b[0], 'en', {'sensitivity': 'base'});});
$.each(options, function(idx, val) {
$inp.append($("<option>").attr('value', val[0]).text(val[1]));
});
Expand Down Expand Up @@ -325,7 +326,9 @@
.done(function(data){
// Put first the required parameters
$("#cmd-opts-div").append($('<h4>').text('Required parameters:'));
for(var key in data.req_options) {
var keys = Object.keys(data.req_options).sort(function(a, b){return a.localeCompare(b, 'en', {'sensitivity': 'base'});});
for (var i = 0; i < keys.length; i++) {
var key = keys[i];
load_parameter_gui(key, data.req_options[key], sel_artifacts_info, $("#cmd-opts-div"));
}

Expand All @@ -336,8 +339,10 @@
var $colDiv = $('<div>').addClass('col-sm-3').appendTo($rowDiv);
var sel = $('<select>').appendTo($colDiv).attr('id', 'params-sel').attr('name', 'params-sel').addClass('form-control').attr('placeholder', 'Choose parameter set...');
sel.append($("<option>").attr('value', "").text("Choose parameter set...").prop('disabled', true).prop('selected', true));
for(var i=0; i<data.options.length; i++) {
sel.append($("<option>").attr('value', data.options[i].id).attr('data-vals', JSON.stringify(data.options[i].values)).text(data.options[i].name));
var options = data.options;
options.sort(function(a, b) {return a.name.localeCompare(b.name, 'en', {'sensitivity': 'base'});} );
for(var i=0; i<options.length; i++) {
sel.append($("<option>").attr('value', options[i].id).attr('data-vals', JSON.stringify(options[i].values)).text(options[i].name));
}
$("<div>").appendTo("#cmd-opts-div").attr('id', 'opt-vals-div').attr('name', 'opt-vals-div');

Expand All @@ -350,7 +355,9 @@
}
// Get the parameter set values that the user selected
var opt_vals = JSON.parse($("#params-sel option[value='" + v + "']").attr("data-vals"));
for(var key in data.opt_options) {
var keys = Object.keys(data.opt_options).sort(function(a, b){return a.localeCompare(b, 'en', {'sensitivity': 'base'});});
for (var i = 0; i < keys.length; i++) {
var key = keys[i];
load_parameter_gui(key, data.opt_options[key], sel_artifacts_info, $("#opt-vals-div"), opt_vals[key], is_analysis_pipeline);
}
$("#add-cmd-btn-div").show();
Expand Down Expand Up @@ -403,9 +410,11 @@
var $colDiv = $('<div>').addClass('col-sm-3').appendTo($rowDiv);
var sel = $('<select>').appendTo($colDiv).attr('id', 'command-sel').attr('name', 'command').addClass('form-control').attr('placeholder', 'Choose command...');
sel.append($("<option>").attr('value', "").text("Choose command...").prop('disabled', true).prop('selected', true));
for(var i=0; i<data.commands.length; i++) {
if (data.commands[i].output.length != 0) {
sel.append($("<option>").attr('value', data.commands[i].id).text(data.commands[i].command));
var commands = data.commands;
commands.sort(function(a, b) {return a.command.localeCompare(b.command, 'en', {'sensitivity': 'base'});} );
for(var i=0; i<commands.length; i++) {
if (commands[i].output.length !== 0) {
sel.append($("<option>").attr('value', commands[i].id).text(commands[i].command));
}
}
sel.change(function(event) {
Expand Down