Merge pull request #2 from mateusgreg/master

Using date interval to filter reports.
RioBus · Dec 5, 2014 · f3b0e2b · f3b0e2b
2 parents 22cd7ab + 6df62f0
commit f3b0e2b
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/public/relatorioCodigo.js b/public/relatorioCodigo.js
@@ -187,7 +187,24 @@ window.onload = function() {
 
 	$(document).on('click', '#button', function() {
 		var selected = $('input[name="report"]:checked').val();
-		$.getJSON('http://localhost:3002/api/2014120410/2014120410', function(data, status) {
+		var dateNow = $("#dateNow");
+		var initialDate = $("#initialDate").val();
+		var finalDate = $("#finalDate").val();
+		var url;
+
+		if (dateNow.is(":checked") == true) {
+			url = "http://rest.riob.us/all?callback=?";
+		}
+		else {
+			url = "http://localhost:3002/api/" + initialDate + "/" + finalDate;
+		}
+
+		$.getJSON(url, function(data, status) {
+
+			if (dateNow.is(":checked")) {
+				data = [data];
+			}
+
 			switch (selected) {
 				case "empty-lines":
 					result = emptyLines(data)
@@ -217,7 +234,7 @@ window.onload = function() {
 					result = buses_in_speed_range(mins, maxs, data, lines);
 					break;
 			}
-			document.getElementById("resposta").innerHTML = "JSON.stringify(result)";
+			document.getElementById("resposta").innerHTML = JSON.stringify(result);
 		});
 	});
 }