diff --git a/ChatService/app/routes.js b/ChatService/app/routes.js index 54a3371db2fb8d4b81fa11ffc3f38eba51755ce5..a923288d70ee1d387393b12b7edf9e04248638fe 100644 --- a/ChatService/app/routes.js +++ b/ChatService/app/routes.js @@ -9,11 +9,26 @@ module.exports = function(app) { // FOR HANDLING DRIVER STATUS // see available driver + Driver.remove({},function(err,some) { + if (err) return console.error; + }); + app.get('/availabledriver', function(req, res){ Driver.find({"status" : "available"}, function(err, foundDriver){ res.json(foundDriver); }); }); + + var someDriver = new Driver({idDriver:7,status:"available"}); + someDriver.save(function(err,someDriver) { + if (err) return console.error(err); + }) + + app.get('/alldriver', function(req, res){ + Driver.find({}, function(err, foundDriver){ + res.json(foundDriver); + }); + }); // driver want to find order app.post('/findorder', function(req, res){ diff --git a/PrOjek/webapp/src/main/webapp/resources/js/order.js b/PrOjek/webapp/src/main/webapp/resources/js/order.js index 6c51110a2a4e5f0ab351131a93bcbef5723347bd..fc077fe757daf0bdcec92d28145cd434caaebbd8 100644 --- a/PrOjek/webapp/src/main/webapp/resources/js/order.js +++ b/PrOjek/webapp/src/main/webapp/resources/js/order.js @@ -52,7 +52,7 @@ function nextToWaitingForOrder() { var next = 'wait-order'; document.getElementById(prev).style.display = 'none'; document.getElementById(next).style.display = 'block'; - post('http://localhost:3000/findorder',{id:idCustomer}); + postAjax('http://localhost:3000/findorder',{id:idCustomer}); } function backToFindOrder() { diff --git a/PrOjek/webapp/src/main/webapp/views/order_view.jsp b/PrOjek/webapp/src/main/webapp/views/order_view.jsp index fc8d211a3104a8bdf0b18c9578dac8807a5f3499..ff07a85fd5ae7983801294759e2b9c28ab7fda22 100644 --- a/PrOjek/webapp/src/main/webapp/views/order_view.jsp +++ b/PrOjek/webapp/src/main/webapp/views/order_view.jsp @@ -203,5 +203,5 @@ var idCustomer = <%= user.getId() %> </script> <% long ts = (new Date()).getTime(); //Used to prevent JS/CSS caching %> -<script type="text/javascript" src="./resources/js/order.js?<%=ts%>"></script> <script type="text/javascript" src="./resources/js/ajax.js?<%=ts%>"></script> +<script type="text/javascript" src="./resources/js/order.js?<%=ts%>"></script>