merge comflict

ChatService/app/routes.js

@@ -73,21 +73,9 @@ module.exports = function(app) {
                     res.json(response);
                 });
             });
-            
-            // 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){
-                console.log(req);
+            app.post('/findorder', function(req, res){s
                 Driver.findOne({"idDriver" : req.body.id}, function(err, foundDriver){
                     if (err){
                         var response = {"status" : 503, "message" : "Database error detected"};
@@ -95,7 +83,7 @@ module.exports = function(app) {
                     }
                     else {
                         if (!foundDriver){
-                            Driver.create({"idDriver" : req.body.id, "status" : "available", "pref": req.body.pref}, function(error, addDriver){
+                            Driver.create({"idDriver" : req.body.id, "status" : "available"}, function(error, addDriver){
                                 if(!error && addDriver){
                                     var response = {"status" : 200, "message" : "Driver added to available driver list"};
                                     res.json(response);    
@@ -111,6 +99,39 @@ module.exports = function(app) {
                     }
                 });
             });
+            
+            // user select certain driver
+            app.post('/selectdriver', function(req, res){
+                Driver.findOne({"idDriver" : Number (req.body.id), "status" : "available"}, function(err, foundDriver){
+                    if (!err && foundDriver){
+                        foundDriver["status"] = "acceptorder";
+                        foundDriver.save();
+                        var response = {"status" : 200, "message" : "Driver has accepted an order"};
+                        res.json(response);
+                    }
+                    else {
+                        var response = {"status" : 503, "message" : "Database error detected"};
+                        res.json(response);                     
+                    }
+                });
+            });
+            
+
+            // driver want to stop finding order
+            app.post('/stopfinding', function(req, res){
+                Driver.findOne({"idDriver" : Number (req.body.id), "status" : "available"}, function(err, foundDriver){
+                    if (!err && foundDriver){
+                        foundDriver["status"] = "unavailable";
+                        foundDriver.save();
+                        var response = {"status" : 200, "message" : "Driver has stopped finding orders"};
+                        res.json(response);
+                    }
+                    else {
+                        var response = {"status" : 503, "message" : "Database error detected"};
+                        res.json(response);                     
+                    }
+                });
+            });
 
             // cancel find order
             app.post('/cancelfindorder', function(req, res){

PrOjek/webapp/src/main/webapp/resources/js/order.js

@@ -3,7 +3,8 @@ var destination = null;;
 var pickingpoint = null;
 var idDriver = 0;
 var comment = null;
-var driver;
+var baseUrl = "http://localhost:8080/webapp/";
+var chatServiceUrl = "http://localhost:3000/";
 
 function post(path, params, method) {
     method = method || "post"; // Set method to post by default if not specified.
@@ -72,7 +73,7 @@ function backToFindOrder() {
     var next = 'find-order';
     document.getElementById(prev).style.display = 'none';
     document.getElementById(next).style.display = 'block';
-    $.post('http://localhost:3000/cancelfindorder',{id:idCustomer});
+    $.post(chatServiceUrl + 'stopfinding',{id:idCustomer});
 }
 
 function nextToGotAnOrder() {
@@ -134,7 +135,6 @@ function openOrder(step) {
 function grabDriver(){
     pickingpoint = document.getElementById('pickingpoint').value;
     destination = document.getElementById('destination').value;
-    // var url = "/soapservlet";
     var url = "http://localhost:3000/availabledriver";
     var createElement = document.getElementById('other-driver');
     var addRow = "";
@@ -259,7 +259,6 @@ document.getElementById("no-order").onclick = function() {
 }
 document.getElementById("yes-order").onclick = function() {
     document.getElementById('modalverifyorder').style.display = "none";
-    
 }
 // When the user clicks anywhere outside of the modal, close it
 window.onclick = function(event) {