updated meta apps and made overview return just the data needed

docs/agent/frontend/FIELD_AGENT_DASHBOARD_API.md

@@ -18,7 +18,10 @@ Enhanced the existing `GET /api/v1/analytics/user/overview` endpoint to support
 
 ## Response Structure
 
-### For All Users (Existing)
+### For Field Agents/Sales Agents (Simplified Response)
+
+Field agents receive a **personalized response** showing only THEIR work, not organization-wide stats:
+
 ```json
 {
   "user_info": {
@@ -31,39 +34,91 @@ Enhanced the existing `GET /api/v1/analytics/user/overview` endpoint to support
     "total": 3,
     "active": 2
   },
-  "tickets": {
-    "total": 45,
-    "open": 12,
-    "in_progress": 8
+  "my_tickets": {
+    "total_assigned": 15,
+    "pending": 4,
+    "in_progress": 2,
+    "completed_this_week": 9
+  },
+  "my_expenses": {
+    "total_amount": 12500.00,
+    "pending_approval": 3,
+    "pending_amount": 4500.00
+  },
+  "my_inventory": {
+    "items_on_hand": 8
+  },
+  "my_time": {
+    "hours_worked_this_week": 32.5
   },
   "notifications": {
     "unread": 5
   },
+  "work_queue": {
+    "pending_assignments": [...],
+    "total_pending": 4,
+    "high_priority": 1,
+    "due_today": 2
+  },
   "generated_at": "2025-11-27T10:30:00Z"
 }
 ```
 
