Merge pull request #3460 from expsa/younes_dev_odex25_mobile

Correct leave logic for mobile app
2025-06-16 11:59:07 +01:00 · 2025-06-16 11:59:07 +01:00 · c187d614f7
parent 6ee5cc931a 2d9c257afe
commit c187d614f7
1 changed files with 2 additions and 4 deletions
--- a/odex25_mobile/odex_mobile/controllers/rest_api_v2/leave.py
+++ b/odex25_mobile/odex_mobile/controllers/rest_api_v2/leave.py
@ -141,10 +141,8 @@ class LeaveController(http.Controller):
                    value = {
                        "id": s.id,
                        "name": s.holiday_status_id.name or "",
-                        # "total": s.leave_balance,
-                        # "remain": s.remaining_leaves,
-                        "remain": s.leave_balance,
-                        "total": s.remaining_leaves,
+                        "remain": s.remaining_leaves,
+                        "total": s.leaves_taken + s.remaining_leaves,
                        "taken": s.leaves_taken,
                    }
                    li.append(value)