From b53024641d2b3e0d727878403dd7ae387274927d Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Thu, 15 Jan 2026 15:12:00 +1100 Subject: [PATCH 1/2] Minor tweaks to legend view based on user feedback --- src/apps/calendar/src/lib/utils/calendar.utils.ts | 1 - .../src/pages/team-calendar/TeamCalendarPage.module.scss | 3 +++ src/apps/calendar/src/pages/team-calendar/TeamCalendarPage.tsx | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/apps/calendar/src/lib/utils/calendar.utils.ts b/src/apps/calendar/src/lib/utils/calendar.utils.ts index b9a90153f..defb7683b 100644 --- a/src/apps/calendar/src/lib/utils/calendar.utils.ts +++ b/src/apps/calendar/src/lib/utils/calendar.utils.ts @@ -22,7 +22,6 @@ export const legendStatusOrder: LeaveStatus[] = [ LeaveStatus.AVAILABLE, LeaveStatus.LEAVE, LeaveStatus.HOLIDAY, - LeaveStatus.WIPRO_HOLIDAY, LeaveStatus.WEEKEND, ] diff --git a/src/apps/calendar/src/pages/team-calendar/TeamCalendarPage.module.scss b/src/apps/calendar/src/pages/team-calendar/TeamCalendarPage.module.scss index 4735ddd7f..110c4f957 100644 --- a/src/apps/calendar/src/pages/team-calendar/TeamCalendarPage.module.scss +++ b/src/apps/calendar/src/pages/team-calendar/TeamCalendarPage.module.scss @@ -17,6 +17,9 @@ .navigation { display: flex; + flex-direction: column; + align-items: center; + gap: 8px; justify-content: center; margin: 14px 0 10px; } diff --git a/src/apps/calendar/src/pages/team-calendar/TeamCalendarPage.tsx b/src/apps/calendar/src/pages/team-calendar/TeamCalendarPage.tsx index ab50c6d28..4e3ebc76b 100644 --- a/src/apps/calendar/src/pages/team-calendar/TeamCalendarPage.tsx +++ b/src/apps/calendar/src/pages/team-calendar/TeamCalendarPage.tsx @@ -1,7 +1,7 @@ import { addMonths, endOfMonth, startOfMonth, subMonths } from 'date-fns' import { FC, useCallback, useEffect, useMemo, useState } from 'react' -import { MonthNavigation, TeamCalendar } from '../../lib/components' +import { CalendarLegend, MonthNavigation, TeamCalendar } from '../../lib/components' import { useFetchTeamLeave } from '../../lib/hooks' import styles from './TeamCalendarPage.module.scss' @@ -57,6 +57,7 @@ const TeamCalendarPage: FC = () => { onNextMonth={handleNextMonth} onPrevMonth={handlePrevMonth} /> +
From fa871ac802d05ba587d1bc59080e608f2f44fe3e Mon Sep 17 00:00:00 2001 From: Justin Gasper Date: Thu, 15 Jan 2026 15:54:30 +1100 Subject: [PATCH 2/2] Legend wording --- src/apps/calendar/src/lib/utils/calendar.utils.ts | 2 +- .../src/pages/personal-calendar/PersonalCalendarPage.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/apps/calendar/src/lib/utils/calendar.utils.ts b/src/apps/calendar/src/lib/utils/calendar.utils.ts index defb7683b..365a52f29 100644 --- a/src/apps/calendar/src/lib/utils/calendar.utils.ts +++ b/src/apps/calendar/src/lib/utils/calendar.utils.ts @@ -12,7 +12,7 @@ const statusColorMap: Record = { const statusLabelMap: Record = { [LeaveStatus.LEAVE]: 'Leave', - [LeaveStatus.HOLIDAY]: 'Personal Holiday', + [LeaveStatus.HOLIDAY]: 'Holiday', [LeaveStatus.WIPRO_HOLIDAY]: 'Wipro Holiday', [LeaveStatus.WEEKEND]: 'Weekend', [LeaveStatus.AVAILABLE]: 'Available', diff --git a/src/apps/calendar/src/pages/personal-calendar/PersonalCalendarPage.tsx b/src/apps/calendar/src/pages/personal-calendar/PersonalCalendarPage.tsx index fe2ab14b9..ac3d57220 100644 --- a/src/apps/calendar/src/pages/personal-calendar/PersonalCalendarPage.tsx +++ b/src/apps/calendar/src/pages/personal-calendar/PersonalCalendarPage.tsx @@ -152,7 +152,7 @@ const PersonalCalendarPage: FC = () => { onClick={handleSetAsHoliday} disabled={!selectedDates.size || isUpdating} > - Set as Personal Holiday + Set as Holiday