fix user name not displayed correctly for employee users in reporting

This commit is contained in:
Gregor Vostrak
2025-05-15 12:54:30 +02:00
parent 16fed4a2b7
commit 46dea00b34
2 changed files with 13 additions and 1 deletions

View File

@@ -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;

View File

@@ -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,
};