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 @@ Actions - @@ -446,12 +447,12 @@ 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 @@ +
+ + + +
+ + + +
+ + + Approved On Date + + + + + Approved On Date is required + + + + + Note + + + +
+ +
+ + + + + + +
+ +
+ +
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; + + 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 @@ + 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] })