diff --git a/src/components/panels/JobqueuePanel.vue b/src/components/panels/JobqueuePanel.vue
index 8ab308c38..22d54e144 100644
--- a/src/components/panels/JobqueuePanel.vue
+++ b/src/components/panels/JobqueuePanel.vue
@@ -36,12 +36,13 @@
+
@@ -57,8 +58,9 @@ import Panel from '@/components/ui/Panel.vue'
import { mdiPlay, mdiPause, mdiTrayFull } from '@mdi/js'
import JobqueueEntry from '@/components/panels/Status/JobqueueEntry.vue'
import draggable from 'vuedraggable'
+import JobqueueEntrySum from '@/components/panels/Status/JobqueueEntrySum.vue'
@Component({
- components: { draggable, JobqueueEntry, Panel },
+ components: { JobqueueEntrySum, draggable, JobqueueEntry, Panel },
})
export default class JobqueuePanel extends Mixins(BaseMixin) {
mdiPlay = mdiPlay
@@ -93,11 +95,15 @@ export default class JobqueuePanel extends Mixins(BaseMixin) {
diff --git a/src/components/panels/Status/Jobqueue.vue b/src/components/panels/Status/Jobqueue.vue
index d1c80bbaa..85ca50dd9 100644
--- a/src/components/panels/Status/Jobqueue.vue
+++ b/src/components/panels/Status/Jobqueue.vue
@@ -51,7 +51,11 @@ export default class StatusPanelJobqueue extends Mixins(BaseMixin) {
diff --git a/src/components/panels/Status/JobqueueEntry.vue b/src/components/panels/Status/JobqueueEntry.vue
index 0f0fdc90d..17b468988 100644
--- a/src/components/panels/Status/JobqueueEntry.vue
+++ b/src/components/panels/Status/JobqueueEntry.vue
@@ -1,7 +1,7 @@
{{ mdiDragVertical }}
diff --git a/src/components/panels/Status/JobqueueEntryRest.vue b/src/components/panels/Status/JobqueueEntryRest.vue
index 02d413d8f..cd6519a23 100644
--- a/src/components/panels/Status/JobqueueEntryRest.vue
+++ b/src/components/panels/Status/JobqueueEntryRest.vue
@@ -17,7 +17,7 @@ import BaseMixin from '@/components/mixins/base'
import { ServerJobQueueStateJob } from '@/store/server/jobQueue/types'
import { mdiFileMultiple } from '@mdi/js'
@Component
-export default class StatusPanelJobqueueEntry extends Mixins(BaseMixin) {
+export default class StatusPanelJobqueueEntryRest extends Mixins(BaseMixin) {
mdiFileMultiple = mdiFileMultiple
@Prop({ type: Array, required: true }) jobs!: ServerJobQueueStateJob[]
@@ -84,7 +84,7 @@ export default class StatusPanelJobqueueEntry extends Mixins(BaseMixin) {
const weight = this.sums.filamentWeight
if (weight === 0) return null
- if (weight >= 1000) return (length / 1000).toFixed(1) + ' kg'
+ if (weight >= 1000) return (weight / 1000).toFixed(1) + ' kg'
return weight.toFixed(0) + ' g'
}
diff --git a/src/components/panels/Status/JobqueueEntrySum.vue b/src/components/panels/Status/JobqueueEntrySum.vue
new file mode 100644
index 000000000..d994db3a0
--- /dev/null
+++ b/src/components/panels/Status/JobqueueEntrySum.vue
@@ -0,0 +1,146 @@
+
+
+
+
+ {{ $t('Panels.StatusPanel.Filament') }}: {{ filamentOutput }},
+ {{ $t('Panels.StatusPanel.PrintTime') }}: {{ estimatedTime }},
+ {{ $t('Panels.StatusPanel.ETA') }}: {{ eta }}
+
+
+
+
+
+
+
+
diff --git a/src/locales/de.json b/src/locales/de.json
index 7fbb23443..885e42c3d 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -198,7 +198,6 @@
"EditFile": "Datei bearbeiten",
"Empty": "Leer",
"ExtruderTemp": "Extruder Temp.",
- "Filament": "Filament",
"FilamentName": "Filament Name",
"FilamentType": "Filament Typ",
"FilamentUsage": "Filamentverbrauch",
@@ -390,7 +389,6 @@
"TotalTime": "Gesamtzeit"
},
"JobQueue": {
- "AllJobs": "Alle Aufträge",
"Cancel": "abbrechen",
"ChangeCount": "Anzahl ändern",
"Count": "Anzahl",
@@ -398,10 +396,10 @@
"InvalidCountEmpty": "Die Eingabe darf nicht leer sein!",
"InvalidCountGreaterZero": "Die Eingabe muss größer als 0 sein!",
"JobQueue": "Auftragswarteschlange",
- "Jobs": "Aufträge",
"Pause": "Pause",
"RemoveFromQueue": "Von Auftragswarteschlange entfernen",
- "Start": "Start"
+ "Start": "Start",
+ "StartPrint": "Auftrag starten"
},
"Machine": {
"ConfigFilesPanel": {