diff --git a/src/api/timesheet/services/timesheet.js b/src/api/timesheet/services/timesheet.js index 5d8e89b..fa716c7 100644 --- a/src/api/timesheet/services/timesheet.js +++ b/src/api/timesheet/services/timesheet.js @@ -328,7 +328,7 @@ module.exports = ({ strapi }) => ({ // Include the leave that is within the FY period response.forEach(leave => { - if (period.contains(DateTime.fromISO(leave.DATE))) { + if (period.contains(DateTime.fromISO(leave.DATE)) && leave.STATUS !== '3') { if(username && leave.ID !== username) return FYleave.push(leave) } diff --git a/src/extensions/documentation/documentation/1.0.0/full_documentation.json b/src/extensions/documentation/documentation/1.0.0/full_documentation.json index f29a1a6..5477a86 100644 --- 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-26T05:17:23.053Z" + "x-generation-date": "2024-10-07T11:54:13.386Z" }, "x-strapi-config": { "path": "/documentation",