diff --git a/src/app/clients/clients-view/client-actions/activate-client/activate-client.component.ts b/src/app/clients/clients-view/client-actions/activate-client/activate-client.component.ts index a087bd73a..dcc1666c7 100644 --- a/src/app/clients/clients-view/client-actions/activate-client/activate-client.component.ts +++ b/src/app/clients/clients-view/client-actions/activate-client/activate-client.component.ts @@ -65,9 +65,9 @@ export class ActivateClientComponent implements OnInit { // TODO: Update once language and date settings are setup const locale = 'en'; const dateFormat = 'dd MMMM yyyy'; - const prevactivationDate: Date = this.activateClientForm.value.activationDate; + const prevActivationDate: Date = this.activateClientForm.value.activationDate; this.activateClientForm.patchValue({ - activationDate: this.datePipe.transform(prevactivationDate, dateFormat), + activationDate: this.datePipe.transform(prevActivationDate, dateFormat), }); const data = { ...this.activateClientForm.value, 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 6d4342491..956f17b48 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 @@ -9,3 +9,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 ce1d033da..e7375a66b 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 @@ -24,6 +24,7 @@ export class ClientActionsComponent { 'Undo Transfer': boolean 'Accept Transfer': boolean 'Reject Transfer': boolean + 'Reactivate': boolean } = { 'Assign Staff': false, 'Close': false, @@ -34,7 +35,8 @@ export class ClientActionsComponent { 'Transfer Client': false, 'Undo Transfer': false, 'Accept Transfer': false, - 'Reject Transfer': false + 'Reject Transfer': false, + 'Reactivate': 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 index aeb0cf45c..528037d9b 100644 --- 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 @@ -22,7 +22,7 @@ Closure Reason - {{ reason.description }} + {{ reason.name }} diff --git a/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.html b/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.html new file mode 100644 index 000000000..ec658e1ad --- /dev/null +++ b/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.html @@ -0,0 +1,30 @@ +
+ + + +
+ + + + + Re Activation On Date + + + + + Reactivation Date is required + + + + + + + + + + +
+ +
+ +
diff --git a/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.scss b/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.scss new file mode 100644 index 000000000..d774f68da --- /dev/null +++ b/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.scss @@ -0,0 +1,3 @@ +.container { + max-width: 37rem; +} diff --git a/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.spec.ts b/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.spec.ts new file mode 100644 index 000000000..e8b04db57 --- /dev/null +++ b/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ReactivateClientComponent } from './reactivate-client.component'; + +describe('ReactivateClientComponent', () => { + let component: ReactivateClientComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ReactivateClientComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ReactivateClientComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.ts b/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.component.ts new file mode 100644 index 000000000..6f9abd0ff --- /dev/null +++ b/src/app/clients/clients-view/client-actions/reactivate-client/reactivate-client.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'; + +/** + * Reactivate Client Component + */ +@Component({ + selector: 'mifosx-reactivate-client', + templateUrl: './reactivate-client.component.html', + styleUrls: ['./reactivate-client.component.scss'] +}) +export class ReactivateClientComponent implements OnInit { + + /** Minimum date allowed. */ + minDate = new Date(2000, 0, 1); + /** Maximum date allowed. */ + maxDate = new Date(); + /** Reactivate client form. */ + reactivateClientForm: FormGroup; + /** Client Account 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.clientId = this.route.parent.snapshot.params['clientId']; + } + + /** + * Creates the reactivate client form. + */ + ngOnInit() { + this.createReactivateClientForm(); + } + + /** + * Creates the reactivate client form. + */ + createReactivateClientForm() { + this.reactivateClientForm = this.formBuilder.group({ + 'reactivationDate': ['', Validators.required] + }); + } + + /** + * Submits the form and reactivates the client, + * 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 prevReactivationDate: Date = this.reactivateClientForm.value.reactivationDate; + this.reactivateClientForm.patchValue({ + reactivationDate: this.datePipe.transform(prevReactivationDate, dateFormat), + }); + const data = { + ...this.reactivateClientForm.value, + dateFormat, + locale + }; + this.clientsService.executeClientCommand(this.clientId, 'reactivate', data).subscribe(() => { + this.router.navigate(['../../'], { relativeTo: this.route }); + }); + } + +} 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 index 268fdc9a1..8533d0391 100644 --- 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 @@ -22,7 +22,7 @@ Rejection Reason - {{ reason.description }} + {{ reason.name }} 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 index aeae71dac..a4e514e03 100644 --- 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 @@ -22,7 +22,7 @@ Withdrawal Reason - {{ reason.description }} + {{ reason.name }} diff --git a/src/app/clients/clients-view/clients-view.component.html b/src/app/clients/clients-view/clients-view.component.html index 3b99762a6..42f37972d 100644 --- a/src/app/clients/clients-view/clients-view.component.html +++ b/src/app/clients/clients-view/clients-view.component.html @@ -53,6 +53,7 @@ + diff --git a/src/app/clients/clients-view/clients-view.component.ts b/src/app/clients/clients-view/clients-view.component.ts index 0f80234cc..d8b9eab7a 100644 --- a/src/app/clients/clients-view/clients-view.component.ts +++ b/src/app/clients/clients-view/clients-view.component.ts @@ -66,6 +66,7 @@ export class ClientsViewComponent implements OnInit { case 'Undo Transfer': case 'Accept Transfer': case 'Reject Transfer': + case 'Reactivate': 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 3dd961e87..db8f48b6c 100644 --- a/src/app/clients/clients.module.ts +++ b/src/app/clients/clients.module.ts @@ -39,6 +39,7 @@ import { TransferClientComponent } from './clients-view/client-actions/transfer- import { UndoClientTransferComponent } from './clients-view/client-actions/undo-client-transfer/undo-client-transfer.component'; 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'; /** @@ -83,7 +84,8 @@ import { AcceptClientTransferComponent } from './clients-view/client-actions/acc TransferClientComponent, UndoClientTransferComponent, RejectClientTransferComponent, - AcceptClientTransferComponent + AcceptClientTransferComponent, + ReactivateClientComponent ], entryComponents: [ UploadDocumentDialogComponent,