From 3b2e3eed0c970f50983f4949994ac2d4262994cb Mon Sep 17 00:00:00 2001
From: Irene Edria <ireneedriadr@gmail.com>
Date: Tue, 21 Nov 2017 09:40:14 +0700
Subject: [PATCH] fix bug Order Handler
---
TugasBesar2_2017/WebApp/src/main/webapp/order_driver.jsp | 1 +
.../java/com/adaapa/ojekservice/handlers/OrderHandler.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/TugasBesar2_2017/WebApp/src/main/webapp/order_driver.jsp b/TugasBesar2_2017/WebApp/src/main/webapp/order_driver.jsp
index 796b59b..6e41e03 100644
--- a/TugasBesar2_2017/WebApp/src/main/webapp/order_driver.jsp
+++ b/TugasBesar2_2017/WebApp/src/main/webapp/order_driver.jsp
@@ -28,5 +28,6 @@
<%@include file="/component/footer.html" %>
<script>
+ src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.4/angular.min.js"
window.onload = toggleActive("nav-order");
</script>
\ No newline at end of file
diff --git a/TugasBesar2_2017/WebService/src/main/java/com/adaapa/ojekservice/handlers/OrderHandler.java b/TugasBesar2_2017/WebService/src/main/java/com/adaapa/ojekservice/handlers/OrderHandler.java
index 0de1e08..9d7215b 100644
--- a/TugasBesar2_2017/WebService/src/main/java/com/adaapa/ojekservice/handlers/OrderHandler.java
+++ b/TugasBesar2_2017/WebService/src/main/java/com/adaapa/ojekservice/handlers/OrderHandler.java
@@ -104,12 +104,14 @@ public class OrderHandler {
webServiceBean.setStatus(WebServiceBean.STATUS_INVALID);
} else {
webServiceBean.setStatus(WebServiceBean.STATUS_VALID);
+ UserModel userModel = new UserModel();
+ UserBean wsUser = userModel.findUserByUsername(validUser.getUsername());
OrderBean orderBean = gson.fromJson(order, OrderBean.class);
DriverModel driverModel = new DriverModel();
driverModel.queryUpdate(String.format(
"INSERT INTO orders (user_id,driver_id,pickup,destination,rating,comment) VALUES"
+ "(%d,%d,'%s','%s','%d','%s')",
- validUser.getId(),orderBean.getDriverId(),orderBean.getPickup(),orderBean.getDestination(),
+ wsUser.getId(),orderBean.getDriverId(),orderBean.getPickup(),orderBean.getDestination(),
orderBean.getRating().intValue(), orderBean.getComment()
));
}
--
GitLab