IO-1605 Refactor smart scheduling.

2021-12-29 17:50:17 -06:00
parent e0d74aecb3
commit 454f69b511
13 changed files with 361 additions and 116 deletions
--- a/client/src/graphql/appointments.queries.js
+++ b/client/src/graphql/appointments.queries.js
@@ -234,11 +234,17 @@ export const QUERY_SCHEDULE_LOAD_DATA = gql`
      }
    }
    compJobs: jobs(
-      where: { scheduled_completion: { _gte: $start, _lte: $end } }
+      where: {
+        _or: [
+          { scheduled_completion: { _gte: $start, _lte: $end } }
+          { actual_completion: { _gte: $start, _lte: $end } }
+        ]
+      }
    ) {
      id
      ro_number
      scheduled_completion
+      actual_completion
      labhrs: joblines_aggregate(
        where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
      ) {