Merge pull request #79 from cortex-reply/fix-holidays-2

Fix holidays 2

Author: f-steel

src/components/Holidays/CalendarView.stories.tsx

@@ -76,6 +76,16 @@ const mockHolidays: Holiday[] = [
     totalDays: 3,
     leaveType: 'Full Day',
   },
+  {
+    id: '7',
+    userId: '3',
+    userName: 'Bob Johnson',
+    startDate: '2025-10-27T00:00:00.000Z',
+    endDate: '2025-10-31T00:00:00.000Z',
+    status: 'approved',
+    totalDays: 5,
+    leaveType: 'Full Day',
+  },
 ]
 
 export const Default: Story = {

src/components/Holidays/CalendarView.tsx

@@ -27,11 +27,6 @@ interface Holiday {
 export function CalendarView({ currentDate, setCurrentDate, holidays }: CalendarViewProps) {
   const [selectedDay, setSelectedDay] = useState<Date | null>(null)
 
-  console.log(
-    'holidaysIds',
-    holidays.map((h) => h.id),
-  )
-
   const firstDayOfMonth =
     (new Date(currentDate.getFullYear(), currentDate.getMonth(), 1).getDay() + 6) % 7
 
@@ -45,7 +40,7 @@ export function CalendarView({ currentDate, setCurrentDate, holidays }: Calendar
     const filteredHolidays = holidays.filter(
       (h) =>
         TimeUtil.toUtcMidnight(new Date(h.startDate)) <= day &&
-        TimeUtil.toUtcMidnight(new Date(h.endDate)) >= day,
+        TimeUtil.toUtcEndOfDay(new Date(h.endDate)) >= day,
     )
     return {
       date: day,

src/components/Holidays/HolidayGrid.stories.tsx

@@ -86,6 +86,16 @@ const mockHolidays: Holiday[] = [
     totalDays: 3,
     leaveType: 'Full Day',
   },
+  {
+    id: '8',
+    userId: '3',
+    userName: 'Bob Johnson',
+    startDate: '2025-10-27T00:00:00.000Z',
+    endDate: '2025-10-31T00:00:00.000Z',
+    status: 'approved',
+    totalDays: 5,
+    leaveType: 'Full Day',
+  },
 ]
 
 const mockEmployees: Employee[] = [

src/components/Holidays/HolidayGrid.tsx

@@ -44,7 +44,7 @@ export function HolidayGrid({
     return {
       ...holiday,
       startDate: TimeUtil.toUtcMidnight(holiday.startDate).toISOString(),
-      endDate: TimeUtil.toUtcMidnight(holiday.endDate).toISOString(),
+      endDate: TimeUtil.toUtcEndOfDay(holiday.endDate).toISOString(),
     }
   })
 

src/utils/TimeUtil.ts

@@ -1,11 +1,19 @@
 export class TimeUtil {
-    public static toUtcMidnight(input: string | Date): Date {
-       const d = new Date(input)
-   
-       if (d.getUTCHours() === 23 && d.getUTCMinutes() === 0 && d.getUTCSeconds() === 0) {
-         return new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate() + 1))
-       }
-   
-       return new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate()))
-     }
-   }
+  public static toUtcMidnight(input: string | Date): Date {
+    const d = new Date(input)
+
+    if (d.getUTCHours() === 23 && d.getUTCMinutes() === 0 && d.getUTCSeconds() === 0) {
+      return new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate() + 1))
+    }
+
+    return new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate()))
+  }
+
+  public static toUtcEndOfDay(input: string | Date): Date {
+    const d = new Date(input)
+    // Normalize to start of day UTC first (handles potential 23:00Z inputs)
+    const startOfDayUtc = this.toUtcMidnight(d)
+    // End of day is 1 day minus 1 millisecond from midnight
+    return new Date(startOfDayUtc.getTime() + 24 * 60 * 60 * 1000 - 1)
+  }
+}