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 6e3496e6d..cbbd85a71 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 @@ -7,3 +7,4 @@ + diff --git a/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.html b/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.html new file mode 100644 index 000000000..01d874c90 --- /dev/null +++ b/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.html @@ -0,0 +1,32 @@ +
+ + + +
+ + + + + Transfer Date + + + + + + + Note + + + + + + + + + + +
+ +
+ +
diff --git a/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.scss b/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.scss new file mode 100644 index 000000000..d774f68da --- /dev/null +++ b/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.scss @@ -0,0 +1,3 @@ +.container { + max-width: 37rem; +} diff --git a/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.spec.ts b/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.spec.ts new file mode 100644 index 000000000..f4a617023 --- /dev/null +++ b/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { RejectClientTransferComponent } from './reject-client-transfer.component'; + +describe('RejectClientTransferComponent', () => { + let component: RejectClientTransferComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ RejectClientTransferComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(RejectClientTransferComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.ts b/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.ts new file mode 100644 index 000000000..daf5b5ba9 --- /dev/null +++ b/src/app/clients/clients-view/client-actions/reject-client-transfer/reject-client-transfer.component.ts @@ -0,0 +1,72 @@ +/** Angular Imports */ +import { Component, OnInit } from '@angular/core'; +import { FormGroup, FormBuilder } from '@angular/forms'; +import { ActivatedRoute, Router } from '@angular/router'; + +/** Custom Services */ +import { ClientsService } from 'app/clients/clients.service'; + +/** + * Reject Client Transfer Component + */ +@Component({ + selector: 'mifosx-reject-client-transfer', + templateUrl: './reject-client-transfer.component.html', + styleUrls: ['./reject-client-transfer.component.scss'] +}) +export class RejectClientTransferComponent implements OnInit { + + /** Reject Approval Savings Account form. */ + rejectClientTransferForm: FormGroup; + /** Client Id */ + clientId: any; + /** Transfer Date */ + transferDate: any; + + /** + * @param {FormBuilder} formBuilder Form Builder + * @param {ClientsService} clientsService Clients Service + * @param {ActivatedRoute} route Activated Route + * @param {Router} router Router + */ + constructor(private formBuilder: FormBuilder, + private clientsService: ClientsService, + private route: ActivatedRoute, + private router: Router) { + this.route.data.subscribe((data: { clientActionData: any }) => { + this.transferDate = data.clientActionData; + }); + this.clientId = this.route.parent.snapshot.params['clientId']; + } + + /** + * Creates the reject-approval savings form. + */ + ngOnInit() { + this.createRejectClientTransferForm(); + } + + /** + * Creates the reject-approval savings account form. + */ + createRejectClientTransferForm() { + this.rejectClientTransferForm = this.formBuilder.group({ + 'transferDate': {value: new Date(this.transferDate), disabled: true}, + 'note': [''] + }); + } + + /** + * Submits the form and reject the transfer of client + * if successful redirects to the client. + */ + submit() { + const data = { + ...this.rejectClientTransferForm.value, + }; + this.clientsService.executeClientCommand(this.clientId, 'rejectTransfer', data).subscribe(() => { + this.router.navigate(['../../'], { relativeTo: this.route }); + }); + } + +} diff --git a/src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.html b/src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.html index 06358fa5d..2dd2a7c01 100644 --- a/src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.html +++ b/src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.html @@ -7,7 +7,7 @@ - Closed On Date + Transfer Date diff --git a/src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.ts b/src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.ts index ff581fffc..2369a73cf 100644 --- a/src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.ts +++ b/src/app/clients/clients-view/client-actions/undo-client-transfer/undo-client-transfer.component.ts @@ -1,7 +1,6 @@ /** Angular Imports */ import { Component, OnInit } from '@angular/core'; -import { FormGroup, FormBuilder, Validators } from '@angular/forms'; -import { DatePipe } from '@angular/common'; +import { FormGroup, FormBuilder } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; /** Custom Services */ @@ -58,7 +57,7 @@ export class UndoClientTransferComponent implements OnInit { } /** - * Submits the form and undo the trandsfer of client + * Submits the form and undo the transfer of client * if successful redirects to the client. */ submit() { diff --git a/src/app/clients/clients-view/clients-view.component.ts b/src/app/clients/clients-view/clients-view.component.ts index 676e3d76d..0f80234cc 100644 --- a/src/app/clients/clients-view/clients-view.component.ts +++ b/src/app/clients/clients-view/clients-view.component.ts @@ -40,9 +40,13 @@ export class ClientsViewComponent implements OnInit { } ngOnInit() { - this.clientsService.getClientProfileImage(this.clientViewData.id).subscribe((base64Image: any) => { - this.clientImage = this._sanitizer.bypassSecurityTrustResourceUrl(base64Image); - }); + this.clientsService.getClientProfileImage(this.clientViewData.id).subscribe( + (base64Image: any) => { + this.clientImage = this._sanitizer.bypassSecurityTrustResourceUrl(base64Image); + }, + (error: any) => {} + ); + } /** diff --git a/src/app/clients/clients.module.ts b/src/app/clients/clients.module.ts index 5eda9766c..9f7c47dc6 100644 --- a/src/app/clients/clients.module.ts +++ b/src/app/clients/clients.module.ts @@ -37,6 +37,7 @@ import { TakeSurveyComponent } from './clients-view/client-actions/view-survey/t import { UpdateClientSavingsAccountComponent } from './clients-view/client-actions/update-client-savings-account/update-client-savings-account.component'; import { TransferClientComponent } from './clients-view/client-actions/transfer-client/transfer-client.component'; 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'; /** @@ -79,7 +80,8 @@ import { UndoClientTransferComponent } from './clients-view/client-actions/undo- TakeSurveyComponent, UpdateClientSavingsAccountComponent, TransferClientComponent, - UndoClientTransferComponent + UndoClientTransferComponent, + RejectClientTransferComponent ], entryComponents: [ UploadDocumentDialogComponent,