wip

Author: Lukinoh

src/domains/attempt/components/attempts-comparison-table/vertical-attempts-comparison-table.tsx

@@ -146,7 +146,7 @@ export const VerticalAttemptsComparisonTable: Component<AttemptsComparisonTableP
       </Show>
 
       {/* Line */}
-      <Cell column={GRID_FULL_COLUMN} text={`Total PB time (${props.sumTimeRecords.trackCount} tracks)`} css={sTitle} />
+      <Cell column={GRID_FULL_COLUMN} text={`TimeSheet (${props.sumTimeRecords.trackCount} tracks)`} css={sTitle} />
 
       {/* Line */}
       <Cell column={GRID_FULL_COLUMN} text={props.sumTimeRecords.time} css={sTime} />

src/domains/attempt/components/attempts-filter/use-attempts-filter.tsx

@@ -18,8 +18,9 @@ export function useAttemptsFilter<Input extends Record<string, Accessor<Array<At
   const tracks = createMemo(() => {
     return unique(
       Object.values(props.input)
-        .flatMap((a) => a())
-        .map((a) => a.raw.track),
+        .flatMap((attempts) => attempts())
+        .map((a) => a.raw.track)
+        .toSorted()
     );
   });
 

src/domains/attempt/compositions/use-attempt-manager.ts

@@ -35,7 +35,11 @@ function useAttemptManagerFactory() {
     const coins = Coins.get(image, putImageData);
 
     if (!isDefined(time) || !isDefined(coins)) {
+<<<<<<< Updated upstream
       deferFinalTime();
+=======
+      const isFinished = isFinalTime(time, isPause, rate);
+>>>>>>> Stashed changes
       return undefined;
     }
 

src/domains/attempt/compositions/use-attempts.ts

@@ -8,7 +8,7 @@ import {
   flat,
   flatMap,
   groupBy,
-  isDeepEqual,
+  isDeepEqual, isDefined,
   last,
   map,
   pipe,
@@ -17,7 +17,7 @@ import {
   unique,
   uniqueBy,
   uniqueWith,
-  values,
+  values
 } from "remeda";
 import type { AttemptEntity } from "../../database/schemas/attempt-entity";
 import type { AttemptsEntity } from "../../database/schemas/attempts-entity";
@@ -27,7 +27,7 @@ import type { SumTimeRecords } from "../types/sum-time-records";
 import { Time } from "../utils/time";
 import { createMemo } from "solid-js";
 
-function getRecordsBy<T extends Attempt>(attempts: Array<T>, by: Parameters<typeof groupBy<T>>[0]): Array<T> {
+function getRecordsBy(attempts: Array<Attempt>, by: Parameters<typeof groupBy<Attempt>>[0]): Array<Attempt> {
   return pipe(
     attempts,
     groupBy(by),
@@ -140,19 +140,30 @@ function useAttemptsFactory(store: Store<AttemptsEntity>) {
     ),
   );
 
-  const getSumTimeRecords = createMemo<SumTimeRecords>(() => {
+  const getSumRecords = (attempts: Array<Attempt>) => {
     return pipe(
-      getTimeRecords(),
+      attempts,
       uniqueBy((attempt) => attempt.raw.track),
-      map((record) => Time.parse(record.time ?? "0:00.000") - Time.parse("0:00.000")),
+      filter((record): record is Attempt & { time: string } => isDefined(record.time)),
+      map((record) => Time.parse(record.time)),
       (times) => {
         return {
-          time: Time.formatH(Time.parse("0:00.000") + sum(times)),
+          time: Time.formatH(sum(times)),
           trackCount: times.length,
         };
       },
-    );
-  });
+    )
+  }
+
+  const getSumSplitsRecords = createMemo<SumTimeRecords>(() => {
+    return getSumRecords(getSplitRecords());
+  })
+
+  // TOOD: Appuyer sur le bouton de switch ou appuyer sur le recording peut etre générer un probleme
+
+  const getSumTimeRecords = createMemo<SumTimeRecords>(() => {
+    return getSumRecords(getTimeRecords());
+  })
 
   const merge = (...attempts: Array<Array<AttemptEntity>>): Array<AttemptEntity> => {
     return pipe(
@@ -173,6 +184,7 @@ function useAttemptsFactory(store: Store<AttemptsEntity>) {
     getSplitRecordByTrack,
     getFlattenRecords,
     getSumTimeRecords,
+    getSumSplitsRecords,
     merge,
   };
 }

src/domains/database/compositions/use-personal-repository.ts

@@ -28,6 +28,7 @@ function usePersonalRepositorySingleton() {
     getSplitRecords,
     getSplitRecordByTrack,
     getSumTimeRecords,
+    getSumSplitsRecords,
     merge,
   } = useAttempts(store);
 
@@ -100,6 +101,7 @@ function usePersonalRepositorySingleton() {
     getSplitRecords,
     getSplitRecordByTrack,
     getSumTimeRecords,
+    getSumSplitsRecords,
     shrink,
 
     // JSON

src/views/results.tsx

@@ -41,12 +41,17 @@ export const Results: Component = () => {
       <div class={sHeader}>
         <AttemptsFilter />
         <GridColumn class={sGrid} template="repeat(3, auto)" spacing="small" yAlign="center">
-          <VerticalDivider />
-          <Cell text="Sum of all your personal bests" />
+          <VerticalDivider row={2} />
+          <Cell text="TimeSheet (PB)" />
           <Cell
             text={`${personal.getSumTimeRecords().time} (${personal.getSumTimeRecords().trackCount} tracks)`}
             css={sTime}
           />
+          <Cell text="TimeSheet (BPS)" />
+          <Cell
+            text={`${personal.getSumSplitsRecords().time} (${personal.getSumSplitsRecords().trackCount} tracks)`}
+            css={sTime}
+          />
         </GridColumn>
       </div>