diff --git a/client/src/components/ProjectCard.tsx b/client/src/components/ProjectCard.tsx index 600767c..004a6a1 100644 --- a/client/src/components/ProjectCard.tsx +++ b/client/src/components/ProjectCard.tsx @@ -13,6 +13,8 @@ interface IProps { link?: string; members?: User[]; progress?: number; + ticketsNumber?: number; + ticketsDone?: number; } const useStyles = makeStyles((theme: Theme) => @@ -29,6 +31,8 @@ const ProjectCard: FC = ({ link = "#", members, progress = 0, + ticketsNumber, + ticketsDone, }) => { const classes = useStyles(); @@ -37,7 +41,11 @@ const ProjectCard: FC = ({ <> {members && }
- +
); diff --git a/client/src/components/ProjectList.tsx b/client/src/components/ProjectList.tsx index d9720b6..878b5f2 100644 --- a/client/src/components/ProjectList.tsx +++ b/client/src/components/ProjectList.tsx @@ -71,6 +71,12 @@ export const ProjectList: FC = ({ projects }) => { link={`/projects/${t.id}`} members={t.users} progress={t.progression} + ticketsNumber={t.tickets === undefined ? 0 : t.tickets.length} + ticketsDone={ + t.tickets === undefined + ? 0 + : t.tickets.filter((t) => t.status === "Done").length + } /> )) )} diff --git a/client/src/components/ProjectTabPanel.tsx b/client/src/components/ProjectTabPanel.tsx index 6f90e8f..7d241c3 100644 --- a/client/src/components/ProjectTabPanel.tsx +++ b/client/src/components/ProjectTabPanel.tsx @@ -105,9 +105,9 @@ export const ProjectTabPanel: FC = ({ - + {/* - + */} ); diff --git a/client/src/pages/ProjectPage.tsx b/client/src/pages/ProjectPage.tsx index ee3cea3..91f28a7 100644 --- a/client/src/pages/ProjectPage.tsx +++ b/client/src/pages/ProjectPage.tsx @@ -38,7 +38,7 @@ export const ProjectPage: FC = ({ viewModel }) => { allProjects, } = viewModel; - const tabNames: string[] = ["Tickets", "Files"]; //, "Activity"]; + const tabNames: string[] = ["Tickets"]; //, "Files", "Activity"]; const [showModal, setShowModal] = useState(false); const classes = useStyles();