@optifye/dashboard-core 6.5.7 → 6.5.9

package/dist/index.d.mts

@@ -32,6 +32,7 @@ interface LineInfo {
         underperforming_workspace_names: string[];
         underperforming_workspace_uuids: string[];
         output_array: number[];
+        output_hourly?: Record<string, number[]>;
         line_threshold: number;
         threshold_pph?: number;
         shift_start?: string;

package/dist/index.d.ts

@@ -32,6 +32,7 @@ interface LineInfo {
         underperforming_workspace_names: string[];
         underperforming_workspace_uuids: string[];
         output_array: number[];
+        output_hourly?: Record<string, number[]>;
         line_threshold: number;
         threshold_pph?: number;
         shift_start?: string;

package/dist/index.js

@@ -889,22 +889,21 @@ var dashboardService = {
       if (hasOutputHourlyData) {
         console.log("Using new output_hourly column for workspace:", data.workspace_name);
         console.log("Raw output_hourly data:", outputHourly);
-        const isNightShift = data.shift_id === 1;
-        const shiftStart = data.shift_start || (isNightShift ? "22:00" : "06:00");
-        const shiftEnd = data.shift_end || (isNightShift ? "06:00" : "14:00");
+        const isNightShift = data.shift_id === (shiftConfig.nightShift?.id ?? 1);
+        const shiftStart = data.shift_start || (isNightShift ? shiftConfig.nightShift?.startTime || "22:00" : shiftConfig.dayShift?.startTime || "06:00");
+        const shiftEnd = data.shift_end || (isNightShift ? shiftConfig.nightShift?.endTime || "06:00" : shiftConfig.dayShift?.endTime || "14:00");
         const startHour = parseInt(shiftStart.split(":")[0]);
         const startMinute = parseInt(shiftStart.split(":")[1] || "0");
         const endHour = parseInt(shiftEnd.split(":")[0]);
         const endMinute = parseInt(shiftEnd.split(":")[1] || "0");
         let shiftDuration = endHour - startHour;
-        if (endMinute > startMinute) {
-          shiftDuration += 1;
-        }
         if (shiftDuration <= 0) {
           shiftDuration += 24;
         }
+        const hasPartialLastHour = endMinute > 0 && endMinute < 60;
+        const hourCount = hasPartialLastHour ? Math.ceil(shiftDuration + endMinute / 60) : shiftDuration;
         let expectedHours = [];
-        for (let i = 0; i < shiftDuration; i++) {
+        for (let i = 0; i < hourCount; i++) {
           expectedHours.push((startHour + i) % 24);
         }
         console.log("Expected shift hours:", expectedHours);
@@ -5703,21 +5702,20 @@ var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId) => {
             console.log("Using new output_hourly column for workspace (fallback):", recentData.workspace_name);
             console.log("Raw output_hourly data (fallback):", outputHourly2);
             const isNightShift = recentData.shift_id === 1;
-            const shiftStart = recentData.shift_start || (isNightShift ? "22:00" : "06:00");
-            const shiftEnd = recentData.shift_end || (isNightShift ? "06:00" : "14:00");
+            const shiftStart = recentData.shift_start || (isNightShift ? shiftConfig.nightShift?.startTime || "22:00" : shiftConfig.dayShift?.startTime || "06:00");
+            const shiftEnd = recentData.shift_end || (isNightShift ? shiftConfig.nightShift?.endTime || "06:00" : shiftConfig.dayShift?.endTime || "14:00");
             const startHour = parseInt(shiftStart.split(":")[0]);
             const startMinute = parseInt(shiftStart.split(":")[1] || "0");
             const endHour = parseInt(shiftEnd.split(":")[0]);
             const endMinute = parseInt(shiftEnd.split(":")[1] || "0");
             let shiftDuration = endHour - startHour;
-            if (endMinute > startMinute) {
-              shiftDuration += 1;
-            }
             if (shiftDuration <= 0) {
               shiftDuration += 24;
             }
+            const hasPartialLastHour = endMinute > 0 && endMinute < 60;
+            const hourCount = hasPartialLastHour ? Math.ceil(shiftDuration + endMinute / 60) : shiftDuration;
             let expectedHours = [];
-            for (let i = 0; i < shiftDuration; i++) {
+            for (let i = 0; i < hourCount; i++) {
               expectedHours.push((startHour + i) % 24);
             }
             console.log("Expected shift hours (fallback):", expectedHours);
@@ -5762,8 +5760,8 @@ var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId) => {
             date: recentData.date,
             shift_id: recentData.shift_id,
             action_name: recentData.action_name || "",
-            shift_start: recentData.shift_start || "06:00",
-            shift_end: recentData.shift_end || "14:00",
+            shift_start: recentData.shift_start || (recentData.shift_id === 1 ? shiftConfig.nightShift?.startTime || "22:00" : shiftConfig.dayShift?.startTime || "06:00"),
+            shift_end: recentData.shift_end || (recentData.shift_id === 1 ? shiftConfig.nightShift?.endTime || "06:00" : shiftConfig.dayShift?.endTime || "14:00"),
             shift_type: recentData.shift_type || (recentData.shift_id === 0 ? "Day" : "Night"),
             pph_threshold: recentData.pph_threshold || 0,
             target_output: recentData.total_day_output || 0,
@@ -5819,21 +5817,20 @@ var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId) => {
         console.log("\u2705 Using new output_hourly column for workspace:", data.workspace_name);
         console.log("Raw output_hourly data:", JSON.stringify(outputHourly));
         const isNightShift = data.shift_id === 1;
-        const shiftStart = data.shift_start || (isNightShift ? "22:00" : "06:00");
-        const shiftEnd = data.shift_end || (isNightShift ? "06:00" : "14:00");
+        const shiftStart = data.shift_start || (isNightShift ? shiftConfig.nightShift?.startTime || "22:00" : shiftConfig.dayShift?.startTime || "06:00");
+        const shiftEnd = data.shift_end || (isNightShift ? shiftConfig.nightShift?.endTime || "06:00" : shiftConfig.dayShift?.endTime || "14:00");
         const startHour = parseInt(shiftStart.split(":")[0]);
         const startMinute = parseInt(shiftStart.split(":")[1] || "0");
         const endHour = parseInt(shiftEnd.split(":")[0]);
         const endMinute = parseInt(shiftEnd.split(":")[1] || "0");
         let shiftDuration = endHour - startHour;
-        if (endMinute > startMinute) {
-          shiftDuration += 1;
-        }
         if (shiftDuration <= 0) {
           shiftDuration += 24;
         }
+        const hasPartialLastHour = endMinute > 0 && endMinute < 60;
+        const hourCount = hasPartialLastHour ? Math.ceil(shiftDuration + endMinute / 60) : shiftDuration;
         let expectedHours = [];
-        for (let i = 0; i < shiftDuration; i++) {
+        for (let i = 0; i < hourCount; i++) {
           expectedHours.push((startHour + i) % 24);
         }
         console.log("Expected shift hours:", expectedHours);
@@ -5881,8 +5878,8 @@ var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId) => {
         date: data.date,
         shift_id: data.shift_id,
         action_name: data.action_name || "",
-        shift_start: data.shift_start || "06:00",
-        shift_end: data.shift_end || "14:00",
+        shift_start: data.shift_start || (data.shift_id === 1 ? shiftConfig.nightShift?.startTime || "22:00" : shiftConfig.dayShift?.startTime || "06:00"),
+        shift_end: data.shift_end || (data.shift_id === 1 ? shiftConfig.nightShift?.endTime || "06:00" : shiftConfig.dayShift?.endTime || "14:00"),
         shift_type: data.shift_type || (data.shift_id === 0 ? "Day" : "Night"),
         pph_threshold: data.pph_threshold || 0,
         target_output: data.total_day_output || 0,
@@ -21273,18 +21270,41 @@ var HourlyOutputChartComponent = ({
     return { hour, minute, decimalHour };
   };
   const shiftStartTime = getTimeFromTimeString(shiftStart);
-  const calculateShiftDuration = React19__namespace.default.useMemo(() => {
+  const { shiftDuration, shiftEndTime, hasPartialLastHour } = React19__namespace.default.useMemo(() => {
+    console.log("[HourlyOutputChart] Calculating shift duration with:", {
+      shiftStart,
+      shiftEnd,
+      shiftStartTime
+    });
     if (!shiftEnd) {
-      return 11;
+      console.log("[HourlyOutputChart] No shiftEnd provided, using default 11 hours");
+      return {
+        shiftDuration: 11,
+        shiftEndTime: null,
+        hasPartialLastHour: false
+      };
     }
     const endTime = getTimeFromTimeString(shiftEnd);
     let duration = endTime.decimalHour - shiftStartTime.decimalHour;
     if (duration <= 0) {
       duration += 24;
     }
-    return Math.round(duration);
+    const hasPartial = endTime.minute > 0 && endTime.minute < 60;
+    const hourCount = hasPartial ? Math.ceil(duration) : Math.round(duration);
+    console.log("[HourlyOutputChart] Shift calculation results:", {
+      endTime,
+      duration,
+      hasPartial,
+      hourCount
+    });
+    return {
+      shiftDuration: hourCount,
+      shiftEndTime: endTime,
+      hasPartialLastHour: hasPartial
+    };
   }, [shiftEnd, shiftStartTime.decimalHour]);
-  const SHIFT_DURATION = calculateShiftDuration;
+  const SHIFT_DURATION = shiftDuration;
+  shiftEndTime ? shiftEndTime.hour : (shiftStartTime.hour + SHIFT_DURATION) % 24;
   const [animatedData, setAnimatedData] = React19__namespace.default.useState(
     () => Array(SHIFT_DURATION).fill(0)
   );
@@ -21395,12 +21415,19 @@ var HourlyOutputChartComponent = ({
     };
   }, []);
   const formatHour = React19__namespace.default.useCallback((hourIndex) => {
+    const isLastHour = hourIndex === SHIFT_DURATION - 1;
     const startDecimalHour = shiftStartTime.decimalHour + hourIndex;
     const startHour = Math.floor(startDecimalHour) % 24;
     const startMinute = Math.round(startDecimalHour % 1 * 60);
-    const endDecimalHour = startDecimalHour + 1;
-    const endHour = Math.floor(endDecimalHour) % 24;
-    const endMinute = Math.round(endDecimalHour % 1 * 60);
+    let endHour, endMinute;
+    if (isLastHour && shiftEndTime) {
+      endHour = shiftEndTime.hour;
+      endMinute = shiftEndTime.minute;
+    } else {
+      const endDecimalHour = startDecimalHour + 1;
+      endHour = Math.floor(endDecimalHour) % 24;
+      endMinute = Math.round(endDecimalHour % 1 * 60);
+    }
     const formatTime3 = (h, m) => {
       const period = h >= 12 ? "PM" : "AM";
       const hour12 = h === 0 ? 12 : h > 12 ? h - 12 : h;
@@ -21410,21 +21437,28 @@ var HourlyOutputChartComponent = ({
       return `${hour12}:${m.toString().padStart(2, "0")}${period}`;
     };
     return `${formatTime3(startHour, startMinute)}-${formatTime3(endHour, endMinute)}`;
-  }, [shiftStartTime.decimalHour]);
+  }, [shiftStartTime.decimalHour, SHIFT_DURATION, shiftEndTime]);
   const formatTimeRange = React19__namespace.default.useCallback((hourIndex) => {
+    const isLastHour = hourIndex === SHIFT_DURATION - 1;
     const startDecimalHour = shiftStartTime.decimalHour + hourIndex;
     const startHour = Math.floor(startDecimalHour) % 24;
     const startMinute = Math.round(startDecimalHour % 1 * 60);
-    const endDecimalHour = startDecimalHour + 1;
-    const endHour = Math.floor(endDecimalHour) % 24;
-    const endMinute = Math.round(endDecimalHour % 1 * 60);
+    let endHour, endMinute;
+    if (isLastHour && shiftEndTime) {
+      endHour = shiftEndTime.hour;
+      endMinute = shiftEndTime.minute;
+    } else {
+      const endDecimalHour = startDecimalHour + 1;
+      endHour = Math.floor(endDecimalHour) % 24;
+      endMinute = Math.round(endDecimalHour % 1 * 60);
+    }
     const formatTime3 = (h, m) => {
       const period = h >= 12 ? "PM" : "AM";
       const hour12 = h === 0 ? 12 : h > 12 ? h - 12 : h;
       return `${hour12}:${m.toString().padStart(2, "0")} ${period}`;
     };
     return `${formatTime3(startHour, startMinute)} - ${formatTime3(endHour, endMinute)}`;
-  }, [shiftStartTime.decimalHour]);
+  }, [shiftStartTime.decimalHour, SHIFT_DURATION, shiftEndTime]);
   const chartData = React19__namespace.default.useMemo(() => {
     return Array.from({ length: SHIFT_DURATION }, (_, i) => {
       const actualHour = (shiftStartTime.hour + i) % 24;
@@ -24939,11 +24973,25 @@ var LinePdfGenerator = ({
       doc.setTextColor(70, 70, 70);
       doc.text("Hourly Output Overview", 20, 135);
       doc.setTextColor(0, 0, 0);
-      const getHourlyTimeRanges = (startTimeStr) => {
+      const getHourlyTimeRanges = (startTimeStr, endTimeStr) => {
         const [hours, minutes] = startTimeStr.split(":");
         const startHour = parseInt(hours);
         const startMinute = parseInt(minutes || "0");
-        const SHIFT_DURATION = 11;
+        let SHIFT_DURATION = 11;
+        if (endTimeStr) {
+          const [endHours, endMinutes] = endTimeStr.split(":");
+          const endHour = parseInt(endHours);
+          const 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);
+        }
         return Array.from({ length: SHIFT_DURATION }, (_, i) => {
           const hourStartTime = /* @__PURE__ */ new Date();
           hourStartTime.setHours(startHour);
@@ -24964,12 +25012,35 @@ var LinePdfGenerator = ({
           return `${formatTime3(hourStartTime)} - ${formatTime3(hourEndTime)}`;
         });
       };
-      const hourlyTimeRanges = lineInfo.metrics.shift_start ? getHourlyTimeRanges(lineInfo.metrics.shift_start) : [];
-      const targetOutputPerHour = Math.round(lineInfo.metrics.line_threshold / 11);
-      const hourlyActualOutput = Array.from({ length: 11 }, (_, i) => {
-        const proportionalOutput = Math.round(lineInfo.metrics.current_output / 11 * (0.85 + Math.random() * 0.3));
-        return Math.max(0, proportionalOutput);
-      });
+      const hourlyTimeRanges = lineInfo.metrics.shift_start ? getHourlyTimeRanges(lineInfo.metrics.shift_start, lineInfo.metrics.shift_end) : [];
+      const shiftDuration = hourlyTimeRanges.length || 11;
+      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 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);
+          }
+          return 0;
+        });
+      } else if (lineInfo.metrics.output_array && lineInfo.metrics.output_array.length > 0) {
+        hourlyActualOutput = lineInfo.metrics.output_array.reduce((acc, val, i) => {
+          const hourIndex = Math.floor(i / 60);
+          if (!acc[hourIndex]) acc[hourIndex] = 0;
+          acc[hourIndex] += val;
+          return acc;
+        }, []);
+      } else {
+        hourlyActualOutput = Array.from({ length: shiftDuration }, () => {
+          return Math.round(lineInfo.metrics.current_output / shiftDuration);
+        });
+      }
       doc.setFontSize(11);
       doc.setFont("helvetica", "bold");
       doc.setFillColor(245, 245, 245);
@@ -29357,10 +29428,11 @@ var HealthStatusGrid = ({
 };
 var ISTTimer2 = ISTTimer_default;
 var DashboardHeader = React19.memo(({ lineTitle, className = "", headerControls }) => {
+  const dashboardConfig = useDashboardConfig();
   const getShiftName = () => {
-    const now2 = /* @__PURE__ */ new Date();
-    const currentHour = now2.getHours();
-    return currentHour >= 6 && currentHour < 18 ? "Day" : "Night";
+    const timezone = dashboardConfig.dateTimeConfig?.defaultTimezone || "Asia/Kolkata";
+    const currentShift = getCurrentShift(timezone, dashboardConfig.shiftConfig);
+    return currentShift.shiftId === 0 ? "Day" : "Night";
   };
   const getShiftIcon = () => {
     const shift = getShiftName();
@@ -34093,6 +34165,7 @@ var KPIDetailView = ({
         underperforming_workspace_names: metrics2.underperforming_workspace_names || [],
         underperforming_workspace_uuids: metrics2.underperforming_workspace_uuids || [],
         output_array: metrics2.output_array || [],
+        output_hourly: metrics2.output_hourly,
         line_threshold: metrics2.line_threshold ?? 0,
         threshold_pph: metrics2.threshold_pph ?? 0,
         shift_start: metrics2.shift_start || "06:00",

package/dist/index.mjs

@@ -859,22 +859,21 @@ var dashboardService = {
       if (hasOutputHourlyData) {
         console.log("Using new output_hourly column for workspace:", data.workspace_name);
         console.log("Raw output_hourly data:", outputHourly);
-        const isNightShift = data.shift_id === 1;
-        const shiftStart = data.shift_start || (isNightShift ? "22:00" : "06:00");
-        const shiftEnd = data.shift_end || (isNightShift ? "06:00" : "14:00");
+        const isNightShift = data.shift_id === (shiftConfig.nightShift?.id ?? 1);
+        const shiftStart = data.shift_start || (isNightShift ? shiftConfig.nightShift?.startTime || "22:00" : shiftConfig.dayShift?.startTime || "06:00");
+        const shiftEnd = data.shift_end || (isNightShift ? shiftConfig.nightShift?.endTime || "06:00" : shiftConfig.dayShift?.endTime || "14:00");
         const startHour = parseInt(shiftStart.split(":")[0]);
         const startMinute = parseInt(shiftStart.split(":")[1] || "0");
         const endHour = parseInt(shiftEnd.split(":")[0]);
         const endMinute = parseInt(shiftEnd.split(":")[1] || "0");
         let shiftDuration = endHour - startHour;
-        if (endMinute > startMinute) {
-          shiftDuration += 1;
-        }
         if (shiftDuration <= 0) {
           shiftDuration += 24;
         }
+        const hasPartialLastHour = endMinute > 0 && endMinute < 60;
+        const hourCount = hasPartialLastHour ? Math.ceil(shiftDuration + endMinute / 60) : shiftDuration;
         let expectedHours = [];
-        for (let i = 0; i < shiftDuration; i++) {
+        for (let i = 0; i < hourCount; i++) {
           expectedHours.push((startHour + i) % 24);
         }
         console.log("Expected shift hours:", expectedHours);
@@ -5673,21 +5672,20 @@ var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId) => {
             console.log("Using new output_hourly column for workspace (fallback):", recentData.workspace_name);
             console.log("Raw output_hourly data (fallback):", outputHourly2);
             const isNightShift = recentData.shift_id === 1;
-            const shiftStart = recentData.shift_start || (isNightShift ? "22:00" : "06:00");
-            const shiftEnd = recentData.shift_end || (isNightShift ? "06:00" : "14:00");
+            const shiftStart = recentData.shift_start || (isNightShift ? shiftConfig.nightShift?.startTime || "22:00" : shiftConfig.dayShift?.startTime || "06:00");
+            const shiftEnd = recentData.shift_end || (isNightShift ? shiftConfig.nightShift?.endTime || "06:00" : shiftConfig.dayShift?.endTime || "14:00");
             const startHour = parseInt(shiftStart.split(":")[0]);
             const startMinute = parseInt(shiftStart.split(":")[1] || "0");
             const endHour = parseInt(shiftEnd.split(":")[0]);
             const endMinute = parseInt(shiftEnd.split(":")[1] || "0");
             let shiftDuration = endHour - startHour;
-            if (endMinute > startMinute) {
-              shiftDuration += 1;
-            }
             if (shiftDuration <= 0) {
               shiftDuration += 24;
             }
+            const hasPartialLastHour = endMinute > 0 && endMinute < 60;
+            const hourCount = hasPartialLastHour ? Math.ceil(shiftDuration + endMinute / 60) : shiftDuration;
             let expectedHours = [];
-            for (let i = 0; i < shiftDuration; i++) {
+            for (let i = 0; i < hourCount; i++) {
               expectedHours.push((startHour + i) % 24);
             }
             console.log("Expected shift hours (fallback):", expectedHours);
@@ -5732,8 +5730,8 @@ var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId) => {
             date: recentData.date,
             shift_id: recentData.shift_id,
             action_name: recentData.action_name || "",
-            shift_start: recentData.shift_start || "06:00",
-            shift_end: recentData.shift_end || "14:00",
+            shift_start: recentData.shift_start || (recentData.shift_id === 1 ? shiftConfig.nightShift?.startTime || "22:00" : shiftConfig.dayShift?.startTime || "06:00"),
+            shift_end: recentData.shift_end || (recentData.shift_id === 1 ? shiftConfig.nightShift?.endTime || "06:00" : shiftConfig.dayShift?.endTime || "14:00"),
             shift_type: recentData.shift_type || (recentData.shift_id === 0 ? "Day" : "Night"),
             pph_threshold: recentData.pph_threshold || 0,
             target_output: recentData.total_day_output || 0,
@@ -5789,21 +5787,20 @@ var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId) => {
         console.log("\u2705 Using new output_hourly column for workspace:", data.workspace_name);
         console.log("Raw output_hourly data:", JSON.stringify(outputHourly));
         const isNightShift = data.shift_id === 1;
-        const shiftStart = data.shift_start || (isNightShift ? "22:00" : "06:00");
-        const shiftEnd = data.shift_end || (isNightShift ? "06:00" : "14:00");
+        const shiftStart = data.shift_start || (isNightShift ? shiftConfig.nightShift?.startTime || "22:00" : shiftConfig.dayShift?.startTime || "06:00");
+        const shiftEnd = data.shift_end || (isNightShift ? shiftConfig.nightShift?.endTime || "06:00" : shiftConfig.dayShift?.endTime || "14:00");
         const startHour = parseInt(shiftStart.split(":")[0]);
         const startMinute = parseInt(shiftStart.split(":")[1] || "0");
         const endHour = parseInt(shiftEnd.split(":")[0]);
         const endMinute = parseInt(shiftEnd.split(":")[1] || "0");
         let shiftDuration = endHour - startHour;
-        if (endMinute > startMinute) {
-          shiftDuration += 1;
-        }
         if (shiftDuration <= 0) {
           shiftDuration += 24;
         }
+        const hasPartialLastHour = endMinute > 0 && endMinute < 60;
+        const hourCount = hasPartialLastHour ? Math.ceil(shiftDuration + endMinute / 60) : shiftDuration;
         let expectedHours = [];
-        for (let i = 0; i < shiftDuration; i++) {
+        for (let i = 0; i < hourCount; i++) {
           expectedHours.push((startHour + i) % 24);
         }
         console.log("Expected shift hours:", expectedHours);
@@ -5851,8 +5848,8 @@ var useWorkspaceDetailedMetrics = (workspaceId, date, shiftId) => {
         date: data.date,
         shift_id: data.shift_id,
         action_name: data.action_name || "",
-        shift_start: data.shift_start || "06:00",
-        shift_end: data.shift_end || "14:00",
+        shift_start: data.shift_start || (data.shift_id === 1 ? shiftConfig.nightShift?.startTime || "22:00" : shiftConfig.dayShift?.startTime || "06:00"),
+        shift_end: data.shift_end || (data.shift_id === 1 ? shiftConfig.nightShift?.endTime || "06:00" : shiftConfig.dayShift?.endTime || "14:00"),
         shift_type: data.shift_type || (data.shift_id === 0 ? "Day" : "Night"),
         pph_threshold: data.pph_threshold || 0,
         target_output: data.total_day_output || 0,
@@ -21243,18 +21240,41 @@ var HourlyOutputChartComponent = ({
     return { hour, minute, decimalHour };
   };
   const shiftStartTime = getTimeFromTimeString(shiftStart);
-  const calculateShiftDuration = React19__default.useMemo(() => {
+  const { shiftDuration, shiftEndTime, hasPartialLastHour } = React19__default.useMemo(() => {
+    console.log("[HourlyOutputChart] Calculating shift duration with:", {
+      shiftStart,
+      shiftEnd,
+      shiftStartTime
+    });
     if (!shiftEnd) {
-      return 11;
+      console.log("[HourlyOutputChart] No shiftEnd provided, using default 11 hours");
+      return {
+        shiftDuration: 11,
+        shiftEndTime: null,
+        hasPartialLastHour: false
+      };
     }
     const endTime = getTimeFromTimeString(shiftEnd);
     let duration = endTime.decimalHour - shiftStartTime.decimalHour;
     if (duration <= 0) {
       duration += 24;
     }
-    return Math.round(duration);
+    const hasPartial = endTime.minute > 0 && endTime.minute < 60;
+    const hourCount = hasPartial ? Math.ceil(duration) : Math.round(duration);
+    console.log("[HourlyOutputChart] Shift calculation results:", {
+      endTime,
+      duration,
+      hasPartial,
+      hourCount
+    });
+    return {
+      shiftDuration: hourCount,
+      shiftEndTime: endTime,
+      hasPartialLastHour: hasPartial
+    };
   }, [shiftEnd, shiftStartTime.decimalHour]);
-  const SHIFT_DURATION = calculateShiftDuration;
+  const SHIFT_DURATION = shiftDuration;
+  shiftEndTime ? shiftEndTime.hour : (shiftStartTime.hour + SHIFT_DURATION) % 24;
   const [animatedData, setAnimatedData] = React19__default.useState(
     () => Array(SHIFT_DURATION).fill(0)
   );
@@ -21365,12 +21385,19 @@ var HourlyOutputChartComponent = ({
     };
   }, []);
   const formatHour = React19__default.useCallback((hourIndex) => {
+    const isLastHour = hourIndex === SHIFT_DURATION - 1;
     const startDecimalHour = shiftStartTime.decimalHour + hourIndex;
     const startHour = Math.floor(startDecimalHour) % 24;
     const startMinute = Math.round(startDecimalHour % 1 * 60);
-    const endDecimalHour = startDecimalHour + 1;
-    const endHour = Math.floor(endDecimalHour) % 24;
-    const endMinute = Math.round(endDecimalHour % 1 * 60);
+    let endHour, endMinute;
+    if (isLastHour && shiftEndTime) {
+      endHour = shiftEndTime.hour;
+      endMinute = shiftEndTime.minute;
+    } else {
+      const endDecimalHour = startDecimalHour + 1;
+      endHour = Math.floor(endDecimalHour) % 24;
+      endMinute = Math.round(endDecimalHour % 1 * 60);
+    }
     const formatTime3 = (h, m) => {
       const period = h >= 12 ? "PM" : "AM";
       const hour12 = h === 0 ? 12 : h > 12 ? h - 12 : h;
@@ -21380,21 +21407,28 @@ var HourlyOutputChartComponent = ({
       return `${hour12}:${m.toString().padStart(2, "0")}${period}`;
     };
     return `${formatTime3(startHour, startMinute)}-${formatTime3(endHour, endMinute)}`;
-  }, [shiftStartTime.decimalHour]);
+  }, [shiftStartTime.decimalHour, SHIFT_DURATION, shiftEndTime]);
   const formatTimeRange = React19__default.useCallback((hourIndex) => {
+    const isLastHour = hourIndex === SHIFT_DURATION - 1;
     const startDecimalHour = shiftStartTime.decimalHour + hourIndex;
     const startHour = Math.floor(startDecimalHour) % 24;
     const startMinute = Math.round(startDecimalHour % 1 * 60);
-    const endDecimalHour = startDecimalHour + 1;
-    const endHour = Math.floor(endDecimalHour) % 24;
-    const endMinute = Math.round(endDecimalHour % 1 * 60);
+    let endHour, endMinute;
+    if (isLastHour && shiftEndTime) {
+      endHour = shiftEndTime.hour;
+      endMinute = shiftEndTime.minute;
+    } else {
+      const endDecimalHour = startDecimalHour + 1;
+      endHour = Math.floor(endDecimalHour) % 24;
+      endMinute = Math.round(endDecimalHour % 1 * 60);
+    }
     const formatTime3 = (h, m) => {
       const period = h >= 12 ? "PM" : "AM";
       const hour12 = h === 0 ? 12 : h > 12 ? h - 12 : h;
       return `${hour12}:${m.toString().padStart(2, "0")} ${period}`;
     };
     return `${formatTime3(startHour, startMinute)} - ${formatTime3(endHour, endMinute)}`;
-  }, [shiftStartTime.decimalHour]);
+  }, [shiftStartTime.decimalHour, SHIFT_DURATION, shiftEndTime]);
   const chartData = React19__default.useMemo(() => {
     return Array.from({ length: SHIFT_DURATION }, (_, i) => {
       const actualHour = (shiftStartTime.hour + i) % 24;
@@ -24909,11 +24943,25 @@ var LinePdfGenerator = ({
       doc.setTextColor(70, 70, 70);
       doc.text("Hourly Output Overview", 20, 135);
       doc.setTextColor(0, 0, 0);
-      const getHourlyTimeRanges = (startTimeStr) => {
+      const getHourlyTimeRanges = (startTimeStr, endTimeStr) => {
         const [hours, minutes] = startTimeStr.split(":");
         const startHour = parseInt(hours);
         const startMinute = parseInt(minutes || "0");
-        const SHIFT_DURATION = 11;
+        let SHIFT_DURATION = 11;
+        if (endTimeStr) {
+          const [endHours, endMinutes] = endTimeStr.split(":");
+          const endHour = parseInt(endHours);
+          const 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);
+        }
         return Array.from({ length: SHIFT_DURATION }, (_, i) => {
           const hourStartTime = /* @__PURE__ */ new Date();
           hourStartTime.setHours(startHour);
@@ -24934,12 +24982,35 @@ var LinePdfGenerator = ({
           return `${formatTime3(hourStartTime)} - ${formatTime3(hourEndTime)}`;
         });
       };
-      const hourlyTimeRanges = lineInfo.metrics.shift_start ? getHourlyTimeRanges(lineInfo.metrics.shift_start) : [];
-      const targetOutputPerHour = Math.round(lineInfo.metrics.line_threshold / 11);
-      const hourlyActualOutput = Array.from({ length: 11 }, (_, i) => {
-        const proportionalOutput = Math.round(lineInfo.metrics.current_output / 11 * (0.85 + Math.random() * 0.3));
-        return Math.max(0, proportionalOutput);
-      });
+      const hourlyTimeRanges = lineInfo.metrics.shift_start ? getHourlyTimeRanges(lineInfo.metrics.shift_start, lineInfo.metrics.shift_end) : [];
+      const shiftDuration = hourlyTimeRanges.length || 11;
+      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 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);
+          }
+          return 0;
+        });
+      } else if (lineInfo.metrics.output_array && lineInfo.metrics.output_array.length > 0) {
+        hourlyActualOutput = lineInfo.metrics.output_array.reduce((acc, val, i) => {
+          const hourIndex = Math.floor(i / 60);
+          if (!acc[hourIndex]) acc[hourIndex] = 0;
+          acc[hourIndex] += val;
+          return acc;
+        }, []);
+      } else {
+        hourlyActualOutput = Array.from({ length: shiftDuration }, () => {
+          return Math.round(lineInfo.metrics.current_output / shiftDuration);
+        });
+      }
       doc.setFontSize(11);
       doc.setFont("helvetica", "bold");
       doc.setFillColor(245, 245, 245);
@@ -29327,10 +29398,11 @@ var HealthStatusGrid = ({
 };
 var ISTTimer2 = ISTTimer_default;
 var DashboardHeader = memo(({ lineTitle, className = "", headerControls }) => {
+  const dashboardConfig = useDashboardConfig();
   const getShiftName = () => {
-    const now2 = /* @__PURE__ */ new Date();
-    const currentHour = now2.getHours();
-    return currentHour >= 6 && currentHour < 18 ? "Day" : "Night";
+    const timezone = dashboardConfig.dateTimeConfig?.defaultTimezone || "Asia/Kolkata";
+    const currentShift = getCurrentShift(timezone, dashboardConfig.shiftConfig);
+    return currentShift.shiftId === 0 ? "Day" : "Night";
   };
   const getShiftIcon = () => {
     const shift = getShiftName();
@@ -34063,6 +34135,7 @@ var KPIDetailView = ({
         underperforming_workspace_names: metrics2.underperforming_workspace_names || [],
         underperforming_workspace_uuids: metrics2.underperforming_workspace_uuids || [],
         output_array: metrics2.output_array || [],
+        output_hourly: metrics2.output_hourly,
         line_threshold: metrics2.line_threshold ?? 0,
         threshold_pph: metrics2.threshold_pph ?? 0,
         shift_start: metrics2.shift_start || "06:00",

package/package.json

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