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 76d3132b0..cbd58f841 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,3 +1,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 7101f6d16..12f228a91 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,11 +15,13 @@ export class ClientActionsComponent {
/** Flag object to store possible actions and render appropriate UI to the user */
actions: {
'Assign Staff': boolean
- 'Close': boolean,
+ 'Close': boolean
+ 'Reject': boolean
'Survey': boolean
} = {
'Assign Staff': false,
'Close': false,
+ 'Reject': false,
'Survey': false
};
diff --git a/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.html b/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.html
new file mode 100644
index 000000000..268fdc9a1
--- /dev/null
+++ b/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.html
@@ -0,0 +1,46 @@
+
diff --git a/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.scss b/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.scss
new file mode 100644
index 000000000..d774f68da
--- /dev/null
+++ b/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.scss
@@ -0,0 +1,3 @@
+.container {
+ max-width: 37rem;
+}
diff --git a/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.spec.ts b/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.spec.ts
new file mode 100644
index 000000000..2a0798145
--- /dev/null
+++ b/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { RejectClientComponent } from './reject-client.component';
+
+describe('RejectClientComponent', () => {
+ let component: RejectClientComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ RejectClientComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(RejectClientComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.ts b/src/app/clients/clients-view/client-actions/reject-client/reject-client.component.ts
new file mode 100644
index 000000000..e5d40dd92
--- /dev/null
+++ b/src/app/clients/clients-view/client-actions/reject-client/reject-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';
+
+/**
+ * Reject Client Component
+ */
+@Component({
+ selector: 'mifosx-reject-client',
+ templateUrl: './reject-client.component.html',
+ styleUrls: ['./reject-client.component.scss']
+})
+export class RejectClientComponent implements OnInit {
+
+ /** Minimum date allowed. */
+ minDate = new Date(2000, 0, 1);
+ /** Maximum date allowed. */
+ maxDate = new Date();
+ /** Reject Share Account form. */
+ rejectClientForm: FormGroup;
+ /** Client Data */
+ rejectionData: 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.rejectionData = data.clientActionData.narrations;
+ });
+ this.clientId = this.route.parent.snapshot.params['clientId'];
+ }
+
+ ngOnInit() {
+ this.createRejectClientForm();
+ }
+
+ /**
+ * Creates the reject client form.
+ */
+ createRejectClientForm() {
+ this.rejectClientForm = this.formBuilder.group({
+ 'rejectionDate': ['', Validators.required],
+ 'rejectionReasonId': ['', Validators.required]
+ });
+ }
+
+ /**
+ * Submits the form and rejects the client.
+ */
+ submit() {
+ // TODO: Update once language and date settings are setup
+ const locale = 'en';
+ const dateFormat = 'dd MMMM yyyy';
+ const prevRejectedDate: Date = this.rejectClientForm.value.rejectionDate;
+ this.rejectClientForm.patchValue({
+ rejectionDate: this.datePipe.transform(prevRejectedDate, dateFormat),
+ });
+ const data = {
+ ...this.rejectClientForm.value,
+ dateFormat,
+ locale
+ };
+ this.clientsService.executeClientCommand(this.clientId, 'reject', 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 eac9695e4..62d9bbc15 100644
--- a/src/app/clients/clients-view/clients-view.component.html
+++ b/src/app/clients/clients-view/clients-view.component.html
@@ -44,6 +44,7 @@
+
diff --git a/src/app/clients/clients-view/clients-view.component.ts b/src/app/clients/clients-view/clients-view.component.ts
index a8aed99ae..b3b740f92 100644
--- a/src/app/clients/clients-view/clients-view.component.ts
+++ b/src/app/clients/clients-view/clients-view.component.ts
@@ -53,6 +53,7 @@ export class ClientsViewComponent implements OnInit {
case 'Assign Staff':
case 'Close':
case 'Survey':
+ case 'Reject':
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 0c73222f0..2ce2916df 100644
--- a/src/app/clients/clients.module.ts
+++ b/src/app/clients/clients.module.ts
@@ -30,6 +30,8 @@ import { ClientAssignStaffComponent } from './clients-view/client-actions/client
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';
import { ViewSurveyComponent } from './clients-view/client-actions/view-survey/view-survey.component';
+import { RejectClientComponent } from './clients-view/client-actions/reject-client/reject-client.component';
+
/**
* Clients Module
@@ -64,7 +66,8 @@ import { ViewSurveyComponent } from './clients-view/client-actions/view-survey/v
ClientAssignStaffComponent,
UnassignStaffDialogComponent,
CloseClientComponent,
- ViewSurveyComponent
+ ViewSurveyComponent,
+ RejectClientComponent
],
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 761f4ca00..1533cdaff 100644
--- a/src/app/clients/common-resolvers/client-actions.resolver.ts
+++ b/src/app/clients/common-resolvers/client-actions.resolver.ts
@@ -34,6 +34,8 @@ export class ClientActionsResolver implements Resolve