Prepared for tcikets info

This commit is contained in:
Ruidy Nemausat 2020-04-17 14:07:33 +02:00
parent 5d5549e1ba
commit 3bf705f036
4 changed files with 18 additions and 4 deletions

View file

@ -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<IProps> = ({
link = "#",
members,
progress = 0,
ticketsNumber,
ticketsDone,
}) => {
const classes = useStyles();
@ -37,7 +41,11 @@ const ProjectCard: FC<IProps> = ({
<>
{members && <AvatarList users={members} />}
<div className={classes.progress}>
<ProgressInfo remainingDays={getRemainingdays(remainingDays)} />
<ProgressInfo
remainingDays={getRemainingdays(remainingDays)}
tasksDone={ticketsDone}
tasksTotalCount={ticketsNumber}
/>
</div>
</>
);

View file

@ -71,6 +71,12 @@ export const ProjectList: FC<IProps> = ({ 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
}
/>
))
)}

View file

@ -105,9 +105,9 @@ export const ProjectTabPanel: FC<IProps> = ({
<TabPanel value={value} index={0} dir={theme.direction}>
<TicketList tickets={tickets} allProjects={[]} addButton={true} />
</TabPanel>
<TabPanel value={value} index={1} dir={theme.direction}>
{/* <TabPanel value={value} index={1} dir={theme.direction}>
<FileList files={files} />
</TabPanel>
</TabPanel> */}
</SwipeableViews>
</div>
);

View file

@ -38,7 +38,7 @@ export const ProjectPage: FC<IProps> = ({ viewModel }) => {
allProjects,
} = viewModel;
const tabNames: string[] = ["Tickets", "Files"]; //, "Activity"];
const tabNames: string[] = ["Tickets"]; //, "Files", "Activity"];
const [showModal, setShowModal] = useState<boolean>(false);
const classes = useStyles();