[ProgressBar] fixes

Author: Yadro

src/components/ProgressBar.tsx

@@ -53,27 +53,30 @@ function ProgressBar() {
     timeItems,
   ]);
 
-  const { estimatedWorkingTimeEnd, progress } = TaskTimeService.getDayProgress(
+  const {
+    estimatedWorkingTimeEnd,
+    progress,
+    realProgress,
+  } = TaskTimeService.getDayProgress(
     timeRangeItems,
     workingTimeStart,
     workingHoursMs
   );
 
-  const progressRound = Math.round(progress);
   const marks: Record<number, string> = {
     0: toTimeFormat(workingTimeStart),
     100: toTimeFormat(estimatedWorkingTimeEnd),
   };
-  if (progressRound > 10 && progressRound < 90) {
-    marks[progressRound] = `${progressRound}%`;
+  if (progress > 10 && progress < 90) {
+    marks[progress] = `${realProgress}%`;
   }
 
   const tipFormatter = useMemo(() => {
-    if (progressRound <= 10 || progressRound >= 90) {
-      return (value?: number) => `${value}%`;
+    if (progress <= 10 || progress >= 90) {
+      return () => `${realProgress}%`;
     }
     return null;
-  }, [progressRound]);
+  }, [progress, realProgress]);
 
   return (
     <Slider

src/services/TaskTimeService.ts

@@ -7,6 +7,7 @@ import { ITimeRangeModel } from '../modules/tasks/models/TaskModel';
 
 export type DayProgress = {
   progress: number;
+  realProgress: number;
   durationMs: number;
   restMs: number;
   estimatedWorkingTimeEnd: Date | undefined;
@@ -21,6 +22,7 @@ const TaskTimeService = {
     if (!workingTimeStart) {
       return {
         progress: 0,
+        realProgress: 0,
         durationMs: 0,
         restMs: 0,
         estimatedWorkingTimeEnd: undefined,
@@ -36,15 +38,19 @@ const TaskTimeService = {
     );
 
     let progress = 0;
+    let realProgress = 0;
     if (estimatedWorkingTimeEnd) {
       const durationWorkDayMs =
         estimatedWorkingTimeEnd.getTime() - workingTimeStart.getTime() || 1;
       progress = ((durationMs + restMs) * 100) / durationWorkDayMs;
-      progress = Math.min(progress, 100);
+      progress = Math.min(Math.round(progress), 100);
+      realProgress = (durationMs * 100) / workingHoursMs;
+      realProgress = Math.min(Math.round(realProgress), 100);
     }
 
     return {
       progress,
+      realProgress,
       durationMs,
       restMs,
       estimatedWorkingTimeEnd,