diff --git a/css/history.css b/css/history.css index d09b9900fda71e64d3c5dd02a941e6f5b0d67617..a260d6c2607f7b0542ec35c8da5fb6b54a806363 100755 --- a/css/history.css +++ b/css/history.css @@ -39,4 +39,4 @@ .history_menu > h3 { margin: 5px 1px; -} \ No newline at end of file +} diff --git a/css/location.css b/css/location.css index 5fdc03f6a9a7d0e3ccd6bbc24a898ff9816525b9..e2c604f9ee2ea78d751276079668763199771117 100644 --- a/css/location.css +++ b/css/location.css @@ -12,7 +12,51 @@ text-align: left; margin: 0; } +.display_loc_frame { + width: 100%; + min-height: 30%; +} +table { + border-collapse: collapse; + font-size: 1.2em; + table-layout: fixed; + width: 100%; +} + +table, td, th { + border: 1px solid black; +} +th { + text-align:center; +} +tr th:nth-child(1) { + width:10%; + text-align:right; +} +tr th:nth-child(2) { + width:65%; +} +tr th:nth-child(3) { + width:25%; +} +tr td:nth-child(1),td:nth-child(2) { + padding-left: 2%; +} +tr th:nth-child(3) { + +} +.edit_button { + color: #82d800; + float: left; + margin-left: 15%; +} +.delete_button { + color: red; + float: right; + margin-right: 15%; +} .add_loc_frame { + margin-top: 10%; height: 30%; } .add_loc_frame h2 { diff --git a/history/transaction_history.php b/history/transaction_history.php index 73ca6f40e9da7dd59a61bb2c9e2aab33dd7f5cb2..ea67f9bf4cdb5f49b008e96d44a593468bc62188 100644 --- a/history/transaction_history.php +++ b/history/transaction_history.php @@ -31,7 +31,6 @@ <div class="subheader"> <div class="title"><h1>Transaction History</h1></div> </div> - <ul class="page_menu"> <li> <a class="history_menu menu_active" href=<?php echo 'transaction_history.php?id='.$user_id; ?>> @@ -47,4 +46,4 @@ </div> </div> </body> -</html> \ No newline at end of file +</html> diff --git a/profile/edit_location.php b/profile/edit_location.php index a7f7f92eb2c54b4cc148adbb918ff34e25fc77dd..0d25d1d0d45e7caf68d3823020d603bf05cbe637 100644 --- a/profile/edit_location.php +++ b/profile/edit_location.php @@ -20,7 +20,7 @@ $username = $row['username']; include("../template/header.php"); } - mysqli_close($con); + ?> </div> <div class="menu_container"> @@ -30,8 +30,33 @@ <div class="subheader"> <div class="title"><h1>Edit Preferred Location</h1></div> </div> + <div class="display_loc_frame"> + <table> + <tr> + <th>No</th> + <th>Locations</th> + <th>Actions</th> + </tr> + <?php + $query=mysqli_query($con,"SELECT pref_loc FROM driver_prefloc WHERE driver_id='".$user_id."'") or die(mysqli_error()); + if(mysqli_num_rows($query)!=0) + { + $i = 1; + while($row=mysqli_fetch_assoc($query)) { + echo ' <tr> + <td>'.$i.'</td> + <td>'.$row['pref_loc'].'</td> + <td><div class="edit_button">✎</div><div class="delete_button">✖</div></td> + </tr>'; + $i++; + } + } + ?> + </table> + + </div> <div class="add_loc_frame"> - <h2> Add New Location</h2> + <h2>Add New Location</h2> <form name="add_location" action="updateLocation.php" method="POST"> <input type="text" name="new_location"> <input type="text" id="hidden_userid" name="hidden_userid" style="display: none;">