Merge branch 'Issue_May_5W' of https://git.marcoaiot.com/admin/marco.pms.web into pramod_Task#111

src/components/Activities/AttendcesLogs.jsx

@@ -112,7 +112,7 @@ const AttendanceLog = ({ handleModalData, projectId, showOnlyCheckout }) => {
 
   const { currentPage, totalPages, currentItems: paginatedAttendances, paginate, resetPage } = usePagination(
     processedData,
-    10
+    20
   );
 
   // Reset to the first page whenever processedData changes (due to switch on/off)
@@ -127,7 +127,7 @@ const AttendanceLog = ({ handleModalData, projectId, showOnlyCheckout }) => {
         id="DataTables_Table_0_length"
       >
         <div className="col-md-3 my-0 ">
-          <DateRangePicker onRangeChange={setDateRange} defaultStartDate={yesterday} />
+          <DateRangePicker onRangeChange={setDateRange} defaultStartDate={yesterday}  />
         </div>
         <div className="col-md-2 m-0 text-end">
           <i
@@ -171,7 +171,7 @@ const AttendanceLog = ({ handleModalData, projectId, showOnlyCheckout }) => {
                   acc.push(
                     <tr key={`header-${currentDate}`} className="table-row-header">
                       <td colSpan={6} className="text-start">
-                        <strong>{moment(currentDate).format("YYYY-MM-DD")}</strong>
+                        <strong>{moment(currentDate).format("DD-MM-YYYY")}</strong>
                       </td>
                     </tr>
                   );

src/components/Activities/ReportTask.jsx

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useState,useEffect } from "react";
 import { formatDate } from "../../utils/dateUtils";
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -13,15 +13,23 @@ export const ReportTask = ({ report, closeModal, refetch }) => {
     report?.workItem?.plannedWork - report?.workItem?.completedWork;
 
   const schema = z.object({
-    completedTask: z
+  completedTask: z
-      .number()
+    .preprocess(
-      .min(0, "Completed Work must be greater than 0")
+      (val) => (val === "" || val === null || Number.isNaN(val) ? undefined : Number(val)),
-      .max(maxPending, {
+      z
-        message: `Completed task cannot exceed total pending tasks:  ${maxPending}`,
+        .number({
-      })
+          required_error: "Completed Work must be a number",
-      .optional(),
+          invalid_type_error: "Completed Work must be a number",
-    comment: z.string().min(1, "Comment cannot be empty"),
+        })
-  });
+        .min(1, "Completed Work must be greater than 0")
+        .max(maxPending, {
+          message: `Completed task cannot exceed total pending tasks: ${maxPending}`,
+        })
+    ),
+  comment: z.string().min(1, "Comment cannot be empty"),
+});
+
+  
   const {
     register,
     handleSubmit,
@@ -32,6 +40,14 @@ export const ReportTask = ({ report, closeModal, refetch }) => {
     defaultValues: { completedTask: 0, comment: "" },
   });
 
+
+useEffect(() => {
+  if (report) {
+    reset({ completedTask: 0, comment: "" }); // optional: customize default if needed
+  }
+}, [report, reset]);
+
+
   const onSubmit = async (data) => {
     try {
       setloading(true);
@@ -56,6 +72,7 @@ export const ReportTask = ({ report, closeModal, refetch }) => {
   };
   const handleClose = () => {
     closeModal();
+    reset();
   };
 
   return (

src/components/Activities/ReportTaskComments.jsx

@@ -13,35 +13,52 @@ const schema = z.object({
   comment: z.string().min(1, "Comment cannot be empty"),
 });
 
+/**
+ * ReportTaskComments component for displaying and adding comments to a task.
+ * It also shows a summary of the activity and task details.
+ *
+ * @param {object} props - The component props.
+ * @param {object} props.commentsData - Data related to the task and its comments, including the description.
+ * @param {function} props.closeModal - Callback function to close the modal.
+ */
+
 const ReportTaskComments = ({ commentsData, closeModal }) => {
   const [loading, setloading] = useState(false);
   const [comments, setComment] = useState([]);
-  const [bgClass, setBgClass] = useState("");
   const {
     register,
     handleSubmit,
     formState: { errors },
-    reset,
+    reset, // Destructure reset from useForm
   } = useForm({
     resolver: zodResolver(schema),
   });
 
   const containerRef = useRef(null);
-  const firstRender = useRef(true);  
+  const firstRender = useRef(true);
-
 
   useEffect(() => {
-    setComment(commentsData?.comments);
+    const taskList = getCachedData("taskList");
+    if (taskList && taskList.data && commentsData?.id) {
+      const currentTask = taskList.data.find(task => task.id === commentsData.id);
+      if (currentTask && currentTask.comments) {
+        setComment(currentTask.comments);
+      } else {
+        setComment(commentsData?.comments || []);
+      }
+    } else {
+      setComment(commentsData?.comments || []);
+    }
+    firstRender.current = true;
   }, [commentsData]);
 
-  // Scroll logic: scroll to bottom when new comments are added
   useEffect(() => {
     if (!firstRender.current && containerRef.current) {
       containerRef.current.scrollTop = containerRef.current.scrollHeight;
     } else {
-      firstRender.current = false;  // Mark the first render as complete
+      firstRender.current = false; 
     }
-  }, [comments]);  // Run this when comments array is updated
+  }, [comments]); 
 
   const onSubmit = async (data) => {
     let sendComment = {
@@ -52,28 +69,34 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
     try {
       setloading(true);
       const resp = await TasksRepository.taskComments(sendComment);
+    
       setComment((prevItems) => [...prevItems, resp.data]);
+
       const taskList = getCachedData("taskList");
-      const updatedTaskList = taskList.data.map((task) => {
+      
-        if (task.id === resp.data.taskAllocationId) {
+      if (taskList && taskList.data) {
-          const existingComments = Array.isArray(task.comments)
+        const updatedTaskList = taskList.data.map((task) => {
-            ? task.comments
+          if (task.id === resp.data.taskAllocationId) {
-            : [];
+            const existingComments = Array.isArray(task.comments)
-          return {
+              ? task.comments
-            ...task,
+              : [];
-            comments: [...existingComments, resp.data],
+            return {
-          };
+              ...task,
-        }
+              comments: [...existingComments, resp.data],
-        return task;
+            };
-      });
+          }
-      cacheData("taskList", {
+          return task;
-        data: updatedTaskList,
+        });
-        projectId: taskList.projectId,
+       
-      });
+        cacheData("taskList", {
-      reset();
+          data: updatedTaskList,
+          projectId: taskList.projectId, 
+        });
+      }
+
+      reset(); 
       setloading(false);
       showToast("Successfully Sent", "success");
-      // closeModal();
     } catch (error) {
       setloading(false);
       showToast(error.response.data?.message || "Something went wrong", "error");
@@ -93,16 +116,20 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
             onClick={closeModal}
             aria-label="Close"
           ></button>
-          <p className="fs-6 text-dark text-start m-0">Activity Summary</p>
+          <h5 className=" text-center mb-2">
+            Activity Summary
+          </h5>
+
           <p className="small-text text-start my-2">
-            {comments && comments[0]?.comment}
+            {commentsData?.workItem?.workArea?.floor?.building?.description}
           </p>
+
           <p className="fw-bold my-2 text-start">
             Assigned By :
             <span className=" ms-2">
-              {commentsData?.assignedBy.firstName +
+              {commentsData?.assignedBy?.firstName +
                 " " +
-                commentsData?.assignedBy.lastName}
+                commentsData?.assignedBy?.lastName}
             </span>{" "}
           </p>
 
@@ -126,7 +153,7 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
             Completed Work : {commentsData?.completedTask}
           </p>
           <div className="d-flex align-items-center flex-wrap">
-            <p className="fw-bold text-start m-0 me-1">Team:</p>
+            <p className="fw-bold text-start m-0 me-1">Team :</p>
             <div className="d-flex flex-wrap align-items-center gap-2">
               {commentsData?.teamMembers?.map((member, idx) => (
                 <span key={idx} className="d-flex align-items-center">
@@ -147,7 +174,6 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
               {...register("comment")}
               className="form-control"
               id="exampleFormControlTextarea1"
-              rows="1"
               placeholder="Enter comment"
             />
             {errors.comment && (
@@ -162,7 +188,7 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
               >
                 Close
               </button>
-              <button type="submit" className="btn btn-sm btn-primary ms-2">
+              <button type="submit" className="btn btn-sm btn-primary ms-2" disabled={loading}>
                 {loading ? "Sending..." : "Comment"}
               </button>
             </div>
@@ -170,23 +196,21 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
 
           <ul
             className="list-group px-0 mx-0 overflow-auto border-0"
-            // ref={containerRef}  // auto scroll according data
+            ref={containerRef} 
-            style={{ maxHeight: "200px" }}
           >
             {comments &&
               comments
                 ?.slice()
-                .reverse()
+                .reverse() 
                 .map((data, idx) => {
                   const fullName = `${data?.employee?.firstName} ${data?.employee?.lastName}`;
-                  const bgClass = getBgClassFromHash(fullName);
                   return (
                     <li
                       className={`list-group-item list-group-item-action border-none my-1 p-1`}
                       key={idx}
                     >
                       <div
-                        className={`li-wrapper d-flex justify-content-start align-items-start my-0`}
+                        className={`li-wrapper d-flex justify-content-start align-items-center my-0`}
                       >
                         <div className="avatar avatar-xs me-1">
                           <span
@@ -196,9 +220,9 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
                           </span>
                         </div>
 
-                        <div className={`text-start py-0`}>
+                        <div className={`d-flex align-items-center justify-content-start`}>
-                          <p className={`mb-0 text-${bgClass}`}>{fullName}</p>
+                          <p className={`mb-0 text-muted me-2`}>{fullName}</p>
-                          <p className="text-muted m-0" style={{ fontSize: "10px" }}>
+                          <p className={`text-secondary m-0`} style={{ fontSize: "10px" }}>
                             {moment.utc(data?.commentDate).local().fromNow()}
                           </p>
                         </div>

src/components/Project/AssignRole.jsx

@@ -273,13 +273,6 @@ const AssignRoleModel = ({ assignData, onClose }) => {
                       </div>
                     </div>
 
-                    {employeeLoading && <div>Loading employees...</div>}
-                    {!employeeLoading &&
-                      filteredEmployees?.length === 0 &&
-                      employees && (
-                        <div>No employees found for the selected role.</div>
-                      )}
-
                     <div className="row">
                       <div className="col-12 h-sm-25 overflow-auto mt-2">
                         {selectedRole !== "" && (

src/components/Project/ManageProjectInfo.jsx

@@ -102,13 +102,21 @@ const ManageProjectInfo = ({ project, handleSubmitForm, onClose }) => {
   const onSubmitForm = (updatedProject) => {
     setLoading(true);
     handleSubmitForm( updatedProject, setLoading,reset );
-   
+  }; 	
-
 
+  const handleCancel = () => {
+    reset({
+      id: project?.id || "",
+      name: project?.name || "",
+      contactPerson: project?.contactPerson || "",
+      projectAddress: project?.projectAddress || "",
+      startDate: formatDate(project?.startDate) || currentDate,
+      endDate: formatDate(project?.endDate) || currentDate,
+      projectStatusId: String(project?.projectStatusId || "00000000-0000-0000-0000-000000000000"),
+    });
+    onClose();
   };
 
-
-
   return (
     <div
       className="modal-dialog modal-lg modal-simple mx-sm-auto mx-1 edit-project-modal"
@@ -119,7 +127,7 @@ const ManageProjectInfo = ({ project, handleSubmitForm, onClose }) => {
           <button
             type="button"
             className="btn-close"
-            onClick={onClose}
+            onClick={handleCancel}
             aria-label="Close"
           ></button>
           <div className="text-center mb-2">
@@ -280,7 +288,7 @@ const ManageProjectInfo = ({ project, handleSubmitForm, onClose }) => {
               <button
                 type="button"
                 className="btn btn-sm btn-label-secondary"
-                onClick={onClose}
+                onClick={handleCancel}
                 aria-label="Close"
               >
                 Cancel

src/components/common/DateRangePicker.jsx

@@ -12,7 +12,7 @@ const DateRangePicker = ({ onRangeChange, DateDifference = 7, defaultStartDate =
 
     const fp = flatpickr(inputRef.current, {
       mode: "range",
-      dateFormat: "Y-m-d",
+      dateFormat: "d-m-Y",
       defaultDate: [fifteenDaysAgo, today],
       static: true,
       clickOpens: true,

src/pages/Activities/DailyTask.jsx

@@ -6,7 +6,7 @@ import { useTaskList } from "../../hooks/useTasks";
 import { useProjects } from "../../hooks/useProjects";
 import { setProjectId } from "../../slices/localVariablesSlice";
 import { useProfile } from "../../hooks/useProfile";
-import { formatDate } from "../../utils/dateUtils";
+// import { formatDate } from "../../utils/dateUtils"; // Removed this import
 import GlobalModel from "../../components/common/GlobalModel";
 import AssignRoleModel from "../../components/Project/AssignRole";
 import { ReportTask } from "../../components/Activities/ReportTask";
@@ -14,6 +14,7 @@ import ReportTaskComments from "../../components/Activities/ReportTaskComments";
 import DateRangePicker from "../../components/common/DateRangePicker";
 import DatePicker from "../../components/common/DatePicker";
 import { useSearchParams } from "react-router-dom";
+import moment from "moment";
 
 const DailyTask = () => {
   const [searchParams] = useSearchParams();
@@ -141,6 +142,7 @@ const DailyTask = () => {
                 <DateRangePicker
                   onRangeChange={setDateRange}
                   DateDifference="6"
+                  dateFormat="DD-MM-YYYY"
                 />
               </div>
               <div className="col-sm-3 col-6 text-end mb-1">
@@ -188,7 +190,7 @@ const DailyTask = () => {
                     </tr>
                   )}
                   {!task_loading && TaskList.length === 0 && (
-                     <tr>
+                    <tr>
                       <td colSpan={7} className="text-center">
                         <p>No Reports Found</p>
                       </td>
@@ -199,7 +201,7 @@ const DailyTask = () => {
                       <React.Fragment key={i}>
                         <tr className="table-row-header">
                           <td colSpan={7} className="text-start">
-                            <strong>{date}</strong>
+                            <strong>{moment(date).format("DD-MM-YYYY")}</strong>
                           </td>
                         </tr>
                         {TaskLists.filter((task) =>
@@ -246,7 +248,7 @@ const DailyTask = () => {
                                     task.workItem.completedWork}
                                 </td>
                                 <td>{task.completedTask}</td>
-                                <td>{formatDate(task.assignmentDate)}</td>
+                                <td>{moment(task.assignmentDate).format("DD-MM-YYYY")}</td>
                                 <td className="text-center">
                                   <div
                                     key={refIndex}
@@ -264,23 +266,23 @@ const DailyTask = () => {
                                         ${task.teamMembers
                                           .map(
                                             (member) => `
-                                            <div class="d-flex align-items-center gap-2 mb-2">
+                                              <div class="d-flex align-items-center gap-2 mb-2">
-                                              <div class="avatar avatar-xs">
+                                                <div class="avatar avatar-xs">
-                                                <span class="avatar-initial rounded-circle bg-label-primary">
+                                                  <span class="avatar-initial rounded-circle bg-label-primary">
-                                                  ${
+                                                    ${
-                                                    member?.firstName?.charAt(
+                                                      member?.firstName?.charAt(
-                                                      0
+                                                        0
-                                                    ) || ""
+                                                      ) || ""
-                                                  }${
+                                                    }${
                                               member?.lastName?.charAt(0) || ""
                                             }
-                                                </span>
+                                                  </span>
-                                              </div>
+                                                </div>
-                                              <span>${member.firstName} ${
+                                                <span>${member.firstName} ${
                                               member.lastName
                                             }</span>
-                                            </div>
+                                              </div>
-                                          `
+                                            `
                                           )
                                           .join("")}
                                       </div>
@@ -362,4 +364,4 @@ const DailyTask = () => {
     </>
   );
 };
-export default DailyTask;
+export default DailyTask;