diff --git a/src/app/deposits/recurring-deposits/common-resolvers/recurring-deposit-account-actions.resolver.ts b/src/app/deposits/recurring-deposits/common-resolvers/recurring-deposit-account-actions.resolver.ts new file mode 100644 index 000000000..21a35ce3d --- /dev/null +++ b/src/app/deposits/recurring-deposits/common-resolvers/recurring-deposit-account-actions.resolver.ts @@ -0,0 +1,36 @@ +/** Angular Imports */ +import { Injectable } from '@angular/core'; +import { Resolve, ActivatedRouteSnapshot } from '@angular/router'; + +/** rxjs Imports */ +import { Observable } from 'rxjs'; + +/** Custom Services */ +import { SavingsService } from 'app/savings/savings.service'; +import { RecurringDepositsService } from '../recurring-deposits.service'; + +/** + * Recurring Deposits Account Actions data resolver. + */ +@Injectable() +export class RecurringDepositsAccountActionsResolver implements Resolve { + + /** + * @param {SavingsService} SavingsService Savings service. + * @param {RecurringDepositsService} recurringDepositsService Recurring Deposits Service. + */ + constructor(private savingsService: SavingsService, + private recurringDepositsService: RecurringDepositsService) { } + + /** + * Returns the Recurring deposits account actions data. + * @param {ActivatedRouteSnapshot} route Route Snapshot + * @returns {Observable} + */ + resolve(route: ActivatedRouteSnapshot): Observable { + const actionName = route.paramMap.get('name'); + const recurringDepositAccountId = route.paramMap.get('recurringDepositAccountId') || route.parent.parent.paramMap.get('recurringDepositAccountId'); + return undefined; + } + +} diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/activate-recurring-deposits-account/activate-recurring-deposits-account.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/activate-recurring-deposits-account/activate-recurring-deposits-account.component.html new file mode 100644 index 000000000..13c5cd7f1 --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/activate-recurring-deposits-account/activate-recurring-deposits-account.component.html @@ -0,0 +1,31 @@ +
+ + + +
+ + + + + Activated On Date + + + + + Activated On Date is required + + + + + + + + + + +
+ +
+ +
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/activate-recurring-deposits-account/activate-recurring-deposits-account.component.scss b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/activate-recurring-deposits-account/activate-recurring-deposits-account.component.scss new file mode 100644 index 000000000..d774f68da --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/activate-recurring-deposits-account/activate-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/activate-recurring-deposits-account/activate-recurring-deposits-account.component.spec.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/activate-recurring-deposits-account/activate-recurring-deposits-account.component.spec.ts new file mode 100644 index 000000000..ce0149bb0 --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/activate-recurring-deposits-account/activate-recurring-deposits-account.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ActivateRecurringDepositsAccountComponent } from './activate-recurring-deposits-account.component'; + +describe('ActivateRecurringDepositsAccountComponent', () => { + let component: ActivateRecurringDepositsAccountComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ActivateRecurringDepositsAccountComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ActivateRecurringDepositsAccountComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/activate-recurring-deposits-account/activate-recurring-deposits-account.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/activate-recurring-deposits-account/activate-recurring-deposits-account.component.ts new file mode 100644 index 000000000..6c6566581 --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/activate-recurring-deposits-account/activate-recurring-deposits-account.component.ts @@ -0,0 +1,81 @@ +/** 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'; + +/** + * Activate Recurring Deposits Account Component + */ +@Component({ + selector: 'mifosx-activate-recurring-deposits-account', + templateUrl: './activate-recurring-deposits-account.component.html', + styleUrls: ['./activate-recurring-deposits-account.component.scss'] +}) +export class ActivateRecurringDepositsAccountComponent implements OnInit { + + /** Minimum date allowed. */ + minDate = new Date(2000, 0, 1); + /** Maximum date allowed. */ + maxDate = new Date(); + /** Activate Recurring Deposits Account form. */ + activateRecurringDepositsAccountForm: 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 activate recurring deposits form. + */ + ngOnInit() { + this.createActivateRecurringDepositsAccountForm(); + } + + /** + * Creates the activate recurring deposits account form. + */ + createActivateRecurringDepositsAccountForm() { + this.activateRecurringDepositsAccountForm = this.formBuilder.group({ + 'activatedOnDate': ['', Validators.required] + }); + } + + /** + * Submits the form and activates 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 prevActivatedOnDate: Date = this.activateRecurringDepositsAccountForm.value.activatedOnDate; + this.activateRecurringDepositsAccountForm.patchValue({ + activatedOnDate: this.datePipe.transform(prevActivatedOnDate, dateFormat), + }); + const data = { + ...this.activateRecurringDepositsAccountForm.value, + dateFormat, + locale + }; + this.recurringDepositsService.executeRecurringDepositsAccountCommand(this.accountId, 'activate', 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 new file mode 100644 index 000000000..dbb69224b --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html @@ -0,0 +1 @@ + diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.scss b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.spec.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.spec.ts new file mode 100644 index 000000000..c70c1ee50 --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { RecurringDepositsAccountActionsComponent } from './recurring-deposits-account-actions.component'; + +describe('RecurringDepositsAccountActionsComponent', () => { + let component: RecurringDepositsAccountActionsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ RecurringDepositsAccountActionsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(RecurringDepositsAccountActionsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 000000000..7fc8a394a --- /dev/null +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts @@ -0,0 +1,26 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; + +@Component({ + selector: 'mifosx-recurring-deposits-account-actions', + templateUrl: './recurring-deposits-account-actions.component.html', + styleUrls: ['./recurring-deposits-account-actions.component.scss'] +}) +export class RecurringDepositsAccountActionsComponent { + + /** Flag object to store possible actions and render appropriate UI to the user */ + actions: { + 'Activate': boolean + } = { + 'Activate': false, + }; + + /** + * @param {ActivatedRoute} route Activated Route + */ + constructor(private route: ActivatedRoute) { + const name = this.route.snapshot.params['name']; + this.actions[name] = true; + } + +} diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.html index 4de21a862..b758742d8 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.html +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.html @@ -39,15 +39,15 @@