fix for dateRange filter

NewcastleRSE · Sep 21, 2024 · 2c525d7 · 2c525d7
1 parent 9e46176
commit 2c525d7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/api/timesheet/services/timesheet.js b/src/api/timesheet/services/timesheet.js
@@ -414,9 +414,18 @@ module.exports = ({ strapi }) =>  ({
           }
         },
         {
-          end: { 
-            $between: [startDate.toISODate(), endDate.toISODate() ]
-          }
+          $or: [
+            {
+              end: {
+                $between: [startDate.toISODate(), endDate.toISODate() ]
+              }
+            },
+            {
+              end: {
+                $null: true
+              }
+            }
+          ]
         },
         {
           $and: [
@@ -437,7 +446,7 @@ module.exports = ({ strapi }) =>  ({
 
     const timesheets = await strapi.services['api::timesheet.timesheet'].find(...args),
           assignments = await strapi.services['api::assignment.assignment'].find({filters: dateRangeFilter}),
-          capacities = await strapi.services['api::capacity.capacity'].find({filters: { $or: [...dateRangeFilter, { end: { $null: true }} ]} }),
+          capacities = await strapi.services['api::capacity.capacity'].find({filters: dateRangeFilter}),
           holidays = await fetchBankHolidays(args[0].filters.year.$eq),
           annualLeave = await strapi.services['api::timesheet.timesheet'].leave({...args[0]})
 

diff --git a/src/extensions/documentation/documentation/1.0.0/full_documentation.json b/src/extensions/documentation/documentation/1.0.0/full_documentation.json
@@ -14,7 +14,7 @@
       "name": "Apache 2.0",
       "url": "https://www.apache.org/licenses/LICENSE-2.0.html"
     },
-    "x-generation-date": "2024-09-21T09:02:52.009Z"
+    "x-generation-date": "2024-09-21T10:08:19.492Z"
   },
   "x-strapi-config": {
     "path": "/documentation",