Development add user balance year filter (#548)

* feat: Add year selection for vacation balances

- Add year selection component and logic
- Update balance API to accept year parameter
- Refactor balance fetching and updating to support selected year
- Add watcher for year changes to refetch balances
- Update UI to display selected year in title and alert

* feat: Add year parameter for vacation balance

- Add IntegerField for year in serializer
- Allow filtering vacation balance by year
- Update docstring with year parameter

* feat: Improve vacation balance calculation logic

- Filter vacations affecting current year balance
- Add balance source description to report
- Indicate if vacation affects year balance

Author: Mahmoud-Emad

client/src/components/dashboard/AuditUserBalance.vue

@@ -45,7 +45,7 @@
                     <div class="d-flex justify-space-between align-end mb-4">
                         <div>
                             <h3 class="text-h6 font-weight-bold">Audit Results for {{ reportData.user_full_name
-                                }}</h3>
+                            }}</h3>
                             <div class="text-body-2 text-medium-emphasis">Period: {{ reportData.year }} |
                                 Reason: <span class="text-capitalize">{{ reportData.reason }}</span></div>
                         </div>
@@ -124,9 +124,9 @@
                                         <span v-else>{{ vac.recalc }}</span>
                                     </td>
                                     <td>
-                                        <v-chip size="x-small" :color="vac.is_old_balance ? 'secondary' : 'primary'"
-                                            variant="tonal">
-                                            {{ vac.is_old_balance ? 'Transferred' : 'Main' }}
+                                        <v-chip size="x-small"
+                                            :color="vac.affects_year_balance ? 'primary' : 'secondary'" variant="tonal">
+                                            {{ vac.balance_source || (vac.is_old_balance ? 'Transferred' : 'Main') }}
                                         </v-chip>
                                     </td>
                                 </tr>

server/cshr/services/balance.py

@@ -1,5 +1,6 @@
 from datetime import datetime
 from typing import Any, Dict, List, Optional
+from django.db.models import Q
 from cshr.models.users import User, USER_TYPE
 from cshr.models.vacations import UserVacationBalance, Vacation
 from cshr.models.requests import STATUS_CHOICES
@@ -31,11 +32,16 @@ def audit_user_balance(user: User, year: int, reason: str) -> Dict[str, Any]:
         total_quota = getattr(balance_obj.total_days, reason, 0)
         current_db_remaining = getattr(balance_obj.remaining_days, reason, 0)
 
+        # Query vacations that affect this year's balance:
+        # 1. Vacations from this year that are NOT from old balance (consumed from current year's balance)
+        # 2. Vacations from the next year that ARE from old balance (consumed from this year's transferred balance)
         vacations = Vacation.objects.filter(
             applying_user=user,
-            from_date__year=year,
             status__in=[STATUS_CHOICES.APPROVED, STATUS_CHOICES.CANCEL_REJECTED],
             reason=reason,
+        ).filter(
+            Q(from_date__year=year, is_old_balance=False) |  # Regular vacations from this year
+            Q(from_date__year=year + 1, is_old_balance=True)  # Next year vacations using this year's balance
         ).order_by("from_date")
 
         reports = []
@@ -52,9 +58,23 @@ def audit_user_balance(user: User, year: int, reason: str) -> Dict[str, Any]:
             ):
                 days = 1.0
 
-            if not vac.is_old_balance:
+            # Count days that affect this year's remaining balance:
+            # - Current year vacations (not from old balance) → deducted from this year's remaining
+            # - Next year vacations (from old balance) → deducted from this year's remaining (via transferred)
+            is_current_year_main = vac.from_date.year == year and not vac.is_old_balance
+            is_next_year_transferred = vac.from_date.year == year + 1 and vac.is_old_balance
+            
+            if is_current_year_main or is_next_year_transferred:
                 total_recalc_current += days
 
+            # Determine the balance source description
+            if is_next_year_transferred:
+                balance_source = f"Transferred (from {year})"
+            elif vac.is_old_balance:
+                balance_source = f"Transferred (from {year - 1})"
+            else:
+                balance_source = "Main"
+
             reports.append(
                 {
                     "id": vac.id,
@@ -63,6 +83,8 @@ def audit_user_balance(user: User, year: int, reason: str) -> Dict[str, Any]:
                     "stored": vac.actual_days,
                     "recalc": days,
                     "is_old_balance": vac.is_old_balance,
+                    "balance_source": balance_source,
+                    "affects_year_balance": is_current_year_main or is_next_year_transferred,
                 }
             )