Skip to content
Snippets Groups Projects
Commit 1fe1de72 authored by Husnulzaki Wibisono Haryadi's avatar Husnulzaki Wibisono Haryadi
Browse files

Merge branch 'master' of http://gitlab.informatika.org/IF3110-2017-K02-OneHundred/TugasBesar1_2017

parents 86599ccf 862fa11d
1 merge request!45OneHundred - 13515005 - Husnulzaki Wibisono Haryadi
Hide whitespace changes
Inline Side-by-side
css/default_style.css
+ 19
− 0
View file @ 1fe1de72
body {
margin: 0;
padding: 0;
}
.frame { .frame {
width: 360px; width: 360px;
height: 550px; height: 550px;
...@@ -92,3 +97,17 @@ a:hover { ...@@ -92,3 +97,17 @@ a:hover {
margin: 0; margin: 0;
} }
.profile_pict_frame {
width: 100px;
height: 100px;
overflow: auto;
border-radius: 50%;
margin-left: auto;
margin-right: auto;
}
.profile_pict_frame img {
display: inline;
margin: 0 auto;
height: 100%;
width: 100%;
}
\ No newline at end of file
css/history.css
+ 68
− 1
View file @ 1fe1de72
.history_container { .history_container {
margin-top: 10%; margin-top: 10%;
height: 79%; height: 79%;
border: 1px solid red; border: 1px solid red; /*OJO LALI HAPUS IKI*/
} }
.history_container .subheader { .history_container .subheader {
...@@ -40,3 +40,70 @@ ...@@ -40,3 +40,70 @@
.history_menu > h3 { .history_menu > h3 {
margin: 5px 1px; margin: 5px 1px;
} }
#history_table_container {
overflow-y: auto;
height: inherit;
}
table.history_table {
margin-top: 5px;
border: 1px solid blue; /*OJO LALI HAPUS IKI*/
width: 100%;
border: 1px solid purple;
padding: 0;
border-collapse: collapse;
}
table.history_table p {
margin: 0;
padding: 0;
font-size: 14px;
font-style: "Lucida Console", Monaco, monospace;
}
td.history_column {
padding: 2px 0 0 8px;
}
p.history_date {
color: grey;
font-weight: bold;
}
p.history_username {
font-size: 20px;
font-weight: bold;
}
p.history_loc {
}
p.history_rating {
}
p.history_comment {
}
table.history_table th, td {
border: 1px solid purple;
padding: 0;
border-collapse: collapse;
}
p.history_table td {
vertical-align: top;
}
img.history_pict {
width: 100px;
height: 100px;
overflow: auto;
border-radius: 50%;
display: inline;
margin: 0;
}
\ No newline at end of file
css/location.css
+ 1
− 1
View file @ 1fe1de72
...@@ -51,7 +51,7 @@ tr th:nth-child(3) { ...@@ -51,7 +51,7 @@ tr th:nth-child(3) {
margin-left: 15%; margin-left: 15%;
} }
.delete_button { .delete_button {
color: red; color: #ff0000;
float: right; float: right;
margin-right: 15%; margin-right: 15%;
} }
......
css/profile.css
+ 1
− 14
View file @ 1fe1de72
...@@ -17,20 +17,7 @@ ...@@ -17,20 +17,7 @@
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
.profile_pict_frame {
width: 100px;
height: 100px;
overflow: auto;
border-radius: 50%;
margin-left: auto;
margin-right: auto;
}
.profile_pict_frame img {
display: inline;
margin: 0 auto;
height: 100%;
width: 100%;
}
.profile_data_container { .profile_data_container {
height: 100px; height: 100px;
} }
......
history/driver_history.php
+ 57
− 0
View file @ 1fe1de72
...@@ -44,6 +44,63 @@ ...@@ -44,6 +44,63 @@
</a> </a>
</li> </li>
</ul> </ul>
<div id="history_table_container">
<table class="history_table">
<colgroup>
<col style="width: 20%;">
<col style="width: 80%;">
</colgroup>
<tbody>
<tr>
<td>
<img class="history_pict" src="../img/default_profile.jpeg">
</td>
<td class="history_column">
<p class="history_date">tanggal</p>
<p class="history_username">Username</p>
<p class="history_loc">asal - tujuan</p>
<p class="history_rating">rating</p>
<p class="history_comment">You commented:</p>
<p class="history_comment" style="margin-left: 30px;">ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
</p>
</td>
</tr>
<tr>
<td>
<img class="history_pict" src="../img/default_profile.jpeg">
</td>
<td class="history_column">
<p class="history_date">tanggal</p>
<p class="history_username">Username</p>
<p class="history_loc">asal - tujuan</p>
<p class="history_rating">rating</p>
<p class="history_comment">You commented:</p>
<p class="history_comment" style="margin-left: 30px;">ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
</p>
</td>
</tr>
<tr>
<td>
<img class="history_pict" src="../img/default_profile.jpeg">
</td>
<td class="history_column">
<p class="history_date">tanggal</p>
<p class="history_username">Username</p>
<p class="history_loc">asal - tujuan</p>
<p class="history_rating">rating</p>
<p class="history_comment">You commented:</p>
<p class="history_comment" style="margin-left: 30px;">ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
</p>
</td>
</tr>
</tbody>
</table>
</div>
</div> </div>
</div> </div>
</body> </body>
......
history/transaction_history.php
+ 57
− 0
View file @ 1fe1de72
...@@ -43,6 +43,63 @@ ...@@ -43,6 +43,63 @@
</a> </a>
</li> </li>
</ul> </ul>
<div id="history_table_container">
<table class="history_table">
<colgroup>
<col style="width: 20%;">
<col style="width: 80%;">
</colgroup>
<tbody>
<tr>
<td>
<img class="history_pict" src="../img/default_profile.jpeg">
</td>
<td class="history_column">
<p class="history_date">tanggal</p>
<p class="history_username">Username</p>
<p class="history_loc">asal - tujuan</p>
<p class="history_rating">rating</p>
<p class="history_comment">You commented:</p>
<p class="history_comment" style="margin-left: 30px;">ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
</p>
</td>
</tr>
<tr>
<td>
<img class="history_pict" src="../img/default_profile.jpeg">
</td>
<td class="history_column">
<p class="history_date">tanggal</p>
<p class="history_username">Username</p>
<p class="history_loc">asal - tujuan</p>
<p class="history_rating">rating</p>
<p class="history_comment">You commented:</p>
<p class="history_comment" style="margin-left: 30px;">ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
</p>
</td>
</tr>
<tr>
<td>
<img class="history_pict" src="../img/default_profile.jpeg">
</td>
<td class="history_column">
<p class="history_date">tanggal</p>
<p class="history_username">Username</p>
<p class="history_loc">asal - tujuan</p>
<p class="history_rating">rating</p>
<p class="history_comment">You commented:</p>
<p class="history_comment" style="margin-left: 30px;">ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
</p>
</td>
</tr>
</tbody>
</table>
</div>
</div> </div>
</div> </div>
</body> </body>
......
profile/deletePrefLoc.php 0 → 100644
+ 10
− 0
View file @ 1fe1de72
<?php
include '../database/dbconnect.php';
$user_id = urldecode($_GET['id']);
$deletedLoc = urldecode($_GET['loc']);
$query = mysqli_query($con,"DELETE FROM driver_prefloc WHERE driver_id='".$user_id."' AND pref_loc='".$deletedLoc."'") or die(mysqli_error($con));
mysqli_close($con);
if ($query) {
header("Location: edit_location.php?id=$user_id");
}
?>
profile/edit_location.php
+ 4
− 4
View file @ 1fe1de72
...@@ -43,11 +43,11 @@ ...@@ -43,11 +43,11 @@
{ {
$i = 1; $i = 1;
while($row=mysqli_fetch_assoc($query)) { while($row=mysqli_fetch_assoc($query)) {
echo ' <tr> echo '<tr>
<td>'.$i.'</td> <td>'.$i.'</td>
<td>'.$row['pref_loc'].'</td> <td>'.$row['pref_loc'].'</td>
<td><div class="edit_button">✎</div><div class="delete_button">✖</div></td> <td><div class="edit_button">✎</div><div class="delete_button"><a href=deletePrefLoc.php?id='.urlencode($user_id).'&loc='.urlencode($row['pref_loc']).'>✖</a></div></td>
</tr>'; </tr>';
$i++; $i++;
} }
} }
......
profile/updateLocation.php
+ 1
− 0
View file @ 1fe1de72
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
$user_id = $_POST['hidden_userid']; $user_id = $_POST['hidden_userid'];
$new_loc = $_POST['new_location']; $new_loc = $_POST['new_location'];
$query = mysqli_query($con,"INSERT INTO driver_prefloc (driver_id,pref_loc) VALUES ('$user_id', '$new_loc')") or die(mysqli_error($con)); $query = mysqli_query($con,"INSERT INTO driver_prefloc (driver_id,pref_loc) VALUES ('$user_id', '$new_loc')") or die(mysqli_error($con));
mysqli_close($con);
if ($query) { if ($query) {
header("Location: edit_location.php?id=$user_id"); header("Location: edit_location.php?id=$user_id");
} }
......
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