Merge pull request #1402 from topcoder-platform/leave-tracker

Leave tracker

Author: jmgasper

src/apps/calendar/src/lib/utils/calendar.utils.ts

@@ -12,7 +12,7 @@ const statusColorMap: Record<LeaveStatus, string> = {
 
 const statusLabelMap: Record<LeaveStatus, string> = {
     [LeaveStatus.LEAVE]: 'Leave',
-    [LeaveStatus.HOLIDAY]: 'Personal Holiday',
+    [LeaveStatus.HOLIDAY]: 'Holiday',
     [LeaveStatus.WIPRO_HOLIDAY]: 'Wipro Holiday',
     [LeaveStatus.WEEKEND]: 'Weekend',
     [LeaveStatus.AVAILABLE]: 'Available',
@@ -22,7 +22,6 @@ export const legendStatusOrder: LeaveStatus[] = [
     LeaveStatus.AVAILABLE,
     LeaveStatus.LEAVE,
     LeaveStatus.HOLIDAY,
-    LeaveStatus.WIPRO_HOLIDAY,
     LeaveStatus.WEEKEND,
 ]
 

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
                     </Button>
                     <Button
                         secondary

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;
 }

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}
                 />
+                <CalendarLegend />
             </section>
 
             <section className={styles.calendarSection}>