mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-08-17 12:42:15 +01:00
fix user name not displayed correctly for employee users in reporting
This commit is contained in:
@@ -6,7 +6,11 @@ import type {
|
|||||||
AggregatedTimeEntriesQueryParams,
|
AggregatedTimeEntriesQueryParams,
|
||||||
ReportingResponse,
|
ReportingResponse,
|
||||||
} from '@/packages/api/src';
|
} from '@/packages/api/src';
|
||||||
import { getCurrentOrganizationId } from '@/utils/useUser';
|
import {
|
||||||
|
getCurrentOrganizationId,
|
||||||
|
getCurrentRole,
|
||||||
|
getCurrentUser,
|
||||||
|
} from '@/utils/useUser';
|
||||||
import { useNotificationsStore } from '@/utils/notification';
|
import { useNotificationsStore } from '@/utils/notification';
|
||||||
import { useProjectsStore } from '@/utils/useProjects';
|
import { useProjectsStore } from '@/utils/useProjects';
|
||||||
import { useMembersStore } from '@/utils/useMembers';
|
import { useMembersStore } from '@/utils/useMembers';
|
||||||
@@ -106,6 +110,9 @@ export const useReportingStore = defineStore('reporting', () => {
|
|||||||
return projects.value.find((project) => project.id === key)?.name;
|
return projects.value.find((project) => project.id === key)?.name;
|
||||||
}
|
}
|
||||||
if (type === 'user') {
|
if (type === 'user') {
|
||||||
|
if (getCurrentRole() === 'employee') {
|
||||||
|
return getCurrentUser().name;
|
||||||
|
}
|
||||||
const memberStore = useMembersStore();
|
const memberStore = useMembersStore();
|
||||||
const { members } = storeToRefs(memberStore);
|
const { members } = storeToRefs(memberStore);
|
||||||
return members.value.find((member) => member.user_id === key)?.name;
|
return members.value.find((member) => member.user_id === key)?.name;
|
||||||
|
|||||||
@@ -10,6 +10,10 @@ function getCurrentUserId() {
|
|||||||
return page.props.auth.user.id;
|
return page.props.auth.user.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getCurrentUser() {
|
||||||
|
return page.props.auth.user;
|
||||||
|
}
|
||||||
|
|
||||||
function getCurrentOrganizationId() {
|
function getCurrentOrganizationId() {
|
||||||
return page.props.auth.user.current_team_id;
|
return page.props.auth.user.current_team_id;
|
||||||
}
|
}
|
||||||
@@ -31,4 +35,5 @@ export {
|
|||||||
getCurrentUserId,
|
getCurrentUserId,
|
||||||
getCurrentMembershipId,
|
getCurrentMembershipId,
|
||||||
getCurrentRole,
|
getCurrentRole,
|
||||||
|
getCurrentUser,
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user