User can now go from picking to chatting

TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/ChatServlet.java

@@ -44,9 +44,11 @@ public class ChatServlet extends HttpServlet {
                 resp.sendRedirect("logout");
             } else {
                 UserBean ubean = gson.fromJson(wsBean.getBody(), UserBean.class);
-                UserBean ubeanUser = gson.fromJson(userBean.getBody(), UserBean.class);
                 req.setAttribute("driverProfile", ubean);
+
+                UserBean ubeanUser = gson.fromJson(userBean.getBody(), UserBean.class);
                 req.setAttribute("userProfile", ubeanUser);
+
                 req.getRequestDispatcher("WEB-INF/chat.jsp").forward(req, resp);
             }
         }

TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/FindDriverServlet.java

@@ -51,21 +51,24 @@ public class FindDriverServlet extends HttpServlet {
             } else {
                 req.setAttribute("preferredDriversLength", 0);
             }
+
             String user = ServiceConnector.getServiceClass().getProfile(CookieCheck.getCookie(req).getToken());
-            WebServiceBean userBean = gson.fromJson(user, WebServiceBean.class);
+            WebServiceBean wsBeanUser = gson.fromJson(user, WebServiceBean.class);
 
-            WebServiceBean wsBean = gson.
+            WebServiceBean wsBeanDrivers = gson.
                     fromJson(service.findDriverByPreferredLocation(cookie.getToken(), pickup, destination),
                             WebServiceBean.class);
 
-            if (wsBean.getStatus().equals(WebServiceBean.STATUS_INVALID)) {
+            if (wsBeanDrivers.getStatus().equals(WebServiceBean.STATUS_INVALID)) {
                 resp.sendRedirect("logout");
             } else {
-                DriverBean[] driverBeans = gson.fromJson(wsBean.getBody(), DriverBean[].class);
-                UserBean ubeanUser = gson.fromJson(userBean.getBody(), UserBean.class);
-                req.setAttribute("userProfile", ubeanUser);
+                DriverBean[] driverBeans = gson.fromJson(wsBeanDrivers.getBody(), DriverBean[].class);
                 req.setAttribute("foundDrivers", driverBeans);
                 req.setAttribute("foundDriversLength", driverBeans.length);
+
+                UserBean userBean = gson.fromJson(wsBeanUser.getBody(), UserBean.class);
+                req.setAttribute("userProfile", userBean);
+
                 req.getRequestDispatcher("WEB-INF/find_driver.jsp").forward(req, resp);
             }
         }

TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/OrderServlet.java

@@ -7,38 +7,40 @@ import com.adaapa.bean.UserBean;
 import com.adaapa.bean.WebServiceBean;
 import com.adaapa.ojekservice.OjekOnline;
 import com.google.gson.Gson;
-import java.io.IOException;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 public class OrderServlet extends HttpServlet {
-  Gson gson = new Gson();
+    Gson gson = new Gson();
 
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-      throws ServletException, IOException {
-    if (!CookieCheck.redirectIfTokenNotFound(req, resp, "login")) {
-      ApplicationCookie cookie = CookieCheck.getCookie(req);
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+            throws ServletException, IOException {
+        if (!CookieCheck.redirectIfTokenNotFound(req, resp, "login")) {
+            ApplicationCookie cookie = CookieCheck.getCookie(req);
 
-      req.setAttribute("user", cookie.getUsername());
+            req.setAttribute("user", cookie.getUsername());
 
-      OjekOnline service = ServiceConnector.getServiceClass();
-      WebServiceBean webServiceBean = gson.fromJson(service.getProfile(cookie.getToken()),
-              WebServiceBean.class);
+            OjekOnline service = ServiceConnector.getServiceClass();
+            WebServiceBean webServiceBean = gson.fromJson(service.getProfile(cookie.getToken()),
+                    WebServiceBean.class);
 
-      if (webServiceBean.getStatus().equals(WebServiceBean.STATUS_INVALID)) {
-        resp.sendRedirect("logout");
-      } else {
-        UserBean ubean = gson.fromJson(webServiceBean.getBody(), UserBean.class);
+            if (webServiceBean.getStatus().equals(WebServiceBean.STATUS_INVALID)) {
+                resp.sendRedirect("logout");
+            } else {
+                UserBean userBean = gson.fromJson(webServiceBean.getBody(), UserBean.class);
+                req.setAttribute("userProfile", userBean);
 
-        if (ubean.getIsDriver()) {
-          req.getRequestDispatcher("WEB-INF/find_user.jsp").forward(req, resp);
-        } else {
-          req.getRequestDispatcher("WEB-INF/order.jsp").forward(req, resp);
+                if (userBean.getIsDriver()) {
+                    req.getRequestDispatcher("WEB-INF/find_user.jsp").forward(req, resp);
+                } else {
+                    req.getRequestDispatcher("WEB-INF/order.jsp").forward(req, resp);
+                }
+            }
         }
-      }
     }
-  }
 }

TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/find_driver.jsp

@@ -68,7 +68,7 @@
                             </div>
                             <div>
                                 <button name="driverId" value="${item.getUsername()}" class="submit-button">
-                                    <input type="hidden" ng-model="driverId">
+                                    <input type="hidden" name="driverId" ng-init="driverId=${item.getId()};" ng-value="driverId">
                                     I Choose You
                                 </button>
                             </div>
@@ -111,7 +111,7 @@
                             </div>
                             <div>
                                 <button name="driverId" value="${item.getUsername()}" class="submit-button" ng-click="pickDriver()">
-                                    <input type="hidden" ng-model="driverId">
+                                    <input type="hidden" name="driverId" ng-init="driverId=${item.getId()};" ng-value="driverId">
                                     I Choose You
                                 </button>
                             </div>
@@ -137,7 +137,6 @@
     angular.module('chatApp', [])
         .service('ConverseService', converse)
         .controller('PickController', function ($scope, $interval, $timeout, ConverseService) {
-            console.log(${userProfile.getId()})
             let account = new ConverseService.User(${userProfile.getId()})
 
             $scope.activeList = new Set()
@@ -157,7 +156,6 @@
             }, 1000)
 
             $scope.pickDriver = function () {
-                console.log('Hello', $scope.driverId)
                 account.pickAsync($scope.driverId)
             }
         })

TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/find_user.jsp

@@ -36,7 +36,6 @@
     angular.module('orderApp', [])
         .service('ConverseService', converse)
         .controller('OrderController', function ($scope, $q, ConverseService) {
-            console.log(${userProfile.getId()})
             let account = new ConverseService.Driver(${userProfile.getId()})
 
             let deferrer
@@ -50,8 +49,7 @@
 
                 account.waitAsync(deferrer.promise)
                     .then(function (userId) {
-                        console.log('Bye', userId)
-                        $window.location.href = 'chat.jsp'
+
                     })
             }