Fix/Skapp-3247

frontend/pages/community/timesheet/my-timesheet.tsx

@@ -5,26 +5,33 @@ import EmployeeTimesheet from "~community/attendance/components/organisms/Employ
 import { EmployeeTimesheetModalTypes } from "~community/attendance/enums/timesheetEnums";
 import useManualEntryRestriction from "~community/attendance/hooks/useManualEntryRestriction";
 import { useAttendanceStore } from "~community/attendance/store/attendanceStore";
+import { useAuth } from "~community/auth/providers/AuthProvider";
 import ContentLayout from "~community/common/components/templates/ContentLayout/ContentLayout";
 import { ButtonStyle } from "~community/common/enums/ComponentEnums";
 import { useTranslator } from "~community/common/hooks/useTranslator";
 
 const MyTimeSheet: NextPage = () => {
   const translateText = useTranslator("attendanceModule");
+  const { user } = useAuth();
   const {
     setIsEmployeeTimesheetModalOpen,
     setEmployeeTimesheetModalType,
-    setDirectManualTimeEntryEligibleEmployee
+    setDirectManualTimeEntryEligibleEmployee,
+    setIsSelfDirectTimeEntry
   } = useAttendanceStore(
     useShallow((state) => ({
       setIsEmployeeTimesheetModalOpen: state.setIsEmployeeTimesheetModalOpen,
       setEmployeeTimesheetModalType: state.setEmployeeTimesheetModalType,
       setDirectManualTimeEntryEligibleEmployee:
-        state.setDirectManualTimeEntryEligibleEmployee
+        state.setDirectManualTimeEntryEligibleEmployee,
+      setIsSelfDirectTimeEntry: state.setIsSelfDirectTimeEntry
     }))
   );
-  const { isManualEntryRestricted, isLoading: isRestrictionLoading } =
-    useManualEntryRestriction();
+  const {
+    isManualEntryRestricted,
+    canDirectlyAddOrEditEntry,
+    isLoading: isRestrictionLoading
+  } = useManualEntryRestriction();
 
   return (
     <ContentLayout
@@ -46,7 +53,11 @@ const MyTimeSheet: NextPage = () => {
       primaryButtonType={ButtonStyle.PRIMARY}
       isPrimaryBtnDisabled={isRestrictionLoading}
       onPrimaryButtonClick={() => {
-        setDirectManualTimeEntryEligibleEmployee(null);
+        const isEligible = canDirectlyAddOrEditEntry && !!user?.userId;
+        setDirectManualTimeEntryEligibleEmployee(
+          isEligible ? { employeeId: user.userId, employeeName: "" } : null
+        );
+        setIsSelfDirectTimeEntry(isEligible);
         setIsEmployeeTimesheetModalOpen(true);
         setEmployeeTimesheetModalType(
           EmployeeTimesheetModalTypes.ADD_TIME_ENTRY

frontend/src/community/attendance/components/molecules/AttendanceModals/AddEditTimeEntry/AddEditTimeEntry.tsx

@@ -87,7 +87,8 @@ const AddEditTimeEntry = ({ setFromDateTime, setToDateTime }: Props) => {
     employeeTimesheetModalType,
     currentAddTimeChanges,
     setIsEmployeeTimesheetModalOpen,
-    directManualTimeEntryEligibleEmployee
+    directManualTimeEntryEligibleEmployee,
+    isSelfDirectTimeEntry
   } = useAttendanceStore((state) => state);
 
   const {
@@ -351,7 +352,7 @@ const AddEditTimeEntry = ({ setFromDateTime, setToDateTime }: Props) => {
 
   return (
     <Form onSubmit={handleSubmit}>
-      {directManualTimeEntryEligibleEmployee && (
+      {directManualTimeEntryEligibleEmployee && !isSelfDirectTimeEntry && (
         <InputField
           label={translateText(["directEntryEmployeeLabel"])}
           inputName={"direct_entry_employee"}

frontend/src/community/attendance/components/molecules/EmployeeTimeRecordsTable/EmployeeTimeRecordsTable.tsx

@@ -71,7 +71,8 @@ const EmployeeTimeRecordsTable = ({
     setSelectedDailyRecord,
     setDirectManualTimeEntryEligibleEmployee,
     setEmployeeTimesheetModalType,
-    setIsEmployeeTimesheetModalOpen
+    setIsEmployeeTimesheetModalOpen,
+    setIsSelfDirectTimeEntry
   } = useAttendanceStore(
     useShallow((state) => ({
       timesheetAnalyticsParams: state.timesheetAnalyticsParams,
@@ -80,7 +81,8 @@ const EmployeeTimeRecordsTable = ({
       setDirectManualTimeEntryEligibleEmployee:
         state.setDirectManualTimeEntryEligibleEmployee,
       setEmployeeTimesheetModalType: state.setEmployeeTimesheetModalType,
-      setIsEmployeeTimesheetModalOpen: state.setIsEmployeeTimesheetModalOpen
+      setIsEmployeeTimesheetModalOpen: state.setIsEmployeeTimesheetModalOpen,
+      setIsSelfDirectTimeEntry: state.setIsSelfDirectTimeEntry
     }))
   );
 
@@ -156,6 +158,7 @@ const EmployeeTimeRecordsTable = ({
     if (modalType === null) return;
 
     setDirectManualTimeEntryEligibleEmployee({ employeeId, employeeName });
+    setIsSelfDirectTimeEntry(false);
     setSelectedDailyRecord(dayRecord);
     setEmployeeTimesheetModalType(modalType);
     setIsEmployeeTimesheetModalOpen(true);

frontend/src/community/attendance/components/molecules/TimesheetDailyLog/TimesheetDailyLog.tsx

@@ -5,6 +5,7 @@ import { DailyLogType } from "~community/attendance/types/timeSheetTypes";
 import Icon from "~community/common/components/atoms/Icon/Icon";
 import { useTranslator } from "~community/common/hooks/useTranslator";
 import { IconName } from "~community/common/types/IconTypes";
+import { L1EmployeeType } from "~community/people/types/PeopleTypes";
 
 import TimesheetDailyRecordTable from "../TimesheetDailyRecordTable/TimesheetDailyRecordTable";
 import TimesheetStatCard from "../TimesheetStatCard/TimesheetStatCard";
@@ -14,13 +15,19 @@ interface Props {
   dailyLogData: DailyLogType[];
   downloadEmployeeDailyLogCsv: () => void;
   isDailyLogLoading?: boolean;
+  targetEmployeeId?: number;
+  targetEmployeeDetails?: L1EmployeeType;
+  isSelfTargetEntry?: boolean;
 }
 
 const TimesheetDailyLog = ({
   workSummaryData,
   dailyLogData,
   downloadEmployeeDailyLogCsv,
-  isDailyLogLoading = false
+  isDailyLogLoading = false,
+  targetEmployeeId,
+  targetEmployeeDetails,
+  isSelfTargetEntry
 }: Props): JSX.Element => {
   const translateText = useTranslator("attendanceModule", "timesheet");
 
@@ -48,6 +55,9 @@ const TimesheetDailyLog = ({
         dailyLogData={dailyLogData}
         downloadEmployeeDailyLogCsv={downloadEmployeeDailyLogCsv}
         isDailyLogLoading={isDailyLogLoading}
+        targetEmployeeId={targetEmployeeId}
+        targetEmployeeDetails={targetEmployeeDetails}
+        isSelfTargetEntry={isSelfTargetEntry}
       />
     </Box>
   );

frontend/src/community/attendance/components/molecules/TimesheetDailyRecordTable/TimesheetDailyRecordTable.tsx

@@ -18,7 +18,7 @@ import { useCommonStore } from "~community/common/stores/commonStore";
 import { IconName } from "~community/common/types/IconTypes";
 import { getTabIndex } from "~community/common/utils/keyboardUtils";
 import { useDefaultCapacity } from "~community/configurations/api/timeConfigurationApi";
-import { EmployeeDetails } from "~community/people/types/EmployeeTypes";
+import { L1EmployeeType } from "~community/people/types/PeopleTypes";
 
 import TimesheetDailyRecordSkeleton from "../AttendanceSkeletons/TimesheetDailyRecordSkeleton";
 import TimesheetDailyRecordTableHeader from "../TimesheetDailyRecordTableHeader/TimesheetDailyRecordTableHeader";
@@ -30,15 +30,17 @@ interface Props {
   downloadEmployeeDailyLogCsv?: () => void;
   isDailyLogLoading?: boolean;
   targetEmployeeId?: number;
-  targetEmployeeDetails?: EmployeeDetails;
+  targetEmployeeDetails?: L1EmployeeType;
+  isSelfTargetEntry?: boolean;
 }
 
 const TimesheetDailyRecordTable = ({
   dailyLogData,
   downloadEmployeeDailyLogCsv,
   isDailyLogLoading,
   targetEmployeeId,
-  targetEmployeeDetails
+  targetEmployeeDetails,
+  isSelfTargetEntry
 }: Props): JSX.Element => {
   const { isFreeTier } = useSessionData();
   const {
@@ -149,6 +151,7 @@ const TimesheetDailyRecordTable = ({
                   targetEmployeeDetails={targetEmployeeDetails}
                   isRowInteractive={isRowInteractive}
                   isManualEntryRestricted={isManualEntryRestricted}
+                  isSelfTargetEntry={isSelfTargetEntry}
                 />
               ))
             ) : (
@@ -162,6 +165,7 @@ const TimesheetDailyRecordTable = ({
                     targetEmployeeDetails={targetEmployeeDetails}
                     isRowInteractive={isRowInteractive}
                     isManualEntryRestricted={isManualEntryRestricted}
+                    isSelfTargetEntry={isSelfTargetEntry}
                   />
                 ))}
               </Box>

frontend/src/community/attendance/components/molecules/TimesheetDailyRecordTableRow/TimesheetDailyRecordTableRow.tsx

@@ -56,6 +56,7 @@ interface Props {
   targetEmployeeDetails?: L1EmployeeType;
   isRowInteractive: boolean;
   isManualEntryRestricted: boolean;
+  isSelfTargetEntry?: boolean;
 }
 
 const TimesheetDailyRecordTableRow: FC<Props> = ({
@@ -64,7 +65,8 @@ const TimesheetDailyRecordTableRow: FC<Props> = ({
   targetEmployeeId,
   targetEmployeeDetails,
   isRowInteractive,
-  isManualEntryRestricted
+  isManualEntryRestricted,
+  isSelfTargetEntry = false
 }) => {
   const { isFreeTier } = useSessionData();
 
@@ -93,7 +95,8 @@ const TimesheetDailyRecordTableRow: FC<Props> = ({
     setSelectedDailyRecord,
     setIsEmployeeTimesheetModalOpen,
     setEmployeeTimesheetModalType,
-    setDirectManualTimeEntryEligibleEmployee
+    setDirectManualTimeEntryEligibleEmployee,
+    setIsSelfDirectTimeEntry
   } = useAttendanceStore((state) => state);
   const status = attendanceParams.slotType;
 
@@ -212,11 +215,13 @@ const TimesheetDailyRecordTableRow: FC<Props> = ({
           employeeGeneralDetails?.lastName ?? ""
         ]).trim()
       });
+      setIsSelfDirectTimeEntry(isSelfTargetEntry);
       handleEdit();
       return;
     }
 
     setDirectManualTimeEntryEligibleEmployee(null);
+    setIsSelfDirectTimeEntry(false);
     mutate();
   };
 

frontend/src/community/attendance/components/organisms/EmployeeTimesheet/EmployeeTimesheet.tsx

@@ -9,6 +9,7 @@ import EmployeeTimesheetRequestTable from "~community/attendance/components/mole
 import TimesheetDailyLog from "~community/attendance/components/molecules/TimesheetDailyLog/TimesheetDailyLog";
 import TimesheetDailyLogFilter from "~community/attendance/components/molecules/TimesheetDailyLogFilter/TimesheetDailyLogFilter";
 import EmployeeTimesheetPopupController from "~community/attendance/components/organisms/EmployeeTimesheetPopupController/EmployeeTimesheetPopupController";
+import useManualEntryRestriction from "~community/attendance/hooks/useManualEntryRestriction";
 import { downloadEmployeeDailyLogCsv } from "~community/attendance/utils/TimesheetCsvUtil";
 import { useAuth } from "~community/auth/providers/AuthProvider";
 import { dateValidation } from "~community/common/utils/validation";
@@ -18,6 +19,7 @@ const EmployeeTimesheet = (): JSX.Element => {
   const [startTime, setStartTime] = useState<string>("");
   const [endTime, setEndTime] = useState<string>("");
   const { user } = useAuth();
+  const { canDirectlyAddOrEditEntry } = useManualEntryRestriction();
 
   const { data: workSummaryData } = useGetEmployeeWorkSummary(
     startTime,
@@ -34,6 +36,23 @@ const EmployeeTimesheet = (): JSX.Element => {
 
   const { data: timeConfigData } = useDefaultCapacity();
 
+  const isSelfDirectEntryEligible = canDirectlyAddOrEditEntry && !!user?.userId;
+
+  const selfTargetEmployeeId = isSelfDirectEntryEligible
+    ? user?.userId
+    : undefined;
+
+  const selfTargetEmployeeDetails = isSelfDirectEntryEligible
+    ? {
+        personal: {
+          general: {
+            firstName: user?.employee?.firstName,
+            lastName: user?.employee?.lastName
+          }
+        }
+      }
+    : undefined;
+
   return (
     <>
       <TimesheetDailyLogFilter
@@ -52,6 +71,9 @@ const EmployeeTimesheet = (): JSX.Element => {
           );
         }}
         isDailyLogLoading={isDailyLogLoading}
+        targetEmployeeId={selfTargetEmployeeId}
+        targetEmployeeDetails={selfTargetEmployeeDetails}
+        isSelfTargetEntry={canDirectlyAddOrEditEntry}
       />
       <EmployeeTimesheetRequestTable
         requestData={requestData}

frontend/src/community/attendance/components/organisms/EmployeeTimesheetPopupController/EmployeeTimesheetPopupController.tsx

@@ -18,7 +18,8 @@ const EmployeeTimesheetPopupController = (): JSX.Element => {
     employeeTimesheetModalType,
     setIsEmployeeTimesheetModalOpen,
     setCurrentAddTimeChanges,
-    setDirectManualTimeEntryEligibleEmployee
+    setDirectManualTimeEntryEligibleEmployee,
+    setIsSelfDirectTimeEntry
   } = useAttendanceStore((state) => state);
 
   const [fromDateTime, setFromDateTime] = useState<string>("");
@@ -63,6 +64,7 @@ const EmployeeTimesheetPopupController = (): JSX.Element => {
     if (!isEmployeeTimesheetModalOpen) {
       setCurrentAddTimeChanges(undefined);
       setDirectManualTimeEntryEligibleEmployee(null);
+      setIsSelfDirectTimeEntry(false);
     }
   }, [isEmployeeTimesheetModalOpen]);
 

frontend/src/community/attendance/store/slices/employeeTimesheetModalSlice.ts

@@ -17,6 +17,7 @@ export const employeeTimesheetModalSlice = (
   currentAddTimeChanges: {} as CurrentAddTimeChangesType,
   employeeTimesheetModalType: EmployeeTimesheetModalTypes.ADD_TIME_ENTRY,
   directManualTimeEntryEligibleEmployee: null,
+  isSelfDirectTimeEntry: false,
 
   setSelectedDailyRecord: (record: DailyLogType) =>
     set((state: EmployeeTimesheetModalSliceType) => ({
@@ -49,5 +50,10 @@ export const employeeTimesheetModalSlice = (
     set((state: EmployeeTimesheetModalSliceType) => ({
       ...state,
       directManualTimeEntryEligibleEmployee: value
+    })),
+  setIsSelfDirectTimeEntry: (value: boolean) =>
+    set((state: EmployeeTimesheetModalSliceType) => ({
+      ...state,
+      isSelfDirectTimeEntry: value
     }))
 });

frontend/src/community/attendance/types/attendanceSliceTypes.ts

@@ -50,6 +50,8 @@ export interface EmployeeTimesheetModalSliceType extends Pick<
   | "currentAddTimeChanges"
   | "directManualTimeEntryEligibleEmployee"
   | "setDirectManualTimeEntryEligibleEmployee"
+  | "isSelfDirectTimeEntry"
+  | "setIsSelfDirectTimeEntry"
 > {}
 
 export interface EmployeeTimesheetFilterSliceTypes extends Pick<

frontend/src/community/attendance/types/attendanceStoreTypes.ts

@@ -43,6 +43,7 @@ interface actionsTypes {
   setDirectManualTimeEntryEligibleEmployee: (
     value: DirectEntryEmployeeType | null
   ) => void;
+  setIsSelfDirectTimeEntry: (value: boolean) => void;
   setClockInType: (type: { [key: string]: (string | number)[] }) => void;
 }
 
@@ -98,6 +99,7 @@ export interface AttendanceStore extends actionsTypes {
   timeAvailabilityForPeriod: TimeAvailabilityType;
   currentAddTimeChanges: CurrentAddTimeChangesType;
   directManualTimeEntryEligibleEmployee: DirectEntryEmployeeType | null;
+  isSelfDirectTimeEntry: boolean;
   clockInType: {
     [key: string]: (string | number)[];
   };