vinvoor: retain scan time

ZeusWPI · Sep 5, 2024 · 06cfd69 · 06cfd69
1 parent ba7ea28
commit 06cfd69
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/vinvoor/src/overview/heatmap/Day.tsx b/vinvoor/src/overview/heatmap/Day.tsx
@@ -39,7 +39,7 @@ export const Day: FC<DayProps> = ({
 
   const data = useMemo<DayData>(() => {
     const normalizedScans = [...scans];
-    normalizedScans.forEach(scan => scan.scanTime.setHours(0, 0, 0, 0));
+    // normalizedScans.forEach(scan => scan.scanTime.setHours(0, 0, 0, 0));
     const formattedScans = formatData(normalizedScans);
 
     const start = new Date(

diff --git a/vinvoor/src/overview/heatmap/utils.ts b/vinvoor/src/overview/heatmap/utils.ts
@@ -28,11 +28,18 @@ export const getColumnCountMonths = (startDate: Date, endDate: Date) => {
 
 export const getMondayIndexedDay = (date: Date) => (date.getDay() + 6) % 7;
 
+const getNormalizedTime = (date: Date) => {
+  const result = new Date(date);
+  result.setHours(0, 0, 0, 0);
+  return result;
+};
+
 export const formatData = (scans: Scan[]) => {
   const result: Record<number, HeatmapValue> = {};
   scans.forEach(scan => {
-    result[scan.scanTime.getTime()] = {
-      date: scan.scanTime,
+    const date = getNormalizedTime(scan.scanTime);
+    result[date.getTime()] = {
+      date: date,
       count: 1,
     };
   });

diff --git a/vinvoor/src/overview/streak/Streak.tsx b/vinvoor/src/overview/streak/Streak.tsx
@@ -29,8 +29,9 @@ const isStreakDay = (date1: Date, date2: Date) => {
 const getStreak = (scans: readonly Scan[]): [boolean, number] => {
   const dates = scans
     .map(scan => {
-      scan.scanTime.setHours(0, 0, 0, 0);
-      return scan.scanTime;
+      const date = new Date(scan.scanTime);
+      date.setHours(0, 0, 0, 0);
+      return date;
     })
     .filter((value, index, array) => {
       return (