vin audit

src/app/home/dashboard/dashboard.component.html

@@ -248,7 +248,7 @@
                                                             <td>
                                                                 <div class="floatLeft">
                                                                     <div class="btn-group btn-group-justified">
-                                                                        <button class="btn btn-default btn-sm">{{bookData.status === '1' ? 'Accepted' : 'Pending'}}</button>
+                                                                        <button class="{{bookData.status === '1' ? 'btn btn-success btn-sm' : 'btn btn-primary btn-sm'}}btn btn-primary btn-sm">{{bookData.status === '1' ? 'Accepted' : 'Pending'}}</button>
                                                                         <button (click)="cnfCancelBook(bookData.booking_id)" class="btn btn-danger btn-sm">Cancel</button>
                                                                     </div>
                                                                 </div>
@@ -277,8 +277,8 @@
                                                             <td>{{mechdata.custom_amount > 0 ?mechdata.custom_amount:mechdata.mechanic_amount}}</td>
                                                             <td>
                                                                 <div class="btn-group btn-group-justified">
-                                                                    <button class="btn btn-default btn-sm" *ngIf="bookData.status == '1' && !mechdata.custom_service_quote">Accepted</button>
-                                                                    <button class="btn btn-default btn-sm" *ngIf="mechdata.status == '0'">Waiting for Approval</button>
+                                                                    <button class="btn btn-success btn-sm" *ngIf="bookData.status == '1' && !mechdata.custom_service_quote">Accepted</button>
+                                                                    <button class="btn btn-info btn-sm" *ngIf="mechdata.status == '0'">Waiting for Approval</button>
                                                                     <button class="btn btn-success btn-sm" [attr.bookAmount]="mechdata.custom_amount > 0 ?mechdata.custom_amount:mechdata.mechanic_amount" *ngIf="mechdata.status == '1' && bookData.status != '1'" (click)="mechanicQuoteAccept($event,bookData.booking_id,mechdata.mechanic_id)">Accept</button>
                                                                     <button class="btn btn-info btn-sm" (click)="showCustQuote(bookData.booking_id,mechdata.mechanic_id,1)" data-toggle="modal" data-target="#quote" *ngIf="mechdata.status =='1' && mechdata.custom_service_quote">View Quote</button>
                                                                 </div>
@@ -450,7 +450,7 @@
                                 <select (change)="get_model($event.target.value)" class="vehicle_input_select" placeholder="Choose Make"
                                 formControlName="maker" [ngClass]="{'input_error': !vehicleDetailsAddForm.controls['maker'].valid && vehicleDetailsFormSubmitClick}">
                                     <option value="" class="hide">MAKE</option>
-                                    <option *ngFor="let car_date of carSearchJsonData; let key = index" value="{{key}}">{{car_date.brand}}</option>
+                                    <option *ngFor="let car_date of carBrands; let key = index" value="{{car_date.veh_brand_id}}">{{car_date.maker}}</option>
                                 </select>
                             </div>
                         </div>
@@ -459,7 +459,7 @@
                                 <select class="vehicle_input_select" placeholder="Choose Model" formControlName="modelName"
                                 [ngClass]="{'input_error': !vehicleDetailsAddForm.controls['modelName'].valid && vehicleDetailsFormSubmitClick}">
                                     <option value="" class="hide">MODEL</option>
-                                    <option *ngFor="let car_models of carModel">{{car_models}}</option>
+                                    <option *ngFor="let car_models of carModel">{{car_models.model}}</option>
                                 </select>
                             </div>
                             <div class="col-md-6">

src/app/home/dashboard/dashboard.component.scss

@@ -718,7 +718,7 @@
                     padding: 30px;
                     padding-top: 50px;
                     position: relative;
