Refactor GCodeFile and Printer models to streamline date fields. Add 'createdAt' to Printer and restore 'updatedAt' to GCodeFile while removing redundant definitions. Update SubJob model to include additional columns for better data tracking.

This commit is contained in:
Tom Butcher 2026-07-18 16:28:18 +01:00
parent 9c2dd62c7e
commit 2ff3636913
3 changed files with 30 additions and 20 deletions

View File

@ -131,6 +131,14 @@ export const GCodeFile = {
readOnly: true, readOnly: true,
columnWidth: 180 columnWidth: 180
}, },
{
name: 'updatedAt',
label: 'Updated At',
type: 'dateTime',
value: null,
readOnly: true,
columnWidth: 175
},
{ {
name: 'name', name: 'name',
label: 'Name', label: 'Name',
@ -140,14 +148,6 @@ export const GCodeFile = {
required: true, required: true,
columnWidth: 200 columnWidth: 200
}, },
{
name: 'updatedAt',
label: 'Updated At',
type: 'dateTime',
value: null,
readOnly: true,
columnWidth: 175
},
{ {
name: 'file', name: 'file',
label: 'File', label: 'File',

View File

@ -228,6 +228,13 @@ export const Printer = {
showCopy: true, showCopy: true,
columnWidth: 140 columnWidth: 140
}, },
{
name: 'createdAt',
label: 'Created At',
type: 'dateTime',
readOnly: true,
columnWidth: 175
},
{ {
name: '_reference', name: '_reference',
label: 'Reference', label: 'Reference',
@ -239,8 +246,8 @@ export const Printer = {
columnWidth: 180 columnWidth: 180
}, },
{ {
name: 'createdAt', name: 'updatedAt',
label: 'Created At', label: 'Updated At',
type: 'dateTime', type: 'dateTime',
readOnly: true, readOnly: true,
columnWidth: 175 columnWidth: 175
@ -253,13 +260,15 @@ export const Printer = {
columnWidth: 200, columnWidth: 200,
columnFixed: 'left' columnFixed: 'left'
}, },
{ {
name: 'updatedAt', name: 'connectedAt',
label: 'Updated At', label: 'Connected At',
type: 'dateTime', type: 'dateTime',
readOnly: true, readOnly: true,
columnWidth: 175 columnWidth: 175
}, },
{ {
name: 'state', name: 'state',
label: 'Status', label: 'Status',
@ -269,13 +278,6 @@ export const Printer = {
readOnly: true, readOnly: true,
columnWidth: 250 columnWidth: 250
}, },
{
name: 'connectedAt',
label: 'Connected At',
type: 'dateTime',
readOnly: true,
columnWidth: 175
},
{ {
name: 'online', name: 'online',
label: 'Online', label: 'Online',

View File

@ -31,7 +31,15 @@ export const SubJob = {
} }
} }
], ],
columns: ['_reference', 'printer', 'job', 'state', 'createdAt'], columns: [
'_reference',
'printer',
'job',
'state',
'startedAt',
'finishedAt',
'createdAt'
],
filters: ['state', '_id', 'job', 'printer'], filters: ['state', '_id', 'job', 'printer'],
sorters: ['createdAt', 'state'], sorters: ['createdAt', 'state'],
group: ['job'], group: ['job'],