admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'Ashutosh_Enhancement#132_Int_To_Guid' of https://git.marcoaiot.com/admin/marco.pms.web into Ashutosh_Enhancement#132_Int_To_Guid

Browse Source
This commit is contained in:
ashutosh.nehete 2025-05-04 12:20:20 +05:30
commit 1ffda41f16
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/components/Project/Infrastructure/WorkItem.jsx
View File

@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
import { useModal } from "../../../ModalContext"; import { useModal } from "../../../ModalContext";
import AssignRoleModel from "../AssignRole"; import AssignRoleModel from "../AssignRole";
import { useParams } from "react-router-dom"; import { useParams } from "react-router-dom";
import EditActivityModal from "./EditActivityModal"; //import EditActivityModal from "./EditActivityModal";
import { useHasUserPermission } from "../../../hooks/useHasUserPermission"; import { useHasUserPermission } from "../../../hooks/useHasUserPermission";
import { MANAGE_TASK } from "../../../utils/constants"; import { MANAGE_TASK } from "../../../utils/constants";
@ -46,29 +46,33 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
const closeModal1 = () => setShowModal(false); const closeModal1 = () => setShowModal(false);
return ( return (
<> <>
<div {showModal && (
className={`modal fade ${isModalOpen ? "show" : ""}`} <div
tabIndex="-1" className={`modal fade ${isModalOpen ? "show" : ""}`}
role="dialog" tabIndex="-1"
style={{ display: isModalOpen ? "block" : "none" }} role="dialog"
aria-hidden={!isModalOpen} style={{ display: isModalOpen ? "block" : "none" }}
> aria-hidden={!isModalOpen}
<AssignRoleModel assignData={assigndata} onClose={closeModal} /> >
</div> <AssignRoleModel assignData={assigndata} onClose={closeModal} />
</div>
)}
<div {/* <div
className={`modal fade ${showModal ? "show" : ""}`} className={`modal fade ${showModal ? "show" : ""}`}
tabIndex="-1" tabIndex="-1"
role="dialog" role="dialog"
style={{ display: showModal ? "block" : "none" }} style={{ display: showModal ? "block" : "none" }}
aria-hidden={!showModal} aria-hidden={!showModal}
> >
<EditActivityModal workItem={workItem} <EditActivityModal
workItem={workItem}
workArea={forWorkArea} workArea={forWorkArea}
building={forBuilding} building={forBuilding}
floor={forFloor} floor={forFloor}
onClose={ closeModal1} /> onClose={closeModal1}
</div> />
</div> */}
<tr> <tr>
<td className="text-start table-cell-small"> <td className="text-start table-cell-small">
@ -121,7 +125,7 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
</td> </td>
<td className="d-none d-md-table-cell"> <td className="d-none d-md-table-cell">
<div className="dropdown"> <div className="dropdown">
{!projectId && ManageTasks && ( {!projectId && ManageTasks && (
<button <button
aria-label="Modify" aria-label="Modify"
type="button" type="button"