From fc5c80922db9f639efe0d20a1478d9cbd459e272 Mon Sep 17 00:00:00 2001 From: Jose Alberto Hernandez Date: Tue, 24 May 2022 22:37:43 -0500 Subject: [PATCH] New Data Tables Creation not working : 1402 --- .../datatable-tab/multi-row/multi-row.component.ts | 2 +- .../single-row/single-row.component.ts | 2 +- .../datatable-tab/multi-row/multi-row.component.ts | 2 +- .../single-row/single-row.component.ts | 4 ++-- .../datatable-tab/multi-row/multi-row.component.ts | 2 +- .../single-row/single-row.component.ts | 4 ++-- src/app/system/manage-data-tables/app-table-data.ts | 5 +++++ .../create-data-table.component.html | 13 +++++++++++-- .../create-data-table.component.ts | 10 ++++++++-- 9 files changed, 32 insertions(+), 12 deletions(-) diff --git a/src/app/centers/centers-view/datatable-tab/multi-row/multi-row.component.ts b/src/app/centers/centers-view/datatable-tab/multi-row/multi-row.component.ts index d416f9e2a..d3973507a 100644 --- a/src/app/centers/centers-view/datatable-tab/multi-row/multi-row.component.ts +++ b/src/app/centers/centers-view/datatable-tab/multi-row/multi-row.component.ts @@ -91,7 +91,7 @@ export class MultiRowComponent implements OnInit, OnChanges { let dataTableEntryObject: any = { locale: this.settingsService.language.code }; const dateTransformColumns: string[] = []; const columns = this.dataObject.columnHeaders.filter((column: any) => { - return ((column.columnName !== 'id') && (column.columnName !== 'center_id')); + return ((column.columnName !== 'id') && (column.columnName !== 'center_id') && (column.columnName !== 'created_at') && (column.columnName !== 'updated_at')); }); const formfields: FormfieldBase[] = columns.map((column: any) => { switch (column.columnDisplayType) { diff --git a/src/app/centers/centers-view/datatable-tab/single-row/single-row.component.ts b/src/app/centers/centers-view/datatable-tab/single-row/single-row.component.ts index efbd4c2c4..0449d8b74 100644 --- a/src/app/centers/centers-view/datatable-tab/single-row/single-row.component.ts +++ b/src/app/centers/centers-view/datatable-tab/single-row/single-row.component.ts @@ -70,7 +70,7 @@ export class SingleRowComponent implements OnInit { let dataTableEntryObject: any = { locale: this.settingsService.language.code }; const dateTransformColumns: string[] = []; const columns = this.dataObject.columnHeaders.filter((column: any) => { - return ((column.columnName !== 'id') && (column.columnName !== 'center_id')); + return ((column.columnName !== 'id') && (column.columnName !== 'center_id') && (column.columnName !== 'created_at') && (column.columnName !== 'updated_at')); }); const formfields: FormfieldBase[] = this.getFormfields(columns, dateTransformColumns, dataTableEntryObject); const data = { 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 index d1d1ede2b..17751c7ef 100644 --- 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 @@ -57,7 +57,7 @@ export class MultiRowComponent implements OnInit, OnChanges { }; const dateTransformColumns: string[] = []; const columns = this.dataObject.columnHeaders.filter((column: any) => { - return ((column.columnName !== 'id') && (column.columnName !== 'client_id')); + return ((column.columnName !== 'id') && (column.columnName !== 'client_id') && (column.columnName !== 'created_at') && (column.columnName !== 'updated_at')); }); const formfields: FormfieldBase[] = columns.map((column: any) => { switch (column.columnDisplayType) { 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 index 6bc9ea376..ae151b4d2 100644 --- 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 @@ -47,7 +47,7 @@ export class SingleRowComponent implements OnInit { }; const dateTransformColumns: string[] = []; const columns = this.dataObject.columnHeaders.filter((column: any) => { - return ((column.columnName !== 'id') && (column.columnName !== 'client_id')); + return ((column.columnName !== 'id') && (column.columnName !== 'client_id') && (column.columnName !== 'created_at') && (column.columnName !== 'updated_at')); }); const formfields: FormfieldBase[] = this.getFormfields(columns, dateTransformColumns, dataTableEntryObject); const data = { @@ -77,7 +77,7 @@ export class SingleRowComponent implements OnInit { }; const dateTransformColumns: string[] = []; const columns = this.dataObject.columnHeaders.filter((column: any) => { - return ((column.columnName !== 'id') && (column.columnName !== 'client_id')); + return ((column.columnName !== 'id') && (column.columnName !== 'client_id') && (column.columnName !== 'created_at') && (column.columnName !== 'updated_at')); }); let formfields: FormfieldBase[] = this.getFormfields(columns, dateTransformColumns, dataTableEntryObject); formfields = formfields.map((formfield: FormfieldBase, index: number) => { diff --git a/src/app/loans/loans-view/datatable-tab/multi-row/multi-row.component.ts b/src/app/loans/loans-view/datatable-tab/multi-row/multi-row.component.ts index 262a1c3be..c22af967d 100644 --- a/src/app/loans/loans-view/datatable-tab/multi-row/multi-row.component.ts +++ b/src/app/loans/loans-view/datatable-tab/multi-row/multi-row.component.ts @@ -91,7 +91,7 @@ export class MultiRowComponent implements OnInit, OnChanges { let dataTableEntryObject: any = { locale: 'en' }; const dateTransformColumns: string[] = []; const columns = this.dataObject.columnHeaders.filter((column: any) => { - return ((column.columnName !== 'id') && (column.columnName !== 'loan_id')); + return ((column.columnName !== 'id') && (column.columnName !== 'loan_id') && (column.columnName !== 'created_at') && (column.columnName !== 'updated_at')); }); const formfields: FormfieldBase[] = columns.map((column: any) => { switch (column.columnDisplayType) { diff --git a/src/app/loans/loans-view/datatable-tab/single-row/single-row.component.ts b/src/app/loans/loans-view/datatable-tab/single-row/single-row.component.ts index 821952b85..9c84981fe 100644 --- a/src/app/loans/loans-view/datatable-tab/single-row/single-row.component.ts +++ b/src/app/loans/loans-view/datatable-tab/single-row/single-row.component.ts @@ -68,7 +68,7 @@ export class SingleRowComponent implements OnInit { let dataTableEntryObject: any = { locale: this.settingsService.language.code }; const dateTransformColumns: string[] = []; const columns = this.dataObject.columnHeaders.filter((column: any) => { - return ((column.columnName !== 'id') && (column.columnName !== 'loan_id')); + return ((column.columnName !== 'id') && (column.columnName !== 'loan_id') && (column.columnName !== 'created_at') && (column.columnName !== 'updated_at')); }); const formfields: FormfieldBase[] = this.getFormfields(columns, dateTransformColumns, dataTableEntryObject); const data = { @@ -98,7 +98,7 @@ export class SingleRowComponent implements OnInit { let dataTableEntryObject: any = { locale: this.settingsService.language.code }; const dateTransformColumns: string[] = []; const columns = this.dataObject.columnHeaders.filter((column: any) => { - return ((column.columnName !== 'id') && (column.columnName !== 'loan_id')); + return ((column.columnName !== 'id') && (column.columnName !== 'loan_id') && (column.columnName !== 'created_at') && (column.columnName !== 'updated_at')); }); let formfields: FormfieldBase[] = this.getFormfields(columns, dateTransformColumns, dataTableEntryObject); formfields = formfields.map((formfield: FormfieldBase, index: number) => { diff --git a/src/app/system/manage-data-tables/app-table-data.ts b/src/app/system/manage-data-tables/app-table-data.ts index 5fbd4ace7..de64e433a 100644 --- a/src/app/system/manage-data-tables/app-table-data.ts +++ b/src/app/system/manage-data-tables/app-table-data.ts @@ -8,3 +8,8 @@ export const appTableData: { displayValue: string, value: string }[] = [ { displayValue: 'Product Loan', value: 'm_product_loan' }, { displayValue: 'Savings Product', value: 'm_savings_product' } ]; + +export const entitySubTypeData: { displayValue: string, value: string }[] = [ + { displayValue: 'Person', value: 'Person' }, + { displayValue: 'Entity', value: 'Entity' }, + ]; diff --git a/src/app/system/manage-data-tables/create-data-table/create-data-table.component.html b/src/app/system/manage-data-tables/create-data-table/create-data-table.component.html index f92636ebf..68f86efb0 100644 --- a/src/app/system/manage-data-tables/create-data-table/create-data-table.component.html +++ b/src/app/system/manage-data-tables/create-data-table/create-data-table.component.html @@ -16,8 +16,8 @@ - - Application Table Name + + Entity Type {{ appTable.displayValue }} @@ -28,6 +28,15 @@ + + Entity SubType + + + {{ entitySubType.displayValue }} + + + +
Multi Row
diff --git a/src/app/system/manage-data-tables/create-data-table/create-data-table.component.ts b/src/app/system/manage-data-tables/create-data-table/create-data-table.component.ts index 999199138..5053cf803 100644 --- a/src/app/system/manage-data-tables/create-data-table/create-data-table.component.ts +++ b/src/app/system/manage-data-tables/create-data-table/create-data-table.component.ts @@ -11,7 +11,7 @@ import { MatTableDataSource } from '@angular/material/table'; import { SystemService } from '../../system.service'; /** Data Imports */ -import { appTableData } from '../app-table-data'; +import { appTableData, entitySubTypeData } from '../app-table-data'; /** Custom Components */ import { ColumnDialogComponent } from '../column-dialog/column-dialog.component'; @@ -31,6 +31,8 @@ export class CreateDataTableComponent implements OnInit { dataTableForm: FormGroup; /** Application Table Data */ appTableData = appTableData; + entitySubTypeData = entitySubTypeData; + showEntitySubType: boolean; /** Column Data */ columnData: any[] = []; /** Data passed to dialog. */ @@ -84,6 +86,9 @@ export class CreateDataTableComponent implements OnInit { ngOnInit() { this.createDataTableForm(); this.setColumns(); + this.dataTableForm.controls.apptableName.valueChanges.subscribe((value: any) => { + this.showEntitySubType = (value === 'm_client'); + }); } /** @@ -102,7 +107,8 @@ export class CreateDataTableComponent implements OnInit { this.dataTableForm = this.formBuilder.group({ 'datatableName': ['', Validators.required], 'apptableName': ['', Validators.required], - 'multiRow': [''] + 'multiRow': [false], + 'entitySubType': [''] }); }