handle edge case for ytd selection at beginning of year

teambtcmap · Dec 19, 2023 · 68b23f6 · 68b23f6
1 parent b1feefc
commit 68b23f6
Showing 1 changed file with 22 additions and 19 deletions.
diff --git a/src/routes/dashboard/+page.svelte b/src/routes/dashboard/+page.svelte
@@ -522,26 +522,29 @@
 			} else {
 				const latestReport = statsSorted[statsSorted.length - 1];
 				const dateHistory = getChartHistoryDate();
+				const reportIsCurrent =
+					today.getDate() === dateHistory.getDate() &&
+					today.getMonth() === dateHistory.getMonth() &&
+					today.getFullYear() === dateHistory.getFullYear();
+
+				statsFiltered.push({
+					...latestReport,
+					date: `${dateHistory.getFullYear()}-${
+						dateHistory.getMonth() + 1
+					}-${dateHistory.getDate()}`,
+					created_at: dateHistory.toISOString(),
+					updated_at: dateHistory.toISOString()
+				});
 
-				statsFiltered.push(
-					...[
-						{
-							...latestReport,
-							date: `${dateHistory.getFullYear()}-${
-								dateHistory.getMonth() + 1
-							}-${dateHistory.getDate()}`,
-							created_at: dateHistory.toISOString(),
-							updated_at: dateHistory.toISOString()
-						},
-						{
-							...latestReport,
-							id: latestReport.id + 1,
-							date: `${today.getFullYear()}-${today.getMonth() + 1}-${today.getDate()}`,
-							created_at: today.toISOString(),
-							updated_at: today.toISOString()
-						}
-					]
-				);
+				if (!reportIsCurrent) {
+					statsFiltered.push({
+						...latestReport,
+						id: latestReport.id + 1,
+						date: `${today.getFullYear()}-${today.getMonth() + 1}-${today.getDate()}`,
+						created_at: today.toISOString(),
+						updated_at: today.toISOString()
+					});
+				}
 
 				statsFiltered = statsFiltered;
 			}