@optifye/dashboard-core 6.10.9 → 6.10.10

package/dist/index.js

@@ -37421,50 +37421,61 @@ var LinePdfGenerator = ({
       doc.setLineWidth(0.8);
       doc.line(20, 118, 190, 118);
       const hourlyOverviewStartY = 123;
+      const parseTimeToMinutes2 = (timeStr) => {
+        const [hours, minutes] = timeStr.split(":");
+        const hour = parseInt(hours, 10);
+        const minute = parseInt(minutes || "0", 10);
+        if (Number.isNaN(hour) || Number.isNaN(minute)) {
+          return NaN;
+        }
+        return (hour * 60 + minute) % (24 * 60);
+      };
+      const formatMinutesLabel = (totalMinutes) => {
+        const normalized = (totalMinutes % (24 * 60) + 24 * 60) % (24 * 60);
+        const hour = Math.floor(normalized / 60);
+        const minute = normalized % 60;
+        const time2 = /* @__PURE__ */ new Date();
+        time2.setHours(hour);
+        time2.setMinutes(minute);
+        time2.setSeconds(0);
+        time2.setMilliseconds(0);
+        return time2.toLocaleTimeString("en-IN", {
+          hour: "2-digit",
+          minute: "2-digit",
+          hour12: true,
+          timeZone: "Asia/Kolkata"
+        });
+      };
+      const buildRange = (startMinutes, minutes) => {
+        const endMinutes = startMinutes + minutes;
+        return {
+          label: `${formatMinutesLabel(startMinutes)} - ${formatMinutesLabel(endMinutes)}`,
+          minutes
+        };
+      };
       const getHourlyTimeRanges = (startTimeStr, endTimeStr) => {
-        const [hours, minutes] = startTimeStr.split(":");
-        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(":");
-          endHour = parseInt(endHours);
-          endMinute = parseInt(endMinutes || "0");
-          let duration = endHour - startHour;
-          if (duration <= 0) {
-            duration += 24;
-          }
-          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 + i) % 24);
-          hourStartTime.setMinutes(startMinute);
-          hourStartTime.setSeconds(0);
-          hourStartTime.setMilliseconds(0);
-          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 formatTime5 = (date2) => {
-            return date2.toLocaleTimeString("en-IN", {
-              hour: "2-digit",
-              minute: "2-digit",
-              hour12: true,
-              timeZone: "Asia/Kolkata"
-            });
-          };
-          return `${formatTime5(hourStartTime)} - ${formatTime5(hourEndTime)}`;
+        const startMinutes = parseTimeToMinutes2(startTimeStr);
+        if (Number.isNaN(startMinutes)) {
+          return [];
+        }
+        if (!endTimeStr) {
+          const defaultHours = 11;
+          return Array.from({ length: defaultHours }, (_, i) => buildRange(startMinutes + i * 60, 60));
+        }
+        const endMinutes = parseTimeToMinutes2(endTimeStr);
+        if (Number.isNaN(endMinutes)) {
+          const fallbackHours = 11;
+          return Array.from({ length: fallbackHours }, (_, i) => buildRange(startMinutes + i * 60, 60));
+        }
+        let durationMinutes = endMinutes - startMinutes;
+        if (durationMinutes <= 0) {
+          durationMinutes += 24 * 60;
+        }
+        const rangeCount = Math.max(1, Math.ceil(durationMinutes / 60));
+        return Array.from({ length: rangeCount }, (_, i) => {
+          const remainingMinutes = durationMinutes - i * 60;
+          const rangeMinutes = remainingMinutes >= 60 ? 60 : remainingMinutes;
+          return buildRange(startMinutes + i * 60, rangeMinutes);
         });
       };
       const hourlyTimeRanges = lineInfo.metrics.shift_start ? getHourlyTimeRanges(lineInfo.metrics.shift_start, lineInfo.metrics.shift_end) : [];
