small changes

zaavia-team · Jun 14, 2022 · 7346a15 · 7346a15
1 parent 1f838f0
commit 7346a15
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/backend/controllers/attendance_controller.js b/backend/controllers/attendance_controller.js
@@ -839,10 +839,23 @@ module.exports.GetLastReport = (req, res) => {
                 }
             ]
           }
+        },
+        {
+            '$addFields': {
+                'HOUR': {
+                    '$divide': [
+                        {
+                            '$subtract': [
+                                '$TakenOut', '$TakenIn'
+                            ]
+                        }, 3600000
+                    ]
+                }
+            }
         }, {
-          '$addFields': {
-            'TotalHours': {
-              '$sum': '$HOUR'
+            '$addFields': {
+                'TotalHours': {
+                    '$sum': '$HOUR'
             }, 
             'WorkingHours': {
               '$sum': '$WorkingHours'

diff --git a/login_app/lib/pages/monthly_attendance.dart b/login_app/lib/pages/monthly_attendance.dart
@@ -67,7 +67,7 @@ class _MonthlyAttendanceState extends State<MonthlyAttendance> {
                   (list['TakenOut'] != null) ?
                   '${DateFormat('dd-MM-yyyy h:mma').format(DateTime.parse(list['TakenOut'].toString()).toLocal())}' : "--"
               )),
-              DataCell(Text(list['TotalHours'].toString())),
+              DataCell(Text(list['TotalHours'].toStringAsFixed(2))),
             ]))
         .toList();
   }