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 31e65ab1b..bafec348b 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 @@ -39,7 +39,7 @@ - + @@ -48,24 +48,23 @@ - - + + Enter Valid Mobile Number. + + + Enter Valid Mobile Number. + --> - - +91 - Enter Valid STD Code Number. - - - - - Enter Valid LandLine Number. - + + Enter Valid STD Code Number. + - + + + Enter Valid LandLine Number. + @@ -206,13 +205,13 @@ - - +91 - Enter Valid STD Code Number. + + + Enter Valid STD Code Number.   -   - - Enter Valid LandLine Number. + + Enter Valid LandLine Number. 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 31892dc46..0b2e76ff2 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 @@ -71,7 +71,9 @@ export class AddPdComponent implements OnInit, OnDestroy { pd_branch_id: [null], lender_applicant_id: [null, Validators.compose([Validators.required])], lender_contact_person: [null, Validators.compose([Validators.required])], - lender_contact_mobile: [null, Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(12),Validators.required,Validators.pattern('^[0-9]*$')])], + lender_contact_mobile: [null, Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], + 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], fk_product_id: [null], fk_subproduct_id: [null], @@ -83,8 +85,6 @@ export class AddPdComponent implements OnInit, OnDestroy { mobile_no: [null,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])], // landline : [null,Validators.compose([Validators.minLength(12),Validators.maxLength(13)])], // email: [null], - 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]*$')])], applicant_stdcode:[null, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])], applicant_landline:[null, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])], company_name: [null], @@ -220,8 +220,8 @@ export class AddPdComponent implements OnInit, OnDestroy { } generateDocuments(): FormGroup { return this._fb.group({ - doc_name: [null, Validators.compose([Validators.required])], - documentFile : [null, Validators.compose([Validators.required])], + doc_name: [null],//Validators.compose([Validators.required]) + documentFile : [null],//, Validators.compose([Validators.required]) }); } @@ -385,14 +385,18 @@ export class AddPdComponent implements OnInit, OnDestroy { // common function for both draft and process pd submitPdDetails(formValue: any, status:string) { - //alert('Inside Function Submit Function'); + if(this._PDtriggerForm.invalid) { - this.validateAllFormFields(this._PDtriggerForm); - //alert('validationError'); - //console.log(this._PDtriggerForm); + this.validateAllFormFields(this._PDtriggerForm); + this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); return; } else { + if((formValue.lender_contact_mobile == '') || (formValue.lender_stdcode == '' && formValue.lender_landline == '')){ + this.notifier.notify('warning', 'Either Mobile or Landline Need.!'); + return; + } + else{ this.disableAfterSubmit=true; let pd_details:any={ "fk_lender_id":formValue.fk_lender_id, @@ -479,7 +483,7 @@ export class AddPdComponent implements OnInit, OnDestroy { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); }); } - + } } loadPdListCompoent(from:boolean) { if(from){ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts index c751b7d7e..bc278b693 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts @@ -134,10 +134,16 @@ export class EditPdApplicantComponent implements OnInit { get pdCoApplicant() { return this._EditApplicantForm.get('coApplicantItems') as FormArray; } updatePdApplicant(formValue: any) { if(this._EditApplicantForm.invalid) { - this.validateAllFormFields(this._EditApplicantForm) + this.validateAllFormFields(this._EditApplicantForm); + this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); return; } else { + if((formValue.mobile_no == '') || (formValue.stdcode == '' && formValue.landline == '')){ + this.notifier.notify('warning', 'Either Mobile or Landline Need.!'); + return; + } + else{ let pd_applicant_details : any=[{ "fk_pd_id": this.data.pdID, "pd_co_applicant_id": formValue.fk_applicant_primary_id, @@ -195,7 +201,7 @@ export class EditPdApplicantComponent implements OnInit { // }, error => { // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); // }); - } + }} } // get relation master details 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 d0492e4af..544a5fbe7 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 @@ -36,8 +36,8 @@ - - + + Enter Valid Mobile Number. @@ -45,10 +45,10 @@ Enter Valid STD Code.  -  - + Enter Valid Landline Number. - + 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 f12954806..d0efd9207 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 @@ -112,6 +112,7 @@ export class EditPdMasterComponent implements OnInit { } loadFormData() { + console.log('this.data.record',this.data.records); let stdcode; let landline; if(this.data.records.pd_contact_landline){ @@ -130,7 +131,7 @@ export class EditPdMasterComponent implements OnInit { fk_lender_id: [this.data.records.fk_lender_id, Validators.compose([Validators.required])], lender_applicant_id: [this.data.records.lender_applicant_id, Validators.compose([Validators.required])], pd_contact_person: [this.data.records.pd_contact_person, Validators.compose([Validators.required])], - pd_contact_mobileno: [this.data.records.pd_contact_mobileno, Validators.compose([Validators.required,Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], + pd_contact_mobileno: [this.data.records.pd_contact_mobileno, Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])], lender_stdcode: [stdcode, Validators.compose([Validators.minLength(3),Validators.maxLength(5)])], lender_landline: [landline,Validators.compose([Validators.minLength(6),Validators.maxLength(8)])], fk_product_id: [this.data.records.fk_product_id], @@ -245,20 +246,24 @@ export class EditPdMasterComponent implements OnInit { submitPdDetails(formValue: any, status:string) { let updateStatus = this.currentPDStatus == this.pdStatusCheck.DRAFT ? status : this.currentPDStatus == this.pdStatusCheck.TRIGGERED ? status : this.currentPDStatus; if(this._EditPDtriggerForm.invalid) { - this.validateAllFormFields(this._EditPDtriggerForm) + this.validateAllFormFields(this._EditPDtriggerForm); + this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); return; } else{ let my_array = this._EditPDtriggerForm.value; - + if((my_array.pd_contact_mobileno == '') || (my_array.lender_stdcode == '' && my_array.lender_landline == '')){ + this.notifier.notify('warning', 'Either Mobile or Landline Need.!'); + return; + } + else{ let concat_landline - if(my_array.lender_stdcode != null && my_array.lender_landline != null){ if(my_array.lender_stdcode == '' && my_array.lender_landline == ''){ concat_landline = null; }else{ let std = my_array.lender_stdcode == '' ? '' : my_array.lender_stdcode; - let landline = my_array.lender_landerline == '' ? '' : my_array.lender_landerline; + let landline = my_array.lender_landline == '' ? '' : my_array.lender_landline; concat_landline = std+'-'+landline; } }else if(my_array.lender_stdcode == '' && my_array.lender_landerline == ''){ @@ -273,7 +278,7 @@ export class EditPdMasterComponent implements OnInit { "lender_applicant_id": my_array.lender_applicant_id, "pd_contact_person": my_array.pd_contact_person, "pd_contact_mobileno": my_array.pd_contact_mobileno, - "pd_Contant_landline": concat_landline, + "pd_contact_landline": concat_landline, "fk_product_id": my_array.fk_product_id, "fk_subproduct_id": my_array.fk_subproduct_id, "fk_pd_type": my_array.fk_pd_type, @@ -299,6 +304,7 @@ export class EditPdMasterComponent implements OnInit { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); });//error closed }//else closed + } } /** To Reset Popup Data */ onReset() { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts index e20af726d..a925059e1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts @@ -88,6 +88,7 @@ export class AddressComponent implements OnInit { private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService, + private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.pdid = this.pd_all_details.pdmaster_details.pd_id; @@ -378,6 +379,7 @@ export class AddressComponent implements OnInit { this._pd.saveForm(records).subscribe(data => { this.notifier.notify('success', 'Saved Successfully.'); + this.dialogRef.close(); }, error => { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); }); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts index a0a15ba4d..5fd1a0254 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts @@ -84,7 +84,7 @@ export class BankingDetailsComponent implements OnInit { this.initBankingForm(); this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ if(data.dataStatus){ - this.existCompanyList = data.records.filter(val =>val.is_active); + this.existCompanyList = data.records.filter(val =>val.is_active===true && val.is_company_applicant===true); } let modifyCompanyList : any=[]; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts index 7a8abf7f9..832bc7286 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts @@ -88,7 +88,7 @@ export class CurrentLoanComponent implements OnInit { this.initCurrentloanForm(); this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ if(data.dataStatus){ - this.existCompanyList = data.records.filter(val =>val.is_active); + this.existCompanyList = data.records.filter(val =>val.is_active===true && val.is_company_applicant===true); } let modifyCompanyList : any=[]; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 9c43301da..d28b5bf94 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -15,12 +15,12 @@ {{master.lender_applicant_id}}
{{master.pd_date_of_initiation}}

