From 24ecbb17589e5d43b3262938b6175d53eea45426 Mon Sep 17 00:00:00 2001
From: Muskan Khedia <36980003+muskankhedia@users.noreply.github.com>
Date: Tue, 7 Jul 2020 19:40:00 +0530
Subject: [PATCH] feat: add recurring deposit action (approve) (#1009)

Fixes: #1008
---
 .../general-tab/general-tab.component.html    |  7 +-
 ...-recurring-deposits-account.component.html | 40 +++++++++
 ...-recurring-deposits-account.component.scss |  3 +
 ...curring-deposits-account.component.spec.ts | 25 ++++++
 ...ve-recurring-deposits-account.component.ts | 83 +++++++++++++++++++
 ...ng-deposits-account-actions.component.html |  1 +
 ...ring-deposits-account-actions.component.ts |  4 +-
 ...curring-deposits-account-view.component.ts |  1 +
 .../recurring-deposits.module.ts              |  4 +-
 9 files changed, 163 insertions(+), 5 deletions(-)
 create mode 100644 src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.html
 create mode 100644 src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.scss
 create mode 100644 src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.spec.ts
 create mode 100644 src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.ts

diff --git a/src/app/clients/clients-view/general-tab/general-tab.component.html b/src/app/clients/clients-view/general-tab/general-tab.component.html
index a9a10d704..d266d1489 100644
--- a/src/app/clients/clients-view/general-tab/general-tab.component.html
+++ b/src/app/clients/clients-view/general-tab/general-tab.component.html
@@ -438,7 +438,8 @@
       <th mat-header-cell *matHeaderCellDef> Actions </th>
       <td mat-cell *matCellDef="let element">
         <ng-container *ngIf="element.status.submittedAndPendingApproval">
-          <button class="account-action-button" mat-raised-button *mifosxHasPermission="'APPROVE_SAVINGSACCOUNT'" color="primary">
+          <button class="account-action-button" mat-raised-button *mifosxHasPermission="'APPROVE_SAVINGSACCOUNT'" 
+          [routerLink]="['../','recurringdeposits', element.id, 'actions', 'Approve']" color="primary">
             <i class="fa fa-check"></i>
           </button>
         </ng-container>
@@ -446,12 +447,12 @@
           <button
             class="account-action-button" mat-raised-button color="primary" (click)="routeEdit($event)"
             *mifosxHasPermission="'APPROVALUNDO_SAVINGSACCOUNT'"
-            [routerLink]="['../','recurring-deposits-accounts', element.id, 'actions', 'Undo Approval']">
+            [routerLink]="['../','recurringdeposits', element.id, 'actions', 'Undo Approval']">
             <i class="fa fa-undo"></i>
           </button>
           <button class="account-action-button" mat-raised-button color="primary" (click)="routeEdit($event)"
             *mifosxHasPermission="'ACTIVATE_SAVINGSACCOUNT'"
-            [routerLink]="['../','recurring-deposits-accounts', element.id, 'actions', 'Activate']">
+            [routerLink]="['../','recurringdeposits', element.id, 'actions', 'Activate']">
             <i class="fa fa-check-circle"></i>
           </button>
         </ng-container>
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.html
new file mode 100644
index 000000000..e72693f2f
--- /dev/null
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.html
@@ -0,0 +1,40 @@
+<div class="container">
+
+  <mat-card>
+
+    <form [formGroup]="approveRecurringDepositsAccountForm" (ngSubmit)="submit()">
+
+      <mat-card-content>
+
+        <div fxLayout="column">
+
+          <mat-form-field>
+            <mat-label>Approved On Date</mat-label>
+            <input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="approvedOnDatePicker" required
+              formControlName="approvedOnDate">
+            <mat-datepicker-toggle matSuffix [for]="approvedOnDatePicker"></mat-datepicker-toggle>
+            <mat-datepicker #approvedOnDatePicker></mat-datepicker>
+            <mat-error *ngIf="approveRecurringDepositsAccountForm.controls.approvedOnDate.hasError('required')">
+              Approved On Date is <strong>required</strong>
+            </mat-error>
+          </mat-form-field>
+
+          <mat-form-field>
+            <mat-label>Note</mat-label>
+            <textarea matInput formControlName="note"></textarea>
+          </mat-form-field>
+
+        </div>
+
+      </mat-card-content>
+
+      <mat-card-actions fxLayout="row" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="5px">
+        <button type="button" mat-raised-button [routerLink]="['../../']">Cancel</button>
+        <button mat-raised-button color="accent" [disabled]="!approveRecurringDepositsAccountForm">Confirm</button>
+      </mat-card-actions>
+
+    </form>
+
+  </mat-card>
+
+</div>
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.scss b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.scss
new file mode 100644
index 000000000..d774f68da
--- /dev/null
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.scss
@@ -0,0 +1,3 @@
+.container {
+  max-width: 37rem;
+}
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.spec.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.spec.ts
new file mode 100644
index 000000000..7dd81b82d
--- /dev/null
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ApproveRecurringDepositsAccountComponent } from './approve-recurring-deposits-account.component';
+
+describe('ApproveRecurringDepositsAccountComponent', () => {
+  let component: ApproveRecurringDepositsAccountComponent;
+  let fixture: ComponentFixture<ApproveRecurringDepositsAccountComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ApproveRecurringDepositsAccountComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ApproveRecurringDepositsAccountComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.ts
new file mode 100644
index 000000000..fd7d3f869
--- /dev/null
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.ts
@@ -0,0 +1,83 @@
+/** Angular Imports */
+import { Component, OnInit } from '@angular/core';
+import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { DatePipe } from '@angular/common';
+import { ActivatedRoute, Router } from '@angular/router';
+
+/** Custom Services */
+import { RecurringDepositsService } from '../../recurring-deposits.service';
+
+/**
+ * Approve Recurring Deposits Account Component
+ */
+@Component({
+  selector: 'mifosx-approve-recurring-deposits-account',
+  templateUrl: './approve-recurring-deposits-account.component.html',
+  styleUrls: ['./approve-recurring-deposits-account.component.scss']
+})
+export class ApproveRecurringDepositsAccountComponent implements OnInit {
+
+  /** Minimum date allowed. */
+  minDate = new Date(2000, 0, 1);
+  /** Maximum date allowed. */
+  maxDate = new Date();
+  /** Approve Recurring Deposits Account form. */
+  approveRecurringDepositsAccountForm: FormGroup;
+  /** Recurring Deposits Account Id */
+  accountId: any;
+
+  /**
+   * @param {FormBuilder} formBuilder Form Builder
+   * @param {RecurringDepositsService} recurringDepositsService Recurring Deposits Service
+   * @param {DatePipe} datePipe Date Pipe
+   * @param {ActivatedRoute} route Activated Route
+   * @param {Router} router Router
+   */
+  constructor(private formBuilder: FormBuilder,
+    private recurringDepositsService: RecurringDepositsService,
+    private datePipe: DatePipe,
+    private route: ActivatedRoute,
+    private router: Router) {
+    this.accountId = this.route.parent.snapshot.params['recurringDepositAccountId'];
+  }
+
+  /**
+   * Creates the approve recurring deposits form.
+   */
+  ngOnInit() {
+    this.createApproveRecurringDepositsAccountForm();
+  }
+
+  /**
+   * Creates the approve recurring deposits account form.
+   */
+  createApproveRecurringDepositsAccountForm() {
+    this.approveRecurringDepositsAccountForm = this.formBuilder.group({
+      'approvedOnDate': ['', Validators.required],
+      'note': ['']
+    });
+  }
+
+  /**
+   * Submits the form and approves the recurring deposit account,
+   * if successful redirects to the recurring deposit account.
+   */
+  submit() {
+    // TODO: Update once language and date settings are setup
+    const locale = 'en';
+    const dateFormat = 'dd MMMM yyyy';
+    const prevApprovedOnDate: Date = this.approveRecurringDepositsAccountForm.value.approvedOnDate;
+    this.approveRecurringDepositsAccountForm.patchValue({
+      approvedOnDate: this.datePipe.transform(prevApprovedOnDate, dateFormat),
+    });
+    const data = {
+      ...this.approveRecurringDepositsAccountForm.value,
+      dateFormat,
+      locale
+    };
+    this.recurringDepositsService.executeRecurringDepositsAccountCommand(this.accountId, 'approve', data).subscribe(() => {
+      this.router.navigate(['../../'], { relativeTo: this.route });
+    });
+  }
+
+}
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html
index e3d7aaa59..aec1e59d6 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html
@@ -1,2 +1,3 @@
 <mifosx-activate-recurring-deposits-account *ngIf="actions['Activate']"></mifosx-activate-recurring-deposits-account>
 <mifosx-undo-approval-recurring-deposits-account *ngIf="actions['Undo Approval']"></mifosx-undo-approval-recurring-deposits-account>
+<mifosx-approve-recurring-deposits-account *ngIf="actions['Approve']"></mifosx-approve-recurring-deposits-account>
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts
index 8a35ca8c2..c1eb45313 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts
@@ -12,9 +12,11 @@ export class RecurringDepositsAccountActionsComponent {
   actions: {
     'Activate': boolean
     'Undo Approval': boolean
+    'Approve': boolean
   } = {
       'Activate': false,
-      'Undo Approval': false
+      'Undo Approval': false,
+      'Approve': false
     };
 
   /**
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts
index 7a879a41a..05f782e72 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts
@@ -78,6 +78,7 @@ export class RecurringDepositsAccountViewComponent implements OnInit {
   doAction(name: string) {
     switch (name) {
       case 'Activate':
+      case 'Approve':
       case 'Undo Approval':
         this.router.navigate([`actions/${name}`], { relativeTo: this.route });
         break;
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits.module.ts b/src/app/deposits/recurring-deposits/recurring-deposits.module.ts
index d83ceeab6..4dff7963e 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits.module.ts
+++ b/src/app/deposits/recurring-deposits/recurring-deposits.module.ts
@@ -28,6 +28,7 @@ import { RecurringDepositsAccountPreviewStepComponent } from './recurring-deposi
 import { RecurringDepositsAccountActionsComponent } from './recurring-deposits-account-actions/recurring-deposits-account-actions.component';
 import { ActivateRecurringDepositsAccountComponent } from './recurring-deposits-account-actions/activate-recurring-deposits-account/activate-recurring-deposits-account.component';
 import { UndoApprovalRecurringDepositsAccountComponent } from './recurring-deposits-account-actions/undo-approval-recurring-deposits-account/undo-approval-recurring-deposits-account.component';
+import { ApproveRecurringDepositsAccountComponent } from './recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component';
 
 /**
  * RecurringDeposits Module
@@ -60,7 +61,8 @@ import { UndoApprovalRecurringDepositsAccountComponent } from './recurring-depos
     RecurringDepositsAccountPreviewStepComponent,
     RecurringDepositsAccountActionsComponent,
     ActivateRecurringDepositsAccountComponent,
-    UndoApprovalRecurringDepositsAccountComponent
+    UndoApprovalRecurringDepositsAccountComponent,
+    ApproveRecurringDepositsAccountComponent
   ],
   providers: [DatePipe]
 })