diff --git a/src/database/models/GCodeFile.js b/src/database/models/GCodeFile.js index 3719072..ff507eb 100644 --- a/src/database/models/GCodeFile.js +++ b/src/database/models/GCodeFile.js @@ -131,6 +131,14 @@ export const GCodeFile = { readOnly: true, columnWidth: 180 }, + { + name: 'updatedAt', + label: 'Updated At', + type: 'dateTime', + value: null, + readOnly: true, + columnWidth: 175 + }, { name: 'name', label: 'Name', @@ -140,14 +148,6 @@ export const GCodeFile = { required: true, columnWidth: 200 }, - { - name: 'updatedAt', - label: 'Updated At', - type: 'dateTime', - value: null, - readOnly: true, - columnWidth: 175 - }, { name: 'file', label: 'File', diff --git a/src/database/models/Printer.js b/src/database/models/Printer.js index 9ed5862..9eae643 100644 --- a/src/database/models/Printer.js +++ b/src/database/models/Printer.js @@ -228,6 +228,13 @@ export const Printer = { showCopy: true, columnWidth: 140 }, + { + name: 'createdAt', + label: 'Created At', + type: 'dateTime', + readOnly: true, + columnWidth: 175 + }, { name: '_reference', label: 'Reference', @@ -239,8 +246,8 @@ export const Printer = { columnWidth: 180 }, { - name: 'createdAt', - label: 'Created At', + name: 'updatedAt', + label: 'Updated At', type: 'dateTime', readOnly: true, columnWidth: 175 @@ -253,13 +260,15 @@ export const Printer = { columnWidth: 200, columnFixed: 'left' }, + { - name: 'updatedAt', - label: 'Updated At', + name: 'connectedAt', + label: 'Connected At', type: 'dateTime', readOnly: true, columnWidth: 175 }, + { name: 'state', label: 'Status', @@ -269,13 +278,6 @@ export const Printer = { readOnly: true, columnWidth: 250 }, - { - name: 'connectedAt', - label: 'Connected At', - type: 'dateTime', - readOnly: true, - columnWidth: 175 - }, { name: 'online', label: 'Online', diff --git a/src/database/models/SubJob.js b/src/database/models/SubJob.js index cee7fd3..ed4e10f 100644 --- a/src/database/models/SubJob.js +++ b/src/database/models/SubJob.js @@ -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'], sorters: ['createdAt', 'state'], group: ['job'],