Fix glitch with values equal to 0 and seconds not rounded in elapsed time

Author: luc-github

src/components/Panels/Status.js

@@ -27,22 +27,26 @@ import { espHttpURL } from "../Helpers"
 
 const TimeControl = ({ label, time }) => {
     if (!time) return null
+    time.day = time.day ? time.day.toString() : "0"
+    time.hour = time.hour ? time.hour.toString() : "0"
+    time.min = time.min ? time.min.toString() : "0"
+    time.sec = time.sec ? time.sec.toString() : "0"
     return (
         <div class="extra-control-value flex-row-between">
             <div class="m-1">{T(label)}:</div>
-            {time.day && time.day > 0 && (
+            {time.day != "0" && (
                 <div class="m-1">
                     {time.day}
                     {T("P108")}
                 </div>
             )}
-            {((time.day && time.day > 0) || time.hour > 0) && (
+            {(time.day != "0" || time.hour != "0") && (
                 <div class="m-1">
                     {time.hour}
                     {T("P109")}
                 </div>
             )}
-            {((time.day && time.day > 0) || time.hour > 0 || time.min > 0) && (
+            {(time.day != "0" || time.hour != "0" || time.min != "0") && (
                 <div class="m-1">
                     {time.min}
                     {T("P110")}

src/targets/Printer3D/Marlin-embedded/TargetContext.js

@@ -130,17 +130,17 @@ const TargetContextProvider = ({ children }) => {
 
     const estimatedTime = (progress, time) => {
         const total =
-            (time.day ? parseInt(time.day) * 24 * 60 * 60 : 0) +
-            (time.hour ? parseInt(time.hour) * 60 * 60 : 0) +
-            (time.min ? parseInt(time.min) * 60 : 0) +
-            (time.sec ? parseInt(time.sec) : 0)
+            (time.day ? parseInt(time.day ? time.day : 0) * 24 * 60 * 60 : 0) +
+            (time.hour ? parseInt(time.hour ? time.hour : 0) * 60 * 60 : 0) +
+            (time.min ? parseInt(time.min ? time.min : 0) * 60 : 0) +
+            (time.sec ? parseInt(time.sec ? time.sec : 0) : 0)
         const totalSecondsLeft = (total * (100 - progress)) / progress
         return {
             year: null,
             day: Math.floor((totalSecondsLeft % (86400 * 30)) / 86400),
             hour: Math.floor((totalSecondsLeft % 86400) / 3600),
             min: Math.floor((totalSecondsLeft % 3600) / 60),
-            sec: totalSecondsLeft % 60,
+            sec: Math.floor(totalSecondsLeft % 60),
         }
     }
 

src/targets/Printer3D/Marlin/TargetContext.js

@@ -130,17 +130,17 @@ const TargetContextProvider = ({ children }) => {
 
     const estimatedTime = (progress, time) => {
         const total =
-            (time.day ? parseInt(time.day) * 24 * 60 * 60 : 0) +
-            (time.hour ? parseInt(time.hour) * 60 * 60 : 0) +
-            (time.min ? parseInt(time.min) * 60 : 0) +
-            (time.sec ? parseInt(time.sec) : 0)
+            (time.day ? parseInt(time.day ? time.day : 0) * 24 * 60 * 60 : 0) +
+            (time.hour ? parseInt(time.hour ? time.hour : 0) * 60 * 60 : 0) +
+            (time.min ? parseInt(time.min ? time.min : 0) * 60 : 0) +
+            (time.sec ? parseInt(time.sec ? time.sec : 0) : 0)
         const totalSecondsLeft = (total * (100 - progress)) / progress
         return {
             year: null,
             day: Math.floor((totalSecondsLeft % (86400 * 30)) / 86400),
             hour: Math.floor((totalSecondsLeft % 86400) / 3600),
             min: Math.floor((totalSecondsLeft % 3600) / 60),
-            sec: totalSecondsLeft % 60,
+            sec: Math.floor(totalSecondsLeft % 60),
         }
     }