Merge pull request #1404 from josehernandezfintecheandomx/fix/datatable_suvebtity

New Data Tables Creation not working : 1402

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) {

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 = {

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) {

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) => {

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) {

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) => {

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' },
+  ];

src/app/system/manage-data-tables/create-data-table/create-data-table.component.html

@@ -16,8 +16,8 @@
             </mat-error>
           </mat-form-field>
 
-          <mat-form-field fxFlex="40%">
-            <mat-label>Application Table Name</mat-label>
+          <mat-form-field fxFlex="20%">
+            <mat-label>Entity Type</mat-label>
             <mat-select required formControlName="apptableName">
               <mat-option *ngFor="let appTable of appTableData" [value]="appTable.value">
                 {{ appTable.displayValue }}
@@ -28,6 +28,15 @@
             </mat-error>
           </mat-form-field>
 
+          <mat-form-field fxFlex="20%" *ngIf="showEntitySubType">
+            <mat-label>Entity SubType</mat-label>
+            <mat-select formControlName="entitySubType">
+              <mat-option *ngFor="let entitySubType of entitySubTypeData" [value]="entitySubType.value">
+                {{ entitySubType.displayValue }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+
           <div fxFlex="14%" class="multi-row-wrapper">
             <mat-checkbox labelPosition="before" formControlName="multiRow" class="multi-row">Multi Row</mat-checkbox>
           </div>

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': ['']
     });
   }