mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-08-14 11:12:16 +01:00
promote duration formats that omit seconds to HH:mm:ss in reporting
views and exports
This commit is contained in:
@@ -52,6 +52,7 @@ const props = defineProps<{
|
||||
selected?: boolean;
|
||||
canCreateProject: boolean;
|
||||
enableEstimatedTime: boolean;
|
||||
isReport?: boolean;
|
||||
}>();
|
||||
|
||||
const emit = defineEmits<{ selected: []; unselected: [] }>();
|
||||
@@ -172,6 +173,7 @@ async function handleDeleteTimeEntry() {
|
||||
<TimeEntryRowDurationInput
|
||||
:start="timeEntry.start"
|
||||
:end="timeEntry.end"
|
||||
:is-report="props.isReport"
|
||||
@changed="updateStartEndTime"></TimeEntryRowDurationInput>
|
||||
<TimeTrackerStartStop
|
||||
:active="!!(timeEntry.start && !timeEntry.end)"
|
||||
@@ -196,6 +198,7 @@ async function handleDeleteTimeEntry() {
|
||||
<TimeEntryRowDurationInput
|
||||
:start="timeEntry.start"
|
||||
:end="timeEntry.end"
|
||||
:is-report="props.isReport"
|
||||
@changed="updateStartEndTime"></TimeEntryRowDurationInput>
|
||||
</div>
|
||||
<!-- Second row: project/task - tags - billable - start - more -->
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
import {
|
||||
calculateDifference,
|
||||
formatHumanReadableDuration,
|
||||
formatReportingDuration,
|
||||
parseTimeInput,
|
||||
} from '@/packages/ui/src/utils/time';
|
||||
import { computed, ref, inject, type ComputedRef } from 'vue';
|
||||
@@ -18,6 +19,7 @@ const organizationSettings = computed(() => ({
|
||||
const props = defineProps<{
|
||||
start: string;
|
||||
end: string | null;
|
||||
isReport?: boolean;
|
||||
}>();
|
||||
const emit = defineEmits<{
|
||||
changed: [start: string, end: string | null];
|
||||
@@ -51,7 +53,8 @@ const currentTime = computed({
|
||||
if (temporaryCustomTimerEntry.value !== '') {
|
||||
return temporaryCustomTimerEntry.value;
|
||||
}
|
||||
return formatHumanReadableDuration(
|
||||
const formatter = props.isReport ? formatReportingDuration : formatHumanReadableDuration;
|
||||
return formatter(
|
||||
calculateDifference(props.start, props.end),
|
||||
organizationSettings.value.intervalFormat,
|
||||
organizationSettings.value.numberFormat
|
||||
|
||||
@@ -118,6 +118,26 @@ export function formatHumanReadableDuration(
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Format a duration for reporting views where cost and duration must reconcile.
|
||||
*
|
||||
* When the org's `hours-minutes` format is selected, seconds are normally dropped for
|
||||
* readability (e.g. "14h 45min"). In reports this can make the total duration appear
|
||||
* inconsistent with the billable cost (which is computed to the second). To keep the
|
||||
* two columns reconcilable without inflating column widths with "14h 45min 06s",
|
||||
* promote to the compact `HH:MM:SS` format in reporting contexts.
|
||||
*/
|
||||
export function formatReportingDuration(
|
||||
duration: number,
|
||||
intervalFormat?: string,
|
||||
numberFormat?: string
|
||||
): string {
|
||||
const promoted =
|
||||
intervalFormat === 'hours-minutes' || intervalFormat === 'hours-minutes-colon-separated';
|
||||
const effectiveFormat = promoted ? 'hours-minutes-seconds-colon-separated' : intervalFormat;
|
||||
return formatHumanReadableDuration(duration, effectiveFormat, numberFormat);
|
||||
}
|
||||
|
||||
export function formatDuration(duration: number): string {
|
||||
const dayJsDuration = dayjs.duration(duration, 's');
|
||||
const hours = Math.floor(dayJsDuration.asHours());
|
||||
|
||||
Reference in New Issue
Block a user