- {imageLength > 0 ? (
-
- {images.map((image: ImageOverlapperProps, index: number) => {
- if (index < numberOfImagesDisplayed) {
- return (
-
-
-
-
-
- );
- }
- })}
- {images.length > numberOfImagesDisplayed && (
+
+ {firstArray.map((image, index) => (
+
+
+
+
+
+
+
+ ))}
+ {secondArray.length > 0 && (
+
+
- {imageLength - numberOfImagesDisplayed < 100 ? imageLength - numberOfImagesDisplayed : 99}+
+ {secondArray.length < 100 ? secondArray.length : 99}+
+
+
+
+
+ {secondArray.map((image: ImageOverlapperProps, index: number) => {
+ return (
+
+
+
+ );
+ })}
- ) : (
-
+
+
)}
);
diff --git a/apps/web/lib/components/kanban-card.tsx b/apps/web/lib/components/kanban-card.tsx
index 66a8a788e..ff3c1aa71 100644
--- a/apps/web/lib/components/kanban-card.tsx
+++ b/apps/web/lib/components/kanban-card.tsx
@@ -6,17 +6,17 @@ import {
useCollaborative,
useOrganizationTeams,
useTMCardTaskEdit,
- useTeamMemberCard,
- useTimerView
+ useTaskStatistics,
+ useTeamMemberCard
} from '@app/hooks';
import ImageComponent, { ImageOverlapperProps } from './image-overlapper';
import { TaskInput, TaskIssueStatus } from 'lib/features';
import Link from 'next/link';
import CircularProgress from '@components/ui/svgs/circular-progress';
import { HorizontalSeparator } from './separator';
-import { pad } from '@app/helpers';
-import { TaskStatus } from '@app/constants';
+import { secondsToTime } from '@app/helpers';
import { UserTeamCardMenu } from 'lib/features/team/user-team-card/user-team-card-menu';
+import { TaskStatus } from '@app/constants';
function getStyle(provided: DraggableProvided, style: any) {
if (!style) {
@@ -118,23 +118,31 @@ type ItemProps = {
isClone: boolean;
index: number;
};
+
/**
- * card that represent each task
+ * Card that represents each task
* @param props
* @returns
*/
export default function Item(props: ItemProps) {
- const { item, isDragging, provided, style, index } = props;
-
- const { hours, minutes, seconds } = useTimerView();
+ const { item, isDragging, provided, style, index } = props;
const { activeTeam } = useOrganizationTeams();
const { user } = useAuthenticateUser();
+ const { getEstimation } = useTaskStatistics(0);
const members = activeTeam?.members || [];
const currentUser = members.find((m) => m.employee.userId === user?.id);
+ let totalWorkedTasksTimer = 0;
+ activeTeam?.members?.forEach((member) => {
+ const totalWorkedTasks = member?.totalWorkedTasks?.find((i) => i.id === item?.id) || null;
+ if (totalWorkedTasks) {
+ totalWorkedTasksTimer += totalWorkedTasks.duration;
+ }
+ });
const memberInfo = useTeamMemberCard(currentUser);
const taskEdition = useTMCardTaskEdit(memberInfo.memberTask);
+
const taskAssignee: ImageOverlapperProps[] = item.members.map((member: any) => {
return {
id: member.user.id,
@@ -145,7 +153,22 @@ export default function Item(props: ItemProps) {
const { collaborativeSelect } = useCollaborative(memberInfo.memberUser);
const menu = <>{!collaborativeSelect &&
};
+ const progress = getEstimation(
+ null,
+ item,
+ totalWorkedTasksTimer || 1,
+ item.estimate || 0
+ );
+ const currentMember = activeTeam?.members.find((member) => member.id === memberInfo.member?.id || item?.id);
+ const { h, m, s } = secondsToTime(
+ (currentMember?.totalWorkedTasks &&
+ currentMember?.totalWorkedTasks?.length &&
+ currentMember?.totalWorkedTasks
+ .filter((t) => t.id === item?.id)
+ .reduce((previousValue, currentValue) => previousValue + currentValue.duration, 0)) ||
+ 0
+ );
return (
{
+ // TODO: implement
console.log(e);
}}
onEnterKey={() => {
@@ -216,32 +240,31 @@ export default function Item(props: ItemProps) {
)}