From 2f9042c9c936b6c3fe2bdafae0cfec18f232ce70 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 12 Jan 2019 00:51:26 +0530 Subject: [PATCH] trigger : ps --- .../list-pd/add-pd/add-pd.component.html | 13 +++++----- .../list-pd/add-pd/add-pd.component.ts | 24 +++++++++++-------- .../edit-pd-applicant.component.ts | 10 ++++++-- .../edit-pd-master.component.ts | 11 ++++++--- .../list-pd/view-pd/view-pd.component.html | 13 +++++----- .../list-pd/view-pd/view-pd.component.ts | 7 +++++- 6 files changed, 49 insertions(+), 29 deletions(-) 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 0fed20539..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,15 +48,14 @@ - + Enter Valid Mobile Number. + + Enter Valid Mobile Number. + --> @@ -207,7 +206,7 @@ - +91 + Enter Valid STD Code 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.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index f12954806..b8242a4e2 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 @@ -245,14 +245,18 @@ 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_person == '') || (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; @@ -299,6 +303,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/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..6f2358bfc 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 @@ -40,16 +40,17 @@
-
-
-
+ +
+
+
- -
-
+
+ +
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..35ecf7c2d 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 @@ -70,7 +70,12 @@ export class ViewPdComponent implements OnInit, OnDestroy { this._pd.editPdDetails(editID).subscribe( data => { if (data.status == 200) { - this.pdMasterData=data.records.pd_master_details; + this.pdMasterData = data.records.pd_master_details; + this.pdMasterData = Object.keys(data.records.pd_master_details).map(function (key) + { + return data.records.pd_master_details[key]; + }); + // console.log(this.pdMasterData); this.pd_QC_Rating = Number(this.pdMasterData[0].qc_rating); this.pdApplicantData= data.records.applicants_details; this.pdDocumentsData=data.records.pd_documnets;