From 099ae10dd78dba473a2f32809b0fc0c44fe30dc3 Mon Sep 17 00:00:00 2001
From: keychera <kyogatama@gmail.com>
Date: Mon, 27 Nov 2017 20:22:40 +0700
Subject: [PATCH] working javascript for find order
---
.../src/main/webapp/resources/js/order.js | 30 +++++++++++++++----
.../src/main/webapp/views/order_view.jsp | 11 +++----
2 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/PrOjek/webapp/src/main/webapp/resources/js/order.js b/PrOjek/webapp/src/main/webapp/resources/js/order.js
index 180cd2bb2..46ae81a7e 100644
--- a/PrOjek/webapp/src/main/webapp/resources/js/order.js
+++ b/PrOjek/webapp/src/main/webapp/resources/js/order.js
@@ -7,8 +7,8 @@ var driver
function nextToSelectDriver() {
- var prev = 'select-destination'
- var next = 'select-driver'
+ var prev = 'select-destination';
+ var next = 'select-driver';
document.getElementById(prev).style.display = 'none';
document.getElementById(next).style.display = 'block';
document.getElementById("tab-"+prev).classList.remove("button-progress-now");
@@ -16,15 +16,35 @@ function nextToSelectDriver() {
}
function nextToCompleteOrder(){
- var prev = 'select-driver'
- var next = 'complete-order'
- console.log('NENE')
+ var prev = 'select-driver';
+ var next = 'complete-order';
document.getElementById(prev).style.display = 'none';
document.getElementById(next).style.display = 'block';
document.getElementById("tab-"+prev).classList.remove("button-progress-now");
document.getElementById("tab-"+next).classList.add("button-progress-now");
}
+function nextToWaitingForOrder() {
+ var prev = 'find-order';
+ var next = 'wait-order';
+ document.getElementById(prev).style.display = 'none';
+ document.getElementById(next).style.display = 'block';
+}
+
+function backToFindOrder() {
+ var prev = 'wait-order';
+ var next = 'find-order';
+ document.getElementById(prev).style.display = 'none';
+ document.getElementById(next).style.display = 'block';
+}
+
+function nextToGotAnOrder() {
+ var prev = 'wait-order';
+ var next = 'got-order';
+ document.getElementById(prev).style.display = 'none';
+ document.getElementById(next).style.display = 'block';
+}
+
function changeTo(element){
var id = Number(element.id.charAt(7));
for(var i = 1; i <= 5; i++){
diff --git a/PrOjek/webapp/src/main/webapp/views/order_view.jsp b/PrOjek/webapp/src/main/webapp/views/order_view.jsp
index 53b505e58..fc8d211a3 100644
--- a/PrOjek/webapp/src/main/webapp/views/order_view.jsp
+++ b/PrOjek/webapp/src/main/webapp/views/order_view.jsp
@@ -173,22 +173,22 @@
<!-- page 1-->
<div id="find-order" class="row">
<div class="col-4"></div>
- <div class="col-4 button button-success">FIND ORDER</div>
+ <div class="col-4 button button-success" onclick="nextToWaitingForOrder()">FIND ORDER</div>
<div class="col-4"></div>
</div>
<!-- page 2-->
- <div id="cancel-find" class="row">
+ <div id="wait-order" class="row" style="display: none">
<div class="row align-center">
<h4>Finding Order
<span id="dot-loading">...</span>
</h4>
</div>
<div class="col-4"></div>
- <div class="col-4 button button-fail">CANCEL</div>
+ <div class="col-4 button button-fail" onclick="backToFindOrder()">CANCEL</div>
<div class="col-4"></div>
</div>
<!-- page 3-->
- <div id="got-order" class="row">
+ <div id="got-order" class="row" style="display: none">
<div class="row align-center">
<h4>Got an Order</h4>
</div>
@@ -205,6 +205,3 @@ var idCustomer = <%= user.getId() %>
<% 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="assets/js/ajax.js"></script>--%>
-<%--<script type="text/javascript" src="assets/js/order.js"></script>--%>
\ No newline at end of file
--
GitLab