expand sub tasks
This commit is contained in:
@@ -13,7 +13,7 @@ import ProjectTimelineModal from '@/features/schedule/ProjectTimelineModal';
|
||||
const GranttChart = React.forwardRef(({ type, date }: { type: string; date: Date }, ref) => {
|
||||
const [expandedProject, setExpandedProject] = useState<string | null>(null);
|
||||
const [isModalOpen, setIsModalOpen] = useState(false);
|
||||
const [selectedProjectId, setSelectedProjectId] = useState<string|undefined>(undefined);
|
||||
const [selectedProjectId, setSelectedProjectId] = useState<string | undefined>(undefined);
|
||||
|
||||
const { teamData } = useAppSelector(state => state.scheduleReducer);
|
||||
const { dateList, loading, dayCount } = useAppSelector(state => state.scheduleReducer);
|
||||
@@ -217,7 +217,13 @@ const GranttChart = React.forwardRef(({ type, date }: { type: string; date: Date
|
||||
{expandedProject === member.id && (
|
||||
<div>
|
||||
<Popover
|
||||
content={<ProjectTimelineModal memberId={member?.team_member_id} projectId={selectedProjectId} setIsModalOpen={setIsModalOpen} />}
|
||||
content={
|
||||
<ProjectTimelineModal
|
||||
memberId={member?.team_member_id}
|
||||
projectId={selectedProjectId}
|
||||
setIsModalOpen={setIsModalOpen}
|
||||
/>
|
||||
}
|
||||
trigger={'click'}
|
||||
open={isModalOpen}
|
||||
></Popover>
|
||||
|
||||
@@ -2,7 +2,10 @@ import { Badge, Button, Flex, Tooltip } from 'antd';
|
||||
import React, { useCallback } from 'react';
|
||||
import { useAppSelector } from '@/hooks/useAppSelector';
|
||||
import CustomAvatar from '../../CustomAvatar';
|
||||
import { fetchMemberProjects, toggleScheduleDrawer } from '../../../features/schedule/scheduleSlice';
|
||||
import {
|
||||
fetchMemberProjects,
|
||||
toggleScheduleDrawer,
|
||||
} from '../../../features/schedule/scheduleSlice';
|
||||
import { CaretDownOutlined, CaretRightFilled } from '@ant-design/icons';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { useAppDispatch } from '@/hooks/useAppDispatch';
|
||||
@@ -37,12 +40,10 @@ const GranttMembersTable = React.memo(
|
||||
|
||||
const handleToggleProject = useCallback(
|
||||
(id: string) => {
|
||||
if(expandedProject != id) {
|
||||
|
||||
if (expandedProject != id) {
|
||||
dispatch(fetchMemberProjects({ id }));
|
||||
}
|
||||
setExpandedProject(expandedProject === id ? null : id);
|
||||
|
||||
},
|
||||
[expandedProject, setExpandedProject]
|
||||
);
|
||||
|
||||
@@ -68,7 +68,13 @@ const ProjectTimelineBar = ({
|
||||
|
||||
return (
|
||||
<Popover
|
||||
content={<ProjectTimelineModal defaultData={defaultData} projectId={project?.id} setIsModalOpen={setIsModalOpen} />}
|
||||
content={
|
||||
<ProjectTimelineModal
|
||||
defaultData={defaultData}
|
||||
projectId={project?.id}
|
||||
setIsModalOpen={setIsModalOpen}
|
||||
/>
|
||||
}
|
||||
trigger={'click'}
|
||||
open={isModalOpen}
|
||||
>
|
||||
@@ -127,7 +133,10 @@ const ProjectTimelineBar = ({
|
||||
align="center"
|
||||
justify="center"
|
||||
style={{ width: '100%' }}
|
||||
onClick={() => {setIsModalOpen(true);dispatch(getWorking());}}
|
||||
onClick={() => {
|
||||
setIsModalOpen(true);
|
||||
dispatch(getWorking());
|
||||
}}
|
||||
>
|
||||
<Typography.Text
|
||||
style={{
|
||||
|
||||
Reference in New Issue
Block a user