added regular date formate and prevent to call api without param.
This commit is contained in:
parent
3fa6e19114
commit
75c81ecc0c
@ -202,3 +202,4 @@ export const ReportTask = ({ report, closeModal }) => {
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
export default ReportTask;
|
||||||
@ -175,6 +175,7 @@ export const useProjectInfra = (projectId) => {
|
|||||||
} = useQuery({
|
} = useQuery({
|
||||||
queryKey: ["ProjectInfra", projectId],
|
queryKey: ["ProjectInfra", projectId],
|
||||||
queryFn: async () => {
|
queryFn: async () => {
|
||||||
|
if(!projectId) return null;
|
||||||
const res = await ProjectRepository.getProjectInfraByproject(projectId);
|
const res = await ProjectRepository.getProjectInfraByproject(projectId);
|
||||||
return res.data;
|
return res.data;
|
||||||
},
|
},
|
||||||
|
|||||||
@ -1,31 +1,29 @@
|
|||||||
import React, { useEffect, useState, useRef } from "react";
|
import React, { useEffect, useMemo, useRef, useState } from "react";
|
||||||
import { useDispatch, useSelector } from "react-redux";
|
import { useDispatch } from "react-redux";
|
||||||
import Breadcrumb from "../../components/common/Breadcrumb";
|
|
||||||
import { useTaskList } from "../../hooks/useTasks";
|
import { useTaskList } from "../../hooks/useTasks";
|
||||||
import { useProjectName, useProjects } from "../../hooks/useProjects";
|
import { useProjectName } from "../../hooks/useProjects";
|
||||||
import { setProjectId } from "../../slices/localVariablesSlice";
|
import { setProjectId } from "../../slices/localVariablesSlice";
|
||||||
import { ReportTask } from "../../components/Activities/ReportTask";
|
import Breadcrumb from "../../components/common/Breadcrumb";
|
||||||
import ReportTaskComments from "../../components/Activities/ReportTaskComments";
|
|
||||||
import DateRangePicker from "../../components/common/DateRangePicker";
|
import DateRangePicker from "../../components/common/DateRangePicker";
|
||||||
import { useSearchParams } from "react-router-dom";
|
import FilterIcon from "../../components/common/FilterIcon";
|
||||||
import moment from "moment";
|
|
||||||
import FilterIcon from "../../components/common/FilterIcon";
|
|
||||||
import GlobalModel from "../../components/common/GlobalModel";
|
import GlobalModel from "../../components/common/GlobalModel";
|
||||||
import AssignTask from "../../components/Project/AssignTask";
|
import ReportTask from "../../components/Activities/ReportTask";
|
||||||
|
import ReportTaskComments from "../../components/Activities/ReportTaskComments";
|
||||||
import SubTask from "../../components/Activities/SubTask";
|
import SubTask from "../../components/Activities/SubTask";
|
||||||
import {formatNumber} from "../../utils/dateUtils";
|
import { formatNumber, formatUTCToLocalTime } from "../../utils/dateUtils";
|
||||||
import { useHasUserPermission } from "../../hooks/useHasUserPermission";
|
import { useHasUserPermission } from "../../hooks/useHasUserPermission";
|
||||||
import { APPROVE_TASK, ASSIGN_REPORT_TASK } from "../../utils/constants";
|
import { APPROVE_TASK, ASSIGN_REPORT_TASK } from "../../utils/constants";
|
||||||
import { useSelectedproject } from "../../slices/apiDataManager";
|
import { useSelectedproject } from "../../slices/apiDataManager";
|
||||||
|
import moment from "moment";
|
||||||
|
import Loader from "../../components/common/Loader";
|
||||||
|
|
||||||
const DailyTask = () => {
|
const DailyTask = () => {
|
||||||
// const selectedProject = useSelector(
|
const dispatch = useDispatch();
|
||||||
// (store) => store.localVariables.projectId
|
|
||||||
// );
|
|
||||||
const selectedProject = useSelectedproject();
|
const selectedProject = useSelectedproject();
|
||||||
const dispatch = useDispatch()
|
const { projectNames } = useProjectName();
|
||||||
const { projectNames, loading: projectLoading, fetchData } = useProjectName();
|
console.log(selectedProject)
|
||||||
|
const ApprovedTaskRights = useHasUserPermission(APPROVE_TASK);
|
||||||
|
const ReportTaskRights = useHasUserPermission(ASSIGN_REPORT_TASK);
|
||||||
|
|
||||||
const [filters, setFilters] = useState({
|
const [filters, setFilters] = useState({
|
||||||
selectedBuilding: "",
|
selectedBuilding: "",
|
||||||
@ -33,429 +31,201 @@ const DailyTask = () => {
|
|||||||
selectedActivities: [],
|
selectedActivities: [],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
|
const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
|
||||||
const ApprovedTaskRights = useHasUserPermission(APPROVE_TASK)
|
|
||||||
const ReportTaskRights = useHasUserPermission(ASSIGN_REPORT_TASK)
|
|
||||||
|
|
||||||
const {
|
const { TaskList, loading: taskLoading } = useTaskList(
|
||||||
TaskList,
|
selectedProject || null,
|
||||||
loading: task_loading,
|
dateRange?.startDate || null,
|
||||||
error: task_error,
|
|
||||||
refetch,
|
|
||||||
} = useTaskList(
|
|
||||||
selectedProject || null,
|
|
||||||
dateRange?.startDate || null,
|
|
||||||
dateRange?.endDate || null
|
dateRange?.endDate || null
|
||||||
);
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!selectedProject?.id && projectNames.length > 0) {
|
|
||||||
dispatch(setProjectId(projectNames[0].id));
|
|
||||||
}
|
|
||||||
|
|
||||||
}, [selectedProject, projectNames, dispatch]);
|
|
||||||
|
|
||||||
const [TaskLists, setTaskLists] = useState([]);
|
|
||||||
const [dates, setDates] = useState([]);
|
|
||||||
const popoverRefs = useRef([]);
|
|
||||||
|
|
||||||
|
// Ensure project is set
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (TaskList) {
|
if (!selectedProject && projectNames.length > 0) {
|
||||||
let filteredTasks = TaskList;
|
dispatch(setProjectId(projectNames[0].id));
|
||||||
|
|
||||||
if (filters.selectedBuilding) {
|
|
||||||
filteredTasks = filteredTasks.filter(
|
|
||||||
(task) =>
|
|
||||||
task?.workItem?.workArea?.floor?.building?.name ===
|
|
||||||
filters.selectedBuilding
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (filters.selectedFloors.length > 0) {
|
|
||||||
filteredTasks = filteredTasks?.filter((task) =>
|
|
||||||
filters.selectedFloors?.includes(
|
|
||||||
task?.workItem?.workArea?.floor?.floorName
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (filters.selectedActivities.length > 0) {
|
|
||||||
filteredTasks = filteredTasks.filter((task) =>
|
|
||||||
filters.selectedActivities.includes(
|
|
||||||
task?.workItem?.activityMaster?.activityName
|
|
||||||
)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
setTaskLists(filteredTasks);
|
|
||||||
} else {
|
|
||||||
setTaskLists([]);
|
|
||||||
}
|
}
|
||||||
}, [
|
}, [selectedProject, projectNames, dispatch]);
|
||||||
TaskList,
|
|
||||||
filters?.selectedBuilding,
|
|
||||||
filters?.selectedFloors,
|
|
||||||
filters?.selectedActivities,
|
|
||||||
]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
// Memoized filtering
|
||||||
const AssignmentDates = [
|
const filteredTasks = useMemo(() => {
|
||||||
...new Set(TaskLists.map((task) => task.assignmentDate.split("T")[0])),
|
if (!TaskList) return [];
|
||||||
].sort((a, b) => new Date(b) - new Date(a));
|
return TaskList.filter((task) => {
|
||||||
setDates(AssignmentDates);
|
const { selectedBuilding, selectedFloors, selectedActivities } = filters;
|
||||||
}, [TaskLists]);
|
|
||||||
|
|
||||||
const [selectedTask, selectTask] = useState(null);
|
if (selectedBuilding && task?.workItem?.workArea?.floor?.building?.name !== selectedBuilding) return false;
|
||||||
const [comments, setComment] = useState({ task: null, isActionAllow: false });
|
if (selectedFloors.length > 0 && !selectedFloors.includes(task?.workItem?.workArea?.floor?.floorName)) return false;
|
||||||
|
if (selectedActivities.length > 0 && !selectedActivities.includes(task?.workItem?.activityMaster?.activityName)) return false;
|
||||||
|
|
||||||
const [isModalOpen, setIsModalOpen] = useState(false);
|
return true;
|
||||||
const [isModalOpenComment, setIsModalOpenComment] = useState(false);
|
|
||||||
|
|
||||||
const openModal = () => setIsModalOpen(true);
|
|
||||||
const closeModal = () => setIsModalOpen(false);
|
|
||||||
|
|
||||||
const openComment = () => setIsModalOpenComment(true);
|
|
||||||
const closeCommentModal = () => setIsModalOpenComment(false);
|
|
||||||
const [IsSubTaskNeeded, setIsSubTaskNeeded] = useState(false);
|
|
||||||
const [SubTaskData, setSubTaskData] = useState();
|
|
||||||
const handletask = (task) => {
|
|
||||||
selectTask(task);
|
|
||||||
openModal();
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
popoverRefs.current.forEach((el) => {
|
|
||||||
if (el) {
|
|
||||||
new bootstrap.Popover(el, {
|
|
||||||
trigger: "focus",
|
|
||||||
placement: "left",
|
|
||||||
html: true,
|
|
||||||
content: el.getAttribute("data-bs-content"),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}, [dates, TaskLists]);
|
}, [TaskList, filters]);
|
||||||
|
|
||||||
|
// Memoized dates
|
||||||
|
const groupedTasks = useMemo(() => {
|
||||||
|
const groups = {};
|
||||||
|
filteredTasks.forEach((task) => {
|
||||||
|
const date = task.assignmentDate.split("T")[0];
|
||||||
|
if (!groups[date]) groups[date] = [];
|
||||||
|
groups[date].push(task);
|
||||||
|
});
|
||||||
|
return Object.keys(groups)
|
||||||
|
.sort((a, b) => new Date(b) - new Date(a))
|
||||||
|
.map((date) => ({ date, tasks: groups[date] }));
|
||||||
|
}, [filteredTasks]);
|
||||||
|
|
||||||
const handlecloseModal = () =>
|
// --- Modal State
|
||||||
{
|
const [modal, setModal] = useState({ type: null, data: null });
|
||||||
setIsModalOpen( false )
|
|
||||||
// refetch();
|
|
||||||
}
|
|
||||||
|
|
||||||
const handleCloseAction = (IsSubTask) => {
|
const openModal = (type, data = null) => setModal({ type, data });
|
||||||
if (IsSubTask) {
|
const closeModal = () => setModal({ type: null, data: null });
|
||||||
setIsSubTaskNeeded(true);
|
|
||||||
setIsModalOpenComment(false);
|
|
||||||
} else {
|
|
||||||
// refetch();
|
|
||||||
setIsModalOpenComment(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
const hanleCloseSubTask = () => {
|
|
||||||
setIsSubTaskNeeded(false);
|
|
||||||
setComment( null );
|
|
||||||
// refetch();
|
|
||||||
};
|
|
||||||
|
|
||||||
|
// --- Render helpers
|
||||||
|
const renderTeamMembers = (task, refIndex) => (
|
||||||
|
<div
|
||||||
|
key={refIndex}
|
||||||
|
tabIndex="0"
|
||||||
|
className="d-flex align-items-center avatar-group justify-content-center"
|
||||||
|
data-bs-toggle="popover"
|
||||||
|
data-bs-trigger="focus"
|
||||||
|
data-bs-placement="left"
|
||||||
|
data-bs-html="true"
|
||||||
|
data-bs-content={`
|
||||||
|
<div class="border border-secondary rounded custom-popover p-2 px-3">
|
||||||
|
${task.teamMembers
|
||||||
|
.map(
|
||||||
|
(m) => `
|
||||||
|
<div class="d-flex align-items-center gap-2 mb-2">
|
||||||
|
<div class="avatar avatar-xs">
|
||||||
|
<span class="avatar-initial rounded-circle bg-label-primary">
|
||||||
|
${m?.firstName?.charAt(0) || ""}${m?.lastName?.charAt(0) || ""}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<span>${m.firstName} ${m.lastName}</span>
|
||||||
|
</div>`
|
||||||
|
)
|
||||||
|
.join("")}
|
||||||
|
</div>
|
||||||
|
`}
|
||||||
|
>
|
||||||
|
{task.teamMembers.slice(0, 3).map((m) => (
|
||||||
|
<div key={m.id} className="avatar avatar-xs" title={`${m.firstName} ${m.lastName}`}>
|
||||||
|
<span className="avatar-initial rounded-circle bg-label-primary">
|
||||||
|
{m?.firstName.slice(0, 1)}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
{task.teamMembers.length > 3 && (
|
||||||
|
<div className="avatar avatar-xs" title={`${task.teamMembers.length - 3} more`}>
|
||||||
|
<span className="avatar-initial rounded-circle bg-label-secondary">+{task.teamMembers.length - 3}</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{isModalOpen && <GlobalModel isOpen={isModalOpen} size="md" closeModal={handlecloseModal} >
|
{/* --- Modals --- */}
|
||||||
<ReportTask
|
{modal.type === "report" && (
|
||||||
report={selectedTask}
|
<GlobalModel isOpen size="md" closeModal={closeModal}>
|
||||||
closeModal={handlecloseModal}
|
<ReportTask report={modal.data} closeModal={closeModal} />
|
||||||
// refetch={refetch}
|
</GlobalModel>
|
||||||
/>
|
)}
|
||||||
</GlobalModel>}
|
{modal.type === "comments" && (
|
||||||
|
<GlobalModel isOpen size="lg" closeModal={closeModal}>
|
||||||
{isModalOpenComment && (
|
|
||||||
<GlobalModel
|
|
||||||
isOpen={isModalOpenComment}
|
|
||||||
size="lg"
|
|
||||||
closeModal={() => setIsModalOpenComment(false)}
|
|
||||||
>
|
|
||||||
<ReportTaskComments
|
<ReportTaskComments
|
||||||
commentsData={comments.task}
|
commentsData={modal.data.task}
|
||||||
actionAllow={comments.isActionAllow}
|
actionAllow={modal.data.isActionAllow}
|
||||||
handleCloseAction={handleCloseAction}
|
handleCloseAction={(isSubTask) => {
|
||||||
closeModal={closeCommentModal}
|
if (isSubTask) openModal("subtask", modal.data.task);
|
||||||
|
else closeModal();
|
||||||
|
}}
|
||||||
|
closeModal={closeModal}
|
||||||
/>
|
/>
|
||||||
</GlobalModel>
|
</GlobalModel>
|
||||||
)}
|
)}
|
||||||
|
{modal.type === "subtask" && (
|
||||||
{IsSubTaskNeeded && (
|
<GlobalModel isOpen size="lg" closeModal={closeModal}>
|
||||||
<GlobalModel
|
<SubTask activity={modal.data} onClose={closeModal} />
|
||||||
isOpen={IsSubTaskNeeded}
|
|
||||||
size="lg"
|
|
||||||
closeModal={hanleCloseSubTask}
|
|
||||||
>
|
|
||||||
<SubTask activity={comments.task} onClose={hanleCloseSubTask} />
|
|
||||||
</GlobalModel>
|
</GlobalModel>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<div className="container-fluid">
|
<div className="container-fluid">
|
||||||
<Breadcrumb
|
<Breadcrumb data={[{ label: "Home", link: "/dashboard" }, { label: "Daily Progress Report" }]} />
|
||||||
data={[
|
|
||||||
{ label: "Home", link: "/dashboard" },
|
<div className="card card-action mb-6">
|
||||||
{ label: "Daily Progress Report", link: null },
|
|
||||||
]}
|
|
||||||
></Breadcrumb>
|
|
||||||
<div className="card card-action mb-6 ">
|
|
||||||
<div className="card-body p-1 p-sm-2">
|
<div className="card-body p-1 p-sm-2">
|
||||||
<div className="row d-flex justify-content-between align-items-center">
|
{!selectedProject && (<div className="text-center text-muted">Please Select Project</div>)}
|
||||||
<div className="col-md-12 d-flex align-items-center col-12 text-start mb-2 mb-md-0">
|
{/* --- Filters --- */}
|
||||||
<DateRangePicker
|
<div className="d-flex align-items-center mb-2">
|
||||||
onRangeChange={setDateRange}
|
<DateRangePicker onRangeChange={setDateRange} endDateMode="today" DateDifference="6" dateFormat="DD-MM-YYYY" />
|
||||||
endDateMode="today"
|
<FilterIcon
|
||||||
DateDifference="6"
|
taskListData={TaskList}
|
||||||
dateFormat="DD-MM-YYYY"
|
onApplyFilters={setFilters}
|
||||||
/>
|
currentSelectedBuilding={filters.selectedBuilding}
|
||||||
<FilterIcon
|
currentSelectedFloors={filters.selectedFloors}
|
||||||
taskListData={TaskList}
|
currentSelectedActivities={filters.selectedActivities}
|
||||||
onApplyFilters={setFilters}
|
/>
|
||||||
currentSelectedBuilding={filters.selectedBuilding}
|
|
||||||
currentSelectedFloors={filters.selectedFloors}
|
|
||||||
currentSelectedActivities={filters.selectedActivities}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* --- Table --- */}
|
||||||
<div className="table-responsive text-nowrap mt-3">
|
<div className="table-responsive text-nowrap mt-3">
|
||||||
<table className="table">
|
<table className="table">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Activity</th>
|
<th>Activity</th>
|
||||||
<th>Assigned </th>
|
<th>Assigned</th>
|
||||||
<th>Completed</th>
|
<th>Completed</th>
|
||||||
<th>Assign On</th>
|
<th>Assign On</th>
|
||||||
<th>Team</th>
|
<th>Team</th>
|
||||||
<th>Actions</th>
|
<th>Actions</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody className="table-border-bottom-0">
|
<tbody>
|
||||||
{/* --- Spinner when tasks are loading --- */}
|
{taskLoading && (
|
||||||
{task_loading && (
|
|
||||||
<tr>
|
<tr>
|
||||||
<td colSpan={6} className="text-center">
|
<td colSpan={6} className="text-center">
|
||||||
{" "}
|
<Loader/>
|
||||||
<div className="mt-10 mb-10 pt-5 pb-10">
|
|
||||||
<div
|
|
||||||
className="spinner-border text-primary"
|
|
||||||
role="status"
|
|
||||||
>
|
|
||||||
<span className="visually-hidden">Loading...</span>
|
|
||||||
</div>
|
|
||||||
<p className="mt-2">Loading Tasks...</p>
|
|
||||||
</div>
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
)}
|
)}
|
||||||
{!task_loading &&
|
{!taskLoading && groupedTasks.length === 0 && (
|
||||||
TaskLists.length === 0 && (
|
<tr>
|
||||||
<tr>
|
<td colSpan={6} className="text-center">No Reports Found</td>
|
||||||
<td colSpan={6} className="text-center">
|
</tr>
|
||||||
<div className="mt-10 mb-10 pt-10 pb-10">
|
)}
|
||||||
{" "}
|
{!taskLoading &&
|
||||||
<p>No Reports Found</p>
|
groupedTasks.map(({ date, tasks }) => (
|
||||||
</div>
|
<React.Fragment key={date}>
|
||||||
</td>
|
<tr className="table-row-header text-start">
|
||||||
</tr>
|
<td colSpan={6}><strong>{formatUTCToLocalTime(date)}</strong></td>
|
||||||
)}
|
</tr>
|
||||||
{!task_loading &&
|
{tasks.map((task, idx) => (
|
||||||
TaskLists.length > 0 &&
|
<tr key={task.id || idx}>
|
||||||
dates.map((date, i) => {
|
<td className="flex-wrap text-start">
|
||||||
const tasksForDate = TaskLists.filter((task) =>
|
<div>{task.workItem.activityMaster?.activityName || "No Activity Name"}</div>
|
||||||
task.assignmentDate.includes(date)
|
<div className="text-sm">
|
||||||
);
|
{task.workItem.workArea?.floor?.building?.name} › {task.workItem.workArea?.floor?.floorName} › {task.workItem.workArea?.areaName}
|
||||||
if (tasksForDate.length === 0) return null;
|
</div>
|
||||||
|
</td>
|
||||||
return (
|
<td>{formatNumber(task.plannedTask)} / {formatNumber(task.workItem.plannedWork - task.workItem.completedWork)}</td>
|
||||||
<React.Fragment key={i}>
|
<td>{task.completedTask}</td>
|
||||||
<tr className="table-row-header">
|
<td>{formatUTCToLocalTime(task.assignmentDate)}</td>
|
||||||
<td colSpan={6} className="text-start">
|
<td className="text-center">{renderTeamMembers(task, idx)}</td>
|
||||||
{" "}
|
<td className="text-center">
|
||||||
<strong>
|
<div className="d-flex justify-content-end gap-2">
|
||||||
{moment(date).format("DD-MM-YYYY")}
|
{ReportTaskRights && !task.reportedDate && (
|
||||||
</strong>
|
<button className="btn btn-xs btn-primary" onClick={() => openModal("report", task)}>Report</button>
|
||||||
|
)}
|
||||||
|
{ApprovedTaskRights && task.reportedDate && !task.approvedBy && (
|
||||||
|
<button className="btn btn-xs btn-warning" onClick={() => openModal("comments", { task, isActionAllow: true })}>QC</button>
|
||||||
|
)}
|
||||||
|
<button className="btn btn-xs btn-primary" onClick={() => openModal("comments", { task, isActionAllow: false })}>Comment</button>
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
{tasksForDate.map((task, index) => {
|
))}
|
||||||
const refIndex = index * 10 + i;
|
</React.Fragment>
|
||||||
return (
|
))}
|
||||||
<React.Fragment key={refIndex}>
|
|
||||||
<tr>
|
|
||||||
<td className="flex-wrap text-start">
|
|
||||||
<div>
|
|
||||||
{task.workItem.activityMaster
|
|
||||||
.activityName || "No Activity Name"}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label className="col-form-label text-sm">
|
|
||||||
{" "}
|
|
||||||
{
|
|
||||||
task?.workItem?.workArea?.floor
|
|
||||||
?.building?.name
|
|
||||||
}{" "}
|
|
||||||
<i
|
|
||||||
className="bx bx-chevron-right text-sm"
|
|
||||||
style={{ fontSize: ".75rem" }}
|
|
||||||
></i>{" "}
|
|
||||||
{
|
|
||||||
task?.workItem?.workArea?.floor
|
|
||||||
?.floorName
|
|
||||||
}{" "}
|
|
||||||
<i
|
|
||||||
className="bx bx-chevron-right text-sm"
|
|
||||||
style={{ fontSize: ".75rem" }}
|
|
||||||
>
|
|
||||||
{" "}
|
|
||||||
</i>
|
|
||||||
{task?.workItem?.workArea?.areaName}
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
{formatNumber(task.plannedTask)} / {formatNumber(task.workItem.plannedWork - task.workItem.completedWork)}
|
|
||||||
</td>
|
|
||||||
<td>{task.completedTask}</td>
|
|
||||||
<td>
|
|
||||||
{moment(task.assignmentDate).format(
|
|
||||||
"DD-MM-YYYY"
|
|
||||||
)}
|
|
||||||
</td>
|
|
||||||
<td className="text-center">
|
|
||||||
<div
|
|
||||||
key={refIndex}
|
|
||||||
ref={(el) =>
|
|
||||||
(popoverRefs.current[refIndex] = el)
|
|
||||||
}
|
|
||||||
tabIndex="0"
|
|
||||||
className="d-flex align-items-center avatar-group justify-content-center"
|
|
||||||
data-bs-toggle="popover"
|
|
||||||
data-bs-trigger="focus"
|
|
||||||
data-bs-placement="left"
|
|
||||||
data-bs-html="true"
|
|
||||||
data-bs-content={`
|
|
||||||
<div class="border border-secondary rounded custom-popover p-2 px-3">
|
|
||||||
${task.teamMembers
|
|
||||||
.map(
|
|
||||||
(member) => `
|
|
||||||
<div class="d-flex align-items-center gap-2 mb-2">
|
|
||||||
<div class="avatar avatar-xs">
|
|
||||||
<span class="avatar-initial rounded-circle bg-label-primary">
|
|
||||||
${
|
|
||||||
member?.firstName?.charAt(
|
|
||||||
0
|
|
||||||
) || ""
|
|
||||||
}${
|
|
||||||
member?.lastName?.charAt(0) || ""
|
|
||||||
}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<span>${member.firstName} ${
|
|
||||||
member.lastName
|
|
||||||
}</span>
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
)
|
|
||||||
.join("")}
|
|
||||||
</div>
|
|
||||||
`}
|
|
||||||
>
|
|
||||||
{task.teamMembers
|
|
||||||
.slice(0, 3)
|
|
||||||
.map((member) => (
|
|
||||||
<div
|
|
||||||
key={member.id}
|
|
||||||
data-bs-toggle="tooltip"
|
|
||||||
data-bs-html="true"
|
|
||||||
data-popup="tooltip-custom"
|
|
||||||
data-bs-placement="top"
|
|
||||||
title={`${member.firstName} ${member.lastName}`}
|
|
||||||
className="avatar avatar-xs"
|
|
||||||
>
|
|
||||||
<span className="avatar-initial rounded-circle bg-label-primary">
|
|
||||||
{member?.firstName.slice(0, 1)}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
{task.teamMembers.length > 3 && (
|
|
||||||
<div
|
|
||||||
className="avatar avatar-xs"
|
|
||||||
data-bs-toggle="tooltip"
|
|
||||||
data-bs-placement="bottom"
|
|
||||||
title={`${
|
|
||||||
task.teamMembers.length - 3
|
|
||||||
} more`}
|
|
||||||
>
|
|
||||||
<span className="avatar-initial rounded-circle bg-label-secondary pull-up">
|
|
||||||
+ {task.teamMembers.length - 3}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
<td className="text-center">
|
|
||||||
<div className="d-flex justify-content-end">
|
|
||||||
{ ReportTaskRights &&
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className={`btn btn-xs btn-primary ${
|
|
||||||
task.reportedDate != null
|
|
||||||
? "d-none"
|
|
||||||
: ""
|
|
||||||
}`}
|
|
||||||
onClick={() => {
|
|
||||||
selectTask(task);
|
|
||||||
openModal();
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
Report
|
|
||||||
</button>
|
|
||||||
}
|
|
||||||
{(ApprovedTaskRights && task.reportedDate ) && (
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className={`btn btn-xs btn-warning ${
|
|
||||||
task.reportedDate && task.approvedBy
|
|
||||||
? "d-none"
|
|
||||||
: ""
|
|
||||||
}`}
|
|
||||||
onClick={() => {
|
|
||||||
setComment({
|
|
||||||
task: task,
|
|
||||||
isActionAllow: true,
|
|
||||||
});
|
|
||||||
openComment();
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
QC
|
|
||||||
</button>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="btn btn-xs btn-primary ms-2"
|
|
||||||
onClick={() => {
|
|
||||||
setComment({
|
|
||||||
task: task,
|
|
||||||
isActionAllow: false,
|
|
||||||
});
|
|
||||||
openComment();
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
Comment
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</React.Fragment>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</React.Fragment>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
import React,{useEffect} from "react";
|
import React,{useEffect,useRef} from "react";
|
||||||
import Breadcrumb from "../../components/common/Breadcrumb";
|
import Breadcrumb from "../../components/common/Breadcrumb";
|
||||||
import InfraPlanning from "../../components/Activities/InfraPlanning";
|
import InfraPlanning from "../../components/Activities/InfraPlanning";
|
||||||
import { useProjectName } from "../../hooks/useProjects";
|
import { useProjectName } from "../../hooks/useProjects";
|
||||||
@ -6,33 +6,34 @@ import { useDispatch, useSelector } from "react-redux";
|
|||||||
import { setProjectId } from "../../slices/localVariablesSlice";
|
import { setProjectId } from "../../slices/localVariablesSlice";
|
||||||
import { useSelectedproject } from "../../slices/apiDataManager";
|
import { useSelectedproject } from "../../slices/apiDataManager";
|
||||||
|
|
||||||
|
|
||||||
const TaskPlannng = () => {
|
const TaskPlannng = () => {
|
||||||
// const selectedProject = useSelector(
|
|
||||||
// (store) => store.localVariables.projectId
|
|
||||||
// );
|
|
||||||
const selectedProject = useSelectedproject();
|
const selectedProject = useSelectedproject();
|
||||||
|
const dispatch = useDispatch();
|
||||||
|
const { projectNames, loading: projectLoading } = useProjectName();
|
||||||
|
|
||||||
|
const initialized = useRef(false);
|
||||||
|
|
||||||
const dispatch = useDispatch()
|
|
||||||
const { projectNames, loading: projectLoading, fetchData } = useProjectName();
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if(selectedProject == null){
|
if (!initialized.current && projectNames.length > 0 && !selectedProject?.id) {
|
||||||
dispatch(setProjectId(projectNames[0]?.id));
|
dispatch(setProjectId(projectNames[0].id));
|
||||||
}
|
initialized.current = true;
|
||||||
},[])
|
}
|
||||||
|
}, [projectNames, selectedProject, dispatch]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<div className="container-fluid">
|
||||||
<div className="container-fluid">
|
<Breadcrumb
|
||||||
<Breadcrumb
|
data={[
|
||||||
data={[
|
{ label: "Home", link: "/dashboard" },
|
||||||
{ label: "Home", link: "/dashboard" },
|
{ label: "Daily Task Planning" },
|
||||||
{ label: "Daily Task Planning" }
|
]}
|
||||||
]}
|
/>
|
||||||
></Breadcrumb>
|
{selectedProject ? (
|
||||||
<InfraPlanning/>
|
<InfraPlanning />
|
||||||
</div>
|
) : (
|
||||||
</>
|
<div className="text-center">Please Select Project</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user