-                    top: 85px;
+                    top: 15px;
                     .login_modal_inner {
                         width: 90%;
                         margin: 0 auto;
@@ -820,7 +820,7 @@
                                         }
                                     }
                                     .active{
-                                        background-color: #f2f2f2;
+                                        background-color: #b9b9b9;
                                         padding:8px;
                                         padding-left: 15px;
                                         border-radius: 8px;

src/app/home/index/index.component.html

@@ -265,7 +265,7 @@
                                             <div class="col-md-6">
                                                 <select (change)="get_model($event.target.value)" formControlName="maker" [ngClass]="{'input_error': !vehicleDataForm.controls['maker'].valid && vehicleDataFormSubmit}">
                                                     <option value="" class="hide">MAKE</option>
-                                                    <option *ngFor="let car_date of carSearchJsonData; let key = index" value="{{car_date.veh_brand_id}}">{{car_date.maker}}</option>
+                                                    <option *ngFor="let car_date of carBrands; let key = index" value="{{car_date.veh_brand_id}}">{{car_date.maker}}</option>
                                                 </select>
                                             </div>
                                         </div>

src/app/home/index/index.component.scss

@@ -395,7 +395,7 @@
         padding: 30px;
         padding-top: 50px;
         position: relative;
-        top: 85px;
+        top:15px;
         .login_modal_inner {
             width: 90%;
             margin: 0 auto;
@@ -498,7 +498,7 @@
                             }
                         }
                         .active{
-                            background-color: #f2f2f2;
+                            background-color: #b9b9b9;
                             padding:8px;
                             padding-left: 15px;
                             border-radius: 8px;

src/app/home/index/index.component.ts

@@ -80,8 +80,9 @@ export class IndexComponent implements OnInit {
   scheduleMechanic: any;
   
   carModel: any;
+  carBrands: any;
+  selBrand: string = '';
   modelDates: number[] = new Array();
-  carSearchJsonData: any;
   optionalImges: any = new Array({1:false,2:false,3:false,4:false});
   optionalDescription: string;
   
@@ -117,10 +118,7 @@ export class IndexComponent implements OnInit {
         modelYear: new FormControl('', [Validators.required]), 
         modelName: new FormControl('', [Validators.required])
       });
-      
-      // this.webService.get_stored_json('car-list.json').subscribe((response: any) => {     
-      //   this.carSearchJsonData = response;
-      // });
+
       this.getVehicleBrand();
       
       let currentYear = Number((new Date()).getFullYear());
@@ -156,20 +154,30 @@ export class IndexComponent implements OnInit {
     }
     
     getVehicleBrand(){
+      this.loader=true;
       this.webService.get_data('getVehicleBrand').subscribe(response => { 
         if(response.status == 'success'){
-          this.carSearchJsonData = response.data;
+          this.carBrands = response.data;
         }
+        this.loader = false;
       });
     }
 
-    get_model(event) {
-      this.webService.post_data('getVehicleModel',{'vehBrand_id':event}).subscribe(response => { 
+    get_model(brand_id) {
+      this.loader = true;
+      const thisObj = this;
+      thisObj.carBrands.forEach(function (brandData,index) {
+        if(brandData.veh_brand_id == brand_id){
+          thisObj.selBrand = brandData.maker;
+        }
+      });
+
+      this.webService.post_data('getVehicleModel',{'vehBrand_id':brand_id}).subscribe(response => { 
         if(response.status == 'success'){
           this.carModel = response.data;
         }
+        this.loader = false;
       });
-     // this.carModel = this.carSearchJsonData[event].models;
     }
     
     getVehicleLoc(lastLoc){
@@ -209,12 +217,12 @@ export class IndexComponent implements OnInit {
     }
     this.wizardData['vechile_info'] = {'trim':vehicleData['trim'],
     'lastMaintanceDate':(vehicleData['last_date'])?(formatDate(vehicleData['last_date'],'MM/dd/yyyy','en')):'',
-    'maker':this.carSearchJsonData[vehicleData['maker']]['brand'],
+    'maker':this.selBrand,
     'milage':vehicleData['milage'],'emgine':vehicleData['emgine'],
     'modelName':vehicleData['modelName'],'modelYear':vehicleData['modelYear'],
     'maintanenceInterval':vehicleData['maintanence_interval']
   }
-  //console.log(this.wizardData['vechile_info'])                                 
+  console.log(this.wizardData['vechile_info'])                                 
   this.vehicleDataFormSubmit = false;
 }
 

src/app/purchase/cart/cart.component.html

@@ -43,7 +43,11 @@
         </li>
       </ul>
       <ng-template #noCart>
-        No Data Found
+        <div class="cmn_nodata">
+          <img src="../../../assets/images/no_result.png">
+          <p>No Data Found</p>
+            
+        </div>
       </ng-template>
     </div>
   </div>

src/app/purchase/cart/cart.component.scss

@@ -236,7 +236,7 @@
                     padding: 10px;
                     img{
                         height: 180px;
-                        width: auto;
+                        max-width: 100%;
                     }
                 }
                 h5{

src/app/purchase/orders/orders.component.html

@@ -4,7 +4,7 @@
       </app-searchbar>
     <div class="loader_overlay" *ngIf="loader"></div>
       <div class="myorder_wrapper">
-        <ul *ngIf="bookedData" infiniteScroll  [infiniteScrollDistance]="2"  [infiniteScrollThrottle]="50"  (scrolled)="onScroll()" [scrollWindow]="false" style="max-height: 700px; overflow: scroll">
+        <ul *ngIf="bookedData;else noOrders" infiniteScroll  [infiniteScrollDistance]="2"  [infiniteScrollThrottle]="50"  (scrolled)="onScroll()" [scrollWindow]="false" style="max-height: 700px; overflow: scroll">
           <li *ngFor="let book of bookedData">
             <div class="row">
               <div class="col-md-6">
@@ -45,6 +45,13 @@
             </div>
           </li>
         </ul>
+        <ng-template #noOrders>
+            <div class="cmn_nodata">
+              <img src="../../../assets/images/no_result.png">
+              <p>No Data Found</p>
+                
+            </div>
+          </ng-template>
       </div>
   </div>
   <div class="bottom_product_list">

src/app/purchase/orders/orders.component.scss

@@ -191,7 +191,7 @@
                         padding: 10px;
                         img{
                             height: 180px;
-                            width: auto;
+                            max-width: 100%;
                         }
                     }
                     h5{

src/app/purchase/productdetails/productdetails.component.html

@@ -20,8 +20,9 @@
                 <div class="product_details">
                   <h1>{{productDetails.product_name}}</h1>
                   <h2>{{productDetails.short_description}}</h2>
-                  <h2>Brand : </h2><h4>{{productDetails.brand_name}}</h4>
-		              <div *ngIf="productDetails.part_id"><h2>Part ID : </h2><h4>{{productDetails.part_id}}</h4></div>
+                  <h2><strong>Brand : </strong>{{productDetails.brand_name}}</h2>
+		              <div *ngIf="productDetails.part_id">
+                    <h2><strong>Part ID : </strong>{{productDetails.part_id}}</h2></div>
                   <h3>$ {{productDetails.amount}}</h3>
                   <div class="rating_div" *ngIf="productDetails.rating">
                       <fieldset class="rating prevent-click">

src/styles.scss

@@ -852,3 +852,19 @@ bs-datepicker-container{
       padding-bottom: 50px;
   }
 
+  .cmn_nodata{
+      text-align: center;
+      padding-top:10%;
+      padding-bottom: 10%;
+      img{
+          width: 200px;
+          margin-bottom:50px;
+      }
+      p{
+        text-align: center;
+        color: #a8a8a8;
+        font-size: 24px;
+        font-weight: 300;
+      }
+  }
+