@@ -62,7 +63,8 @@
-
+
+
- 0 && units.value.paid_monthly_rent_per_met>0 && units.value.payment_mode!='' && units.value.payment_mode_per_met!='') && (units.value.monthly_rent_amount!=units.value.paid_monthly_rent_per_met) && units.value.payment_mode_per_met.id != 2 ">
+ 0 && units.value.paid_monthly_rent_per_met>0 && units.value.payment_mode!='' && units.value.payment_mode_per_met!='') && (units.value.monthly_rent_amount!=units.value.paid_monthly_rent_per_met) || units.value.payment_mode_per_met.id != 2 ">
What is the Reason for Difference in Rent Amount
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts
index 0436619ed..db012e129 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts
@@ -367,7 +367,7 @@ loadFormData(){
element.amount_received_cash_per_met ? control.controls[index].addControl('amount_received_cash_per_met', new FormControl('')) : control.controls[index].removeControl('amount_received_cash_per_met');
element.amount_received_bank_per_met ? control.controls[index].addControl('amount_received_bank_per_met', new FormControl('')) : control.controls[index].removeControl('amount_received_bank_per_met');
element.payment_received_reason_per_met ? control.controls[index].addControl('payment_received_reason_per_met', new FormControl('', Validators.required)) : control.controls[index].removeControl('payment_received_reason_per_met');
- element.payment_difference_per_met ? control.controls[index].addControl('payment_difference_per_met', new FormControl('')) : control.controls[index].removeControl('payment_difference_per_met');
+ (element.met_tenant_lessees_options=="1") ? control.controls[index].addControl('payment_difference_per_met', new FormControl('')) : control.controls[index].removeControl('payment_difference_per_met');
if(element.payment_mode_per_met){
@@ -467,7 +467,7 @@ addMoreUnitDetails(){
control.controls[index].addControl('amount_received_cash_per_met', new FormControl(value.amount_received_cash_per_met ? value.amount_received_cash_per_met : '', [Validators.required,Validators.max(paidmonthlyrentamt),Validators.min(paidmonthlyrentamt)]));
control.controls[index].removeControl('amount_received_bank_per_met');
control.controls[index].removeControl('payment_received_reason_per_met');
- }
+ }
else if(value && value.payment_mode_per_met.id==2){
control.controls[index].addControl('amount_received_bank_per_met', new FormControl(value.amount_received_bank_per_met ? value.amount_received_bank_per_met : '', [Validators.required,Validators.max(paidmonthlyrentamt),Validators.min(paidmonthlyrentamt)]));
control.controls[index].removeControl('amount_received_cash_per_met');
@@ -483,24 +483,31 @@ addMoreUnitDetails(){
control.controls[index].removeControl('amount_received_bank_per_met');
control.controls[index].removeControl('payment_received_reason_per_met');
}
- control.controls[index].payment_difference_per_met.setValue('');
- control.controls[index].payment_difference_per_met.updateValueAndValidity();
+
+ if(control.controls[index].payment_difference_per_met){
+ console.log('control.controls[index].payment_difference_per_met);',control.controls[index].payment_difference_per_met);
+ control.controls[index].payment_difference_per_met.setValue('');
+ control.controls[index].payment_difference_per_met.updateValueAndValidity();
+ }
+ else{
+ console.log('There is NO Control');
+ }
+
}
}
+
ValidatedRentAmount(value:any,index:number,type: number){
let control: any = this._rentalForm.controls['property_unit_details'];
- console.log('value',value);
if(type==1){
+ let monthlyrentamt : any = value.monthly_rent_amount ;
if(value && value.payment_mode.id==3){
let ChildCtrl : any = control.controls[index];
ChildCtrl.controls['amount_received_bank'].clearValidators();
ChildCtrl.controls['amount_received_bank'].updateValueAndValidity();
ChildCtrl.controls['amount_received_cash'].clearValidators();;
ChildCtrl.controls['amount_received_cash'].updateValueAndValidity();
- let monthlyrentamt : any = value.monthly_rent_amount ;
-
if(monthlyrentamt != ''){
@@ -508,9 +515,9 @@ addMoreUnitDetails(){
ChildCtrl.controls['amount_received_bank'].setValidators([Validators.required,Validators.max(monthlyrentamt),Validators.min(0)]);
ChildCtrl.controls['amount_received_bank'].updateValueAndValidity();
- let maxamt = monthlyrentamt-bank_amount
- if(maxamt >= 0 ){
- ChildCtrl.controls['amount_received_cash'].setValue(maxamt);
+ let remainingAmt = monthlyrentamt-bank_amount
+ if(remainingAmt >= 0 ){
+ ChildCtrl.controls['amount_received_cash'].setValue(remainingAmt);
ChildCtrl.controls['amount_received_cash'].setValidators([Validators.required,Validators.max(monthlyrentamt-bank_amount),Validators.min(monthlyrentamt-bank_amount)]);
}
else{
@@ -523,8 +530,9 @@ addMoreUnitDetails(){
}
}
if(type==2 && value.payment_mode_per_met != ''){
- console.log('type,value.payment_mode_per_met',type,value.payment_mode_per_met);
- if(value && value.payment_mode.id==3){
+
+ if(value && value.payment_mode_per_met.id==3){
+
let ChildCtrl : any = control.controls[index];
ChildCtrl.controls['amount_received_bank_per_met'].clearValidators();
ChildCtrl.controls['amount_received_bank_per_met'].updateValueAndValidity();
@@ -532,10 +540,9 @@ addMoreUnitDetails(){
ChildCtrl.controls['amount_received_cash_per_met'].updateValueAndValidity();
let paidmonthlyrentamt : any = value.paid_monthly_rent_per_met;
-
if(paidmonthlyrentamt != ''){
- let bank_amount = value.amount_received_bank;
+ let bank_amount = value.amount_received_bank_per_met;
ChildCtrl.controls['amount_received_bank_per_met'].setValidators([Validators.required,Validators.max(paidmonthlyrentamt),Validators.min(0)]);
ChildCtrl.controls['amount_received_bank_per_met'].updateValueAndValidity();
let remainingAmt = paidmonthlyrentamt-bank_amount
@@ -964,7 +971,6 @@ saveRental(formData: any) {
if(formData.property_unit_details.length > 0){
-
formData.property_unit_details.forEach((data,index) => {
TempArray1[index] = data.monthly_rent_amount;
ApplicantRentAmt = TempArray1.reduce((sum, val) => sum + +val, 0);
@@ -978,7 +984,7 @@ saveRental(formData: any) {
let Array : any = [];
if(formData.multistoried_building_details.length > 0){
formData.multistoried_building_details.forEach((val,index) => {
- // console.log('val.floor_rent_amount',val.floor_rent_amount,index);
+
Array[index] = val.floor_rent_amount;
FloorsTotalRentAmt = Array.reduce((sum, val) => sum + +val, 0);
});