Datepickers using max date with business date

2022-07-28 17:06:39 +02:00
parent 753791a078
commit a4b266080b
132 changed files with 268 additions and 42 deletions
@@ -70,6 +70,7 @@ export class EditStandingInstructionsComponent implements OnInit {
   * Creates and sets the edit standing instructions form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createEditStandingInstructionsForm();
    const presentDate = new Date();
    const n = presentDate.getFullYear();
@@ -49,6 +49,7 @@ export class CreateClosureComponent implements OnInit {
   * Creates the accounting closure form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createAccountingClosureForm();
  }

@@ -63,6 +63,7 @@ export class CreateJournalEntryComponent implements OnInit {
   * Creates the journal entry form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createJournalEntryForm();
  }

@@ -71,6 +71,7 @@ export class FrequentPostingsComponent implements OnInit {
   * Creates the frequent postings form and sets the affected gl entry form array.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createFrequentPostingsForm();
    this.setAffectedGLEntryForm();
  }
@@ -64,6 +64,7 @@ export class MigrateOpeningBalancesComponent implements OnInit {
   * Creates the opening balances form. (initially retrieves gl accounts on the basis of specified office)
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createOpeningBalancesForm();
  }

@@ -42,6 +42,7 @@ export class PeriodicAccrualsComponent implements OnInit {
   * Creates periodic accruals form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createPeriodicAccrualsForm();
  }

@@ -42,6 +42,7 @@ export class CreateProvisioningEntryComponent implements OnInit {
   * Creates the provisioning entry form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createProvisioningEntryForm();
  }

@@ -133,6 +133,7 @@ export class SearchJournalEntryComponent implements OnInit, AfterViewInit {
   * Sets filtered offices and gl accounts for autocomplete and journal entries table.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.setFilteredOffices();
    this.setFilteredGlAccounts();
    this.getJournalEntries();
@@ -48,6 +48,7 @@ export class ActivateCenterComponent implements OnInit {
   * Creates the activate center form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createActivateCenterForm();
  }

@@ -59,6 +59,7 @@ export class AttachCenterMeetingComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createCenterMeetingForm();
    this.buildDependencies();
  }
@@ -70,6 +70,7 @@ export class CenterAttendanceComponent implements OnInit {
   * Sets the members table.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    if (this.membersData !== undefined && this.membersData !== null) {
      this.dataSource = this.membersData.map((member: any) => ({ clientId: member.id, attendanceType: 1 }));
    }
@@ -50,6 +50,7 @@ export class CloseCenterComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createCloseCenterForm();
  }

@@ -57,6 +57,7 @@ export class EditCenterMeetingScheduleComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createEditMeetingScheduleForm();
  }

@@ -62,6 +62,7 @@ export class EditCenterMeetingComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createEditCenterMeetingForm();
    this.buildDependencies();
  }
@@ -62,6 +62,7 @@ export class CreateCenterComponent implements OnInit {
   * Creates and sets the center form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createCenterForm();
  }

