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

src/components/Activities/ReportTaskComments.jsx

@@ -113,8 +113,17 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
       <div className="modal-body p-sm-4 p-0">
         <h5 className=" text-center mb-2">Activity Summary</h5>
 
-        <p className="small-text text-start my-2">
+        <p className="fw-bold my-2 text-start">
-          {commentsData?.workItem?.workArea?.floor?.building?.description}
+          Location :
+          <span className="fw-normal ms-2 text-start">
+            {`${commentsData?.workItem?.workArea?.floor?.building?.name}`}{" "}
+            <i className="bx bx-chevron-right"></i>{" "}
+            {`${commentsData?.workItem?.workArea?.floor?.floorName} `}{" "}
+            <i className="bx bx-chevron-right"></i>
+            {`${commentsData?.workItem?.workArea?.areaName}`}
+            <i className="bx bx-chevron-right"></i>
+            {` ${commentsData?.workItem?.activityMaster?.activityName}`}
+          </span>
         </p>
 
         <p className="fw-bold my-2 text-start">
@@ -137,27 +146,20 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
           </span>{" "}
         </p>
 
-        <p className="fw-bold my-2 text-start">
-          Location :
-          <span className="fw-normal ms-2 text-start">
-            {`${commentsData?.workItem?.workArea?.floor?.building?.name}`}{" "}
-            <i className="bx bx-chevron-right"></i>{" "}
-            {`${commentsData?.workItem?.workArea?.floor?.floorName} `}{" "}
-            <i className="bx bx-chevron-right"></i>
-            {`${commentsData?.workItem?.workArea?.areaName}`}
-            <i className="bx bx-chevron-right"></i>
-            {` ${commentsData?.workItem?.activityMaster?.activityName}`}
-          </span>
-        </p>
         <p className="fw-bold my-2 text-start">
           Planned Work: {commentsData?.plannedTask}{" "}
           {commentsData?.workItem?.activityMaster?.unitOfMeasurement}
         </p>
-        <p className="fw-bold my-2 text-start">
+        {commentsData?.reportedDate != null && (
-          {" "}
+          <p className="fw-bold my-2 text-start">
-          Completed Work : {commentsData?.completedTask}{" "}
+            {" "}
-          {commentsData?.workItem?.activityMaster?.unitOfMeasurement}
+            Completed Work : {commentsData?.completedTask}{" "}
-        </p>
+            {commentsData?.workItem?.activityMaster?.unitOfMeasurement}
+          </p>
+        )}
+        {!commentsData?.reportedDate && (
+          <p className="fw-bold my-2 text-start"> Completed Work : &nbsp;-</p>
+        )}
         <div className="d-flex align-items-center flex-wrap">
           <p className="fw-bold text-start m-0 me-1">Team :</p>
           <div className="d-flex flex-wrap align-items-center gap-2">
@@ -173,7 +175,14 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
             ))}
           </div>
         </div>
-           {commentsData?.reportedPreSignedUrls?.length > 0 && (
+        <p className="fw-bold my-2 text-start my-2">
+          Note :{" "}
+          <div
+            className="fw-normal ms-5"
+            dangerouslySetInnerHTML={{ __html: commentsData?.description }}
+          />
+        </p>
+        {commentsData?.reportedPreSignedUrls?.length > 0 && (
           <div className=" text-start">
             <p className="fw-bold m-0">Attachment</p>
             <ImagePreview
@@ -211,7 +220,7 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
             </button>
           </div>
         </form>
-     
+
         <ul
           className="list-group px-0 mx-0 overflow-auto border-0"
           ref={containerRef}
@@ -259,7 +268,10 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
                     {data?.preSignedUrls?.length > 0 && (
                       <div className="ps-6 text-start">
                         <small className="">Attachment</small>
-                        <ImagePreview images={data?.preSignedUrls} IsReported={true} />
+                        <ImagePreview
+                          images={data?.preSignedUrls}
+                          IsReported={true}
+                        />
                       </div>
                     )}
                   </li>

src/components/Layout/Header.jsx

@@ -131,17 +131,24 @@ const Header = () => {
                   </button>
 
                   {projectNames?.length > 1 && (
-                    <ul className="dropdown-menu">
+                    <ul
-                      {projectNames?.map((project) => (
+                      className="dropdown-menu"
-                        <li key={project?.id}>
+                      style={{ overflow: "auto", maxHeight: "300px" }}
-                          <button
+                    >
-                            className="dropdown-item"
+                      {[...projectNames]
-                            onClick={() => dispatch(setProjectId(project?.id))}
+                        .sort((a, b) => a.name.localeCompare(b.name))
-                          >
+                        .map((project) => (
-                            {project?.name}
+                          <li key={project?.id}>
-                          </button>
+                            <button
-                        </li>
+                              className="dropdown-item"
-                      ))}
+                              onClick={() =>
+                                dispatch(setProjectId(project?.id))
+                              }
+                            >
+                              {project?.name}
+                            </button>
+                          </li>
+                        ))}
                     </ul>
                   )}
                 </div>
@@ -263,7 +270,7 @@ const Header = () => {
             </div>
           </li>
 
-          <li className="nav-item dropdown-notifications navbar-dropdown dropdown me-2 me-xl-0">
+          {/* <li className="nav-item dropdown-notifications navbar-dropdown dropdown me-2 me-xl-0">
             <a
               className="nav-link dropdown-toggle hide-arrow cursor-pointer"
               data-bs-toggle="dropdown"
@@ -557,20 +564,7 @@ const Header = () => {
                     </div>
                   </li>
                 </ul>
-                {/* <div className="ps__rail-x" style="left: 0px; bottom: 0px;">
+  
-                  <div
-                    className="ps__thumb-x"
-                    tabindex="0"
-                    style="left: 0px; width: 0px;"
-                  ></div>
-                </div>
-                <div className="ps__rail-y" style="top: 0px; right: 0px;">
-                  <div
-                    className="ps__thumb-y"
-                    tabindex="0"
-                    style="top: 0px; height: 0px;"
-                  ></div>
-                </div> */}
               </li>
               <li className="border-top">
                 <div className="d-grid p-4">
@@ -582,7 +576,7 @@ const Header = () => {
                 </div>
               </li>
             </ul>
-          </li>
+          </li> */}
           <li className="nav-item navbar-dropdown dropdown-user dropdown">
             <a
               aria-label="dropdown profile avatar"
@@ -632,7 +626,7 @@ const Header = () => {
                   <span className="align-middle">My Profile</span>
                 </a>
               </li>
-              <li>
+              <li onClick={handleProfilePage}>
                 <a
                   aria-label="go to setting "
                   className="dropdown-item cusor-pointer"
@@ -641,7 +635,7 @@ const Header = () => {
                   <span className="align-middle">Settings</span>
                 </a>
               </li>
-              <li>
+              {/* <li>
                 <a
                   aria-label="go to billing "
                   className="dropdown-item cusor-pointer"
@@ -656,7 +650,7 @@ const Header = () => {
                     </span>
                   </span>
                 </a>
-              </li>
+              </li> */}
               <li onClick={openChangePassword}>
                 {" "}
                 {/* Use the function from the context */}