Skip to content

D
dcarfixers_angular
Commit 294cb2c5 by amalk
Options

Merge branch 'master' into amal

parents e870316c 39545a80
Showing with 110 additions and 28 deletions
package-lock.json
...@@ -4324,14 +4324,12 @@ ...@@ -4324,14 +4324,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -4351,8 +4349,7 @@ ...@@ -4351,8 +4349,7 @@
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
...@@ -4500,7 +4497,6 @@ ...@@ -4500,7 +4497,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -4508,8 +4504,7 @@ ...@@ -4508,8 +4504,7 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.2.4", "version": "2.2.4",
......
package.json
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
"core-js": "^2.5.4", "core-js": "^2.5.4",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"jquery": "^3.3.1", "jquery": "^3.3.1",
"malihu-custom-scrollbar-plugin": "^3.1.5",
"mt-latlon": "^0.1.1", "mt-latlon": "^0.1.1",
"ng2-archwizard": "^2.1.0", "ng2-archwizard": "^2.1.0",
"ng2-file-upload": "^1.3.0", "ng2-file-upload": "^1.3.0",
......
src/app/home/dashboard/dashboard.component.html
...@@ -572,7 +572,7 @@ ...@@ -572,7 +572,7 @@
<h3>SUMMARY</h3> <h3>SUMMARY</h3>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h6 class="pt10 textLeft">Please add a photo or video</h6> <h6 class="pt10 textLeft">Issues</h6>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
...@@ -591,6 +591,17 @@ ...@@ -591,6 +591,17 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<input #newGoogleLocSearch placeholder="Enter Location" autocorrect="off" autocapitalize="off" spellcheck="off" type="text" [ngModel]="(wizardData && wizardData.pickup_data && wizardData.pickup_data.pickup_loc)?wizardData.pickup_data.pickup_loc:''" (keyup)="googlesearchLocError = false;" (ngModelChange)="get_newlocaion(newGoogleLocSearch.value)" [attr.value]="(wizardData && wizardData.pickup_data && wizardData.pickup_data.pickup_loc)?wizardData.pickup_data.pickup_loc:''">
</div>
<div class="row">
<div class="col-md-6">
<input placeholder="LAST MAINTENANCE DATE" type="" bsDatepicker name="dob" [ngModel]="">
</div>
<div class="col-md-6">
<input placeholder="APPROX VEHICLE MILEAGE" type="" [attr.value]="">
</div>
</div>
<div class="row">
<div class="col-md-12 textCenter"> <div class="col-md-12 textCenter">
<button *ngIf="!loginDetails" (click)="resetForm()" class="wizard_signin" type="button" data-toggle="modal" data-target="#login">SIGN IN</button> <button *ngIf="!loginDetails" (click)="resetForm()" class="wizard_signin" type="button" data-toggle="modal" data-target="#login">SIGN IN</button>
<button (click)="getQuote()" class="wizard_quotes" type="button" data-toggle="modal" data-target="#quotes">VIEW SERVICE QUOTE</button> <button (click)="getQuote()" class="wizard_quotes" type="button" data-toggle="modal" data-target="#quotes">VIEW SERVICE QUOTE</button>
......
src/app/home/dashboard/dashboard.component.ts
...@@ -35,7 +35,7 @@ export class DashboardComponent implements OnInit { ...@@ -35,7 +35,7 @@ export class DashboardComponent implements OnInit {
autocompleteDetails: any; autocompleteDetails: any;
editProfileSubmitClick: boolean; editProfileSubmitClick: boolean;
optionalDescription: string; optionalDescription: string;
cfautocomplete: any;
carModel: any; carModel: any;
modelDates: number[] = new Array(); modelDates: number[] = new Array();
carSearchJsonData: any; carSearchJsonData: any;
...@@ -76,6 +76,7 @@ export class DashboardComponent implements OnInit { ...@@ -76,6 +76,7 @@ export class DashboardComponent implements OnInit {
showRightArrow: boolean; showRightArrow: boolean;
estimatedPrice: number; estimatedPrice: number;
scheduleDateInit: boolean; scheduleDateInit: boolean;
googlesearchLocError: boolean;
scheduleMechanic: any; scheduleMechanic: any;
optionalImges: any = new Array({1:false,2:false,3:false,4:false}); optionalImges: any = new Array({1:false,2:false,3:false,4:false});
...@@ -92,6 +93,7 @@ export class DashboardComponent implements OnInit { ...@@ -92,6 +93,7 @@ export class DashboardComponent implements OnInit {
@ViewChild("step3nextBtn") public step3nextRef: ElementRef; @ViewChild("step3nextBtn") public step3nextRef: ElementRef;
@ViewChild("closeQuoteWizard") closeQuoteWizardRef: ElementRef; @ViewChild("closeQuoteWizard") closeQuoteWizardRef: ElementRef;
@ViewChild("googleLocDetails") public googleLocDetailsRef: ElementRef; @ViewChild("googleLocDetails") public googleLocDetailsRef: ElementRef;
@ViewChild("newGoogleLocSearch") public newGoogleLocRef: ElementRef;
@ViewChild("serviceHistoryTab") public serviceHistoryTabRef: ElementRef; @ViewChild("serviceHistoryTab") public serviceHistoryTabRef: ElementRef;
@ViewChild("closeVehicleAddForm") public closeVehicleAddFormRef: ElementRef; @ViewChild("closeVehicleAddForm") public closeVehicleAddFormRef: ElementRef;
...@@ -114,6 +116,7 @@ export class DashboardComponent implements OnInit { ...@@ -114,6 +116,7 @@ export class DashboardComponent implements OnInit {
this.showLeftArrow = false; this.showLeftArrow = false;
this.showRightArrow = true; this.showRightArrow = true;
this.scheduleDateInit = false; this.scheduleDateInit = false;
this.googlesearchLocError = false;
this.editProfileSubmitClick = false; this.editProfileSubmitClick = false;
this.scheduleMechanic = false; this.scheduleMechanic = false;
this.optionalDescription = ''; this.optionalDescription = '';
...@@ -181,6 +184,9 @@ export class DashboardComponent implements OnInit { ...@@ -181,6 +184,9 @@ export class DashboardComponent implements OnInit {
this.autocompleteDetails = new google.maps.places.Autocomplete(this.googleLocDetailsRef.nativeElement, { this.autocompleteDetails = new google.maps.places.Autocomplete(this.googleLocDetailsRef.nativeElement, {
types: ["address"] types: ["address"]
}); });
this.cfautocomplete = new google.maps.places.Autocomplete(this.newGoogleLocRef.nativeElement, {
types: ["address"]
});
}); });
this.nextDate.setDate(this.nextDate.getDate() + 1); this.nextDate.setDate(this.nextDate.getDate() + 1);
} }
...@@ -260,6 +266,31 @@ export class DashboardComponent implements OnInit { ...@@ -260,6 +266,31 @@ export class DashboardComponent implements OnInit {
}); });
} }
get_newlocaion(lastLoc){
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) {
this.googlesearchLocError = true;
return;
}
this.wizardData['pickup_data'] = {
'disp_loc':places.name,
'pickup_loc':places.formatted_address,
'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();
});
})
}
removeSelectedItem(issue_id,sub_issue_id){ removeSelectedItem(issue_id,sub_issue_id){
let index = this.selectedIssues.findIndex(x => x.sub_issue_id == sub_issue_id); let index = this.selectedIssues.findIndex(x => x.sub_issue_id == sub_issue_id);
if(index > -1){ if(index > -1){
...@@ -540,7 +571,7 @@ export class DashboardComponent implements OnInit { ...@@ -540,7 +571,7 @@ export class DashboardComponent implements OnInit {
thisObj.selectedIssues.forEach(function (selIssues) { thisObj.selectedIssues.forEach(function (selIssues) {
selSubIssues.push(selIssues.sub_issue_id); selSubIssues.push(selIssues.sub_issue_id);
}); });
console.log(this.wizardData.pickup_data)
let searchData = {'pickup_data':this.wizardData.pickup_data,'sub_issues':selSubIssues} let searchData = {'pickup_data':this.wizardData.pickup_data,'sub_issues':selSubIssues}
this.webService.post_data('getNearByMechanics',searchData).subscribe(response => { this.webService.post_data('getNearByMechanics',searchData).subscribe(response => {
if(response.status == '1'){ if(response.status == '1'){
......
src/app/home/index/index.component.html
...@@ -402,7 +402,7 @@ ...@@ -402,7 +402,7 @@
<h3>SUMMARY</h3> <h3>SUMMARY</h3>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<h6 class="pt10 textLeft">Please add a photo or video</h6> <h6 class="pt10 textLeft">Issues</h6>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
...@@ -420,6 +420,17 @@ ...@@ -420,6 +420,17 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<input #addressLocSearch placeholder="Enter Location" autocorrect="off" autocapitalize="off" spellcheck="off" type="text" [ngModel]="(wizardData && wizardData.pickup_data && wizardData.pickup_data.pickup_loc)?wizardData.pickup_data.pickup_loc:''" (keyup)="addresssearchLocError = false;" (ngModelChange)="get_newlocaion(addressLocSearch.value)" [attr.value]="(wizardData && wizardData.pickup_data && wizardData.pickup_data.pickup_loc)?wizardData.pickup_data.pickup_loc:''">
</div>
<div class="row">
<div class="col-md-6">
<input placeholder="LAST MAINTENANCE DATE" type="" bsDatepicker name="dob" [ngModel]="(wizardData && wizardData.vechile_info && wizardData.vechile_info.lastMaintanceDate)?wizardData.vechile_info.lastMaintanceDate:''">
</div>
<div class="col-md-6">
<input placeholder="APPROX VEHICLE MILEAGE" type="" [attr.value]="(wizardData && wizardData.vechile_info && wizardData.vechile_info.milage)?wizardData.vechile_info.milage:''">
</div>
</div>
<div class="row">
<div class="col-md-12 textCenter"> <div class="col-md-12 textCenter">
<button *ngIf="!loginDetails" (click)="resetForm()" class="wizard_signin" type="button" data-toggle="modal" data-target="#login">SIGN IN</button> <button *ngIf="!loginDetails" (click)="resetForm()" class="wizard_signin" type="button" data-toggle="modal" data-target="#login">SIGN IN</button>
<button (click)="getQuote()" class="wizard_quotes" type="button" data-toggle="modal" data-target="#quotes">VIEW SERVICE QUOTE</button> <button (click)="getQuote()" class="wizard_quotes" type="button" data-toggle="modal" data-target="#quotes">VIEW SERVICE QUOTE</button>
...@@ -538,7 +549,8 @@ ...@@ -538,7 +549,8 @@
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="scheduletiming_listing"> <div class="scheduletiming_listing">
<ul id="scroll_0_{{mechanic.mechanic_id}}" malihu-scrollbar [scrollbarOptions]="scrollbarOptions"> <!-- <ul id="scroll_0_{{mechanic.mechanic_id}}" malihu-scrollbar [scrollbarOptions]="scrollbarOptions"> -->
<ul id="scroll_0_{{mechanic.id}}">
<li *ngFor="let time of mechanic.scheduleTiming" id="custom_check_button"> <li *ngFor="let time of mechanic.scheduleTiming" id="custom_check_button">
<label> <label>
<input type="radio" name="scheduleTime" (click)="getSchedule(time,'0'); <input type="radio" name="scheduleTime" (click)="getSchedule(time,'0');
...@@ -547,7 +559,7 @@ ...@@ -547,7 +559,7 @@
</label> </label>
</li> </li>
</ul> </ul>
<ul id="scroll_1_{{mechanic.mechanic_id}}" malihu-scrollbar [scrollbarOptions]="scrollbarOptions"> <ul id="scroll_1_{{mechanic.id}}">
<li *ngFor="let time of mechanic.scheduleTiming" id="custom_check_button"> <li *ngFor="let time of mechanic.scheduleTiming" id="custom_check_button">
<label> <label>
<input type="radio" name="scheduleTime" (click)="getSchedule(time,'1'); <input type="radio" name="scheduleTime" (click)="getSchedule(time,'1');
...@@ -558,8 +570,8 @@ ...@@ -558,8 +570,8 @@
</ul> </ul>
</div> </div>
<div class="scheduletiming_btm_btns"> <div class="scheduletiming_btm_btns">
<div class="btm_btns" (click)="scrollToBottom('scroll_0_'+mechanic.mechanic_id)"></div> <div class="btm_btns" (click)="scrollToBottom('scroll_0_'+mechanic.id)"></div>
<div class="btm_btns" (click)="scrollToBottom('scroll_1_'+mechanic.mechanic_id)"></div> <div class="btm_btns" (click)="scrollToBottom('scroll_1_'+mechanic.id)"></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -582,8 +594,11 @@ ...@@ -582,8 +594,11 @@
<agm-map #gm [latitude]="lat" [longitude]="lng" [fitBounds]="true"> <agm-map #gm [latitude]="lat" [longitude]="lng" [fitBounds]="true">
<agm-marker *ngFor="let mechanicLoc of mechanicData" [agmFitBounds]="true" [latitude]="mechanicLoc.location_lat" [longitude]="mechanicLoc.location_lat" (mouseOver)="onMouseOver(infoWindow,gm)" (mouseOut)="onMouseOut(gm)"> <agm-marker *ngFor="let mechanicLoc of mechanicData" [agmFitBounds]="true" [latitude]="mechanicLoc.location_lat" [longitude]="mechanicLoc.location_lat" (mouseOver)="onMouseOver(infoWindow,gm)" (mouseOut)="onMouseOut(gm)">
<agm-info-window [disableAutoPan]="false" #infoWindow> <agm-info-window [disableAutoPan]="false" #infoWindow>
<div>{{mechanicLoc.display_name}}</div> <div style="width:130px;">
<div>{{mechanicLoc.estimate}}</div> <img src="{{imageServer + mechanicLoc.profile_image}}" width="30px" height="30px" style="float: left;margin-right: 5px" onerror="this.src='assets/images/user_avatar.jpg'">
<div style="float: left">{{mechanicLoc.display_name}}</div><br>
<div style="float: left">{{mechanicLoc.estimate}}</div>
</div>
</agm-info-window> </agm-info-window>
</agm-marker> </agm-marker>
</agm-map> </agm-map>
......
src/app/home/index/index.component.ts
...@@ -12,9 +12,6 @@ import { formatDate } from '@angular/common'; ...@@ -12,9 +12,6 @@ import { formatDate } from '@angular/common';
declare var $; declare var $;
declare const google: any; declare const google: any;
@Component({ @Component({
selector: 'app-index', selector: 'app-index',
templateUrl: './index.component.html', templateUrl: './index.component.html',
...@@ -36,14 +33,16 @@ export class IndexComponent implements OnInit { ...@@ -36,14 +33,16 @@ export class IndexComponent implements OnInit {
//Basic Location Search: TAB 1 //Basic Location Search: TAB 1
autocomplete: any; autocomplete: any;
cfautocomplete: any;
searchLocError: boolean; searchLocError: boolean;
addresssearchLocError: boolean;
@ViewChild("goTostep0") public goTostep0Ref: ElementRef; @ViewChild("goTostep0") public goTostep0Ref: ElementRef;
@ViewChild("goTostep1") public goTostep1Ref: ElementRef; @ViewChild("goTostep1") public goTostep1Ref: ElementRef;
@ViewChild("goTostep2") public goTostep2Ref: ElementRef; @ViewChild("goTostep2") public goTostep2Ref: ElementRef;
@ViewChild("closeWizard") public closeWizardRef: ElementRef; @ViewChild("closeWizard") public closeWizardRef: ElementRef;
@ViewChild("googleLocSearch") public searchElementRef: ElementRef; @ViewChild("googleLocSearch") public searchElementRef: ElementRef;
@ViewChild("addressLocSearch") public addressElementRef: ElementRef;
@ViewChild("indexLoginModal") loginModalRef: ElementRef; @ViewChild("indexLoginModal") loginModalRef: ElementRef;
@ViewChild("closeQuoteWizard") closeQuoteWizardRef: ElementRef; @ViewChild("closeQuoteWizard") closeQuoteWizardRef: ElementRef;
...@@ -95,6 +94,7 @@ export class IndexComponent implements OnInit { ...@@ -95,6 +94,7 @@ export class IndexComponent implements OnInit {
this.nextDate = new Date(); this.nextDate = new Date();
this.loginDetails = false; this.loginDetails = false;
this.searchLocError = false; this.searchLocError = false;
this.addresssearchLocError = false;
this.showLeftArrow = false; this.showLeftArrow = false;
this.showRightArrow = true; this.showRightArrow = true;
this.scheduleDateInit = false; this.scheduleDateInit = false;
...@@ -134,6 +134,9 @@ export class IndexComponent implements OnInit { ...@@ -134,6 +134,9 @@ export class IndexComponent implements OnInit {
this.autocomplete = new google.maps.places.Autocomplete(this.searchElementRef.nativeElement, { this.autocomplete = new google.maps.places.Autocomplete(this.searchElementRef.nativeElement, {
types: ["address"] types: ["address"]
}); });
this.cfautocomplete = new google.maps.places.Autocomplete(this.addressElementRef.nativeElement, {
types: ["address"]
});
}); });
this.featuredOn = {grid: {xs: 1, sm: 2 , md: 5, lg: 6, all: 0},slide: 1, speed: 400, animation: 'lazy',point: { visible: false },load: 2, touch: true, easing: 'ease'} this.featuredOn = {grid: {xs: 1, sm: 2 , md: 5, lg: 6, all: 0},slide: 1, speed: 400, animation: 'lazy',point: { visible: false },load: 2, touch: true, easing: 'ease'}
...@@ -158,9 +161,9 @@ export class IndexComponent implements OnInit { ...@@ -158,9 +161,9 @@ export class IndexComponent implements OnInit {
this.searchLocError = true; this.searchLocError = true;
return; return;
} }
this.wizardData = {'pickup_data': this.wizardData = {'pickup_data':
{'pickup_loc':place.formatted_address, {'disp_loc':place.name,
'pickup_loc':place.formatted_address,
'pickup_lat':place.geometry.location.lat(), 'pickup_lat':place.geometry.location.lat(),
'pickup_lng':place.geometry.location.lng() 'pickup_lng':place.geometry.location.lng()
} }
...@@ -180,10 +183,13 @@ export class IndexComponent implements OnInit { ...@@ -180,10 +183,13 @@ export class IndexComponent implements OnInit {
this.vehicleDataFormSubmit = true; this.vehicleDataFormSubmit = true;
return false; return false;
} }
this.wizardData['vechile_info'] = {'trim':vehicleData['trim'],'maker':this.carSearchJsonData[vehicleData['maker']]['brand'], 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'],
'milage':vehicleData['milage'],'emgine':vehicleData['emgine'], 'milage':vehicleData['milage'],'emgine':vehicleData['emgine'],
'modelName':vehicleData['modelName'],'modelYear':vehicleData['modelYear'] 'modelName':vehicleData['modelName'],'modelYear':vehicleData['modelYear']
} }
this.vehicleDataFormSubmit = false; this.vehicleDataFormSubmit = false;
} }
...@@ -229,7 +235,31 @@ export class IndexComponent implements OnInit { ...@@ -229,7 +235,31 @@ export class IndexComponent implements OnInit {
}); });
},500); },500);
} }
get_newlocaion(lastLoc){
this.cfautocomplete.addListener("place_changed", () => {
console.log('ffdf');
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) {
this.addresssearchLocError = true;
return;
}
this.wizardData['pickup_data'] = {
'disp_loc':places.name,
'pickup_loc':places.formatted_address,
'pickup_lat':places.geometry.location.lat(),
'pickup_lng':places.geometry.location.lng()
};
console.log(this.wizardData);
this.addresssearchLocError = false;
this.lat = places.geometry.location.lat();
this.lng = places.geometry.location.lng();
});
})
}
setIssueSelected(event){ setIssueSelected(event){
let issue_id = event.target.attributes.issue_id.value; let issue_id = event.target.attributes.issue_id.value;
let sub_issue_id = event.target.attributes.sub_issue_id.value; let sub_issue_id = event.target.attributes.sub_issue_id.value;
...@@ -297,7 +327,7 @@ export class IndexComponent implements OnInit { ...@@ -297,7 +327,7 @@ export class IndexComponent implements OnInit {
this.optionalDescription = ''; this.optionalDescription = '';
} }
getQuote(){ getQuote(location){
const thisObj = this; const thisObj = this;
this.loader = true; this.loader = true;
...@@ -310,7 +340,6 @@ export class IndexComponent implements OnInit { ...@@ -310,7 +340,6 @@ export class IndexComponent implements OnInit {
this.webService.post_data('getNearByMechanics',searchData).subscribe(response => { this.webService.post_data('getNearByMechanics',searchData).subscribe(response => {
if(response.status == '1'){ if(response.status == '1'){
this.mechanicData = response.mechanic_data; this.mechanicData = response.mechanic_data;
this.dateSection.push(new Date(this.today.setDate(this.today.getDate()))); this.dateSection.push(new Date(this.today.setDate(this.today.getDate())));
this.dateSection.push(new Date(this.today.setDate(this.today.getDate() + 1))); this.dateSection.push(new Date(this.today.setDate(this.today.getDate() + 1)));
......
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