Merge branch 'jensa' into 'master'

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

@@ -660,7 +660,7 @@
                                     </div>
                                     <div class="row">
                                         <div class="col-md-6">
-                                            <input  placeholder="LAST MAINTENANCE DATE" type="" bsDatepicker name="dob" [ngModel]="" (ngModelChange)="get_newdate($event)">
+                                            <input  placeholder="LAST MAINTENANCE DATE" type="" bsDatepicker name="dob" [ngModel]="(wizardData && wizardData.vechile_info && wizardData.vechile_info.lastMaintanceDate)?wizardData.vechile_info.lastMaintanceDate:''" (ngModelChange)="get_newdate($event)">
                                         </div>
                                         <div class="col-md-6">
                                             <input placeholder="APPROX VEHICLE MILEAGE" type="" [ngModel]="testMilage" (ngModelChange)="get_newmilage($event)">
@@ -864,12 +864,10 @@
         </div>
     </div>
 </div>
-
 <!-- QUOTES-MODAL-ENDS-->
 
-
+<!-- <button class="add_btn" data-toggle="modal" data-target="#success">Show Success</button> -->
 <!-- BOOKING-SUCCESS-MODAL-STARTS -->
-
 <div class="modal" id="success">
     <div class="modal-dialog modal-full">
         <div class="modal-content login_modal_wrapper">
@@ -921,6 +919,4 @@
         </div>
     </div>
 </div>
-
-
 <!-- BOOKING-SUCCESS-MODAL-ENDS -->

src/app/home/dashboard/dashboard.component.ts

@@ -281,7 +281,6 @@ export class DashboardComponent implements OnInit {
     this.cfautocomplete.addListener("place_changed", () => {
       this.ngZone.run(() => {
         let places: google.maps.places.PlaceResult = this.cfautocomplete.getPlace();
-        console.log(places);
         if (places == undefined || places == null || places === undefined || places === null || 
             places.geometry == undefined || places.geometry == null || places.geometry === undefined || places.geometry === null || 
             places.formatted_address == undefined || places.formatted_address == null || places.formatted_address === undefined || places.formatted_address === null) {
@@ -294,7 +293,6 @@ export class DashboardComponent implements OnInit {
                                           'pickup_lat':places.geometry.location.lat(),
                                           'pickup_lng':places.geometry.location.lng()
                                         };
-        console.log(this.wizardData);
         this.googlesearchLocError = false;
         this.lat = places.geometry.location.lat();
         this.lng = places.geometry.location.lng();
@@ -532,10 +530,13 @@ export class DashboardComponent implements OnInit {
                                            'maker':vehData.car_maker,
                                            'modelName':vehData.car_model,
                                            'modelYear':vehData.car_model_year,
-                                           'maintanenceInterval':vehData.maintanence_interval}
-                                           console.log(thisObj.wizardData['vechile_info']);
+                                           'maintanenceInterval':vehData.maintanence_interval,
+                                           'lastMaintanceDate':vehData.last_maintenance_date
+                                          };
+
+        thisObj.wizardData['customer_vehicle_id'] = vehData.customer_veh_id;
       }
-    });
+    }); 
     this.getIssueData();
   }
 
@@ -639,7 +640,6 @@ export class DashboardComponent implements OnInit {
     thisObj.selectedIssues.forEach(function (selIssues) {
       selSubIssues.push(selIssues.sub_issue_id);
     });
-    console.log(this.wizardData)
     let searchData = {'pickup_data':this.wizardData.pickup_data,'sub_issues':selSubIssues}
     this.webService.post_data('getNearByMechanics',searchData).subscribe(response => {
       if(response.status == '1'){