@@ -54,6 +54,7 @@ export class EditCenterComponent implements OnInit {
   * Creates the edit center form.
   */
  ngOnInit(): void {
+    this.maxDate = this.settingsService.businessDate;
    this.createEditCenterForm();
  }

@@ -39,6 +39,7 @@ export class ClientFamilyMemberDialogComponent implements OnInit {
              private settingsService: SettingsService) { }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createFamilyMemberForm();
    if (this.data.context === 'Edit') {
      this.familyMemberForm.patchValue({
@@ -136,13 +136,15 @@
      <mat-datepicker #submittedOnDatePicker></mat-datepicker>
    </mat-form-field>

+    <br />
+
    <mat-checkbox fxFlex="48%" labelPosition="before" formControlName="active" class="margin-v">
      Active?
    </mat-checkbox>

    <mat-form-field *ngIf="createClientForm.contains('activationDate')" fxFlex="48%" (click)="activatedOnDatePicker.open()">
      <mat-label>Activation Date</mat-label>
-      <input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="activatedOnDatePicker" required
+      <input matInput [min]="minDate" [max]="createClientForm.value.submittedOnDate" [matDatepicker]="activatedOnDatePicker" required
        formControlName="activationDate">
      <mat-datepicker-toggle matSuffix [for]="activatedOnDatePicker"></mat-datepicker-toggle>
      <mat-datepicker #activatedOnDatePicker></mat-datepicker>
@@ -57,6 +57,7 @@ export class ClientGeneralStepComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.setOptions();
    this.buildDependencies();
  }
@@ -48,6 +48,7 @@ export class ActivateClientComponent implements OnInit {
   * Creates the activate client form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createActivateClientForm();
  }

@@ -55,6 +55,7 @@ export class AddClientChargeComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createClientsChargeForm();
    this.buildDependencies();
  }
@@ -50,6 +50,7 @@ export class CloseClientComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createCloseClientForm();
  }

@@ -48,6 +48,7 @@ export class ReactivateClientComponent implements OnInit {
   * Creates the reactivate client form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createReactivateClientForm();
  }

@@ -50,6 +50,7 @@ export class RejectClientComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createRejectClientForm();
  }

@@ -50,6 +50,7 @@ export class TransferClientComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createTransferClientForm();
  }

@@ -47,6 +47,7 @@ export class UndoClientRejectionComponent implements OnInit {
   * Creates the undo client rejection form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createUndoClientRejectionForm();
  }

@@ -50,6 +50,7 @@ export class WithdrawClientComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createWithdrawClientForm();
  }

@@ -51,6 +51,7 @@ export class AddFamilyMemberComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createAddFamilyMemberForm();
  }

@@ -50,6 +50,7 @@ export class EditFamilyMemberComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createEditFamilyMemberForm(this.familyMemberDetails);
  }

@@ -66,6 +66,7 @@ export class EditClientComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createEditClientForm();
    this.setOptions();
    this.buildDependencies();
