diff --git a/css/default_style.css b/css/default_style.css
index 336f2ff6a181eedac3a52921199569dc07ffa394..68c30196d825fe4601fe520ead18539fe6d6c3c0 100755
--- a/css/default_style.css
+++ b/css/default_style.css
@@ -7,6 +7,7 @@ body {
width: 360px;
height: 550px;
margin: 50px auto;
+ padding: 5px 20px;
padding-right: 20px;
padding-left: 20px;
border-top: 0.5px solid black;
@@ -81,14 +82,13 @@ a:hover {
}
.menu_container {
- background-color: red;
width: 360px;
- margin-left: auto;
- margin-right: auto;
+ margin: 15px auto 5px auto;
}
.subheader {
height: 15%;
+ margin-bottom: 10px;
}
.title {
float: left;
@@ -113,3 +113,19 @@ a:hover {
height: 100%;
width: 100%;
}
+
+ul.nav_bar {
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+ overflow: hidden;
+ display: table;
+ width: inherit;
+}
+
+ul.nav_bar > li {
+ display: table-cell;
+}
+
+#main_nav_bar.nav_bar > li {
+}
\ No newline at end of file
diff --git a/css/header.css b/css/header.css
index 6e015048ce8061bf823ce80b17eafc39df6f882f..d2e6ca954f7d67da60ff9d6143b8044f4f8181b9 100644
--- a/css/header.css
+++ b/css/header.css
@@ -23,3 +23,8 @@
margin: 0 ;
margin-top: 10px;
}
+
+div.greeting a, div.greeting a:link, div.greeting a:visited {
+ color: blue;
+ text-decoration: underline;
+}
diff --git a/css/history.css b/css/history.css
index dd3da3a4a4d0a78a73d2ae396e0a16831bafa735..d3c75758b99659de2e5585335494675e9cbc8a25 100755
--- a/css/history.css
+++ b/css/history.css
@@ -1,5 +1,4 @@
.history_container {
- margin-top: 10%;
height: 79%;
}
@@ -11,19 +10,6 @@
}
-.page_menu {
- list-style-type: none;
- margin: 0;
- padding: 0;
- overflow: hidden;
-}
-
-.page_menu > li {
- width: 50%;
- display: inline;
- float: left;
-}
-
.history_menu {
border: 0.5px solid black;
text-align: center;
@@ -52,8 +38,9 @@ table.history_table {
}
table.history_table p {
- margin: 0;
+ margin: 0 0 5px 0;
padding: 0;
+ font-size: 12px;
font-style: "Lucida Console", Monaco, monospace;
}
@@ -61,35 +48,22 @@ td.history_column {
padding: 2px 0 0 8px;
}
-p.history_date {
- font-size: 14px;
+table.history_table p.history_date {
color: grey;
font-weight: bold;
}
-p.history_username {
+table.history_table p.history_username {
font-size: 20px;
font-weight: bold;
}
-p.history_loc {
- font-size: 14px;
-}
-
-p.history_rating {
- font-size: 14px;
-}
-
-p.history_comment {
- font-size: 14px;
-}
-
table.history_table th, td {
- padding: 5px;
+ padding: 0 5px;
border-collapse: collapse;
}
-p.history_table td {
+table.history_table tr td.order_data {
vertical-align: top;
}
@@ -99,12 +73,30 @@ img.history_pict {
border-radius: 50%;
display: inline;
margin: 0;
-
}
-.hide_hist_button {
+button.hide_hist_button {
margin: 0;
color: white;
background-color: red;
font-size: 9px;
+ margin-bottom: 45px;
+}
+
+.checked {
+ color:orange
+}
+
+.yellow_score {
+ font-size: 20px;
+ color: orange;
+ vertical-align: middle;
+}
+
+ul#history_nav.nav_bar > li {
+ width: 50%;
+}
+
+ul#history_nav {
+ margin-bottom: 7px;
}
\ No newline at end of file
diff --git a/css/order.css b/css/order.css
index c78640715ed9bc0fc7864ff8e3a5662dd7192bc3..a8b6898b0da9419c594f16d7d259ba8dd6db4e67 100755
--- a/css/order.css
+++ b/css/order.css
@@ -1,66 +1,217 @@
-.frame > h1 {
- text-align: left;
+.order_container {
+ height: 79%;
+}
+
+.order_container .subheader {
+ height: 10%;
}
.submenu_container {
- width: 360px;
- display: inline-flex;
- margin-left: auto;
- margin-right: auto;
+ width: 100%;
+ display: table;
+ border-collapse: separate;
+ border-spacing: 10px;
+ margin-bottom: 5px;
}
.submenu {
- width: 100px;
+ display: table-cell;
+ width: 30%;
height: 40px;
- float: left;
border: 0.5px solid black;
font-size: 15px;
- text-align: center;
+ position: relative;
}
-.submenu.left {
- float: left;
+.submenu_active {
+ background-color: #fffe9f;
}
.submenu.mid {
- margin-left: 29px;
- margin-right: 29px;
+ margin: 0 5% 0;
}
-.submenu.right {
+div.step_num {
+ float: left;
+ width: 20%;
+ height: 100%;
+ vertical-align: middle;
+}
+
+div.step_name {
float: right;
+ height: 100%;
+ vertical-align: middle;
}
-.content {
- width: 350px;
- margin-top: 20px;
- margin-left: 5px;
- margin-right: 5px;
+div.step_num p {
+ margin: 10px 0 0 2px;
+ text-align: center;
+ width: 25px;
+ padding: 2% 0;
+ background-color: grey;
+ border-radius: 50%;
}
-.content > div {
- margin: 5px 0px 5px 0px;
+div.step_name p {
+ margin: 0 0 0 15px;
}
-.content > div div {
- display: inline;
+.submenu p {
+ margin: 0;
+ position: absolute;
+ top: 0%;
+ vertical-align: middle;
}
-.content > div > span {
+
+div.step_name {
+ float: right;
+ width: 80%;
+ text-align: left;
+}
+
+.content {
+ width: 100%;
+ padding-left: 0px;
+ margin: 5px;
+}
+
+.content div {
+ width: 100%;
+ margin-bottom: 10px;
+}
+
+.content span.loc_form_label {
+ width: 30%;
+ margin-right: auto;
float: left;
}
-.content > div > input[type="text"] {
- width: 100px;
- float: right;
+.content input[type=text] {
+ width: 63%;
+ height: 20px;
}
-#select_driver div {
- border: 0.5px solid black;
+.content input[type=submit]#loc_button {
+ position: absolute;
+ margin: 10px;
+ left: 45%;
+ width: 60px;
+ height: 30px;
+
}
-#preferred_driver {
+#select_driver h2 {
+ margin: 7px 0;
+}
+
+div h2 {
+ margin: 0;
+ padding: 0;
+ text-align: left;
+}
+
+.star {
+ 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 {
background-color: #465d43;
-}
\ No newline at end of file
+}
+
+#driver_table_container {
+ overflow-y: auto;
+ overflow-x: hidden;
+ height: inherit;
+}
+
+img.driver_pict {
+ width: 100px;
+ height: 100px;
+ border-radius: 50%;
+ display: inline;
+ margin: 0;
+}
+
+table.driver_table {
+ margin-top: 5px;
+ width: 100%;
+ padding: 0;
+ border-collapse: collapse;
+}
+
+table.driver_table th, td {
+ padding: 0 5px;
+ border-collapse: collapse;
+}
+
+table.driver_table p {
+ margin: 0 0 5px 0;
+ padding: 0;
+ width: 40%;
+ font-size: 12px;
+ font-style: "Lucida Console", Monaco, monospace;
+}
+
+td.driver_column {
+ padding-top: 5px;
+ padding-right: 10px;
+ padding-left: 20px;
+}
+
+table.driver_table tr td.driver_column {
+ vertical-align: top;
+}
+
+table.driver_table p.driver_username {
+ font-size: 20px;
+}
+
+div.choose_driver {
+ float: right;
+ border: 0.5px solid black;
+ border-radius: 5px;
+ width: 50%;
+ text-align: center;
+ padding: 5px;
+}
+
+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/css/profile.css b/css/profile.css
index 86fd7c3bea440677adde9adc0f0207d0ca59d100..ebcd394a83a5dd1251ff083231d7a085f343cf88 100755
--- a/css/profile.css
+++ b/css/profile.css
@@ -1,5 +1,4 @@
.profile_container {
- margin-top: 10%;
height: 50%;
}
diff --git a/history/driver_history.php b/history/driver_history.php
index f9789aabea9e82b3ce7324a7cd24606fdb032320..2d757f5f8402e863719e6b69ed5bb0e2febb04bc 100644
--- a/history/driver_history.php
+++ b/history/driver_history.php
@@ -5,6 +5,8 @@
<link rel="stylesheet" type="text/css" href="../css/default_style.css">
<link rel="stylesheet" type="text/css" href="../css/history.css">
<link rel="stylesheet" type="text/css" href="../css/header.css">
+
+ <script type="text/javascript" src="format_date.js"></script>
</head>
<body>
<div class="frame">
@@ -34,7 +36,7 @@
<div class="title"><h1>Transaction History</h1></div>
</div>
- <ul class="page_menu">
+ <ul class="nav_bar" id="history_nav">
<li>
<a class="history_menu" href=<?php echo 'transaction_history.php?id='.$user_id; ?>>
<h3>MY PREVIOUS ORDER</h3>
@@ -60,25 +62,38 @@
if(mysqli_num_rows($query_order)!=0)
{
+ $i = 1;
while($row=mysqli_fetch_assoc($query_order)) {
$driver_query=mysqli_query($con,"SELECT username FROM user WHERE user_id='".$row['cust_id']."'") or die(mysqli_error());
$driver_row=mysqli_fetch_assoc($driver_query);
$driver_name=$driver_row['username'];
+ $given_score=(int)$row['score'];
+
+ echo
+ '<script>
+ var order_date = new Date("'.$row['date'].'");
+ </script>';
+
echo
"<tr>
<td>
<img class='history_pict' src='../profile/getProfilePict.php?id=".$row['cust_id']."'>
<button class='hide_hist_button' type='button' value='hide' onclick='hide_row(this)'>Hide</button>
</td>
- <td>
- <p class='history_date'>".$row['date']."</p>
+ <td class='order_data'>
+ <p class='history_date' id='row".$i."'></p>
+ <script>
+ document.getElementById('row".$i."').innerHTML=format_date(order_date);
+ </script>
<p class='history_username'>".$driver_name."</p>
<p class='history_loc'>".$row['pick_city']." - ".$row['dest_city']."</p>
- <p class='history_rating'>gave ".$row['score']." stars for this order</p>
+ <p class='history_rating'>gave <span class='yellow_score'>  ".$given_score." </span> stars for this order</p>
<p class='history_comment'>and left comment:</p>
<p class='history_comment' style='margin-left: 30px;'>".$row['comment']."</p>
</td>
</tr>";
+
+ $i++;
}
}
mysqli_close($con);
@@ -88,7 +103,6 @@
</div>
</div>
</div>
+ <script type="text/javascript" src="hide_history.js"></script>
</body>
</html>
-
-<script type="text/javascript" src="hide_history.js"></script>
\ No newline at end of file
diff --git a/history/format_date.js b/history/format_date.js
new file mode 100644
index 0000000000000000000000000000000000000000..87cf44f0cca2fc11e4a927013ad4cdb2482ddee0
--- /dev/null
+++ b/history/format_date.js
@@ -0,0 +1,126 @@
+function format_date(order_date) {
+ var day;
+ switch (order_date.getDay()) {
+ case 0:
+ day = "Sunday";
+ break;
+
+ case 1:
+ day = "Monday";
+ break;
+
+ case 2:
+ day = "Tuesday";
+ break;
+
+ case 3:
+ day = "Wednesday";
+ break;
+
+ case 4:
+ day = "Thursday";
+ break;
+
+ case 5:
+ day = "Friday";
+ break;
+
+ case 6:
+ day = "Saturday";
+ break;
+
+ default:
+ day = "Error: day out of range";
+ break;
+ }
+
+ var month;
+ switch (order_date.getMonth()) {
+ case 0:
+ month = "January";
+ break;
+
+ case 1:
+ month = "February";
+ break;
+
+ case 2:
+ month = "March";
+ break;
+
+ case 3:
+ month = "April";
+ break;
+
+ case 4:
+ month = "May";
+ break;
+
+ case 5:
+ month = "June";
+ break;
+
+ case 6:
+ month = "July";
+ break;
+
+ case 7:
+ month = "August";
+ break;
+
+ case 8:
+ month = "September";
+ break;
+
+ case 9:
+ month = "October";
+ break;
+
+ case 10:
+ month = "November";
+ break;
+
+ case 11:
+ month = "December";
+ break;
+
+ default:
+ month = "Error: month out of range";
+ break;
+ }
+
+ var dateSuffix;
+ switch (order_date.getDate) {
+ case 1:
+ dateSuffix = "st";
+ break;
+
+ case 2:
+ dateSuffix = "nd";
+
+ case 3:
+ dateSuffix = "rd";
+
+ case 21:
+ dateSuffix = "st";
+
+ case 23:
+ dateSuffix = "nd";
+ break;
+
+ case 23:
+ dateSuffix = "rd";
+ break;
+
+ case 31:
+ dateSuffix = "st";
+ break;
+
+ default:
+ dateSuffix = "th";
+ break;
+ }
+
+
+ return (day + ", " + month + " " + order_date.getDate() + dateSuffix + " " + order_date.getFullYear());
+};
\ No newline at end of file
diff --git a/history/transaction_history.php b/history/transaction_history.php
index 789778ffa99161c62bcfa67db4c59f0d40fd06b8..7c562460f3e6e6d3bfc5eae3653cf512c1ceb45d 100644
--- a/history/transaction_history.php
+++ b/history/transaction_history.php
@@ -2,12 +2,13 @@
<html>
<head>
<title>transaction history</title>
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="../css/default_style.css">
<link rel="stylesheet" type="text/css" href="../css/history.css">
<link rel="stylesheet" type="text/css" href="../css/header.css">
- <script type="text/javascript" src="hide_history.js">
+
+ <script type="text/javascript" src="format_date.js"></script>
</script>
-}
</head>
<body>
<div class="frame">
@@ -36,7 +37,7 @@
<div class="subheader">
<div class="title"><h1>Transaction History</h1></div>
</div>
- <ul class="page_menu">
+ <ul id="history_nav" class="nav_bar">
<li>
<a class="history_menu menu_active" href=<?php echo 'transaction_history.php?id='.$user_id; ?>>
<h3>MY PREVIOUS ORDER</h3>
@@ -62,25 +63,44 @@
if(mysqli_num_rows($query_order)!=0)
{
+ $i = 1;
while($row=mysqli_fetch_assoc($query_order)) {
$driver_query=mysqli_query($con,"SELECT username FROM user WHERE user_id='".$row['driver_id']."'") or die(mysqli_error());
$driver_row=mysqli_fetch_assoc($driver_query);
$driver_name=$driver_row['username'];
+
+ echo
+ '<script>
+ var order_date = new Date("'.$row['date'].'");
+ </script>';
+
echo
"<tr>
<td>
<img class='history_pict' src='../profile/getProfilePict.php?id=".$row['driver_id']."'>
<button class='hide_hist_button' type='button' value='hide' onclick='hide_row(this)'>Hide</button>
</td>
- <td>
- <p class='history_date'>".$row['date']."</p>
+ <td class='order_data'>
+ <p class='history_date' id='row".$i."'></p>
+ <script>
+ document.getElementById('row".$i."').innerHTML=format_date(order_date);
+ </script>
<p class='history_username'>".$driver_name."</p>
<p class='history_loc'>".$row['pick_city']." - ".$row['dest_city']."</p>
- <p class='history_rating'>rating ".$row['score']."</p>
+ <p class='history_rating'>You rated: ";
+
+ for ($i = 0; $i < $row['score']; $i++) {
+ echo "<span class='fa fa-star checked'></span>";
+ }
+
+ echo
+ "</p>
<p class='history_comment'>You commented:</p>
<p class='history_comment' style='margin-left: 30px;'>".$row['comment']."</p>
</td>
</tr>";
+
+ $i++;
}
}
mysqli_close($con);
diff --git a/order/(BACKUP) order.php b/order/(BACKUP) order.php
new file mode 100644
index 0000000000000000000000000000000000000000..c5c45aa3da2ef9715ec18e2d51b3925813d77b38
--- /dev/null
+++ b/order/(BACKUP) order.php
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>U Wanna Call Me Beibh?</title>
+ <link rel="stylesheet" type="text/css" href="../css/default_style.css">
+ <link rel="stylesheet" type="text/css" href="../css/order.css">
+ <link rel="stylesheet" type="text/css" href="../css/header.css">
+</head>
+<body>
+ <div class="frame">
+ <div class="header">
+ <?php
+ $user_id = $_GET['id'];
+ include '../database/dbconnect.php';
+
+ $query=mysqli_query($con,"SELECT * FROM user WHERE user_id='".$user_id."'") or die(mysqli_error());
+
+ if(mysqli_num_rows($query)!=0)
+ {
+ $row=mysqli_fetch_assoc($query);
+ $username = $row['username'];
+ include("../template/header.php");
+ }
+ mysqli_close($con);
+ ?>
+ </div>
+ <div class="menu_container">
+ <?php include'../template/menu.php';?>
+ </div>
+
+ <h1>Make an Order</h1>
+ <div class="submenu_container">
+ <div class="submenu left" onclick="showSelectDest()">
+ Select Destination
+ </div>
+
+ <div class="submenu mid" onclick="showSelectDriver()">
+ Select a Driver
+ </div>
+
+ <div class="submenu right" onclick="showCompleteOrder()">
+ Complete Order
+ </div>
+ </div>
+ <form method="post">
+ <div class="content" id="select_destination">
+ <div>
+ <div>
+ <span>Picking point</span>
+ <input type="text" name="picking_point">
+ </div>
+ <div>
+ <span>Destination</span>
+ <input type="text" name="destination">
+ </div>
+ <div>
+ <span>Preferred driver</span>
+ <input type="text" name="preferred_driver">
+ </div>
+ </div>
+ <div class="button green" onclick="showSelectDriver()">
+ Next
+ </div>
+ </div>
+ <div class="content" id="select_driver" style="display: none;">
+ <div id="preferred_driver">
+ <h2>Preferred driver</h2>
+ </div>
+ <div id="other_driver">
+ <h2>Other drivers</h2>
+ </div>
+ <div id="selected_driver" style="display: none">
+ <input type="text" name="selected_driver">
+ </div>
+ </div>
+ <div class="content" id="complete_order" style="display: none;">
+ <h2>
+ How was it?
+ </h2>
+ <input class="button green" type="submit" name="submit" value="Complete Order">
+ </div>
+ </form>
+ </div>
+
+ <script type="text/javascript">
+ var pref_driver = $("input#preferred_driver").val();
+ function showSelectDest() {
+ alert(pref_driver);
+ document.getElementById('select_destination').style.display= 'inline';
+ document.getElementById('select_driver').style.display= 'none';
+ document.getElementById('complete_order').style.display= 'none';
+ };
+
+ function showSelectDriver() {
+ document.getElementById('select_driver').style.display= 'inline';
+ document.getElementById('select_destination').style.display= 'none';
+ document.getElementById('complete_order').style.display= 'none';
+ };
+
+ function showCompleteOrder() {
+ document.getElementById('complete_order').style.display='inline';
+ document.getElementById('select_destination').style.display= 'none';
+ document.getElementById('select_driver').style.display= 'none';
+ };
+ </script>
+</body>
+</html>
diff --git a/order/complete_order.html b/order/complete_order.html
deleted file mode 100755
index d6d12cccf7560b357e12c5275ab62ff3e470601c..0000000000000000000000000000000000000000
--- a/order/complete_order.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<body>
- <p>
- complete order
- </p>
-</body>
\ No newline at end of file
diff --git a/order/complete_order.php b/order/complete_order.php
new file mode 100644
index 0000000000000000000000000000000000000000..6f0725f8117b4839d11a8b15e29b577a42832e48
--- /dev/null
+++ b/order/complete_order.php
@@ -0,0 +1,191 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>U Wanna Call Me Beibh?</title>
+ <link rel="stylesheet" type="text/css" href="../css/default_style.css">
+ <link rel="stylesheet" type="text/css" href="../css/order.css">
+ <link rel="stylesheet" type="text/css" href="../css/header.css">
+</head>
+<body>
+ <div class="frame">
+ <div class="header">
+ <?php
+ $user_id = $_GET['id'];
+ include '../database/dbconnect.php';
+
+ $query=mysqli_query($con,"SELECT * FROM user WHERE user_id='".$user_id."'") or die(mysqli_error());
+
+ if(mysqli_num_rows($query)!=0)
+ {
+ $row=mysqli_fetch_assoc($query);
+ $username = $row['username'];
+ include("../template/header.php");
+ }
+
+ //==================================================
+
+ $ppoint = $_POST['picking_point'];
+ $dest = $_POST['destination'];
+ $seldrv = $_POST['selected_driver'];
+
+ $driverinfo_query = mysqli_query($con, "SELECT * FROM user JOIN (SELECT * FROM driver WHERE driver_id='" . $seldrv . "') AS drivert ON user_id = driver_id") or die(mysqli_error());
+ $driverinfo = mysqli_fetch_assoc($driverinfo_query);
+
+ echo $ppoint;
+ $driver_username = $driverinfo['username'];
+ $driver_name = $driverinfo['name'];
+ ?>
+ </div>
+ <div class="menu_container">
+ <?php include'../template/menu.php';?>
+ </div>
+ <script>
+ document.getElementById("order_link").setAttribute("class", "menu menu_active");
+ </script>
+
+ <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="submenu mid">
+ <div class="step_num">
+ <p>2</p>
+ </div>
+ <div class="step_name">
+ <p>Select a Driver</p>
+ </div>
+ </div>
+
+ <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>
+
+
+ <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">
+ var star1 = document.getElementById('1-star');
+ var star2 = document.getElementById('2-star');
+ var star3 = document.getElementById('3-star');
+ var star4 = document.getElementById('4-star');
+ var star5 = document.getElementById('5-star');
+ var rate = document.getElementById('rating');
+
+ function rate1() {
+ rate.value = 1;
+ light1();
+ }
+ function rate2() {
+ rate.value = 2;
+ light2();
+ }
+ function rate3() {
+ rate.value = 3;
+ light3();
+ }
+ function rate4() {
+ rate.value = 4;
+ light4();
+ }
+ function rate5() {
+ rate.value = 5;
+ light5();
+ }
+
+ function light1() {
+ rate.value = 1;
+ star1.style.color = "yellow";
+ star2.style.color = "gray";
+ star3.style.color = "gray";
+ star4.style.color = "gray";
+ star5.style.color = "gray";
+ }
+ function light2() {
+ rate.value = 2;
+ star1.style.color = "yellow";
+ star2.style.color = "yellow";
+ star3.style.color = "gray";
+ star4.style.color = "gray";
+ star5.style.color = "gray";
+ }
+ function light3() {
+ rate.value = 3;
+ star1.style.color = "yellow";
+ star2.style.color = "yellow";
+ star3.style.color = "yellow";
+ star4.style.color = "gray";
+ star5.style.color = "gray";
+ }
+ function light4() {
+ rate.value = 4;
+ star1.style.color = "yellow";
+ star2.style.color = "yellow";
+ star3.style.color = "yellow";
+ star4.style.color = "yellow";
+ star5.style.color = "gray";
+ }
+ function light5() {
+ rate.value = 5;
+ star1.style.color = "yellow";
+ star2.style.color = "yellow";
+ star3.style.color = "yellow";
+ star4.style.color = "yellow";
+ star5.style.color = "yellow";
+ }
+
+</script>
+</html>
\ No newline at end of file
diff --git a/order/order.php b/order/order.php
index dd2165055dc367c38037c8eb7446f2552abd83b5..45240315bed168b2a3f6a46d0425ab3978eb7767 100644
--- a/order/order.php
+++ b/order/order.php
@@ -1,108 +1,6 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>U Wanna Call Me Beibh?</title>
- <link rel="stylesheet" type="text/css" href="../css/default_style.css">
- <link rel="stylesheet" type="text/css" href="../css/order.css">
- <link rel="stylesheet" type="text/css" href="../css/header.css">
-</head>
-<body>
- <div class="frame">
- <div class="header">
- <?php
- $user_id = $_GET['id'];
- include '../database/dbconnect.php';
-
- $query=mysqli_query($con,"SELECT * FROM user WHERE user_id='".$user_id."'") or die(mysqli_error());
-
- if(mysqli_num_rows($query)!=0)
- {
- $row=mysqli_fetch_assoc($query);
- $username = $row['username'];
- include("../template/header.php");
- }
- mysqli_close($con);
- ?>
- </div>
- <div class="menu_container">
- <?php include'../template/menu.php';?>
- <script>
- document.getElementById("order_link").setAttribute("class", "menu menu_active");
- </script>
- </div>
+<?php
- <h1>Make an Order</h1>
- <div class="submenu_container">
- <div class="submenu left" onclick="showSelectDest()">
- Select Destination
- </div>
-
- <div class="submenu mid" onclick="showSelectDriver()">
- Select a Driver
- </div>
-
- <div class="submenu right" onclick="showCompleteOrder()">
- Complete Order
- </div>
- </div>
- <form method="post">
- <div class="content" id="select_destination">
- <div>
- <div>
- <span>Picking point</span>
- <input type="text" name="picking_point">
- </div>
- <div>
- <span>Destination</span>
- <input type="text" name="destination">
- </div>
- <div>
- <span>Preferred driver</span>
- <input type="text" name="preferred_driver">
- </div>
- </div>
- <div class="button green" id="next" onclick="showSelectDriver()">
- Next
- </div>
- </div>
- <div class="content" id="select_driver" style="display: none;">
- <div id="preferred_driver">
- <h2>Preferred driver</h2>
- </div>
- <div id="other_driver">
- <h2>Other drivers</h2>
- </div>
- <div id="selected_driver" style="display: none">
- <input type="text" name="selected_driver">
- </div>
- </div>
- <div class="content" id="complete_order" style="display: none;">
- <h2>
- How was it?
- </h2>
- <input class="button green" type="submit" name="submit" value="Complete Order">
- </div>
- </form>
- </div>
-
- <script type="text/javascript">
- function showSelectDest() {
- document.getElementById('select_destination').style.display= 'inline';
- document.getElementById('select_driver').style.display= 'none';
- document.getElementById('complete_order').style.display= 'none';
- };
-
- function showSelectDriver() {
- document.getElementById('select_driver').style.display= 'inline';
- document.getElementById('select_destination').style.display= 'none';
- document.getElementById('complete_order').style.display= 'none';
- };
-
- function showCompleteOrder() {
- document.getElementById('complete_order').style.display='inline';
- document.getElementById('select_destination').style.display= 'none';
- document.getElementById('select_driver').style.display= 'none';
- };
- </script>
-</body>
-</html>
+ $user_id = $_GET['id'];
+ header("Location: ../order/select_location.php?id=$user_id");
+ die();
+?>
diff --git a/order/order_handler.php b/order/order_handler.php
new file mode 100644
index 0000000000000000000000000000000000000000..b676fbd7718efb45aeaf011dfcc7c92292d626e8
--- /dev/null
+++ b/order/order_handler.php
@@ -0,0 +1,20 @@
+<?php
+ include '../database/dbconnect.php';
+
+ $cust_id = $_POST['customer'];
+ $driver_id = $_POST['selected_driver'];
+ $pick_city = $_POST['picking_point'];
+ $dest_city = $_POST['destination'];
+ $score = $_POST['rating'];
+ $comment = $_POST['comment'];
+ $date = date_create() -> format("Y-m-d");
+
+ $insert_order_query = mysqli_query($con, "
+ INSERT INTO `order`(dest_city, pick_city, score, comment, driver_id, cust_id, date)
+ VALUES ('".$dest_city."', '".$pick_city."', '".$score."', '".$comment."', '".$driver_id."', '".$cust_id."', '".$date."')
+ ") or die(mysqli_error($con));
+
+ mysqli_close($con);
+
+ header("Location: order.php?id=$cust_id");
+?>
\ No newline at end of file
diff --git a/order/select_driver.html b/order/select_driver.html
deleted file mode 100755
index 32ffbe45f9c209fe776ba7e27870c54e6cd79997..0000000000000000000000000000000000000000
--- a/order/select_driver.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<body>
- <p>
- select driver
- </p>
-</body>
\ No newline at end of file
diff --git a/order/select_driver.php b/order/select_driver.php
new file mode 100644
index 0000000000000000000000000000000000000000..db891adb157f1f7b76bf4a408343747bf0027e11
--- /dev/null
+++ b/order/select_driver.php
@@ -0,0 +1,184 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>U Wanna Call Me Beibh?</title>
+ <link rel="stylesheet" type="text/css" href="../css/default_style.css">
+ <link rel="stylesheet" type="text/css" href="../css/order.css">
+ <link rel="stylesheet" type="text/css" href="../css/header.css">
+</head>
+<body>
+ <div class="frame">
+ <div class="header">
+ <?php
+ $user_id = $_GET['id'];
+ include '../database/dbconnect.php';
+
+ $query=mysqli_query($con,"SELECT * FROM user WHERE user_id='".$user_id."'") or die(mysqli_error());
+
+ if(mysqli_num_rows($query)!=0)
+ {
+ $row=mysqli_fetch_assoc($query);
+ $username = $row['username'];
+ include("../template/header.php");
+ }
+
+ //===========================================
+
+ $ppoint = $_POST['picking_point'];
+ $dest = $_POST['destination'];
+ $prefdrv = $_POST['preferred_driver'];
+
+ function ShowPrefDrv($prefdrv, $con)
+ {
+ $pdQuery = mysqli_query($con, "SELECT * FROM driver INNER JOIN user ON driver_id = user_id WHERE name='$prefdrv'") or die(mysqli_error($con));
+ if (mysqli_num_rows($pdQuery)!=0) {
+ while ($row = mysqli_fetch_assoc($pdQuery)) {
+ $driver_id = $row['driver_id'];
+ $driver_name = $row['name'];
+ $driver_votes = $row['votes'];
+ $driver_rating = ($driver_votes == 0) ? 0 : $row['total_score']/$row['votes'];
+ if ($driver_id != $GLOBALS['user_id']) {
+ echo
+ "
+ <table class='driver_table'>
+ <colgroup>
+ <col style='width: 20%;'>
+ <col style='width: 80%;'>
+ </colgroup>
+ <tr>
+ <td>
+ <img class='driver_pict' src='../profile/getProfilePict.php?id=".$driver_id."'
+ </td>
+ <td class='driver_column'>
+ <p class='driver_username'>".$driver_name."</p>
+ <p class='driver_rating'>★".$driver_rating." (".$driver_votes." votes)</p>
+ <div class='choose_driver green' onclick='chooseDriver(".$driver_id.")'>
+ I CHOOSE YOU
+ </div>
+ </td>
+ </tr>
+ </table>
+ ";
+ }
+ }
+ }
+ else
+ {
+ echo "<h3>Nothing to display :(</h3>";
+ }
+ }
+
+ function ShowRegDrv($con, $user_id)
+ {
+ $point = $GLOBALS['ppoint'];
+ $dst = $GLOBALS['dest'];
+
+ $rdQuery = mysqli_query($con, "
+ SELECT DISTINCT * FROM (driver_prefloc INNER JOIN user ON driver_prefloc.driver_id = user.user_id)
+ INNER JOIN driver ON driver.driver_id = user.user_id
+ WHERE pref_loc = '$point' OR pref_loc = '$dst'
+ ") or die(mysqli_error($con));
+
+ while ($row = mysqli_fetch_assoc($rdQuery)) {
+ $driver_id = $row['driver_id'];
+ $driver_name = $row['name'];
+ $driver_votes = $row['votes'];
+ $driver_rating = ($driver_votes == 0) ? 0 : $row['total_score']/$row['votes'];
+ if ($driver_id != $user_id) {
+ echo
+ "
+ <table class='driver_table'>
+ <colgroup>
+ <col style='width: 20%;'>
+ <col style='width: 80%;'>
+ </colgroup>
+ <tr>
+ <td>
+ <img class='driver_pict' src='../profile/getProfilePict.php?id=".$driver_id."'
+ </td>
+ <td class='driver_column'>
+ <p class='driver_username'>".$driver_name."</p>
+ <p class='driver_rating'>★".$driver_rating." (".$driver_votes." votes)</p>
+ <div class='choose_driver green' onclick='chooseDriver(".$driver_id.")'>
+ I CHOOSE YOU
+ </div>
+ </td>
+ </tr>
+ </table>
+ ";
+ }
+ }
+ }
+ ?>
+ </div>
+ <div class="menu_container">
+ <?php include'../template/menu.php';?>
+ </div>
+ <script>
+ document.getElementById("order_link").setAttribute("class", "menu menu_active");
+ </script>
+
+ <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="submenu mid submenu_active">
+ <div class="step_num">
+ <p>2</p>
+ </div>
+ <div class="step_name">
+ <p>Select a Driver</p>
+ </div>
+ </div>
+
+ <div class="submenu right">
+ <div class="step_num">
+ <p>3</p>
+ </div>
+ <div class="step_name">
+ <p>Complete Order</p>
+ </div>
+ </div>
+ </div>
+
+
+ <div id="driver_table_container">
+ <form method="post" id="submit_select_drv" action=<?php echo "complete_order.php?id=".$user_id ?>>
+ <?php echo $ppoint . $dest; ?>
+
+ <div class="content" id="select_driver">
+ <div id="preferred_driver">
+ <h2>Preferred driver</h2>
+ <?php ShowPrefDrv($prefdrv, $con) ?>
+ </div>
+ <div id="other_driver">
+ <h2>Other drivers</h2>
+ <?php ShowRegDrv($con, $user_id) ?>
+ </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" id="selected_driver">
+ </div>
+ </form>
+ <?php mysqli_close($con) ?>
+ </div>
+ </div>
+</body>
+<script type="text/javascript">
+ function chooseDriver(driver_id) {
+ document.getElementById('selected_driver').value = driver_id;
+ var form = document.getElementById('submit_select_drv');
+ form.submit();
+ }
+</script>
+</html>
\ No newline at end of file
diff --git a/order/select_location.php b/order/select_location.php
index 44b5ca0243fde2923992bf5b8879a47420e3a1fa..ea9e4169e87fe31b2e337917a6fe914e1b493ac2 100644
--- a/order/select_location.php
+++ b/order/select_location.php
@@ -1,5 +1,89 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>U Wanna Call Me Beibh?</title>
+ <link rel="stylesheet" type="text/css" href="../css/default_style.css">
+ <link rel="stylesheet" type="text/css" href="../css/order.css">
+ <link rel="stylesheet" type="text/css" href="../css/header.css">
+</head>
<body>
- <p>
- select location
- </p>
-</body>
\ No newline at end of file
+ <div class="frame">
+ <div class="header">
+ <?php
+ $user_id = $_GET['id'];
+ include '../database/dbconnect.php';
+
+ $query=mysqli_query($con,"SELECT * FROM user WHERE user_id='".$user_id."'") or die(mysqli_error());
+
+ if(mysqli_num_rows($query)!=0)
+ {
+ $row=mysqli_fetch_assoc($query);
+ $username = $row['username'];
+ include("../template/header.php");
+ }
+ mysqli_close($con);
+ ?>
+ </div>
+ <div class="menu_container">
+ <?php include'../template/menu.php';?>
+ </div>
+ <script>
+ document.getElementById("order_link").setAttribute("class", "menu menu_active");
+ </script>
+
+ <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 submenu_active">
+ <div class="step_num">
+ <p>1</p>
+ </div>
+ <div class="step_name">
+ <p>Select Destination</p>
+ </div>
+ </div>
+
+ <div class="submenu mid">
+ <div class="step_num">
+ <p>2</p>
+ </div>
+ <div class="step_name">
+ <p>Select a Driver</p>
+ </div>
+ </div>
+
+ <div class="submenu right">
+ <div class="step_num">
+ <p>3</p>
+ </div>
+ <div class="step_name">
+ <p>Complete Order</p>
+ </div>
+ </div>
+ </div>
+
+
+ <form method="post" action=<?php echo "select_driver.php?id=" . $user_id;?>>
+ <div class="content" id="select_destination">
+ <div>
+ <span class="loc_form_label">Picking point</span>
+ <input type="text" name="picking_point">
+ </div>
+ <div>
+ <span class="loc_form_label">Destination</span>
+ <input type="text" name="destination">
+ </div>
+ <div>
+ <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" id="loc_button" value="Next">
+ </div>
+ </form>
+ </div>
+
+ </div>
+</body>
+</html>
diff --git a/order/show_drivers.php b/order/show_drivers.php
deleted file mode 100644
index 7a9ce35739f88a6cf18774724f1da2112a188181..0000000000000000000000000000000000000000
--- a/order/show_drivers.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
- include '../database/dbconnect.php';
-
-
-?>
\ No newline at end of file
diff --git a/profile/profile.php b/profile/profile.php
index 0f45fde3346be1f477e476c13258db180b3b1b7b..1ea48363bf0eba5048d0bebb85ddba5d6549f99c 100644
--- a/profile/profile.php
+++ b/profile/profile.php
@@ -34,9 +34,7 @@
<div class="edit_profile_button"><a href=<?php echo 'edit_profile.php?id='.$user_id; ?>>✎</a></div>
</div>
<div class="profile_info_container">
- <div class="profile_pict_frame">
- <img id="profile_pict" src="../img/default_profile.jpeg">
- </div>
+ <img class="profile_pict_frame" id="profile_pict" src="../img/default_profile.jpeg">
<div class="profile_data_container">
<?php
echo "<div class='username_display'><strong>".$row['username']."</strong></div>";
@@ -48,7 +46,12 @@
$getDriver = mysqli_fetch_assoc($query);
$driver_score = $getDriver['total_score'];
$driver_votes = $getDriver['votes'];
- $rating = $driver_score / $driver_votes;
+
+ if ($driver_votes != 0) {
+ $rating = $driver_score / $driver_votes;
+ } else {
+ $rating = 0;
+ }
echo '<script>document.getElementById("driver_rating").innerHTML = '.$rating.';</script>';
echo '<script>document.getElementById("driver_votes").innerHTML = '.$driver_votes.';</script>';
}
diff --git a/template/header.php b/template/header.php
index 7dc0dbded32246764f57c861a6f4d77bdfc9326a..6326dc14c75029d75c85be7215b9c0b3db57b1f4 100644
--- a/template/header.php
+++ b/template/header.php
@@ -1,6 +1,6 @@
<?php
echo '<div class="logo">
- <h1>OneHundred</h1>
+ <h1><span style="color: red;">One</span><span style="color: green;">Hundred</span></h1>
<p>"An ojek for anything you need"</p></br>
</div>
<div class="greeting">
diff --git a/template/menu.php b/template/menu.php
index 35d738d480e3156c2368ecea5b657d3f9b5c4ca6..8cfc8e474f2174cbab591725e4cf97626e60068b 100644
--- a/template/menu.php
+++ b/template/menu.php
@@ -1,19 +1,20 @@
<?php
- echo '
- <a href="../order/order.php?id='. $user_id .'" name="order_link">
- <div class="menu" id="order_link">
- <h3>ORDER</h3>
- </div>
- </a>
- <a href="../history/transaction_history.php?id='. $user_id .'" name="history_link">
- <div class="menu" id="history_link">
- <h3>HISTORY</h3>
- </div>
- </a>
- <a href="../profile/profile.php?id='. $user_id .'" name="profile_link">
- <div class="menu" id="profile_link">
- <h3>MY PROFILE</h3>
- </div>
- </a>
- ';
-?>
+ echo '
+ <ul id="main_nav_bar" class="nav_bar">
+ <li>
+ <a class="menu" id="order_link" href="../order/select_location.php?id='. $user_id .'" name="order_link">
+ <h3>ORDER</h3>
+ </a>
+ </li>
+ <li>
+ <a class="menu" id="history_link" href="../history/transaction_history.php?id='. $user_id .'" name="history_link">
+ <h3>HISTORY</h3>
+ </a>
+ </li>
+ <li>
+ <a class="menu" id = "profile_link" href="../profile/profile.php?id='. $user_id .'" name="profile_link">
+ <h3>MY PROFILE</h3>
+ </a>
+ </li>
+ </ul>';
+?>
\ No newline at end of file