refactor

zaavia-team · May 13, 2022 · 705eed1 · 705eed1
1 parent 1c1953e
commit 705eed1
Showing 1 changed file with 16 additions and 7 deletions.
diff --git 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
+                      ]
                     }
-                },
+                  },
             }
         }
     ]