From 8dc254f491b8a61db4fed5e223d74c1088181281 Mon Sep 17 00:00:00 2001 From: Karan Takalkar Date: Mon, 13 Jul 2020 19:02:11 +0530 Subject: [PATCH] feat: client actions (transfer) (#1081) Fixes: #1080 --- .../client-actions.component.html | 1 + .../client-actions.component.ts | 4 +- .../transfer-client.component.html | 51 +++++++++++ .../transfer-client.component.scss | 3 + .../transfer-client.component.spec.ts | 25 ++++++ .../transfer-client.component.ts | 85 +++++++++++++++++++ .../clients-view/clients-view.component.html | 1 + .../clients-view/clients-view.component.ts | 1 + src/app/clients/clients.module.ts | 4 +- src/app/clients/clients.service.ts | 7 ++ .../client-actions.resolver.ts | 2 + 11 files changed, 182 insertions(+), 2 deletions(-) create mode 100644 src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.html create mode 100644 src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.scss create mode 100644 src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.spec.ts create mode 100644 src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.ts diff --git a/src/app/clients/clients-view/client-actions/client-actions.component.html b/src/app/clients/clients-view/client-actions/client-actions.component.html index 62baa2df0..39235d85e 100644 --- a/src/app/clients/clients-view/client-actions/client-actions.component.html +++ b/src/app/clients/clients-view/client-actions/client-actions.component.html @@ -5,3 +5,4 @@ + diff --git a/src/app/clients/clients-view/client-actions/client-actions.component.ts b/src/app/clients/clients-view/client-actions/client-actions.component.ts index a5d898921..d0cd206c3 100644 --- a/src/app/clients/clients-view/client-actions/client-actions.component.ts +++ b/src/app/clients/clients-view/client-actions/client-actions.component.ts @@ -20,13 +20,15 @@ export class ClientActionsComponent { 'Survey': boolean 'Withdraw': boolean 'Update Default Savings': boolean + 'Transfer Client': boolean } = { 'Assign Staff': false, 'Close': false, 'Reject': false, 'Survey': false, 'Withdraw': false, - 'Update Default Savings': false + 'Update Default Savings': false, + 'Transfer Client': false }; /** diff --git a/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.html b/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.html new file mode 100644 index 000000000..0787c14a6 --- /dev/null +++ b/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.html @@ -0,0 +1,51 @@ +
+ + + +
+ + + +
+ + + Office + + + {{ office.name }} + + + + Office is required + + + + + Transfer Date + + + + + Transfer Date is required + + + + + Note + + + +
+ +
+ + + + + + +
+ +
+ +
diff --git a/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.scss b/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.scss new file mode 100644 index 000000000..d774f68da --- /dev/null +++ b/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.scss @@ -0,0 +1,3 @@ +.container { + max-width: 37rem; +} diff --git a/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.spec.ts b/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.spec.ts new file mode 100644 index 000000000..5ee013868 --- /dev/null +++ b/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TransferClientComponent } from './transfer-client.component'; + +describe('TransferClientComponent', () => { + let component: TransferClientComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ TransferClientComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TransferClientComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.ts b/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.ts new file mode 100644 index 000000000..d6f7b6558 --- /dev/null +++ b/src/app/clients/clients-view/client-actions/transfer-client/transfer-client.component.ts @@ -0,0 +1,85 @@ +/** 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 { ClientsService } from 'app/clients/clients.service'; + +/** + * Transfer Client Component + */ +@Component({ + selector: 'mifosx-transfer-client', + templateUrl: './transfer-client.component.html', + styleUrls: ['./transfer-client.component.scss'] +}) +export class TransferClientComponent implements OnInit { + + /** Minimum date allowed. */ + minDate = new Date(2000, 0, 1); + /** Maximum date allowed. */ + maxDate = new Date(); + /** Transfer Client form. */ + transferClientForm: FormGroup; + /** Client Data */ + officeData: any; + /** Client Id */ + clientId: any; + + /** + * @param {FormBuilder} formBuilder Form Builder + * @param {ClientsService} clientsService Clients Service + * @param {DatePipe} datePipe Date Pipe + * @param {ActivatedRoute} route Activated Route + * @param {Router} router Router + */ + constructor(private formBuilder: FormBuilder, + private clientsService: ClientsService, + private datePipe: DatePipe, + private route: ActivatedRoute, + private router: Router) { + this.route.data.subscribe((data: { clientActionData: any }) => { + this.officeData = data.clientActionData; + }); + this.clientId = this.route.parent.snapshot.params['clientId']; + } + + ngOnInit() { + this.createTransferClientForm(); + } + + /** + * Creates the transfer client form. + */ + createTransferClientForm() { + this.transferClientForm = this.formBuilder.group({ + 'destinationOfficeId': ['', Validators.required], + 'transferDate': ['', Validators.required], + 'note': [''] + }); + } + + /** + * Submits the form and transfers the client. + */ + submit() { + // TODO: Update once language and date settings are setup + const locale = 'en'; + const dateFormat = 'dd MMMM yyyy'; + const prevClosedDate: Date = this.transferClientForm.value.transferDate; + this.transferClientForm.patchValue({ + transferDate: this.datePipe.transform(prevClosedDate, dateFormat), + }); + const data = { + ...this.transferClientForm.value, + dateFormat, + locale + }; + this.clientsService.executeClientCommand(this.clientId, 'proposeTransfer', data).subscribe(() => { + this.router.navigate(['../../'], { relativeTo: this.route }); + }); + } + +} diff --git a/src/app/clients/clients-view/clients-view.component.html b/src/app/clients/clients-view/clients-view.component.html index beea23cc1..5e88ce7d3 100644 --- a/src/app/clients/clients-view/clients-view.component.html +++ b/src/app/clients/clients-view/clients-view.component.html @@ -45,6 +45,7 @@ + diff --git a/src/app/clients/clients-view/clients-view.component.ts b/src/app/clients/clients-view/clients-view.component.ts index b606503ff..a4a9b3930 100644 --- a/src/app/clients/clients-view/clients-view.component.ts +++ b/src/app/clients/clients-view/clients-view.component.ts @@ -58,6 +58,7 @@ export class ClientsViewComponent implements OnInit { case 'Activate': case 'Withdraw': case 'Update Default Savings': + case 'Transfer Client': this.router.navigate([`actions/${name}`], { relativeTo: this.route }); break; case 'Unassign Staff': diff --git a/src/app/clients/clients.module.ts b/src/app/clients/clients.module.ts index 4106ce6a4..eecdc7379 100644 --- a/src/app/clients/clients.module.ts +++ b/src/app/clients/clients.module.ts @@ -35,6 +35,7 @@ import { ActivateClientComponent } from './clients-view/client-actions/activate- import { WithdrawClientComponent } from './clients-view/client-actions/withdraw-client/withdraw-client.component'; import { TakeSurveyComponent } from './clients-view/client-actions/view-survey/take-survey/take-survey.component'; import { UpdateClientSavingsAccountComponent } from './clients-view/client-actions/update-client-savings-account/update-client-savings-account.component'; +import { TransferClientComponent } from './clients-view/client-actions/transfer-client/transfer-client.component'; /** @@ -75,7 +76,8 @@ import { UpdateClientSavingsAccountComponent } from './clients-view/client-actio ActivateClientComponent, WithdrawClientComponent, TakeSurveyComponent, - UpdateClientSavingsAccountComponent + UpdateClientSavingsAccountComponent, + TransferClientComponent ], entryComponents: [ UploadDocumentDialogComponent, diff --git a/src/app/clients/clients.service.ts b/src/app/clients/clients.service.ts index 2e3ed46c4..8ff2bc61b 100644 --- a/src/app/clients/clients.service.ts +++ b/src/app/clients/clients.service.ts @@ -220,6 +220,13 @@ export class ClientsService { return this.http.get(`/clients/template`, { params: httpParams }); } + /** + * @returns {Observable} Offices data + */ + getOffices(): Observable { + return this.http.get('/offices'); + } + /** * returns the list of survey data of the particular Client * @param clientId diff --git a/src/app/clients/common-resolvers/client-actions.resolver.ts b/src/app/clients/common-resolvers/client-actions.resolver.ts index 75cfe95db..307ab1153 100644 --- a/src/app/clients/common-resolvers/client-actions.resolver.ts +++ b/src/app/clients/common-resolvers/client-actions.resolver.ts @@ -39,6 +39,8 @@ export class ClientActionsResolver implements Resolve { return this.clientsService.getClientCommandTemplate('reject'); case 'Withdraw': return this.clientsService.getClientCommandTemplate('withdraw'); + case 'Transfer Client': + return this.clientsService.getOffices(); default: return undefined; }