From f4af7ccf1c3592d5b0948ae67b778c8d83260cc9 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Wed, 2 Apr 2025 17:24:43 +0530 Subject: [PATCH] added ascending order list , user-rights, --- src/components/Activities/Attendance.jsx | 9 ++++++++- src/components/Project/ProjectInfra.jsx | 10 +++++----- src/components/Project/ProjectNav.jsx | 6 +++--- src/components/Project/Teams.jsx | 8 ++++---- src/pages/employee/EmployeeList.jsx | 2 +- src/pages/master/MasterPage.jsx | 4 ++-- src/pages/master/MasterTable.jsx | 4 ++-- src/pages/project/ProjectList.jsx | 2 +- src/utils/constants.jsx | 17 ++++++++++++----- 9 files changed, 38 insertions(+), 24 deletions(-) diff --git a/src/components/Activities/Attendance.jsx b/src/components/Activities/Attendance.jsx index 7ecf3a2b..b4d3a378 100644 --- a/src/components/Activities/Attendance.jsx +++ b/src/components/Activities/Attendance.jsx @@ -30,7 +30,14 @@ const Attendance = ( {attendance, getRole, handleModalData} ) => {currentItems && - currentItems.map((item) => ( + currentItems + .sort((a, b) => { + // If checkInTime exists, compare it, otherwise, treat null as earlier than a date + const checkInA = a.checkInTime ? new Date(a.checkInTime) : new Date(0); + const checkInB = b.checkInTime ? new Date(b.checkInTime) : new Date(0); + return checkInB - checkInA; // Sort in descending order of checkInTime + }) + .map( ( item ) => (
diff --git a/src/components/Project/ProjectInfra.jsx b/src/components/Project/ProjectInfra.jsx index d995cad8..56d16036 100644 --- a/src/components/Project/ProjectInfra.jsx +++ b/src/components/Project/ProjectInfra.jsx @@ -8,7 +8,7 @@ import TaskModel from "./TaskModel"; import ProjectRepository from "../../repositories/ProjectRepository"; import ProjectModal from "./ProjectModal"; import {useHasUserPermission} from "../../hooks/useHasUserPermission"; -import {MANAGE_INFRA} from "../../utils/constants"; +import {MANAGE_PROJECT_INFRA} from "../../utils/constants"; // import AssignRoleModel from "./AssignRoleModel"; const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) => { @@ -17,7 +17,7 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) = const [project, setProject] = useState(data); const[modalConfig,setModalConfig] = useState({type:null,data:null}); const [ isModalOpen, setIsModalOpen ] = useState( false ) - const ManageInfra = useHasUserPermission(MANAGE_INFRA) + const ManageInfra = useHasUserPermission(MANAGE_PROJECT_INFRA) const [buildings, setBuildings] = useState(data.buildings); const [isBuildingModalOpen, setIsBuildingModalOpen] = useState(false); @@ -517,11 +517,11 @@ const ProjectInfra = ({ data, activityMaster, onDataChange,eachSiteEngineer }) =
-
-
+
+