From 705eed15d8ccdb16fe47ec78f435bba36525fa5c Mon Sep 17 00:00:00 2001 From: Zukqurnain Date: Fri, 13 May 2022 16:11:09 +0500 Subject: [PATCH] refactor --- backend/controllers/attendance_controller.js | 23 ++++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/backend/controllers/attendance_controller.js b/backend/controllers/attendance_controller.js index ca67646..531ce9d 100644 --- a/backend/controllers/attendance_controller.js +++ b/backend/controllers/attendance_controller.js @@ -157,14 +157,23 @@ module.exports.report = (req, res) => { }, 'Leave': { '$sum': { - - $cond: [{ $eq: ['$TransactionType', "Leave"] }, 1, 0], - - $cond: [{ $eq: ['$TransactionType', "Leave",'$ApprovedDetails', true - ] }, 1, 0] - + '$cond': [ + { + '$and': [ + { + '$eq': [ + '$TransactionType', 'Leave' + ] + }, { + '$eq': [ + '$ApprovedDetails.ActionTakenOn', true + ] + } + ] + }, 1, 0 + ] } - }, + }, } } ]