SQuiz/frontPanel
2
0
Fork 0
Code Issues 18 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

фикс выводов графиков (что пришло то и вывелось)
Some checks are pending
Deploy / CreateImage (push) Waiting to run
Details
Deploy / DeployService (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
Nastya 2025-07-28 19:12:54 +03:00
parent c785b9eb95
commit 3df3eb2432
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pages/Analytics/General.tsx
View File

@ -42,16 +42,9 @@ const GeneralItem = ({
([nextValue], [currentValue]) => Number(nextValue) - Number(currentValue),
);
const days = data.map(([value]) => value);
const { time } = data.reduce(
(total, [_, value]) => ({
defaultValue: value > 0 ? value : total.defaultValue,
time: [...total.time, value > 0 ? value : total.defaultValue],
}),
{ defaultValue: 0, time: [] as number[] },
);
const numberValue = calculateTime
? time.reduce((total, value) => total + value, 0) / days.length
? Object.values(general).reduce((total, value) => total + value, 0) / Object.values(general).length
: conversionValue
? conversionValue
: Object.values(general).reduce((total, item) => total + item, 0);
@ -82,17 +75,17 @@ const GeneralItem = ({
<LineChart
xAxis={[
{
data: statiscticsResult ? days : Object.keys(general),
data: Object.keys(general),
valueFormatter: (value) => {
const timestamp = Number(value);
if (isNaN(timestamp)) return 'Invalid Date';
return moment.unix(timestamp).format(statiscticsResult ? "DD/MM/YYYY" : "DD/MM/YYYY HH") + (statiscticsResult ? "" : "ч");
return moment.unix(timestamp).format("DD/MM/YYYY");
},
},
]}
series={[
{
data: Object.values(statiscticsResult ? time : general),
data: Object.values(general),
valueFormatter: (value) =>
calculateTime
? getCalculatedTime(value)