-### For Field Agents/Sales Agents (NEW)
+**Key Differences from Manager Response:**
+- ✅ `my_tickets` - Only tickets assigned to ME (not all project tickets)
+- ✅ `my_expenses` - Only MY expenses (not team expenses)
+- ✅ `my_inventory` - Only items I have (not warehouse inventory)
+- ✅ `my_time` - MY hours worked
+- ✅ `work_queue` - MY pending assignments
+- ❌ No `team` stats (don't manage team)
+- ❌ No `sales_orders` (not relevant)
+- ❌ No organization-wide `inventory` value
+
+**Metrics Explained:**
+- `my_tickets.total_assigned`: All tickets ever assigned to me
+- `my_tickets.pending`: Tickets with status "assigned" (not started)
+- `my_tickets.in_progress`: Tickets with status "en_route" or "in_progress"
+- `my_tickets.completed_this_week`: Completed this ISO week (Monday-Sunday)
+- `my_expenses.total_amount`: Sum of all MY expenses (approved + pending)
+- `my_expenses.pending_approval`: Count of MY unapproved expenses
+- `my_expenses.pending_amount`: Sum of MY unapproved expenses
+- `my_inventory.items_on_hand`: Equipment I collected but haven't returned/installed
+- `my_time.hours_worked_this_week`: Hours from MY timesheets (ISO week)
+
+### For Managers/Admins (Full Response)
 
-**Additional Fields:**
+Managers receive organization-wide stats:
 
-#### 1. Field Agent Stats
 ```json
-"field_agent_stats": {
-  "hours_worked_this_week": 32.5,
-  "pending_expenses_amount": 4500.00,
-  "inventory_on_hand": 8,
-  "tickets_completed_this_week": 15
+{
+  "user_info": {...},
+  "projects": {...},
+  "team": {
+    "total_members": 25
+  },
+  "tickets": {
+    "total": 150,
+    "open": 45,
+    "in_progress": 30
+  },
+  "expenses": {
+    "total_amount": 250000.00,
+    "pending_approval": 15
+  },
+  "sales_orders": {
+    "total": 80,
+    "pending": 20
+  },
+  "inventory": {
+    "total_value": 500000.00,
+    "active_assignments": 45
+  },
+  "notifications": {...},
+  "generated_at": "..."
 }
 ```
 
-**Metrics Explained:**
-- `hours_worked_this_week`: Sum of hours from Timesheet table (ISO week: Monday-Sunday)
-- `pending_expenses_amount`: Sum of unapproved TicketExpense records
-- `inventory_on_hand`: Count of active InventoryAssignment (not returned/installed/consumed)
-- `tickets_completed_this_week`: Count of completed TicketAssignment (ISO week)
-
-#### 2. Work Queue
+### Work Queue Structure (Field Agents Only)
 ```json
 "work_queue": {
   "pending_assignments": [
@@ -111,23 +166,23 @@ const data = await response.json();
 
 **Display Summary Cards:**
 ```typescript
-// Use field_agent_stats for summary cards
-const stats = data.field_agent_stats;
+// Field agent response has simplified structure
+const { my_tickets, my_expenses, my_inventory, my_time } = data;
 
 <Card title="Hours This Week">
-  {stats.hours_worked_this_week} hrs
+  {my_time.hours_worked_this_week} hrs
 </Card>
 
 <Card title="Pending Expenses">
-  KES {stats.pending_expenses_amount.toLocaleString()}
+  KES {my_expenses.pending_amount.toLocaleString()}
 </Card>
 
 <Card title="Inventory On Hand">
-  {stats.inventory_on_hand} items
+  {my_inventory.items_on_hand} items
 </Card>
 
 <Card title="Completed This Week">
-  {stats.tickets_completed_this_week} tickets
+  {my_tickets.completed_this_week} tickets
 </Card>
 ```
 

src/app/config/apps.py

@@ -464,8 +464,8 @@ META_APPS_BY_ROLE: Dict[str, List[str]] = {
     "project_manager": ["overview", "projects", "users", "finance", "notifications", "settings", "help"],
     "sales_manager": ["overview", "projects", "users", "finance", "notifications", "settings", "help"],
     "dispatcher": ["overview", "projects", "users", "finance", "notifications", "settings", "help"],
-    "field_agent": ["overview", "settings", "notifications", "help"],
-    "sales_agent": ["overview", "settings", "notifications", "help"],
+    "field_agent": ["overview", "notifications", "projects", "payroll"],
+    "sales_agent": ["overview", "notifications", "projects", "payroll"],
     
     # Admin roles: No context switching - empty list means show all apps always
     "platform_admin": [],

src/app/services/dashboard_service.py

@@ -757,23 +757,45 @@ class DashboardService:
                     ProjectTeam.removed_at.is_(None)
                 ).count()
             
-            # Ticket stats across all projects
-            total_tickets = db.query(Ticket).filter(
-                Ticket.project_id.in_(project_ids) if project_ids else False,
-                Ticket.deleted_at.is_(None)
-            ).count()
-            
-            open_tickets = db.query(Ticket).filter(
-                Ticket.project_id.in_(project_ids) if project_ids else False,
-                Ticket.deleted_at.is_(None),
-                Ticket.status.in_(["open", "assigned"])
-            ).count()
-            
-            in_progress_tickets = db.query(Ticket).filter(
-                Ticket.project_id.in_(project_ids) if project_ids else False,
-                Ticket.deleted_at.is_(None),
-                Ticket.status == "in_progress"
-            ).count()
+            # Ticket stats - different for field agents vs managers
+            if current_user.role in [AppRole.FIELD_AGENT.value, AppRole.SALES_AGENT.value]:
+                # Field agents: Only their assigned tickets
+                from app.models.ticket_assignment import TicketAssignment
+                
+                total_tickets = db.query(TicketAssignment).filter(
+                    TicketAssignment.user_id == current_user.id,
+                    TicketAssignment.deleted_at.is_(None)
+                ).count()
+                
+                open_tickets = db.query(TicketAssignment).filter(
+                    TicketAssignment.user_id == current_user.id,
+                    TicketAssignment.status.in_(["assigned"]),
+                    TicketAssignment.deleted_at.is_(None)
+                ).count()
+                
+                in_progress_tickets = db.query(TicketAssignment).filter(
+                    TicketAssignment.user_id == current_user.id,
+                    TicketAssignment.status.in_(["en_route", "in_progress"]),
+                    TicketAssignment.deleted_at.is_(None)
+                ).count()
+            else:
+                # Managers/admins: All tickets in their projects
+                total_tickets = db.query(Ticket).filter(
+                    Ticket.project_id.in_(project_ids) if project_ids else False,
+                    Ticket.deleted_at.is_(None)
+                ).count()
+                
+                open_tickets = db.query(Ticket).filter(
+                    Ticket.project_id.in_(project_ids) if project_ids else False,
+                    Ticket.deleted_at.is_(None),
+                    Ticket.status.in_(["open", "assigned"])
+                ).count()
+                
+                in_progress_tickets = db.query(Ticket).filter(
+                    Ticket.project_id.in_(project_ids) if project_ids else False,
+                    Ticket.deleted_at.is_(None),
+                    Ticket.status == "in_progress"
+                ).count()
             
             # Unread notifications
             unread_notifications = db.query(Notification).filter(
@@ -782,10 +804,36 @@ class DashboardService:
                 Notification.deleted_at.is_(None)
             ).count()
             
-            # Expense stats (for managers/admins)
+            # Expense stats
             total_expenses = 0.0
             pending_expenses = 0
-            if current_user.role in [AppRole.PROJECT_MANAGER.value, AppRole.CONTRACTOR_ADMIN.value, AppRole.CLIENT_ADMIN.value, AppRole.PLATFORM_ADMIN.value]:
+            
+            if current_user.role in [AppRole.FIELD_AGENT.value, AppRole.SALES_AGENT.value]:
+                # Field agents: Only their own expenses
+                from app.models.ticket_assignment import TicketAssignment
+                
+                expense_sum = db.query(func.sum(TicketExpense.total_cost)).join(
+                    Ticket
+                ).join(
+                    TicketAssignment, TicketAssignment.ticket_id == Ticket.id
+                ).filter(
+                    TicketAssignment.user_id == current_user.id,
+                    TicketExpense.deleted_at.is_(None)
+                ).scalar()
+                total_expenses = float(expense_sum) if expense_sum else 0.0
+                
+                pending_expenses = db.query(TicketExpense).join(
+                    Ticket
+                ).join(
+                    TicketAssignment, TicketAssignment.ticket_id == Ticket.id
+                ).filter(
+                    TicketAssignment.user_id == current_user.id,
+                    TicketExpense.deleted_at.is_(None),
+                    TicketExpense.is_approved == False
+                ).count()
+                
+            elif current_user.role in [AppRole.PROJECT_MANAGER.value, AppRole.CONTRACTOR_ADMIN.value, AppRole.CLIENT_ADMIN.value, AppRole.PLATFORM_ADMIN.value]:
+                # Managers/admins: All expenses in their projects
                 expense_sum = db.query(func.sum(TicketExpense.total_cost)).join(
                     Ticket
                 ).filter(
@@ -851,49 +899,86 @@ class DashboardService:
             if current_user.role in [AppRole.FIELD_AGENT.value, AppRole.SALES_AGENT.value]:
                 work_queue = DashboardService._get_work_queue(db, current_user, limit)
             
-            response = {
-                "user_info": {
-                    "id": str(current_user.id),
-                    "name": current_user.name,
-                    "email": current_user.email,
-                    "role": current_user.role
-                },
-                "projects": {
-                    "total": total_projects,
-                    "active": active_projects
-                },
-                "team": {
-                    "total_members": total_team_members
-                },
-                "tickets": {
-                    "total": total_tickets,
-                    "open": open_tickets,
-                    "in_progress": in_progress_tickets
-                },
-                "notifications": {
-                    "unread": unread_notifications
-                },
-                "expenses": {
-                    "total_amount": total_expenses,
-                    "pending_approval": pending_expenses
-                },
-                "sales_orders": {
-                    "total": total_orders,
-                    "pending": pending_orders
-                },
-                "inventory": {
-                    "total_value": total_inventory_value,
-                    "active_assignments": active_assignments
-                },
-                "generated_at": datetime.utcnow().isoformat() + "Z"
-            }
-            
-            # Add field agent specific data
-            if field_agent_stats:
-                response["field_agent_stats"] = field_agent_stats
-            
-            if work_queue:
-                response["work_queue"] = work_queue
+            # Build response based on role
+            if current_user.role in [AppRole.FIELD_AGENT.value, AppRole.SALES_AGENT.value]:
+                # Simplified response for field agents - only what they care about
+                response = {
+                    "user_info": {
+                        "id": str(current_user.id),
+                        "name": current_user.name,
+                        "email": current_user.email,
+                        "role": current_user.role
+                    },
+                    "projects": {
+                        "total": total_projects,
+                        "active": active_projects
+                    },
+                    "my_tickets": {
+                        "total_assigned": total_tickets,
+                        "pending": open_tickets,
+                        "in_progress": in_progress_tickets,
+                        "completed_this_week": field_agent_stats["tickets_completed_this_week"] if field_agent_stats else 0
+                    },
+                    "my_expenses": {
+                        "total_amount": total_expenses,
+                        "pending_approval": pending_expenses,
+                        "pending_amount": field_agent_stats["pending_expenses_amount"] if field_agent_stats else 0.0
+                    },
+                    "my_inventory": {
+                        "items_on_hand": field_agent_stats["inventory_on_hand"] if field_agent_stats else 0
+                    },
+                    "my_time": {
+                        "hours_worked_this_week": field_agent_stats["hours_worked_this_week"] if field_agent_stats else 0.0
+                    },
+                    "notifications": {
+                        "unread": unread_notifications
+                    },
+                    "work_queue": work_queue if work_queue else {
+                        "pending_assignments": [],
+                        "total_pending": 0,
+                        "high_priority": 0,
+                        "due_today": 0
+                    },
+                    "generated_at": datetime.utcnow().isoformat() + "Z"
+                }
+            else:
+                # Full response for managers/admins
+                response = {
+                    "user_info": {
+                        "id": str(current_user.id),
+                        "name": current_user.name,
+                        "email": current_user.email,
+                        "role": current_user.role
+                    },
+                    "projects": {
+                        "total": total_projects,
+                        "active": active_projects
+                    },
+                    "team": {
+                        "total_members": total_team_members
+                    },
+                    "tickets": {
+                        "total": total_tickets,
+                        "open": open_tickets,
+                        "in_progress": in_progress_tickets
+                    },
+                    "notifications": {
+                        "unread": unread_notifications
+                    },
+                    "expenses": {
+                        "total_amount": total_expenses,
+                        "pending_approval": pending_expenses
+                    },
+                    "sales_orders": {
+                        "total": total_orders,
+                        "pending": pending_orders
+                    },
+                    "inventory": {
+                        "total_value": total_inventory_value,
+                        "active_assignments": active_assignments
+                    },
+                    "generated_at": datetime.utcnow().isoformat() + "Z"
+                }
             
             return response