-    - +
{{master.pd_allocated_to | titlecase}} {{master.executive_name | titlecase}}/{{master.centralofficer | titlecase}} @@ -40,16 +40,17 @@
-
-
-
- + +
+
+ + - -
-
+ + +
@@ -166,8 +167,8 @@  {{applicant.landline}} - ( Main Applicant ) - ( {{applicant.relation_name}} ) + ( Main Applicant ) + {{applicant.relation_name}}

diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index a806cfe68..a5182125c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -46,6 +46,8 @@ export class ViewPdComponent implements OnInit, OnDestroy { "QC_COMPLETED" :'QC_COMPLETED', }; + mandatoryFieldsValidations: any=[]; + // @Input() childData: string; // @Output() loadParent = new EventEmitter(); public _EditPDtriggerForm:FormGroup; @@ -70,8 +72,10 @@ export class ViewPdComponent implements OnInit, OnDestroy { this._pd.editPdDetails(editID).subscribe( data => { if (data.status == 200) { - this.pdMasterData=data.records.pd_master_details; - this.pd_QC_Rating = Number(this.pdMasterData[0].qc_rating); + let masterData: any = data.records.pd_master_details; + this.pdMasterData.push(masterData[0]); + this.mandatoryFieldsValidations = masterData[1].mandatory_fields; + this.pd_QC_Rating = Number(this.pdMasterData.qc_rating); this.pdApplicantData= data.records.applicants_details; this.pdDocumentsData=data.records.pd_documnets; this.masterPdLogsData=data.records.pd_logs.master; @@ -228,6 +232,30 @@ export class ViewPdComponent implements OnInit, OnDestroy { this.router.navigate([ '../../pdRecord',pdID], { relativeTo: this.route }); } + // direct trigger the pd + directTriggerPD(data: any,pdid:string){ + if(data.length>0){ + this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); + } + else { + let lenderMasterArray = { + "pd_id": pdid, + } + this._pd.editPdMasterDetails(lenderMasterArray, this.pdStatusCheck.TRIGGERED).subscribe(result => { + if (result.status == 200) { + this.notifier.notify('success', 'PD Status Updated.'); + this.viewPdDetails(this.viewID); + } + else { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + }//else + }, error => { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + });//error closed + } + + } + // updateViewComponent(editBack:string) { // if(editBack=='1'){