diff --git a/ChatService/app/routes.js b/ChatService/app/routes.js index 26edb4e99b797acdc5a6efd25b38d34048451eec..376ebb01dbe641a3bd9a0d6256361c87cf4b3219 100644 --- a/ChatService/app/routes.js +++ b/ChatService/app/routes.js @@ -84,11 +84,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 46ae81a7e56674d2cfd0bb25401ee8f5e856c89a..1102664a475f2fc1e5a2918e93f19ced580da06e 100644 --- a/PrOjek/webapp/src/main/webapp/resources/js/order.js +++ b/PrOjek/webapp/src/main/webapp/resources/js/order.js @@ -3,8 +3,31 @@ var destination = null;; var pickingpoint = null; var idDriver = 0; var comment = null; -var driver +var driver; +function post(path, params, method) { + method = method || "post"; // Set method to post by default if not specified. + + // The rest of this code assumes you are not using a library. + // It can be made less wordy if you use one. + var form = document.createElement("form"); + form.setAttribute("method", method); + form.setAttribute("action", path); + + for(var key in params) { + if(params.hasOwnProperty(key)) { + var hiddenField = document.createElement("input"); + hiddenField.setAttribute("type", "hidden"); + hiddenField.setAttribute("name", key); + hiddenField.setAttribute("value", params[key]); + + form.appendChild(hiddenField); + } + } + + document.body.appendChild(form); + form.submit(); +} function nextToSelectDriver() { var prev = 'select-destination'; @@ -29,6 +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}); } 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..56a82839ad5ea501a79048f71f5d1e33621e8272 100644 --- a/PrOjek/webapp/src/main/webapp/views/order_view.jsp +++ b/PrOjek/webapp/src/main/webapp/views/order_view.jsp @@ -203,5 +203,6 @@ 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 src="//ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script> <script type="text/javascript" src="./resources/js/ajax.js?<%=ts%>"></script> +<script type="text/javascript" src="./resources/js/order.js?<%=ts%>"></script> diff --git a/Readme.md b/Readme.md index baef61f03b1b2462d2c318e2d96dbdda5dfd2fa5..67dbd8e902c98e2bbcd9e1b65621e301fa994aa4 100644 --- a/Readme.md +++ b/Readme.md @@ -12,8 +12,9 @@ Diharapkan dengan tugas ini Anda dapat mengerti: * Web security terkait access token dan HTTP Headers. ## Anggota Tim -Setiap kelompok beranggotakan **3 orang dari kelas yang sama**. Jika jumlah mahasiswa dalam satu kelas modulo 3 menghasilkan 1, maka hanya 1 kelompok terdiri dari 4 mahasiswa. Jika jumlah mahasiswa modulo 3 menghasilkan 2, maka ada dua kelompok yang beranggotakan 4 orang. Anggota kelompok harus berbeda dengan tugas 1 dan tugas 2. - +1. 13515016 - Kevin Erdiza Yogatama +2. 13515112 - Irfan Ariq +3. 13515130 - Adya Naufal Fikri ## Petunjuk Pengerjaan 1. Buatlah organisasi pada gitlab dengan format "IF3110-2017-KXX-nama kelompok", dengan XX adalah nomor kelas. @@ -156,23 +157,33 @@ Harap semua anggota kelompok mengerjakan baik implementasi Firebase sebagai *clo Chat App Front-end : -1. Fungsionalitas A : 135140XX -2. Fungsionalitas B : 135140XX - +1. Firebase Init Connection : 13515130 +2. Styling : 13515112 +3. Controllers : 13515016 +4. Finding Order : 13515016 +5. HttpRequest : 13515130 +6. Service Worker : 13515112 Chat REST Service: -1. Fungsionalitas C : 135140XX -2. Fungsionalitas D : 135140XX +1. Driver Available : 13515016 +2. FCM Token : 13515130 +3. Add History : 13515130 +4. Send Message : 13515112 +5. Routing : 13515130 +6. Setting Database : 13515016 +7. Setting Firebase : 13515112 Fitur security (IP, User-agent) : -1. Fungsionalitas E : 135140XX -2. Fungsionalitas F : 135140XX +1. IP : 13515112 +2. User-Agent : 13515112 +3. Cek Kadaluarsa : 13515130 +4. Cek Token : 13515016 ## About -Asisten IF3110 2016 +Kelompok KIA IF3110 2017 -Ade | Johan | Kristianto | Micky | Michael | Rangga | Raudi | Robert | Sashi +Kevin | Irfan | Adya Dosen : Yudistira Dwi Wardhana | Riza Satria Perdana | Muhammad Zuhri Catur Candra