fix bug calculating monthly capacity in previous years

src/api/timesheet/services/timesheet.js

@@ -605,7 +605,7 @@ module.exports = ({ strapi }) =>  ({
     const summary = await fetchSummaryReport(year, userIDs, projectIDs),
           annuaLeave = await strapi.services['api::timesheet.timesheet'].leave(query),
           holidays = await fetchBankHolidays(year),
-          rses = await strapi.services['api::rse.rse'].find({populate: { capacities: { filters: dateRangeFilter } }, filters: { active: true } })
+          rses = await strapi.services['api::rse.rse'].find({populate: { capacities: { filters: dateRangeFilter } } })
 
 
     const holidayDates = holidays.map(holiday => DateTime.fromISO(holiday.date).toISODate())
@@ -624,6 +624,8 @@ module.exports = ({ strapi }) =>  ({
 
       let profile = rses.results.find(r => r.clockifyID === rse._id)
 
+      if(!profile) console.log(rse)
+
       const rseLeave = annuaLeave.data.filter(leave => leave.ID === profile.username)
 
       let months = []
@@ -633,7 +635,7 @@ module.exports = ({ strapi }) =>  ({
         let billableTime = month.children.reduce((total, project) => project.amount > 0 ? total + project.duration : 0, 0)
 
         const start = DateTime.fromFormat(month.name, 'MMM yyyy').startOf('month'),
-              end = start.month === DateTime.now().month ? DateTime.now() : start.endOf('month')
+              end = start.month === DateTime.now().month && start.year === DateTime.now().year ? DateTime.now() : start.endOf('month')
 
         let date = start
 

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-21T10:08:19.492Z"
+    "x-generation-date": "2024-09-26T05:17:23.053Z"
   },
   "x-strapi-config": {
     "path": "/documentation",