Merge pull request #3505 from JaySoni1/WEB-921-restrict-negative-values-in-fixed-deposits-frequency-and-period-fields

WEB-921 Restrict negative values in fixed deposits frequency and period  fields

Author: alberto-art3ch

src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-settings-step/fixed-deposit-account-settings-step.component.html

@@ -12,7 +12,7 @@ <h4 class="mat-h4 flex-98">{{ 'labels.heading.Lock-in Period' | translate }}</h4
 
     <mat-form-field class="flex-48">
       <mat-label>{{ 'labels.inputs.Frequency' | translate }}</mat-label>
-      <input type="number" matInput formControlName="lockinPeriodFrequency" />
+      <input type="number" matInput formControlName="lockinPeriodFrequency" mifosxPositiveInteger />
     </mat-form-field>
 
     <mat-form-field class="flex-48">

src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-settings-step/fixed-deposit-account-settings-step.component.ts

@@ -22,6 +22,7 @@ import { MatCheckbox } from '@angular/material/checkbox';
 import { MatStepperPrevious, MatStepperNext } from '@angular/material/stepper';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { PositiveIntegerDirective } from 'app/directives/positive-integer.directive';
 
 /**
  * Fixed Deposits Account Settings Step
@@ -36,7 +37,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
     MatCheckbox,
     MatStepperPrevious,
     FaIconComponent,
-    MatStepperNext
+    MatStepperNext,
+    PositiveIntegerDirective
   ]
 })
 export class FixedDepositAccountSettingsStepComponent implements OnInit, OnChanges {
@@ -53,7 +55,7 @@ export class FixedDepositAccountSettingsStepComponent implements OnInit, OnChang
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Fixed Deposits Account Settings Form */
-  fixedDepositAccountSettingsForm: UntypedFormGroup;
+  fixedDepositAccountSettingsForm!: UntypedFormGroup;
   /** Lockin Period Frequency Type Data */
   lockinPeriodFrequencyTypeData: any;
   /** Period Frequency Type Data */
@@ -63,7 +65,7 @@ export class FixedDepositAccountSettingsStepComponent implements OnInit, OnChang
   /** Savings Accounts Data */
   savingsAccountsData: any;
 
-  maturityInstructionOptions: OptionData[];
+  maturityInstructionOptions!: OptionData[];
 
   /**
    * @param {FormBuilder} formBuilder Form Builder
@@ -98,14 +100,14 @@ export class FixedDepositAccountSettingsStepComponent implements OnInit, OnChang
       });
       if (this.fixedDepositsAccountProductTemplate.withHoldTax) {
         this.fixedDepositAccountSettingsForm.addControl('withHoldTax', new UntypedFormControl(false));
-        this.fixedDepositAccountSettingsForm.get('withHoldTax').valueChanges.subscribe((value: boolean) => {
+        this.fixedDepositAccountSettingsForm.get('withHoldTax')!.valueChanges.subscribe((value: boolean) => {
           if (value) {
             this.fixedDepositAccountSettingsForm.addControl(
               'taxGroupId',
               new UntypedFormControl({ value: '', disabled: true })
             );
             this.fixedDepositAccountSettingsForm
-              .get('taxGroupId')
+              .get('taxGroupId')!
               .patchValue(
                 this.fixedDepositsAccountProductTemplate.taxGroup &&
                   this.fixedDepositsAccountProductTemplate.taxGroup.name
@@ -115,7 +117,7 @@ export class FixedDepositAccountSettingsStepComponent implements OnInit, OnChang
           }
         });
         this.fixedDepositAccountSettingsForm
-          .get('withHoldTax')
+          .get('withHoldTax')!
           .patchValue(this.fixedDepositsAccountTemplate.withHoldTax);
       } else {
         this.fixedDepositAccountSettingsForm.removeControl('withHoldTax');
@@ -162,29 +164,29 @@ export class FixedDepositAccountSettingsStepComponent implements OnInit, OnChang
    * Subscribes to value changes and sets new form controls accordingly.
    */
   buildDependencies() {
-    this.fixedDepositAccountSettingsForm.get('transferInterestToSavings').valueChanges.subscribe((value: boolean) => {
+    this.fixedDepositAccountSettingsForm.get('transferInterestToSavings')!.valueChanges.subscribe((value: boolean) => {
       if (value) {
         this.fixedDepositAccountSettingsForm.addControl(
           'linkAccountId',
           new UntypedFormControl('', Validators.required)
         );
         this.fixedDepositAccountSettingsForm
-          .get('linkAccountId')
+          .get('linkAccountId')!
           .patchValue(
             this.fixedDepositsAccountTemplate.linkedAccount && this.fixedDepositsAccountTemplate.linkedAccount.id
           );
       } else {
         this.fixedDepositAccountSettingsForm.removeControl('linkAccountId');
       }
     });
-    this.fixedDepositAccountSettingsForm.get('maturityInstructionId').valueChanges.subscribe((value: number) => {
+    this.fixedDepositAccountSettingsForm.get('maturityInstructionId')!.valueChanges.subscribe((value: number) => {
       if (value > 100) {
         this.fixedDepositAccountSettingsForm.addControl(
           'transferToSavingsId',
           new UntypedFormControl('', Validators.required)
         );
         this.fixedDepositAccountSettingsForm
-          .get('transferToSavingsId')
+          .get('transferToSavingsId')!
           .patchValue(
             this.fixedDepositsAccountTemplate.transferToSavingsId &&
               this.fixedDepositsAccountTemplate.transferToSavingsId.id

src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-terms-step/fixed-deposit-account-terms-step.component.html

@@ -23,7 +23,7 @@
 
     <mat-form-field class="flex-48">
       <mat-label>{{ 'labels.inputs.Deposit Period' | translate }}</mat-label>
-      <input type="number" matInput formControlName="depositPeriod" required />
+      <input type="number" matInput formControlName="depositPeriod" mifosxPositiveInteger required />
       <mat-error>
         {{ 'labels.inputs.Deposit Period' | translate }} {{ 'labels.commons.is' | translate }}
         <strong>{{ 'labels.commons.required' | translate }}</strong>

src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-terms-step/fixed-deposit-account-terms-step.component.ts

@@ -16,6 +16,7 @@ import { MatDivider } from '@angular/material/divider';
 import { MatStepperPrevious, MatStepperNext } from '@angular/material/stepper';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { PositiveIntegerDirective } from 'app/directives/positive-integer.directive';
 
 /**
  * Fixed Deposits Terms Step
@@ -30,7 +31,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
     MatDivider,
     MatStepperPrevious,
     FaIconComponent,
-    MatStepperNext
+    MatStepperNext,
+    PositiveIntegerDirective
   ]
 })
 export class FixedDepositAccountTermsStepComponent implements OnInit, OnChanges {
@@ -47,7 +49,7 @@ export class FixedDepositAccountTermsStepComponent implements OnInit, OnChanges
   /** Maximum date allowed. */
   maxDate = new Date();
   /** Fixed Deposits Account Terms Form */
-  fixedDepositAccountTermsForm: UntypedFormGroup;
+  fixedDepositAccountTermsForm!: UntypedFormGroup;
   /** Interest Compounding Period Type Data */
   interestCompoundingPeriodTypeData: any;
   /** Interest Posting Period Type Data */