diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component.html new file mode 100644 index 000000000..c2e1c5744 --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component.html @@ -0,0 +1,35 @@ +
+ + + +
+ + + +
+ + + Closed On + + + + + Closed On Date is required + + + +
+ +
+ + + + + + +
+ +
+ +
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component.scss b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component.scss new file mode 100644 index 000000000..d774f68da --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component.scss @@ -0,0 +1,3 @@ +.container { + max-width: 37rem; +} diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component.spec.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component.spec.ts new file mode 100644 index 000000000..956370a47 --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PrematureCloseRecurringDepositAccountComponent } from './premature-close-recurring-deposit-account.component'; + +describe('PrematureCloseRecurringDepositAccountComponent', () => { + let component: PrematureCloseRecurringDepositAccountComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ PrematureCloseRecurringDepositAccountComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PrematureCloseRecurringDepositAccountComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component.ts new file mode 100644 index 000000000..36e139b42 --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-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'; + +/** + * Premature Close Recurring Deposits Account Component + */ + +@Component({ + selector: 'mifosx-premature-close-recurring-deposit-account', + templateUrl: './premature-close-recurring-deposit-account.component.html', + styleUrls: ['./premature-close-recurring-deposit-account.component.scss'] +}) +export class PrematureCloseRecurringDepositAccountComponent implements OnInit { + + /** Minimum date allowed. */ + minDate = new Date(2000, 0, 1); + /** Maximum date allowed. */ + maxDate = new Date(); + /** premature close Recurring Deposits Account form. */ + prematureCloseRecurringDepositsAccountForm: 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 premature close recurring deposits form. + */ + ngOnInit() { + this.createprematureCloseRecurringDepositsAccountForm(); + } + + /** + * Creates the premature close recurring deposits account form. + */ + createprematureCloseRecurringDepositsAccountForm() { + this.prematureCloseRecurringDepositsAccountForm = this.formBuilder.group({ + 'closedOnDate': ['', Validators.required] + }); + } + + /** + * Submits the form and premature closes 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 prevClosedOnDate: Date = this.prematureCloseRecurringDepositsAccountForm.value.closedOnDate; + this.prematureCloseRecurringDepositsAccountForm.patchValue({ + closedOnDate: this.datePipe.transform(prevClosedOnDate, dateFormat), + }); + const data = { + ...this.prematureCloseRecurringDepositsAccountForm.value, + dateFormat, + locale + }; + this.recurringDepositsService.executeRecurringDepositsAccountCommand(this.accountId, 'prematureClose', 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 07a67ee80..c83a2570b 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 @@ -4,3 +4,4 @@ + \ No newline at end of file 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 168288056..a876ebc2e 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 @@ -145,6 +145,7 @@ export class RecurringDepositsAccountViewComponent implements OnInit { case 'Undo Approval': case 'Add Charge': case 'Withdraw By Client': + case 'Premature Close': this.router.navigate([`actions/${name}`], { relativeTo: this.route }); break; case 'Modify Application': diff --git a/src/app/deposits/recurring-deposits/recurring-deposits.module.ts b/src/app/deposits/recurring-deposits/recurring-deposits.module.ts index 79f234d2b..bd610dbf3 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits.module.ts +++ b/src/app/deposits/recurring-deposits/recurring-deposits.module.ts @@ -36,6 +36,7 @@ import { AddChargeRecurringDepositsAccountComponent } from './recurring-deposits /* Dialog Components */ import { RecurringDepositConfirmationDialogComponent } from './recurring-deposits-account-view/custom-dialogs/recurring-deposit-confirmation-dialog/recurring-deposit-confirmation-dialog.component'; import { EditRecurringDepositAccountComponent } from './edit-recurring-deposit-account/edit-recurring-deposit-account.component'; +import { PrematureCloseRecurringDepositAccountComponent } from './recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component'; /** @@ -75,7 +76,8 @@ import { EditRecurringDepositAccountComponent } from './edit-recurring-deposit-a WithdrawByClientRecurringDepositsAccountComponent, AddChargeRecurringDepositsAccountComponent, RecurringDepositConfirmationDialogComponent, - EditRecurringDepositAccountComponent + EditRecurringDepositAccountComponent, + PrematureCloseRecurringDepositAccountComponent ], entryComponents: [ RecurringDepositConfirmationDialogComponent diff --git a/src/app/deposits/recurring-deposits/recurring-deposits.service.ts b/src/app/deposits/recurring-deposits/recurring-deposits.service.ts index db455180a..25c71534c 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits.service.ts +++ b/src/app/deposits/recurring-deposits/recurring-deposits.service.ts @@ -96,7 +96,7 @@ export class RecurringDepositsService { /** * @param {any} accountId Account Id - * @param {any} fixedDepositAccountData Recurring Deposit Account Data + * @param {any} recurringDepositAccountData Recurring Deposit Account Data * @returns {Observable} */ updateRecurringDepositAccount(accountId: any, recurringDepositAccountData: any): Observable {