@@ -37476,8 +37487,13 @@ var LinePdfGenerator = ({
         const startHour = parseInt(startHourStr);
         const startMinute = parseInt(startMinuteStr || "0");
         const [endHourStr, endMinuteStr] = (lineInfo.metrics.shift_end || "18:00").split(":");
+        const endHour = parseInt(endHourStr);
         const endMinute = parseInt(endMinuteStr || "0");
-        const hasPartialLastHour = endMinute > 0 && endMinute < 60;
+        let durationMinutes = endHour * 60 + endMinute - (startHour * 60 + startMinute);
+        if (durationMinutes <= 0) {
+          durationMinutes += 24 * 60;
+        }
+        const hasPartialLastHour = durationMinutes % 60 !== 0;
         const expectedHours = [];
         for (let i = 0; i < shiftDuration; i++) {
           expectedHours.push((startHour + i) % 24);
@@ -37668,19 +37684,21 @@ var LinePdfGenerator = ({
         const hourNumber = (startHour + index) % 24;
         const dataCollected = !isTodayForTable || hourNumber < currentHour;
         const outputStr = dataCollected ? actualOutput.toString() : "TBD";
-        const targetStr = targetOutputPerHour.toString();
         if (index < totalRows - 1) {
           const rowBottomY = headerBottomY + (index + 1) * rowSpacing;
           doc.setDrawColor(200, 200, 200);
           doc.line(20, rowBottomY, 190, rowBottomY);
         }
-        doc.text(timeRange, 25, yPos);
+        const rangeMinutes = timeRange.minutes || 60;
+        const targetForRange = targetOutputPerHour * (rangeMinutes / 60);
+        const targetStr = rangeMinutes === 60 ? targetOutputPerHour.toString() : targetForRange.toFixed(1).replace(/\.0$/, "");
+        doc.text(timeRange.label, 25, yPos);
         doc.text(outputStr, 75, yPos);
         doc.text(targetStr, 105, yPos);
         if (!dataCollected) {
           doc.setTextColor(100, 100, 100);
           doc.text("-", 135, yPos);
-        } else if (actualOutput >= targetOutputPerHour) {
+        } else if (actualOutput >= targetForRange) {
           doc.setTextColor(0, 171, 69);
           doc.setFont("ZapfDingbats", "normal");
           doc.text("4", 135, yPos);
@@ -39091,23 +39109,29 @@ var WorkspacePdfGenerator = ({ workspace, className, idleTimeReasons }) => {
       const colBoundaries = [20, 70, 100, 130, 155, 190];
       const totalRows = hourlyData.length;
       const gridBottomY = headerBottomY + totalRows * rowHeight;
+      const tableHeight = gridBottomY - gridTopY;
+      doc.setFillColor(255, 255, 255);
+      doc.roundedRect(20, gridTopY, 170, tableHeight, 2, 2, "F");
+      doc.setDrawColor(230, 230, 230);
+      doc.setLineWidth(0.2);
+      doc.roundedRect(20, gridTopY, 170, tableHeight, 2, 2, "S");
       doc.setDrawColor(200, 200, 200);
       doc.setLineWidth(0.3);
-      doc.line(20, gridTopY, 190, gridTopY);
       doc.line(20, headerBottomY, 190, headerBottomY);
-      colBoundaries.forEach((x) => {
+      colBoundaries.slice(1, -1).forEach((x) => {
         doc.line(x, gridTopY, x, gridBottomY);
       });
       doc.setFontSize(headerFontSize);
       doc.setFont("helvetica", "bold");
-      doc.text("Time Range", 25, headerY);
-      doc.text("Output", 75, headerY);
-      doc.text("Target", 105, headerY);
-      doc.text("Status", 135, headerY);
-      doc.text("Remarks", 160, headerY);
+      const headerTextY = gridTopY + 5.5;
+      doc.text("Time Range", 25, headerTextY);
+      doc.text("Output", 75, headerTextY);
+      doc.text("Target", 105, headerTextY);
+      doc.text("Status", 135, headerTextY);
+      doc.text("Remarks", 160, headerTextY);
       doc.setFontSize(contentFontSize);
       doc.setFont("helvetica", "normal");
-      let yPos = tableStartY;
+      let yPos = headerBottomY + 5.5;
       const workspaceDate = new Date(workspace.date);
       const today = /* @__PURE__ */ new Date();
       today.setHours(0, 0, 0, 0);
@@ -39135,9 +39159,11 @@ var WorkspacePdfGenerator = ({ workspace, className, idleTimeReasons }) => {
         const dataCollected = !isToday2 || hourNumber < currentHour;
         const outputStr = dataCollected ? output.toString() : "TBD";
         const targetStr = hourlyTarget.toString();
-        const rowBottomY = headerBottomY + (index + 1) * rowHeight;
-        doc.setDrawColor(200, 200, 200);
-        doc.line(20, rowBottomY, 190, rowBottomY);
+        if (index < totalRows - 1) {
+          const rowBottomY = headerBottomY + (index + 1) * rowHeight;
+          doc.setDrawColor(200, 200, 200);
+          doc.line(20, rowBottomY, 190, rowBottomY);
+        }
         doc.text(timeRange, 25, yPos);
         doc.text(outputStr, 75, yPos);
         doc.text(targetStr, 105, yPos);

package/dist/index.mjs

@@ -37392,50 +37392,61 @@ var LinePdfGenerator = ({
       doc.setLineWidth(0.8);
       doc.line(20, 118, 190, 118);
       const hourlyOverviewStartY = 123;
+      const parseTimeToMinutes2 = (timeStr) => {
+        const [hours, minutes] = timeStr.split(":");
+        const hour = parseInt(hours, 10);
+        const minute = parseInt(minutes || "0", 10);
+        if (Number.isNaN(hour) || Number.isNaN(minute)) {
+          return NaN;
+        }
+        return (hour * 60 + minute) % (24 * 60);
+      };
+      const formatMinutesLabel = (totalMinutes) => {
+        const normalized = (totalMinutes % (24 * 60) + 24 * 60) % (24 * 60);
+        const hour = Math.floor(normalized / 60);
+        const minute = normalized % 60;
+        const time2 = /* @__PURE__ */ new Date();
+        time2.setHours(hour);
+        time2.setMinutes(minute);
+        time2.setSeconds(0);
+        time2.setMilliseconds(0);
+        return time2.toLocaleTimeString("en-IN", {
+          hour: "2-digit",
+          minute: "2-digit",
+          hour12: true,
+          timeZone: "Asia/Kolkata"
+        });
+      };
+      const buildRange = (startMinutes, minutes) => {
+        const endMinutes = startMinutes + minutes;
+        return {
+          label: `${formatMinutesLabel(startMinutes)} - ${formatMinutesLabel(endMinutes)}`,
+          minutes
+        };
+      };
       const getHourlyTimeRanges = (startTimeStr, endTimeStr) => {
-        const [hours, minutes] = startTimeStr.split(":");
-        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(":");
-          endHour = parseInt(endHours);
-          endMinute = parseInt(endMinutes || "0");
-          let duration = endHour - startHour;
-          if (duration <= 0) {
-            duration += 24;
-          }
-          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 + i) % 24);
-          hourStartTime.setMinutes(startMinute);
-          hourStartTime.setSeconds(0);
-          hourStartTime.setMilliseconds(0);
-          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 formatTime5 = (date2) => {
-            return date2.toLocaleTimeString("en-IN", {
-              hour: "2-digit",
-              minute: "2-digit",
-              hour12: true,
-              timeZone: "Asia/Kolkata"
-            });
-          };
-          return `${formatTime5(hourStartTime)} - ${formatTime5(hourEndTime)}`;
+        const startMinutes = parseTimeToMinutes2(startTimeStr);
+        if (Number.isNaN(startMinutes)) {
+          return [];
+        }
+        if (!endTimeStr) {
+          const defaultHours = 11;
+          return Array.from({ length: defaultHours }, (_, i) => buildRange(startMinutes + i * 60, 60));
+        }
+        const endMinutes = parseTimeToMinutes2(endTimeStr);
+        if (Number.isNaN(endMinutes)) {
+          const fallbackHours = 11;
+          return Array.from({ length: fallbackHours }, (_, i) => buildRange(startMinutes + i * 60, 60));
+        }
+        let durationMinutes = endMinutes - startMinutes;
+        if (durationMinutes <= 0) {
+          durationMinutes += 24 * 60;
+        }
+        const rangeCount = Math.max(1, Math.ceil(durationMinutes / 60));
+        return Array.from({ length: rangeCount }, (_, i) => {
+          const remainingMinutes = durationMinutes - i * 60;
+          const rangeMinutes = remainingMinutes >= 60 ? 60 : remainingMinutes;
+          return buildRange(startMinutes + i * 60, rangeMinutes);
         });
       };
       const hourlyTimeRanges = lineInfo.metrics.shift_start ? getHourlyTimeRanges(lineInfo.metrics.shift_start, lineInfo.metrics.shift_end) : [];
@@ -37447,8 +37458,13 @@ var LinePdfGenerator = ({
         const startHour = parseInt(startHourStr);
         const startMinute = parseInt(startMinuteStr || "0");
         const [endHourStr, endMinuteStr] = (lineInfo.metrics.shift_end || "18:00").split(":");
+        const endHour = parseInt(endHourStr);
         const endMinute = parseInt(endMinuteStr || "0");
-        const hasPartialLastHour = endMinute > 0 && endMinute < 60;
+        let durationMinutes = endHour * 60 + endMinute - (startHour * 60 + startMinute);
+        if (durationMinutes <= 0) {
+          durationMinutes += 24 * 60;
+        }
+        const hasPartialLastHour = durationMinutes % 60 !== 0;
         const expectedHours = [];
         for (let i = 0; i < shiftDuration; i++) {
           expectedHours.push((startHour + i) % 24);
@@ -37639,19 +37655,21 @@ var LinePdfGenerator = ({
         const hourNumber = (startHour + index) % 24;
         const dataCollected = !isTodayForTable || hourNumber < currentHour;
         const outputStr = dataCollected ? actualOutput.toString() : "TBD";
-        const targetStr = targetOutputPerHour.toString();
         if (index < totalRows - 1) {
           const rowBottomY = headerBottomY + (index + 1) * rowSpacing;
           doc.setDrawColor(200, 200, 200);
           doc.line(20, rowBottomY, 190, rowBottomY);
         }
-        doc.text(timeRange, 25, yPos);
+        const rangeMinutes = timeRange.minutes || 60;
+        const targetForRange = targetOutputPerHour * (rangeMinutes / 60);
+        const targetStr = rangeMinutes === 60 ? targetOutputPerHour.toString() : targetForRange.toFixed(1).replace(/\.0$/, "");
+        doc.text(timeRange.label, 25, yPos);
         doc.text(outputStr, 75, yPos);
         doc.text(targetStr, 105, yPos);
         if (!dataCollected) {
           doc.setTextColor(100, 100, 100);
           doc.text("-", 135, yPos);
-        } else if (actualOutput >= targetOutputPerHour) {
+        } else if (actualOutput >= targetForRange) {
           doc.setTextColor(0, 171, 69);
           doc.setFont("ZapfDingbats", "normal");
           doc.text("4", 135, yPos);
@@ -39062,23 +39080,29 @@ var WorkspacePdfGenerator = ({ workspace, className, idleTimeReasons }) => {
       const colBoundaries = [20, 70, 100, 130, 155, 190];
       const totalRows = hourlyData.length;
       const gridBottomY = headerBottomY + totalRows * rowHeight;
+      const tableHeight = gridBottomY - gridTopY;
+      doc.setFillColor(255, 255, 255);
+      doc.roundedRect(20, gridTopY, 170, tableHeight, 2, 2, "F");
+      doc.setDrawColor(230, 230, 230);
+      doc.setLineWidth(0.2);
+      doc.roundedRect(20, gridTopY, 170, tableHeight, 2, 2, "S");
       doc.setDrawColor(200, 200, 200);
       doc.setLineWidth(0.3);
-      doc.line(20, gridTopY, 190, gridTopY);
       doc.line(20, headerBottomY, 190, headerBottomY);
-      colBoundaries.forEach((x) => {
+      colBoundaries.slice(1, -1).forEach((x) => {
         doc.line(x, gridTopY, x, gridBottomY);
       });
       doc.setFontSize(headerFontSize);
       doc.setFont("helvetica", "bold");
-      doc.text("Time Range", 25, headerY);
-      doc.text("Output", 75, headerY);
-      doc.text("Target", 105, headerY);
-      doc.text("Status", 135, headerY);
-      doc.text("Remarks", 160, headerY);
+      const headerTextY = gridTopY + 5.5;
+      doc.text("Time Range", 25, headerTextY);
+      doc.text("Output", 75, headerTextY);
+      doc.text("Target", 105, headerTextY);
+      doc.text("Status", 135, headerTextY);
+      doc.text("Remarks", 160, headerTextY);
       doc.setFontSize(contentFontSize);
       doc.setFont("helvetica", "normal");
-      let yPos = tableStartY;
+      let yPos = headerBottomY + 5.5;
       const workspaceDate = new Date(workspace.date);
       const today = /* @__PURE__ */ new Date();
       today.setHours(0, 0, 0, 0);
@@ -39106,9 +39130,11 @@ var WorkspacePdfGenerator = ({ workspace, className, idleTimeReasons }) => {
         const dataCollected = !isToday2 || hourNumber < currentHour;
         const outputStr = dataCollected ? output.toString() : "TBD";
         const targetStr = hourlyTarget.toString();
-        const rowBottomY = headerBottomY + (index + 1) * rowHeight;
-        doc.setDrawColor(200, 200, 200);
-        doc.line(20, rowBottomY, 190, rowBottomY);
+        if (index < totalRows - 1) {
+          const rowBottomY = headerBottomY + (index + 1) * rowHeight;
+          doc.setDrawColor(200, 200, 200);
+          doc.line(20, rowBottomY, 190, rowBottomY);
+        }
         doc.text(timeRange, 25, yPos);
         doc.text(outputStr, 75, yPos);
         doc.text(targetStr, 105, yPos);

package/package.json

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