web: round values and add average

This commit is contained in:
Carl-Gerhard Lindesvärd
2023-12-12 23:13:32 +01:00
parent f6823cd303
commit 13d7ad2a8c
4 changed files with 36 additions and 20 deletions

View File

@@ -57,7 +57,7 @@ export function ReportBarChart({ data }: ReportBarChartProps) {
footer: (info) => info.column.id,
size: width ? width * 0.3 : undefined,
}),
columnHelper.accessor((row) => row.totalCount, {
columnHelper.accessor((row) => row.metrics.total, {
id: 'totalCount',
cell: (info) => (
<div className="text-right font-medium">{info.getValue()}</div>
@@ -67,7 +67,7 @@ export function ReportBarChart({ data }: ReportBarChartProps) {
size: width ? width * 0.1 : undefined,
enableSorting: true,
}),
columnHelper.accessor((row) => row.totalCount, {
columnHelper.accessor((row) => row.metrics.total, {
id: 'graph',
cell: (info) => (
<div

View File

@@ -97,6 +97,7 @@ export function ReportTable({
{/* Header */}
<div className={cn('w-max', row)}>
<div className={cn(header, value, cell, total)}>Total</div>
<div className={cn(header, value, cell, total)}>Average</div>
{data.series[0]?.data.map((serie) => (
<div
key={serie.date.toString()}
@@ -112,7 +113,10 @@ export function ReportTable({
return (
<div className={cn('w-max', row)} key={serie.name}>
<div className={cn(header, value, cell, total)}>
{serie.totalCount}
{serie.metrics.total}
</div>
<div className={cn(header, value, cell, total)}>
{serie.metrics.average}
</div>
{serie.data.map((item) => {
return (
@@ -127,9 +131,13 @@ export function ReportTable({
</div>
</div>
<div className="flex gap-2">
<div>Summary</div>
<div>Total</div>
<div>
{data.series.reduce((acc, serie) => serie.totalCount + acc, 0)}
{data.series.reduce((acc, serie) => serie.metrics.total + acc, 0)}
</div>
<div>Average</div>
<div>
{data.series.reduce((acc, serie) => serie.metrics.average + acc, 0)}
</div>
</div>
</>