- Progress Commit

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/graphql/tasks.queries.js

@@ -1,46 +1,5 @@
 import {gql} from "@apollo/client";
 
-/**
- * All tasks paginated query
- * @type {DocumentNode}
- */
-export const QUERY_ALL_TASKS_PAGINATED = gql`
-  query QUERY_ALL_TASKS_PAGINATED(
-    $offset: Int
-    $limit: Int
-    $order: [tasks_order_by!]!
-  ) {
-    tasks(
-      offset: $offset
-      limit: $limit
-      order_by: $order
-    ) {
-      id
-      created_at
-      updated_at
-      title
-      description
-      deleted
-      deleted_at
-      due_date
-      created_by
-      assigned_to
-      completed
-      completed_at
-      remind_at
-      priority
-      jobid
-      joblineid
-      partsorderid
-      billid
-    }
-    tasks_aggregate {
-      aggregate {
-        count
-      }
-    }
-  }
-`;
 
 const PARTIAL_TASK_FIELDS = gql`
   fragment TaskFields on tasks {
@@ -87,6 +46,45 @@ const PARTIAL_TASK_FIELDS = gql`
   }
 `;
 
+export const QUERY_ALL_TASKS_PAGINATED = gql`
+  ${PARTIAL_TASK_FIELDS}
+  query QUERY_ALL_TASKS_PAGINATED(
+    $offset: Int
+    $limit: Int
+    $bodyshop: uuid!
+    $deleted: Boolean
+    $completed: Boolean
+    $assigned_to: String
+    $order: [tasks_order_by!]!
+  ) {
+    tasks(
+      offset: $offset
+      limit: $limit
+      order_by: $order
+      where: {
+        bodyshopid: {_eq: $bodyshop},
+        deleted: {_eq: $deleted},
+        assigned_to: {_eq: $assigned_to},
+        completed: {_eq: $completed}
+      }
+    ) {
+      ...TaskFields
+    }
+    tasks_aggregate(
+      where: {
+        bodyshopid: {_eq: $bodyshop},
+        deleted: {_eq: $deleted},
+        assigned_to: {_eq: $assigned_to},
+        completed: {_eq: $completed}
+      }
+    ) {
+      aggregate {
+        count
+      }
+    }
+  }
+`;
+
 // Query for joblineid
 export const QUERY_JOBLINE_TASKS_PAGINATED = gql`
   ${PARTIAL_TASK_FIELDS}