diff --git a/src/app/clients/clients-routing.module.ts b/src/app/clients/clients-routing.module.ts
index e7afd21cd..4839b34e1 100644
--- a/src/app/clients/clients-routing.module.ts
+++ b/src/app/clients/clients-routing.module.ts
@@ -17,6 +17,7 @@ import { EditFamilyMemberComponent } from './clients-view/family-members-tab/edi
import { IdentitiesTabComponent } from './clients-view/identities-tab/identities-tab.component';
import { NotesTabComponent } from './clients-view/notes-tab/notes-tab.component';
import { DocumentsTabComponent } from './clients-view/documents-tab/documents-tab.component';
+import { DatatableTabComponent } from './clients-view/datatable-tab/datatable-tab.component';
/** Custom Resolvers */
import { ClientsResolver } from './common-resolvers/clients.resolver';
@@ -30,6 +31,8 @@ import { ClientTemplateResolver } from './common-resolvers/client-template.resol
import { ClientIdentitiesResolver } from './common-resolvers/client-identities.resolver';
import { ClientNotesResolver } from './common-resolvers/client-notes.resolver';
import { ClientDocumentsResolver } from './common-resolvers/client-document.resolver';
+import { ClientDatatablesResolver } from './common-resolvers/client-datatables.resolver';
+import { ClientDatatableResolver } from './common-resolvers/client-datatable.resolver';
const routes: Routes = [
Route.withShell([{
@@ -49,6 +52,7 @@ const routes: Routes = [
data: { title: extract('Clients View'), routeParamBreadcrumb: 'clientId' },
resolve: {
clientViewData: ClientViewResolver,
+ clientDatatables: ClientDatatablesResolver
},
children: [
{
@@ -110,6 +114,16 @@ const routes: Routes = [
resolve: {
clientNotes: ClientNotesResolver
}
+ },
+ {
+ path: 'datatables',
+ children: [{
+ path: ':datatableName',
+ component: DatatableTabComponent,
+ resolve: {
+ clientDatatable: ClientDatatableResolver
+ }
+ }]
}
]
}
@@ -132,7 +146,9 @@ const routes: Routes = [
ClientTemplateResolver,
ClientIdentitiesResolver,
ClientNotesResolver,
- ClientDocumentsResolver
+ ClientDocumentsResolver,
+ ClientDatatablesResolver,
+ ClientDatatableResolver
]
})
export class ClientsRoutingModule { }
diff --git a/src/app/clients/clients-view/clients-view.component.html b/src/app/clients/clients-view/clients-view.component.html
index 0cb6e7145..bb3ff9fc5 100644
--- a/src/app/clients/clients-view/clients-view.component.html
+++ b/src/app/clients/clients-view/clients-view.component.html
@@ -43,7 +43,7 @@
-
diff --git a/src/app/clients/clients-view/clients-view.component.scss b/src/app/clients/clients-view/clients-view.component.scss
index 4337c8c53..9be697070 100644
--- a/src/app/clients/clients-view/clients-view.component.scss
+++ b/src/app/clients/clients-view/clients-view.component.scss
@@ -26,4 +26,7 @@
margin: 0 1%;
}
}
+ .navigation-tabs {
+ overflow: auto;
+ }
}
diff --git a/src/app/clients/clients-view/clients-view.component.ts b/src/app/clients/clients-view/clients-view.component.ts
index 44ab00355..1d5783f23 100644
--- a/src/app/clients/clients-view/clients-view.component.ts
+++ b/src/app/clients/clients-view/clients-view.component.ts
@@ -12,13 +12,18 @@ import { ClientsService } from '../clients.service';
})
export class ClientsViewComponent implements OnInit {
clientViewData: any;
+ clientDatatables: any;
clientImage: any;
clientTemplate: any;
constructor(private route: ActivatedRoute,
private clientsService: ClientsService,
private _sanitizer: DomSanitizer) {
- this.route.data.subscribe((data: { clientViewData: any }) => {
+ this.route.data.subscribe((data: {
+ clientViewData: any,
+ clientDatatables: any
+ }) => {
this.clientViewData = data.clientViewData;
+ this.clientDatatables = data.clientDatatables;
});
}
diff --git a/src/app/clients/clients-view/datatable-tab/datatable-tab.component.html b/src/app/clients/clients-view/datatable-tab/datatable-tab.component.html
new file mode 100644
index 000000000..2dd096522
--- /dev/null
+++ b/src/app/clients/clients-view/datatable-tab/datatable-tab.component.html
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/app/clients/clients-view/datatable-tab/datatable-tab.component.scss b/src/app/clients/clients-view/datatable-tab/datatable-tab.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/clients/clients-view/datatable-tab/datatable-tab.component.spec.ts b/src/app/clients/clients-view/datatable-tab/datatable-tab.component.spec.ts
new file mode 100644
index 000000000..1f409cd4e
--- /dev/null
+++ b/src/app/clients/clients-view/datatable-tab/datatable-tab.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DatatableTabComponent } from './datatable-tab.component';
+
+describe('DatatableTabComponent', () => {
+ let component: DatatableTabComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ DatatableTabComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(DatatableTabComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/clients/clients-view/datatable-tab/datatable-tab.component.ts b/src/app/clients/clients-view/datatable-tab/datatable-tab.component.ts
new file mode 100644
index 000000000..b47f99453
--- /dev/null
+++ b/src/app/clients/clients-view/datatable-tab/datatable-tab.component.ts
@@ -0,0 +1,23 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+
+@Component({
+ selector: 'mifosx-datatable-tab',
+ templateUrl: './datatable-tab.component.html',
+ styleUrls: ['./datatable-tab.component.scss']
+})
+export class DatatableTabComponent implements OnInit {
+ clientDatatable: any;
+ multiRowDatatableFlag: boolean;
+ constructor(private route: ActivatedRoute) {
+ this.route.data.subscribe((data: { clientDatatable: any }) => {
+ this.clientDatatable = data.clientDatatable;
+ this.multiRowDatatableFlag = this.clientDatatable.columnHeaders[0].columnName === 'id' ? true : false;
+ });
+
+ }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/clients/clients-view/datatable-tab/multi-row/multi-row.component.html b/src/app/clients/clients-view/datatable-tab/multi-row/multi-row.component.html
new file mode 100644
index 000000000..1b7f6c45f
--- /dev/null
+++ b/src/app/clients/clients-view/datatable-tab/multi-row/multi-row.component.html
@@ -0,0 +1,20 @@
+
+
{{datatableName}}
+
+
+
+
+
+
+ | {{datatableColumn}} |
+ {{data.row[i]}} |
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/clients/clients-view/datatable-tab/multi-row/multi-row.component.scss b/src/app/clients/clients-view/datatable-tab/multi-row/multi-row.component.scss
new file mode 100644
index 000000000..04774025d
--- /dev/null
+++ b/src/app/clients/clients-view/datatable-tab/multi-row/multi-row.component.scss
@@ -0,0 +1,8 @@
+.tab-container {
+ padding: 1%;
+ margin: 1%;
+
+ table {
+ width: 100%;
+ }
+}
diff --git a/src/app/clients/clients-view/datatable-tab/multi-row/multi-row.component.spec.ts b/src/app/clients/clients-view/datatable-tab/multi-row/multi-row.component.spec.ts
new file mode 100644
index 000000000..dd46589d8
--- /dev/null
+++ b/src/app/clients/clients-view/datatable-tab/multi-row/multi-row.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MultiRowComponent } from './multi-row.component';
+
+describe('MultiRowComponent', () => {
+ let component: MultiRowComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ MultiRowComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(MultiRowComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/clients/clients-view/datatable-tab/multi-row/multi-row.component.ts b/src/app/clients/clients-view/datatable-tab/multi-row/multi-row.component.ts
new file mode 100644
index 000000000..422b2945e
--- /dev/null
+++ b/src/app/clients/clients-view/datatable-tab/multi-row/multi-row.component.ts
@@ -0,0 +1,29 @@
+import { Component, OnInit, Input, OnChanges } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+
+@Component({
+ selector: 'mifosx-multi-row',
+ templateUrl: './multi-row.component.html',
+ styleUrls: ['./multi-row.component.scss']
+})
+export class MultiRowComponent implements OnInit, OnChanges {
+ @Input() dataObject: any;
+ datatableName: String;
+ datatableColumns: string[] = [];
+ datatableData: any;
+
+
+ constructor(private route: ActivatedRoute) { }
+
+ ngOnInit() {
+ this.route.params.subscribe((routeParams: any) => {
+ this.datatableName = routeParams.datatableName;
+ });
+ }
+ ngOnChanges() {
+ this.datatableColumns = this.dataObject.columnHeaders.map((columnHeader: any) => {
+ return columnHeader.columnName;
+ });
+ this.datatableData = this.dataObject.data;
+ }
+}
diff --git a/src/app/clients/clients-view/datatable-tab/single-row/single-row.component.html b/src/app/clients/clients-view/datatable-tab/single-row/single-row.component.html
new file mode 100644
index 000000000..201ee46c3
--- /dev/null
+++ b/src/app/clients/clients-view/datatable-tab/single-row/single-row.component.html
@@ -0,0 +1,13 @@
+
+
{{datatableName}}
+
+
+
+
+
+ {{columnHeader.columnName}} : {{dataObject.data[0].row[i]}}
+
+
+
\ No newline at end of file
diff --git a/src/app/clients/clients-view/datatable-tab/single-row/single-row.component.scss b/src/app/clients/clients-view/datatable-tab/single-row/single-row.component.scss
new file mode 100644
index 000000000..877efd996
--- /dev/null
+++ b/src/app/clients/clients-view/datatable-tab/single-row/single-row.component.scss
@@ -0,0 +1,4 @@
+.tab-container {
+ padding:1%;
+ margin: 1%;
+}
\ No newline at end of file
diff --git a/src/app/clients/clients-view/datatable-tab/single-row/single-row.component.spec.ts b/src/app/clients/clients-view/datatable-tab/single-row/single-row.component.spec.ts
new file mode 100644
index 000000000..8aece650c
--- /dev/null
+++ b/src/app/clients/clients-view/datatable-tab/single-row/single-row.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SingleRowComponent } from './single-row.component';
+
+describe('SingleRowComponent', () => {
+ let component: SingleRowComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ SingleRowComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(SingleRowComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/clients/clients-view/datatable-tab/single-row/single-row.component.ts b/src/app/clients/clients-view/datatable-tab/single-row/single-row.component.ts
new file mode 100644
index 000000000..ba4b7762d
--- /dev/null
+++ b/src/app/clients/clients-view/datatable-tab/single-row/single-row.component.ts
@@ -0,0 +1,20 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+
+@Component({
+ selector: 'mifosx-single-row',
+ templateUrl: './single-row.component.html',
+ styleUrls: ['./single-row.component.scss']
+})
+export class SingleRowComponent implements OnInit {
+ @Input() dataObject: any;
+ datatableName: String;
+ constructor(private route: ActivatedRoute) { }
+
+ ngOnInit() {
+ this.route.params.subscribe((routeParams: any) => {
+ this.datatableName = routeParams.datatableName;
+ });
+ }
+
+}
diff --git a/src/app/clients/clients.module.ts b/src/app/clients/clients.module.ts
index 5e92fd4a2..6e602c6d6 100644
--- a/src/app/clients/clients.module.ts
+++ b/src/app/clients/clients.module.ts
@@ -19,6 +19,9 @@ import { UploadDocumentDialogComponent } from './clients-view/upload-document-di
import { NotesTabComponent } from './clients-view/notes-tab/notes-tab.component';
import { EditNotesDialogComponent } from './clients-view/edit-notes-dialog/edit-notes-dialog.component';
import { DocumentsTabComponent } from './clients-view/documents-tab/documents-tab.component';
+import { DatatableTabComponent } from './clients-view/datatable-tab/datatable-tab.component';
+import { MultiRowComponent } from './clients-view/datatable-tab/multi-row/multi-row.component';
+import { SingleRowComponent } from './clients-view/datatable-tab/single-row/single-row.component';
/**
@@ -43,7 +46,10 @@ import { DocumentsTabComponent } from './clients-view/documents-tab/documents-ta
UploadDocumentDialogComponent,
NotesTabComponent,
EditNotesDialogComponent,
- DocumentsTabComponent
+ DocumentsTabComponent,
+ DatatableTabComponent,
+ MultiRowComponent,
+ SingleRowComponent
],
entryComponents: [
UploadDocumentDialogComponent,
diff --git a/src/app/clients/clients.service.ts b/src/app/clients/clients.service.ts
index c1c70e88a..aecbcac69 100644
--- a/src/app/clients/clients.service.ts
+++ b/src/app/clients/clients.service.ts
@@ -28,6 +28,15 @@ export class ClientsService {
return this.http.get(`/clients/${clientId}`);
}
+ getClientDatatables() {
+ const httpParams = new HttpParams().set('apptable', 'm_client');
+ return this.http.get(`/datatables`, { params: httpParams });
+ }
+ getClientDatatable(clientId: string, datatableName: string) {
+ const httpParams = new HttpParams().set('genericResultSet', 'true');
+ return this.http.get(`/datatables/${datatableName}/${clientId}`, { params: httpParams });
+ }
+
getClientAccountData(clientId: string) {
return this.http.get(`/clients/${clientId}/accounts`);
}
diff --git a/src/app/clients/common-resolvers/client-datatable.resolver.ts b/src/app/clients/common-resolvers/client-datatable.resolver.ts
new file mode 100644
index 000000000..f18167848
--- /dev/null
+++ b/src/app/clients/common-resolvers/client-datatable.resolver.ts
@@ -0,0 +1,32 @@
+/** Angular Imports */
+import { Injectable } from '@angular/core';
+import { Resolve, ActivatedRouteSnapshot } from '@angular/router';
+
+/** rxjs Imports */
+import { Observable } from 'rxjs';
+
+/** Custom Services */
+import { ClientsService } from '../clients.service';
+
+/**
+ * Client datatable resolver.
+ */
+@Injectable()
+export class ClientDatatableResolver implements Resolve