diff --git a/src/database/models/Job.js b/src/database/models/Job.js index 19bb645..d97a58e 100644 --- a/src/database/models/Job.js +++ b/src/database/models/Job.js @@ -102,17 +102,36 @@ export const Job = { content: () => createElement(JobInfo) } ], - columns: ['_reference', 'quantity', 'state', 'gcodeFile', 'createdAt'], + columns: [ + '_reference', + 'quantity', + 'state', + 'gcodeFile', + 'startedAt', + 'finishedAt', + 'createdAt', + 'updatedAt' + ], filters: [ 'state', - 'gcodeFile._id', + 'gcodeFile', 'quantity', '_id', '_reference', 'createdAt', - 'updatedAt' + 'updatedAt', + 'startedAt', + 'finishedAt' + ], + sorters: [ + 'createdAt', + 'state', + 'quantity', + 'gcodeFile', + 'updatedAt', + 'startedAt', + 'finishedAt' ], - sorters: ['createdAt', 'state', 'quantity', 'gcodeFile', 'updatedAt'], properties: [ { name: '_id', diff --git a/src/database/models/SubJob.js b/src/database/models/SubJob.js index 4129b5e..b5454aa 100644 --- a/src/database/models/SubJob.js +++ b/src/database/models/SubJob.js @@ -54,14 +54,24 @@ export const SubJob = { ], filters: [ '_id', - 'job._id', - 'printer._id', + 'job', + 'printer', '_reference', 'state', 'createdAt', - 'updatedAt' + 'updatedAt', + 'startedAt', + 'finishedAt' + ], + sorters: [ + 'createdAt', + 'state', + 'updatedAt', + 'startedAt', + 'finishedAt', + 'job', + 'printer' ], - sorters: ['createdAt', 'state', 'updatedAt'], group: ['job'], properties: [ {