From 30e7aa2cf95b35fac45f95c4be64fa2074575b33 Mon Sep 17 00:00:00 2001
From: Tom Butcher <thomasbutcher15@gmail.com>
Date: Mon, 10 Aug 2026 01:53:43 +0100
Subject: [PATCH] Enhance Job and SubJob models with additional properties and
 filters

- Updated Job model to include 'startedAt' and 'finishedAt' in columns and filters, improving data tracking.
- Modified SubJob model to replace specific job and printer IDs with their respective objects in filters, and added 'startedAt' and 'finishedAt' to filters and sorters for better data management.
---
 src/database/models/Job.js    | 27 +++++++++++++++++++++++----
 src/database/models/SubJob.js | 18 ++++++++++++++----
 2 files changed, 37 insertions(+), 8 deletions(-)

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: [
     {