From b7fd416fd87e448b681f69b03687ed1927f4b48e Mon Sep 17 00:00:00 2001
From: "fariz.tumbuan" <13515050@std.stei.itb.ac.id>
Date: Sat, 7 Oct 2017 19:01:31 +0800
Subject: [PATCH] Bikin fron end laman complete order
---
css/order.css | 53 ++++++++++++++++--
login/sign_up.php | 2 +-
order/complete_order.php | 113 +++++++++++++++++++++++---------------
order/order.php | 2 +-
order/select_location.php | 8 +--
5 files changed, 125 insertions(+), 53 deletions(-)
diff --git a/css/order.css b/css/order.css
index c341aaab..a8b6898b 100755
--- a/css/order.css
+++ b/css/order.css
@@ -81,7 +81,7 @@ div.step_name {
margin-bottom: 10px;
}
-.content span {
+.content span.loc_form_label {
width: 30%;
margin-right: auto;
float: left;
@@ -92,7 +92,7 @@ div.step_name {
height: 20px;
}
-.content input[type=submit] {
+.content input[type=submit]#loc_button {
position: absolute;
margin: 10px;
left: 45%;
@@ -105,9 +105,27 @@ div.step_name {
margin: 7px 0;
}
+div h2 {
+ margin: 0;
+ padding: 0;
+ text-align: left;
+}
+
.star {
- size: 300%;
+ font-size: 30px;
color: yellow;
+
+ text-shadow:
+ -1px -1px 0 #000,
+ 1px -1px 0 #000,
+ -1px 1px 0 #000,
+ 1px 1px 0 #000;
+}
+
+div.rating_bar {
+ height: auto;
+ vertical-align: top;
+ border-radius: 20px;
}
#order_link {
@@ -169,4 +187,31 @@ div.choose_driver {
width: 50%;
text-align: center;
padding: 5px;
-}
\ No newline at end of file
+}
+
+div#driver_profile {
+ margin: 0;
+ padding-top: 10px;
+ text-align: center;
+}
+
+div#driver_profile p {
+ padding: 0;
+ margin: 0;
+}
+
+div#complete_order {
+ text-align: center;
+}
+
+div#left_complete {
+ margin-top: 5px;
+ width: 40%;
+ float: left;
+}
+
+div#right_complete {
+ margin-top: 20px;
+ width: 60%;
+ float: right;
+}
diff --git a/login/sign_up.php b/login/sign_up.php
index 81eb6ee0..a66c1c3c 100644
--- a/login/sign_up.php
+++ b/login/sign_up.php
@@ -31,7 +31,7 @@
$user_id=$row['user_id'];
if ($status == "customer") {
- header("Location: ../order/select_location.php?id=$user_id");
+ header("Location: ../order/order.php?id=$user_id");
} else {
$query = mysqli_query($con,"INSERT INTO driver (driver_id,total_score,votes) VALUES ('$user_id',0,0)") or die(mysqli_error($con));
if ($query) {
diff --git a/order/complete_order.php b/order/complete_order.php
index 1f14004c..6f0725f8 100644
--- a/order/complete_order.php
+++ b/order/complete_order.php
@@ -39,55 +39,82 @@
<div class="menu_container">
<?php include'../template/menu.php';?>
</div>
+ <script>
+ document.getElementById("order_link").setAttribute("class", "menu menu_active");
+ </script>
- <h1>Make an Order</h1>
- <div class="submenu_container">
- <div class="submenu left">
- Select Destination
- </div>
-
- <div class="submenu mid">
- Select a Driver
- </div>
-
- <div class="submenu right">
- Complete Order
- </div>
- </div>
- <form id="submit_cmplt_ordr" method="post" action="order_handler.php">
- <div class="content" id="complete_order">
- <h2>
- How was it?
- </h2>
- <div>
- <?php echo "
- <img class='driver_pict' src='../profile/getProfilePict.php?id=".$seldrv."'>"
- ;?>
- <p> @<?php echo $driver_username;?></p>
- <p> <?php echo $driver_name;?></p>
+ <div class="order_container">
+ <div class="subheader">
+ <div class="title"><h1>Make an Order</h1></div>
+ </div>
+ <div class="submenu_container">
+ <div class="submenu left">
+ <div class="step_num">
+ <p>1</p>
+ </div>
+ <div class="step_name">
+ <p>Select Destination</p>
+ </div>
</div>
- <div class="rating_bar">
- <span class="star" id="1-star" onclick="rate1()">★</span>
- <span class="star" id="2-star" onclick="rate2()">★</span>
- <span class="star" id="3-star" onclick="rate3()">★</span>
- <span class="star" id="4-star" onclick="rate4()">★</span>
- <span class="star" id="5-star" onclick="rate5()">★</span>
- <input type="hidden" name="rating" id="rating">
+
+ <div class="submenu mid">
+ <div class="step_num">
+ <p>2</p>
+ </div>
+ <div class="step_name">
+ <p>Select a Driver</p>
+ </div>
</div>
- <div>
- <textarea id="comment" name="comment" form="submit_cmplt_ordr">
- </textarea>
+
+ <div class="submenu right submenu_active">
+ <div class="step_num">
+ <p>3</p>
+ </div>
+ <div class="step_name">
+ <p>Complete Order</p>
+ </div>
</div>
+ </div>
- <input type="hidden" name="picking_point" value=<?php echo $ppoint ?>>
- <input type="hidden" name="destination" value=<?php echo $dest ?>>
- <input type="hidden" name="selected_driver" value=<?php echo $seldrv ?>>
- <input type="hidden" name="customer" value=<?php echo $user_id ?>>
- <input class="button green" type="submit" name="submit" value="Complete Order">
- </div>
- </form>
- <?php mysqli_close($con); ?>
+ <form id="submit_cmplt_ordr" method="post" action="order_handler.php">
+ <div class="content" id="complete_order">
+ <h2>How was it?</h2>
+ <div id="left_complete">
+ <div id="driver_profile">
+ <?php echo "
+ <img class='driver_pict' src='../profile/getProfilePict.php?id=".$seldrv."'>"
+ ;?>
+ <p> @<?php echo $driver_username;?></p>
+ <p> <?php echo $driver_name;?></p>
+ </div>
+ <div class="rating_bar" style="background-color: rgba(0,255,0,0.2);">
+ <span class="star" id="1-star" onclick="rate1()">★</span>
+ <span class="star" id="2-star" onclick="rate2()">★</span>
+ <span class="star" id="3-star" onclick="rate3()">★</span>
+ <span class="star" id="4-star" onclick="rate4()">★</span>
+ <span class="star" id="5-star" onclick="rate5()">★</span>
+ <input type="hidden" name="rating" id="rating">
+ </div>
+ </div>
+
+ <div id="right_complete">
+ <div>
+ <textarea id="comment" name="comment" form="submit_cmplt_ordr" rows="8" cols="27">
+ </textarea>
+ </div>
+
+ <input type="hidden" name="picking_point" value=<?php echo $ppoint ?>>
+ <input type="hidden" name="destination" value=<?php echo $dest ?>>
+ <input type="hidden" name="selected_driver" value=<?php echo $seldrv ?>>
+ <input type="hidden" name="customer" value=<?php echo $user_id ?>>
+
+ <input class="button green" type="submit" name="submit" value="Complete Order">
+ </div>
+ </div>
+ </form>
+ <?php mysqli_close($con); ?>
+ </div>
</div>
</body>
<script type="text/javascript">
diff --git a/order/order.php b/order/order.php
index fa2ec3f6..6acd9a0d 100644
--- a/order/order.php
+++ b/order/order.php
@@ -1,3 +1,3 @@
<?php
- header('Location : select_location.php')
+ header('Location: select_location.php')
?>
diff --git a/order/select_location.php b/order/select_location.php
index 187ffc00..ea9e4169 100644
--- a/order/select_location.php
+++ b/order/select_location.php
@@ -68,18 +68,18 @@
<form method="post" action=<?php echo "select_driver.php?id=" . $user_id;?>>
<div class="content" id="select_destination">
<div>
- <span>Picking point</span>
+ <span class="loc_form_label">Picking point</span>
<input type="text" name="picking_point">
</div>
<div>
- <span>Destination</span>
+ <span class="loc_form_label">Destination</span>
<input type="text" name="destination">
</div>
<div>
- <span>Preferred driver</span>
+ <span class="loc_form_label">Preferred driver</span>
<input type="text" name="preferred_driver">
</div>
- <input type="submit" name="submit_select_loc" class="button green" value="Next">
+ <input type="submit" name="submit_select_loc" class="button green" id="loc_button" value="Next">
</div>
</form>
</div>
--
GitLab