diff --git a/src/components/Dashboard/Production/Printers/ControlPrinter.jsx b/src/components/Dashboard/Production/Printers/ControlPrinter.jsx index 9249f98..1bfe61f 100644 --- a/src/components/Dashboard/Production/Printers/ControlPrinter.jsx +++ b/src/components/Dashboard/Production/Printers/ControlPrinter.jsx @@ -341,6 +341,7 @@ const ControlPrinter = ({ slicerIntegration = false }) => { createdAt: false, updatedAt: false, state: !slicerIntegration, + pendingSlicerUploads: false, name: !slicerIntegration }} objectPropertyProps={{ diff --git a/src/components/Dashboard/Production/Printers/NewPrinter.jsx b/src/components/Dashboard/Production/Printers/NewPrinter.jsx index d2f9ed9..f58e981 100644 --- a/src/components/Dashboard/Production/Printers/NewPrinter.jsx +++ b/src/components/Dashboard/Production/Printers/NewPrinter.jsx @@ -53,7 +53,8 @@ const NewPrinter = ({ onOk, defaultValues }) => { 'currentJob._id': false, currentSubJob: false, 'currentSubJob._id': false, - alerts: false + alerts: false, + queue: false }} /> ) @@ -80,7 +81,10 @@ const NewPrinter = ({ onOk, defaultValues }) => { 'currentJob._id': false, currentSubJob: false, 'currentSubJob._id': false, - alerts: false + alerts: false, + pendingSlicerUploads: false, + online: false, + queue: false }} isEditing={false} objectData={objectData} diff --git a/src/components/Dashboard/Production/Printers/PrinterInfo.jsx b/src/components/Dashboard/Production/Printers/PrinterInfo.jsx index 232bda4..f050ec9 100644 --- a/src/components/Dashboard/Production/Printers/PrinterInfo.jsx +++ b/src/components/Dashboard/Production/Printers/PrinterInfo.jsx @@ -171,7 +171,8 @@ const PrinterInfo = () => { 'currentJob._id': false, currentSubJob: false, 'currentSubJob._id': false, - alerts: false + alerts: false, + pendingSlicerUploads: false }} /> )} diff --git a/src/database/models/Printer.js b/src/database/models/Printer.js index 2d69f20..f2131dc 100644 --- a/src/database/models/Printer.js +++ b/src/database/models/Printer.js @@ -406,6 +406,36 @@ export const Printer = { required: false, readOnly: true, columnWidth: 200 + }, + { + name: 'pendingSlicerUploads', + type: 'objectChildren', + label: 'Pending Slicer Uploads', + properties: [ + { + name: 'file', + label: 'File', + type: 'object', + objectType: 'file', + required: true, + showHyperlink: true + }, + { + name: 'shouldPrint', + label: 'Should Print', + type: 'bool', + required: true, + columnWidth: 125 + }, + { + name: 'job', + label: 'Job', + type: 'object', + objectType: 'job', + required: false, + showHyperlink: true + } + ] } ], stats: [