fixed compare display

This commit is contained in:
2026-04-07 10:54:57 +05:30
parent f4e5979c00
commit 6602d29299
2 changed files with 36 additions and 16 deletions

View File

@@ -6,6 +6,7 @@ export interface ChartDataPoint {
amount: number; amount: number;
compareAmount?: number; compareAmount?: number;
count?: number; count?: number;
compareLabel?: string;
highlighted?: boolean; highlighted?: boolean;
} }
@@ -203,9 +204,17 @@ export default function HistoryChart({
}} }}
> >
{/* Values */} {/* Values */}
<Typography variant="caption" sx={{ mb: 1, fontSize: "0.65rem" }}> <Box sx={{ mb: 1, textAlign: "center" }}>
{comparison && point.compareAmount ? (
<Typography variant="caption" sx={{ fontSize: "0.6rem", color: "text.secondary" }}>
{formatAmount(point.compareAmount)}
</Typography>
) : null}
<Typography variant="caption" sx={{ fontSize: "0.65rem" }}>
{formatAmount(point.amount)} {formatAmount(point.amount)}
</Typography> </Typography>
</Box>
{/* Bars */} {/* Bars */}
<Box <Box
@@ -240,19 +249,26 @@ export default function HistoryChart({
</Box> </Box>
{/* Label */} {/* Label */}
<Box sx={{ mt: 1, textAlign: "center" }}>
{comparison && point.compareLabel && (
<Typography <Typography
variant="caption" variant="caption"
color="text.secondary" color="text.secondary"
sx={{ sx={{ fontSize: "0.6rem", display: "block" }}
mt: 1, >
fontSize: "0.7rem", {point.compareLabel}
textAlign: "center", </Typography>
whiteSpace: "pre-line" )}
}}
<Typography
variant="caption"
color="text.secondary"
sx={{ fontSize: "0.7rem", display: "block" }}
> >
{point.id} {point.id}
</Typography> </Typography>
</Box> </Box>
</Box>
); );
})} })}
</Box> </Box>

View File

@@ -2,6 +2,7 @@ import { api } from "../../react-openapi";
import { LatestItem } from "../components/LatestItemsList"; import { LatestItem } from "../components/LatestItemsList";
import { ChartDataPoint } from "../components/HistoryChart"; import { ChartDataPoint } from "../components/HistoryChart";
import * as React from "react"; import * as React from "react";
import { format } from "./dateUtils";
import MonetizationOnIcon from "@mui/icons-material/MonetizationOn"; import MonetizationOnIcon from "@mui/icons-material/MonetizationOn";
import { import {
@@ -129,7 +130,10 @@ export async function fetchAggregatedData(
arr.map((x) => ({ arr.map((x) => ({
id: x.label, id: x.label,
amount: x.amount, amount: x.amount,
compareAmount: x.compare compareAmount: x.compare,
compareLabel: x.prevStart && x.prevEnd
? `${format(x.prevStart)} - ${format(x.prevEnd)}`
: undefined
})); }));
const chartData = { const chartData = {