diff --git a/ng6-seed/PDgenie_Web_Test(21-01-2021).zip b/ng6-seed/PDgenie_Web_Test(21-01-2021).zip deleted file mode 100644 index 194d25356..000000000 Binary files a/ng6-seed/PDgenie_Web_Test(21-01-2021).zip and /dev/null differ diff --git a/ng6-seed/PDgenie_Web_Test(25-01-2021).zip b/ng6-seed/PDgenie_Web_Test(25-01-2021).zip deleted file mode 100644 index c2e462b42..000000000 Binary files a/ng6-seed/PDgenie_Web_Test(25-01-2021).zip and /dev/null differ diff --git a/ng6-seed/package.json b/ng6-seed/package.json index 432f51afb..c566ba316 100755 --- a/ng6-seed/package.json +++ b/ng6-seed/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "license": "MIT", "scripts": { - "production": "node --max_old_space_size=8192 node_modules/@angular/cli/bin/ng build --prod ", + "production": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --prod ", "staging": "node --max_old_space_size=6144 node_modules/@angular/cli/bin/ng build --configuration=staging", "ng": "ng", "start": "ng serve", 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 8b903d9ff..dde6568df 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 @@ -54,7 +54,8 @@ - + {{lenderShortName == 'CFPL' ? 'Facility' :'Loan'}} Application ID + @@ -158,9 +159,10 @@ - + {{lenderShortName == 'CFPL' ? 'Facility' :'Loan'}} Amount * + {{"₹"}} {{pdMain.loan_amount.value | numberToWords}} Only - + Required. Enter valid amount. 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 9c803f68d..a639a5362 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 @@ -165,7 +165,7 @@ export class AddPdComponent implements OnInit, OnDestroy { fk_subproduct_id: [null], fk_pd_type: [null], fk_customer_segment: [null], - loan_amount: [null, Validators.compose([Validators.pattern('^[0-9]*$')])], + loan_amount: [null, Validators.compose([Validators.required,Validators.pattern('^[0-9]*$')])], applicant_title_name: [''], applicant_name: [null,Validators.compose([Validators.required])], mobile_no: [null, Validators.compose([Validators.maxLength(10), Validators.minLength(10)])], @@ -236,6 +236,16 @@ export class AddPdComponent implements OnInit, OnDestroy { } this._PDtriggerForm.controls['sub_entity_id'].setValue(lender.entity_id) + if(lender.short_name == 'CFPL'){ + this._PDtriggerForm.controls['loan_amount'].clearValidators(); + this._PDtriggerForm.controls['loan_amount'].setValidators([Validators.pattern('^[0-9]*$')]) + this._PDtriggerForm.controls['loan_amount'].updateValueAndValidity(); + } + else{ + this._PDtriggerForm.controls['loan_amount'].setValidators([Validators.required,Validators.pattern('^[0-9]*$')]); + this._PDtriggerForm.controls['loan_amount'].updateValueAndValidity(); + } + // if(this.lenderShortName == "IIB"){ //FOR INDUSLAND BANK // // console.log("entered"); // this._PDtriggerForm.controls['fk_product_id'].setValue("3") @@ -577,9 +587,11 @@ export class AddPdComponent implements OnInit, OnDestroy { this._PDtriggerForm.controls['fk_customer_segment'].setValidators([Validators.required]); this._PDtriggerForm.controls['fk_customer_segment'].updateValueAndValidity(); - + + if(this.lenderShortName != 'CFPL') { this._PDtriggerForm.controls['loan_amount'].setValidators([Validators.required]); this._PDtriggerForm.controls['loan_amount'].updateValueAndValidity(); + } } @@ -997,7 +1009,7 @@ checkExistPd(value,option){ switch(option){ case 1: param={lender_applicant_id:value} - name= "Loan Application Id" + name= this.lenderShortName == 'CFPL' ? 'Facility' : 'Loan' +" Application Id" swal_text="The Entered "+name+" ("+value+") is already exists on the Case No. " break; case 2: diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/duplicate-pd/duplicate-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/duplicate-pd/duplicate-pd.component.html index 31e334756..44c7c670b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/duplicate-pd/duplicate-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/duplicate-pd/duplicate-pd.component.html @@ -12,7 +12,8 @@
- + New {{data.lender_short_name == 'CFPL' ? 'Facility' :'Loan'}} Application ID + Lender Applicant ID.
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 22220d88d..50914e55e 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 @@ -67,7 +67,8 @@ - {{lenderShortName == 'CFPL' ? 'Facility' :'Loan'}} Application ID + @@ -174,8 +175,9 @@ - {{lenderShortName == 'CFPL' ? 'Facility' :'Loan'}} Amount * + {{"₹"}} {{pdMain.loan_amount.value | numberToWords}} Only 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 07d7f0727..33fa85018 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 @@ -255,6 +255,15 @@ if(!option){ // this._EditPDtriggerForm.controls['fk_product_id'].setValue("3") // this._EditPDtriggerForm.controls['fk_pd_type'].setValue("1"); this.getSubproductList("3",2) + } + if(lender.short_name == 'CFPL'){ + this._EditPDtriggerForm.controls['loan_amount'].clearValidators(); + this._EditPDtriggerForm.controls['loan_amount'].setValidators([Validators.pattern('^[0-9]*$')]) + this._EditPDtriggerForm.controls['loan_amount'].updateValueAndValidity(); + } + else{ + this._EditPDtriggerForm.controls['loan_amount'].setValidators([Validators.required,Validators.pattern('^[0-9]*$')]); + this._EditPDtriggerForm.controls['loan_amount'].updateValueAndValidity(); } // console.log("len",lender) } @@ -378,7 +387,7 @@ if(!option){ fk_subproduct_id: [this.data.records.fk_subproduct_id], fk_pd_type: [this.data.records.fk_pd_type], fk_customer_segment: [this.data.records.fk_customer_segment], - loan_amount: [this.data.records.loan_amount,Validators.compose([Validators.pattern('^[0-9]*$')])], + loan_amount: [this.data.records.loan_amount,Validators.compose([Validators.required,Validators.pattern('^[0-9]*$')])], addresses: this._fb.array([]), //   addressline1: [this.data.records.addressline1.toUpperCase()], // fk_city: [this.data.records.fk_city], @@ -914,7 +923,7 @@ checkExistPd(value){ Swal({ title:"Warning!", type:'warning', - text:"The Entered Loan Application Id ("+value+") is already exists on the Case No. "+result['records'][0].pd_sno}) + text:`The Entered ${this.lenderShortName == 'CFPL' ? 'Facility' : 'Loan'} Application Id (${value}) is already exists on the Case No. `+result['records'][0].pd_sno}) // this._EditPDtriggerForm.controls['lender_applicant_id'].setValue(''); } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index c1705b5c8..fa23addd0 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -392,7 +392,8 @@
- Is There a Loan Against This Asset? + Select Yes diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html index 097bbe030..f38e2a30f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html @@ -188,7 +188,8 @@
- Is There a {{lender_short_name == 'CFPL' ? 'Facility' :'Loan'}} Existing Against This Asset? + Select Yes @@ -447,7 +448,8 @@ *ngIf="(sup.get('business_assets_mode').value != '') && sup.get('business_ownership_type').value == 'owned' && (lender_short_name != 'CLIX' && lender_short_name != 'MWISE' || prod_catagory === 'LFMP')">
- Is There a {{lender_short_name == 'CFPL' ? 'Facility' :'Loan'}} Existing Against This Asset? + Select Yes diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts index 37d8f74ba..aad5b61e7 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts @@ -30,10 +30,10 @@ export class OtherApplicantDetailsComponent implements OnInit { // } console.log("data",this.data) if(this.data.edit_data){ - this.pageTitle="Update Name of Person(s) Met and Individual Loan Applicant(s) " + this.pageTitle="Update Name of Person(s) Met and Individual "+ this.data.lender_short_name == 'CFPL' ? 'Facility' : 'Loan' +" Applicant(s) " } else{ - this.pageTitle="Add Name of Person(s) Met and Individual Loan Applicant(s) " + this.pageTitle=`Add Name of Person(s) Met and Individual ${this.data.lender_short_name == 'CFPL' ? 'Facility' : 'Loan'} Applicant(s) ` } this.role_id=localStorage.getItem('user_role') console.log('User Role',this.role_id); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html index 16fa79752..84ea4e583 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html @@ -126,7 +126,7 @@ - + {{"₹"}} {{sup.get('rent').value | numberToWords}} Only @@ -139,7 +139,7 @@
--> -
+
@@ -283,7 +283,7 @@
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts index fc1eb0877..b78b4019d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts @@ -587,19 +587,28 @@ export class FamilyDetailsComponent implements OnInit { let familyDetailsFormGrp : FormGroup = familyFormArray.controls[cnt1] as FormGroup; let familyMembersFormArr : FormArray = familyDetailsFormGrp.controls.family_members_details as FormArray; - familyDetailsFormGrp.controls.residence_ownership.value == 1 - ? familyDetailsFormGrp.controls.ownershipOther.setValidators([Validators.required]) - : familyDetailsFormGrp.controls.ownershipOther.setValue(''); - familyDetailsFormGrp.controls.ownershipOther.updateValueAndValidity(); + if (familyDetailsFormGrp.controls.residence_ownership.value == 1) { + familyDetailsFormGrp.controls.ownershipOther.setValidators([Validators.required]) + } + else { + familyDetailsFormGrp.controls.ownershipOther.setValue(''); familyDetailsFormGrp.controls.ownershipOther.clearValidators() + } + familyDetailsFormGrp.controls.ownershipOther.updateValueAndValidity(); - familyDetailsFormGrp.controls.residence_ownership.value == 3 - ? familyDetailsFormGrp.controls.rent.setValidators([Validators.required]) - : familyDetailsFormGrp.controls.rent.setValue(''); + if (familyDetailsFormGrp.controls.residence_ownership.value == 3) { + familyDetailsFormGrp.controls.rent.setValidators([Validators.required]) + } + else { + familyDetailsFormGrp.controls.rent.setValue(''); familyDetailsFormGrp.controls.rent.clearValidators() + } familyDetailsFormGrp.controls.rent.updateValueAndValidity(); - familyDetailsFormGrp.controls.residence_pin.value == 1 - ? familyDetailsFormGrp.controls.residence_other_pincode.setValidators([Validators.required]) - : familyDetailsFormGrp.controls.residence_other_pincode.setValue(''); + if (familyDetailsFormGrp.controls.residence_pin.value == 1) { + familyDetailsFormGrp.controls.residence_other_pincode.setValidators([Validators.required]) + } + else { + familyDetailsFormGrp.controls.residence_other_pincode.setValue(''); familyDetailsFormGrp.controls.residence_other_pincode.clearValidators() + } familyDetailsFormGrp.controls.residence_other_pincode.updateValueAndValidity(); let FMArrayLength: any = familyMembersFormArr.controls.length; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html index 553b18486..8bffdfb4f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html @@ -21,7 +21,7 @@ - Name of Person(s) Met and Individual Loan Applicant(s) + Name of Person(s) Met and Individual {{lender_short_name == 'CFPL' ? 'Facility' :'Loan'}} Applicant(s) - Is Loan applicant + Is {{lender_short_name == 'CFPL' ? 'Facility' :'Loan'}} applicant Is Applicant diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts index f1d8bc5a1..21282b2f2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts @@ -100,12 +100,14 @@ export class GeneralInfoComponent implements OnInit { public filteredBusinessEntityTypeList: ReplaySubject = new ReplaySubject(1); public filteredRelationShipList: ReplaySubject = new ReplaySubject(1); public filteredCompanyRelationShipList: ReplaySubject = new ReplaySubject(1); + lender_short_name: any; /********************** Declaration Section Ends Here *****************/ /** Constructor Section */ constructor(notifier: NotifierService, private _fb: FormBuilder, private _pd: PdTrigerService, private dialog: MatDialog, @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialogRef: MatDialogRef, private titleCase: TitleCasePipe, private imageRef: MatDialogRef) { this.pdid = this.pd_all_details.pdmaster_details.pd_id; + this.lender_short_name = this.pd_all_details.pdmaster_details.lender_short_name; this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.notifier = notifier; this.form_id = 18; @@ -643,7 +645,7 @@ export class GeneralInfoComponent implements OnInit { addMoreIndividuals() { const dialogRef = this.dialog.open(OtherApplicantDetailsComponent, { - data: {'pd_id':this.pdid,}, + data: {'pd_id':this.pdid,lender_short_name:this.lender_short_name}, width: '40%', disableClose: true }); @@ -674,7 +676,7 @@ export class GeneralInfoComponent implements OnInit { editIndividuals(value,index){ //console.log(value); const dialogRef = this.dialog.open(OtherApplicantDetailsComponent, { - data: {'pd_id':this.pdid,edit_data:true,previous_value:value.value}, + data: {'pd_id':this.pdid,edit_data:true,previous_value:value.value,lender_short_name:this.lender_short_name}, width: '40%', disableClose: true }); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/images-all/images-all.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/images-all/images-all.component.html index dcbf89973..aebb3cea4 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/images-all/images-all.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/images-all/images-all.component.html @@ -1,4 +1,4 @@ -
+

@@ -20,6 +20,7 @@
+
@@ -35,7 +36,7 @@
-->

- +
@@ -165,17 +166,18 @@
+ -
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/images-all/images-all.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/images-all/images-all.component.scss index 464655179..86d79dbaf 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/images-all/images-all.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/images-all/images-all.component.scss @@ -1,14 +1,14 @@ -::ng-deep - .cus-images > mat-card-content { - overflow-y: scroll !important; -} +// ::ng-deep +// .cus-images > mat-card-content { +// overflow-y: scroll !important; +// } -.scroll{ - overflow-y: scroll !important; - overflow-y:auto; +// .scroll{ +// overflow-y: scroll !important; +// overflow-y:auto; -} +// } .paragraph_change { color: #fff !important; background-color: #e00201 !important; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index 829d2c01e..70e0e6771 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -23,7 +23,8 @@ - {{lenderShortName == 'CFPL' ? 'Facility' :'Loan'}} Amount Applied for ? + @@ -32,7 +33,7 @@ {{loanAmtInWords}} Only --> - Loan Tenure applied for? + {{lenderShortName == 'CFPL' ? 'Facility' :'Loan'}} Tenure applied for? @@ -166,7 +167,7 @@ - + {{"₹"}} {{ loanDetailsForm.controls['emi_level'].value | numberToWords }} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts index 462c258a8..8c62d6506 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts @@ -130,6 +130,10 @@ export class LoanDetailsComponent implements OnInit { this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; this.lenderShortName = this.pd_all_details.pdmaster_details.lender_short_name; + if(this.lenderShortName == 'CFPL') { + this.pageTitle = 'Facility & Anchor Details' + } + if (this.prod_catagory == 'PL' || this.prod_catagory == 'BL' || this.prod_catagory == 'LAP' || this.prod_catagory == 'LFMP') { this.isContribution = true; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html index 2df0b5fe1..556c27f64 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html @@ -26,7 +26,8 @@ - Other Income of {{lender_short_name == 'CFPL' ? 'Facility' :'Loan'}} Applicants + Select Yes diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts index e81d0354e..8f22cd165 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts @@ -63,6 +63,7 @@ export class OtherIncomeComponent implements OnInit { isIncomeEarnedBy: any = []; image_doc_params: { pdid: string; form_id: number; company_id: string; }; addressList: any = []; + lender_short_name: any; // stringArr = []; constructor(notifier: NotifierService, private fb: FormBuilder, @@ -74,6 +75,7 @@ export class OtherIncomeComponent implements OnInit { @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.parent_pdid = this.pd_all_details.pdmaster_details.parent_pd_id; this.pdid = this.pd_all_details.pdmaster_details.pd_id; + this.lender_short_name = this.pd_all_details.pdmaster_details.lender_short_name; this.form_id = 9; this.rental_form_id = 17; this.notifier = notifier; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.html index db9608ef5..6f0688d3f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.html @@ -133,7 +133,7 @@ - Name of the Owner/Owners of the Let out Property as per Loan Applicants + Name of the Owner/Owners of the Let out Property as per {{lender_short_name == 'CFPL' ? 'Facility' :'Loan'}} Applicants @@ -148,7 +148,7 @@ - Relation of Owner to Loan Applicant + Relation of Owner to {{lender_short_name == 'CFPL' ? 'Facility' :'Loan'}} Applicant @@ -190,7 +190,7 @@ - Nature of Let Out Property as per Loan Applicant + Nature of Let Out Property as per {{lender_short_name == 'CFPL' ? 'Facility' :'Loan'}} Applicant @@ -205,7 +205,7 @@ - Type of Units as per Loan Applicants + Type of Units as per {{lender_short_name == 'CFPL' ? 'Facility' :'Loan'}} Applicants @@ -363,13 +363,13 @@ - Monthly Rent Amount as per Loan Applicant + Monthly Rent Amount as per {{lender_short_name == 'CFPL' ? 'Facility' :'Loan'}} Applicant {{"₹"}} {{units.value.monthly_rent_amount | numberToWords}} Only - Mode of Payment of Rent as per Loan Applicant + Mode of Payment of Rent as per {{lender_short_name == 'CFPL' ? 'Facility' :'Loan'}} Applicant @@ -400,7 +400,7 @@ - Securtity Deposit amount as per Loan Applicant + Securtity Deposit amount as per {{lender_short_name == 'CFPL' ? 'Facility' :'Loan'}} Applicant {{"₹"}} {{units.value.securtity_deposit_amount | numberToWords}} Only @@ -521,7 +521,7 @@ - Relation of Owner to Loan Applicant + Relation of Owner to {{lender_short_name == 'CFPL' ? 'Facility' :'Loan'}} Applicant @@ -588,7 +588,7 @@ - Relation of Owner to Loan Applicant + Relation of Owner to {{lender_short_name == 'CFPL' ? 'Facility' :'Loan'}} Applicant diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts index a9fe41411..ac680f0f6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts @@ -78,12 +78,14 @@ export class ManageRentalVerificationComponent implements OnInit { cityData: any = []; pincodeData: any = []; addressList: any = []; + lender_short_name: any; constructor(notifier: NotifierService, private _pd: PdTrigerService ,private _fb: FormBuilder, @Inject(MAT_DIALOG_DATA) public data: any,private dialogRef: MatDialogRef,private dialog: MatDialog) { this.pageTitle = this.data.manage_status==1 ? 'Add RI Details' : 'Update RI Details'; this.parent_pdid = this.data.parentData.pdmaster_details.parent_pd_id; this.pdid = this.data.parentData.pdmaster_details.pd_id; + this.lender_short_name = this.data.parentData.pdmaster_details.lender_short_name this.notifier = notifier; this.form_id = 17; this.rental_count_id = this.data.existing_rental_count_id; @@ -1000,7 +1002,7 @@ export class ManageRentalVerificationComponent implements OnInit { TempArray2[index] = data.hasOwnProperty('paid_monthly_rent_per_met') ? data.paid_monthly_rent_per_met : 0 ; TenantRentAmt = TempArray2.reduce((sum, val) => sum + +val, 0); }) - textMessage = 'Monthly Rent as Per Loan Applicant = '+ApplicantRentAmt+'
'; + textMessage = 'Monthly Rent as Per '+ this.lender_short_name == 'CFPL' ? 'Facility' : 'Loan'+ ' Applicant = '+ApplicantRentAmt+'
'; } 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 657f70099..dc144ac21 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 @@ -62,7 +62,7 @@
- Loan Amount + {{master.lender_short_name == 'CFPL' ? 'Facility' : 'Loan'}} Amount
{{master.loan_amount}}
diff --git a/ng6-seed/src/app/personal-discussion/pd-pipes/number-to-words.pipe.ts b/ng6-seed/src/app/personal-discussion/pd-pipes/number-to-words.pipe.ts index 87f8dca11..f9bf8a844 100755 --- a/ng6-seed/src/app/personal-discussion/pd-pipes/number-to-words.pipe.ts +++ b/ng6-seed/src/app/personal-discussion/pd-pipes/number-to-words.pipe.ts @@ -5,7 +5,9 @@ import { Pipe, PipeTransform } from '@angular/core'; }) export class NumberToWordsPipe implements PipeTransform { transform(price: any): any{ - + if(price == null || price == undefined || price == '') { + return; + } price = price.toString(); let atemp = price.split("."); let amount = atemp[0]; diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html index 9b3dcd75c..d9f8f1469 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html @@ -63,7 +63,7 @@
- Loan Amount + {{master.lender_short_name == 'CFPL' ? 'Facility' : 'Loan'}} Amount
{{master.loan_amount}}