-
+
+
{{ $t('App.Notifications.Remind') }}
-
-
- 1H
-
-
- 1D
-
-
- 7D
-
-
-
-
- {{ $t('App.Notifications.NextReboot') }}
-
-
- {{ $t('App.Notifications.Never') }}
-
-
+
+ {{ reminder.text }}
+
+
-
-
diff --git a/src/components/panels/HistoryRemindersPanel.vue b/src/components/panels/HistoryRemindersPanel.vue
deleted file mode 100644
index a6547f417..000000000
--- a/src/components/panels/HistoryRemindersPanel.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-
-
-
-
-
-
-
-
-
- {{ mdiDelete }}
-
-
-
-
- {{ mdiPlus }}
-
-
-
-
-
-
-
-
- No Reminders
-
-
-
-
- |
-
- |
-
- {{ item.name }}
- |
-
-
-
-
-
- {{ getStatusIcon(item.remaining_print_time) }}
-
-
-
-
- {{ getStatusText(item.remaining_print_time) }}
-
-
- |
-
- {{ formatPrintTime(item.remaining_print_time) }}
- |
-
- {{ formatPrintTime(item.time_delta) }}
- |
-
-
-
-
-
-
-
- {{ mdiPencil }}
-
- Edit
-
-
- {{ mdiRepeatOnce }}
-
- Repeat
-
-
- {{ mdiDelete }}
-
- Delete
-
-
-
-
-
-
-
- {{ mdiCloseThick }}
-
-
-
-
- Do you really want to delete {{ selectedReminders.length }} reminders?
-
-
-
- {{ $t('History.Cancel') }}
- {{ $t('History.Delete') }}
-
-
-
-
-
-
-
-
- {{ mdiCloseThick }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Confirm
-
-
-
-
-
-
-
-
- {{ mdiCloseThick }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Confirm
-
-
-
-
-
-
-
diff --git a/src/components/panels/HistoryStatisticsPanel.vue b/src/components/panels/HistoryStatisticsPanel.vue
index 5ded56f68..4ef4ecdf1 100644
--- a/src/components/panels/HistoryStatisticsPanel.vue
+++ b/src/components/panels/HistoryStatisticsPanel.vue
@@ -12,15 +12,15 @@
| {{ $t('History.SelectedPrinttime') }} |
- {{ formatPrintTime(selectedPrintTime) }} |
+ {{ formatPrintTime(selectedPrintTime, false) }} |
| {{ $t('History.LongestPrinttime') }} |
- {{ formatPrintTime(selectedLongestPrintTime) }} |
+ {{ formatPrintTime(selectedLongestPrintTime, false) }} |
| {{ $t('History.AvgPrinttime') }} |
- {{ formatPrintTime(selectedAvgPrintTime) }} |
+ {{ formatPrintTime(selectedAvgPrintTime, false) }} |
| {{ $t('History.SelectedFilamentUsed') }} |
@@ -34,15 +34,15 @@
| {{ $t('History.TotalPrinttime') }} |
- {{ formatPrintTime(totalPrintTime) }} |
+ {{ formatPrintTime(totalPrintTime, false) }} |
| {{ $t('History.LongestPrinttime') }} |
- {{ formatPrintTime(longestPrintTime) }} |
+ {{ formatPrintTime(longestPrintTime, false) }} |
| {{ $t('History.AvgPrinttime') }} |
- {{ formatPrintTime(avgPrintTime) }} |
+ {{ formatPrintTime(avgPrintTime, false) }} |
| {{ $t('History.TotalFilamentUsed') }} |
@@ -57,17 +57,12 @@
-
-
+
+
-
- {{ $t('History.Chart') }}
-
-
- {{ $t('History.Table') }}
-
+ {{ $t('History.Chart') }}
+ {{ $t('History.Table') }}
@@ -88,16 +83,12 @@
-
-
+
+
-
- {{ $t('History.FilamentUsage') }}
-
-
- {{ $t('History.PrinttimeAvg') }}
-
+ {{ $t('History.FilamentUsage') }}
+ {{ $t('History.PrinttimeAvg') }}
@@ -122,6 +113,7 @@ import { formatPrintTime } from '@/plugins/helpers'
export default class HistoryStatisticsPanel extends Mixins(BaseMixin) {
mdiChartAreaspline = mdiChartAreaspline
mdiDatabaseArrowDownOutline = mdiDatabaseArrowDownOutline
+ formatPrintTime = formatPrintTime
formatPrintTime = formatPrintTime
@@ -134,9 +126,7 @@ export default class HistoryStatisticsPanel extends Mixins(BaseMixin) {
}
get totalPrintTime() {
- return 'total_print_time' in this.$store.state.server.history.job_totals
- ? this.$store.state.server.history.job_totals.total_print_time
- : 0
+ return this.$store.state.server.history.job_totals?.total_print_time ?? 0
}
get selectedPrintTime() {
@@ -150,9 +140,7 @@ export default class HistoryStatisticsPanel extends Mixins(BaseMixin) {
}
get longestPrintTime() {
- return 'longest_print' in this.$store.state.server.history.job_totals
- ? this.$store.state.server.history.job_totals.longest_print
- : 0
+ return this.$store.state.server.history.job_totals?.longest_print ?? 0
}
get selectedLongestPrintTime() {
@@ -180,9 +168,7 @@ export default class HistoryStatisticsPanel extends Mixins(BaseMixin) {
}
get totalFilamentUsed() {
- return 'total_filament_used' in this.$store.state.server.history.job_totals
- ? this.$store.state.server.history.job_totals.total_filament_used
- : 0
+ return this.$store.state.server.history.job_totals?.total_filament_used ?? 0
}
get selectedFilamentUsed() {
@@ -196,9 +182,7 @@ export default class HistoryStatisticsPanel extends Mixins(BaseMixin) {
}
get totalJobsCount() {
- return 'total_jobs' in this.$store.state.server.history.job_totals
- ? this.$store.state.server.history.job_totals.total_jobs
- : 0
+ return this.$store.state.server.history.job_totals?.total_jobs ?? 0
}
get toggleChart() {
diff --git a/src/components/panels/Machine/ConfigFilesPanel.vue b/src/components/panels/Machine/ConfigFilesPanel.vue
index b289778ad..293738e96 100644
--- a/src/components/panels/Machine/ConfigFilesPanel.vue
+++ b/src/components/panels/Machine/ConfigFilesPanel.vue
@@ -601,10 +601,6 @@ interface uploadSnackbar {
number: number
max: number
cancelTokenSource: any
- lastProgress: {
- time: number
- loaded: number
- }
}
interface draggingFile {
@@ -719,10 +715,6 @@ export default class ConfigFilesPanel extends Mixins(BaseMixin, ThemeMixin) {
number: 0,
max: 0,
cancelTokenSource: {},
- lastProgress: {
- time: 0,
- loaded: 0,
- },
}
private draggingFile: draggingFile = {
item: {
diff --git a/src/components/panels/Machine/UpdatePanel/GitCommitsList.vue b/src/components/panels/Machine/UpdatePanel/GitCommitsList.vue
index 688ff0e4d..cc11e51d5 100644
--- a/src/components/panels/Machine/UpdatePanel/GitCommitsList.vue
+++ b/src/components/panels/Machine/UpdatePanel/GitCommitsList.vue
@@ -1,5 +1,5 @@
-
+
-
-
-
-
-
-
-
-
-
- {{ $t('Machine.UpdatePanel.MoreCommitsInfo') }}
-
-
- {{ $t('Machine.UpdatePanel.LinkToGithub') }}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{ $t('Machine.UpdatePanel.MoreCommitsInfo') }}
+
+
+ {{ $t('Machine.UpdatePanel.LinkToGithub') }}
+
+
+
+
+
+
+
@@ -110,6 +106,24 @@ export default class GitCommitsList extends Mixins(BaseMixin) {
return `https://github.com/${this.repo?.owner}/${this.repo?.name}/commits/${this.repo?.branch}/?after=${this.lastCommit?.sha}+0`
}
+ get overlayScrollbarsStyle() {
+ if (this.isMobile) {
+ return {
+ height: 'calc(100vh - 48px)',
+ }
+ }
+
+ return {
+ height: '400px',
+ }
+ }
+
+ get timelineClassName() {
+ if (this.isMobile) return ['groupedCommits', 'mobile']
+
+ return ['groupedCommits']
+ }
+
closeDialog() {
this.$emit('close-dialog')
}
@@ -161,4 +175,18 @@ export default class GitCommitsList extends Mixins(BaseMixin) {
}
}
}
+
+::v-deep .groupedCommits.mobile {
+ &:before {
+ left: 20px;
+ }
+
+ .v-timeline-item__body {
+ max-width: calc(100% - 41px);
+ }
+
+ .v-timeline-item__divider {
+ min-width: 41px;
+ }
+}
diff --git a/src/components/panels/Machine/UpdatePanel/GitCommitsListDayCommit.vue b/src/components/panels/Machine/UpdatePanel/GitCommitsListDayCommit.vue
index 68854fbc9..44c2a3160 100644
--- a/src/components/panels/Machine/UpdatePanel/GitCommitsListDayCommit.vue
+++ b/src/components/panels/Machine/UpdatePanel/GitCommitsListDayCommit.vue
@@ -1,6 +1,6 @@
-
+
{{ title }}
@@ -20,7 +20,7 @@
{{ commitFormatDate }}
-
+
{{ commitShortSha }}
diff --git a/src/components/panels/Status/Gcodefiles.vue b/src/components/panels/Status/Gcodefiles.vue
index 6ddcb7a66..d2a38e6fa 100644
--- a/src/components/panels/Status/Gcodefiles.vue
+++ b/src/components/panels/Status/Gcodefiles.vue
@@ -173,53 +173,10 @@
-
-
-
-
- {{ mdiCloseThick }}
-
-
-
-
-
-
-
-
- {{ mdiChevronUp }}
-
-
- {{ mdiChevronDown }}
-
-
-
-
-
-
-
- {{ $t('Files.Cancel') }}
- {{ $t('Files.AddToQueue') }}
-
-
-
+
@@ -231,8 +188,6 @@ import ControlMixin from '@/components/mixins/control'
import { FileStateGcodefile } from '@/store/files/types'
import StartPrintDialog from '@/components/dialogs/StartPrintDialog.vue'
import {
- mdiChevronDown,
- mdiChevronUp,
mdiFile,
mdiPlay,
mdiPlaylistPlus,
@@ -246,6 +201,7 @@ import {
} from '@mdi/js'
import Panel from '@/components/ui/Panel.vue'
import { defaultBigThumbnailBackground } from '@/store/variables'
+import AddBatchToQueueDialog from '@/components/dialogs/AddBatchToQueueDialog.vue'
interface dialogRenameObject {
show: boolean
@@ -253,21 +209,14 @@ interface dialogRenameObject {
item: FileStateGcodefile
}
-interface dialogAddBatchToQueue {
- show: boolean
- count: number
- item: FileStateGcodefile
-}
-
@Component({
components: {
Panel,
StartPrintDialog,
+ AddBatchToQueueDialog,
},
})
export default class StatusPanelGcodefiles extends Mixins(BaseMixin, ControlMixin) {
- mdiChevronDown = mdiChevronDown
- mdiChevronUp = mdiChevronUp
mdiFile = mdiFile
mdiPlay = mdiPlay
mdiPlaylistPlus = mdiPlaylistPlus
@@ -320,10 +269,9 @@ export default class StatusPanelGcodefiles extends Mixins(BaseMixin, ControlMixi
item: { ...this.dialogFile },
}
- private dialogAddBatchToQueue: dialogAddBatchToQueue = {
- show: false,
- count: 1,
- item: { ...this.contextMenu.item },
+ dialogAddBatchToQueue: { isVisible: boolean; filename: string } = {
+ isVisible: false,
+ filename: '',
}
private countInputRules = [
@@ -470,23 +418,12 @@ export default class StatusPanelGcodefiles extends Mixins(BaseMixin, ControlMixi
}
openAddBatchToQueueDialog(item: FileStateGcodefile) {
- this.dialogAddBatchToQueue.show = true
- this.dialogAddBatchToQueue.count = 1
- this.dialogAddBatchToQueue.item = item
+ this.dialogAddBatchToQueue.isVisible = true
+ this.dialogAddBatchToQueue.filename = item.filename
}
- async addBatchToQueueAction() {
- let filename = [this.currentPath, this.dialogAddBatchToQueue.item.filename].join('/')
- if (filename.startsWith('/')) filename = filename.slice(1)
-
- const array: string[] = []
- for (let i = 0; i < this.dialogAddBatchToQueue.count; i++) {
- array.push(filename)
- }
-
- await this.$store.dispatch('server/jobQueue/addToQueue', array)
-
- this.dialogAddBatchToQueue.show = false
+ closeAddBatchToQueueDialog() {
+ this.dialogAddBatchToQueue.isVisible = false
}
view3D(item: FileStateGcodefile) {
@@ -571,11 +508,4 @@ export default class StatusPanelGcodefiles extends Mixins(BaseMixin, ControlMixi
.filesGcodeCard {
position: relative;
}
-
-._spin_button_group {
- width: 24px;
- margin-top: -6px;
- margin-left: -6px;
- margin-bottom: -6px;
-}
diff --git a/src/components/panels/Status/Jobqueue.vue b/src/components/panels/Status/Jobqueue.vue
index 85ca50dd9..e9ee73c94 100644
--- a/src/components/panels/Status/Jobqueue.vue
+++ b/src/components/panels/Status/Jobqueue.vue
@@ -13,7 +13,9 @@
- {{ $t('Panels.StatusPanel.EmptyJobqueue') }}
+
+
{{ $t('Panels.StatusPanel.EmptyJobqueue') }}
+