Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fairoj: rental issue fixed and family details validation removed

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-09-03 18:01:36 +05:30
parent bc7bf95939
commit 9ec0aacb2c
7 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ng6-seed/src/app/layouts/admin/admin-layout.component.html
View File

@ -252,12 +252,12 @@
<button (click)="menuToggleFunc()" mat-icon-button class="lines-btn">
<mat-icon>menu</mat-icon>
</button>
<div class="search-bar" fxFlex>
<!-- <div class="search-bar" fxFlex>
<form class="search-form" fxShow="false" fxShow.gt-xs>
<mat-icon>search</mat-icon>
<input type="text" placeholder="Search" autofocus="true" />
</form>
</div>
</div> -->
<span fxFlex></span>
<button appToggleFullscreen mat-icon-button>
<mat-icon>fullscreen</mat-icon>

4
ng6-seed/src/app/layouts/role-menu-items.pipe.ts
View File

@ -11,7 +11,7 @@ export class RoleMenuItemsPipe implements PipeTransform {
switch(localStorage.getItem('user_role')){
case '1': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion");
case '2': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion");
case '3': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion");
case '3': return value.filter(val=>val.state!="settings");
case '4': return;
case '5': return value.filter(val=>val.state!="settings" && val.state!="quality_check_discussion" && val.state!="reports");
case '6': return;
@ -30,7 +30,7 @@ export class RoleMenuItemsPipe implements PipeTransform {
switch(localStorage.getItem('user_role')){
case '1': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion");
case '2': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion");
case '3': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion");
case '3': return value.filter(val=>val.state!="settings");
case '4': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion" && val.state!="reports");
case '5': return value.filter(val=>val.state!="setting" && val.state!="quality_check_discussion" && val.state!="reports");
case '6': return value.filter(val=>val.state!="setting" && val.state!="personal_discussion" && val.state!="reports");

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
View File

@ -92,7 +92,7 @@
</mat-form-field>
<mat-form-field >
<input matInput placeholder="Month" formControlName="residence_No_of_months"
OnlyNumber type="text" required>
OnlyNumber type="text" >
</mat-form-field>
<mat-form-field>
@ -193,12 +193,12 @@
<mat-form-field style="width:45%;">
<input matInput [placeholder]="item.get('earning_segment').value != 5 ? 'Name of the Employer/Business' : 'Pension Received From'"
formControlName="earning_name_of_the_employer_or_business"
required>
>
</mat-form-field>
<mat-form-field style="width:45%;">
<input matInput placeholder="No. of years in Employment/Business"
formControlName="earning_number_of_years_in_employment_or_business" OnlyNumber type="text"
required>
>
</mat-form-field>
</div>
<div *ngIf="item.get('family_member_earning_status').value == 2">

14
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts
View File

@ -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([])],

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
View File

@ -115,7 +115,7 @@
<mat-error *ngIf="details.controls['reason_for_refer_to_credit'].hasError('required')">Reasons Required</mat-error>
</mat-form-field>
<button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button
matTooltip="Delete" matTooltipPosition="above" (click)="deleteaddRecommendationReferToCredit(i)"
matTooltip="Delete" matTooltipPosition="above" (click)="deleteRecommendationReferToCredit(i)"
*ngIf="_finalRemarkForm.get('recommendation_refer_to_credit').controls.length > 1">
<mat-icon>delete</mat-icon>
</button>

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/manage-rental-verification/manage-rental-verification.component.ts
View File

@ -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');

2
ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts
View File

@ -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'},