Skip to content
Snippets Groups Projects
Commit 819db816 authored by Aldrich Valentino Halim's avatar Aldrich Valentino Halim
Browse files

added method insert to transaction table in database

parent 2dedead2
1 merge request!42Projekers - 13515051 - Girvandi Ilyas
Hide whitespace changes
Inline Side-by-side
controller/orderController.php
+ 34
− 2
View file @ 819db816
<?php
include "../model/user.php";
include "../model/order.php";
if(isset($_GET['drivername']) && isset($_GET['id'])){
$userId = $_GET['id'];
$driverName = $_GET['drivername'];
$user = new User();
$result = $user->getDriver($userId);
$result = $user->getDriverNotId($userId);
header('Content-Type: text/html');
$txt = '<div class="driver-box"><h1>PREFERRED DRIVERS</h1>';
//Process to find the driver
while($row = mysqli_fetch_array($result)){
......@@ -23,7 +25,7 @@ if(isset($_GET['drivername']) && isset($_GET['id'])){
$txt = $txt . '</div>';
$txt = $txt . '<div class="driver-box"><h1>OTHER DRIVERS</h1>';
//Process other drivers
$result = $user->getDriver($userId);
$result = $user->getDriverNotId($userId);
while($row = mysqli_fetch_array($result)){
if($row['name'] !== $driverName){
$txt = $txt . '<div class="single-driver"><img src="../img/'. $row['image'] .'" /><div class="driver-bio">
......@@ -34,3 +36,33 @@ if(isset($_GET['drivername']) && isset($_GET['id'])){
$txt = $txt . '</div>';
echo $txt;
}
if(isset($_GET['driverId'])){
$driverId = $_GET['driverId'];
$user = new User();
$result = $user->getDriverById($driverId);
header('Content-Type: text/html');
$txt = '<div class="third-page-driver">';
//Process to find the driver
while($row = mysqli_fetch_array($result)){
$txt = $txt . '<input type="hidden" id="hidden-image" value="'. $row['image'].'"/><div class="driver-image">
</div><div class="driver-username">@'. $row['username'].'</div><div>'. $row['name'] .'</div>';
}
$txt = $txt . '</div>';
echo $txt;
}
if(isset($_POST['pickup'])){
$date = date('Y-m-d H:i:s');
$pickup = $_POST['pickup'];
$destination = $_POST['destination'];
$driverId = $_POST['driverId'];
$userId = $_POST['userId'];
$rating = $_POST['rating'];
$pickup = $_POST['pickup'];
$comment = $_POST['comment'];
$transaction = new Order();
$transaction->setTransaction($userId, $driverId, $pickup, $destination, $date, $rating, $comment);
//header('Location: ../view/dashboard.php?id=1');
echo "berhasil";
}
controller/transactionController.php
+ 2
− 2
View file @ 819db816
......@@ -33,7 +33,7 @@ if($isDriver) {
<div class='transaction-city'>" . $row['pickup'] . " to " . $row['destination'] . "</div>
<div class='transaction-rating'>gave " . $row['rating'] . " star(s) for this order</div>
<div class='transaction-comment'>and left comment:<blockquote>\"" . $row['comment'] . "\"</blockquote></div></div>
<div class='hide-button'><button id='transaction-" . $i . "' onclick='hide(" . $i . ")'>HIDE</button></div>
<div class='hide-button'><div id='transaction-" . $i . "' onclick='hide(" . $i . ")'>HIDE</div></div>
</div>";
$i++;
}
......@@ -61,7 +61,7 @@ if($isDriver) {
<div class='transaction-city'>" . $row['pickup'] . " to " . $row['destination'] . "</div>
<div class='transaction-rating'>you rated: " . $row['rating'] . "</div>
<div class='transaction-comment'>and left comment:<blockquote>\"" . $row['comment'] . "\"</blockquote></div></div>
<div class='hide-button'><button id='transaction-" . $i . "' onclick='hide(" . $i . ")'>HIDE</button></div>
<div class='hide-button'><div id='transaction-" . $i . "' onclick='hide(" . $i . ")'>HIDE</div></div>
</div>";
$i++;
}
......
css/dashboard.css
+ 2
− 0
View file @ 819db816
......@@ -28,6 +28,7 @@
border: 1px solid #000;
font-size: 2rem;
font-weight: bold;
cursor: pointer;
}
.submenu-two {
......@@ -40,6 +41,7 @@
border: 1px solid #000;
font-size: 1.5rem;
font-weight: bold;
cursor: pointer;
}
.selected {
......
css/history.css
+ 3
− 1
View file @ 819db816
......@@ -40,7 +40,9 @@
display: inline-block;
font-size: initial;
}
.hide-button button {
.hide-button > div {
display: inline-block;
cursor: pointer;
padding: 8px;
font-size: 1.5rem;
background: red;
......
css/order.css
+ 42
− 0
View file @ 819db816
......@@ -106,4 +106,46 @@
border: 1px solid #000;
background-color: #82D800;
border-radius: 8px;
}
.third-page {
width: 100%;
text-align: center;
}
.third-page > h1 {
text-align: left;
}
.selected-driver {
margin: 10px 0;
width: 100%;
text-align: center;
font-size: 1.5rem;
}
.driver-image {
display: inline-block;
height: 100px;
width: 100px;
background-position: center;
background-size: cover;
border: 2px solid #000;
border-radius: 1000px;
}
.driver-username {
font-size: 2rem;
font-weight: bold;
}
textarea {
width: 100%;
}
.submit-button {
margin: 10px 0;
width: 100%;
text-align: right;
}
.submit-button input {
display: inline-block;
text-align: right;
border: 1px solid #000;
background-color: #82D800;
border-radius: 15px;
padding: 15px;
}
\ No newline at end of file
js/order.js
+ 18
− 3
View file @ 819db816
......@@ -25,13 +25,28 @@ function getDriver() {
var drivername = (document.getElementById('preferred-driver').value) ? document.getElementById('preferred-driver').value : null;
xmlhttp.onreadystatechange = function () {
if(xmlhttp.readyState == 4 && xmlhttp.status == 200){
var drivers = this.responseText;
document.getElementsByClassName('second-page')[0].innerHTML = drivers;
document.getElementsByClassName('second-page')[0].innerHTML = this.responseText;
}
};
xmlhttp.open('GET','../controller/orderController.php?drivername='+drivername+'&id='+sessionid,true);
xmlhttp.send();
}
function chooseDriver(id){
console.log(id);
document.getElementsByClassName('select-driver')[0].classList.remove('order-count');
document.getElementsByClassName('complete-order')[0].classList.add('order-count');
document.getElementsByClassName('second-page')[0].style.display = 'none';
document.getElementsByClassName('third-page')[0].style.display = 'block';
var xmlhttp = new XMLHttpRequest();
xmlhttp.onreadystatechange = function () {
if(xmlhttp.readyState == 4 && xmlhttp.status == 200){
document.getElementById('selected-driver').innerHTML = xmlhttp.responseText;
document.getElementById('driverId').value = id;
document.getElementById('userId').value = sessionid;
var imageName = document.getElementById('hidden-image').value;
console.log(imageName);
document.getElementsByClassName('driver-image')[0].style.backgroundImage = 'url(../img/' + imageName + ')';
}
};
xmlhttp.open('GET','../controller/orderController.php?driverId='+id,true);
xmlhttp.send();
}
\ No newline at end of file
model/order.php
+ 9
− 0
View file @ 819db816
......@@ -9,4 +9,13 @@ class Order {
mysqli_close($con);
return $result;
}
function setTransaction($userId, $driverId, $pickup, $destination, $transactionDate, $rating, $comment){
$con = mysqli_connect('localhost','root', '', 'projekers');
mysqli_select_db($con, 'projekers');
$sql = 'INSERT INTO transaction(user_id, driver_id, pickup, destination, date, rating, comment) VALUES('
. $userId .','. $driverId .','. $pickup .','. $destination.','. $transactionDate.','.$rating.','
. $comment.')';
mysqli_query($con, $sql);
mysqli_close($con);
}
}
\ No newline at end of file
model/user.php
+ 9
− 5
View file @ 819db816
......@@ -75,11 +75,7 @@ class User {
mysqli_close($con);
return $result;
}
/**
get drivers whose id is not the user's id
* prevent order with self
*/
function getDriver($id){
function getDriverNotId($id){
$con = mysqli_connect('localhost','root','','projekers');
mysqli_select_db($con,'projekers');
$query = "SELECT id,name,image FROM user WHERE isDriver=1 AND not id=" . $id;
......@@ -87,4 +83,12 @@ class User {
mysqli_close($con);
return $result;
}
function getDriverById($id){
$con = mysqli_connect('localhost','root','','projekers');
mysqli_select_db($con,'projekers');
$query = "SELECT name,username,image FROM user WHERE isDriver=1 AND id=" . $id;
$result = mysqli_query($con,$query);
mysqli_close($con);
return $result;
}
}
\ No newline at end of file
view/dashboard.php
+ 7
− 7
View file @ 819db816
......@@ -30,9 +30,9 @@
</div>
</div>
<div class="menu">
<button class="submenu" id="order" onclick="order_clicked()">ORDER</button>
<button class="submenu" id="history" onclick="history_clicked(); getAllTransaction(1)">HISTORY</button>
<button class="submenu selected" id="profile" onclick="getUserProfile(); profile_clicked();">PROFILE</button>
<div class="submenu" id="order" onclick="order_clicked()">ORDER</div>
<div class="submenu" id="history" onclick="history_clicked(); getAllTransaction(1)">HISTORY</div>
<div class="submenu selected" id="profile" onclick="getUserProfile(); profile_clicked();">PROFILE</div>
</div>
<section class="order-wrapper">
......@@ -44,10 +44,10 @@
<div class="sub-header-heading"><h1>TRANSACTION HISTORY</h1></div>
</div>
<div class="menu">
<button class="submenu-two" id="previous-order" onclick="getAllTransaction(0); previousOrderClicked()">
MY PREVIOUS ORDER</button>
<button class="submenu-two selected-order" id="driver-history" onclick="getAllTransaction(1); driverHistoryClicked()">
DRIVER HISTORY</button>
<div class="submenu-two" id="previous-order" onclick="getAllTransaction(0); previousOrderClicked()">
MY PREVIOUS ORDER</div>
<div class="submenu-two selected-order" id="driver-history" onclick="getAllTransaction(1); driverHistoryClicked()">
DRIVER HISTORY</div>
</div>
<div class="driver-info" id="driver-info"></div>
</section>
......
view/order.php
+ 12
− 6
View file @ 819db816
......@@ -7,7 +7,7 @@
<div class="complete-order"><div class="counter">3</div>Complete Order</div>
</div>
<div>
<form action="../controller/orderController.php">
<form action="../controller/orderController.php" method="post">
<div class="first-page">
<div class="input-box">
<label>Picking Point</label><input type="text" name="pickup" placeholder="Pickup Point"/>
......@@ -22,14 +22,20 @@
<div class="next-page"><div id="next-page" onclick="nextPage(); getDriver();">NEXT</div></div>
<div class="second-page">
</div>
<div class="second-page"></div>
<div class="third-page">
<h1>HOW WAS IT?</h1>
<input type="radio" />
<input type="text" />
<div class="selected-driver" id="selected-driver"></div>
<input type="hidden" id="driverId" name="driverId" />
<input type="hidden" id="userId" name="userId" />
<input type="radio" id="rating" name="rating" value="1" />1
<input type="radio" id="rating" name="rating" value="2" />2
<input type="radio" id="rating" name="rating" value="3" />3
<input type="radio" id="rating" name="rating" value="4" />4
<input type="radio" id="rating" name="rating" value="5" />5
<textarea rows="3" placeholder="Leave your comment here!" name="comment" id="comment"></textarea>
<div class="submit-button"><input type="submit" value="COMPLETE!" /></div>
</div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment