From aee5ea99f7fa989d3f63bbf6aa66fdbd82549cc4 Mon Sep 17 00:00:00 2001
From: kukuhbr <kukuhis777@gmail.com>
Date: Wed, 18 Oct 2017 17:38:25 +0700
Subject: [PATCH] perbaikan
---
src/edit-preferred-locations.php | 13 +-
src/history-driver.php | 213 +++++++++++++------------------
src/history-penumpang.php | 191 ++++++++++++++-------------
src/history.css | 9 +-
src/orderComplete.php | 18 ++-
src/postDataOrderComplete.php | 3 +-
src/postDataPilihDriver.php | 3 +-
7 files changed, 218 insertions(+), 232 deletions(-)
diff --git a/src/edit-preferred-locations.php b/src/edit-preferred-locations.php
index 97a8462..92aac15 100644
--- a/src/edit-preferred-locations.php
+++ b/src/edit-preferred-locations.php
@@ -37,12 +37,21 @@ if(isset($_POST['sub'])) {
<?php
$sql = "SELECT * FROM userprefloc WHERE uname='$uname'";
$result = $conn->query($sql);
+ echo '
+ <table style="font-size:1.2rem;">
+ ';
while ($row = $result->fetch_assoc()){
$prefloc = $row['prefloc'];
if($prefloc !== "") {
- echo '<li>'.$prefloc.'</li>';
+ echo'<tr>
+ <td style="padding:10px;">'.$prefloc.'</td>
+
+ </tr>';
}
}
+ echo '
+ </table>
+ ';
?>
<div class="add-loc-wrapper">
<div class="add-new-loc">
@@ -50,7 +59,7 @@ if(isset($_POST['sub'])) {
</div>
<form method="post" action="">
<input type="hidden" value="<?php echo $id ?>" name="id_active">
- <input type="text" id="loc-name" name="loc">
+ <input type="text" id="loc-name" require name="loc">
<input type="submit" value="ADD" id="add" name="sub">
</form>
</div>
diff --git a/src/history-driver.php b/src/history-driver.php
index 39e5877..394e7fb 100644
--- a/src/history-driver.php
+++ b/src/history-driver.php
@@ -1,101 +1,28 @@
<!DOCTYPE html>
-<html>
+<html lang="en">
+<?php
+$conn = new mysqli("localhost", "root", "", "projek_db");
+ $id = $_GET['id_active'];
+ $sql = "SELECT * FROM users WHERE id='$id' limit 1";
+ $result = mysqli_query($conn, $sql);
+ $row = mysqli_fetch_assoc($result);
+ $uname = $row["uname"];
+ $name = $row["userRealName"];
+ $email = $row["email"];
+ $phone = $row["phoneNumber"];
+ $drive = $row["isDriver"];
+ if($drive == 1) {
+ $driver = "Driver";
+ } else {
+ $driver = "Non-Driver";
+ }
+
+echo '
-<head>
- <title>Tugas Besar 1 IF3110</title>
<link rel="stylesheet" type="text/css" href="history.css">
<link rel="stylesheet" type="text/css" href="index.css">
<link href="https://fonts.googleapis.com/css?family=Oswald:600" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Lora" rel="stylesheet">
- <script>
- var clickedButton = null;
- function buttonHighlight(i) {
- if(clickedButton != null) {
- clickedButton.className = "menu-buttons";
- }
-
- clickedButton = document.getElementById(i);
- clickedButton.className = "menu-buttons-clicked";
- }
- function loadOrderDoc() {
- var xhttp;
- if(window.XMLHttpRequest) {
- xhttp = new XMLHttpRequest();
- } else {
- xhttp = new ActiveXObject("Microsoft.XMLHTTP");
- }
- xhttp.onreadystatechange = function() {
- if (this.readyState == 4 && this.status == 200) {
- document.getElementById("loadable").innerHTML =
- this.responseText;
- }
- };
- xhttp.open("GET", "orderdestination.php", true);
- xhttp.send();
- }
-
- function loadHistoryDoc() {
- var xhttp;
- if(window.XMLHttpRequest) {
- xhttp = new XMLHttpRequest();
- } else {
- xhttp = new ActiveXObject("Microsoft.XMLHTTP");
- }
- xhttp.onreadystatechange = function() {
- if (this.readyState == 4 && this.status == 200) {
- document.getElementById("loadable").innerHTML =
- this.responseText;
- }
- };
- xhttp.open("GET", "history-penumpang.php", true);
- xhttp.send();
- }
-
- function loadProfileDoc() {
- var xhttp;
- if(window.XMLHttpRequest) {
- xhttp = new XMLHttpRequest();
- } else {
- xhttp = new ActiveXObject("Microsoft.XMLHTTP");
- }
- xhttp.onreadystatechange = function() {
- if (this.readyState == 4 && this.status == 200) {
- document.getElementById("loadable").innerHTML =
- this.responseText;
- }
- };
- xhttp.open("GET", "profile.php", true);
- xhttp.send();
- }
- </script>
-</head>
-
-<body>
- <?php
- echo '
- <div class="header-wrapper">
- <div class="user-logo">
- <div class="pr-ojek-logo">
- <div class="logo">
- <span class="pr">PR</span>-<span class="ojek">OJEK</span>
- </div>
- <div class="slogan">
- wushh... wushh... ngeeeeeenggg...
- </div>
- </div>
- <div class="user-wrapper">
- Hi, <span class="username">bocanhesen</span> ! <br>
- <a href="#">Logout</a>
- </div>
- </div>
- <div class="menu-wrapper">
- <button type="button" onclick="loadOrderDoc(); buttonHighlight(\'order\')" id="order" class="menu-buttons">ORDER</button>
- <button type="button" onclick="loadHistoryDoc(); buttonHighlight(\'history\')" id="history" class="menu-buttons">HISTORY</button>
- <button type="button" onclick="loadProfileDoc(); buttonHighlight(\'profile\')" id="profile" class="menu-buttons">MY PROFILE</button>
- </div>
- </div>
-
- <div id="loadable" class="loadable"></div>
<div class="history-wrapper">
<transaksihistory>TRANSACTION HISTORY</transaksihistory>
@@ -103,48 +30,82 @@
<div class="space1"></div>
<div class="menu-wrapper">
- <a href="history-penumpang.php">
+
+ <a href="history-penumpang.php?id_active='.$id.'">
<button type="button" id="hmpo" class="history-menu-buttons">MY PREVIOUS ORDERS</button>
</a>
- <a href="history-driver.php">
+
<button type="button" id="hdriver" style="background: rgb(70,93,67); color: #FFFFFF" class="history-menu-buttons">DRIVER HISTORY</button>
- </a>
- </div>
- <div id="loadableHistory" class="loadableHistory"></div>
-
- <div class="space3"></div>
-
- <div class="contenthistory">
- <div class="gambardriver">
- <img src="../images/ash_ketchum.png" id="stylegambar" alt="Ash Ketchum">
- </div>
- <div class="deskripsi">
- <dayDate>Saturday, October 7th 2017</dayDate>
- <div class="space4"></div>
- <usernameDriver>bocanloo</usernameDriver>
- <div class="space4"></div>
- <lokasiKeTujuan>Gelap Nyawang - Cisitu Indah</lokasiKeTujuan>
- <div class="space1"></div>
- <div id = "ratingDriver">
- <rating>gave 5 stars for this order</rating>
- </div>
- <div class="space4"></div>
- <comment>and left comment: </comment>
- <div class="space4"></div>
- <isiComment>Mantap pak e</isiComment>
- </div>
- <div class="tombolhide">
- <buttonHide class="buttonHide" type="submit" nama="submit">HIDE</buttonHide>
- </div>
</div>
+ <div class="space3"></div>';
+ if($drive == 1) {
+ $datahistory = "SELECT * FROM order_history
+ WHERE order_history.id='$id' AND order_history.uname_driver='$uname'";
+ $resulthistory = $conn->query($datahistory);
+ $rowresult = $resulthistory->fetch_assoc();
+
+ if (mysqli_num_rows($resulthistory) < 1) {
+ echo 'No History';
+ } else {
+ $i = 0;
+ $orderan = 6;
+ $jumlahData = mysqli_num_rows($resulthistory);
+
+ for ($i=0; $i<$jumlahData; $i++) {
+ $id_order = $rowresult['id_order'];
+ $date_order = $rowresult['date_order'];
+ $uname_pemesan = $rowresult['uname_pemesan'];
+ $uname_driver = $rowresult['uname_driver'];
+ $picking_point = $rowresult['picking_point'];
+ $destination = $rowresult['destination'];
+ $rating_for_driver = $rowresult['rating_for_driver'];
+ $comment = $rowresult['comment'];
+ echo '
+ <div class="historyUsers">
+ <div class="contenthistory">
+ <div class="gambardriver">
+ <img src = "../images/carifont.png" id="stylegambar" alt="Carifont">
+ </div>
+ <div class="deskripsi">
+ <dayDate id="date" name="date">Saturday, October 13th 2017</dayDate>
+ <div class="space4"></div>
+ <usernameDriver>'.$uname_pemesan.'</usernameDriver>
+ <div class="space4"></div>
+ <lokasiKeTujuan>'.$picking_point.' - '.$destination.'</lokasiKeTujuan>
+ <div class="space1"></div>
+ <div id = "ratingDriver">
+ <rating>gave '.$rating_for_driver.' stars for this order</rating>
+ </div>
+ <div class="space4"></div>
+ <comment>and left comment: </comment>
+ <div class="space4"></div>
+ <isiComment>'.$comment.'</isiComment>
+ </div>
+ <div class="tombolhide">
+ <buttonHide class="buttonHide" type="submit" nama="submit">HIDE</buttonHide>
+ </div>
+ <div class="space3"></div>
+ </div>
+ </div>
+ ';
+
+
+ }
+ }
+
+ } else {
+ echo '<notDriverHistory>
+ You are not Driver
+ </notDriverHistory>';
+ }
+ echo '
+
<div class="space3"></div>
</div>
- '
-?>
-</body>
-</html>
+'
+?>
diff --git a/src/history-penumpang.php b/src/history-penumpang.php
index c99b7e5..a681d49 100644
--- a/src/history-penumpang.php
+++ b/src/history-penumpang.php
@@ -1,18 +1,29 @@
<!DOCTYPE html>
-<html>
+<html lang="en">
+<?php
+$conn = new mysqli("localhost", "root", "", "projek_db");
+ $id = $_GET['id_active'];
+ $sql = "SELECT * FROM users WHERE id='$id' limit 1";
+ $result = mysqli_query($conn, $sql);
+ $row = mysqli_fetch_assoc($result);
+ $id = $row["id"];
+ $uname = $row["uname"];
+ $name = $row["userRealName"];
+ $email = $row["email"];
+ $phone = $row["phoneNumber"];
+ $drive = $row["isDriver"];
+ if($drive == 1) {
+ $driver = "Driver";
+ } else {
+ $driver = "Non-Driver";
+ }
-<head>
- <title>Tugas Besar 1 IF3110</title>
+echo '
<link rel="stylesheet" type="text/css" href="history.css">
<link rel="stylesheet" type="text/css" href="index.css">
<link href="https://fonts.googleapis.com/css?family=Oswald:600" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Lora" rel="stylesheet">
-</head>
-
-<body>
- <?php
- echo '
-
+
<div class="history-wrapper" name="historyPenumpang" method="POST" action="historyShowPenumpang.php">
<transaksihistory>TRANSACTION HISTORY</transaksihistory>
@@ -21,99 +32,87 @@
<div class="menu-wrapper">
<button type="button" id="hmpo" style="background: rgb(70,93,67); color: #FFFFFF" class="history-menu-buttons">MY PREVIOUS ORDERS</button>
- <a href="history-driver.php">
+ <a href="history-driver.php?id_active='.$id.'">
<button type="button" id="hdriver" class="history-menu-buttons">DRIVER HISTORY</button>
</a>
</div>
<div id="loadableHistory" class="loadableHistory"></div>
- <div class="space3"></div>
-
- <div class="contenthistory">
- <div class="gambardriver">
- <img src="../images/Rattata.png" id="stylegambar" alt="Bomba Rattata">
- </div>
- <div class="deskripsi">
- <dayDate id="date" name="date">Saturday, October 7th 2017</dayDate><?php endforeach ?>
- <div class="space4"></div>
- <usernameDriver>bocanlagi</usernameDriver>
- <div class="space4"></div>
- <lokasiKeTujuan>Gelap Nyawang - Cisitu Indah</lokasiKeTujuan>
- <div class="space1"></div>
- <div id = "ratingDriver">
- <rating>You rated: </rating>
- <div class="stars">
- <form action="" id="formBintang" required>
- <input class="star star-5" id="star-5" type="radio" name="star"/>
- <label class="star star-5" for="star-5"></label>
- <input class="star star-4" id="star-4" type="radio" name="star"/>
- <label class="star star-4" for="star-4"></label>
- <input class="star star-3" id="star-3" type="radio" name="star"/>
- <label class="star star-3" for="star-3"></label>
- <input class="star star-2" id="star-2" type="radio" name="star"/>
- <label class="star star-2" for="star-2"></label>
- <input class="star star-1" id="star-1" type="radio" name="star"/>
- <label class="star star-1" for="star-1"></label>
- </form>
- </div>
- </div>
- <div class="space4"></div>
- <comment>You commented: </comment>
- <div class="space4"></div>
- <isiComment>Mantap pak e</isiComment>
- </div>
- <div class="tombolhide">
- <buttonHide class="buttonHide" type="submit" nama="submit">HIDE</buttonHide>
- </div>
- </div>
-
- <div class="space3"></div>
-
- <div class="contenthistory">
- <div class="gambardriver">
- <img src="../images/Bulbasaur.png" id="stylegambar" alt="Bomba Rattata">
- </div>
- <div class="deskripsi">
- <dayDate id="date" name="date">Saturday, October 7th 2017</dayDate><?php endforeach ?>
- <div class="space4"></div>
- <usernameDriver>kangkang</usernameDriver>
- <div class="space4"></div>
- <lokasiKeTujuan>PVJ - ITB</lokasiKeTujuan>
- <div class="space1"></div>
- <div id = "ratingDriver">
- <rating>You rated: </rating>
- <div class="stars">
- <form action="" id="formBintang" required>
- <input class="star star-5" id="star-5" type="radio" name="star"/>
- <label class="star star-5" for="star-5"></label>
- <input class="star star-4" id="star-4" type="radio" name="star"/>
- <label class="star star-4" for="star-4"></label>
- <input class="star star-3" id="star-3" type="radio" name="star"/>
- <label class="star star-3" for="star-3"></label>
- <input class="star star-2" id="star-2" type="radio" name="star"/>
- <label class="star star-2" for="star-2"></label>
- <input class="star star-1" id="star-1" type="radio" name="star"/>
- <label class="star star-1" for="star-1"></label>
- </form>
- </div>
- </div>
- <div class="space4"></div>
- <comment>You commented: </comment>
- <div class="space4"></div>
- <isiComment>Cemunguuuutttzzz</isiComment>
- </div>
- <div class="tombolhide">
- <buttonHide class="buttonHide" type="submit" nama="submit">HIDE</buttonHide>
- </div>
- </div>
-
+ <div class="space3"></div>';
- <div class="space3"></div>
+ $datahistory = "SELECT * FROM order_history
+ WHERE order_history.id='$id' AND order_history.uname_pemesan='$uname'";
+ $resulthistory = $conn->query($datahistory);
+ $rowresult = $resulthistory->fetch_assoc();
+ $id_order = $rowresult['id_order'];
+ $date_order = $rowresult['date_order'];
+ $uname_driver = $rowresult['uname_driver'];
+ $picking_point = $rowresult['picking_point'];
+ $destination = $rowresult['destination'];
+ $rating_for_driver = $rowresult['rating_for_driver'];
+ $comment = $rowresult['comment'];
+ if (mysqli_num_rows($resulthistory) < 1) {
+ echo 'No History';
+ } else {
+ $i = 0;
+ $orderan = 6;
+ $jumlahData = mysqli_num_rows($resulthistory);
- </div>
- '
- ?>
-</body>
+ for ($i=0; $i<$jumlahData; $i++) {
+ if ($orderan == $id_order) {
+
+ echo '
+ <div class="historyUsers">
+ <div class="contenthistory">
+ <div class="gambardriver">
+ <img src = "../images/carifont.png" id="stylegambar" alt="Carifont">
+ </div>
+ <div class="deskripsi">
+ <dayDate id="date" name="date">Saturday, October 7th 2017</dayDate>
+ <div class="space4"></div>
+ <usernameDriver>'.$uname_driver.'</usernameDriver>
+ <div class="space4"></div>
+ <lokasiKeTujuan>'.$picking_point.' - '.$destination.'</lokasiKeTujuan>
+ <div class="space1"></div>
+ <div id = "ratingDriver">
+ <rating>You rated: </rating>
+ <div class="stars">
+ <form action="" id="formBintang" required> ';
+ $j = 0;
+ for($j=0; $j<$rating_for_driver; $j++) {
+ $m = $rating_for_driver+1;
+ echo '
+ <input class="star star-5" id="star-5" type="radio" name="star"/> ';
+ echo '
+ <label class="star star-5" for="star-5"></label> ';
+ $m--;
+
+ }
+ echo '
+ </form>
+ </div>
+ </div>
+ <div class="space4"></div>
+ <comment>You commented: </comment>
+ <div class="space4"></div>
+ <isiComment>'.$comment.'</isiComment>
+ </div>
+ <div class="tombolhide">
+ <buttonHide class="buttonHide" type="submit" nama="submit">HIDE</buttonHide>
+ </div>
+ <div class="space3"></div>
+ </div>
+ </div>
+ ';
-</html>
+ } else {
+ $orderan++;
+ }
+ }
+ }
+
+ echo '
+ </div>
+'
+?>
\ No newline at end of file
diff --git a/src/history.css b/src/history.css
index 1284412..751aeaf 100644
--- a/src/history.css
+++ b/src/history.css
@@ -1,6 +1,5 @@
.history-wrapper {
width: 500px;
- text-align: left;
margin-left: auto;
margin-right: auto;
}
@@ -17,6 +16,14 @@
margin: 8px;
}
+.historyUsers {
+}
+
+notDriverHistory {
+ width: 100%;
+ text-align: center;
+}
+
.akunhistory {
width:100%;
display:flex;
diff --git a/src/orderComplete.php b/src/orderComplete.php
index dcab882..6bbe015 100644
--- a/src/orderComplete.php
+++ b/src/orderComplete.php
@@ -1,3 +1,11 @@
+<?php
+$conn = new mysqli("localhost", "root", "", "projek_db");
+$id = $_GET['id_active'];
+$sql = "SELECT * FROM users WHERE id='$id' limit 1";
+$result = mysqli_query($conn, $sql);
+$uname = mysqli_fetch_assoc($result)["uname"];
+?>
+
<!DOCTYPE html>
<html>
<head>
@@ -19,7 +27,7 @@
</div>
</div>
<div class="user-wrapper">
- Hi, <span class="username">bocanhesen</span> ! <br>
+ Hi, <span class="username"><?php echo $uname ?></span> ! <br>
<a href="#">Logout</a>
</div>
</div>
@@ -99,17 +107,17 @@
</div>
</div>
</div>
- <form id="formCompleteOrder method="POST" action="postDataOrderComplete.php">
+ <form id="formCompleteOrder" method="POST" action="postDataOrderComplete.php">
+ <input type="hidden" value=<?php echo $id ?> name="id_active">
<div id ="containerComment">
- <form action="">
<textarea class="userComment" name = "userComment" placeholder="Your comment..." required id="userComment"></textarea>
- <form>
</div>
<div id ="containerButtonComplete">
<div id="containerButtonCompleteKecil">
- <button id="buttonCompleteOrder" type = "submit" name="submit">COMPLETE ORDER</button>
+ <input id="buttonCompleteOrder" type = "submit" name="submit" value="Complete"></input>
</div>
</div>
+ </form>
</div>
</body>
</html>
\ No newline at end of file
diff --git a/src/postDataOrderComplete.php b/src/postDataOrderComplete.php
index 69b8129..d3be216 100644
--- a/src/postDataOrderComplete.php
+++ b/src/postDataOrderComplete.php
@@ -4,6 +4,7 @@ $dbusername = "root";
$dbpassword = "";
$dbname = "projek_db";
+$id = $_POST['id_active'];
$comment = $_POST['userComment'];
$conn = new mysqli($servername, $dbusername, $dbpassword, $dbname);
@@ -30,6 +31,6 @@ if ($conn->query($sql) === TRUE) {
}
echo '<script type="text/javascript">
- window.location = "index.php"
+ window.location = "index.php?id_active='.$id.'"
</script>';
?>
\ No newline at end of file
diff --git a/src/postDataPilihDriver.php b/src/postDataPilihDriver.php
index 406f4c7..cb8dade 100644
--- a/src/postDataPilihDriver.php
+++ b/src/postDataPilihDriver.php
@@ -4,6 +4,7 @@ $dbusername = "root";
$dbpassword = "";
$dbname = "projek_db";
+$id = $_POST['id_active'];
$uname = $_POST['buttonChooseYou'];
@@ -18,7 +19,7 @@ if ($conn->connect_error) {
echo '<script type="text/javascript">
- window.location = "orderComplete.php"
+ window.location = "orderComplete.php?id_active='.$id.'"
</script>';
--
GitLab