issues fixes : ps

This commit is contained in:
venbatechnologies@gmail.com 2019-05-02 13:13:55 +05:30
parent 2af1e7ba81
commit 628dc61800
6 changed files with 35 additions and 6 deletions

View File

@ -17,6 +17,18 @@
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:38%" appearance="outline">
<mat-label>Applicant</mat-label>
<mat-select placeholder="" formControlName="pd_co_applicant_id" required>
<mat-option *ngFor="let appt of applicantList" [value]="appt.pd_co_applicant_id">
{{appt.applicant_name | titlecase}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width:38%" appearance="outline">
<mat-label>Applicant Mobile Number</mat-label>
<input matInput placeholder="" formControlName="mobile_no" type="text" maxlength="10" ForMobileNumbers required>
</mat-form-field>
</mat-dialog-content> </mat-dialog-content>
<mat-dialog-actions> <mat-dialog-actions>
<div fxFlex="80" align="left"> <div fxFlex="80" align="left">

View File

@ -14,9 +14,12 @@ export class InitiateAdditionalPdComponent implements OnInit {
private notifier: NotifierService; private notifier: NotifierService;
additionalPDForm:FormGroup; additionalPDForm:FormGroup;
customerSegmentList: any=[]; customerSegmentList: any=[];
applicantList: any =[];
constructor(notifier: NotifierService,private _fb: FormBuilder, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef<InitiateAdditionalPdComponent>) { constructor(notifier: NotifierService,private _fb: FormBuilder, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef<InitiateAdditionalPdComponent>) {
this.notifier = notifier; this.notifier = notifier;
this.pageTitle="Choose customer segment For this PD address" this.pageTitle="Choose customer segment For this PD address"
this.applicantList = this.data.applicants_details;
this.applicantList = this.applicantList.filter(appt => appt.applicant_type != 2);
} }
ngOnInit() { ngOnInit() {
@ -29,12 +32,22 @@ export class InitiateAdditionalPdComponent implements OnInit {
}); });
this.data.type===false ? this.additionalPDForm.controls['fk_customer_segment'].disable():this.additionalPDForm.controls['fk_customer_segment'].enable(); this.data.type===false ? this.additionalPDForm.controls['fk_customer_segment'].disable():this.additionalPDForm.controls['fk_customer_segment'].enable();
if(this.data.applicant_id){ this.additionalPDForm.controls['pd_co_applicant_id'].setValue(this.data.applicant_id);
// this.additionalPDForm.controls['pd_co_applicant_id'].disable();
}
// else { this.additionalPDForm.controls['pd_co_applicant_id'].enable(); }
let mobile = this.applicantList.filter(val=>val.pd_co_applicant_id == this.data.applicant_id).map(val=>val.mobile_no)[0]
if(mobile != '' && mobile != null){ this.additionalPDForm.controls['mobile_no'].setValue(mobile); }
} }
initForm(){ initForm(){
return this.additionalPDForm = this._fb.group({ return this.additionalPDForm = this._fb.group({
pd_id:[this.data.type===false ? this.data.pd_id : ''], pd_id:[this.data.type===false ? this.data.pd_id : ''],
parent_pd_id: [this.data.type===true ? this.data.pd_id : ''], parent_pd_id: [this.data.type===true ? this.data.pd_id : ''],
fk_customer_segment: [this.data.type===false ? this.data.fk_customer_segment :'',Validators.required], fk_customer_segment: [this.data.type===false ? this.data.fk_customer_segment :'',Validators.required],
pd_co_applicant_id:[this.data.type===false ? '' : '',Validators.required],
mobile_no:[this.data.type===false ? '' : '',Validators.required],
fk_address_id:[this.data.pd_address_id,Validators.required], fk_address_id:[this.data.pd_address_id,Validators.required],
pd_status:[this.data.pd_status,Validators.required], pd_status:[this.data.pd_status,Validators.required],
}); });
@ -48,10 +61,10 @@ submitDetails(values: any) {
} }
let update_details: any; let update_details: any;
if(this.data.type){ if(this.data.type){
update_details= {"pd_id":values.pd_id,"parent_pd_id":values.parent_pd_id,"fk_customer_segment":values.fk_customer_segment , "fk_address_id":values.fk_address_id,"pd_status":"TRIGGERED"}; update_details= {"pd_id":values.pd_id,"parent_pd_id":values.parent_pd_id,"fk_customer_segment":values.fk_customer_segment , "fk_address_id":values.fk_address_id,"pd_status":"TRIGGERED","pd_co_applicant_id":values.pd_co_applicant_id,"mobile_no":values.mobile_no};
} }
else{ else{
update_details={"pd_id":values.pd_id,"parent_pd_id":values.parent_pd_id,"fk_customer_segment":values.fk_customer_segment , "fk_primary_address_id":values.fk_address_id}; update_details={"pd_id":values.pd_id,"parent_pd_id":values.parent_pd_id,"fk_customer_segment":values.fk_customer_segment , "fk_primary_address_id":values.fk_address_id,"pd_co_applicant_id":values.pd_co_applicant_id,"mobile_no":values.mobile_no};
} }
this._pd.initiateAddressPdProcess(update_details).subscribe(data => { this._pd.initiateAddressPdProcess(update_details).subscribe(data => {
@ -61,6 +74,7 @@ submitDetails(values: any) {
},3000); },3000);
}, error => { }, error => {
this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
// alert(error);
}); });
} }
// validate all form group and form array fields // validate all form group and form array fields

