diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html index af1a7371b..4f31a551d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html @@ -6,7 +6,7 @@
-
+ @@ -157,7 +157,9 @@ - Select + + + {{SL.name}} @@ -168,7 +170,9 @@ - Select + + + {{CL.city_name}} @@ -178,7 +182,9 @@ - Select + + + {{PL.pincode}} @@ -380,6 +386,31 @@ + + + + + + {{ opt.score_option_name }} + + + + + + + + + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts index f2e489e0b..4b80b608a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts @@ -9,6 +9,8 @@ import { AwsService } from '../../../../AwsService/aws.service'; import { TitleCasePipe } from '@angular/common'; /**sweet alert */ import Swal from 'sweetalert2'; +import { takeUntil } from 'rxjs/operators'; +import { Subject } from 'rxjs'; @Component({ selector: 'app-add-pd', templateUrl: './add-pd.component.html', @@ -26,6 +28,8 @@ export class AddPdComponent implements OnInit, OnDestroy { private notifier: NotifierService; public _PDtriggerForm: FormGroup; + protected _onDestroy = new Subject(); + addresses: FormArray; coapplicants: FormArray; addtional_requirements: FormArray; @@ -56,6 +60,9 @@ export class AddPdComponent implements OnInit, OnDestroy { sales_and_credit_enable:boolean=false; finInstitutionList: any; selected_cus_abbr: any; + pincodeData:any=[]; + cityData: any=[]; + stateData: any=[]; constructor(notifier: NotifierService, private _fb: FormBuilder, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService, private _aws: AwsService, private ListPdComponent: ListPdComponent, private titleCase : TitleCasePipe) { @@ -65,6 +72,7 @@ export class AddPdComponent implements OnInit, OnDestroy { public totalfiles: Array = []; public totalFileName = []; public lengthCheckToaddMore = 0; + public scoreCardOptions: any = [{'score_option_name':'Yes','score_option_value':'1'},{'score_option_name':'No','score_option_value':'0'}]; ngOnInit() { this.draftStatus = "DRAFT"; this.PDTriggerStatus = "TRIGGERED"; @@ -114,6 +122,7 @@ export class AddPdComponent implements OnInit, OnDestroy { // lender_stdcode: [null, Validators.compose([Validators.minLength(3), Validators.maxLength(5), Validators.pattern('^[0-9]*$')])], // lender_landline: [null, Validators.compose([Validators.minLength(6), Validators.maxLength(8), Validators.pattern('^[0-9]*$')])], //lender_billing: [null], + is_notify_enabled:[null], fk_product_id: [null], fk_subproduct_id: [null], fk_pd_type: [null], @@ -219,6 +228,7 @@ export class AddPdComponent implements OnInit, OnDestroy { data => { if (data.status == 200) { this.stateList = data.records.filter(item => item.isactive == 1); + this.stateData = this.stateList; } }); } @@ -292,6 +302,8 @@ export class AddPdComponent implements OnInit, OnDestroy { if (data.status == 200) { this.cityList[index] = data.records.cities; this.pincodeList[index] = data.records.pincode; + this.cityData = this.cityList; + this.pincodeData = this.pincodeList; } }); } @@ -387,6 +399,9 @@ export class AddPdComponent implements OnInit, OnDestroy { addressline1: [null], fk_city: [null], fk_state: [null], + stateSearch:[''], + citySearch:[''], + pinSearch:[''], pincode: [null],/** ,Validators.compose([Validators.minLength(6),Validators.maxLength(6)]) */ other_pincode: [null, Validators.compose([Validators.minLength(6), Validators.maxLength(6)])], }); @@ -654,6 +669,7 @@ export class AddPdComponent implements OnInit, OnDestroy { "fk_product_id": formValue.fk_product_id, "fk_subproduct_id": formValue.fk_product_id != 4 ? formValue.fk_subproduct_id != '' || formValue.fk_subproduct_id != 0 ? formValue.fk_subproduct_id : null : null, "fk_pd_type": formValue.fk_pd_type, + "is_notify_enabled":formValue.is_notify_enabled, "fk_customer_segment": formValue.fk_customer_segment, "loan_amount": formValue.loan_amount, "addressline1": !formValue.addresses[0].addressline1 ? null : this.titleCase.transform(formValue.addresses[0].addressline1), @@ -906,5 +922,86 @@ checkExistPd(value){ } }) } +searchFun(control:any,i:number,option){ + console.log("control",control) + if (option == 'city') { + // this.cityData[i]=this.filterCity(this.stateList,control.value.state_name) + control.controls['citySearch'].valueChanges + .pipe(takeUntil(this._onDestroy)) + .subscribe(() => { + this.SearchCity(control.controls['citySearch'].value, i); + }) + } + if (option == 'state') { + console.log("state") + control.controls['stateSearch'].valueChanges + .pipe(takeUntil(this._onDestroy)) + .subscribe(()=>{ + this.searchState(control.controls['stateSearch'].value) + }) + } + if (option == 'pin') { + console.log("pin") + control.controls['pinSearch'].valueChanges + .pipe(takeUntil(this._onDestroy)) + .subscribe(()=>{ + this.searchPin(control.controls['pinSearch'].value,i) + }) + } + } + searchPin(val:any,index:number){ + if(!this.pincodeData[index]){ + return + } + let searchValue=val + if(!searchValue){ + this.pincodeList[index]=this.pincodeData[index].slice() + return + }else{ + searchValue=searchValue.toLowerCase() + } + this.pincodeList[index]=this.pincodeData[index].filter(value=>value.pincode.toLowerCase().indexOf(searchValue) > -1) + } + SearchCity(val: any, i: number) { + // let cityData= + console.log(this.cityData[i]) + if (!this.cityData[i]) { + return + } + let searchValue = val + if (!searchValue) { + this.cityList[i]=this.cityData[i].slice() + return + } else { + searchValue = searchValue.toLowerCase() + } + this.cityList[i]= + this.cityData[i].filter(val=>val.city_name.toLowerCase().indexOf(searchValue)> -1) + + console.log("City Data value",this.cityList[i]) + // this.filteredCity.next( + // this.cityData[i].filter(value => value.city_name.toLowerCase().indexOf(searchValue) > -1) + // ) + + } + searchState(val: any) { + console.log("statedata") + if (!this.stateData) { + return + } + let searchVal = val + if (!searchVal) { + // this.filteredState.next(this.stateList.slice()) + this.stateList=this.stateData.slice() + return + } + else { + searchVal = searchVal.toLowerCase() + } + this.stateList=this.stateData.filter(res => res.name.toLowerCase().indexOf(searchVal) > -1) + // this.filteredState.next( + // this.stateList.filter(res => res.state_name.toLowerCase().indexOf(searchVal) > -1) + // ) + } } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html index 02a4c8c48..90ecf5d1a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html @@ -182,7 +182,9 @@ - Select + + + {{SL.name}} @@ -192,7 +194,9 @@ - Select + + + {{CL.city_name}} @@ -203,7 +207,9 @@ - Select + + + {{PL.pincode}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index 6f6851050..138eddb06 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts @@ -7,6 +7,8 @@ import { PdTrigerService } from '../../../pd-service/pd-triger.service'; import { TitleCasePipe } from '@angular/common'; import { getRandomString } from 'selenium-webdriver/safari'; import Swal from 'sweetalert2' +import { takeUntil } from 'rxjs/operators'; +import { Subject } from 'rxjs'; @Component({ selector: 'app-edit-pd-master', @@ -32,7 +34,10 @@ export class EditPdMasterComponent implements OnInit { lenderBranchList: any; pincodeList: any = []; addressesList : any = []; - addressesDeactivited : any = []; + addressesDeactivited : any = []; + pincodeData:any=[]; + cityData: any=[]; + stateData: any=[]; applicantLength:number; // draftStatus: string; // PDTriggerStatus: string; @@ -47,6 +52,9 @@ export class EditPdMasterComponent implements OnInit { addresses: FormArray; public masterRandomString : string; + protected _onDestroy = new Subject(); + + // create values for status check pdStatusCheck :any={ @@ -268,6 +276,7 @@ if(!option){ data => { if (data.status == 200) { this.stateList = data.records.filter(item => item.isactive == 1); + this.stateData = this.stateList; } }); } @@ -423,6 +432,8 @@ if(!option){ this.cityList[i] = data.records.cities; this.pincodeList[i] = data.records.pincode; + this.cityData[i] = this.cityList[i]; + this.pincodeData[i] = this.pincodeList[i]; } }); } @@ -436,6 +447,9 @@ if(!option){ addressline1: [null], fk_city: [null], fk_state: [null], + stateSearch:[''], + citySearch:[''], + pinSearch:[''], pincode: [null],/** ,Validators.compose([Validators.minLength(6),Validators.maxLength(6)]) */ other_pincode: [null, Validators.compose([Validators.minLength(6), Validators.maxLength(6)])], isactive:[1], @@ -448,6 +462,9 @@ if(!option){   addressline1: [data.addressline1 != null ? this.titleCase.transform(data.addressline1) : null], fk_city: [data.fk_city], fk_state: [data.fk_state], + stateSearch:[''], + citySearch:[''], + pinSearch:[''],   pincode : [data.pincode], other_pincode:[data.other_pincode,Validators.compose([Validators.minLength(6),Validators.maxLength(6),Validators.pattern('^[0-9]*$')])], isactive:[data.isactive], @@ -835,4 +852,86 @@ checkExistPd(value){ } }) } + +searchFun(control:any,i:number,option){ + console.log("control",control) + if (option == 'city') { + // this.cityData[i]=this.filterCity(this.stateList,control.value.state_name) + control.controls['citySearch'].valueChanges + .pipe(takeUntil(this._onDestroy)) + .subscribe(() => { + this.SearchCity(control.controls['citySearch'].value, i); + }) + } + if (option == 'state') { + console.log("state") + control.controls['stateSearch'].valueChanges + .pipe(takeUntil(this._onDestroy)) + .subscribe(()=>{ + this.searchState(control.controls['stateSearch'].value) + }) + } + if (option == 'pin') { + console.log("pin") + control.controls['pinSearch'].valueChanges + .pipe(takeUntil(this._onDestroy)) + .subscribe(()=>{ + this.searchPin(control.controls['pinSearch'].value,i) + }) + } + } + searchPin(val:any,index:number){ + if(!this.pincodeData[index]){ + return + } + let searchValue=val + if(!searchValue){ + this.pincodeList[index]=this.pincodeData[index].slice() + return + }else{ + searchValue=searchValue.toLowerCase() + } + this.pincodeList[index]=this.pincodeData[index].filter(value=>value.pincode.toLowerCase().indexOf(searchValue) > -1) + } + SearchCity(val: any, i: number) { + // let cityData= + console.log(this.cityData[i]) + if (!this.cityData[i]) { + return + } + let searchValue = val + if (!searchValue) { + this.cityList[i]=this.cityData[i].slice() + return + } else { + searchValue = searchValue.toLowerCase() + } + this.cityList[i]= + this.cityData[i].filter(val=>val.city_name.toLowerCase().indexOf(searchValue)> -1) + + console.log("City Data value",this.cityList[i]) + // this.filteredCity.next( + // this.cityData[i].filter(value => value.city_name.toLowerCase().indexOf(searchValue) > -1) + // ) + + } + searchState(val: any) { + console.log("statedata") + if (!this.stateData) { + return + } + let searchVal = val + if (!searchVal) { + // this.filteredState.next(this.stateList.slice()) + this.stateList=this.stateData.slice() + return + } + else { + searchVal = searchVal.toLowerCase() + } + this.stateList=this.stateData.filter(res => res.name.toLowerCase().indexOf(searchVal) > -1) + // this.filteredState.next( + // this.stateList.filter(res => res.state_name.toLowerCase().indexOf(searchVal) > -1) + // ) + } } diff --git a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html index 00c6172c9..4114256b1 100755 --- a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html +++ b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.html @@ -44,6 +44,27 @@ Field Required. + + + {{ opt.score_option_name }} + + Field Required. + + + + + {{ opt.score_option_name }} + + Field Required. + + + + + {{ opt.score_option_name }} + + Field Required. + +
diff --git a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts index 2d8b0a304..a6dafb15e 100755 --- a/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts +++ b/ng6-seed/src/app/settings/entity/entity-add/entity.add.component.ts @@ -71,8 +71,11 @@ export class EntityAddComponent implements OnInit { fk_entity_type_id: [null, Validators.compose([Validators.required])], full_name: [null, Validators.compose([Validators.required])], short_name: [null, Validators.compose([Validators.required])], - is_score_card_enabled: [null, Validators.compose([Validators.required])], + is_score_card_enabled: [null, Validators.compose([Validators.required])], is_otp_enabled: [null, Validators.compose([Validators.required])], + is_sms_enabled: [null, Validators.compose([Validators.required])], + is_mail_enabled: [null, Validators.compose([Validators.required])], + is_app_notify_enabled: [null, Validators.compose([Validators.required])], remarks: [null], isactive: [1] }); diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html index ac8cd8dd3..053fa6ae3 100755 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.html @@ -198,32 +198,57 @@ You must Include Entity Full Name.
-
+
You must Include Entity Short Name.
-
+
{{ opt.score_option_name }} Field Required. -
-
+
+
+
+
{{ opt.score_option_name }} Field Required. -
- - +
+
+ + + {{ opt.score_option_name }} + + Field Required. + +
+
+ + + {{ opt.score_option_name }} + + Field Required. + +
+
+ + + {{ opt.score_option_name }} + + Field Required. + +
+
diff --git a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts index 003e5df90..bb01a5692 100755 --- a/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts +++ b/ng6-seed/src/app/settings/entity/entity-edit/entity.edit.component.ts @@ -100,6 +100,9 @@ export class EntityEditComponent implements OnInit, OnDestroy { short_name: [this.entityNameRecord.short_name, Validators.compose([Validators.required]) ], is_score_card_enabled:[this.entityNameRecord.is_score_card_enabled || '',Validators.compose([Validators.required])], is_otp_enabled:[this.entityNameRecord.is_otp_enabled || '',Validators.compose([Validators.required])], + is_sms_enabled:[this.entityNameRecord.is_sms_enabled || '',Validators.compose([Validators.required])], + is_mail_enabled:[this.entityNameRecord.is_mail_enabled || '',Validators.compose([Validators.required])], + is_app_notify_enabled:[this.entityNameRecord.is_app_notify_enabled || '',Validators.compose([Validators.required])], // entity_name: [this.entityNameRecord.entity_name], fk_entity_type_id: [this.entityNameRecord.fk_entity_type_id], isactive: [this.entityNameRecord.isactive]