@optifye/dashboard-core 6.5.8 → 6.5.10

package/dist/index.mjs

@@ -859,40 +859,140 @@ 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);
         console.log("Available data hours:", Object.keys(outputHourly));
-        hourlyActionCounts = expectedHours.map((expectedHour) => {
-          let hourData = outputHourly[expectedHour.toString()];
-          if (!hourData && isNightShift) {
-            for (const [storedHour, data2] of Object.entries(outputHourly)) {
-              if (Array.isArray(data2) && data2.length > 0 && data2.some((val) => val > 0)) {
-                if (storedHour === "18" && expectedHour === 1) {
-                  hourData = data2;
-                  console.log(`Mapping stored hour ${storedHour} to expected hour ${expectedHour}`);
-                  break;
+        hourlyActionCounts = expectedHours.map((expectedHour, index) => {
+          let hourSum = 0;
+          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 Array.isArray(hourData) ? hourData.reduce((sum, count) => sum + (count || 0), 0) : 0;
+          return hourSum;
         });
         console.log("Final hourly action counts:", hourlyActionCounts);
       } else {
@@ -2093,136 +2193,142 @@ var WorkspaceHealthService = class _WorkspaceHealthService {
     const now2 = /* @__PURE__ */ new Date();
     const currentHour = now2.getHours();
     const currentMinute = now2.getMinutes();
-    let shiftStartHour;
-    let shiftEndHour;
+    const dayShiftStart = shiftConfig?.dayShift?.startTime || "08:00";
+    const dayShiftEnd = shiftConfig?.dayShift?.endTime || "19:30";
+    const nightShiftStart = shiftConfig?.nightShift?.startTime || "19:30";
+    const nightShiftEnd = shiftConfig?.nightShift?.endTime || "06:00";
+    const parseShiftTime = (timeStr) => {
+      const [hour, minute] = timeStr.split(":").map(Number);
+      return { hour, minute };
+    };
+    let shiftStart, shiftEnd;
     if (currentShiftId === 0) {
-      shiftStartHour = 9;
-      shiftEndHour = 18;
+      shiftStart = parseShiftTime(dayShiftStart);
+      shiftEnd = parseShiftTime(dayShiftEnd);
     } else {
-      shiftStartHour = 20;
-      shiftEndHour = 3;
+      shiftStart = parseShiftTime(nightShiftStart);
+      shiftEnd = parseShiftTime(nightShiftEnd);
     }
     let elapsedMinutes = 0;
     if (currentShiftId === 0) {
-      if (currentHour >= shiftStartHour && currentHour < shiftEndHour) {
-        elapsedMinutes = (currentHour - shiftStartHour) * 60 + currentMinute;
-      } else if (currentHour >= shiftEndHour) {
-        elapsedMinutes = (shiftEndHour - shiftStartHour) * 60;
+      const shiftStartTotalMinutes = shiftStart.hour * 60 + shiftStart.minute;
+      const currentTotalMinutes = currentHour * 60 + currentMinute;
+      const shiftEndTotalMinutes = shiftEnd.hour * 60 + shiftEnd.minute;
+      if (currentTotalMinutes >= shiftStartTotalMinutes && currentTotalMinutes < shiftEndTotalMinutes) {
+        elapsedMinutes = currentTotalMinutes - shiftStartTotalMinutes;
+      } else if (currentTotalMinutes >= shiftEndTotalMinutes) {
+        elapsedMinutes = shiftEndTotalMinutes - shiftStartTotalMinutes;
       }
     } else {
-      if (currentHour >= shiftStartHour) {
-        elapsedMinutes = (currentHour - shiftStartHour) * 60 + currentMinute;
-      } else if (currentHour < shiftEndHour) {
-        elapsedMinutes = (24 - shiftStartHour + currentHour) * 60 + currentMinute;
+      const shiftStartTotalMinutes = shiftStart.hour * 60 + shiftStart.minute;
+      const currentTotalMinutes = currentHour * 60 + currentMinute;
+      const shiftEndTotalMinutes = shiftEnd.hour * 60 + shiftEnd.minute;
+      if (currentHour >= shiftStart.hour || currentHour < shiftEnd.hour) {
+        if (currentHour >= shiftStart.hour) {
+          elapsedMinutes = currentTotalMinutes - shiftStartTotalMinutes;
+        } else {
+          elapsedMinutes = 24 * 60 - shiftStartTotalMinutes + currentTotalMinutes;
+        }
+        if (currentHour >= shiftEnd.hour && currentTotalMinutes >= shiftEndTotalMinutes) {
+          const totalShiftMinutes = 24 * 60 - shiftStartTotalMinutes + shiftEndTotalMinutes;
+          elapsedMinutes = Math.min(elapsedMinutes, totalShiftMinutes);
+        }
       }
     }
     const tableName = `performance_metrics_${companyId.replace(/-/g, "_")}`;
-    const query = `
-      WITH workspace_uptime AS (
-        SELECT 
-          workspace_id,
-          workspace_display_name,
-          idle_time_hourly,
-          output_hourly,
-          shift_start,
-          shift_end
-        FROM ${tableName}
-        WHERE date = $1::date
-          AND shift_id = $2
-      ),
-      calculated_uptime AS (
-        SELECT 
-          workspace_id,
-          workspace_display_name,
-          -- Calculate actual minutes from hourly data
-          (
-            SELECT COALESCE(SUM(
-              CASE 
-                WHEN jsonb_array_length(idle_time_hourly->key::text) >= 58 THEN 60
-                WHEN jsonb_array_length(idle_time_hourly->key::text) > 0 THEN jsonb_array_length(idle_time_hourly->key::text)
-                ELSE 0
-              END
-            ), 0)
-            FROM jsonb_object_keys(idle_time_hourly) AS key
-            WHERE key::int >= $3 AND key::int < $4
-          ) +
-          -- Add current hour's data if applicable
-          CASE 
-            WHEN $4::int >= $3 AND $4::int < $5 THEN
-              LEAST($6::int, 
-                    COALESCE(jsonb_array_length(idle_time_hourly->$4::text), 0))
-            ELSE 0
-          END as actual_minutes
-        FROM workspace_uptime
-      )
-      SELECT 
-        workspace_id,
-        workspace_display_name,
-        actual_minutes,
-        $7::int as expected_minutes,
-        ROUND(
-          CASE 
-            WHEN $7::int > 0 THEN (actual_minutes::numeric / $7::numeric) * 100
-            ELSE 100
-          END, 1
-        ) as uptime_percentage
-      FROM calculated_uptime
-    `;
     try {
-      const { data, error } = await supabase.rpc("sql_query", {
-        query_text: query,
-        params: [
-          currentDate,
-          currentShiftId,
-          shiftStartHour,
-          currentHour,
-          shiftEndHour,
-          currentMinute,
-          elapsedMinutes
-        ]
-      }).single();
+      const { data: queryData, error } = await supabase.from(tableName).select("workspace_id, workspace_display_name, output_hourly").eq("date", currentDate).eq("shift_id", currentShiftId);
       if (error) {
-        const { data: queryData, error: queryError } = await supabase.from(tableName).select("workspace_id, workspace_display_name, idle_time_hourly, output_hourly").eq("date", currentDate).eq("shift_id", currentShiftId);
-        if (queryError) {
-          console.error("Error fetching performance metrics:", queryError);
-          return /* @__PURE__ */ new Map();
-        }
-        const uptimeMap2 = /* @__PURE__ */ new Map();
-        for (const record of queryData || []) {
-          let actualMinutes = 0;
-          const idleTimeHourly = record.idle_time_hourly || {};
-          if (idleTimeHourly && typeof idleTimeHourly === "object") {
-            for (const [hour, dataArray] of Object.entries(idleTimeHourly)) {
-              const hourNum = parseInt(hour);
-              if (hourNum >= shiftStartHour && hourNum < currentHour) {
-                const arrayLength = Array.isArray(dataArray) ? dataArray.length : 0;
-                actualMinutes += arrayLength >= 58 ? 60 : arrayLength;
-              } else if (hourNum === currentHour && currentHour >= shiftStartHour) {
-                const arrayLength = Array.isArray(dataArray) ? dataArray.length : 0;
-                actualMinutes += Math.min(currentMinute, arrayLength);
+        console.error("Error fetching performance metrics:", error);
+        return /* @__PURE__ */ new Map();
+      }
+      const uptimeMap = /* @__PURE__ */ new Map();
+      for (const record of queryData || []) {
+        let actualMinutes = 0;
+        let totalPossibleMinutes = 0;
+        const outputHourly = record.output_hourly || {};
+        const hoursElapsed = Math.ceil(elapsedMinutes / 60);
+        for (let hourIndex = 0; hourIndex < hoursElapsed; hourIndex++) {
+          const actualHour = (shiftStart.hour + hourIndex) % 24;
+          let hourData = [];
+          let minutesInThisHour = 60;
+          if (shiftStart.minute > 0) {
+            if (hourIndex === 0) {
+              const firstHourData = outputHourly[actualHour.toString()] || [];
+              const nextHour = (actualHour + 1) % 24;
+              const nextHourData = outputHourly[nextHour.toString()] || [];
+              hourData = [
+                ...Array.isArray(firstHourData) ? firstHourData.slice(shiftStart.minute) : [],
+                ...Array.isArray(nextHourData) ? nextHourData.slice(0, shiftStart.minute) : []
+              ];
+            } else if (hourIndex < hoursElapsed - 1) {
+              const currentHourData = outputHourly[actualHour.toString()] || [];
+              const nextHour = (actualHour + 1) % 24;
+              const nextHourData = outputHourly[nextHour.toString()] || [];
+              hourData = [
+                ...Array.isArray(currentHourData) ? currentHourData.slice(shiftStart.minute) : [],
+                ...Array.isArray(nextHourData) ? nextHourData.slice(0, shiftStart.minute) : []
+              ];
+            } else {
+              const isLastHourPartial = hourIndex === hoursElapsed - 1 && elapsedMinutes % 60 > 0;
+              if (isLastHourPartial) {
+                minutesInThisHour = elapsedMinutes % 60;
+                const currentHourData = outputHourly[actualHour.toString()] || [];
+                if (shiftStart.minute > 0) {
+                  const nextHour = (actualHour + 1) % 24;
+                  const nextHourData = outputHourly[nextHour.toString()] || [];
+                  const firstPart = Array.isArray(currentHourData) ? currentHourData.slice(shiftStart.minute) : [];
+                  const secondPart = Array.isArray(nextHourData) ? nextHourData.slice(0, Math.min(shiftStart.minute, minutesInThisHour)) : [];
+                  hourData = [...firstPart, ...secondPart].slice(0, minutesInThisHour);
+                } else {
+                  hourData = Array.isArray(currentHourData) ? currentHourData.slice(0, minutesInThisHour) : [];
+                }
+              } else {
+                const currentHourData = outputHourly[actualHour.toString()] || [];
+                const nextHour = (actualHour + 1) % 24;
+                const nextHourData = outputHourly[nextHour.toString()] || [];
+                hourData = [
+                  ...Array.isArray(currentHourData) ? currentHourData.slice(shiftStart.minute) : [],
+                  ...Array.isArray(nextHourData) ? nextHourData.slice(0, shiftStart.minute) : []
+                ];
+              }
+            }
+          } else {
+            hourData = outputHourly[actualHour.toString()] || [];
+            if (hourIndex === hoursElapsed - 1) {
+              const remainingMinutes = elapsedMinutes % 60;
+              if (remainingMinutes > 0) {
+                minutesInThisHour = remainingMinutes;
+                hourData = Array.isArray(hourData) ? hourData.slice(0, minutesInThisHour) : [];
               }
             }
           }
-          const percentage = elapsedMinutes > 0 ? Math.round(actualMinutes / elapsedMinutes * 1e3) / 10 : 100;
-          uptimeMap2.set(record.workspace_id, {
-            expectedMinutes: elapsedMinutes,
-            actualMinutes,
-            percentage,
-            lastCalculated: (/* @__PURE__ */ new Date()).toISOString()
-          });
-        }
-        return uptimeMap2;
-      }
-      const uptimeMap = /* @__PURE__ */ new Map();
-      if (Array.isArray(data)) {
-        for (const record of data) {
-          uptimeMap.set(record.workspace_id, {
-            expectedMinutes: record.expected_minutes,
-            actualMinutes: record.actual_minutes,
-            percentage: record.uptime_percentage,
-            lastCalculated: (/* @__PURE__ */ new Date()).toISOString()
-          });
+          const hasXArchitecture = Array.isArray(hourData) && hourData.some((val) => val === "x");
+          if (hasXArchitecture) {
+            const xCount = hourData.filter((val) => val === "x").length;
+            if (xCount <= 2) {
+              actualMinutes += minutesInThisHour;
+            } else {
+              const uptimeCount = hourData.filter((val) => val !== "x").length;
+              actualMinutes += Math.min(uptimeCount, minutesInThisHour);
+            }
+          } else {
+            const arrayLength = Array.isArray(hourData) ? hourData.length : 0;
+            if (arrayLength >= Math.min(58, minutesInThisHour - 2)) {
+              actualMinutes += minutesInThisHour;
+            } else {
+              actualMinutes += Math.min(arrayLength, minutesInThisHour);
+            }
+          }
+          totalPossibleMinutes += minutesInThisHour;
         }
+        const percentage = totalPossibleMinutes > 0 ? Math.round(actualMinutes / totalPossibleMinutes * 1e3) / 10 : 100;
+        uptimeMap.set(record.workspace_id, {
+          expectedMinutes: totalPossibleMinutes,
+          actualMinutes,
+          percentage,
+          lastCalculated: (/* @__PURE__ */ new Date()).toISOString()
+        });
       }
       return uptimeMap;
     } catch (error) {
@@ -5673,39 +5779,139 @@ 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);
             console.log("Available data hours (fallback):", Object.keys(outputHourly2));
-            hourlyActionCounts2 = expectedHours.map((expectedHour) => {
-              let hourData = outputHourly2[expectedHour.toString()];
-              if (!hourData && isNightShift) {
-                for (const [storedHour, data2] of Object.entries(outputHourly2)) {
-                  if (Array.isArray(data2) && data2.length > 0 && data2.some((val) => val > 0)) {
-                    if (storedHour === "18" && expectedHour === 1) {
-                      hourData = data2;
-                      console.log(`Mapping stored hour ${storedHour} to expected hour ${expectedHour} (fallback)`);
-                      break;
+            hourlyActionCounts2 = expectedHours.map((expectedHour, index) => {
+              let hourSum = 0;
+              const hourData = outputHourly2[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 = outputHourly2[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 = outputHourly2[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 = outputHourly2[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 = outputHourly2[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 Array.isArray(hourData) ? hourData.reduce((sum, count) => sum + (count || 0), 0) : 0;
+              return hourSum;
             });
             console.log("Final hourly action counts (fallback):", hourlyActionCounts2);
           } else {
@@ -5732,8 +5938,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,39 +5995,139 @@ 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);
         console.log("Available data hours:", Object.keys(outputHourly));
-        hourlyActionCounts = expectedHours.map((expectedHour) => {
-          let hourData = outputHourly[expectedHour.toString()];
-          if (!hourData && isNightShift) {
-            for (const [storedHour, data2] of Object.entries(outputHourly)) {
-              if (Array.isArray(data2) && data2.length > 0 && data2.some((val) => val > 0)) {
-                if (storedHour === "18" && expectedHour === 1) {
-                  hourData = data2;
-                  console.log(`Mapping stored hour ${storedHour} to expected hour ${expectedHour}`);
-                  break;
+        hourlyActionCounts = expectedHours.map((expectedHour, index) => {
+          let hourSum = 0;
+          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 Array.isArray(hourData) ? hourData.reduce((sum, count) => sum + (count || 0), 0) : 0;
+          return hourSum;
         });
         console.log("Final hourly action counts:", hourlyActionCounts);
       } else {
@@ -5851,8 +6157,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 +21549,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 +21694,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,26 +21716,85 @@ 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;
-      const idleArray = idleTimeHourly?.[actualHour.toString()] || [];
-      const idleMinutes = idleArray.filter((val) => val === "1").length;
+      const startMinute = shiftStartTime.minute;
+      let idleArray = [];
+      let idleMinutes = 0;
+      if (idleTimeHourly) {
+        if (startMinute > 0) {
+          if (i === 0) {
+            const firstHourData = idleTimeHourly[actualHour.toString()] || [];
+            const nextHour = (actualHour + 1) % 24;
+            const nextHourData = idleTimeHourly[nextHour.toString()] || [];
+            idleArray = [
+              ...firstHourData.slice(startMinute) || [],
+              ...nextHourData.slice(0, startMinute) || []
+            ];
+          } else if (i < SHIFT_DURATION - 1) {
+            const currentHourData = idleTimeHourly[actualHour.toString()] || [];
+            const nextHour = (actualHour + 1) % 24;
+            const nextHourData = idleTimeHourly[nextHour.toString()] || [];
+            idleArray = [
+              ...currentHourData.slice(startMinute) || [],
+              ...nextHourData.slice(0, startMinute) || []
+            ];
+          } else {
+            const hasPartialLastHour2 = shiftEndTime && shiftEndTime.minute > 0 && shiftEndTime.minute < 60;
+            if (hasPartialLastHour2) {
+              const currentHourData = idleTimeHourly[actualHour.toString()] || [];
+              const nextHour = (actualHour + 1) % 24;
+              const nextHourData = idleTimeHourly[nextHour.toString()] || [];
+              if (startMinute > 0) {
+                const firstPart = currentHourData.slice(startMinute) || [];
+                const secondPart = nextHourData.slice(0, shiftEndTime.minute) || [];
+                idleArray = [...firstPart, ...secondPart];
+              } else {
+                idleArray = currentHourData.slice(0, shiftEndTime.minute) || [];
+              }
+            } else {
+              const currentHourData = idleTimeHourly[actualHour.toString()] || [];
+              const nextHour = (actualHour + 1) % 24;
+              const nextHourData = idleTimeHourly[nextHour.toString()] || [];
+              idleArray = [
+                ...currentHourData.slice(startMinute) || [],
+                ...nextHourData.slice(0, startMinute) || []
+              ];
+            }
+          }
+        } else {
+          const currentHourData = idleTimeHourly[actualHour.toString()] || [];
+          if (i === SHIFT_DURATION - 1 && shiftEndTime && shiftEndTime.minute > 0 && shiftEndTime.minute < 60) {
+            idleArray = currentHourData.slice(0, shiftEndTime.minute) || [];
+          } else {
+            idleArray = currentHourData || [];
+          }
+        }
+      }
+      idleMinutes = idleArray.filter((val) => val === "1" || val === 1).length;
       return {
         hour: formatHour(i),
         timeRange: formatTimeRange(i),
@@ -21411,7 +21806,7 @@ var HourlyOutputChartComponent = ({
         idleArray
       };
     });
-  }, [animatedData, data, pphThreshold, idleTimeHourly, shiftStartTime.hour, formatHour, formatTimeRange]);
+  }, [animatedData, data, pphThreshold, idleTimeHourly, shiftStartTime.hour, shiftStartTime.minute, shiftEndTime, formatHour, formatTimeRange, SHIFT_DURATION]);
   const IdleBar = React19__default.useMemo(() => {
     if (!idleBarState.visible) return null;
     return /* @__PURE__ */ jsx(
@@ -21571,13 +21966,13 @@ var HourlyOutputChartComponent = ({
                     if (showIdleTime && data2.idleArray) {
                       let currentRange = null;
                       data2.idleArray.forEach((val, idx) => {
-                        if (val === "1") {
+                        if (val === "1" || val === 1) {
                           if (!currentRange) {
                             currentRange = { start: idx, end: idx };
                           } else {
                             currentRange.end = idx;
                           }
-                        } else if (currentRange) {
+                        } else if (val !== "x" && currentRange) {
                           idleRanges.push(currentRange);
                           currentRange = null;
                         }
@@ -34119,21 +34514,135 @@ var KPIDetailView = ({
       const shiftStart = metrics2.shift_start || (isNightShift ? "22:00" : "06:00");
       const shiftEnd = metrics2.shift_end || (isNightShift ? "06:00" : "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 (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);
       }
-      return expectedHours.map((hour) => {
-        const hourData = metrics2.output_hourly[hour.toString()];
-        if (hourData && Array.isArray(hourData)) {
-          return hourData.reduce((sum, val) => sum + (val || 0), 0);
+      return expectedHours.map((expectedHour, index) => {
+        let hourSum = 0;
+        const outputHourly = metrics2.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;
       });
     }
     if (metrics2.output_array) {