@@ -100,6 +100,7 @@ export class IndividualCollectionSheetComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    if (localStorage.getItem('Success')) {
      localStorage.removeItem('Success');
      this.Success = true;
@@ -1,6 +1,5 @@
 import { DatePipe } from '@angular/common';
 import { Injectable } from '@angular/core';
-import { SettingsService } from 'app/settings/settings.service';
 import * as moment from 'moment';

@Injectable({
@@ -8,12 +7,10 @@ import * as moment from 'moment';
 })
 export class Dates {

-  constructor(private settingsService: SettingsService,
-      private datePipe: DatePipe) {}
+  constructor(private datePipe: DatePipe) {}

  public getDate(timestamp: any): string {
-    const dateFormat = this.settingsService.dateFormat;
-    return this.datePipe.transform(timestamp, dateFormat);
+    return this.datePipe.transform(timestamp, 'YYYY-MM-DD');
  }

  public formatDate(timestamp: any, dateFormat: string): string {
@@ -27,4 +24,8 @@ export class Dates {
      return moment(value).toDate();
    }
  }
+
+  public convertToDate(value: any, format: string): Date {
+    return moment(value).toDate();
+  }
 }
@@ -1,6 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { SettingsService } from 'app/settings/settings.service';

 /** Custom Services */
 import { FixedDepositsService } from '../../fixed-deposits.service';
@@ -38,13 +39,16 @@ export class FixedDepositAccountDetailsStepComponent implements OnInit {
   * Sets fixed deposits account details form.
   * @param {FormBuilder} formBuilder Form Builder.
   * @param {FixedDepositsService} fixedDepositsService Fixed Deposits Service.
+   * @param {SettingsService} settingsService Settings Service
   */
  constructor(private formBuilder: FormBuilder,
-              private fixedDepositsService: FixedDepositsService) {
+              private fixedDepositsService: FixedDepositsService,
+              private settingsService: SettingsService) {
    this.createFixedDepositsAccountDetailsForm();
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.buildDependencies();
    if (this.fixedDepositsAccountTemplate) {
      this.productData = this.fixedDepositsAccountTemplate.productOptions;
@@ -1,6 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit, Input, OnChanges } from '@angular/core';
 import { FormGroup, FormBuilder, FormControl, Validators } from '@angular/forms';
+import { SettingsService } from 'app/settings/settings.service';

 /**
 * Fixed Deposits Account Settings Step
@@ -34,8 +35,10 @@ export class FixedDepositAccountSettingsStepComponent implements OnInit, OnChang

  /**
   * @param {FormBuilder} formBuilder Form Builder
+   * @param {SettingsService} settingsService Settings Service
   */
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: FormBuilder,
+    private settingsService: SettingsService) {
    this.createFixedDepositAccountSettingsForm();
    this.buildDependencies();
  }
@@ -72,6 +75,7 @@ export class FixedDepositAccountSettingsStepComponent implements OnInit, OnChang
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    if (this.fixedDepositsAccountTemplate) {
      this.fixedDepositAccountSettingsForm.patchValue({
        'lockinPeriodFrequency': this.fixedDepositsAccountTemplate.lockinPeriodFrequency,
@@ -1,6 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit, Input, OnChanges } from '@angular/core';
 import { FormGroup, FormBuilder, Validators} from '@angular/forms';
+import { SettingsService } from 'app/settings/settings.service';

 /**
 * Fixed Deposits Terms Step
@@ -36,8 +37,10 @@ export class FixedDepositAccountTermsStepComponent implements OnInit, OnChanges

  /**
   * @param {FormBuilder} formBuilder Form Builder
+   * @param {SettingsService} settingsService Settings Service
   */
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: FormBuilder,
+    private settingsService: SettingsService) {
    this.createFixedDepositsAccountTermsForm();
  }

@@ -48,6 +51,7 @@ export class FixedDepositAccountTermsStepComponent implements OnInit, OnChanges
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    if (this.fixedDepositsAccountTemplate.interestCompoundingPeriodType) {
      this.fixedDepositAccountTermsForm.patchValue({
        'interestCompoundingPeriodType': this.fixedDepositsAccountTemplate.interestCompoundingPeriodType.id,
@@ -49,6 +49,7 @@ export class ActivateFixedDepositsAccountComponent implements OnInit {
   * Creates the activate fixed deposits form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createActivateFixedDepositsAccountForm();
  }

@@ -59,6 +59,7 @@ export class AddChargeFixedDepositsAccountComponent implements OnInit {
   * Creates the Fixed Deposits Charge form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createFixedDepositsChargeForm();
    this.buildDependencies();
  }
@@ -48,6 +48,7 @@ export class ApproveFixedDepositsAccountComponent implements OnInit {
   * Creates the approve fixed deposits form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createApproveFixedDepositsAccountForm();
  }

@@ -60,6 +60,7 @@ export class CloseFixedDepositsAccountComponent implements OnInit {
   * Creates the close on maturity fd account form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createCloseOnMaturityAccountForm();
    this.addTransferDetails();
  }
@@ -55,6 +55,7 @@ export class PrematureCloseFixedDepositsAccountComponent implements OnInit {
   * Creates the premature close fd account form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createPrematureCloseAccountForm();
    this.buildDependencies();
  }
@@ -48,6 +48,7 @@ export class RejectFixedDepositsAccountComponent implements OnInit {
   * Creates the reject fixed deposits form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createRejectFixedDepositsAccountForm();
  }

@@ -48,6 +48,7 @@ export class WithdrawByClientFixedDepositsAccountComponent implements OnInit {
   * Creates the withdraw fixed deposits form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createWithdrawFixedDepositsAccountForm();
  }

@@ -48,6 +48,7 @@ export class ActivateRecurringDepositsAccountComponent implements OnInit {
   * Creates the activate recurring deposits form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createActivateRecurringDepositsAccountForm();
  }

@@ -58,6 +58,7 @@ export class AddChargeRecurringDepositsAccountComponent implements OnInit {
   * Creates the Recurring Deposits Charge form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createRecurringDepositsChargeForm();
    this.buildDependencies();
  }
@@ -48,6 +48,7 @@ export class ApproveRecurringDepositsAccountComponent implements OnInit {
   * Creates the approve recurring deposits form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createApproveRecurringDepositsAccountForm();
  }

@@ -67,6 +67,7 @@ export class CloseRecurringDepositsAccountComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createcloseRecurringDepositForm();
  }

@@ -63,6 +63,7 @@ export class DepositRecurringDepositsAccountComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createdepositRecurringDepositForm();
  }

@@ -49,6 +49,7 @@ export class PrematureCloseRecurringDepositAccountComponent implements OnInit {
   * Creates the premature close recurring deposits form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createprematureCloseRecurringDepositsAccountForm();
  }

@@ -49,6 +49,7 @@ export class RejectRecurringDepositsAccountComponent implements OnInit {
   * Creates the reject recurring deposits form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createRejectRecurringDepositsAccountForm();
  }

@@ -39,7 +39,7 @@ export class WithdrawByClientRecurringDepositsAccountComponent implements OnInit
    private dateUtils: Dates,
    private route: ActivatedRoute,
    private router: Router,
-    private settingsService: SettingsService, ) {
+    private settingsService: SettingsService) {
    this.accountId = this.route.parent.snapshot.params['recurringDepositAccountId'];
  }

@@ -47,6 +47,7 @@ export class WithdrawByClientRecurringDepositsAccountComponent implements OnInit
   * Creates the withdraw recurring deposits form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createWithdrawRecurringDepositsAccountForm();
  }

@@ -1,6 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { SettingsService } from 'app/settings/settings.service';

 /** Custom Services */
 import { RecurringDepositsService } from '../../recurring-deposits.service';
@@ -38,13 +39,16 @@ export class RecurringDepositsAccountDetailsStepComponent implements OnInit {
   * Sets recurring deposits account details form.
   * @param {FormBuilder} formBuilder Form Builder.
   * @param {RecurringDepositsService} recurringDepositsService Recurring Deposits Service.
+   * @param {SettingsService} settingsService Settings Service
   */
  constructor(private formBuilder: FormBuilder,
-    private recurringDepositsService: RecurringDepositsService) {
+    private recurringDepositsService: RecurringDepositsService,
+    private settingsService: SettingsService) {
    this.createRecurringDepositsAccountDetailsForm();
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.buildDependencies();
    if (this.recurringDepositsAccountTemplate) {
      this.productData = this.recurringDepositsAccountTemplate.productOptions;
@@ -1,6 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit, Input, OnChanges } from '@angular/core';
 import { FormGroup, FormBuilder, Validators, FormControl } from '@angular/forms';
+import { SettingsService } from 'app/settings/settings.service';

 /** Custom Services */

@@ -34,8 +35,10 @@ export class RecurringDepositsAccountSettingsStepComponent implements OnInit, On

  /**
   * @param {FormBuilder} formBuilder Form Builder
+   * @param {SettingsService} settingsService Settings Service
   */
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: FormBuilder,
+    private settingsService: SettingsService) {
    this.createRecurringDepositAccountSettingsForm();
    this.buildDependencies();
  }
@@ -79,6 +82,7 @@ export class RecurringDepositsAccountSettingsStepComponent implements OnInit, On
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    if (this.recurringDepositsAccountTemplate) {
      this.recurringDepositAccountSettingsForm.patchValue({
        'lockinPeriodFrequency': this.recurringDepositsAccountTemplate.lockinPeriodFrequency,
@@ -1,6 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit, Input, OnChanges } from '@angular/core';
 import { FormGroup, FormBuilder, Validators, FormControl } from '@angular/forms';
+import { SettingsService } from 'app/settings/settings.service';

 /**
 * Recurring Deposits Terms Step
@@ -32,8 +33,10 @@ export class RecurringDepositsAccountTermsStepComponent implements OnInit, OnCha

  /**
   * @param {FormBuilder} formBuilder Form Builder
+   * @param {SettingsService} settingsService Settings Service
   */
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: FormBuilder,
+    private settingsService: SettingsService) {
    this.createRecurringDepositsAccountTermsForm();
  }

@@ -44,6 +47,7 @@ export class RecurringDepositsAccountTermsStepComponent implements OnInit, OnCha
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    if (this.recurringDepositsAccountTemplate.interestCompoundingPeriodType) {
      this.recurringDepositAccountTermsForm.patchValue({
        'interestCompoundingPeriodType': this.recurringDepositsAccountTemplate.interestCompoundingPeriodType.id,
@@ -65,6 +65,7 @@ export class EditTransactionComponent implements OnInit {
   * Creates the Recurring Deposits account transaction form when component loads.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createEditTransactionForm();
    this.editTransactionForm.patchValue({
      'transactionDate': this.transactionTemplateData.date && new Date(this.transactionTemplateData.date),
@@ -62,6 +62,7 @@ export class CreateGroupComponent implements OnInit, AfterViewInit {
   * Creates and sets the group form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createGroupForm();
  }

@@ -57,6 +57,7 @@ export class EditGroupComponent implements OnInit {
   * Creates and sets the edit group form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createEditGroupForm();
    this.editGroupForm.patchValue({
      'name': this.groupData.name,
@@ -45,6 +45,7 @@ export class ActivateGroupComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createActivateGroupForm();
  }

@@ -59,6 +59,7 @@ export class AttachGroupMeetingComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createGroupMeetingForm();
    this.buildDependencies();
  }
@@ -50,6 +50,7 @@ export class CloseGroupComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createCloseGroupForm();
  }

@@ -57,6 +57,7 @@ export class EditGroupMeetingScheduleComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createEditMeetingScheduleForm();
  }

@@ -62,6 +62,7 @@ export class EditGroupMeetingComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createEditGroupMeetingForm();
    this.buildDependencies();
  }
@@ -1,6 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { SettingsService } from 'app/settings/settings.service';

 /** Custom Services */
 import { LoansService } from '../../loans.service';
@@ -43,13 +44,16 @@ export class LoansAccountDetailsStepComponent implements OnInit {
   * Sets loans account details form.
   * @param {FormBuilder} formBuilder Form Builder.
   * @param {LoansService} loansService Loans Service.
+   * @param {SettingsService} settingsService SettingsService
   */
  constructor(private formBuilder: FormBuilder,
-    private loansService: LoansService) {
+    private loansService: LoansService,
+    private settingsService: SettingsService) {
    this.createLoansAccountDetailsForm();
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.buildDependencies();
    if (this.loansAccountTemplate) {
      this.productData = this.loansAccountTemplate.productOptions;
@@ -1,7 +1,7 @@
 /** Angular Imports */
 import { Component, OnInit, Input, OnChanges } from '@angular/core';
-import { FormGroup, FormBuilder, Validators, FormControl, FormArray } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
+import { FormGroup, FormBuilder, Validators, FormArray } from '@angular/forms';
+import { SettingsService } from 'app/settings/settings.service';

 /**
 * Create Loans Account Terms Step
@@ -46,12 +46,10 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
  /**
   * Create Loans Account Terms Form
   * @param formBuilder FormBuilder
-   * @param route Route
-   * @param router Router
+   * @param {SettingsService} settingsService SettingsService
   */
  constructor(private formBuilder: FormBuilder,
-              private route: ActivatedRoute,
-              private router: Router) {
+      private settingsService: SettingsService) {
    this.createloansAccountTermsForm();
  }
  /**
@@ -87,6 +85,7 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    if (this.loansAccountTemplate) {
      if (this.loansAccountTemplate.loanProductId) {
        this.loansAccountTermsForm.patchValue({
@@ -67,6 +67,7 @@ export class AddLoanChargeComponent implements OnInit {
   * Creates the Loan Charge form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createLoanChargeForm();
    this.loanChargeForm.controls.chargeId.valueChanges.subscribe(chargeId => {
      const chargeDetails = this.loanChargeOptions.find(option => {
@@ -45,6 +45,7 @@ export class AssignLoanOfficerComponent implements OnInit {
   * Creates the assign officer form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createassignOfficerForm();
    this.loanOfficers = this.dataObject.loanOfficerOptions;
  }
@@ -45,6 +45,7 @@ export class CloseAsRescheduledComponent implements OnInit {
   * Creates the close form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createCloseForm();
  }

@@ -55,6 +55,7 @@ export class CreateGuarantorComponent implements OnInit, AfterViewInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createNewGuarantorForm();
    this.setNewGuarantorDetailsForm();
    this.buildDependencies();
@@ -43,6 +43,7 @@ export class DisburseLoanAccountComponent implements OnInit {
              private settingsService: SettingsService) { }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.setDisbursementToSavingsForm();
  }

@@ -54,6 +54,7 @@ export class DisburseComponent implements OnInit {
   * and initialize with the required values
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createDisbursementLoanForm();
    this.setDisbursementLoanDetails();
  }
@@ -39,6 +39,7 @@ export class ForeclosureComponent implements OnInit {
    }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createforeclosureForm();
    this.onChanges();
  }
@@ -46,6 +46,7 @@ export class LoanRescheduleComponent implements OnInit {
    }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.codes = this.dataObject.rescheduleReasons;
    this.setRescheduleLoanForm();
  }
@@ -46,6 +46,7 @@ export class LoansAccountCloseComponent implements OnInit {
   * Creates the close form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createCloseForm();
  }

@@ -53,6 +53,7 @@ export class MakeRepaymentComponent implements OnInit {
   * and initialize with the required values
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createRepaymentLoanForm();
    this.setRepaymentLoanDetails();
  }
@@ -58,6 +58,7 @@ export class PrepayLoanComponent implements OnInit {
   * and initialize with the required values
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createprepayLoanForm();
    this.setPrepayLoanDetails();
  }
@@ -53,6 +53,7 @@ export class RecoveryRepaymentComponent implements OnInit {
   * and initialize with the required values
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createRecoveryRepaymentLoanForm();
    this.setRecoveryRepaymentLoanDetails();
  }
@@ -44,6 +44,7 @@ export class RejectLoanComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.setRejectLoanForm();
  }

@@ -42,6 +42,7 @@ export class WaiveInterestComponent implements OnInit {
              private route: ActivatedRoute) { }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.setLoanInterestForm();
  }

@@ -49,6 +49,7 @@ export class WithdrawnByClientComponent implements OnInit {
   * and initialize with the required values
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createWithdrawnByClientLoanForm();
  }

@@ -45,6 +45,7 @@ export class WriteOffPageComponent implements OnInit {
              private settingsService: SettingsService) { }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.setWriteOffForm();
  }

@@ -65,6 +65,7 @@ export class EditTransactionComponent implements OnInit {
   * Creates the Loan account transaction form when component loads.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createEditTransactionForm();
    this.editTransactionForm.patchValue({
      'transactionDate': this.transactionTemplateData.date && new Date(this.transactionTemplateData.date),
@@ -7,6 +7,7 @@ import { ActivatedRoute } from '@angular/router';
 /** Custom Services */
 import { ReportsService } from 'app/reports/reports.service';
 import { Dates } from 'app/core/utils/dates';
+import { SettingsService } from 'app/settings/settings.service';

 /**
 * Export Client Loans Transactions Component
@@ -38,19 +39,21 @@ export class ExportTransactionsComponent implements OnInit {
   * @param {FormBuilder} formBuilder Form Builder
   * @param {Dates} dateUtils Date Utils
   * @param {ActivatedRoute} route Activated Route
+   * @param {SettingsService} settingsService Settings Service
   */
  constructor(private sanitizer: DomSanitizer,
              private reportsService: ReportsService,
              private formBuilder: FormBuilder,
              private dateUtils: Dates,
-              private route: ActivatedRoute) {
+              private route: ActivatedRoute,
+              private settingsService: SettingsService) {
    this.route.parent.parent.data.subscribe((data: { loanDetailsData: any }) => {
      this.loansAccountId = data.loanDetailsData.accountNo;
    });
  }

-
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createTransactionsReportForm();
  }

@@ -57,6 +57,7 @@ export class BulkLoanReassignmnetComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.setBulkLoanForm();
  }

@@ -51,6 +51,7 @@ export class CreateEmployeeComponent implements OnInit {
   * Creates the employee form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createEmployeeForm();
  }

@@ -54,6 +54,7 @@ export class EditEmployeeComponent implements OnInit {
   * Creates the edit employee form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createEditEmployeeForm();
  }

@@ -61,6 +61,7 @@ export class FundMappingComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createFundMappingForm();
    this.buildDependencies();
  }
@@ -58,6 +58,7 @@ export class EditHolidayComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.setEditForm();
    if (!this.isActiveHoliday) {
      this.getReschedulingType();
@@ -48,6 +48,7 @@ export class CreateOfficeComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createofficeForm();
  }

@@ -49,6 +49,7 @@ export class EditOfficeComponent implements OnInit {
    }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createOfficeForm();
  }

@@ -1,5 +1,5 @@
 /** Angular Imports */
-import { Component, OnChanges, Input, Output, EventEmitter } from '@angular/core';
+import { Component, OnChanges, Input, Output, EventEmitter, OnInit } from '@angular/core';
 import { Validators, FormGroup, FormControl } from '@angular/forms';

 /** Rxjs Imports */
@@ -22,7 +22,7 @@ import { Dates } from 'app/core/utils/dates';
  templateUrl: './edit-business-rule-parameters.component.html',
  styleUrls: ['./edit-business-rule-parameters.component.scss']
 })
-export class EditBusinessRuleParametersComponent implements OnChanges {
+export class EditBusinessRuleParametersComponent implements OnInit, OnChanges {

  /** Run Report Parameters Data */
  @Input() paramData: any;
@@ -44,11 +44,16 @@ export class EditBusinessRuleParametersComponent implements OnChanges {

  /**
   * @param {ReportsService} reportsService Reports Service
+   * @param {SettingsService} settingsService Settings Service.
   */
  constructor(private reportsService: ReportsService,
              private settingsService: SettingsService,
              private dateUtils: Dates) { }

+  ngOnInit(): void {
+    this.maxDate = this.settingsService.businessDate;
+  }
+
  ngOnChanges() {
    if (this.paramData) {
      this.ReportForm = new FormGroup({});
@@ -7,6 +7,7 @@ import { ReportsService } from 'app/reports/reports.service';

 /** Custom Models */
 import { ReportParameter } from 'app/reports/common-models/report-parameter.model';
+import { SettingsService } from 'app/settings/settings.service';

 /**
 * Edit SMS Campaign step.
@@ -46,9 +47,11 @@ export class EditSmsCampaignStepComponent implements OnInit {
  /**
   * @param {FormBuilder} formBuilder Form Builder
   * @param {ReportsService} reportService Reports Service
+   * @param {SettingsService} settingsService Settings Service.
   */
  constructor(private formBuilder: FormBuilder,
-              private reportService: ReportsService) {
+              private reportService: ReportsService,
+              private settingsService: SettingsService) {
    this.createSMSCampaignDetailsForm();
  }

@@ -66,6 +69,7 @@ export class EditSmsCampaignStepComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.triggerTypes = this.smsCampaignTemplate.triggerTypeOptions;
    this.smsProviders = this.smsCampaignTemplate.smsProviderOptions;
    this.businessRules = this.smsCampaignTemplate.businessRulesOptions;
@@ -1,5 +1,5 @@
 /** Angular Imports */
-import { Component, OnChanges, Input, Output, EventEmitter } from '@angular/core';
+import { Component, OnChanges, Input, Output, EventEmitter, OnInit } from '@angular/core';
 import { Validators, FormGroup, FormControl } from '@angular/forms';

 /** Custom Services */
@@ -19,7 +19,7 @@ import { Dates } from 'app/core/utils/dates';
  templateUrl: './business-rule-parameters.component.html',
  styleUrls: ['./business-rule-parameters.component.scss']
 })
-export class BusinessRuleParametersComponent implements OnChanges {
+export class BusinessRuleParametersComponent implements OnInit, OnChanges {

  /** Run Report Parameters Data */
  @Input() paramData: any;
@@ -47,6 +47,10 @@ export class BusinessRuleParametersComponent implements OnChanges {
              private settingsService: SettingsService,
              private dateUtils: Dates) { }

+  ngOnInit(): void {
+    this.maxDate = this.settingsService.businessDate;
+  }
+
  ngOnChanges() {
    if (this.paramData) {
      this.ReportForm = new FormGroup({});
@@ -92,8 +92,8 @@ export class ViewCampaignComponent implements OnInit {
    });
  }

-
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createSMSForm();
  }

@@ -63,6 +63,7 @@ export class StandingInstructionsHistoryComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createInstructionForm();
    this.buildDependencies();
  }
@@ -48,6 +48,7 @@ export class AllocateCashComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.setCashierForm();
  }

@@ -48,6 +48,7 @@ export class CreateCashierComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.setCreateCashierForm();
  }

@@ -52,6 +52,7 @@ export class EditCashierComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.setEditChargeForm();
  }

@@ -45,6 +45,7 @@ export class SettleCashComponent implements OnInit {
  }

  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.setCashierForm();
  }

@@ -55,6 +55,7 @@ export class CreateTellerComponent implements OnInit {
   * Creates the teller form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createTellerForm();
  }

@@ -67,6 +67,7 @@ export class EditTellerComponent implements OnInit {
   * Creates the Edit teller form.
   */
  ngOnInit() {
+    this.maxDate = this.settingsService.businessDate;
    this.createEditTellerForm();
  }

@@ -54,8 +54,12 @@ export class CreateChargeComponent implements OnInit {
              private settingsService: SettingsService) {
    this.route.data.subscribe((data: { chargesTemplate: any }) => {
      this.chargesTemplateData = data.chargesTemplate;
-      this.incomeAndLiabilityAccountData = data.chargesTemplate.incomeOrLiabilityAccountOptions.incomeAccountOptions
-        .concat(data.chargesTemplate.incomeOrLiabilityAccountOptions.liabilityAccountOptions);
+      if (data.chargesTemplate.incomeOrLiabilityAccountOptions.liabilityAccountOptions) {
+        this.incomeAndLiabilityAccountData = data.chargesTemplate.incomeOrLiabilityAccountOptions.incomeAccountOptions
+          .concat(data.chargesTemplate.incomeOrLiabilityAccountOptions.liabilityAccountOptions);
+      } else {
+        this.incomeAndLiabilityAccountData = data.chargesTemplate.incomeOrLiabilityAccountOptions.incomeAccountOptions;
+      }
    });
  }

--- a/Show More
+++ b/Show More