From 7616938e203635290c0bbd0d8c37f9ebcfe41051 Mon Sep 17 00:00:00 2001 From: Karan Takalkar Date: Wed, 15 Jul 2020 13:25:13 +0530 Subject: [PATCH] feat: client actions (undo-rejection) (#1103) Fixes: #1102 --- .../client-actions.component.html | 1 + .../client-actions.component.ts | 4 +- .../undo-client-rejection.component.html | 30 +++++++ .../undo-client-rejection.component.scss | 3 + .../undo-client-rejection.component.spec.ts | 25 ++++++ .../undo-client-rejection.component.ts | 82 +++++++++++++++++++ .../clients-view/clients-view.component.html | 1 + .../clients-view/clients-view.component.ts | 1 + src/app/clients/clients.module.ts | 4 +- 9 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.html create mode 100644 src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.scss create mode 100644 src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.spec.ts create mode 100644 src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.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 956f17b48..eb133ad6e 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 @@ -10,3 +10,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 e7375a66b..3f580130c 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 @@ -25,6 +25,7 @@ export class ClientActionsComponent { 'Accept Transfer': boolean 'Reject Transfer': boolean 'Reactivate': boolean + 'Undo Rejection': boolean } = { 'Assign Staff': false, 'Close': false, @@ -36,7 +37,8 @@ export class ClientActionsComponent { 'Undo Transfer': false, 'Accept Transfer': false, 'Reject Transfer': false, - 'Reactivate': false + 'Reactivate': false, + 'Undo Rejection': false }; /** diff --git a/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.html b/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.html new file mode 100644 index 000000000..eec0ea781 --- /dev/null +++ b/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.html @@ -0,0 +1,30 @@ +
+ + + +
+ + + + + Reopened On Date + + + + + Reopened On Date is required + + + + + + + + + + +
+ +
+ +
diff --git a/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.scss b/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.scss new file mode 100644 index 000000000..d774f68da --- /dev/null +++ b/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.scss @@ -0,0 +1,3 @@ +.container { + max-width: 37rem; +} diff --git a/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.spec.ts b/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.spec.ts new file mode 100644 index 000000000..a791b49fd --- /dev/null +++ b/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { UndoClientRejectionComponent } from './undo-client-rejection.component'; + +describe('UndoClientRejectionComponent', () => { + let component: UndoClientRejectionComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ UndoClientRejectionComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(UndoClientRejectionComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.ts b/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.ts new file mode 100644 index 000000000..a54031437 --- /dev/null +++ b/src/app/clients/clients-view/client-actions/undo-client-rejection/undo-client-rejection.component.ts @@ -0,0 +1,82 @@ +/** 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'; + +/** + * Undo Client Rejection Component + */ +@Component({ + selector: 'mifosx-undo-client-rejection', + templateUrl: './undo-client-rejection.component.html', + styleUrls: ['./undo-client-rejection.component.scss'] +}) +export class UndoClientRejectionComponent implements OnInit { + + /** Minimum date allowed. */ + minDate = new Date(2000, 0, 1); + /** Maximum date allowed. */ + maxDate = new Date(); + /** Undo Client Rejection form. */ + undoClientRejectionForm: FormGroup; + /** Client Id */ + clientId: any; + + /** + * @param {FormBuilder} formBuilder Form Builder + * @param {clientsService} clientsService Cliens 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.clientId = this.route.parent.snapshot.params['clientId']; + } + + /** + * Creates the undo client rejection form. + */ + ngOnInit() { + this.createUndoClientRejectionForm(); + } + + /** + * Creates the undo client rejection form. + */ + createUndoClientRejectionForm() { + this.undoClientRejectionForm = this.formBuilder.group({ + 'reopenedDate': ['', Validators.required] + }); + } + + /** + * Submits the form and undo client rejection, + * if successful redirects to the client. + */ + submit() { + // TODO: Update once language and date settings are setup + const locale = 'en'; + const dateFormat = 'dd MMMM yyyy'; + const prevReopenedDate: Date = this.undoClientRejectionForm.value.reopenedDate; + this.undoClientRejectionForm.patchValue({ + reopenedDate: this.datePipe.transform(prevReopenedDate, dateFormat), + }); + const data = { + ...this.undoClientRejectionForm.value, + dateFormat, + locale + }; + this.clientsService.executeClientCommand(this.clientId, 'undoRejection', 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 42f37972d..555907eb7 100644 --- a/src/app/clients/clients-view/clients-view.component.html +++ b/src/app/clients/clients-view/clients-view.component.html @@ -54,6 +54,7 @@ + diff --git a/src/app/clients/clients-view/clients-view.component.ts b/src/app/clients/clients-view/clients-view.component.ts index d8b9eab7a..ecc4a7aa4 100644 --- a/src/app/clients/clients-view/clients-view.component.ts +++ b/src/app/clients/clients-view/clients-view.component.ts @@ -67,6 +67,7 @@ export class ClientsViewComponent implements OnInit { case 'Accept Transfer': case 'Reject Transfer': case 'Reactivate': + case 'Undo Rejection': 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 db8f48b6c..94f5ea0fc 100644 --- a/src/app/clients/clients.module.ts +++ b/src/app/clients/clients.module.ts @@ -40,6 +40,7 @@ import { UndoClientTransferComponent } from './clients-view/client-actions/undo- import { RejectClientTransferComponent } from './clients-view/client-actions/reject-client-transfer/reject-client-transfer.component'; import { AcceptClientTransferComponent } from './clients-view/client-actions/accept-client-transfer/accept-client-transfer.component'; import { ReactivateClientComponent } from './clients-view/client-actions/reactivate-client/reactivate-client.component'; +import { UndoClientRejectionComponent } from './clients-view/client-actions/undo-client-rejection/undo-client-rejection.component'; /** @@ -85,7 +86,8 @@ import { ReactivateClientComponent } from './clients-view/client-actions/reactiv UndoClientTransferComponent, RejectClientTransferComponent, AcceptClientTransferComponent, - ReactivateClientComponent + ReactivateClientComponent, + UndoClientRejectionComponent ], entryComponents: [ UploadDocumentDialogComponent,