From 9ec0aacb2cff5472e088cc1cc1cd59ac6f552ce9 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 3 Sep 2019 18:01:36 +0530 Subject: [PATCH] Fairoj: rental issue fixed and family details validation removed --- .../app/layouts/admin/admin-layout.component.html | 4 ++-- ng6-seed/src/app/layouts/role-menu-items.pipe.ts | 4 ++-- .../family-details/family-details.component.html | 6 +++--- .../family-details/family-details.component.ts | 14 +++++++------- .../final-remarks/final-remarks.component.html | 2 +- .../manage-rental-verification.component.ts | 2 +- .../manage-pd/manage-pd.module.ts | 2 ++ 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.html b/ng6-seed/src/app/layouts/admin/admin-layout.component.html index c279f0225..f4e6346e7 100755 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.html @@ -252,12 +252,12 @@ -
+
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 c4ebdef49..5d6485c1b 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 @@ -179,8 +179,8 @@ export class FamilyDetailsComponent implements OnInit { family_member_earning_status: [val.family_member_earning_status, Validators.compose([])], earning_segment: [val.earning_segment, Validators.compose([])], earning_gross_income_per_month: [val.earning_gross_income_per_month, Validators.compose([])], - earning_name_of_the_employer_or_business: [val.earning_name_of_the_employer_or_business, Validators.compose([])], - earning_number_of_years_in_employment_or_business: [val.earning_number_of_years_in_employment_or_business, Validators.compose([])], + earning_name_of_the_employer_or_business: [val.earning_name_of_the_employer_or_business], + earning_number_of_years_in_employment_or_business: [val.earning_number_of_years_in_employment_or_business], earning_if_others_segment: [val.earning_if_others_segment], non_earning_occupation: [val.non_earning_occupation, Validators.compose([])], non_earning_if_others: [val.non_earning_if_others, Validators.compose([])], @@ -294,7 +294,7 @@ export class FamilyDetailsComponent implements OnInit { residence_pin: ['', Validators.compose([])], residence_other_pincode: [''], residence_No_of_years: ['', Validators.compose([])], - residence_No_of_months:['',Validators.compose([])], + residence_No_of_months:[''], residence_ownership: ['', Validators.compose([])], ownershipOther: [''], rent: [''], @@ -354,8 +354,8 @@ export class FamilyDetailsComponent implements OnInit { family_member_earning_status: [vals.family_member_earning_status || null, Validators.compose([])], earning_segment: [vals.earning_segment || null, Validators.compose([])], earning_gross_income_per_month: [vals.earning_gross_income_per_month || null, Validators.compose([])], - earning_name_of_the_employer_or_business: [vals.earning_name_of_the_employer_or_business || null, Validators.compose([])], - earning_number_of_years_in_employment_or_business: [vals.earning_number_of_years_in_employment_or_business || null, Validators.compose([])], + earning_name_of_the_employer_or_business: [vals.earning_name_of_the_employer_or_business || null], + earning_number_of_years_in_employment_or_business: [vals.earning_number_of_years_in_employment_or_business || null], earning_if_others_segment: [vals.earning_if_others_segment || null], non_earning_occupation: [vals.non_earning_occupation || null, Validators.compose([])], non_earning_if_others: [vals.non_earning_if_others || null, Validators.compose([])], @@ -490,8 +490,8 @@ export class FamilyDetailsComponent implements OnInit { family_member_earning_status: ['', Validators.compose([])], earning_segment: ['', Validators.compose([])], earning_gross_income_per_month: ['', Validators.compose([])], - earning_name_of_the_employer_or_business: ['', Validators.compose([])], - earning_number_of_years_in_employment_or_business: ['', Validators.compose([])], + earning_name_of_the_employer_or_business: [''], + earning_number_of_years_in_employment_or_business: [''], earning_if_others_segment: [''], non_earning_occupation: ['', Validators.compose([])], non_earning_if_others: ['', Validators.compose([])], diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html index 71eacb323..a3e22bf3e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html @@ -115,7 +115,7 @@ Reasons Required 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 05b0f237b..05df48c95 100644 --- 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 @@ -331,7 +331,7 @@ export class ManageRentalVerificationComponent implements OnInit { (element.rental_remaining_months=='' || element.rental_remaining_months>=0) ? control.controls[index].addControl('rental_remaining_months', new FormControl('', Validators.required)) : control.controls[index].removeControl('rental_remaining_months'); element.agreement_monthly_rent_amount ? control.controls[index].addControl('agreement_monthly_rent_amount', new FormControl('', Validators.required)) : control.controls[index].removeControl('agreement_monthly_rent_amount'); element.agreement_security_deposit_amount ? control.controls[index].addControl('agreement_security_deposit_amount', new FormControl('', Validators.required)) : control.controls[index].removeControl('agreement_security_deposit_amount'); - element.differences_loanapplicant_rentagreement ? control.controls[index].addControl('differences_loanapplicant_rentagreement', new FormControl('', Validators.required)) : control.controls[index].removeControl('differences_loanapplicant_rentagreement'); + element.hasOwnProperty('differences_loanapplicant_rentagreement') ? control.controls[index].addControl('differences_loanapplicant_rentagreement', new FormControl('', Validators.required)) : control.controls[index].removeControl('differences_loanapplicant_rentagreement'); //agreement owners element.agreement_property_owners_name ? control.controls[index].addControl('agreement_property_owners_name', new FormControl('', Validators.required)) : control.controls[index].removeControl('agreement_property_owners_name'); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts index 9307d637f..c8e2d83c8 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts @@ -125,6 +125,7 @@ import { FuturePlansAndBusinessEnvironmentComponent } from './list-pd/start-pd/f import { ImageCropComponent } from './list-pd/start-pd/forms/dialogue/image-crop/image-crop.component'; import {PurchaseCalculationComponent} from './list-pd/start-pd/forms/assessed-income/purchase-calculation/purchase-calculation.component' import { QueriesDocsComponent } from './list-pd/start-pd/forms/queries-docs/queries-docs.component'; +import {AngularSplitModule} from 'angular-split' /** * Custom angular notifier options @@ -203,6 +204,7 @@ const pdCustomNotifierOptions: NotifierOptions = { NgxMatSelectSearchModule,MatTooltipModule, MatExpansionModule,ResizableModule, AgmCoreModule.forRoot({apiKey: 'AIzaSyCXsHTus6hyIB8jYvt9ZEIbZve-2vWeQRg'}),OwlDateTimeModule, OwlNativeDateTimeModule, + AngularSplitModule ], exports: [PdLocatedMapViewDirective, PdAllocationComponent, SmartPdAllocationComponent, TelePdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent, AssessedIncomeComponent, AllocationViewMoreComponent, GeneralInfoComponent, PdRequirementComponent,PdCollectedDocsComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, BusinessOtherFamilyMemberComponent, BusinessInfoGroupComponent,DailySalesDetailsComponent, SalesCalculationComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManageSalesComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent, PdStatusChangeDialogueComponent, ViewLocationComponent, ConfirmAiDetailsComponent, RentalVerificationComponent, InitiateAdditionalPdComponent, DailyPurchaseDetailsComponent, ManageDailyPurchaseComponent,ManageRentalVerificationComponent,ImageCropComponent,PurchaseCalculationComponent], providers: [PdTrigerService, GetGeometricLocationService,{provide: MAT_DATE_LOCALE, useValue: 'en-GB'},