From 9b492ac7af26b72776add1b73a97233944424a65 Mon Sep 17 00:00:00 2001 From: Muskan Khedia <36980003+muskankhedia@users.noreply.github.com> Date: Tue, 7 Jul 2020 21:09:48 +0530 Subject: [PATCH] feat: add recurring deposit action (reject) (#1013) Fixes: #1012 --- ...ng-deposits-account-actions.component.html | 1 + ...ring-deposits-account-actions.component.ts | 4 +- ...-recurring-deposits-account.component.html | 40 +++++++++ ...-recurring-deposits-account.component.scss | 3 + ...curring-deposits-account.component.spec.ts | 25 ++++++ ...ct-recurring-deposits-account.component.ts | 84 +++++++++++++++++++ ...curring-deposits-account-view.component.ts | 1 + .../recurring-deposits.module.ts | 4 +- 8 files changed, 160 insertions(+), 2 deletions(-) create mode 100644 src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.html create mode 100644 src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.scss create mode 100644 src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.spec.ts create mode 100644 src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.ts 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 aec1e59d6..deb13e31a 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,3 +1,4 @@ + \ No newline at end of file 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 c1eb45313..23a009663 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 @@ -13,10 +13,12 @@ export class RecurringDepositsAccountActionsComponent { 'Activate': boolean 'Undo Approval': boolean 'Approve': boolean + 'Reject': boolean } = { 'Activate': false, 'Undo Approval': false, - 'Approve': false + 'Approve': false, + 'Reject': false }; /** diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.html new file mode 100644 index 000000000..48fb4534d --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.html @@ -0,0 +1,40 @@ +
+ + + +
+ + + +
+ + + Rejected On Date + + + + + Rejected On Date is required + + + + + Note + + + +
+ +
+ + + + + + +
+ +
+ +
\ No newline at end of file diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.scss b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.scss new file mode 100644 index 000000000..d774f68da --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-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/reject-recurring-deposits-account/reject-recurring-deposits-account.component.spec.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.spec.ts new file mode 100644 index 000000000..2993edc2c --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { RejectRecurringDepositsAccountComponent } from './reject-recurring-deposits-account.component'; + +describe('RejectRecurringDepositsAccountComponent', () => { + let component: RejectRecurringDepositsAccountComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ RejectRecurringDepositsAccountComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(RejectRecurringDepositsAccountComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.ts new file mode 100644 index 000000000..4fb4d8aa8 --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component.ts @@ -0,0 +1,84 @@ +/** 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'; + + +/** + * Reject Recurring Deposits Account Component + */ +@Component({ + selector: 'mifosx-reject-recurring-deposits-account', + templateUrl: './reject-recurring-deposits-account.component.html', + styleUrls: ['./reject-recurring-deposits-account.component.scss'] +}) +export class RejectRecurringDepositsAccountComponent implements OnInit { + + /** Minimum date allowed. */ + minDate = new Date(2000, 0, 1); + /** Maximum date allowed. */ + maxDate = new Date(); + /** Reject Recurring Deposits Account form. */ + rejectRecurringDepositsAccountForm: 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 reject recurring deposits form. + */ + ngOnInit() { + this.createRejectRecurringDepositsAccountForm(); + } + + /** + * Creates the reject recurring deposits account form. + */ + createRejectRecurringDepositsAccountForm() { + this.rejectRecurringDepositsAccountForm = this.formBuilder.group({ + 'rejectedOnDate': ['', Validators.required], + 'note': [''] + }); + } + + /** + * Submits the form and rejects 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 prevRejectedOnDate: Date = this.rejectRecurringDepositsAccountForm.value.rejectedOnDate; + this.rejectRecurringDepositsAccountForm.patchValue({ + rejectedOnDate: this.datePipe.transform(prevRejectedOnDate, dateFormat), + }); + const data = { + ...this.rejectRecurringDepositsAccountForm.value, + dateFormat, + locale + }; + this.recurringDepositsService.executeRecurringDepositsAccountCommand(this.accountId, 'reject', data).subscribe(() => { + this.router.navigate(['../../'], { relativeTo: this.route }); + }); + } + +} 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 05f782e72..ecaa629dc 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 @@ -79,6 +79,7 @@ export class RecurringDepositsAccountViewComponent implements OnInit { switch (name) { case 'Activate': case 'Approve': + case 'Reject': 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 4dff7963e..62a5f3e32 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits.module.ts +++ b/src/app/deposits/recurring-deposits/recurring-deposits.module.ts @@ -29,6 +29,7 @@ import { RecurringDepositsAccountActionsComponent } from './recurring-deposits-a 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'; +import { RejectRecurringDepositsAccountComponent } from './recurring-deposits-account-actions/reject-recurring-deposits-account/reject-recurring-deposits-account.component'; /** * RecurringDeposits Module @@ -62,7 +63,8 @@ import { ApproveRecurringDepositsAccountComponent } from './recurring-deposits-a RecurringDepositsAccountActionsComponent, ActivateRecurringDepositsAccountComponent, UndoApprovalRecurringDepositsAccountComponent, - ApproveRecurringDepositsAccountComponent + ApproveRecurringDepositsAccountComponent, + RejectRecurringDepositsAccountComponent ], providers: [DatePipe] })