diff --git a/servers/php/dbconnect.php b/servers/php/dbconnect.php index 0261563..b88f346 100644 --- a/servers/php/dbconnect.php +++ b/servers/php/dbconnect.php @@ -3,7 +3,7 @@ $dbuser = 'gpstracker_user'; $dbpass = 'gpstracker'; $params = array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, - PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC); + PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_NUM); $pdo = new PDO('mysql:host=localhost;dbname=gpstracker;charset=utf8', $dbuser, $dbpass, $params); diff --git a/servers/php/getallroutesformap.php b/servers/php/getallroutesformap.php index c3e58bb..ef30fe6 100644 --- a/servers/php/getallroutesformap.php +++ b/servers/php/getallroutesformap.php @@ -8,7 +8,7 @@ $json = '{ "locations": ['; foreach ($stmt as $row) { - $json .= $row['json']; + $json .= $row[2]; $json .= ','; } diff --git a/servers/php/getrouteformap.php b/servers/php/getrouteformap.php index 09ae371..c290bed 100644 --- a/servers/php/getrouteformap.php +++ b/servers/php/getrouteformap.php @@ -10,7 +10,7 @@ $json = '{ "locations": ['; foreach ($stmt as $row) { - $json .= $row['json']; + $json .= $row[0]; $json .= ','; } @@ -19,6 +19,5 @@ header('Content-Type: application/json'); echo $json; - - // echo '{ "locations": [] }'; + ?> \ No newline at end of file diff --git a/servers/php/getroutes.php b/servers/php/getroutes.php index 4082b4a..2eb8460 100644 --- a/servers/php/getroutes.php +++ b/servers/php/getroutes.php @@ -7,7 +7,7 @@ $json = '{ "routes": ['; foreach ($stmt as $row) { - $json .= $row['json']; + $json .= $row[0]; $json .= ','; } diff --git a/servers/php/js/maps.js b/servers/php/js/maps.js index b34fcbf..1492ac6 100644 --- a/servers/php/js/maps.js +++ b/servers/php/js/maps.js @@ -96,8 +96,8 @@ // iterate through the routes and load them into the dropdwon box. $(json.routes).each(function(key, value){ var option = document.createElement('option'); - option.setAttribute('value', '?sessionID=' + $(this).attr('sessionID') - + '&phoneNumber=' + $(this).attr('phoneNumber')); + option.setAttribute('value', '?sessionid=' + $(this).attr('sessionID') + + '&phonenumber=' + $(this).attr('phoneNumber')); sessionIDArray.push($(this).attr('sessionID')); @@ -117,7 +117,7 @@ // console.log($("#routeSelect").prop("selectedIndex")); var url = 'getrouteformap.php' + routeSelect.options[routeSelect.selectedIndex].value; - // console.log("testing route: " + $('#routeSelect').val()); + console.log("testing route: " + $('#routeSelect').val()); $.ajax({ url: url, @@ -136,17 +136,9 @@ } } - // check to see if we have a map loaded, don't want to autorefresh or delete without it - function hasMap() { - if (routeSelect.selectedIndex == 0) { // means no map - return false; - } - else { - return true; - } - } - function loadGPSLocations(json) { + // console.log(JSON.stringify(json)); + if (json.length == 0) { showPermanentMessage('There is no tracking data to view'); map.innerHTML = ''; @@ -289,7 +281,7 @@ gpstrackerMarker.unbindPopup(); gpstrackerMarker.on("click", function() { - var url = 'getrouteformap.php?sessionID=' + sessionID + "&phoneNumber=" + phoneNumber; + var url = 'getrouteformap.php?sessionid=' + sessionID + "&phonenumber=" + phoneNumber; viewingAllRoutes = false; @@ -337,6 +329,16 @@ return ""; } + + // check to see if we have a map loaded, don't want to autorefresh or delete without it + function hasMap() { + if (routeSelect.selectedIndex == 0) { // means no map + return false; + } + else { + return true; + } + } function displayCityName(latitude, longitude) { var lat = parseFloat(latitude);