Enhacement to management funds (#1735)
Co-authored-by: Jose Alberto Hernandez <alberto@MacBook-Pro.local>
This commit is contained in:
co-authored by
Jose Alberto Hernandez
parent
452a1adc17
commit
bf700cc100
+2
-2
@@ -11,14 +11,14 @@
|
||||
</button>
|
||||
</span>
|
||||
<span *mifosxHasPermission="'DELETE_' + datatableName">
|
||||
<button class="delete-button" mat-raised-button color="warn" (click)="delete()" *ngIf="showDeleteBotton">
|
||||
<button class="delete-button" mat-raised-button color="warn" (click)="delete()" *ngIf="hasEntityData">
|
||||
<fa-icon icon="trash" class="m-r-10"></fa-icon>Delete All
|
||||
</button>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<table #dataTable mat-table [hidden]="!datatableData[0]" [dataSource]="datatableData" class="mat-elevation-z1 m-b-25">
|
||||
<table #dataTable mat-table [hidden]="!hasEntityData" [dataSource]="datatableData" class="mat-elevation-z1 m-b-25">
|
||||
|
||||
<ng-container *ngFor="let datatableColumn of datatableColumns;let i = index" [matColumnDef]="datatableColumn">
|
||||
<th mat-header-cell class="right" *matHeaderCellDef> {{datatableColumn}} </th>
|
||||
|
||||
+22
-5
@@ -1,5 +1,5 @@
|
||||
import { DecimalPipe } from '@angular/common';
|
||||
import { Component, Input, OnInit, ViewChild } from '@angular/core';
|
||||
import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
|
||||
import { MatDialog } from '@angular/material/dialog';
|
||||
import { MatTable } from '@angular/material/table';
|
||||
import { ActivatedRoute } from '@angular/router';
|
||||
@@ -18,7 +18,7 @@ import { SystemService } from 'app/system/system.service';
|
||||
templateUrl: './datatable-multi-row.component.html',
|
||||
styleUrls: ['./datatable-multi-row.component.scss']
|
||||
})
|
||||
export class DatatableMultiRowComponent implements OnInit {
|
||||
export class DatatableMultiRowComponent implements OnInit, OnDestroy {
|
||||
|
||||
/** Data Object */
|
||||
@Input() dataObject: any;
|
||||
@@ -34,6 +34,7 @@ export class DatatableMultiRowComponent implements OnInit {
|
||||
|
||||
/** Toggle button visibility */
|
||||
showDeleteBotton: boolean;
|
||||
hasEntityData = false;
|
||||
|
||||
/** Data Table Reference */
|
||||
@ViewChild('dataTable', { static: true }) dataTableRef: MatTable<Element>;
|
||||
@@ -55,7 +56,9 @@ export class DatatableMultiRowComponent implements OnInit {
|
||||
private datatables: Datatables,
|
||||
private dateFormat: DateFormatPipe,
|
||||
private dateTimeFormat: DatetimeFormatPipe,
|
||||
private numberFormat: DecimalPipe) { }
|
||||
private numberFormat: DecimalPipe) {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches data table name from route params.
|
||||
@@ -69,7 +72,17 @@ export class DatatableMultiRowComponent implements OnInit {
|
||||
return columnHeader.columnName;
|
||||
});
|
||||
this.datatableData = this.dataObject.data;
|
||||
this.showDeleteBotton = this.datatableData[0] ? true : false;
|
||||
this.hasEntityData = (this.datatableData && this.datatableData.length > 0);
|
||||
console.log(this.hasEntityData);
|
||||
console.log(this.dataObject.data);
|
||||
}
|
||||
|
||||
ngOnDestroy(): void {
|
||||
this.datatableColumns = null;
|
||||
this.datatableData = null;
|
||||
this.hasEntityData = false;
|
||||
console.log(this.hasEntityData);
|
||||
console.log(this.dataObject.data);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -128,7 +141,11 @@ export class DatatableMultiRowComponent implements OnInit {
|
||||
} else if (columnDisplayType === 'DATETIME') {
|
||||
return this.dateTimeFormat.transform(value);
|
||||
} else if (columnDisplayType === 'INTEGER' || columnDisplayType === 'DECIMAL') {
|
||||
return this.numberFormat.transform(value);
|
||||
if (typeof value === 'number') {
|
||||
return this.numberFormat.transform(value);
|
||||
} else {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user