Fascinated/scoresaber-reloadedv3
Archived
1
1
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Activity

fix graph only showing 49 days of data
Some checks failed
Deploy Backend / docker (ubuntu-latest) (push) Successful in 45s
Details
Deploy Website / docker (ubuntu-latest) (push) Failing after 57s
Details

Browse Source
This commit is contained in:
Lee 2024-10-21 14:15:59 +01:00
parent 5933074569
commit 0b92cec911
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/common/src/model/player.ts
View File

@ -63,7 +63,7 @@ export class Player {
const statisticHistory = this.getStatisticHistory(); const statisticHistory = this.getStatisticHistory();
const history: Record<string, PlayerHistory> = {}; const history: Record<string, PlayerHistory> = {};
for (let i = 0; i < days; i++) { for (let i = 1; i <= days; i++) {
const date = formatDateMinimal(getMidnightAlignedDate(getDaysAgoDate(i))); const date = formatDateMinimal(getMidnightAlignedDate(getDaysAgoDate(i)));
const playerHistory = statisticHistory[date]; const playerHistory = statisticHistory[date];
if (playerHistory !== undefined && Object.keys(playerHistory).length > 0) { if (playerHistory !== undefined && Object.keys(playerHistory).length > 0) {

16
projects/website/src/components/player/chart/generic-player-chart.tsx
View File

@ -3,7 +3,7 @@
import React from "react"; import React from "react";
import GenericChart, { DatasetConfig } from "@/components/chart/generic-chart"; import GenericChart, { DatasetConfig } from "@/components/chart/generic-chart";
import ScoreSaberPlayer from "@ssr/common/player/impl/scoresaber-player"; import ScoreSaberPlayer from "@ssr/common/player/impl/scoresaber-player";
import { parseDate } from "@ssr/common/utils/time-utils"; import { getDaysAgoDate, parseDate } from "@ssr/common/utils/time-utils";
import { getValueFromHistory } from "@ssr/common/utils/player-utils"; import { getValueFromHistory } from "@ssr/common/utils/player-utils";
type Props = { type Props = {
@ -43,25 +43,19 @@ export default function GenericPlayerChart({ player, datasetConfig }: Props) {
([a], [b]) => parseDate(a).getTime() - parseDate(b).getTime() ([a], [b]) => parseDate(a).getTime() - parseDate(b).getTime()
); );
const today = new Date();
let currentHistoryIndex = 0; let currentHistoryIndex = 0;
// Iterate from historyDays-1 to 0 (last 'historyDays' days) for (let dayAgo = historyDays; dayAgo >= 0; dayAgo--) {
for (let dayAgo = historyDays - 1; dayAgo >= 0; dayAgo--) { const targetDate = getDaysAgoDate(dayAgo);
const targetDate = new Date(); labels.push(targetDate); // Add the target date to labels
targetDate.setDate(today.getDate() - dayAgo);
labels.push(targetDate); // Push the target date to labels
// Check if currentHistoryIndex is within bounds of statisticEntries
if (currentHistoryIndex < statisticEntries.length) { if (currentHistoryIndex < statisticEntries.length) {
const [dateString, history] = statisticEntries[currentHistoryIndex]; const [dateString, history] = statisticEntries[currentHistoryIndex];
const entryDate = parseDate(dateString); const entryDate = parseDate(dateString);
// If the entry date matches the target date, use this entry
if (entryDate.toDateString() === targetDate.toDateString()) { if (entryDate.toDateString() === targetDate.toDateString()) {
datasetConfig.forEach(config => { datasetConfig.forEach(config => {
// Use the correct index for histories histories[config.field][historyDays - dayAgo] = getValueFromHistory(history, config.field) ?? null;
histories[config.field][historyDays - 1 - dayAgo] = getValueFromHistory(history, config.field) ?? null;
}); });
currentHistoryIndex++; currentHistoryIndex++;
} }