diff --git a/src/components/panels/Status/History.vue b/src/components/panels/Status/History.vue new file mode 100644 index 000000000..df3a31dc3 --- /dev/null +++ b/src/components/panels/Status/History.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/src/components/panels/Status/HistoryEntry.vue b/src/components/panels/Status/HistoryEntry.vue new file mode 100644 index 000000000..7d5af2cb7 --- /dev/null +++ b/src/components/panels/Status/HistoryEntry.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/src/components/panels/StatusPanel.vue b/src/components/panels/StatusPanel.vue index 6c7eb3ad9..4e278ef68 100644 --- a/src/components/panels/StatusPanel.vue +++ b/src/components/panels/StatusPanel.vue @@ -135,6 +135,7 @@ import MinSettingsPanel from '@/components/panels/MinSettingsPanel.vue' import KlippyStatePanel from '@/components/panels/KlippyStatePanel.vue' import StatusPanelPrintstatus from '@/components/panels/Status/Printstatus.vue' import StatusPanelGcodefiles from '@/components/panels/Status/Gcodefiles.vue' +import StatusPanelHistory from '@/components/panels/Status/History.vue' import StatusPanelJobqueue from '@/components/panels/Status/Jobqueue.vue' import StatusPanelExcludeObject from '@/components/panels/Status/ExcludeObject.vue' import StatusPanelPrintstatusThumbnail from '@/components/panels/Status/PrintstatusThumbnail.vue' @@ -169,6 +170,7 @@ import CancelJobDialog from '@/components/dialogs/CancelJobDialog.vue' Panel, StatusPanelExcludeObject, StatusPanelGcodefiles, + StatusPanelHistory, StatusPanelJobqueue, StatusPanelPrintstatus, StatusPanelPrintstatusThumbnail, diff --git a/src/locales/en.json b/src/locales/en.json index 27a990721..378c2f49b 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -775,6 +775,7 @@ "Slicer": "Slicer", "Speed": "Speed", "Total": "Total", + "TotalTime": "Total Time", "Unknown": "Unknown" }, "TemperaturePanel": { diff --git a/src/store/server/history/types.ts b/src/store/server/history/types.ts index 9cc07f8cd..090ae9649 100644 --- a/src/store/server/history/types.ts +++ b/src/store/server/history/types.ts @@ -91,3 +91,7 @@ export interface ServerHistoryStateAllPrintStatusEntry { } export type HistoryStatsValueNames = 'jobs' | 'filament' | 'time' + +export interface ServerHistoryStateJobWithCount extends ServerHistoryStateJob { + count: number +}