added edit task modal, and changed compeletd work and plannedwork
This commit is contained in:
parent
477cc5ab73
commit
3677b80cfa
@ -1,7 +1,7 @@
|
||||
import React, { useState, useEffect } from "react";
|
||||
import AssignRoleModel from "../AssignRole";
|
||||
import { useParams } from "react-router-dom";
|
||||
//import EditActivityModal from "./EditActivityModal";
|
||||
import EditActivityModal from "./EditActivityModal";
|
||||
import { useHasUserPermission } from "../../../hooks/useHasUserPermission";
|
||||
import { MANAGE_PROJECT_INFRA, MANAGE_TASK } from "../../../utils/constants";
|
||||
|
||||
@ -59,7 +59,7 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* <div
|
||||
{showModal && <div
|
||||
className={`modal fade ${showModal ? "show" : ""}`}
|
||||
tabIndex="-1"
|
||||
role="dialog"
|
||||
@ -73,7 +73,7 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
|
||||
floor={forFloor}
|
||||
onClose={closeModal1}
|
||||
/>
|
||||
</div> */}
|
||||
</div> }
|
||||
|
||||
<tr>
|
||||
<td className="text-start table-cell-small">
|
||||
@ -87,19 +87,23 @@ const WorkItem = ({ workItem, forBuilding, forFloor, forWorkArea }) => {
|
||||
</td>
|
||||
{/* for mobile view */}
|
||||
<td className="text-center d-sm-none d-sm-table-cell">
|
||||
{NewWorkItem?.workItem?.completedWork}/{" "}
|
||||
{hasWorkItem
|
||||
? NewWorkItem?.workItem?.completedWork ?? workItem?.completedWork ?? "NA"
|
||||
: "NA"}/{" "}
|
||||
{hasWorkItem
|
||||
? NewWorkItem?.workItem?.plannedWork || workItem?.plannedWork
|
||||
: "NA"}
|
||||
</td>
|
||||
{/* for greather than mobile view ************* */}
|
||||
<td className="text-center d-none d-md-table-cell">
|
||||
{hasWorkItem
|
||||
? NewWorkItem?.workItem?.plannedWork || workItem?.plannedWork
|
||||
: "NA"}
|
||||
{hasWorkItem
|
||||
? NewWorkItem?.workItem?.plannedWork ?? workItem?.plannedWork ?? "NA"
|
||||
: "NA"}
|
||||
</td>
|
||||
<td className="text-center d-none d-md-table-cell">
|
||||
{NewWorkItem?.workItem?.completedWork}
|
||||
{hasWorkItem
|
||||
? NewWorkItem?.workItem?.completedWork ?? workItem?.completedWork ?? "NA"
|
||||
: "NA"}
|
||||
</td>
|
||||
<td className="text-center" style={{ width: "15%" }}>
|
||||
<div className="progress p-0">
|
||||
|
Loading…
x
Reference in New Issue
Block a user