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 56af53d99..df375541c 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
@@ -3,3 +3,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 12f228a91..d9abe5ff2 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
@@ -18,11 +18,13 @@ export class ClientActionsComponent {
'Close': boolean
'Reject': boolean
'Survey': boolean
+ 'Withdraw': boolean
} = {
'Assign Staff': false,
'Close': false,
'Reject': false,
- 'Survey': false
+ 'Survey': false,
+ 'Withdraw': false
};
/**
diff --git a/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.html b/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.html
new file mode 100644
index 000000000..aeae71dac
--- /dev/null
+++ b/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.html
@@ -0,0 +1,46 @@
+
diff --git a/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.scss b/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.scss
new file mode 100644
index 000000000..d774f68da
--- /dev/null
+++ b/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.scss
@@ -0,0 +1,3 @@
+.container {
+ max-width: 37rem;
+}
diff --git a/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.spec.ts b/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.spec.ts
new file mode 100644
index 000000000..c0845456e
--- /dev/null
+++ b/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { WithdrawClientComponent } from './withdraw-client.component';
+
+describe('WithdrawClientComponent', () => {
+ let component: WithdrawClientComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ WithdrawClientComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(WithdrawClientComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.ts b/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-client.component.ts
new file mode 100644
index 000000000..e85167db2
--- /dev/null
+++ b/src/app/clients/clients-view/client-actions/withdraw-client/withdraw-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';
+
+/**
+ * Withdraw Client Component
+ */
+@Component({
+ selector: 'mifosx-withdraw-client',
+ templateUrl: './withdraw-client.component.html',
+ styleUrls: ['./withdraw-client.component.scss']
+})
+export class WithdrawClientComponent implements OnInit {
+
+ /** Minimum date allowed. */
+ minDate = new Date(2000, 0, 1);
+ /** Maximum date allowed. */
+ maxDate = new Date();
+ /** Withdraw Client form. */
+ withdrawClientForm: FormGroup;
+ /** Client Data */
+ withdrawalData: 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.withdrawalData = data.clientActionData.narrations;
+ });
+ this.clientId = this.route.parent.snapshot.params['clientId'];
+ }
+
+ ngOnInit() {
+ this.createWithdrawClientForm();
+ }
+
+ /**
+ * Creates the withdraw client form.
+ */
+ createWithdrawClientForm() {
+ this.withdrawClientForm = this.formBuilder.group({
+ 'withdrawalDate': ['', Validators.required],
+ 'withdrawalReasonId': ['', Validators.required]
+ });
+ }
+
+ /**
+ * Submits the form and withdraws the client.
+ */
+ submit() {
+ // TODO: Update once language and date settings are setup
+ const locale = 'en';
+ const dateFormat = 'dd MMMM yyyy';
+ const prevWithdrawalDate: Date = this.withdrawClientForm.value.withdrawalDate;
+ this.withdrawClientForm.patchValue({
+ withdrawalDate: this.datePipe.transform(prevWithdrawalDate, dateFormat),
+ });
+ const data = {
+ ...this.withdrawClientForm.value,
+ dateFormat,
+ locale
+ };
+ this.clientsService.executeClientCommand(this.clientId, 'withdraw', 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 12de825f8..d2fcbed24 100644
--- a/src/app/clients/clients-view/clients-view.component.html
+++ b/src/app/clients/clients-view/clients-view.component.html
@@ -42,9 +42,10 @@
-
+
+
diff --git a/src/app/clients/clients-view/clients-view.component.ts b/src/app/clients/clients-view/clients-view.component.ts
index db2930be1..f46809398 100644
--- a/src/app/clients/clients-view/clients-view.component.ts
+++ b/src/app/clients/clients-view/clients-view.component.ts
@@ -56,6 +56,7 @@ export class ClientsViewComponent implements OnInit {
case 'Survey':
case 'Reject':
case 'Activate':
+ case 'Withdraw':
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 de7bedcb1..86fa10098 100644
--- a/src/app/clients/clients.module.ts
+++ b/src/app/clients/clients.module.ts
@@ -32,6 +32,7 @@ import { CloseClientComponent } from './clients-view/client-actions/close-client
import { ViewSurveyComponent } from './clients-view/client-actions/view-survey/view-survey.component';
import { RejectClientComponent } from './clients-view/client-actions/reject-client/reject-client.component';
import { ActivateClientComponent } from './clients-view/client-actions/activate-client/activate-client.component';
+import { WithdrawClientComponent } from './clients-view/client-actions/withdraw-client/withdraw-client.component';
/**
@@ -69,7 +70,8 @@ import { ActivateClientComponent } from './clients-view/client-actions/activate-
CloseClientComponent,
ViewSurveyComponent,
RejectClientComponent,
- ActivateClientComponent
+ ActivateClientComponent,
+ WithdrawClientComponent
],
entryComponents: [
UploadDocumentDialogComponent,
diff --git a/src/app/clients/common-resolvers/client-actions.resolver.ts b/src/app/clients/common-resolvers/client-actions.resolver.ts
index 1533cdaff..b1331b2fe 100644
--- a/src/app/clients/common-resolvers/client-actions.resolver.ts
+++ b/src/app/clients/common-resolvers/client-actions.resolver.ts
@@ -30,12 +30,14 @@ export class ClientActionsResolver implements Resolve