Skip to content

D
dcarfixers_angular
Commit 430c84e9 by Jansa Jose
Options

dc -- maintanence interval

parent fb5b9e2a
Showing with 50 additions and 14 deletions
src/app/home/dashboard/dashboard.component.html
...@@ -514,7 +514,7 @@ ...@@ -514,7 +514,7 @@
<button id="custom_check_button"> <button id="custom_check_button">
<label> <label>
<input type="checkbox" name="services" [attr.id]="'issue_' + issue_data.issue_id + '_' + sub_issue_data.issue_cat_id" [attr.issue_id]="issue_data.issue_id" [attr.sub_issue_id]="sub_issue_data.issue_cat_id" (click)="setIssueSelected($event)"> <input type="checkbox" name="services" [attr.id]="'issue_' + issue_data.issue_id + '_' + sub_issue_data.issue_cat_id" [attr.issue_id]="issue_data.issue_id" [attr.sub_issue_id]="sub_issue_data.issue_cat_id" (click)="setIssueSelected($event)">
<p>{{sub_issue_data.issue_category}}</p> <p class="text_truncate">{{sub_issue_data.issue_category}}</p>
</label> </label>
</button> </button>
</li> </li>
...@@ -621,7 +621,15 @@ ...@@ -621,7 +621,15 @@
<input placeholder="LAST MAINTENANCE DATE" type="" bsDatepicker name="dob" [ngModel]="" (ngModelChange)="get_newdate($event)"> <input placeholder="LAST MAINTENANCE DATE" type="" bsDatepicker name="dob" [ngModel]="" (ngModelChange)="get_newdate($event)">
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<input placeholder="APPROX VEHICLE MILEAGE" type="" [ngModel]="milage" (ngModelChange)="get_newmilage($event)"> <input placeholder="APPROX VEHICLE MILEAGE" type="" [ngModel]="testMilage" (ngModelChange)="get_newmilage($event)">
</div>
</div>
<div class="row">
<div class="col-md-6">
<select *ngIf="(wizardData && wizardData.vechile_info)" (change)=get_newmaintanence_date($event)>
<option value="" class="hide">MAINTENANCE INTERVALS</option>
<option *ngFor="let date of monthArray;let i = index;" [attr.value]="i+1" [selected]="(wizardData && wizardData.vechile_info && wizardData.vechile_info.maintanenceInterval)? wizardData.vechile_info.maintanenceInterval == i+1 :''">{{i+1}}{{(i === 0)?' Month':' Months'}}</option>
</select>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
......
src/app/home/dashboard/dashboard.component.ts
...@@ -23,6 +23,7 @@ export class DashboardComponent implements OnInit { ...@@ -23,6 +23,7 @@ export class DashboardComponent implements OnInit {
imageUrl: any; imageUrl: any;
user_name: string; user_name: string;
vehDetails: any; vehDetails: any;
testMilage: any = '';
errMessage: any; errMessage: any;
editProfile; editProfile;
loginDetails: any; loginDetails: any;
...@@ -39,6 +40,7 @@ export class DashboardComponent implements OnInit { ...@@ -39,6 +40,7 @@ export class DashboardComponent implements OnInit {
cfautocomplete: any; cfautocomplete: any;
carModel: any; carModel: any;
modelDates: number[] = new Array(); modelDates: number[] = new Array();
monthArray: any[] = new Array(12);
carSearchJsonData: any; carSearchJsonData: any;
vehicleVinAddForm; vehicleVinAddForm;
...@@ -264,7 +266,6 @@ export class DashboardComponent implements OnInit { ...@@ -264,7 +266,6 @@ export class DashboardComponent implements OnInit {
} }
}); });
} }
console.log(thisObj.selectedIssues);
this.calculateEstimate(); this.calculateEstimate();
} }
...@@ -309,6 +310,10 @@ export class DashboardComponent implements OnInit { ...@@ -309,6 +310,10 @@ export class DashboardComponent implements OnInit {
this.wizardData['vechile_info']['milage']=event; this.wizardData['vechile_info']['milage']=event;
} }
get_newmaintanence_date(newdate){
this.wizardData['vechile_info']['maintanenceInterval']=newdate.target.value;
}
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){
...@@ -526,7 +531,9 @@ export class DashboardComponent implements OnInit { ...@@ -526,7 +531,9 @@ export class DashboardComponent implements OnInit {
thisObj.wizardData['vechile_info'] = {'trim':'','milage':'','emgine':'', thisObj.wizardData['vechile_info'] = {'trim':'','milage':'','emgine':'',
'maker':vehData.car_maker, 'maker':vehData.car_maker,
'modelName':vehData.car_model, 'modelName':vehData.car_model,
'modelYear':vehData.car_model_year} 'modelYear':vehData.car_model_year,
'maintanenceInterval':vehData.maintanence_interval}
console.log(thisObj.wizardData['vechile_info']);
} }
}); });
this.getIssueData(); this.getIssueData();
...@@ -632,7 +639,7 @@ export class DashboardComponent implements OnInit { ...@@ -632,7 +639,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) console.log(this.wizardData)
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/home.module.ts
...@@ -31,7 +31,7 @@ import { ForgotComponent } from './forgot/forgot.component'; ...@@ -31,7 +31,7 @@ import { ForgotComponent } from './forgot/forgot.component';
BsDatepickerModule.forRoot(), BsDatepickerModule.forRoot(),
MalihuScrollbarModule.forRoot(), MalihuScrollbarModule.forRoot(),
AgmCoreModule.forRoot({ AgmCoreModule.forRoot({
apiKey: 'AIzaSyCaczDjLVYU1vZH0HXkbU5ugsUHoWNE2NM', apiKey: 'AIzaSyAd3eUTU8Y3w0qemOuaRw1IXoACbeyjBJQ',
libraries: ["places"] libraries: ["places"]
}) })
] ]
......
src/app/home/index/index.component.html
...@@ -292,7 +292,13 @@ ...@@ -292,7 +292,13 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<input formControlName="last_date" placeholder="LAST MAINTENANCE DATE" type="text" class="form-control date" <input formControlName="last_date" placeholder="LAST MAINTENANCE DATE" type="text" class="form-control date"
bsDatepicker name="dob" autocomplete="off"> bsDatepicker name="dob">
</div>
<div class="col-md-6">
<select formControlName="maintanence_interval">
<option value="" class="hide">MAINTENANCE INTERVALS</option>
<option *ngFor="let date of monthArray;let i = index;" [value]="i+1">{{i+1}}{{(i === 0)?' Month':' Months'}}</option>
</select>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
...@@ -339,7 +345,7 @@ ...@@ -339,7 +345,7 @@
<button id="custom_check_button"> <button id="custom_check_button">
<label> <label>
<input type="checkbox" name="services" [attr.id]="'issue_' + issue_data.issue_id + '_' + sub_issue_data.issue_cat_id" [attr.issue_id]="issue_data.issue_id" [attr.sub_issue_id]="sub_issue_data.issue_cat_id" (click)="setIssueSelected($event)"> <input type="checkbox" name="services" [attr.id]="'issue_' + issue_data.issue_id + '_' + sub_issue_data.issue_cat_id" [attr.issue_id]="issue_data.issue_id" [attr.sub_issue_id]="sub_issue_data.issue_cat_id" (click)="setIssueSelected($event)">
<p>{{sub_issue_data.issue_category}}</p> <p class="text_truncate">{{sub_issue_data.issue_category}}</p>
</label> </label>
</button> </button>
</li> </li>
...@@ -449,7 +455,15 @@ ...@@ -449,7 +455,15 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12 textCenter"> <div class="col-md-6">
<select *ngIf="(wizardData && wizardData.vechile_info && wizardData.vechile_info.maintanenceInterval)" (change)=get_newmaintanence_date($event)>
<option value="" class="hide">MAINTENANCE INTERVALS</option>
<option *ngFor="let date of monthArray;let i = index;" [attr.value]="i+1" [selected]="wizardData.vechile_info.maintanenceInterval == i+1">{{i+1}}{{(i === 0)?' Month':' Months'}}</option>
</select>
</div>
</div>
<div class="row">
<div class="col-md-12 textCenter">
<button *ngIf="!loginDetails" (click)="resetForm()" class="wizard_signin floatLeft" type="button" data-toggle="modal" data-target="#login">SIGN IN</button> <button *ngIf="!loginDetails" (click)="resetForm()" class="wizard_signin floatLeft" type="button" data-toggle="modal" data-target="#login">SIGN IN</button>
<button (click)="getQuote()" class="wizard_quotes floatRight" type="button" data-toggle="modal" data-target="#quotes">VIEW SERVICE QUOTE</button> <button (click)="getQuote()" class="wizard_quotes floatRight" type="button" data-toggle="modal" data-target="#quotes">VIEW SERVICE QUOTE</button>
<input type="hidden" #indexLoginModal data-toggle="modal" data-target="#login"> <input type="hidden" #indexLoginModal data-toggle="modal" data-target="#login">
......
src/app/home/index/index.component.ts
...@@ -58,6 +58,7 @@ export class IndexComponent implements OnInit { ...@@ -58,6 +58,7 @@ export class IndexComponent implements OnInit {
issuesData: any; issuesData: any;
defIssuesData: any[] = new Array(); defIssuesData: any[] = new Array();
selectedIssues: any[] = new Array(); selectedIssues: any[] = new Array();
monthArray: any[] = new Array(12);
public scrollbarOptions = { axis: 'y', theme: 'minimal-dark' }; public scrollbarOptions = { axis: 'y', theme: 'minimal-dark' };
...@@ -110,6 +111,7 @@ export class IndexComponent implements OnInit { ...@@ -110,6 +111,7 @@ export class IndexComponent implements OnInit {
this.vehicleDataForm = new FormGroup({ this.vehicleDataForm = new FormGroup({
trim: new FormControl(''), milage: new FormControl(''), emgine: new FormControl(''), trim: new FormControl(''), milage: new FormControl(''), emgine: new FormControl(''),
last_date: new FormControl(''), last_date: new FormControl(''),
maintanence_interval: new FormControl(''),
maker: new FormControl('', [Validators.required]), maker: new FormControl('', [Validators.required]),
modelYear: new FormControl('', [Validators.required]), modelYear: new FormControl('', [Validators.required]),
modelName: new FormControl('', [Validators.required]) modelName: new FormControl('', [Validators.required])
...@@ -194,9 +196,10 @@ export class IndexComponent implements OnInit { ...@@ -194,9 +196,10 @@ export class IndexComponent implements OnInit {
'lastMaintanceDate':(vehicleData['last_date'])?(formatDate(vehicleData['last_date'],'MM/dd/yyyy','en')):'', 'lastMaintanceDate':(vehicleData['last_date'])?(formatDate(vehicleData['last_date'],'MM/dd/yyyy','en')):'',
'maker':this.carSearchJsonData[vehicleData['maker']]['brand'], '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'],
'maintanenceInterval':vehicleData['maintanence_interval']
} }
console.log(this.wizardData['vechile_info'])
this.vehicleDataFormSubmit = false; this.vehicleDataFormSubmit = false;
} }
...@@ -281,6 +284,10 @@ export class IndexComponent implements OnInit { ...@@ -281,6 +284,10 @@ export class IndexComponent implements OnInit {
this.wizardData['vechile_info']['milage']=milage; this.wizardData['vechile_info']['milage']=milage;
} }
get_newmaintanence_date(newdate){
this.wizardData['vechile_info']['maintanenceInterval']=newdate.target.value;
}
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;
...@@ -348,7 +355,7 @@ export class IndexComponent implements OnInit { ...@@ -348,7 +355,7 @@ export class IndexComponent implements OnInit {
this.optionalDescription = ''; this.optionalDescription = '';
} }
getQuote(location){ getQuote(){
const thisObj = this; const thisObj = this;
this.loader = true; this.loader = true;
...@@ -356,7 +363,7 @@ export class IndexComponent implements OnInit { ...@@ -356,7 +363,7 @@ export class IndexComponent 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)
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/index.html
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
</head> </head>
<body> <body>
<app-root></app-root> <app-root></app-root>
<script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCaczDjLVYU1vZH0HXkbU5ugsUHoWNE2NM&libraries=places"></script> <script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAd3eUTU8Y3w0qemOuaRw1IXoACbeyjBJQ&libraries=places"></script>
</body> </body>
</html> </html>
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