Merge branch 'Feature_Task_Management' of https://git.marcoaiot.com/admin/marco.pms.web into Feature_Task_Management

src/components/Project/AssignRole.jsx

@@ -92,7 +92,7 @@ const onSubmit = async(data) => {
     let response = await TasksRepository.assignTask( formattedData );
     showToast( "Task Successfully Assigend", "success" )
     reset()
-    closeModal()
+    onClose()
   } catch ( error )
   {
     showToast("something wrong","error")

src/components/Project/ManageProjectInfo.jsx

@@ -41,7 +41,14 @@ const ManageProjectInfo = ( {project,handleSubmitForm, onClose} ) =>
       return num;
     }),
   
-  } )
+  } ) .refine((data) => {
+    const start = new Date(data.startDate);
+    const end = new Date(data.endDate);
+    return end > start;
+  }, {
+    path: ['endDate'], // attaches the error to the endDate field
+    message: 'End Date must be greater than Start Date',
+  });
 
 
  const {register, control, handleSubmit, formState: {errors}, reset, getValues} = useForm( {

src/pages/project/ProjectList.jsx

@@ -85,6 +85,19 @@ const ProjectList = () =>
     ? Math.ceil(projectList.length / itemsPerPage)
     : 0;
 
+  const statusMap = {
+    1: { label: 'active', priority: 1 },
+    2: { label: 'hold', priority: 2 },
+    3: { label: 'inactive', priority: 3 },
+    4: { label: 'complete', priority: 4 }
+  };
+  
+
+  const sortedProjects = [...currentItems].sort((a, b) => {
+    const aPriority = statusMap[+a.projectStatusId]?.priority ?? 99;
+    const bPriority = statusMap[+b.projectStatusId]?.priority ?? 99;
+    return aPriority - bPriority;
+  });
   
   return (
     <>
@@ -119,7 +132,7 @@ const ProjectList = () =>
             {" "}
             <button
               type="button"
-              className={`btn btn-sm btn-primary ${!HasManageProject && 'd-none' }`}
+              className={`btn btn-xs btn-primary ${!HasManageProject && 'd-none' }`}
               data-bs-toggle="modal"
               data-bs-target="#create-project-model"
               onClick={handleShow}
@@ -151,8 +164,10 @@ const ProjectList = () =>
 
         <div className="row">
           {loading && <p className="text-center">Loading...</p>}
+
+          
           {currentItems &&
-            currentItems.sort((a, b) => b.id - a.id).map((item) => (
+            sortedProjects.map((item) => (
               <ProjectCard projectData={item} key={item.id}></ProjectCard>
             ))}
         </div>