Support additional export table report options (#1780)

Co-authored-by: Jose Alberto Hernandez <alberto@blue-daemon.local>

src/app/products/loan-products/create-loan-product/create-loan-product.component.ts

@@ -13,6 +13,7 @@ import { LoanProductAccountingStepComponent } from '../loan-product-stepper/loan
 /** Custom Services */
 import { ProductsService } from 'app/products/products.service';
 import { SettingsService } from 'app/settings/settings.service';
+import { GlobalConfiguration } from 'app/system/configurations/global-configurations-tab/configuration.model';
 
 @Component({
   selector: 'mifosx-create-loan-product',
@@ -47,7 +48,7 @@ export class CreateLoanProductComponent implements OnInit {
       const assetAccountData = this.loanProductsTemplate.accountingMappingOptions.assetAccountOptions || [];
       const liabilityAccountData = this.loanProductsTemplate.accountingMappingOptions.liabilityAccountOptions || [];
       this.loanProductsTemplate.accountingMappingOptions.assetAndLiabilityAccountOptions = assetAccountData.concat(liabilityAccountData);
-      data.configurations.globalConfiguration.forEach((config: any) => {
+      data.configurations.globalConfiguration.forEach((config: GlobalConfiguration) => {
         if (config.name === 'days-before-repayment-is-due') {
           this.loanProductsTemplate['dueDaysForRepaymentEvent'] = config.value;
         } else if (config.name === 'days-after-repayment-is-overdue') {

src/app/products/loan-products/edit-loan-product/edit-loan-product.component.ts

@@ -13,6 +13,7 @@ import { LoanProductAccountingStepComponent } from '../loan-product-stepper/loan
 /** Custom Services */
 import { ProductsService } from 'app/products/products.service';
 import { SettingsService } from 'app/settings/settings.service';
+import { GlobalConfiguration } from 'app/system/configurations/global-configurations-tab/configuration.model';
 
 @Component({
   selector: 'mifosx-edit-loan-product',
@@ -42,11 +43,22 @@ export class EditLoanProductComponent implements OnInit {
               private productsService: ProductsService,
               private settingsService: SettingsService,
               private router: Router) {
-    this.route.data.subscribe((data: { loanProductAndTemplate: any }) => {
+    this.route.data.subscribe((data: { loanProductAndTemplate: any, configurations: any }) => {
       this.loanProductAndTemplate = data.loanProductAndTemplate;
       const assetAccountData = this.loanProductAndTemplate.accountingMappingOptions.assetAccountOptions || [];
       const liabilityAccountData = this.loanProductAndTemplate.accountingMappingOptions.liabilityAccountOptions || [];
       this.loanProductAndTemplate.accountingMappingOptions.assetAndLiabilityAccountOptions = assetAccountData.concat(liabilityAccountData);
+      data.configurations.globalConfiguration.forEach((config: GlobalConfiguration) => {
+        if (config.name === 'days-before-repayment-is-due') {
+          if (this.loanProductAndTemplate['dueDaysForRepaymentEvent'] == null) {
+            this.loanProductAndTemplate['dueDaysForRepaymentEvent'] = config.value;
+          }
+        } else if (config.name === 'days-after-repayment-is-overdue') {
+          if (this.loanProductAndTemplate['overDueDaysForRepaymentEvent'] == null) {
+            this.loanProductAndTemplate['overDueDaysForRepaymentEvent'] = config.value;
+          }
+        }
+      });
     });
   }
 

src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.ts

@@ -184,8 +184,8 @@ export class LoanProductSettingsStepComponent implements OnInit {
         'graceOnArrearsAgeing': [true]
       }),
       'delinquencyBucketId': ['', Validators.required],
-      'dueDaysForRepaymentEvent': [''],
-      'overDueDaysForRepaymentEvent': ['']
+      'dueDaysForRepaymentEvent': ['', Validators.required],
+      'overDueDaysForRepaymentEvent': ['', Validators.required]
     });
   }
 

src/app/products/products-routing.module.ts

@@ -198,7 +198,8 @@ const routes: Routes = [
                   component: EditLoanProductComponent,
                   data: { title: extract('Edit Loan Product'), breadcrumb: 'Edit', routeParamBreadcrumb: false },
                   resolve: {
-                    loanProductAndTemplate: LoanProductAndTemplateResolver
+                    loanProductAndTemplate: LoanProductAndTemplateResolver,
+                    configurations: GlobalConfigurationsResolver
                   }
                 }
               ]