Compare commits
No commits in common. "b502b6b31e48fe3540ea2df04a89c557a7321570" and "2425387d8e97e160c923e3f3605b3c5dd0d4edaa" have entirely different histories.
b502b6b31e
...
2425387d8e
@ -91,6 +91,7 @@ const isTaskPlanning = /^\/activities\/task$/.test(location.pathname);
|
|||||||
|
|
||||||
const handleSubmit = async () => {
|
const handleSubmit = async () => {
|
||||||
let WorkItemId = workItem.workItemId || workItem.id;
|
let WorkItemId = workItem.workItemId || workItem.id;
|
||||||
|
debugger
|
||||||
DeleteTask({
|
DeleteTask({
|
||||||
workItemId: WorkItemId,
|
workItemId: WorkItemId,
|
||||||
workAreaId: forWorkArea?.id,
|
workAreaId: forWorkArea?.id,
|
||||||
|
|||||||
@ -14,8 +14,6 @@ import {
|
|||||||
getProjectStatusName,
|
getProjectStatusName,
|
||||||
} from "../../utils/projectStatus";
|
} from "../../utils/projectStatus";
|
||||||
import GlobalModel from "../common/GlobalModel";
|
import GlobalModel from "../common/GlobalModel";
|
||||||
import { useDispatch } from "react-redux";
|
|
||||||
import { setProjectId } from "../../slices/localVariablesSlice";
|
|
||||||
|
|
||||||
const ProjectCard = ({ projectData, recall }) => {
|
const ProjectCard = ({ projectData, recall }) => {
|
||||||
const [ projectInfo, setProjectInfo ] = useState( projectData );
|
const [ projectInfo, setProjectInfo ] = useState( projectData );
|
||||||
@ -23,7 +21,6 @@ const ProjectCard = ({ projectData, recall }) => {
|
|||||||
projectInfo?.id,false
|
projectInfo?.id,false
|
||||||
);
|
);
|
||||||
const [showModal, setShowModal] = useState(false);
|
const [showModal, setShowModal] = useState(false);
|
||||||
const dispatch = useDispatch()
|
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const ManageProject = useHasUserPermission(MANAGE_PROJECT);
|
const ManageProject = useHasUserPermission(MANAGE_PROJECT);
|
||||||
const {
|
const {
|
||||||
@ -60,7 +57,6 @@ const ProjectCard = ({ projectData, recall }) => {
|
|||||||
const handleClose = () => setShowModal(false);
|
const handleClose = () => setShowModal(false);
|
||||||
|
|
||||||
const handleViewProject = () => {
|
const handleViewProject = () => {
|
||||||
dispatch(setProjectId(projectInfo.id))
|
|
||||||
navigate(`/projects/details`);
|
navigate(`/projects/details`);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -20,12 +20,9 @@ import showToast from "../../services/toastService";
|
|||||||
import { getCachedData, cacheData } from "../../slices/apiDataManager";
|
import { getCachedData, cacheData } from "../../slices/apiDataManager";
|
||||||
import GlobalModel from "../../components/common/GlobalModel";
|
import GlobalModel from "../../components/common/GlobalModel";
|
||||||
import {formatNumber} from "../../utils/dateUtils";
|
import {formatNumber} from "../../utils/dateUtils";
|
||||||
import { setProjectId } from "../../slices/localVariablesSlice";
|
|
||||||
import { useDispatch } from "react-redux";
|
|
||||||
|
|
||||||
const ProjectListView = ({ projectData, recall }) => {
|
const ProjectListView = ({ projectData, recall }) => {
|
||||||
const [projectInfo, setProjectInfo] = useState(projectData);
|
const [projectInfo, setProjectInfo] = useState(projectData);
|
||||||
const dispatch = useDispatch()
|
|
||||||
const { projects_Details, loading, error, refetch } = useProjectDetails(
|
const { projects_Details, loading, error, refetch } = useProjectDetails(
|
||||||
projectInfo?.id,false
|
projectInfo?.id,false
|
||||||
);
|
);
|
||||||
@ -92,10 +89,7 @@ const ProjectListView = ({ projectData, recall }) => {
|
|||||||
<td className="text-start" colSpan={5}>
|
<td className="text-start" colSpan={5}>
|
||||||
<span
|
<span
|
||||||
className="text-primary cursor-pointer"
|
className="text-primary cursor-pointer"
|
||||||
onClick={() => {
|
onClick={() => navigate(`/projects/details`)}
|
||||||
dispatch(setProjectId(projectInfo.id))
|
|
||||||
navigate(`/projects/details`)
|
|
||||||
}}
|
|
||||||
>
|
>
|
||||||
{projectInfo.shortName
|
{projectInfo.shortName
|
||||||
? `${projectInfo.name} (${projectInfo.shortName})`
|
? `${projectInfo.name} (${projectInfo.shortName})`
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user