Salaried Changes Added

This commit is contained in:
sriram-at-840620226347 2019-12-24 11:58:56 +05:30
parent 771b712896
commit 5e37a56093
6 changed files with 166 additions and 29 deletions

View File

@ -304,7 +304,7 @@
</mat-form-field>
</div>
<div fxFlex="100" fxLayout="nowrap">
<div fxFlex="100" fxLayout="nowrap" *ngIf="split_customer_abbr != 'SAL'">
<mat-form-field style="width: 46%;" *ngIf="addressForm.controls['estimated_area']">
<input matInput
[placeholder]=" placeholderName != '' ? placeholderName : 'Estimated area of the (Address Type)'"

View File

@ -72,6 +72,7 @@ export class AddressComponent implements OnInit {
cityDataList: any = [];
pincodeDataList: any = [];
product_abbr: any;
split_customer_abbr: any;
/**Constructor of the class */
constructor(private el: ElementRef, notifier: NotifierService,
@ -96,6 +97,11 @@ export class AddressComponent implements OnInit {
this.product_abbr = this.pd_all_details.pdmaster_details.product_abbr;
console.log(this.product_abbr);
this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr;
this.split_customer_abbr = this.customer_segment_abbr.split('-')
if(this.split_customer_abbr.length > 0){
this.split_customer_abbr = this.split_customer_abbr[0];
console.log(this.split_customer_abbr)
}
let CSAbbrSearch = this.pd_all_details.pdmaster_details.customer_segment_abbr.search("-");
this.CustSegAbbr = this.pd_all_details.pdmaster_details.customer_segment_abbr.substr(0, CSAbbrSearch);

View File

@ -76,28 +76,37 @@
</mat-form-field>
<div fxLayout="row" fxLayoutAlign="start none" *ngIf="employmentForm.controls['was_met'].value == 'yes'">
<mat-form-field style="width: 45%">
<!-- <input matInput placeholder="Name of Person Met" formControlName="name_person_met" required> -->
<mat-select placeholder="Name of Person Met" formControlName="name_person_met"
<input matInput placeholder="Name of Person Met" formControlName="name_person_met"
autocomplete="off" required>
<!-- <mat-select placeholder="Name of Person Met" formControlName="name_person_met"
required (selectionChange)="filtercompanyrelationship(employmentForm.controls['employer_name'].value,$event.value)">
<mat-option>Select</mat-option>
<mat-option *ngFor="let person of person_met_list" [value]="person.pd_co_applicant_id">
{{person.applicant_name | titlecase}}
</mat-option>
</mat-select>
</mat-select> -->
<mat-error *ngIf="employmentForm.controls['name_person_met'].hasError('required')">Name of Person Met Required</mat-error>
</mat-form-field>
<mat-form-field style="width: 45%">
<input matInput placeholder="Designation of Person Met" formControlName="designation_person_met"
required>
<mat-error *ngIf="employmentForm.controls['designation_person_met'].hasError('required')">Designation of Person Met Required</mat-error>
<!-- <mat-select placeholder="Designation of Person Met" formControlName="designation_person_met" required>
<!-- <input matInput placeholder="Designation of Person Met" formControlName="designation_person_met"
required> -->
<mat-select placeholder="Designation of Person Met" formControlName="designation_person_met" required>
<mat-option>Select</mat-option>
<mat-option *ngFor="let comrelShip of companyRelationShipList" [value]="comrelShip.company_relationship_id">
{{comrelShip.name | titlecase}}
</mat-option>
<mat-option value="0"> Not Applicable </mat-option>
</mat-select> -->
<mat-option *ngFor="let deslist of designationdatalist" [value]="deslist.designation_id">
{{deslist.designation}}
</mat-option>
</mat-select>
<mat-error *ngIf="employmentForm.controls['designation_person_met'].hasError('required')">Designation of Person Met Required</mat-error>
</mat-form-field>
<span *ngIf="employmentForm.value.designation_person_met == '1'">
<mat-form-field style="width: 45%">
<input matInput placeholder="Specify Person Met" formControlName="others_person_met"
autocomplete="off" required>
<mat-error *ngIf="employmentForm.controls['designation_person_met'].hasError('required')">
Specify Person Met Required</mat-error>
</mat-form-field>
</span>
</div>
<mat-form-field *ngIf="pd_cus_segment!='SAL-CHQ'" style="width: 45%">
<mat-select placeholder="Salary amount confirmed ?" formControlName="confirm_salary"
@ -108,6 +117,13 @@
</mat-select>
<mat-error *ngIf="employmentForm.controls['confirm_salary'].hasError('required')">Salary amount confirmed Required</mat-error>
</mat-form-field>
<mat-form-field appearance="outline" style="width: 45%" *ngIf="employmentForm.controls['confirm_salary'].value == 'no'">
<!-- <mat-label>why salary amount was not confirmed</mat-label> -->
<textarea matInput placeholder="why salary amount was not confirmed" formControlName="sal_amount_was_not_confirmed"></textarea>
<!-- <mat-error *ngIf="employmentForm.controls['sal_amount_was_not_confirmed'].hasError('required')">why salary amount was not confirmed Required</mat-error> -->
</mat-form-field>
<div fxLayout="row" fxLayoutAlign="start none" *ngIf="employmentForm.controls['confirm_salary'].value == 'yes'">
<mat-form-field style="width: 45%">
<input matInput placeholder="What is the salary amount confirmed?"
@ -137,6 +153,18 @@
</mat-select>
<mat-error *ngIf="employmentForm.controls['sal_reg_seen'].hasError('required')">Salary register seen Required</mat-error>
</mat-form-field>
<mat-form-field style="width: 45%">
<mat-select placeholder="Mode of getting salary" formControlName="mode_of_getting_salary"
required>
<mat-option>Select</mat-option>
<mat-option value="bank_transfer">Bank Transfer</mat-option>
<mat-option value="paid_in_cash">Paid in Cash</mat-option>
<mat-option value="both_bank_transfer_cash">Both Bank Transfer & Cash</mat-option>
</mat-select>
<!-- <mat-error *ngIf="employmentForm.controls['mode_of_getting_salary'].hasError('required')">Mode of getting salary Required</mat-error> -->
</mat-form-field>
<mat-card>
<mat-card-header>
<p>Salary Details<p>
@ -200,14 +228,14 @@
<!-- <input matInput placeholder="Net Take Home"
formControlName="net_take_home"> -->
</mat-form-field>
<mat-form-field style="width: 80%">
<mat-form-field style="width: 80%" *ngIf="employmentForm.value.mode_of_getting_salary == 'bank_transfer' || employmentForm.value.mode_of_getting_salary == 'both_bank_transfer_cash'">
<input matInput placeholder="Amount paid through Bank"
formControlName="amount_paid_through_bank" OnlyNumber type="text" autocomplete="off" (change)="ValidateNetSalary()">
<mat-hint align="start" style="font-size:90%" *ngIf="employmentForm.controls['amount_paid_through_bank'].value != ''">{{"&#8377;"}} {{employmentForm.controls['amount_paid_through_bank'].value | numberToWords}} Only</mat-hint>
<mat-error *ngIf="employmentForm.controls.amount_paid_through_bank.hasError('max')">Given Value is More than Net Salary</mat-error>
<mat-error *ngIf="employmentForm.controls.amount_paid_through_bank.hasError('min')">Given Value is Less than Net Salary</mat-error>
</mat-form-field>
<mat-form-field style="width: 80%">
<mat-form-field style="width: 80%" *ngIf="employmentForm.value.mode_of_getting_salary == 'paid_in_cash' || employmentForm.value.mode_of_getting_salary == 'both_bank_transfer_cash'">
<input matInput placeholder="Amount paid in Cash"
formControlName="amount_paid_in_cash" OnlyNumber type="text" autocomplete="off" (change)="ValidateNetSalary()">
<mat-hint align="start" style="font-size:90%" *ngIf="employmentForm.controls['amount_paid_in_cash'].value != ''">{{"&#8377;"}} {{employmentForm.controls['amount_paid_in_cash'].value | numberToWords}} Only</mat-hint>
@ -269,6 +297,21 @@
<mat-error *ngIf="employmentForm.controls['bonus_type_other'].hasError('required')">Bonus Type Others Required</mat-error>
</mat-form-field>
<mat-form-field style="width: 45%">
<mat-select placeholder="ID Card issued by the Company seen ?" formControlName="id_card_issued_company"
required>
<mat-option>Select</mat-option>
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>
<mat-error *ngIf="employmentForm.controls['id_card_issued_company'].hasError('required')">ID Card issued by the Company seen ? Required</mat-error>
</mat-form-field>
<mat-form-field appearance="outline" style="width: 45%" *ngIf="employmentForm.controls['id_card_issued_company'].value == 'no'">
<!-- <mat-label>why salary amount was not confirmed</mat-label> -->
<textarea matInput placeholder="why companys ID proof is not available." formControlName="why_company_id_proof_not_available"></textarea>
<!-- <mat-error *ngIf="employmentForm.controls['why_company_id_proof_not_available'].hasError('required')">why companys ID proof is not available Required</mat-error> -->
</mat-form-field>
</div>
</div>
</mat-card-content>

View File

@ -57,6 +57,8 @@ export class EmploymentInfoComponent implements OnInit {
generalExistBusinessYear:any;
generalExistBusinessMonth:any;
image_doc_params: { pdid: number; form_id: number; company_id: string; };
split_customer_abbr: any;
designationdatalist: any [];
constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute,
@ -73,6 +75,12 @@ export class EmploymentInfoComponent implements OnInit {
this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id;
this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr;
this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr;
this.split_customer_abbr = this.customer_segment_abbr.split('-')
if(this.split_customer_abbr.length > 0){
this.split_customer_abbr = this.split_customer_abbr[0];
console.log(this.split_customer_abbr)
}
this.generalExistBusinessYear=100;
this.generalExistBusinessMonth=12;
this.image_doc_params={pdid:this.pdid,form_id:this.form_id,company_id:''}
@ -136,8 +144,14 @@ export class EmploymentInfoComponent implements OnInit {
}
if (value.records.designation_person_met) {
this.employmentForm.controls['designation_person_met'].setValue(value.records.designation_person_met);
if(value.records.designation_person_met == '1'){
this.employmentForm.controls['others_person_met'].setValue(value.records.others_person_met);
}
}
this.employmentForm.controls['confirm_salary'].setValue(value.records.confirm_salary);
if(value.records.confirm_salary == 'no'){
this.employmentForm.controls['sal_amount_was_not_confirmed'].setValue(value.records.sal_amount_was_not_confirmed);
}
if (value.records.confirm_salary_amount) {
this.employmentForm.controls['confirm_salary_amount'].setValue(value.records.confirm_salary_amount);
}
@ -150,8 +164,14 @@ export class EmploymentInfoComponent implements OnInit {
this.employmentForm.controls['to_date_the_salary_is_rcv'].setValue(value.records.to_date_the_salary_is_rcv);
this.employmentForm.controls['gross_monthly_salary'].setValue(value.records.gross_monthly_salary);
this.employmentForm.controls['net_monthly_salary'].setValue(value.records.net_monthly_salary);
this.employmentForm.controls['amount_paid_in_cash'].setValue(value.records.amount_paid_in_cash);
this.employmentForm.controls['amount_paid_through_bank'].setValue(value.records.amount_paid_through_bank);
this.employmentForm.controls['mode_of_getting_salary'].setValue(value.records.mode_of_getting_salary);
if(value.records.mode_of_getting_salary == 'paid_in_cash' || value.records.mode_of_getting_salary == 'both_bank_transfer_cash'){
this.employmentForm.controls['amount_paid_in_cash'].setValue(value.records.amount_paid_in_cash);
}
if(value.records.mode_of_getting_salary == 'bank_transfer' || value.records.mode_of_getting_salary == 'both_bank_transfer_cash'){
this.employmentForm.controls['amount_paid_through_bank'].setValue(value.records.amount_paid_through_bank);
}
this.employmentForm.controls['check_validated'].setValue(value.records.check_validated);
this.employmentForm.controls['how_was_it_validated'].setValue(value.records.how_was_it_validated);
this.employmentForm.controls['why_was_it_not_validated'].setValue(value.records.why_was_it_not_validated);
@ -160,6 +180,10 @@ export class EmploymentInfoComponent implements OnInit {
this.employmentForm.controls['bonus_frequency'].setValue(value.records.bonus_frequency);
this.employmentForm.controls['bonus_type'].setValue(value.records.bonus_type);
this.employmentForm.controls['bonus_type_other'].setValue(value.records.bonus_type_other);
this.employmentForm.controls['id_card_issued_company'].setValue(value.records.id_card_issued_company);
if(value.records.id_card_issued_company == 'no'){
this.employmentForm.controls['why_company_id_proof_not_available'].setValue(value.records.why_company_id_proof_not_available);
}
this.employmentForm.controls['employment_remarks'].setValue(value.records.employment_remarks);
@ -178,6 +202,17 @@ export class EmploymentInfoComponent implements OnInit {
}
});
this._pd.getAllMasterDatas('DESIGNATION').subscribe(
data => {
if (data.status == 200) {
console.log('DESIGNATION',data);
this.designationdatalist = data.records;
this.designationdatalist = this.designationdatalist.filter(des => des.isactive == 1);
}
});
this._pd.getAllMasterDatas('COMPANYRELATIONSHIPS').subscribe(
data => {
if (data.status == 200) {
@ -200,7 +235,9 @@ export class EmploymentInfoComponent implements OnInit {
was_met: [this.pd_cus_segment == 'SAL-CHQ' ? 'no' : '', Validators.compose([Validators.required])],
name_person_met: [''],
designation_person_met: [''],
others_person_met: [''],
confirm_salary: [this.pd_cus_segment == 'SAL-CHQ' ? 'no' : '', Validators.compose([Validators.required])],
sal_amount_was_not_confirmed: [''],
confirm_salary_amount: [''],
attendance_seen: [this.pd_cus_segment == 'SAL-CHQ' ? 'no' : '', Validators.compose([Validators.required])],
sal_reg_seen: [this.pd_cus_segment == 'SAL-CHQ' ? 'no' : '', Validators.compose([Validators.required])],
@ -210,6 +247,7 @@ export class EmploymentInfoComponent implements OnInit {
net_monthly_salary: ['', Validators.compose([Validators.required])],
amount_paid_in_cash: [''],
amount_paid_through_bank: [''],
mode_of_getting_salary:[''],
check_validated:[''],
how_was_it_validated: [''],
why_was_it_not_validated: [''],
@ -218,6 +256,8 @@ export class EmploymentInfoComponent implements OnInit {
bonus_frequency: [''],
bonus_type: [''],
bonus_type_other: [''],
id_card_issued_company: [''],
why_company_id_proof_not_available: [''],
// employment_details: this.fb.array([]),
employment_remarks: [''],
});
@ -459,12 +499,18 @@ export class EmploymentInfoComponent implements OnInit {
if (this.employmentForm.controls['was_met'].value == 'yes') {
records.name_person_met = this.employmentForm.controls['name_person_met'].value;
records.designation_person_met = this.employmentForm.controls['designation_person_met'].value;
if(records.designation_person_met == '1'){
records.others_person_met = this.employmentForm.controls['others_person_met'].value;
}
}
records.confirm_salary = this.employmentForm.controls['confirm_salary'].value;
if (this.employmentForm.controls['confirm_salary'].value == 'yes') {
records.confirm_salary_amount = this.employmentForm.controls['confirm_salary_amount'].value;
records.total_business_experience = this.employmentForm.controls['total_business_experience'].value;
records.total_business_previous_experience = this.employmentForm.controls['total_business_previous_experience'].value;
}else if(this.employmentForm.controls['confirm_salary'].value == 'no'){
records.sal_amount_was_not_confirmed = this.employmentForm.controls['sal_amount_was_not_confirmed'].value;
}
records.attendance_seen = this.employmentForm.controls['attendance_seen'].value;
records.sal_reg_seen = this.employmentForm.controls['sal_reg_seen'].value;
@ -472,9 +518,14 @@ export class EmploymentInfoComponent implements OnInit {
records.to_date_the_salary_is_rcv = this.employmentForm.controls['to_date_the_salary_is_rcv'].value;
records.gross_monthly_salary = this.employmentForm.controls['gross_monthly_salary'].value;
records.net_monthly_salary = this.employmentForm.controls['net_monthly_salary'].value;
records.amount_paid_in_cash = this.employmentForm.controls['amount_paid_in_cash'].value;
records.amount_paid_through_bank = this.employmentForm.controls['amount_paid_through_bank'].value;
records.mode_of_getting_salary = this.employmentForm.controls['mode_of_getting_salary'].value;
if(this.employmentForm.controls['mode_of_getting_salary'].value == 'paid_in_cash' || this.employmentForm.controls['mode_of_getting_salary'].value == 'both_bank_transfer_cash'){
records.amount_paid_in_cash = this.employmentForm.controls['amount_paid_in_cash'].value;
}
if(this.employmentForm.controls['mode_of_getting_salary'].value == 'bank_transfer' || this.employmentForm.controls['mode_of_getting_salary'].value == 'both_bank_transfer_cash'){
records.amount_paid_through_bank = this.employmentForm.controls['amount_paid_through_bank'].value;
}
records.check_validated = this.employmentForm.controls['check_validated'].value;
records.how_was_it_validated = this.employmentForm.controls['how_was_it_validated'].value;
records.why_was_it_not_validated = this.employmentForm.controls['why_was_it_not_validated'].value;
@ -486,6 +537,11 @@ export class EmploymentInfoComponent implements OnInit {
records.bonus_type = this.employmentForm.controls['bonus_type'].value;
records.bonus_type_other = this.employmentForm.controls['bonus_type_other'].value;
records.id_card_issued_company = this.employmentForm.controls['id_card_issued_company'].value;
if(this.employmentForm.controls['id_card_issued_company'].value == 'no'){
records.why_company_id_proof_not_available = this.employmentForm.controls['why_company_id_proof_not_available'].value;
}
records.employment_remarks = this.employmentForm.controls['employment_remarks'].value;
this._pd.saveForm(records).subscribe(data => {

View File

@ -40,14 +40,14 @@
<mat-header-cell *matHeaderCellDef> Is Person Met </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
<mat-checkbox class="table-checkbox" color="primary"
formControlName="is_person_met"></mat-checkbox>
formControlName="is_person_met" (change)="split_customer_abbr == 'SAL' ? salariedcheck() : ''"></mat-checkbox>
</mat-cell>
</ng-container>
<ng-container matColumnDef="is_applicant">
<mat-header-cell *matHeaderCellDef> Is Applicant </mat-header-cell>
<mat-cell *matCellDef="let details;let i = index;" [formGroupName]="i">
<mat-checkbox class="table-checkbox" color="primary"
formControlName="is_applicant"></mat-checkbox>
formControlName="is_applicant" (change)="split_customer_abbr == 'SAL' ? salariedcheck() : ''"></mat-checkbox>
<!-- <button type="button" class="mr-1 mb-1 hover-icon" mat-raised-button mat-icon-button (click)="removeIndividuals(i)"
matTooltip="Remove Individuals" matTooltipPosition="below">
<mat-icon>delete</mat-icon>
@ -153,7 +153,7 @@
</mat-form-field>
</mat-card>
<!-- RI month and year ends-->
<mat-card>
<mat-card *ngIf="checksalaried == false">
<mat-form-field style="width:30%" class="mt-1">
<mat-select placeholder="Is the applicant name same as per KYC" formControlName="is_kyc" (selectionChange)="kycchange($event.value)" required>
<mat-option>Select</mat-option>
@ -192,8 +192,10 @@
Is Applicant</mat-checkbox>
<mat-form-field style="width: 45%;">
<mat-select [placeholder]="customer_segment_abbr == 'SEP_INDV' ? 'Entity type' : 'Business Entity Type'"
formControlName="business_entity_type"
<mat-label *ngIf="customer_segment_abbr == 'SEP_INDV' && split_customer_abbr != 'SAL'">Entity type</mat-label>
<mat-label *ngIf="customer_segment_abbr != 'SEP_INDV' && split_customer_abbr != 'SAL'">Business Entity Type</mat-label>
<mat-label *ngIf="split_customer_abbr == 'SAL'">Company/Firm Entity Type</mat-label>
<mat-select formControlName="business_entity_type"
(selectionChange)="checkEntityType(com.value.business_entity_type,c)"
required>
<mat-option>Select</mat-option>
@ -212,8 +214,9 @@
Specify Others Required</mat-error>
</mat-form-field>
<p><span *ngIf="customer_segment_abbr == 'SEP_INDV'">Number of Years in Current Profession</span>
<span *ngIf="customer_segment_abbr != 'SEP_INDV'">Number of Years For Which The Business Has Been Running</span></p>
<p><span *ngIf="customer_segment_abbr == 'SEP_INDV' && split_customer_abbr != 'SAL'">Number of Years in Current Profession</span>
<span *ngIf="customer_segment_abbr != 'SEP_INDV' && split_customer_abbr != 'SAL'">Number of Years For Which The Business Has Been Running</span>
<span *ngIf="split_customer_abbr == 'SAL'">Number of Years For Which The Company/Firm Has Been Running</span></p>
<mat-form-field style="width: 20%;">
<mat-label>Year</mat-label>
<input matInput placeholder="No of years (Eg. 10)"

View File

@ -86,6 +86,8 @@ export class GeneralInfoComponent implements OnInit {
businessEntityTypeList: any = [];
role_id: string;
image_doc_params: { pdid: string; form_id: number; company_id: string; };
checksalaried: boolean = false;
split_customer_abbr: any;
/********************** Declaration Section Ends Here *****************/
@ -100,6 +102,11 @@ export class GeneralInfoComponent implements OnInit {
this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id;
this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr;
this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr;
this.split_customer_abbr = this.customer_segment_abbr.split('-')
if(this.split_customer_abbr.length > 0){
this.split_customer_abbr = this.split_customer_abbr[0];
console.log(this.split_customer_abbr)
}
this.disableAfterSubmit = false;
this.role_id=localStorage.getItem('user_role')
this.image_doc_params={pdid:this.pdid,form_id:this.form_id,company_id:''}
@ -313,7 +320,10 @@ export class GeneralInfoComponent implements OnInit {
// });
// });
// }
if(this.split_customer_abbr == 'SAL'){
this.salariedcheck();
}
}
else {
@ -693,7 +703,7 @@ export class GeneralInfoComponent implements OnInit {
});
if (this.temp == formData.individuals.length) {
if (this.temp == formData.individuals.length && this.split_customer_abbr != 'SAL') {
this.notifier.notify('warning', 'Please Choose Name of Person Met.!');
this.temp = 0;
return;
@ -982,6 +992,25 @@ export class GeneralInfoComponent implements OnInit {
// console.log(event);
event =='no' ? this._generalForm.addControl('kyc_and_captur_the_name', new FormControl('')) : this._generalForm.removeControl('kyc_and_captur_the_name');
}
salariedcheck(){
console.log('checkbox',this._generalForm)
// this._generalForm.value.individuals.forEach((valueChanges) => {
// console.log(valueChanges);
// if(valueChanges.is_applicant == false || valueChanges.is_person_met == false){
// this.checksalaried = false;
// }else {
// this.checksalaried = true;
// }
// console.log('check box status',this.checksalaried);
// })
let control_value=this._generalForm.value.individuals
control_value=control_value.filter(val=>val.is_applicant == false || val.is_person_met == false)
console.log(control_value.length >0)
this.checksalaried = control_value.length > 0
}
}