alexandr/myoffice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
alexandr
2023-08-04 21:32:40 +03:00
parent 0d45061d81
commit 25184e9edc
6 changed files with 83 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyOffice.SPA/src/app/dashboard/income/dashboard.component.html
+8 -2
View File
@@ -50,8 +50,14 @@
<table class="table align-items-center">
<tbody>
<tr *ngFor="let item of dashboardModel!.details">
<td><i class="fa fa-circle col-cyan msr-2"></i> {{item.currency}}</td>
<td [ngClass]="{ 'col-green': item.value != 0, 'col-red': item.value == 0}" style="text-align: right;">{{item.value | number: '1.2'}} ({{item.valueRaw}})</td>
<td><i class="fa fa-circle col-cyan msr-2"></i> {{item.name}}</td>
<td [ngClass]="{ 'col-green': item.value != 0, 'col-red': item.value == 0}" style="text-align: right;">{{item.valueRaw | number: '1.2'}}</td>
<td [ngClass]="{ 'col-green': item.value != 0, 'col-red': item.value == 0}" style="text-align: right;">{{item.value | number: '1.2'}}</td>
</tr>
<tr>
<td class="col-cyan">{{'TOTAL' | translate}}</td>
<td class="col-cyan" style="text-align: right;"></td>
<td class="col-cyan" style="text-align: right;">{{total | number: '1.2'}}</td>
</tr>
</tbody>
</table>
MyOffice.SPA/src/app/dashboard/income/dashboard.component.ts
+3
View File
@@ -41,6 +41,7 @@ export class DashboardIncomeComponent implements OnInit {
@ViewChild("chart") chart!: ChartComponent;
public chartOptions!: Partial<ChartOptions>;
dashboardModel?: DashboardInOutModel;
total?: number;
public dateFrom: Date = moment(new Date).add(-30, 'days').toDate();
public dateTo: Date = moment(new Date).add(0, 'days').toDate();
@@ -91,6 +92,8 @@ export class DashboardIncomeComponent implements OnInit {
});
}
this.total = response.data.reduce((sum, current) => sum + current.value, 0);
if (update) {
this.chart.updateSeries([{
data: series
MyOffice.SPA/src/app/dashboard/outcome/dashboard.component.html
+8 -2
View File
@@ -50,8 +50,14 @@
<table class="table align-items-center">
<tbody>
<tr *ngFor="let item of dashboardModel!.details">
<td><i class="fa fa-circle col-cyan msr-2"></i> {{item.currency}}</td>
<td [ngClass]="{ 'col-green': item.value != 0, 'col-red': item.value == 0}" style="text-align: right;">{{item.value | number: '1.2'}} ({{item.valueRaw}})</td>
<td><i class="fa fa-circle col-cyan msr-2"></i> {{item.name}}</td>
<td [ngClass]="{ 'col-green': item.value != 0, 'col-red': item.value == 0}" style="text-align: right;">{{item.valueRaw | number: '1.2'}}</td>
<td [ngClass]="{ 'col-green': item.value != 0, 'col-red': item.value == 0}" style="text-align: right;">{{item.value | number: '1.2'}}</td>
</tr>
<tr>
<td class="col-cyan">{{'TOTAL' | translate}}</td>
<td class="col-cyan" style="text-align: right;"></td>
<td class="col-cyan" style="text-align: right;">{{total | number: '1.2'}}</td>
</tr>
</tbody>
</table>
MyOffice.SPA/src/app/dashboard/outcome/dashboard.component.ts
+3
View File
@@ -42,6 +42,7 @@ export class DashboardOutcomeComponent implements OnInit {
@ViewChild("chart") chart!: ChartComponent;
public chartOptions!: Partial<ChartOptions>;
dashboardModel?: DashboardInOutModel;
total?: number;
public dateFrom: Date = moment(new Date).add(-30, 'days').toDate();
public dateTo: Date = moment(new Date).add(0, 'days').toDate();
@@ -97,6 +98,8 @@ export class DashboardOutcomeComponent implements OnInit {
});
}
this.total = response.data.reduce((sum, current) => sum + current.value, 0);
if (update) {
this.chart.updateSeries([{
data: series