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 d405babcd..9e041ae99 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
@@ -1 +1,3 @@
+
+
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 8ed2178ad..3301c0b66 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
@@ -15,8 +15,10 @@ export class ClientActionsComponent {
/** Flag object to store possible actions and render appropriate UI to the user */
actions: {
'Assign Staff': boolean
+ 'Close': boolean
} = {
'Assign Staff': false,
+ 'Close': false
};
/**
diff --git a/src/app/clients/clients-view/client-actions/close-client/close-client.component.html b/src/app/clients/clients-view/client-actions/close-client/close-client.component.html
new file mode 100644
index 000000000..aeb0cf45c
--- /dev/null
+++ b/src/app/clients/clients-view/client-actions/close-client/close-client.component.html
@@ -0,0 +1,46 @@
+
diff --git a/src/app/clients/clients-view/client-actions/close-client/close-client.component.scss b/src/app/clients/clients-view/client-actions/close-client/close-client.component.scss
new file mode 100644
index 000000000..d774f68da
--- /dev/null
+++ b/src/app/clients/clients-view/client-actions/close-client/close-client.component.scss
@@ -0,0 +1,3 @@
+.container {
+ max-width: 37rem;
+}
diff --git a/src/app/clients/clients-view/client-actions/close-client/close-client.component.spec.ts b/src/app/clients/clients-view/client-actions/close-client/close-client.component.spec.ts
new file mode 100644
index 000000000..d2fa5088c
--- /dev/null
+++ b/src/app/clients/clients-view/client-actions/close-client/close-client.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CloseClientComponent } from './close-client.component';
+
+describe('CloseClientComponent', () => {
+ let component: CloseClientComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ CloseClientComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(CloseClientComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/clients/clients-view/client-actions/close-client/close-client.component.ts b/src/app/clients/clients-view/client-actions/close-client/close-client.component.ts
new file mode 100644
index 000000000..ebfa0821f
--- /dev/null
+++ b/src/app/clients/clients-view/client-actions/close-client/close-client.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 { ClientsService } from 'app/clients/clients.service';
+
+/**
+ * Close Client Component
+ */
+@Component({
+ selector: 'mifosx-close-client',
+ templateUrl: './close-client.component.html',
+ styleUrls: ['./close-client.component.scss']
+})
+export class CloseClientComponent implements OnInit {
+
+ /** Minimum date allowed. */
+ minDate = new Date(2000, 0, 1);
+ /** Maximum date allowed. */
+ maxDate = new Date();
+ /** Close Share Account form. */
+ closeClientForm: FormGroup;
+ /** Client Data */
+ closureData: 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.closureData = data.clientActionData.narrations;
+ });
+ this.clientId = this.route.parent.snapshot.params['clientId'];
+ }
+
+ ngOnInit() {
+ this.createCloseClientForm();
+ }
+
+ /**
+ * Creates the close client form.
+ */
+ createCloseClientForm() {
+ this.closeClientForm = this.formBuilder.group({
+ 'closureDate': ['', Validators.required],
+ 'closureReasonId': ['', Validators.required]
+ });
+ }
+
+ /**
+ * Submits the form and closes the client.
+ */
+ submit() {
+ // TODO: Update once language and date settings are setup
+ const locale = 'en';
+ const dateFormat = 'dd MMMM yyyy';
+ const prevClosedDate: Date = this.closeClientForm.value.closureDate;
+ this.closeClientForm.patchValue({
+ closureDate: this.datePipe.transform(prevClosedDate, dateFormat),
+ });
+ const data = {
+ ...this.closeClientForm.value,
+ dateFormat,
+ locale
+ };
+ this.clientsService.executeClientCommand(this.clientId, 'close', 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 dab80c81b..504ac821a 100644
--- a/src/app/clients/clients-view/clients-view.component.html
+++ b/src/app/clients/clients-view/clients-view.component.html
@@ -42,6 +42,7 @@
+
diff --git a/src/app/clients/clients-view/clients-view.component.ts b/src/app/clients/clients-view/clients-view.component.ts
index 926f6c0c7..270c33bdf 100644
--- a/src/app/clients/clients-view/clients-view.component.ts
+++ b/src/app/clients/clients-view/clients-view.component.ts
@@ -51,6 +51,7 @@ export class ClientsViewComponent implements OnInit {
doAction(name: string) {
switch (name) {
case 'Assign Staff':
+ case 'Close':
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 927f57d12..5b7003a34 100644
--- a/src/app/clients/clients.module.ts
+++ b/src/app/clients/clients.module.ts
@@ -28,6 +28,7 @@ import { ChargesOverviewComponent } from './clients-view/charges-overview/charge
import { ClientActionsComponent } from './clients-view/client-actions/client-actions.component';
import { ClientAssignStaffComponent } from './clients-view/client-actions/client-assign-staff/client-assign-staff.component';
import { UnassignStaffDialogComponent } from './clients-view/custom-dialogs/unassign-staff-dialog/unassign-staff-dialog.component';
+import { CloseClientComponent } from './clients-view/client-actions/close-client/close-client.component';
/**
@@ -61,7 +62,8 @@ import { UnassignStaffDialogComponent } from './clients-view/custom-dialogs/unas
ChargesOverviewComponent,
ClientActionsComponent,
ClientAssignStaffComponent,
- UnassignStaffDialogComponent
+ UnassignStaffDialogComponent,
+ CloseClientComponent
],
entryComponents: [
UploadDocumentDialogComponent,
diff --git a/src/app/clients/clients.service.ts b/src/app/clients/clients.service.ts
index 0862ff764..bacc50415 100644
--- a/src/app/clients/clients.service.ts
+++ b/src/app/clients/clients.service.ts
@@ -218,4 +218,9 @@ export class ClientsService {
return this.http.post(`/clients/${clientId}`, data, { params: httpParams });
}
+ getClientCommandTemplate(command: string): Observable {
+ const httpParams = new HttpParams().set('commandParam', command);
+ return this.http.get(`/clients/template`, { params: httpParams });
+ }
+
}
diff --git a/src/app/clients/common-resolvers/client-actions.resolver.ts b/src/app/clients/common-resolvers/client-actions.resolver.ts
index 0f42eb337..dc395ea82 100644
--- a/src/app/clients/common-resolvers/client-actions.resolver.ts
+++ b/src/app/clients/common-resolvers/client-actions.resolver.ts
@@ -30,6 +30,8 @@ export class ClientActionsResolver implements Resolve