diff --git a/tomcat/webapps/Trawl/index.jsp b/tomcat/webapps/Trawl/index.jsp
index 3871379858ca3858d813869c4ad81b86e42d3762..927313ea609b495de24ced086c495cebda38f34a 100644
--- a/tomcat/webapps/Trawl/index.jsp
+++ b/tomcat/webapps/Trawl/index.jsp
@@ -43,20 +43,20 @@ Double Handle Slider Modified from: http://jqueryui.com/slider/#range
<section id="pickSciRanks">
Phylum:
<%--<select name="pickSciR" id="pickPhylum" size="1" onChange="updateSci(this)"><!--Dynamically Filled--></select>--%>
- <select name="pickSciR" id="pickPhylum" size="1" onChange="updateSci('pickPhylum', this)"><!--Dynamically Filled--></select>
+ <select name="pickSciR" id="pickPhylum" size="1" onChange="callUpdateSci(this)"><!--Dynamically Filled--></select>
Class:
- <select name="pickSciR" id="pickClass" size="1" onChange="updateSci('pickClass', this)">
+ <select name="pickSciR" id="pickClass" size="1" onChange="callUpdateSci(this)">
<%--<option value="00">Arthropoda</option>--%>
<%--<option value="01">Chordata</option>--%>
<%--<option value="03">Mollusca</option>--%>
</select>
Order:
- <select name="pickSciR" id="pickOrder" size="1" onChange="updateSci('pickOrder', this)""><!--Dynamically Filled--></select>
+ <select name="pickSciR" id="pickOrder" size="1" onChange="callUpdateSci(this)""><!--Dynamically Filled--></select>
Family:
- <select name="pickSciR" id="pickFamily" size="1" onChange="updateSci('pickFamily', this)"><!--Dynamically Filled--></select>
+ <select name="pickSciR" id="pickFamily" size="1" onChange="callUpdateSci(this)"><!--Dynamically Filled--></select>
Genus:
- <select name="pickSciR" id="pickGenus" size="1" onChange="updateSci('pickGenus', this)"><!--Dynamically Filled--></select>
+ <select name="pickSciR" id="pickGenus" size="1" onChange="callUpdateSci(this)"><!--Dynamically Filled--></select>
Species:
<select name="pickSciR" id="pickSpecies" size="1" onChange="alert("No function atm")"><!--Dynamically Filled--></select>
</section>
diff --git a/tomcat/webapps/Trawl/script.js b/tomcat/webapps/Trawl/script.js
index bead50b00316b35a08bd0b054360cf7711f2e7d0..be3f2c898cb1f003113bea8b80ec49c0f96e014e 100644
--- a/tomcat/webapps/Trawl/script.js
+++ b/tomcat/webapps/Trawl/script.js
@@ -1,11 +1,37 @@
// Initialization
function init() {
- updateSci("pickAnimalia", {value:2}); // Propagate Dropdowns on Startup
+ callUpdateSci({id:"pickAnimalia", value:2}); // Propagate Dropdowns on Startup
+}
+
+function resolveAny(obj) {
+ if(obj.id === "pickPhylum"){
+ return {id:"pickAnimalia", value:2};
+ }
+ else {
+ if (Number(obj.previousElementSibling.value) === -1) {
+ return resolveAny(obj.previousElementSibling);
+ }
+ else {
+ return {id: obj.previousElementSibling.id, value: obj.previousElementSibling.value};
+ }
+ }
+}
+
+function callUpdateSci(object){
+ var tagID = object.id;
+ var taxID = Number(object.value);
+
+ // Resolve "Any" option
+ if (taxID === -1){
+ var obj2 = resolveAny(object);
+ tagID = obj2.id;
+ taxID = Number(obj2.value);
+ }
+ reqBioLookup(tagID, taxID);
}
function populateDropdown(childTagID, nodeList, subnode){
var x, y, content="";
- document.getElementById("console").innerHTML += "Populating Dropdown with ... " + nodeList[subnode]+"<br>"; //TODO: Console
for (var i in nodeList[subnode]["taxonName"]){
x = nodeList[subnode]["taxonId"][i];
y = nodeList[subnode]["taxonName"][i];
@@ -14,54 +40,8 @@ function populateDropdown(childTagID, nodeList, subnode){
document.getElementById(childTagID).innerHTML = content;
}
-// This function will get the new nodelist from the server.
-// ParentId is the taxId of the node that holds the list of children we want.
-function getNodeList(parentId){
- return nodeList = {
- "order":{
- "taxonName":["o1n","o2n","o3n"],
- "taxonId":[6,7,8]
- },
- "phylum":{
- "taxonName":["p1n","p2n","p3n"],
- "taxonId":[3,4,5]
- },
- "class":{
- "taxonName":["c1n","c2n","c3m"],
- "taxonId":[9,10,11]
- },
- "family":{
- "taxonName":["f1n","f2n","f3n"],
- "taxonId":[12,13,14]
- },
- "genus":{
- "taxonName":["g1n","g2n","g3n"],
- "taxonId":[15,16,17]
- },
- "species":{
- "taxonName":["s1n","s2n","s4n"],
- "taxonId":[18,19,20]
- }
- }; //TODO replace Substitude Testing JSON object
-}
-
-function resolveAny(object){
- document.getElementById("console").innerHTML += "In | resolveAny()<br>"; //TODO: Console
- return 2;
-}
-
-function updateSci(tagID, object) {
- var taxID = object.value;
-
- if (taxID == 0){
- taxID = resolveAny(object);
- }
-
- var nodeList = getNodeList(taxID); //TODO This is where you call Java
-
- document.getElementById("console").innerHTML += "In | updateSci()<br>"; //TODO: Console
-
- while (tagID != "END"){
+function updateSci(tagID, nodeList) {
+ while (tagID !== "END"){
switch (tagID){
case "pickAnimalia":
populateDropdown("pickPhylum", nodeList, "phylum");
@@ -94,16 +74,37 @@ function updateSci(tagID, object) {
break;
case "pickSpecies":
- console.log("All dropdowns should be loaded");
tagID = "END";
break;
-
- default: //TODO: Remove this eventually. Shouldnt be necessary anyways.
- document.getElementById("console").innerHTML += "Error: switch(tagID) failed<br>"; //TODO: Console
}
}
}
+// This function will get the new nodelist from the server.
+// ParentId is the taxId of the node that holds the list of children we want.
+function reqBioLookup(tagID, parentId){
+ var path = 'doBioLookup.do';
+ var params = {taxId: Number(parentId)};
+ var xhr = new XMLHttpRequest();
+ xhr.open("POST", path);
+ xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); //Send the proper header info
+
+ xhr.onreadystatechange = function() {//Call a function when the state changes (i.e. response comes back)
+ // Update the dropdown when response is ready
+ if(xhr.readyState == XMLHttpRequest.DONE && xhr.status == 200) {
+ var nodeList = JSON.parse(this.responseText);
+ updateSci(tagID, nodeList);
+ }
+ else{
+ console.log("Server Response: Error"); //RME
+ }
+ };
+
+ var jsonString= JSON.stringify(params); //generate JSON string
+ xhr.send(jsonString); //send request to server
+ // document.getElementById("console").innerHTML += "Sent request to " + path + ": " + jsonString + "<br>"; //RME
+}
+
// JQuery for Range Slider
$( function() {
$( "#slider-range" ).slider({
@@ -118,49 +119,4 @@ $( function() {
$( "#fromtoYear" ).html($( "#slider-range" ).slider( "values", 0 ) + " - " + $( "#slider-range" ).slider( "values", 1 ))
} );
-window.onload=init;
-
-// Archive
-// Updates a dropdown List
-// tagID = tag of dropdown that changes
-// taxID = id of parent of the thing that changes
-
-
-// function updateSciR(tagID, object) {
-// var path = 'doBioLookup.do';
-// var taxID = Number(object.value);
-// // alert("Updating: " + tagID + "with children of: " + taxID); //TODO Remove me
-// var params = {taxId: taxID};
-// var xhr = new XMLHttpRequest();
-// xhr.open("POST", path);
-//
-// //Send the proper header information along with the request
-// xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-//
-// xhr.onreadystatechange = function() {//Call a function when the state changes (i.e. response comes back)
-// // Update the dropdown
-// if(xhr.readyState == XMLHttpRequest.DONE && xhr.status == 200) {
-// document.getElementById("console").innerHTML += "Retrieved: "; //TODO: Console REMOVEME
-// document.getElementById("console").innerHTML += this.responseText + "<br>"; //TODO: Console REMOVEME
-// console.log("RETRIEVED:" + this.responseText);
-// var nodeList = JSON.parse(this.responseText);
-// document.getElementById("console").innerHTML += nodeList + "<br>"; //TODO: Console REMOVEME
-//
-// var content = "", x, y;
-// for (var i in nodeList.taxonId){
-// x = nodeList.taxonId[i];
-// y = nodeList.taxonName[i];
-// content += '"<option value="' + x + '">' + y + '</option>';
-// }
-//
-// document.getElementById(tagID).innerHTML = content;
-// }
-// else{
-// document.getElementById("console").innerHTML += "Error<br>"; //TODO: Console REMOVEME
-// }
-// };
-//
-// var jsonString= JSON.stringify(params); //generate JSON string
-// xhr.send(jsonString); //send request to server
-// document.getElementById("console").innerHTML += "Sent request to " + path + ": " + jsonString + "<br>"; //TODO: Console REMOVEME
-// }
\ No newline at end of file
+window.onload=init;
\ No newline at end of file