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

unify display values for work and break time totals

Browse Source
This commit is contained in:
Gregor Vostrak
2026-07-27 15:48:05 +02:00
parent 2639b62744
commit f6311eddfd
4 changed files with 74 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,19 +186,27 @@ const emit = defineEmits<{
? 'text-text-primary'
: 'text-text-secondary',
]">
<span>{{ total > 0 ? formatDuration(total) : '-' }}</span>
<span
>{{ formatDuration(total)
}}<template v-if="total > 0 && (breakDayTotals[dayIndex] ?? 0) > 0">
work</template
></span
>
<span
v-if="(breakDayTotals[dayIndex] ?? 0) > 0"
class="font-normal text-text-tertiary">
+{{ formatDuration(breakDayTotals[dayIndex] ?? 0) }} break
</span>
class="font-normal text-text-tertiary"
>{{ formatDuration(breakDayTotals[dayIndex] ?? 0) }} break</span
>
</div>
<div
class="flex flex-col items-end justify-center border-t border-default-background-separator bg-background dark:bg-secondary pl-3 pr-3 py-1 text-xs font-semibold text-text-primary leading-tight">
<span>{{ weekTotalFormatted }}</span>
<span v-if="breakGrandTotal > 0" class="font-normal text-text-tertiary">
+{{ formatDuration(breakGrandTotal) }} break
</span>
<span
>{{ weekTotalFormatted
}}<template v-if="breakGrandTotal > 0"> work</template></span
>
<span v-if="breakGrandTotal > 0" class="font-normal text-text-tertiary"
>{{ formatDuration(breakGrandTotal) }} break</span
>
</div>
<div
class="border-t border-default-background-separator bg-background dark:bg-secondary"></div>