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

fix duration formatting over 24h, fix time entry create modal clearing after submit

Browse Source
This commit is contained in:
Gregor Vostrak
2024-04-25 15:36:16 +02:00
parent 1f6d9c598d
commit 66210e7830
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/js/Components/Common/TimeEntry/TimeEntryCreateModal.vue
View File

@@ -30,12 +30,12 @@ const timeEntryDefaultValues = {
user_id: getCurrentUserId(), user_id: getCurrentUserId(),
}; };
const timeEntry = ref(timeEntryDefaultValues); const timeEntry = ref({ ...timeEntryDefaultValues });
async function submit() { async function submit() {
await createTimeEntry(timeEntry.value); await createTimeEntry(timeEntry.value);
timeEntry.value = { ...timeEntryDefaultValues };
show.value = false; show.value = false;
timeEntry.value = timeEntryDefaultValues;
} }
const projectNameInput = ref<HTMLInputElement | null>(null); const projectNameInput = ref<HTMLInputElement | null>(null);

5
resources/js/utils/time.ts
View File

@@ -19,7 +19,10 @@ export function getDayJsInstance() {
} }
export function formatHumanReadableDuration(duration: number): string { export function formatHumanReadableDuration(duration: number): string {
return dayjs.duration(duration, 's').format('HH[h] mm[min]'); const dayJsDuration = dayjs.duration(duration, 's');
const hours = dayJsDuration.hours() + dayJsDuration.days() * 24;
const minutes = dayJsDuration.minutes();
return `${hours}h ${minutes.toString().padStart(2, '0')}min`;
} }
export function calculateDifference(start: string, end: string | null) { export function calculateDifference(start: string, end: string | null) {