No Result Found
| Activity | +
+
+ Total Pending{" "}
+ |
+
+
+ Reported/Planned{" "}
+ |
+ Assign Date | +Team | +Actions | +
|---|---|---|---|---|---|
| + No reports available + | +|||||
| + {formatUTCToLocalTime(date)} + | +|||||
|
+
+ {task.workItem.activityMaster?.activityName || "No Activity Name"}
+
+
+ {task.workItem.workArea?.floor?.building?.name} ›{" "}
+ {task.workItem.workArea?.floor?.floorName} ›{" "}
+ {task.workItem.workArea?.areaName}
+
+ |
+ + {formatNumber(task.workItem.plannedWork)} + | +{`${formatNumber(task.completedTask)} / ${formatNumber(task.plannedTask)}`} | +{formatUTCToLocalTime(task.assignmentDate)} | +{renderTeamMembers(task, idx)} | +
+
+ {ReportTaskRights && !task.reportedDate && (
+
+ )}
+ {ApprovedTaskRights && task.reportedDate && !task.approvedBy && (
+
+ )}
+
+
+ |
+
| Activity | +Assigned | +Completed | +Assign On | +Team | +Actions | +
|---|---|---|---|---|---|
|
+ |
+
+ |
+
+ |
+
+ |
+
+
+ {[...Array(3)].map((_, i) => (
+
+ |
+
+
+
+ |
+
Activity Progress Chart
-Activity Progress Chart
+//Loading activity data...
- ) : isError ? ( -No data available.
- ) : ( - ActivityData && ( - <> -Loading activity data...
+// ) : isError ? ( +//No data available.
+// ) : ( +// ActivityData && ( +// <> +//| Activity / Location | -Assigned / Completed | -
|---|---|
| {log.activity} | -{log.assignedToday} / {log.completed} | -
| Activity / Location | +//Assigned / Completed | +//
|---|---|
| {log.activity} | +//{log.assignedToday} / {log.completed} | +//
Daily Attendance Data
| - {record.firstName} {record.lastName} - | -- {new Date(record.inTime).toLocaleTimeString([], { - hour: "2-digit", - minute: "2-digit", - })} - | -- {new Date(record.outTime).toLocaleTimeString([], { - hour: "2-digit", - minute: "2-digit", - })} - | + {AttendanceData?.attendanceTable?.length ? ( + AttendanceData.attendanceTable.map((r, i) => ( +|||||||
| {r.firstName} {r.lastName} | +{r.inTime ? new Date(r.inTime).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }) : "-"} | +{r.outTime ? new Date(r.outTime).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }) : "-"} | |||||||
| - No attendance data available - | +No attendance data available | ||||||||
|
{col.label}
diff --git a/src/components/Documents/DocumentFilterPanel.jsx b/src/components/Documents/DocumentFilterPanel.jsx
index c305b9bb..15a2cbf1 100644
--- a/src/components/Documents/DocumentFilterPanel.jsx
+++ b/src/components/Documents/DocumentFilterPanel.jsx
@@ -96,7 +96,7 @@ const DocumentFilterPanel = ({ entityTypeId, onApply }) => {
placeholder="DD-MM-YYYY To DD-MM-YYYY"
startField="startDate"
endField="endDate"
- defaultRange={true}
+ defaultRange={false}
resetSignal={resetKey}
maxDate={new Date()}
/>
diff --git a/src/components/Documents/Documents.jsx b/src/components/Documents/Documents.jsx
index b1dbe493..8210bf58 100644
--- a/src/components/Documents/Documents.jsx
+++ b/src/components/Documents/Documents.jsx
@@ -118,7 +118,7 @@ const Documents = ({ Document_Entity, Entity }) => {
return (
-
+
{/* Search */}
@@ -149,30 +149,11 @@ const Documents = ({ Document_Entity, Entity }) => {
- {/* Actions */}
- {/* {
- setSearchText("");
- setFilter(DocumentFilterDefaultValues);
- refetchFn && refetchFn();
- }}
- >
- Refresh
-
- */}
-
{(isSelf || canUploadDocument) && (
)}
diff --git a/src/components/Employee/DemoTable.jsx b/src/components/Employee/DemoTable.jsx
deleted file mode 100644
index 1d645cc3..00000000
--- a/src/components/Employee/DemoTable.jsx
+++ /dev/null
@@ -1,172 +0,0 @@
-import React from "react";
-
-const DemoTable = () => {
- return (
-
-
- );
-};
-
-export default DemoTable;
diff --git a/src/components/Employee/EmpAttendance.jsx b/src/components/Employee/EmpAttendance.jsx
index c441b826..548471d8 100644
--- a/src/components/Employee/EmpAttendance.jsx
+++ b/src/components/Employee/EmpAttendance.jsx
@@ -2,7 +2,6 @@ import React, { useState, useEffect } from "react";
import moment from "moment";
import DateRangePicker, { DateRangePicker1 } from "../common/DateRangePicker";
import { useDispatch, useSelector } from "react-redux";
-import { fetchEmployeeAttendanceData } from "../../slices/apiSlice/employeeAttendanceSlice";
import usePagination from "../../hooks/usePagination";
import Avatar from "../common/Avatar";
import { convertShortTime } from "../../utils/dateUtils";
diff --git a/src/components/Employee/EmployeeList.jsx b/src/components/Employee/EmployeeList.jsx
deleted file mode 100644
index 5a79c6ce..00000000
--- a/src/components/Employee/EmployeeList.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import React from "react";
-
-const EmployeeList = () => {
- return
-
-
-
-
-
-
-
-
-
-
-
-
- - New Record -- -
-
-
- - - - - - EmployeeList ;
-};
-
-export default EmployeeList;
\ No newline at end of file
diff --git a/src/components/Employee/EmployeeSchema.jsx b/src/components/Employee/EmployeeSchema.jsx
new file mode 100644
index 00000000..ba540ef4
--- /dev/null
+++ b/src/components/Employee/EmployeeSchema.jsx
@@ -0,0 +1,124 @@
+import { z } from "zod"
+
+
+const mobileNumberRegex = /^[0-9]\d{9}$/;
+
+export const employeeSchema =
+ z.object({
+ firstName: z.string().min(1, { message: "First Name is required" }),
+ middleName: z.string().optional(),
+ lastName: z.string().min(1, { message: "Last Name is required" }),
+ email: z
+ .string()
+ .max(80, "Email cannot exceed 80 characters")
+ .optional()
+ .refine((val) => !val || /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(val), {
+ message: "Invalid email format",
+ })
+ .refine(
+ (val) => {
+ if (!val) return true;
+ const [local, domain] = val.split("@");
+ return (
+ val.length <= 320 && local?.length <= 64 && domain?.length <= 255
+ );
+ },
+ {
+ message: "Email local or domain part is too long",
+ }
+ ),
+ currentAddress: z
+ .string()
+ .min(1, { message: "Current Address is required" })
+ .max(500, { message: "Address cannot exceed 500 characters" }),
+ birthDate: z
+ .string()
+ .min(1, { message: "Birth Date is required" })
+ .refine(
+ (date, ctx) => {
+ return new Date(date) <= new Date();
+ },
+ {
+ message: "Birth date cannot be in the future",
+ }
+ ),
+ joiningDate: z
+ .string()
+ .min(1, { message: "Joining Date is required" })
+ .refine(
+ (date, ctx) => {
+ return new Date(date) <= new Date();
+ },
+ {
+ message: "Joining date cannot be in the future",
+ }
+ ),
+ emergencyPhoneNumber: z
+ .string()
+ .min(1, { message: "Phone Number is required" })
+ .regex(mobileNumberRegex, { message: "Invalid phone number " }),
+ emergencyContactPerson: z
+ .string()
+ .min(1, { message: "Emergency Contact Person is required" })
+ .regex(/^[A-Za-z\s]+$/, {
+ message: "Emergency Contact Person must contain only letters",
+ }),
+ aadharNumber: z
+ .string()
+ .optional()
+ .refine((val) => !val || /^\d{12}$/.test(val), {
+ message: "Aadhar card must be exactly 12 digits long",
+ }),
+ gender: z
+ .string()
+ .min(1, { message: "Gender is required" })
+ .refine((val) => val !== "Select Gender", {
+ message: "Please select a gender",
+ }),
+ panNumber: z
+ .string()
+ .optional()
+ .refine((val) => !val || /^[A-Z]{5}[0-9]{4}[A-Z]{1}$/.test(val), {
+ message: "Invalid PAN number",
+ }),
+ permanentAddress: z
+ .string()
+ .min(1, { message: "Permanent Address is required" })
+ .max(500, { message: "Address cannot exceed 500 characters" }),
+ phoneNumber: z
+ .string()
+ .min(1, { message: "Phone Number is required" })
+ .regex(mobileNumberRegex, { message: "Invalid phone number " }),
+ jobRoleId: z.string().min(1, { message: "Role is required" }),
+ organizationId:z.string().min(1,{message:"Organization is required"}),
+ hasApplicationAccess:z.boolean().default(false),
+ }).refine((data) => {
+ if (data.hasApplicationAccess) {
+ return data.email && data.email.trim() !== "";
+ }
+ return true;
+}, {
+ message: "Email is required when employee has access",
+ path: ["email"],
+});
+
+
+export const defatEmployeeObj = {
+ firstName: "",
+ middleName: "",
+ lastName: "",
+ email: "",
+ currentAddress: "",
+ birthDate: "",
+ joiningDate: "",
+ emergencyPhoneNumber: "",
+ emergencyContactPerson: "",
+ aadharNumber: "",
+ gender: "",
+ panNumber: "",
+ permanentAddress: "",
+ phoneNumber: "",
+ jobRoleId: null,
+ organizationId:"",
+ hasApplicationAccess:false
+ }
\ No newline at end of file
diff --git a/src/components/Employee/ManageEmployee.jsx b/src/components/Employee/ManageEmployee.jsx
index 81a4c4d2..f57ca994 100644
--- a/src/components/Employee/ManageEmployee.jsx
+++ b/src/components/Employee/ManageEmployee.jsx
@@ -1,36 +1,37 @@
import React, { useEffect, useState } from "react";
-import showToast from "../../services/toastService";
-import EmployeeRepository from "../../repositories/EmployeeRepository";
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
-import { z } from "zod";
+
import useMaster from "../../hooks/masterHook/useMaster";
import { useDispatch } from "react-redux";
import { changeMaster } from "../../slices/localVariablesSlice";
import { Link, useNavigate, useParams } from "react-router-dom";
import { formatDate } from "../../utils/dateUtils";
-import { useEmployeeProfile, useUpdateEmployee } from "../../hooks/useEmployees";
import {
- cacheData,
- clearCacheKey,
- getCachedData,
-} from "../../slices/apiDataManager";
-import { clearApiCacheKey } from "../../slices/apiCacheSlice";
-import { useMutation } from "@tanstack/react-query";
+ useEmployeeProfile,
+ useUpdateEmployee,
+} from "../../hooks/useEmployees";
+
import Label from "../common/Label";
import DatePicker from "../common/DatePicker";
-
-const mobileNumberRegex = /^[0-9]\d{9}$/;
+import { defatEmployeeObj, employeeSchema } from "./EmployeeSchema";
+import { useOrganizationsList } from "../../hooks/useOrganization";
+import { ITEMS_PER_PAGE } from "../../utils/constants";
const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => {
const dispatch = useDispatch();
const { mutate: updateEmployee, isPending } = useUpdateEmployee();
-
+ const {
+ data: organzationList,
+ isLoading,
+ isError,
+ error: EempError,
+ } = useOrganizationsList(ITEMS_PER_PAGE, 1, true);
const {
employee,
error,
loading: empLoading,
- refetch
+ refetch,
} = useEmployeeProfile(employeeId);
useEffect(() => {
@@ -38,6 +39,7 @@ const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => {
}, [employeeId]);
const [disabledEmail, setDisabledEmail] = useState(false);
+
const { data: job_role, loading } = useMaster();
const [isloading, setLoading] = useState(false);
const navigation = useNavigate();
@@ -45,98 +47,9 @@ const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => {
const [currentAddressLength, setCurrentAddressLength] = useState(0);
const [permanentAddressLength, setPermanentAddressLength] = useState(0);
- const userSchema = z.object({
- ...(employeeId ? { id: z.string().optional() } : {}),
- firstName: z.string().min(1, { message: "First Name is required" }),
- middleName: z.string().optional(),
- lastName: z.string().min(1, { message: "Last Name is required" }),
- email: z
- .string()
- .max(80, "Email cannot exceed 80 characters")
- .optional()
- .refine((val) => !val || /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(val), {
- message: "Invalid email format",
- })
- .refine(
- (val) => {
- if (!val) return true;
- const [local, domain] = val.split("@");
- return (
- val.length <= 320 && local?.length <= 64 && domain?.length <= 255
- );
- },
- {
- message: "Email local or domain part is too long",
- }
- ),
- currentAddress: z
- .string()
- .min(1, { message: "Current Address is required" })
- .max(500, { message: "Address cannot exceed 500 characters" }),
- birthDate: z
- .string()
- .min(1, { message: "Birth Date is required" })
- .refine(
- (date, ctx) => {
- return new Date(date) <= new Date();
- },
- {
- message: "Birth date cannot be in the future",
- }
- ),
- joiningDate: z
- .string()
- .min(1, { message: "Joining Date is required" })
- .refine(
- (date, ctx) => {
- return new Date(date) <= new Date();
- },
- {
- message: "Joining date cannot be in the future",
- }
- ),
- emergencyPhoneNumber: z
- .string()
- .min(1, { message: "Phone Number is required" })
- .regex(mobileNumberRegex, { message: "Invalid phone number " }),
- emergencyContactPerson: z
- .string()
- .min(1, { message: "Emergency Contact Person is required" })
- .regex(/^[A-Za-z\s]+$/, {
- message: "Emergency Contact Person must contain only letters",
- }),
- aadharNumber: z
- .string()
- .optional()
- .refine((val) => !val || /^\d{12}$/.test(val), {
- message: "Aadhar card must be exactly 12 digits long",
- }),
- gender: z
- .string()
- .min(1, { message: "Gender is required" })
- .refine((val) => val !== "Select Gender", {
- message: "Please select a gender",
- }),
- panNumber: z
- .string()
- .optional()
- .refine((val) => !val || /^[A-Z]{5}[0-9]{4}[A-Z]{1}$/.test(val), {
- message: "Invalid PAN number",
- }),
- permanentAddress: z
- .string()
- .min(1, { message: "Permanent Address is required" })
- .max(500, { message: "Address cannot exceed 500 characters" }),
- phoneNumber: z
- .string()
- .min(1, { message: "Phone Number is required" })
- .regex(mobileNumberRegex, { message: "Invalid phone number " }),
- jobRoleId: z.string().min(1, { message: "Role is required" }),
- });
-
useEffect(() => {
- refetch()
- }, [])
+ refetch();
+ }, []);
const {
register,
@@ -147,25 +60,8 @@ const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => {
reset,
getValues,
} = useForm({
- resolver: zodResolver(userSchema),
- defaultValues: {
- id: currentEmployee?.id || null,
- firstName: currentEmployee?.firstName || "",
- middleName: currentEmployee?.middleName || "",
- lastName: currentEmployee?.lastName || "",
- email: currentEmployee?.email || "",
- currentAddress: currentEmployee?.currentAddress || "",
- birthDate: formatDate(currentEmployee?.birthDate) || "",
- joiningDate: formatDate(currentEmployee?.joiningDate) || "",
- emergencyPhoneNumber: currentEmployee?.emergencyPhoneNumber || "",
- emergencyContactPerson: currentEmployee?.emergencyContactPerson || "",
- aadharNumber: currentEmployee?.aadharNumber || "",
- gender: currentEmployee?.gender || "",
- panNumber: currentEmployee?.panNumber || "",
- permanentAddress: currentEmployee?.permanentAddress || "",
- phoneNumber: currentEmployee?.phoneNumber || "",
- jobRoleId: currentEmployee?.jobRoleId.toString() || null,
- },
+ resolver: zodResolver(employeeSchema),
+ defaultValues: defatEmployeeObj,
mode: "onChange",
});
@@ -176,7 +72,13 @@ const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => {
data.email = null;
}
- updateEmployee({ ...data, IsAllEmployee }, {
+ const payload = { ...data, IsAllEmployee };
+
+ if (employeeId) {
+ payload.id = employeeId;
+ }
+
+ updateEmployee(payload, {
onSuccess: () => {
reset();
onClosed();
@@ -184,7 +86,6 @@ const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => {
});
};
-
useEffect(() => {
if (!loading && !error && employee) {
setCurrentEmployee(employee);
@@ -195,37 +96,47 @@ const ManageEmployee = ({ employeeId, onClosed, IsAllEmployee }) => {
reset(
currentEmployee
? {
- id: currentEmployee.id || null,
- firstName: currentEmployee.firstName || "",
- middleName: currentEmployee.middleName || "",
- lastName: currentEmployee.lastName || "",
- email: currentEmployee.email || "",
- currentAddress: currentEmployee.currentAddress || "",
- birthDate: formatDate(currentEmployee.birthDate) || "",
- joiningDate: formatDate(currentEmployee.joiningDate) || "",
- emergencyPhoneNumber: currentEmployee.emergencyPhoneNumber || "",
- emergencyContactPerson:
- currentEmployee.emergencyContactPerson || "",
- aadharNumber: currentEmployee.aadharNumber || "",
- gender: currentEmployee.gender || "",
- panNumber: currentEmployee.panNumber || "",
- permanentAddress: currentEmployee.permanentAddress || "",
- phoneNumber: currentEmployee.phoneNumber || "",
- jobRoleId: currentEmployee.jobRoleId?.toString() || "",
- }
+ id: currentEmployee.id || null,
+ firstName: currentEmployee.firstName || "",
+ middleName: currentEmployee.middleName || "",
+ lastName: currentEmployee.lastName || "",
+ email: currentEmployee.email || "",
+ currentAddress: currentEmployee.currentAddress || "",
+ birthDate: formatDate(currentEmployee.birthDate) || "",
+ joiningDate: formatDate(currentEmployee.joiningDate) || "",
+ emergencyPhoneNumber: currentEmployee.emergencyPhoneNumber || "",
+ emergencyContactPerson:
+ currentEmployee.emergencyContactPerson || "",
+ aadharNumber: currentEmployee.aadharNumber || "",
+ gender: currentEmployee.gender || "",
+ panNumber: currentEmployee.panNumber || "",
+ permanentAddress: currentEmployee.permanentAddress || "",
+ phoneNumber: currentEmployee.phoneNumber || "",
+ jobRoleId: currentEmployee.jobRoleId?.toString() || "",
+ organizationId: currentEmployee.organizationId || "",
+ hasApplicationAccess: currentEmployee.hasApplicationAccess || false,
+ }
: {}
);
setCurrentAddressLength(currentEmployee?.currentAddress?.length || 0);
setPermanentAddressLength(currentEmployee?.permanentAddress?.length || 0);
}, [currentEmployee, reset]);
+ const hasAccessAplication = watch("hasApplicationAccess");
return (
<>
|
|---|