npm - @optifye/dashboard-core - Versions diffs - 6.5.10 → 6.5.11 - Mend

@optifye/dashboard-core 6.5.10 → 6.5.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.js CHANGED Viewed

@@ -25339,29 +25339,36 @@ var LinePdfGenerator = ({
         const startHour = parseInt(hours);
         const startMinute = parseInt(minutes || "0");
         let SHIFT_DURATION = 11;
+        let endHour = startHour + 11;
+        let endMinute = startMinute;
         if (endTimeStr) {
           const [endHours, endMinutes] = endTimeStr.split(":");
-          const endHour = parseInt(endHours);
-          const endMinute = parseInt(endMinutes || "0");
+          endHour = parseInt(endHours);
+          endMinute = parseInt(endMinutes || "0");
           let duration = endHour - startHour;
           if (duration <= 0) {
             duration += 24;
           }
-          const minuteDiff = endMinute - startMinute;
-          if (minuteDiff !== 0) {
-            duration += minuteDiff / 60;
-          }
-          SHIFT_DURATION = Math.round(duration);
+          const hasPartialLastHour = endMinute > 0 && endMinute < 60;
+          SHIFT_DURATION = hasPartialLastHour ? Math.ceil(duration) : Math.round(duration);
         }
         return Array.from({ length: SHIFT_DURATION }, (_, i) => {
+          const isLastHour = i === SHIFT_DURATION - 1;
           const hourStartTime = /* @__PURE__ */ new Date();
-          hourStartTime.setHours(startHour);
+          hourStartTime.setHours((startHour + i) % 24);
           hourStartTime.setMinutes(startMinute);
           hourStartTime.setSeconds(0);
           hourStartTime.setMilliseconds(0);
-          hourStartTime.setTime(hourStartTime.getTime() + i * 60 * 60 * 1e3);
-          const hourEndTime = new Date(hourStartTime);
-          hourEndTime.setTime(hourEndTime.getTime() + 60 * 60 * 1e3);
+          let hourEndTime = /* @__PURE__ */ new Date();
+          if (isLastHour && endTimeStr) {
+            hourEndTime.setHours(endHour % 24);
+            hourEndTime.setMinutes(endMinute);
+          } else {
+            hourEndTime.setHours((startHour + i + 1) % 24);
+            hourEndTime.setMinutes(startMinute);
+          }
+          hourEndTime.setSeconds(0);
+          hourEndTime.setMilliseconds(0);
           const formatTime3 = (date2) => {
             return date2.toLocaleTimeString("en-IN", {
               hour: "2-digit",
@@ -25378,17 +25385,132 @@ var LinePdfGenerator = ({
       const targetOutputPerHour = Math.round(lineInfo.metrics.line_threshold / shiftDuration);
       let hourlyActualOutput = [];
       if (lineInfo.metrics.output_hourly && Object.keys(lineInfo.metrics.output_hourly).length > 0) {
-        const startHour = parseInt(lineInfo.metrics.shift_start?.split(":")[0] || "6");
+        const [startHourStr, startMinuteStr] = (lineInfo.metrics.shift_start || "6:00").split(":");
+        const startHour = parseInt(startHourStr);
+        const startMinute = parseInt(startMinuteStr || "0");
+        const [endHourStr, endMinuteStr] = (lineInfo.metrics.shift_end || "18:00").split(":");
+        const endMinute = parseInt(endMinuteStr || "0");
+        const hasPartialLastHour = endMinute > 0 && endMinute < 60;
         const expectedHours = [];
         for (let i = 0; i < shiftDuration; i++) {
           expectedHours.push((startHour + i) % 24);
         }
-        hourlyActualOutput = expectedHours.map((hour) => {
-          const hourData = lineInfo.metrics.output_hourly[hour.toString()];
-          if (hourData && Array.isArray(hourData)) {
-            return hourData.reduce((sum, val) => sum + (val || 0), 0);
+        hourlyActualOutput = expectedHours.map((expectedHour, index) => {
+          let hourSum = 0;
+          const outputHourly = lineInfo.metrics.output_hourly;
+          const hourData = outputHourly[expectedHour.toString()] || [];
+          if (startMinute > 0) {
+            if (index === 0) {
+              if (Array.isArray(hourData)) {
+                for (let i = startMinute; i < hourData.length; i++) {
+                  const val = hourData[i];
+                  if (val !== "x" && typeof val === "number") {
+                    hourSum += val;
+                  }
+                }
+              }
+              const nextHour = (expectedHour + 1) % 24;
+              const nextHourData = outputHourly[nextHour.toString()] || [];
+              if (Array.isArray(nextHourData)) {
+                for (let i = 0; i < startMinute && i < nextHourData.length; i++) {
+                  const val = nextHourData[i];
+                  if (val !== "x" && typeof val === "number") {
+                    hourSum += val;
+                  }
+                }
+              }
+            } else if (index < expectedHours.length - 1) {
+              if (Array.isArray(hourData)) {
+                for (let i = startMinute; i < hourData.length; i++) {
+                  const val = hourData[i];
+                  if (val !== "x" && typeof val === "number") {
+                    hourSum += val;
+                  }
+                }
+              }
+              const nextHour = (expectedHour + 1) % 24;
+              const nextHourData = outputHourly[nextHour.toString()] || [];
+              if (Array.isArray(nextHourData)) {
+                for (let i = 0; i < startMinute && i < nextHourData.length; i++) {
+                  const val = nextHourData[i];
+                  if (val !== "x" && typeof val === "number") {
+                    hourSum += val;
+                  }
+                }
+              }
+            } else {
+              if (hasPartialLastHour && endMinute > 0) {
+                if (startMinute > 0) {
+                  if (Array.isArray(hourData)) {
+                    for (let i = startMinute; i < hourData.length; i++) {
+                      const val = hourData[i];
+                      if (val !== "x" && typeof val === "number") {
+                        hourSum += val;
+                      }
+                    }
+                  }
+                  const nextHour = (expectedHour + 1) % 24;
+                  const nextHourData = outputHourly[nextHour.toString()] || [];
+                  if (Array.isArray(nextHourData)) {
+                    for (let i = 0; i < endMinute && i < nextHourData.length; i++) {
+                      const val = nextHourData[i];
+                      if (val !== "x" && typeof val === "number") {
+                        hourSum += val;
+                      }
+                    }
+                  }
+                } else {
+                  if (Array.isArray(hourData)) {
+                    for (let i = 0; i < endMinute && i < hourData.length; i++) {
+                      const val = hourData[i];
+                      if (val !== "x" && typeof val === "number") {
+                        hourSum += val;
+                      }
+                    }
+                  }
+                }
+              } else {
+                if (Array.isArray(hourData)) {
+                  for (let i = startMinute; i < hourData.length; i++) {
+                    const val = hourData[i];
+                    if (val !== "x" && typeof val === "number") {
+                      hourSum += val;
+                    }
+                  }
+                }
+                const nextHour = (expectedHour + 1) % 24;
+                const nextHourData = outputHourly[nextHour.toString()] || [];
+                if (Array.isArray(nextHourData)) {
+                  for (let i = 0; i < startMinute && i < nextHourData.length; i++) {
+                    const val = nextHourData[i];
+                    if (val !== "x" && typeof val === "number") {
+                      hourSum += val;
+                    }
+                  }
+                }
+              }
+            }
+          } else {
+            if (Array.isArray(hourData)) {
+              hourData.forEach((val) => {
+                if (val !== "x" && typeof val === "number") {
+                  hourSum += val;
+                }
+              });
+            }
+            if (index === expectedHours.length - 1 && hasPartialLastHour && endMinute > 0) {
+              hourSum = 0;
+              if (Array.isArray(hourData)) {
+                for (let i = 0; i < endMinute && i < hourData.length; i++) {
+                  const val = hourData[i];
+                  if (val !== "x" && typeof val === "number") {
+                    hourSum += val;
+                  }
+                }
+              }
+            }
           }
-          return 0;
+          return hourSum;
         });
       } else if (lineInfo.metrics.output_array && lineInfo.metrics.output_array.length > 0) {
         hourlyActualOutput = lineInfo.metrics.output_array.reduce((acc, val, i) => {

package/dist/index.mjs CHANGED Viewed

@@ -25309,29 +25309,36 @@ var LinePdfGenerator = ({
         const startHour = parseInt(hours);
         const startMinute = parseInt(minutes || "0");
         let SHIFT_DURATION = 11;
+        let endHour = startHour + 11;
+        let endMinute = startMinute;
         if (endTimeStr) {
           const [endHours, endMinutes] = endTimeStr.split(":");
-          const endHour = parseInt(endHours);
-          const endMinute = parseInt(endMinutes || "0");
+          endHour = parseInt(endHours);
+          endMinute = parseInt(endMinutes || "0");
           let duration = endHour - startHour;
           if (duration <= 0) {
             duration += 24;
           }
-          const minuteDiff = endMinute - startMinute;
-          if (minuteDiff !== 0) {
-            duration += minuteDiff / 60;
-          }
-          SHIFT_DURATION = Math.round(duration);
+          const hasPartialLastHour = endMinute > 0 && endMinute < 60;
+          SHIFT_DURATION = hasPartialLastHour ? Math.ceil(duration) : Math.round(duration);
         }
         return Array.from({ length: SHIFT_DURATION }, (_, i) => {
+          const isLastHour = i === SHIFT_DURATION - 1;
           const hourStartTime = /* @__PURE__ */ new Date();
-          hourStartTime.setHours(startHour);
+          hourStartTime.setHours((startHour + i) % 24);
           hourStartTime.setMinutes(startMinute);
           hourStartTime.setSeconds(0);
           hourStartTime.setMilliseconds(0);
-          hourStartTime.setTime(hourStartTime.getTime() + i * 60 * 60 * 1e3);
-          const hourEndTime = new Date(hourStartTime);
-          hourEndTime.setTime(hourEndTime.getTime() + 60 * 60 * 1e3);
+          let hourEndTime = /* @__PURE__ */ new Date();
+          if (isLastHour && endTimeStr) {
+            hourEndTime.setHours(endHour % 24);
+            hourEndTime.setMinutes(endMinute);
+          } else {
+            hourEndTime.setHours((startHour + i + 1) % 24);
+            hourEndTime.setMinutes(startMinute);
+          }
+          hourEndTime.setSeconds(0);
+          hourEndTime.setMilliseconds(0);
           const formatTime3 = (date2) => {
             return date2.toLocaleTimeString("en-IN", {
               hour: "2-digit",
@@ -25348,17 +25355,132 @@ var LinePdfGenerator = ({
       const targetOutputPerHour = Math.round(lineInfo.metrics.line_threshold / shiftDuration);
       let hourlyActualOutput = [];
       if (lineInfo.metrics.output_hourly && Object.keys(lineInfo.metrics.output_hourly).length > 0) {
-        const startHour = parseInt(lineInfo.metrics.shift_start?.split(":")[0] || "6");
+        const [startHourStr, startMinuteStr] = (lineInfo.metrics.shift_start || "6:00").split(":");
+        const startHour = parseInt(startHourStr);
+        const startMinute = parseInt(startMinuteStr || "0");
+        const [endHourStr, endMinuteStr] = (lineInfo.metrics.shift_end || "18:00").split(":");
+        const endMinute = parseInt(endMinuteStr || "0");
+        const hasPartialLastHour = endMinute > 0 && endMinute < 60;
         const expectedHours = [];
         for (let i = 0; i < shiftDuration; i++) {
           expectedHours.push((startHour + i) % 24);
         }
-        hourlyActualOutput = expectedHours.map((hour) => {
-          const hourData = lineInfo.metrics.output_hourly[hour.toString()];
-          if (hourData && Array.isArray(hourData)) {
-            return hourData.reduce((sum, val) => sum + (val || 0), 0);
+        hourlyActualOutput = expectedHours.map((expectedHour, index) => {
+          let hourSum = 0;
+          const outputHourly = lineInfo.metrics.output_hourly;
+          const hourData = outputHourly[expectedHour.toString()] || [];
+          if (startMinute > 0) {
+            if (index === 0) {
+              if (Array.isArray(hourData)) {
+                for (let i = startMinute; i < hourData.length; i++) {
+                  const val = hourData[i];
+                  if (val !== "x" && typeof val === "number") {
+                    hourSum += val;
+                  }
+                }
+              }
+              const nextHour = (expectedHour + 1) % 24;
+              const nextHourData = outputHourly[nextHour.toString()] || [];
+              if (Array.isArray(nextHourData)) {
+                for (let i = 0; i < startMinute && i < nextHourData.length; i++) {
+                  const val = nextHourData[i];
+                  if (val !== "x" && typeof val === "number") {
+                    hourSum += val;
+                  }
+                }
+              }
+            } else if (index < expectedHours.length - 1) {
+              if (Array.isArray(hourData)) {
+                for (let i = startMinute; i < hourData.length; i++) {
+                  const val = hourData[i];
+                  if (val !== "x" && typeof val === "number") {
+                    hourSum += val;
+                  }
+                }
+              }
+              const nextHour = (expectedHour + 1) % 24;
+              const nextHourData = outputHourly[nextHour.toString()] || [];
+              if (Array.isArray(nextHourData)) {
+                for (let i = 0; i < startMinute && i < nextHourData.length; i++) {
+                  const val = nextHourData[i];
+                  if (val !== "x" && typeof val === "number") {
+                    hourSum += val;
+                  }
+                }
+              }
+            } else {
+              if (hasPartialLastHour && endMinute > 0) {
+                if (startMinute > 0) {
+                  if (Array.isArray(hourData)) {
+                    for (let i = startMinute; i < hourData.length; i++) {
+                      const val = hourData[i];
+                      if (val !== "x" && typeof val === "number") {
+                        hourSum += val;
+                      }
+                    }
+                  }
+                  const nextHour = (expectedHour + 1) % 24;
+                  const nextHourData = outputHourly[nextHour.toString()] || [];
+                  if (Array.isArray(nextHourData)) {
+                    for (let i = 0; i < endMinute && i < nextHourData.length; i++) {
+                      const val = nextHourData[i];
+                      if (val !== "x" && typeof val === "number") {
+                        hourSum += val;
+                      }
+                    }
+                  }
+                } else {
+                  if (Array.isArray(hourData)) {
+                    for (let i = 0; i < endMinute && i < hourData.length; i++) {
+                      const val = hourData[i];
+                      if (val !== "x" && typeof val === "number") {
+                        hourSum += val;
+                      }
+                    }
+                  }
+                }
+              } else {
+                if (Array.isArray(hourData)) {
+                  for (let i = startMinute; i < hourData.length; i++) {
+                    const val = hourData[i];
+                    if (val !== "x" && typeof val === "number") {
+                      hourSum += val;
+                    }
+                  }
+                }
+                const nextHour = (expectedHour + 1) % 24;
+                const nextHourData = outputHourly[nextHour.toString()] || [];
+                if (Array.isArray(nextHourData)) {
+                  for (let i = 0; i < startMinute && i < nextHourData.length; i++) {
+                    const val = nextHourData[i];
+                    if (val !== "x" && typeof val === "number") {
+                      hourSum += val;
+                    }
+                  }
+                }
+              }
+            }
+          } else {
+            if (Array.isArray(hourData)) {
+              hourData.forEach((val) => {
+                if (val !== "x" && typeof val === "number") {
+                  hourSum += val;
+                }
+              });
+            }
+            if (index === expectedHours.length - 1 && hasPartialLastHour && endMinute > 0) {
+              hourSum = 0;
+              if (Array.isArray(hourData)) {
+                for (let i = 0; i < endMinute && i < hourData.length; i++) {
+                  const val = hourData[i];
+                  if (val !== "x" && typeof val === "number") {
+                    hourSum += val;
+                  }
+                }
+              }
+            }
           }
-          return 0;
+          return hourSum;
         });
       } else if (lineInfo.metrics.output_array && lineInfo.metrics.output_array.length > 0) {
         hourlyActualOutput = lineInfo.metrics.output_array.reduce((acc, val, i) => {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@optifye/dashboard-core",
-  "version": "6.5.10",
+  "version": "6.5.11",
   "description": "Reusable UI & logic for Optifye dashboard",
   "main": "dist/index.js",
   "module": "dist/index.mjs",