diff --git a/pdb-ui/src/main/java/org/lucares/pdbui/PdbController.java b/pdb-ui/src/main/java/org/lucares/pdbui/PdbController.java index cf92496..e9325b8 100644 --- a/pdb-ui/src/main/java/org/lucares/pdbui/PdbController.java +++ b/pdb-ui/src/main/java/org/lucares/pdbui/PdbController.java @@ -63,7 +63,7 @@ public class PdbController implements HardcodedValues, CollectionUtils { @RequestMapping(path = "/autocomplete", // method = RequestMethod.GET, // - consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, // APPLICATION_FORM_URLENCODED_VALUE + consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, // APPLICATION_JSON_UTF8_VALUE produces = MediaType.APPLICATION_JSON_UTF8_VALUE // ) @ResponseBody diff --git a/pdb-ui/src/main/resources/resources/index.html b/pdb-ui/src/main/resources/resources/index.html index 0c42f1c..41aaddd 100644 --- a/pdb-ui/src/main/resources/resources/index.html +++ b/pdb-ui/src/main/resources/resources/index.html @@ -3,11 +3,12 @@ - + +
@@ -15,29 +16,14 @@
-
-
-
- - -
-
-
\ No newline at end of file diff --git a/pdb-ui/src/main/resources/resources/js/search.js b/pdb-ui/src/main/resources/resources/js/search.js index 280ece2..62d3c70 100644 --- a/pdb-ui/src/main/resources/resources/js/search.js +++ b/pdb-ui/src/main/resources/resources/js/search.js @@ -3,99 +3,30 @@ $(document).ready(function(){ $('#search-submit').click(plot); - initFilter(); - - + AutoComplete({ + HttpMethod: "GET", + Delay: 300, + _QueryArg: function() { + var caretIndex = document.getElementById('search-input').selectionStart; + return 'caretIndex=' + caretIndex + '&query'; + }, + _Post: function(response) { + var result = []; + var responseObject = JSON.parse(response); + responseObject['proposals'].forEach(function(item, index){ + var proposal = {}; + proposal['Label'] = item.value; + proposal['Value'] = item.proposedQuery; + + result.push(proposal); + }); + + console.log(JSON.stringify(result)); + return result; + } + }); }); - -function initFilter() { - - var successCallback = function (fields) { - - var fieldsView = [{name: ""}]; - fields.forEach(function(item, index){ - fieldsView.push( {name: item} ); - }); - - var template = $('#template-filter').html(); - var view = { - fields: fieldsView - }; - - var rendered = Mustache.render(template, view); - $('#filter-bar').append(rendered); - - $('#filter-values').hide(); - - $('#filter-field').change(function() { - if ($(this).val() == ""){ - $('#filter-values').hide(); - }else{ - addFieldValues($(this).val()); - } - }); - - $('#add-filter').click(function(){ - var field = $('#filter-field').val(); - var values = $('#filter-values').val(); - - if (field != "" - && values != [] ) - { - var query = ""; - values.forEach(function (value, index) { - if (query.length > 0) - { - query += ","; - } - query += field+"="+value; - } ); - $('#filter-bar').append(query); - } - }); - }; - - getFields( successCallback); -} - -function addFieldValues(field){ - - var params = {}; - params['query'] = ""; - - var successCallback = function (values){ - $('#result-view').text("SUCCESS: " + JSON.stringify(values)); - - values.forEach(function (item, index){ - $('#filter-values').append($('