diff --git a/controller/orderController.php b/controller/orderController.php index b7d9b683e6c61dacf9e1099cda9e331b13bf1a8d..c3bbcde83caea3b5541e8de9d9be3ff240b5bc48 100644 --- a/controller/orderController.php +++ b/controller/orderController.php @@ -13,8 +13,14 @@ if(isset($_GET['drivername']) && isset($_GET['id'])){ //Process to find the driver 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"> - <h2 class="driver-name">'. $row['name'].'</h2><div class="driver-rating"></div></div> + //get drier rating + $driverStats = mysqli_fetch_array($user->getDriverRating($row['id'])); + $driverRating = $driverStats['driverRating']; + $driverVotes = $driverStats['votes']; + + $txt = $txt . '<div class="single-driver"><img class="order-driver-image" src="../img/'. $row['image'] .'" /><div class="driver-bio"> + <h2 class="driver-name">'. $row['name'].'</h2><div class="driver-rating"><img class="rating-image" src="../img/rating.png" />'. + round($driverRating) . ' ('. $driverVotes .' votes)</div></div> <div class="button-choose"><div onclick="chooseDriver('. $row['id'] .')">I CHOOSE YOU!</div></div></div>'; } } @@ -28,8 +34,14 @@ if(isset($_GET['drivername']) && isset($_GET['id'])){ $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"> - <h2 class="driver-name">'. $row['name'].'</h2><div class="driver-rating"></div></div> + //get drier rating + $driverStats = mysqli_fetch_array($user->getDriverRating($row['id'])); + $driverRating = $driverStats['driverRating']; + $driverVotes = $driverStats['votes']; + + $txt = $txt . '<div class="single-driver"><img class="order-driver-image" src="../img/'. $row['image'] .'" /><div class="driver-bio"> + <h2 class="driver-name">'. $row['name'].'</h2><div class="driver-rating"><img class="rating-image" src="../img/rating.png" />'. + round($driverRating) . ' ('. $driverVotes .' votes)</div></div> <div class="button-choose"><div onclick="chooseDriver('. $row['id'] .')">I CHOOSE YOU!</div></div></div>'; } } diff --git a/css/order.css b/css/order.css index 4cc6eaa4e11489436fb4b2f5626928d0f2e606bd..ceaf0d78bb871e7ca12c9405f97c77effbf24fb1 100644 --- a/css/order.css +++ b/css/order.css @@ -79,11 +79,16 @@ margin: 20px 0; box-sizing: border-box; } -.single-driver img { +.order-driver-image { display: inline-block; width: 20%; vertical-align: top; } +.rating-image { + display: inline-block; + width: 15px; + margin-right: 5px; +} .driver-bio { display: inline-block; width: 49%; diff --git a/img/rating.png b/img/rating.png new file mode 100644 index 0000000000000000000000000000000000000000..29a39d80f932e061994cdcaa0cfd0fb6cb2df4b8 Binary files /dev/null and b/img/rating.png differ