From 88f4919f116f6b810923a14d37c4459527f9a3a7 Mon Sep 17 00:00:00 2001
From: keychera <kyogatama@gmail.com>
Date: Mon, 27 Nov 2017 23:44:44 +0700
Subject: [PATCH] adding postAjax for find order
---
ChatService/app/routes.js | 15 +++++++++++++++
.../webapp/src/main/webapp/resources/js/order.js | 2 +-
.../webapp/src/main/webapp/views/order_view.jsp | 2 +-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ChatService/app/routes.js b/ChatService/app/routes.js
index 54a3371db..a923288d7 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 6c51110a2..fc077fe75 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 fc8d211a3..ff07a85fd 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>
--
GitLab