+
-
- {t('pages.maintenance.HEADING_TITLE')}
-
+ Maintenance
-
+
+ {t('pages.maintenance.HEADING_TITLE')}
+
+
+
{t('pages.maintenance.HEADING_DESCRIPTION')}
diff --git a/apps/web/lib/features/activity/user-worked-task.tsx b/apps/web/lib/features/activity/user-worked-task.tsx
new file mode 100644
index 000000000..f34300099
--- /dev/null
+++ b/apps/web/lib/features/activity/user-worked-task.tsx
@@ -0,0 +1,76 @@
+import { OT_Member } from '@app/interfaces';
+import { memo } from 'react';
+import { TaskCard } from '../task/task-card';
+import { useUserSelectedPage } from '@app/hooks/features/useUserSelectedPage';
+import { useTaskFilter } from '../task/task-filters';
+import { Divider, Text } from 'lib/components';
+import { useTranslations } from 'next-intl';
+import { useAuthenticateUser } from '@app/hooks';
+
+const UserWorkedTaskTab = ({ member }: { member?: OT_Member }) => {
+ const profile = useUserSelectedPage(member?.employee?.userId);
+ const hook = useTaskFilter(profile);
+ const { user } = useAuthenticateUser();
+
+ const t = useTranslations();
+
+ const tasks = hook.tasksFiltered;
+ const canSeeActivity = profile.userProfile?.id === user?.id || user?.role?.name?.toUpperCase() == 'MANAGER';
+ const otherTasks = tasks.filter((t) =>
+ profile.member?.running == true ? t.id !== profile.activeUserTeamTask?.id : t
+ );
+
+ return (
+
+ {profile.activeUserTeamTask && canSeeActivity && (
+
+ )}
+
+ {otherTasks.length > 0 && canSeeActivity && (
+
+
+ {t('common.LAST_24_HOURS')} ({otherTasks.length})
+
+
+
+ )}
+
+
+ {canSeeActivity &&
+ otherTasks.map((task) => {
+ return (
+ -
+
+
+ );
+ })}
+
+
+ );
+};
+
+export default memo(UserWorkedTaskTab);
diff --git a/apps/web/lib/features/team/user-team-card/index.tsx b/apps/web/lib/features/team/user-team-card/index.tsx
index e5b292cc0..aeeddd508 100644
--- a/apps/web/lib/features/team/user-team-card/index.tsx
+++ b/apps/web/lib/features/team/user-team-card/index.tsx
@@ -18,8 +18,6 @@ import React from 'react';
import UserTeamActivity from './user-team-card-activity';
import { CollapseUpIcon, ExpandIcon } from '@components/ui/svgs/expand';
import { activityTypeState } from '@app/stores/activity-type';
-import { useUserProfilePage } from '@app/hooks';
-import { useTaskFilter } from 'lib/features/task/task-filters';
type IUserTeamCard = {
active?: boolean;
@@ -50,9 +48,6 @@ export function UserTeamCard({
const memberInfo = useTeamMemberCard(member);
const taskEdition = useTMCardTaskEdit(memberInfo.memberTask);
- const profile = useUserProfilePage();
- const hook = useTaskFilter(profile);
-
const { collaborativeSelect, user_selected, onUserSelect } = useCollaborative(memberInfo.memberUser);
const seconds = useRecoilValue(timerSecondsState);
@@ -193,7 +188,7 @@ export function UserTeamCard({
{/* Card menu */}
{menu}
-