extern/homer
1
0
Fork 1
mirror of https://github.com/bastienwirtz/homer.git synced 2025-06-26 12:41:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix octoprint timestamp (#693)

Browse Source 
update octoprint service with timestamp changes
This commit is contained in:
Kaustubh Murumkar 2024-10-26 01:09:21 +05:30 committed by GitHub
parent 11cdb50ea5
commit ea12ee520b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/components/services/OctoPrint.vue
View File

@ -12,9 +12,9 @@
<i class="fa-solid fa-gear mr-1"></i> <i class="fa-solid fa-gear mr-1"></i>
<b v-if="completion">{{ completion.toFixed() }}%</b> <b v-if="completion">{{ completion.toFixed() }}%</b>
<span class="separator mx-1"> | </span> <span class="separator mx-1"> | </span>
<span v-if="printTime" :title="`${toTime(printTimeLeft)} left`"> <span v-if="printTime" :title="`${formatTime(printTimeLeft)} left`">
<i class="fa-solid fa-stopwatch mr-1"></i> <i class="fa-solid fa-stopwatch mr-1"></i>
{{ toTime(printTime) }} {{ formatTime(printTime) }}
</span> </span>
</template> </template>
<template v-if="!error && display == 'text' && statusClass == 'ready'"> <template v-if="!error && display == 'text' && statusClass == 'ready'">
@ -33,8 +33,8 @@
class="progress is-primary" class="progress is-primary"
:value="completion" :value="completion"
max="100" max="100"
:title="`${state} - ${completion.toFixed()}%, ${toTime( :title="`${state} - ${completion.toFixed()}%, ${formatTime(
printTimeLeft, printTimeLeft
)} left`" )} left`"
> >
{{ completion }}% {{ completion }}%
@ -115,9 +115,28 @@ export default {
console.error(e); console.error(e);
} }
}, },
toTime: function (timastamp) { formatTime: function (seconds) {
return new Date(timastamp * 1000).toTimeString().substring(0, 5); const days = Math.floor(seconds / 86400);
}, let remainingSeconds = seconds % 86400;
const hours = Math.floor(remainingSeconds / 3600);
remainingSeconds %= 3600;
const minutes = Math.floor(remainingSeconds / 60);
const secs = remainingSeconds % 60;
const formattedHrs = hours.toString().padStart(2, '0')
const formattedMins = minutes.toString().padStart(2, '0')
const formattedSecs = secs.toString().padStart(2, '0')
if (days > 0) {
return `${days}d ${formattedHrs}h ${formattedMins}m`;
} else if (hours > 0) {
return `${formattedHrs}h ${formattedMins}m ${formattedSecs}s`;
} else if (minutes > 0) {
return `${formattedMins}m ${formattedSecs}s`;
} else {
return `${secs} seconds`;
}
}
}, },
}; };
</script> </script>