CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add 12-hour time format in printers overview (#1571)

Browse Source
This commit is contained in:
Stefan Dej 2023-10-01 09:54:22 +02:00 committed by GitHub
parent b7914f8de6
commit a28c6fdb03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/store/farm/printer/getters.ts
View File

@ -166,7 +166,7 @@ export const getters: GetterTree<FarmPrinterState, any> = {
return [] return []
}, },
getPrinterPreview: (state, getters) => { getPrinterPreview: (state, getters, rootState, rootGetters) => {
if (!state.server.klippy_connected) return [] if (!state.server.klippy_connected) return []
const output = [] const output = []
@ -215,19 +215,28 @@ export const getters: GetterTree<FarmPrinterState, any> = {
}) })
} }
if ( if ((state.data?.print_stats?.state ?? '') === 'printing' && getters['getPrintPercent'] > 0) {
'print_stats' in state.data && const hours12Format = rootGetters['gui/getHours12Format'] ?? false
'state' in state.data.print_stats &&
state.data.print_stats.state === 'printing' &&
getters['getPrintPercent'] > 0
) {
const eta = new Date(getters.estimated_time_eta) const eta = new Date(getters.estimated_time_eta)
const h = eta.getHours() >= 10 ? eta.getHours() : '0' + eta.getHours()
const m = eta.getMinutes() >= 10 ? eta.getMinutes() : '0' + eta.getMinutes() const date = new Date(eta)
let am = true
let h: string | number = date.getHours()
if (hours12Format && h > 11) am = false
if (hours12Format && h > 12) h -= 12
if (h < 10) h = '0' + h
const m = date.getMinutes() >= 10 ? date.getMinutes() : '0' + date.getMinutes()
const diff = date.getTime() - new Date().getTime()
let outputOutput = h + ':' + m
if (hours12Format) outputOutput += ` ${am ? 'AM' : 'PM'}`
if (diff > 60 * 60 * 24 * 1000) outputOutput += `+${Math.trunc(diff / (60 * 60 * 24 * 1000))}`
output.push({ output.push({
name: 'ETA', name: 'ETA',
value: getters.estimated_time_eta > 0 ? h + ':' + m : '--', value: getters.estimated_time_eta > 0 ? outputOutput : '--',
file: getters.estimated_time_file, file: getters.estimated_time_file,
filament: getters.estimated_time_filament, filament: getters.estimated_time_filament,
slicer: getters.estimated_time_slicer, slicer: getters.estimated_time_slicer,