Resolved contracts list not showing correct entries based on dates. BOD-313. Added changes not saved indicator to shop info BOD-325

2020-08-27 16:25:37 -07:00
parent cc2947c7a2
commit 554a8f6170
8 changed files with 71 additions and 11 deletions
--- a/client/src/graphql/cccontracts.queries.js
+++ b/client/src/graphql/cccontracts.queries.js
@@ -136,7 +136,13 @@ export const QUERY_ACTIVE_CONTRACTS_PAGINATED = gql`
      offset: $offset
      limit: $limit
      order_by: $order
-      where: { actualreturn: { _lte: $end }, start: { _gte: $start } }
+      where: {
+        _or: [
+          { actualreturn: { _lte: $end } }
+          { actualreturn: { _is_null: true } }
+        ]
+        start: { _gte: $start }
+      }
    ) {
      agreementnumber
      courtesycarid