Skip to content

D
dcarfixers_angular
Commit 6e443894 by amal
Options

Merge branch 'amal' into 'master'

Amal See merge request !23
parents 2def1342 3cffa72f
Showing with 184 additions and 59 deletions
src/app/home/dashboard/dashboard.component.html
...@@ -238,62 +238,64 @@ ...@@ -238,62 +238,64 @@
<th>Action</th> <th>Action</th>
</tr> </tr>
</thead> </thead>
<tbody> </table>
<tr *ngFor="let bookData of successBookDtls; let i = index"> <div *ngFor="let bookData of successBookDtls; let i = index">
<td>{{i+1}}</td> <table>
<td>{{bookData.scheduled_date+' '+bookData.scheduled_time}}</td> <tbody>
<td>{{bookData.car_name}}</td> <tr>
<td>{{bookData.car_name}}</td> <td>{{i+1}}</td>
<td>{{bookData.first_name+' '+bookData.last_name}}</td> <td>{{bookData.scheduled_date+' '+bookData.scheduled_time}}</td>
<td>{{bookData.cost}}</td> <td>{{bookData.car_name}}</td>
<td> <td>{{bookData.car_name}}</td>
<div class="floatLeft"> <td>{{bookData.first_name+' '+bookData.last_name}}</td>
<td>{{bookData.cost}}</td>
<td>
<div class="floatLeft">
<div class="btn-group btn-group-justified">
<button (click)="cancelBooking(bookData.booking_id)" class="btn btn-danger btn-sm">Reject</button>
</div>
</div>
<div class="booking_drop" data-toggle="collapse" data-target="#quote_list">
</div>
</td>
</tr>
</tbody>
</table>
<table id="quote_list" class="collapse">
<thead>
<tr>
<th>Sl no</th>
<th>Mechanic Name</th>
<th>Contact</th>
<th>Rating</th>
<th>Location</th>
<th>Amount</th>
<th>Action</th>
</tr>
</thead>
<tbody>
<tr>
<td>01</td>
<td>John Doe</td>
<td>96153214859</td>
<td>6.4/10</td>
<td>East Bouliward Sydney</td>
<td>$400</td>
<td>
<div class="btn-group btn-group-justified"> <div class="btn-group btn-group-justified">
<button (click)="cancelBooking(bookData.booking_id)" class="btn btn-danger btn-sm">Reject</button> <button class="btn btn-default btn-sm">Waiting for Approval</button>
<button class="btn btn-success btn-sm">Accept</button>
<button class="btn btn-danger btn-sm">Reject</button>
<button class="btn btn-info btn-sm" data-toggle="modal" data-target="#failure">View Quote</button>
</div> </div>
</div> </td>
</tr>
<div class="booking_drop" data-toggle="collapse" data-target="#quote_list">
</tbody>
</div> </table>
</td> </div>
</tr>
</tbody>
</table>
<table id="quote_list" class="collapse">
<thead>
<tr>
<th>Sl no</th>
<th>Mechanic Name</th>
<th>Contact</th>
<th>Shop name</th>
<th>Rating</th>
<th>Location</th>
<th>Amount</th>
<th>Action</th>
</tr>
</thead>
<tbody>
<tr>
<td>01</td>
<td>John Doe</td>
<td>96153214859</td>
<td>Shop Name</td>
<td>6.4/10</td>
<td>East Bouliward Sydney</td>
<td>$400</td>
<td>
<div class="btn-group btn-group-justified">
<button class="btn btn-default btn-sm">Waiting for Approval</button>
<button class="btn btn-success btn-sm">Accept</button>
<button class="btn btn-danger btn-sm">Reject</button>
<button class="btn btn-info btn-sm" data-toggle="modal" data-target="#success">View Quote</button>
</div>
</td>
</tr>
</tbody>
</table>
</ng-template> </ng-template>
</div> </div>
</div> </div>
...@@ -866,9 +868,10 @@ ...@@ -866,9 +868,10 @@
</div> </div>
<!-- QUOTES-MODAL-ENDS--> <!-- QUOTES-MODAL-ENDS-->
<!-- <button class="add_btn" data-toggle="modal" data-target="#success">Show Success</button> -->
<!-- BOOKING-SUCCESS-MODAL-STARTS --> <!-- BOOKING-QUOTE-MODAL-STARTS -->
<div class="modal" id="success">
<div class="modal" id="quote">
<div class="modal-dialog modal-full"> <div class="modal-dialog modal-full">
<div class="modal-content login_modal_wrapper"> <div class="modal-content login_modal_wrapper">
<div class="modal_close" data-dismiss="modal"> × </div> <div class="modal_close" data-dismiss="modal"> × </div>
...@@ -919,4 +922,66 @@ ...@@ -919,4 +922,66 @@
</div> </div>
</div> </div>
</div> </div>
<!-- BOOKING-QUOTE-MODAL-ENDS -->
<!-- BOOKING-SUCCESS-MODAL-STARTS -->
<div class="modal" id="success">
<div class="modal-dialog modal-full">
<div class="modal-content login_modal_wrapper">
<div class="modal_close" data-dismiss="modal"> × </div>
<div class="modal-body quote_modal">
<div class="login_modal_content">
<div class="login_modal_inner">
<div class="login_success">
<img src="assets/images/asset_success.png">
<h4>Your Booking is success</h4>
</div>
<div class="row">
<div class="col-md-12 textCenter" style="padding-top:40px;">
<button class="log_btn">Close</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- BOOKING-SUCCESS-MODAL-ENDS --> <!-- BOOKING-SUCCESS-MODAL-ENDS -->
<!-- BOOKING-FAILURE-MODAL-STARTS -->
<div class="modal" id="failure">
<div class="modal-dialog modal-full">
<div class="modal-content login_modal_wrapper">
<div class="modal_close" data-dismiss="modal"> × </div>
<div class="modal-body quote_modal">
<div class="login_modal_content">
<div class="login_modal_inner">
<div class="login_success">
<img src="assets/images/asset_error.png">
<h4>Your Booking is failure</h4>
</div>
<div class="row">
<div class="col-md-12 textCenter" style="padding-top:40px;">
<button class="log_btn" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- BOOKING-FAILURE-MODAL-ENDS -->
src/app/home/dashboard/dashboard.component.scss
...@@ -96,8 +96,10 @@ ...@@ -96,8 +96,10 @@
padding-bottom: 80px; padding-bottom: 80px;
#quote_list{ #quote_list{
background: #fff !important;
thead { thead {
background:#2655bf;
background: rgba(0, 0, 0, 0.5);
tr { tr {
th { th {
color: #fff; color: #fff;
...@@ -115,8 +117,9 @@ ...@@ -115,8 +117,9 @@
} }
table { table {
width: 100%; width: 100%;
background: #f8f8f8;
thead { thead {
background: rgba(0, 0, 0, 0.5); background:#2655bf;
tr { tr {
th { th {
color: #fff; color: #fff;
...@@ -124,6 +127,27 @@ ...@@ -124,6 +127,27 @@
font-weight: 400; font-weight: 400;
padding: 5px; padding: 5px;
padding-left: 20px; padding-left: 20px;
&:nth-child(1){
width:5%;
}
&:nth-child(2){
width:20%;
}
&:nth-child(3){
width:20%;
}
&:nth-child(4){
width:20%;
}
&:nth-child(5){
width:15%;
}
&:nth-child(6){
width:10%;
}
&:nth-child(7){
width:10%;
}
} }
} }
} }
...@@ -152,6 +176,27 @@ ...@@ -152,6 +176,27 @@
.btn_set{ .btn_set{
padding: 7px; padding: 7px;
} }
&:nth-child(1){
width:5%;
}
&:nth-child(2){
width:20%;
}
&:nth-child(3){
width:20%;
}
&:nth-child(4){
width:20%;
}
&:nth-child(5){
width:15%;
}
&:nth-child(6){
width:10%;
}
&:nth-child(7){
width:10%;
}
} }
} }
} }
......
src/styles.scss
...@@ -587,3 +587,18 @@ bs-datepicker-container{ ...@@ -587,3 +587,18 @@ bs-datepicker-container{
} }
.login_success{
text-align: center;
img{
width: 100px;
}
h4{
text-align: center;
text-transform: capitalize;
padding-top: 10%;
padding-bottom: 10%;
font-size: 26px;
}
}
Markdown is supported
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