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

fix formatting

Browse Source
This commit is contained in:
Gregor Vostrak
2026-05-11 17:18:57 +02:00
parent 6d93e48b1d
commit 72cd0b6f05
6 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/js/Components/Timesheet/TimesheetCell.vue
View File

@@ -43,9 +43,7 @@ const emit = defineEmits<{
disabled:opacity-50 disabled:cursor-not-allowed" /> disabled:opacity-50 disabled:cursor-not-allowed" />
</span> </span>
</TooltipTrigger> </TooltipTrigger>
<TooltipContent> <TooltipContent> Stop the running time entry to edit the timesheet </TooltipContent>
Stop the running time entry to edit the timesheet
</TooltipContent>
</Tooltip> </Tooltip>
</TooltipProvider> </TooltipProvider>
<DurationSecondsInput <DurationSecondsInput

4
resources/js/Components/Timesheet/TimesheetFooterActions.vue
View File

@@ -26,9 +26,7 @@ defineEmits<{
<Button variant="ghost" size="sm" :disabled="busy"> <Button variant="ghost" size="sm" :disabled="busy">
<LoadingSpinner v-if="busy" class="h-3.5 w-3.5 m-0" /> <LoadingSpinner v-if="busy" class="h-3.5 w-3.5 m-0" />
Copy last week Copy last week
<ChevronDownIcon <ChevronDownIcon v-if="!busy" class="h-3.5 w-3.5 ml-1 text-icon-default" />
v-if="!busy"
class="h-3.5 w-3.5 ml-1 text-icon-default" />
</Button> </Button>
</DropdownMenuTrigger> </DropdownMenuTrigger>
<DropdownMenuContent align="start" class="min-w-[220px]"> <DropdownMenuContent align="start" class="min-w-[220px]">

7
resources/js/Components/Timesheet/TimesheetGrid.vue
View File

@@ -58,7 +58,12 @@ const emit = defineEmits<{
<div class="inline-block min-w-full align-middle"> <div class="inline-block min-w-full align-middle">
<div <div
class="grid min-w-full w-max border-y border-default-background-separator" class="grid min-w-full w-max border-y border-default-background-separator"
style="grid-template-columns: minmax(420px, 1fr) repeat(7, minmax(96px, 120px)) minmax(100px, auto) 40px;"> style="
grid-template-columns: minmax(420px, 1fr) repeat(7, minmax(96px, 120px)) minmax(
100px,
auto
) 40px;
">
<!-- Header row --> <!-- Header row -->
<div <div
class="bg-background dark:bg-secondary pl-7 pr-3 py-1 text-xs text-text-tertiary md:sticky md:left-0 md:z-10"> class="bg-background dark:bg-secondary pl-7 pr-3 py-1 text-xs text-text-tertiary md:sticky md:left-0 md:z-10">

7
resources/js/Pages/Timesheet.vue
View File

@@ -170,12 +170,9 @@ async function createTag(name: string): Promise<Tag | undefined> {
@remove-row="handleRemoveRow" @remove-row="handleRemoveRow"
@cell-update="handleCellUpdate" @cell-update="handleCellUpdate"
@project-task-change=" @project-task-change="
(row, projectId, taskId) => (row, projectId, taskId) => handleRowIdentityChange(row, { projectId, taskId })
handleRowIdentityChange(row, { projectId, taskId })
"
@billable-change="
(row, billable) => handleRowIdentityChange(row, { billable })
" "
@billable-change="(row, billable) => handleRowIdentityChange(row, { billable })"
@tags-change="(row, tags) => handleRowIdentityChange(row, { tags })" @tags-change="(row, tags) => handleRowIdentityChange(row, { tags })"
@add-row="handleAddRow" /> @add-row="handleAddRow" />

1
resources/js/utils/timesheet/cellMath.ts
View File

@@ -88,7 +88,6 @@ export function findFreeWindowOnDay(
// Sort + merge so we can walk a clean [gap, obstacle, gap, ...] sequence. // Sort + merge so we can walk a clean [gap, obstacle, gap, ...] sequence.
obstacles.sort((a, b) => a.start.diff(b.start)); obstacles.sort((a, b) => a.start.diff(b.start));
// merge overlaps // merge overlaps
const merged: Interval[] = []; const merged: Interval[] = [];
for (const obs of obstacles) { for (const obs of obstacles) {

2
resources/js/utils/timesheet/useTimesheetCellMutations.ts
View File

@@ -19,7 +19,6 @@ import {
type FreeWindow, type FreeWindow,
} from './cellMath'; } from './cellMath';
/** /**
* Cell-level edit dispatcher. Picks one of four strategies based on * Cell-level edit dispatcher. Picks one of four strategies based on
* the diff between current and requested totals: * the diff between current and requested totals:
@@ -317,6 +316,5 @@ export function useTimesheetCellMutations(
return best; return best;
} }
return { handleCellUpdate }; return { handleCellUpdate };
} }