feat: add savings charge form (#726)

Fixes: #250

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

@@ -49,6 +49,11 @@ const routes: Routes = [
         path: '',
         component: ClientsComponent,
       },
+      {
+        path: ':clientId/savingsaccounts',
+        data: { routeParamBreadcrumb: 'clientId'},
+        loadChildren: '../savings/savings.module#SavingsModule'
+      },
       {
         path: ':clientId',
         component: ClientsViewComponent,

src/app/savings/add-savings-charge/add-savings-charge.component.html

@@ -0,0 +1,93 @@
+<div class="container">
+
+  <mat-card>
+
+    <form [formGroup]="savingsChargeForm" (ngSubmit)="submit()">
+
+      <mat-card-content>
+
+        <div fxLayout="column">
+          <mat-form-field>
+            <mat-label>Charge</mat-label>
+            <mat-select required formControlName="chargeId">
+              <mat-option *ngFor="let savingsCharge of savingsChargeOptions" [value]="savingsCharge.id">
+                {{ savingsCharge.name + ' (' + savingsCharge.currency.name + ')' }}
+              </mat-option>
+            </mat-select>
+            <mat-error *ngIf="savingsChargeForm.controls.chargeId.hasError('required')">
+              Charge is <strong>required</strong>
+            </mat-error>
+          </mat-form-field>
+
+          <div *ngIf="chargeDetails" fxLayout="column">
+
+            <mat-form-field>
+              <mat-label>Amount</mat-label>
+              <input type=number required matInput formControlName="amount" />
+              <mat-error *ngIf="savingsChargeForm.controls.amount.hasError('required')">
+                Amount is <strong>required</strong>
+              </mat-error>
+            </mat-form-field>
+
+            <mat-form-field>
+              <mat-label>Charge Calculation</mat-label>
+              <mat-select formControlName="chargeCalculationType">
+                <mat-option *ngFor="let chargeCalculation of chargeDetails.chargeCalculationTypeOptions"
+                  [value]="chargeCalculation.id">
+                  {{ chargeCalculation.value }}
+                </mat-option>
+              </mat-select>
+            </mat-form-field>
+
+            <mat-form-field>
+              <mat-label>Charge time type</mat-label>
+              <mat-select formControlName="chargeTimeType">
+                <mat-option *ngFor="let chargeTime of chargeDetails.chargeTimeTypeOptions" [value]="chargeTime.id">
+                  {{ chargeTime.value }}
+                </mat-option>
+              </mat-select>
+            </mat-form-field>
+
+            <mat-form-field *ngIf="savingsChargeForm.contains('dueDate')">
+              <mat-label>Due for collection on</mat-label>
+              <input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="dueDatePicker" required
+                formControlName="dueDate">
+              <mat-datepicker-toggle matSuffix [for]="dueDatePicker"></mat-datepicker-toggle>
+              <mat-datepicker #dueDatePicker></mat-datepicker>
+              <mat-error *ngIf="savingsChargeForm.controls.dueDate.hasError('required')">
+                Due for collection on is <strong>required</strong>
+              </mat-error>
+            </mat-form-field>
+
+            <mat-form-field *ngIf="savingsChargeForm.contains('feeOnMonthDay')">
+              <mat-label>Due On</mat-label>
+              <input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="feeOnMonthDayPicker" required
+                formControlName="feeOnMonthDay">
+              <mat-datepicker-toggle matSuffix [for]="feeOnMonthDayPicker"></mat-datepicker-toggle>
+              <mat-datepicker #feeOnMonthDayPicker></mat-datepicker>
+              <mat-error *ngIf="savingsChargeForm.controls.feeOnMonthDay.hasError('required')">
+                Due Date is <strong>required</strong>
+              </mat-error>
+            </mat-form-field>
+
+            <mat-form-field *ngIf="savingsChargeForm.contains('feeInterval')">
+              <mat-label>Repeats Every</mat-label>
+              <input matInput formControlName="feeInterval" />
+            </mat-form-field>
+
+          </div>
+
+        </div>
+
+        <mat-card-actions fxLayoutGap="5px" fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center">
+          <button type="button" mat-raised-button [routerLink]="['../']">Cancel</button>
+          <button mat-raised-button color="primary" [disabled]="!savingsChargeForm.valid">Submit</button>
+        </mat-card-actions>
+
+      </mat-card-content>
+
+    </form>
+
+  </mat-card>
+
+</div>

src/app/savings/add-savings-charge/add-savings-charge.component.scss

@@ -0,0 +1,3 @@
+.container{
+  width: 37rem;
+}

src/app/savings/add-savings-charge/add-savings-charge.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AddSavingsChargeComponent } from './add-savings-charge.component';
+
+describe('AddSavingsChargeComponent', () => {
+  let component: AddSavingsChargeComponent;
+  let fixture: ComponentFixture<AddSavingsChargeComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AddSavingsChargeComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AddSavingsChargeComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/savings/add-savings-charge/add-savings-charge.component.ts

@@ -0,0 +1,138 @@
+/** Angular Imports */
+import { Component, OnInit } from '@angular/core';
+import { FormGroup, FormBuilder, Validators, FormControl } from '@angular/forms';
+import { Router, ActivatedRoute } from '@angular/router';
+import { DatePipe } from '@angular/common';
+
+/** Custom Services */
+import { SavingsService } from '../savings.service';
+
+/**
+ * Add Savings Charge component.
+ */
+@Component({
+  selector: 'mifosx-add-savings-charge',
+  templateUrl: './add-savings-charge.component.html',
+  styleUrls: ['./add-savings-charge.component.scss']
+})
+export class AddSavingsChargeComponent implements OnInit {
+
+  /** Minimum Due Date allowed. */
+  minDate = new Date(2000, 0, 1);
+  /** Maximum Due Date allowed. */
+  maxDate = new Date();
+  /** Add Savings Charge form. */
+  savingsChargeForm: FormGroup;
+  /** savings charge options. */
+  savingsChargeOptions: any;
+  /** savings Id of the savings account. */
+  savingAccountId: string;
+  /** charge details */
+  chargeDetails: any;
+
+  /**
+   * Retrieves the savings charge template data from `resolve`.
+   * @param {FormBuilder} formBuilder Form Builder.
+   * @param {AccountingService} accountingService Accounting Service.
+   * @param {ActivatedRoute} route Activated Route.
+   * @param {Router} router Router for navigation.
+   */
+  constructor(
+    private formBuilder: FormBuilder,
+    private route: ActivatedRoute,
+    private router: Router,
+    private datePipe: DatePipe,
+    private savingsService: SavingsService
+  ) {
+    this.route.data.subscribe((data: { savingsChargeTemplate: any }) => {
+      this.savingsChargeOptions = data.savingsChargeTemplate.chargeOptions;
+    });
+    this.savingAccountId = this.route.snapshot.params['savingAccountId'];
+  }
+
+  /**
+   * Creates the Savings Charge form.
+   */
+  ngOnInit() {
+    this.createSavingsChargeForm();
+    this.buildDependencies();
+  }
+
+  buildDependencies() {
+    this.savingsChargeForm.controls.chargeId.valueChanges.subscribe(chargeId => {
+      this.savingsService.getChargeTemplate(chargeId).subscribe((data: any) => {
+        this.chargeDetails = data;
+        const chargeTimeType = data.chargeTimeType.id;
+        if (data.chargeTimeType.value === 'Withdrawal Fee' || data.chargeTimeType.value === 'Saving No Activity Fee') {
+          this.chargeDetails.dueDateNotRequired = true;
+        }
+        if (data.chargeTimeType.value === 'Annual Fee' || data.chargeTimeType.value === 'Monthly Fee') {
+          this.chargeDetails.chargeTimeTypeAnnualOrMonth = true;
+        }
+        if (!this.chargeDetails.dueDateNotRequired && !this.chargeDetails.chargeTimeTypeAnnualOrMonth) {
+          this.savingsChargeForm.addControl('dueDate', new FormControl('', Validators.required));
+        } else {
+          this.savingsChargeForm.removeControl('dueDate');
+        }
+        if (!this.chargeDetails.dueDateNotRequired && this.chargeDetails.chargeTimeTypeAnnualOrMonth) {
+          this.savingsChargeForm.addControl('feeOnMonthDay', new FormControl('', Validators.required));
+        } else {
+          this.savingsChargeForm.removeControl('feeOnMonthDay');
+        }
+        if (chargeTimeType.value === 'Monthly Fee') {
+          this.savingsChargeForm.addControl('feeInterval', new FormControl(data.feeInterval, Validators.required));
+        } else {
+          this.savingsChargeForm.removeControl('feeInterval');
+        }
+        this.savingsChargeForm.patchValue({
+          'amount': data.amount,
+          'chargeCalculationType': data.chargeCalculationType.id,
+          'chargeTimeType': data.chargeTimeType.id
+        });
+      });
+    });
+  }
+
+  /**
+   * Creates the Savings Charge form.
+   */
+  createSavingsChargeForm() {
+    this.savingsChargeForm = this.formBuilder.group({
+      'chargeId': ['', Validators.required],
+      'amount': ['', Validators.required],
+      'chargeCalculationType': [{ value: '', disabled: true }],
+      'chargeTimeType': [{ value: '', disabled: true }]
+    });
+  }
+
+  /**
+   * Submits savings charge.
+   */
+  submit() {
+    const savingsCharge = this.savingsChargeForm.value;
+    savingsCharge.locale = 'en';
+    if (!savingsCharge.feeInterval) {
+      savingsCharge.feeInterval = this.chargeDetails.feeInterval;
+    }
+    if (this.chargeDetails.dueDateNotRequired !== true) {
+      if (this.chargeDetails.chargeTimeTypeAnnualOrMonth === true) {
+        const monthDayFormat = 'MMMM-dd'; // TODO: Update once language and date settings are setup
+        savingsCharge.monthDayFormat = monthDayFormat;
+        if (savingsCharge.feeOnMonthDay) {
+          const prevDate = this.savingsChargeForm.value.feeOnMonthDay;
+          savingsCharge.feeOnMonthDay = this.datePipe.transform(prevDate, monthDayFormat);
+        }
+      } else {
+        const dateFormat = 'yyyy-MM-dd';
+        savingsCharge.dateFormat = dateFormat;
+        if (savingsCharge.dueDate) {
+          const prevDate = this.savingsChargeForm.value.dueDate;
+          savingsCharge.dueDate = this.datePipe.transform(prevDate, dateFormat);
+        }
+      }
+    }
+    this.savingsService.createSavingsCharge(this.savingAccountId, 'charges', savingsCharge).subscribe(res => {
+      // this.router.navigate(['../'], { relativeTo: this.route });
+    });
+  }
+}

src/app/savings/common-resolvers/savings-charge-template.resolver.ts

@@ -0,0 +1,30 @@
+/** Angular Imports */
+import { Injectable } from '@angular/core';
+import { Resolve, ActivatedRouteSnapshot } from '@angular/router';
+
+/** rxjs Imports */
+import { Observable } from 'rxjs';
+
+/** Custom Services */
+import { SavingsService } from '../savings.service';
+
+/**
+ * Savings Charge Template data resolver.
+ */
+@Injectable()
+export class SavingsChargeTemplateResolver implements Resolve<Object> {
+
+  /**
+   * @param {SavingsService} SavingsService savings service.
+   */
+  constructor(private savingsService: SavingsService) {}
+
+  /**
+   * Returns the Savings Charge Template.
+   * @returns {Observable<any>}
+   */
+  resolve(route: ActivatedRouteSnapshot): Observable<any> {
+    const savingAccountId = route.paramMap.get('savingAccountId');
+    return this.savingsService.getSavingsChargeTemplateResource(savingAccountId);
+  }
+}

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

@@ -7,38 +7,52 @@ import { extract } from '../core/i18n/i18n.service';
 
 /** Custom Components */
 import { SavingAccountActionsComponent } from './saving-account-actions/saving-account-actions.component';
+import { AddSavingsChargeComponent } from './add-savings-charge/add-savings-charge.component';
 
 /** Custom Resolvers */
 import { SavingAccountTransactionTemplateResolver } from './common-resolvers/saving-transaction-template.resolver';
+import { SavingsChargeTemplateResolver } from './common-resolvers/savings-charge-template.resolver';
 
 const routes: Routes = [
-    {
+  {
-        path: '',
+    path: '',
-        data: { title: extract('All Savings'), breadcrumb: 'Savings', routeParamBreadcrumb: false },
+    data: { title: extract('All Savings'), breadcrumb: 'Savings', routeParamBreadcrumb: false },
-        // Component to view all saving accounts Comes Here
+    // Component to view all saving accounts Comes Here
+    children: [
+      {
+        path: ':savingAccountId',
+        data: { title: extract('Saving Account View'), routeParamBreadcrumb: 'savingAccountId' },
+        // Component For Saving Account View Comes Here
         children: [
-            {
+          {
-                path: ':savingAccountId',
+            path: 'add-savings-charge',
-                data: { title: extract('Saving Account View'), routeParamBreadcrumb: 'savingAccountId' },
+            component: AddSavingsChargeComponent,
-                // Component For Saving Account View Comes Here
+            data: {
-                children: [
+              title: extract('Add Savings Charge'),
-                    {
+              breadcrumb: 'Add Savings Charge',
-                        path: ':action',
+              routeParamBreadcrumb: false
-                        component: SavingAccountActionsComponent,
+            },
-                        data: { title: extract('Saving Account Actions'), routeParamBreadcrumb: 'action' },
+            resolve: {
-                        resolve: {
+              savingsChargeTemplate: SavingsChargeTemplateResolver
-                            savingAccountTransactionTemplate: SavingAccountTransactionTemplateResolver
-                        }
-                    }
-                ]
             }
+          },
+          {
+            path: ':action',
+            component: SavingAccountActionsComponent,
+            data: { title: extract('Saving Account Actions'), routeParamBreadcrumb: 'action' },
+            resolve: {
+              savingAccountTransactionTemplate: SavingAccountTransactionTemplateResolver
+            }
+          }
         ]
-    }
+      }
+    ]
+  }
 ];
 @NgModule({
-    imports: [RouterModule.forChild(routes)],
+  imports: [RouterModule.forChild(routes)],
-    exports: [RouterModule],
+  exports: [RouterModule],
-    declarations: [],
+  declarations: [],
-    providers: [SavingAccountTransactionTemplateResolver]
+  providers: [SavingAccountTransactionTemplateResolver, SavingsChargeTemplateResolver]
 })
-export class SavingsRoutingModule { }
+export class SavingsRoutingModule {}

src/app/savings/savings.module.ts

@@ -9,6 +9,7 @@ import { SharedModule } from 'app/shared/shared.module';
 /** Custom Components */
 import { SavingAccountActionsComponent } from './saving-account-actions/saving-account-actions.component';
 import { SavingsAccountTransactionsComponent } from './saving-account-actions/savings-account-transactions/savings-account-transactions.component';
+import { AddSavingsChargeComponent } from './add-savings-charge/add-savings-charge.component';
 
 /**
  * Savings Module
@@ -22,8 +23,9 @@ import { SavingsAccountTransactionsComponent } from './saving-account-actions/sa
   ],
   declarations: [
     SavingAccountActionsComponent,
-    SavingsAccountTransactionsComponent
+    SavingsAccountTransactionsComponent,
+    AddSavingsChargeComponent
   ],
   providers: [DatePipe]
 })
-export class SavingsModule { }
+export class SavingsModule {}

src/app/savings/savings.service.ts

@@ -12,8 +12,7 @@ import { Observable } from 'rxjs';
   providedIn: 'root'
 })
 export class SavingsService {
-
+  constructor(private http: HttpClient) {}
-  constructor(private http: HttpClient) { }
   /**
    * @param {string} savingAccountId is saving account's Id.
    * @returns {Observable<any>}
@@ -31,4 +30,29 @@ export class SavingsService {
   makeTransaction(action: string, savingAccountId: string, transactionData: any): Observable<any> {
     return this.http.post(`/savingsaccounts/${savingAccountId}/transactions?command=${action}`, transactionData);
   }
+
+  /**
+   * @param {string} savingAccountId saving account id.
+   * @returns {Observable<any>}
+   */
+  getSavingsChargeTemplateResource(savingAccountId: string): Observable<any> {
+    return this.http.get(`/savingsaccounts/${savingAccountId}/charges/template`);
+  }
+
+  /**
+   * @param {any} savingsCharge to apply on a savings Account.
+   * @returns {Observable<any>}
+   */
+  createSavingsCharge(savingAccountId: string, resourceType: string, savingsCharge: any): Observable<any> {
+    return this.http.post(`/savingsaccounts/${savingAccountId}/${resourceType}`, savingsCharge);
+  }
+
+  /**
+   * @param {string} chargeId Charge ID of charge.
+   * @returns {Observable<any>} Charge.
+   */
+  getChargeTemplate(chargeId: string): Observable<any> {
+    const params = { template: 'true' };
+    return this.http.get(`/charges/${chargeId}`, { params: params });
+  }
 }