Attendance Controller Changes

zaavia-team · May 13, 2022 · fa40186 · fa40186
1 parent 839c6ca
commit fa40186
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/backend/controllers/attendance_controller.js b/backend/controllers/attendance_controller.js
@@ -114,7 +114,7 @@ module.exports.report = (req, res) => {
     const aggr = [
         {
             $match: {
-                'TakenIn': {
+                'ActionDetails.ActionTakenOn': {
                     '$gte': new Date(req.body.StartDate),
                     '$lte': new Date(new Date(req.body.EndDate).setHours(23, 59, 59))
                 }
@@ -157,7 +157,12 @@ module.exports.report = (req, res) => {
                 },
                 'Leave': {
                     '$sum': {
+
                         $cond: [{ $eq: ['$TransactionType', "Leave"] }, 1, 0]
+
+                        $cond: [{ $eq: ['$TransactionType', "Leave",'$ApprovedDetails', true
+                    ] }, 1, 0]
+
                     }
                 },
             }