adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-16 04:02:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix employee reporting request, fix billable update, fix start of week in reporting

Browse Source
This commit is contained in:
Gregor Vostrak
2024-05-22 16:13:08 +02:00
committed by Constantin Graf
parent c888ac7ec2
commit ce00f5f446
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/js/utils/time.ts
View File

@@ -78,7 +78,7 @@ export function formatDate(date: string): string {
}
export function formatWeek(date: string | null): string {
return 'Week ' + dayjs(date).week();
return 'Week ' + getDayJsInstance()(date).week();
}
/*

7
resources/js/utils/useUser.ts
View File

@@ -24,6 +24,12 @@ function getCurrentMembershipId() {
)?.membership.id;
}
function getCurrentRole() {
return page.props.auth.user.all_teams.find(
(team) => team.id === getCurrentOrganizationId()
)?.membership.role;
}
function getUserTimezone() {
return page.props.auth.user.timezone;
}
@@ -34,4 +40,5 @@ export {
getUserTimezone,
getWeekStart,
getCurrentMembershipId,
getCurrentRole,
};