diff --git a/resources/js/utils/useReporting.ts b/resources/js/utils/useReporting.ts index 24c8e7ca..24f84515 100644 --- a/resources/js/utils/useReporting.ts +++ b/resources/js/utils/useReporting.ts @@ -6,7 +6,11 @@ import type { AggregatedTimeEntriesQueryParams, ReportingResponse, } from '@/packages/api/src'; -import { getCurrentOrganizationId } from '@/utils/useUser'; +import { + getCurrentOrganizationId, + getCurrentRole, + getCurrentUser, +} from '@/utils/useUser'; import { useNotificationsStore } from '@/utils/notification'; import { useProjectsStore } from '@/utils/useProjects'; import { useMembersStore } from '@/utils/useMembers'; @@ -106,6 +110,9 @@ export const useReportingStore = defineStore('reporting', () => { return projects.value.find((project) => project.id === key)?.name; } if (type === 'user') { + if (getCurrentRole() === 'employee') { + return getCurrentUser().name; + } const memberStore = useMembersStore(); const { members } = storeToRefs(memberStore); return members.value.find((member) => member.user_id === key)?.name; diff --git a/resources/js/utils/useUser.ts b/resources/js/utils/useUser.ts index 1cd13cd6..46842c7d 100644 --- a/resources/js/utils/useUser.ts +++ b/resources/js/utils/useUser.ts @@ -10,6 +10,10 @@ function getCurrentUserId() { return page.props.auth.user.id; } +function getCurrentUser() { + return page.props.auth.user; +} + function getCurrentOrganizationId() { return page.props.auth.user.current_team_id; } @@ -31,4 +35,5 @@ export { getCurrentUserId, getCurrentMembershipId, getCurrentRole, + getCurrentUser, };