diff --git a/servers/dotNet/GetAllRoutesForMap.aspx.cs b/servers/dotNet/GetAllRoutesForMap.aspx.cs index 1d43c46..41b5c22 100755 --- a/servers/dotNet/GetAllRoutesForMap.aspx.cs +++ b/servers/dotNet/GetAllRoutesForMap.aspx.cs @@ -14,8 +14,6 @@ Response.AppendHeader("Content-Type", "application/json"); - Response.Write(reader.getJsonString("prcGetAllRoutesForMap", "locations", - new SqlParameter("@sessionID", sessionID), - new SqlParameter("@phoneNumber", phoneNumber))); + Response.Write(reader.getJsonString("prcGetAllRoutesForMap", "locations")); } } diff --git a/servers/dotNet/GetRouteForMap.aspx.cs b/servers/dotNet/GetRouteForMap.aspx.cs index 4ca834f..98e3184 100755 --- a/servers/dotNet/GetRouteForMap.aspx.cs +++ b/servers/dotNet/GetRouteForMap.aspx.cs @@ -7,7 +7,6 @@ protected void Page_Load(object sender, EventArgs e) { string sessionID = Request.QueryString["sessionID"]; - string phoneNumber = Request.QueryString["phoneNumber"]; // our helper class to get data DbJsonReader reader = new DbJsonReader(); @@ -15,7 +14,6 @@ Response.AppendHeader("Content-Type", "application/json"); Response.Write(reader.getJsonString("prcGetRouteForMap", "locations", - new SqlParameter("@sessionID", sessionID), - new SqlParameter("@phoneNumber", phoneNumber))); + new SqlParameter("@sessionID", sessionID))); } } diff --git a/servers/dotNet/gpstracker.bak b/servers/dotNet/gpstracker.bak deleted file mode 100644 index 13878d6..0000000 --- a/servers/dotNet/gpstracker.bak +++ /dev/null Binary files differ diff --git a/servers/dotNet/images/beepphone.jpg b/servers/dotNet/images/beepphone.jpg new file mode 100644 index 0000000..0f979fc --- /dev/null +++ b/servers/dotNet/images/beepphone.jpg Binary files differ diff --git a/servers/dotNet/images/deleteroute.jpg b/servers/dotNet/images/deleteroute.jpg new file mode 100644 index 0000000..14ab9ab --- /dev/null +++ b/servers/dotNet/images/deleteroute.jpg Binary files differ diff --git a/servers/dotNet/images/download.jpg b/servers/dotNet/images/download.jpg new file mode 100644 index 0000000..34aa06f --- /dev/null +++ b/servers/dotNet/images/download.jpg Binary files differ diff --git a/servers/dotNet/images/findphone.jpg b/servers/dotNet/images/findphone.jpg new file mode 100644 index 0000000..ccd83e1 --- /dev/null +++ b/servers/dotNet/images/findphone.jpg Binary files differ diff --git a/servers/dotNet/images/info.jpg b/servers/dotNet/images/info.jpg new file mode 100644 index 0000000..18b357a --- /dev/null +++ b/servers/dotNet/images/info.jpg Binary files differ diff --git a/servers/dotNet/images/purple_circle.png b/servers/dotNet/images/purple_circle.png new file mode 100644 index 0000000..209ba12 --- /dev/null +++ b/servers/dotNet/images/purple_circle.png Binary files differ diff --git a/servers/dotNet/images/refresh.jpg b/servers/dotNet/images/refresh.jpg new file mode 100644 index 0000000..f48604a --- /dev/null +++ b/servers/dotNet/images/refresh.jpg Binary files differ diff --git a/servers/dotNet/images/start.jpg b/servers/dotNet/images/start.jpg new file mode 100644 index 0000000..643606c --- /dev/null +++ b/servers/dotNet/images/start.jpg Binary files differ diff --git a/servers/dotNet/images/stop_dark.jpg b/servers/dotNet/images/stop_dark.jpg new file mode 100644 index 0000000..9b2d522 --- /dev/null +++ b/servers/dotNet/images/stop_dark.jpg Binary files differ diff --git a/servers/dotNet/images/stop_green.jpg b/servers/dotNet/images/stop_green.jpg new file mode 100644 index 0000000..00aaa99 --- /dev/null +++ b/servers/dotNet/images/stop_green.jpg Binary files differ diff --git a/servers/dotNet/js/maps.js b/servers/dotNet/js/maps.js index 8068697..da44848 100644 --- a/servers/dotNet/js/maps.js +++ b/servers/dotNet/js/maps.js @@ -50,14 +50,14 @@ showPermanentMessage('Please select a route below'); $.ajax({ - url: 'getallroutesformap.php', + url: 'getallroutesformap.aspx', type: 'GET', dataType: 'json', success: function(data) { loadGPSLocations(data); }, error: function (xhr, status, errorThrown) { - console.log("error status: " + xhr.status); + console.log("error status: " + status); console.log("errorThrown: " + errorThrown); } }); @@ -65,14 +65,14 @@ function loadRoutesIntoDropdownBox() { $.ajax({ - url: 'getroutes.php', + url: 'getroutes.aspx', type: 'GET', dataType: 'json', success: function(data) { loadRoutes(data); }, error: function (xhr, status, errorThrown) { - console.log("status: " + xhr.status); + console.log("status: " + status); console.log("errorThrown: " + errorThrown); } }); @@ -115,7 +115,7 @@ if (hasMap()) { // console.log($("#routeSelect").prop("selectedIndex")); - var url = 'getrouteformap.php' + $('#routeSelect').val(); + var url = 'getrouteformap.aspx' + $('#routeSelect').val(); $.ajax({ url: url, @@ -125,7 +125,7 @@ loadGPSLocations(data); }, error: function (xhr, status, errorThrown) { - console.log("status: " + xhr.status); + console.log("status: " + status); console.log("errorThrown: " + errorThrown); } }); @@ -276,7 +276,7 @@ gpstrackerMarker.unbindPopup(); gpstrackerMarker.on("click", function() { - var url = 'getrouteformap.php?sessionid=' + sessionID; + var url = 'getrouteformap.aspx?sessionid=' + sessionID; viewingAllRoutes = false; @@ -295,7 +295,7 @@ loadGPSLocations(data); }, error: function (xhr, status, errorThrown) { - console.log("status: " + xhr.status); + console.log("status: " + status); console.log("errorThrown: " + errorThrown); } }); @@ -391,7 +391,7 @@ var answer = confirm("This will permanently delete this route\n from the database. Do you want to delete?"); if (answer){ - var url = 'deleteroute.php' + $('#routeSelect').val(); + var url = 'deleteroute.aspx' + $('#routeSelect').val(); $.ajax({ url: url, @@ -417,7 +417,7 @@ document.getElementById('map-canvas').outerHTML = "
"; $.ajax({ - url: 'getroutes.php', + url: 'getroutes.aspx', type: 'GET', success: function(data) { loadRoutes(data); diff --git a/servers/dotNet/sqlserver/gpstracker-9-14-14.bak b/servers/dotNet/sqlserver/gpstracker-9-14-14.bak new file mode 100644 index 0000000..054036e --- /dev/null +++ b/servers/dotNet/sqlserver/gpstracker-9-14-14.bak Binary files differ diff --git a/servers/dotNet/sqlserver/gpstracker.bak b/servers/dotNet/sqlserver/gpstracker.bak deleted file mode 100755 index 491b78c..0000000 --- a/servers/dotNet/sqlserver/gpstracker.bak +++ /dev/null Binary files differ