View File

@ -182,7 +182,7 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<input matInput placeholder="Contact Person Name" formControlName="trade_product_contact_person_name" <input matInput placeholder="Contact Person Name" formControlName="trade_product_contact_person_name"
maxlength="10" [value]="items.get('trade_product_contact_person_name').value | titlecase"> [value]="items.get('trade_product_contact_person_name').value | titlecase">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 35%"> <mat-form-field style="width: 35%">
<mat-select placeholder="Contact Person Designation" formControlName="person_designation" <mat-select placeholder="Contact Person Designation" formControlName="person_designation"

View File

@ -30,7 +30,7 @@
</div> </div>
</mat-card-content> </mat-card-content>
<mat-card-actions align="end"> <mat-card-actions align="end">
<button matTooltip="Complete Question" matTooltipPosition="above" [disabled]="actualQuestions==0 || actualQuestions!=answeredQuestions || currentPDStatus===false" mat-raised-button color="primary" (click)="pdStatusDialogue(pdStatusCheck.COMPLETED,2);"><span>{{currentPDStatus === true ? 'COMPLETE':'COMPLETED' }}</span></button> <button matTooltip="Complete Discussion" matTooltipPosition="above" [disabled]="actualQuestions==0 || actualQuestions!=answeredQuestions || currentPDStatus===false" mat-raised-button color="primary" (click)="pdStatusDialogue(pdStatusCheck.COMPLETED,2);"><span>{{currentPDStatus === true ? 'COMPLETE':'COMPLETED' }}</span></button>
</mat-card-actions> </mat-card-actions>
</mat-card> </mat-card>
<notifier-container></notifier-container> <notifier-container></notifier-container>

View File

@ -428,8 +428,11 @@ export class ViewPdComponent implements OnInit, OnDestroy {
// this is for initiate additional pd // this is for initiate additional pd
initiateAddtionalPD(parentData: any, childData: any, type: boolean){ initiateAddtionalPD(parentData: any, childData: any, type: boolean){
let masterApplicantID = ''
if(parentData.main_applicant){
masterApplicantID = this.pdApplicantData.filter(appt => appt.applicant_name == parentData.main_applicant)[0].pd_co_applicant_id;}
const dialogRef = this.dialog.open(InitiateAdditionalPdComponent, { const dialogRef = this.dialog.open(InitiateAdditionalPdComponent, {
data: { "type":type,"pd_id":parentData.pd_id,"fk_customer_segment":parentData.fk_customer_segment, "pd_status":parentData.pd_status, "pd_address_id": childData.pd_address_id}, data: { "type":type,"pd_id":parentData.pd_id,"fk_customer_segment":parentData.fk_customer_segment, "pd_status":parentData.pd_status, "pd_address_id": childData.pd_address_id,"applicant_id":masterApplicantID,"applicants_details":this.pdApplicantData},
disableClose: true, disableClose: true,
// position: { right: '0' }, // position: { right: '0' },
minWidth: '40%', minWidth: '40%',

View File

@ -25,5 +25,5 @@ export const environment = {
s3_endpoint: '', s3_endpoint: '',
accessToken:'', accessToken:'',
//apiUrl:'http://localhost/sparqapi/api/' //apiUrl:'http://localhost/sparqapi/api/'
apiEndpoint: 'https://ssa.sineedge.com/sparqtest/api/' apiEndpoint: 'https://ssa.sineedge.com/sparqapi/api/'
}; };