Skip to content

Commit 4d383db

Browse files
josenavasElDeveloper
authored andcommitted
Partial #2237 (#2368)
* fix calls to system_call and ebi submissions * fixing errors * fix if state == submitting: * just raise error * EBISubmissionError -> ComputeError * Sorting values * Case insensitive sorting * Addressing @ElDeveloper's comments
1 parent 7beb06a commit 4d383db

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

qiita_pet/templates/artifact_ajax/processing_artifact.html

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@
258258
}
259259
}
260260

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

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

@@ -350,7 +355,9 @@
350355
}
351356
// Get the parameter set values that the user selected
352357
var opt_vals = JSON.parse($("#params-sel option[value='" + v + "']").attr("data-vals"));
353-
for(var key in data.opt_options) {
358+
var keys = Object.keys(data.opt_options).sort(function(a, b){return a.localeCompare(b, 'en', {'sensitivity': 'base'});});
359+
for (var i = 0; i < keys.length; i++) {
360+
var key = keys[i];
354361
load_parameter_gui(key, data.opt_options[key], sel_artifacts_info, $("#opt-vals-div"), opt_vals[key], is_analysis_pipeline);
355362
}
356363
$("#add-cmd-btn-div").show();
@@ -403,9 +410,11 @@
403410
var $colDiv = $('<div>').addClass('col-sm-3').appendTo($rowDiv);
404411
var sel = $('<select>').appendTo($colDiv).attr('id', 'command-sel').attr('name', 'command').addClass('form-control').attr('placeholder', 'Choose command...');
405412
sel.append($("<option>").attr('value', "").text("Choose command...").prop('disabled', true).prop('selected', true));
406-
for(var i=0; i<data.commands.length; i++) {
407-
if (data.commands[i].output.length != 0) {
408-
sel.append($("<option>").attr('value', data.commands[i].id).text(data.commands[i].command));
413+
var commands = data.commands;
414+
commands.sort(function(a, b) {return a.command.localeCompare(b.command, 'en', {'sensitivity': 'base'});} );
415+
for(var i=0; i<commands.length; i++) {
416+
if (commands[i].output.length !== 0) {
417+
sel.append($("<option>").attr('value', commands[i].id).text(commands[i].command));
409418
}
410419
}
411420
sel.change(function(event) {

0 commit comments

Comments
 (0)