balkian/senpy
1
0
Fork 0
mirror of https://github.com/gsi-upm/senpy synced 2024-11-22 00:02:28 +00:00
Code Issues Releases Wiki Activity

Merge branch 'input-as-string-if-no-options' into 'master'

Browse Source 
Accept string inputs if no options are available

See merge request senpy/senpy!18
This commit is contained in:
J. Fernando Sánchez 2017-10-03 17:24:32 +00:00
commit 694201d8d3
1 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
senpy/static/js/main.js
View File

@ -1,7 +1,7 @@
var ONYX = "http://www.gsi.dit.upm.es/ontologies/onyx/ns#"; var ONYX = "http://www.gsi.dit.upm.es/ontologies/onyx/ns#";
var RDF_TYPE = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"; var RDF_TYPE = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type";
var plugins_params={}; var plugins_params={};
var default_params = JSON.parse($.ajax({type: "GET", url: "/api?help=True" , async: false}).responseText); var default_params = JSON.parse($.ajax({type: "GET", url: "/api?help=true" , async: false}).responseText);
function replaceURLWithHTMLLinks(text) { function replaceURLWithHTMLLinks(text) {
console.log('Text: ' + text); console.log('Text: ' + text);
var exp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig; var exp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;
@ -105,29 +105,40 @@ function change_params(){
html="" html=""
for (param in default_params){ for (param in default_params){
if ((default_params[param]['options']) && (['help','conversion'].indexOf(param) < 0)){ if ((default_params[param]['options']) && (['help','conversion'].indexOf(param) < 0)){
html+= "<label> "+param+"</label>" html+= "<label> "+param+"</label>"
html+= "<select id=\""+param+"\" name=\""+param+"\">" if (default_params[param]['options'].length < 1) {
for (option in default_params[param]['options']){ html +="<input></input>";
if (default_params[param]['options'][option] == default_params[param]['default']){ }
html+="<option value \""+default_params[param]['options'][option]+"\" selected >"+default_params[param]['options'][option]+"</option>" else {
} html+= "<select id=\""+param+"\" name=\""+param+"\">"
else{ for (option in default_params[param]['options']){
html+="<option value \""+default_params[param]['options'][option]+"\">"+default_params[param]['options'][option]+"</option>" if (default_params[param]['options'][option] == default_params[param]['default']){
html+="<option value \""+default_params[param]['options'][option]+"\" selected >"+default_params[param]['options'][option]+"</option>"
} }
} else{
html+="</select><br>" html+="<option value \""+default_params[param]['options'][option]+"\">"+default_params[param]['options'][option]+"</option>"
}
}
}
}
html+="</select><br>"
}
} }
for (param in plugins_params[plugin]){ for (param in plugins_params[plugin]){
if (param || plugins_params[plugin][param].length > 1){ if (param || plugins_params[plugin][param].length > 1){
html+= "<label> Parameter "+param+"</label>" html+= "<label> Parameter "+param+"</label>"
html+= "<select id=\""+param+"\" name=\""+param+"\">" param_opts = plugins_params[plugin][param]
for (option in plugins_params[plugin][param]){ if (param_opts.length > 0) {
html+="<option value \""+plugins_params[plugin][param][option]+"\">"+plugins_params[plugin][param][option]+"</option>" html+= "<select id=\""+param+"\" name=\""+param+"\">"
} for (option in param_opts){
html+="<option value \""+param_opts[option]+"\">"+param_opts[option]+"</option>"
}
html+="</select>"
}
else {
html +="<input id=\""+param+"\" name=\""+param+"\"></input>";
}
} }
html+="</select>"
} }
document.getElementById("params").innerHTML = html document.getElementById("params").innerHTML = html
}; };
@ -143,9 +154,13 @@ function load_JSON(){
url += "?algo="+plugin+"&i="+input url += "?algo="+plugin+"&i="+input
for (param in plugins_params[plugin]){ for (param in plugins_params[plugin]){
if (param != null){ if (param != null){
var param_value = encodeURIComponent(document.getElementById(param).options[document.getElementById(param).selectedIndex].text); if (plugins_params[plugin].length > 0){
if (param_value){ var param_value = encodeURIComponent(document.getElementById(param).options[document.getElementById(param).selectedIndex].text);
url+="&"+param+"="+param_value } else {
var param_value = encodeURIComponent(document.getElementById(param).value);
}
if (param_value !== "undefined" && param_value.length > 0){
url+="&"+param+"="+param_value
} }
} }
} }