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

add break time entries and simplified time tracker ui

Browse Source
This commit is contained in:
Gregor Vostrak
2026-07-21 16:48:37 +02:00
parent c07c62bfab
commit 64ca1e9115
128 changed files with 6252 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
resources/js/utils/timesheet/useCopyLastWeek.ts
View File

@@ -41,8 +41,10 @@ export function useCopyLastWeek(
projectId: string | null,
taskId: string | null,
billable: boolean,
tags: string[]
) => string
tags: string[],
type?: 'work' | 'break'
) => string,
breaksEnabled: Ref<boolean>
) {
const dayjs = getDayJsInstance();
const queryClient = useQueryClient();
@@ -50,6 +52,14 @@ export function useCopyLastWeek(
const isCopyingLastWeek = ref(false);
// The server rejects creating break entries while breaks are disabled,
// so leave last week's breaks out of the copy in that case
function copyableEntries(response: TimeEntryResponse): TimeEntry[] {
return breaksEnabled.value
? response.data
: response.data.filter((entry) => entry.type !== 'break');
}
async function fetchLastWeekEntries(): Promise<TimeEntryResponse | null> {
const prevStart = weekStart.value.subtract(7, 'day');
const prevEnd = weekStart.value;
@@ -73,16 +83,22 @@ export function useCopyLastWeek(
*/
function addMissingRowsFromPreviousWeek(prevEntries: TimeEntry[]): void {
const existingIdentities = new Set(
rows.value.map((r) => makeRowKey(r.projectId, r.taskId, r.billable, r.tags))
rows.value.map((r) => makeRowKey(r.projectId, r.taskId, r.billable, r.tags, r.type))
);
const addedIdentities = new Set<string>();
for (const entry of prevEntries) {
const tags = entry.tags ?? [];
const identity = makeRowKey(entry.project_id, entry.task_id, entry.billable, tags);
const identity = makeRowKey(
entry.project_id,
entry.task_id,
entry.billable,
tags,
entry.type
);
if (!existingIdentities.has(identity) && !addedIdentities.has(identity)) {
addedIdentities.add(identity);
addSlot(entry.project_id, entry.task_id, entry.billable, tags);
addSlot(entry.project_id, entry.task_id, entry.billable, tags, entry.type);
}
}
}
@@ -92,7 +108,7 @@ export function useCopyLastWeek(
try {
const prev = await fetchLastWeekEntries();
if (!prev) return;
addMissingRowsFromPreviousWeek(prev.data);
addMissingRowsFromPreviousWeek(copyableEntries(prev));
} finally {
isCopyingLastWeek.value = false;
}
@@ -110,7 +126,8 @@ export function useCopyLastWeek(
const tz = getUserTimezone();
addMissingRowsFromPreviousWeek(prev.data);
const prevEntries = copyableEntries(prev);
addMissingRowsFromPreviousWeek(prevEntries);
const prevWeekStart = weekStart.value.subtract(7, 'day');
@@ -125,7 +142,7 @@ export function useCopyLastWeek(
let overlapFailures = 0;
let otherFailures = 0;
for (const entry of prev.data) {
for (const entry of prevEntries) {
if (!entry.end || !entry.duration) continue;
// Map previous-week date → same day-of-week in current week.
@@ -174,6 +191,7 @@ export function useCopyLastWeek(
start: window.start,
end: window.end,
billable: entry.billable,
type: entry.type,
description: entry.description ?? null,
tags: entry.tags ?? [],
};