From 72cd0b6f05f32f71719d39b84305041ca8713639 Mon Sep 17 00:00:00 2001 From: Gregor Vostrak Date: Mon, 11 May 2026 17:18:57 +0200 Subject: [PATCH] fix formatting --- resources/js/Components/Timesheet/TimesheetCell.vue | 4 +--- .../js/Components/Timesheet/TimesheetFooterActions.vue | 4 +--- resources/js/Components/Timesheet/TimesheetGrid.vue | 7 ++++++- resources/js/Pages/Timesheet.vue | 7 ++----- resources/js/utils/timesheet/cellMath.ts | 1 - resources/js/utils/timesheet/useTimesheetCellMutations.ts | 2 -- 6 files changed, 10 insertions(+), 15 deletions(-) diff --git a/resources/js/Components/Timesheet/TimesheetCell.vue b/resources/js/Components/Timesheet/TimesheetCell.vue index 31556672..533e855b 100644 --- a/resources/js/Components/Timesheet/TimesheetCell.vue +++ b/resources/js/Components/Timesheet/TimesheetCell.vue @@ -43,9 +43,7 @@ const emit = defineEmits<{ disabled:opacity-50 disabled:cursor-not-allowed" /> - - Stop the running time entry to edit the timesheet - + Stop the running time entry to edit the timesheet Copy last week - + diff --git a/resources/js/Components/Timesheet/TimesheetGrid.vue b/resources/js/Components/Timesheet/TimesheetGrid.vue index df54539a..7b3fa705 100644 --- a/resources/js/Components/Timesheet/TimesheetGrid.vue +++ b/resources/js/Components/Timesheet/TimesheetGrid.vue @@ -58,7 +58,12 @@ const emit = defineEmits<{
+ style=" + grid-template-columns: minmax(420px, 1fr) repeat(7, minmax(96px, 120px)) minmax( + 100px, + auto + ) 40px; + ">
diff --git a/resources/js/Pages/Timesheet.vue b/resources/js/Pages/Timesheet.vue index 5a9e6c62..40c997e7 100644 --- a/resources/js/Pages/Timesheet.vue +++ b/resources/js/Pages/Timesheet.vue @@ -170,12 +170,9 @@ async function createTag(name: string): Promise { @remove-row="handleRemoveRow" @cell-update="handleCellUpdate" @project-task-change=" - (row, projectId, taskId) => - handleRowIdentityChange(row, { projectId, taskId }) - " - @billable-change=" - (row, billable) => handleRowIdentityChange(row, { billable }) + (row, projectId, taskId) => handleRowIdentityChange(row, { projectId, taskId }) " + @billable-change="(row, billable) => handleRowIdentityChange(row, { billable })" @tags-change="(row, tags) => handleRowIdentityChange(row, { tags })" @add-row="handleAddRow" /> diff --git a/resources/js/utils/timesheet/cellMath.ts b/resources/js/utils/timesheet/cellMath.ts index f8a04aed..71f78361 100644 --- a/resources/js/utils/timesheet/cellMath.ts +++ b/resources/js/utils/timesheet/cellMath.ts @@ -88,7 +88,6 @@ export function findFreeWindowOnDay( // Sort + merge so we can walk a clean [gap, obstacle, gap, ...] sequence. obstacles.sort((a, b) => a.start.diff(b.start)); - // merge overlaps const merged: Interval[] = []; for (const obs of obstacles) { diff --git a/resources/js/utils/timesheet/useTimesheetCellMutations.ts b/resources/js/utils/timesheet/useTimesheetCellMutations.ts index fafd84a9..e9abec0e 100644 --- a/resources/js/utils/timesheet/useTimesheetCellMutations.ts +++ b/resources/js/utils/timesheet/useTimesheetCellMutations.ts @@ -19,7 +19,6 @@ import { type FreeWindow, } from './cellMath'; - /** * Cell-level edit dispatcher. Picks one of four strategies based on * the diff between current and requested totals: @@ -317,6 +316,5 @@ export function useTimesheetCellMutations( return best; } - return { handleCellUpdate }; }