fix: reports

.nuget-scratch/NuGet.Config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+</configuration>

TaskTrackingSystem.Database/AppDbContextModels/AppDbContext.cs

@@ -178,7 +178,11 @@ public partial class AppDbContext : DbContext
                 .HasDefaultValueSql("(getdate())")
                 .HasColumnType("datetime");
             entity.Property(e => e.Description).HasMaxLength(1000);
+            entity.Property(e => e.DelayReason).HasMaxLength(300);
+            entity.Property(e => e.BlockedBy).HasMaxLength(200);
             entity.Property(e => e.DueDate).HasColumnType("datetime");
+            entity.Property(e => e.EscalationLevel).HasDefaultValue(0);
+            entity.Property(e => e.IsBlocked).HasDefaultValue(false);
             entity.Property(e => e.IsDeleted).HasDefaultValue(false);
             entity.Property(e => e.PriorityId).HasDefaultValue(TaskPriority.Medium);
             entity.Property(e => e.StartDate).HasColumnType("datetime");

TaskTrackingSystem.Database/AppDbContextModels/Issue.cs

@@ -20,6 +20,14 @@ public partial class Issue
 
     public decimal? ActualHours { get; set; }
 
+    public string? DelayReason { get; set; }
+
+    public bool IsBlocked { get; set; }
+
+    public string? BlockedBy { get; set; }
+
+    public int EscalationLevel { get; set; }
+
     public DateTime StartDate { get; set; }
 
     public DateTime DueDate { get; set; }

TaskTrackingSystem.Shared/Models/Issue/CreateIssueDto.cs

@@ -27,6 +27,17 @@ namespace TaskTrackingSystem.Shared.Models.Issue
         [Range(typeof(decimal), "0", "100000")]
         public decimal? ActualHours { get; set; }
 
+        [MaxLength(300)]
+        public string? DelayReason { get; set; }
+
+        public bool IsBlocked { get; set; }
+
+        [MaxLength(200)]
+        public string? BlockedBy { get; set; }
+
+        [Range(0, 3)]
+        public int EscalationLevel { get; set; }
+
         [Required]
         public DateTime StartDate { get; set; }
 

TaskTrackingSystem.Shared/Models/Issue/IssueDto.cs

@@ -16,6 +16,10 @@ namespace TaskTrackingSystem.Shared.Models.Issue
         public string? AssignedToName { get; set; }
         public decimal? EstimatedHours { get; set; }
         public decimal? ActualHours { get; set; }
+        public string? DelayReason { get; set; }
+        public bool IsBlocked { get; set; }
+        public string? BlockedBy { get; set; }
+        public int EscalationLevel { get; set; }
         public DateTime StartDate { get; set; }
         public DateTime DueDate { get; set; }
         public AppTaskStatus StatusId { get; set; }

TaskTrackingSystem.Shared/Models/Issue/UpdateIssueDto.cs

@@ -23,6 +23,17 @@ namespace TaskTrackingSystem.Shared.Models.Issue
         [Range(typeof(decimal), "0", "100000")]
         public decimal? ActualHours { get; set; }
 
+        [MaxLength(300)]
+        public string? DelayReason { get; set; }
+
+        public bool IsBlocked { get; set; }
+
+        [MaxLength(200)]
+        public string? BlockedBy { get; set; }
+
+        [Range(0, 3)]
+        public int EscalationLevel { get; set; }
+
         [Required]
         public DateTime StartDate { get; set; }
 

TaskTrackingSystem.Shared/Models/Report/EmployeeProductivityReportDto.cs

@@ -7,6 +7,14 @@ public class EmployeeProductivityReportDto
     public string Username { get; set; } = string.Empty;
     public int AssignedCount { get; set; }
     public int CompletedCount { get; set; }
+    public int AssignedIssues { get; set; }
+    public int OpenIssues { get; set; }
+    public int OverdueIssues { get; set; }
+    public decimal ActualHours { get; set; }
+    public string WorkloadLevel { get; set; } = "Balanced";
+    public double AverageCompletionTimeDays { get; set; }
+    public string Trend { get; set; } = "Stable";
+    public double CompletionRate { get; set; }
     public double Efficiency { get; set; }
     public double OnTimeDeliveryRate { get; set; }
 }

TaskTrackingSystem.Shared/Models/Report/IssueReportSummaryDto.cs

@@ -0,0 +1,13 @@
+namespace TaskTrackingSystem.Shared.Models.Report;
+
+public class IssueReportSummaryDto
+{
+    public int TotalIssues { get; set; }
+    public int OpenIssues { get; set; }
+    public int OverdueIssues { get; set; }
+    public int BlockedIssues { get; set; }
+    public decimal EstimatedHours { get; set; }
+    public decimal ActualHours { get; set; }
+    public decimal VarianceHours { get; set; }
+    public double UtilizationPercent { get; set; }
+}

TaskTrackingSystem.Shared/Models/Report/OverdueCriticalTaskDto.cs

@@ -15,5 +15,10 @@ namespace TaskTrackingSystem.Shared.Models.Report
         public DateTime DueDate { get; set; }
         public int DaysOverdue { get; set; }
         public DateTime CreatedAt { get; set; }
+        public int OverdueIssues { get; set; }
+        public string DelayReason { get; set; } = string.Empty;
+        public string BlockedBy { get; set; } = string.Empty;
+        public int EscalationLevel { get; set; }
+        public string RecordType { get; set; } = "Task";
     }
 }

TaskTrackingSystem.Shared/Models/Report/ProjectProgressReportDto.cs

@@ -8,7 +8,14 @@ public class ProjectProgressReportDto
     public DateTime EndDate { get; set; }
     public int TotalTasks { get; set; }
     public int CompletedTasks { get; set; }
+    public int OpenIssues { get; set; }
+    public int OverdueIssues { get; set; }
+    public int BlockedIssues { get; set; }
     public double Progress { get; set; }
     public bool IsAhead { get; set; }
     public bool IsAtRisk { get; set; }
+    public string ProjectHealth { get; set; } = "Healthy";
+    public DateTime LastActivity { get; set; }
+    public DateTime? NextMilestone { get; set; }
+    public decimal ActualHours { get; set; }
 }

TaskTrackingSystem.Shared/Models/Report/TaskReportDto.cs

@@ -20,5 +20,10 @@ namespace TaskTrackingSystem.Shared.Models.Report
         public string? AssignedByUser { get; set; }
         public DateTime DueDate { get; set; }
         public DateTime CreatedAt { get; set; }
+        public DateTime LastActivity { get; set; }
+        public int OpenIssues { get; set; }
+        public int OverdueIssues { get; set; }
+        public string IssueSummary { get; set; } = string.Empty;
+        public string TaskHealth { get; set; } = "Healthy";
     }
 }

TaskTrackingSystem.WebApi/Features/Issue/IssueService.cs

@@ -157,6 +157,10 @@ namespace TaskTrackingSystem.WebApi.Features.Issue
                 AssignedTo = dto.AssignedTo,
                 EstimatedHours = dto.EstimatedHours,
                 ActualHours = dto.ActualHours,
+                DelayReason = dto.DelayReason,
+                IsBlocked = dto.IsBlocked,
+                BlockedBy = dto.BlockedBy,
+                EscalationLevel = dto.EscalationLevel,
                 StartDate = dto.StartDate,
                 DueDate = dto.DueDate,
                 StatusId = dto.StatusId == 0 ? AppTaskStatus.Todo : dto.StatusId,
@@ -206,6 +210,10 @@ namespace TaskTrackingSystem.WebApi.Features.Issue
             issue.AssignedTo = dto.AssignedTo;
             issue.EstimatedHours = dto.EstimatedHours;
             issue.ActualHours = dto.ActualHours;
+            issue.DelayReason = dto.DelayReason;
+            issue.IsBlocked = dto.IsBlocked;
+            issue.BlockedBy = dto.BlockedBy;
+            issue.EscalationLevel = dto.EscalationLevel;
             issue.StartDate = dto.StartDate;
             issue.DueDate = dto.DueDate;
             issue.StatusId = dto.StatusId;
@@ -307,6 +315,10 @@ namespace TaskTrackingSystem.WebApi.Features.Issue
                     : null,
                 EstimatedHours = i.EstimatedHours,
                 ActualHours = i.ActualHours,
+                DelayReason = i.DelayReason,
+                IsBlocked = i.IsBlocked,
+                BlockedBy = i.BlockedBy,
+                EscalationLevel = i.EscalationLevel,
                 StartDate = i.StartDate,
                 DueDate = i.DueDate,
                 StatusId = i.StatusId,

TaskTrackingSystem.WebApi/Features/Report/ReportController.cs

@@ -29,7 +29,7 @@ namespace TaskTrackingSystem.WebApi.Features.Report
         [ProducesResponseType(typeof(List<IssueDto>), StatusCodes.Status200OK)]
         public async Task<ActionResult<Result<List<IssueDto>>>> GetIssuesReport()
         {
-            var result = await _reportService.GetIssuesReportAsync();
+            var result = await _reportService.GetIssuesReportAsync(User.GetRoleId(), User.GetUserId());
             return StatusCode(result.StatusCode, result);
         }
 

TaskTrackingSystem.WebApi/Features/Report/ReportService.cs

@@ -25,14 +25,16 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             _db = db;
         }
 
-        public async Task<Result<List<IssueDto>>> GetIssuesReportAsync()
+        public async Task<Result<List<IssueDto>>> GetIssuesReportAsync(long roleId, long currentUserId)
         {
-            var list = await _db.Issues
-                .Where(i => i.IsDeleted != true && i.Task.IsDeleted != true && i.Task.Project.IsDeleted != true)
+            var isAdmin = await DataScopeAuthorization.IsAdminScopeAsync(_db, roleId);
+            var isManager = await DataScopeAuthorization.IsManagerScopeAsync(_db, roleId);
+            var list = await BuildAccessibleIssueQuery(isAdmin, isManager, currentUserId)
                 .Include(i => i.Task)
                 .ThenInclude(t => t.Project)
                 .Include(i => i.AssignedToNavigation)
-                .OrderBy(i => i.Title)
+                .OrderBy(i => i.DueDate)
+                .ThenBy(i => i.Title)
                 .Select(i => new IssueDto
                 {
                     Id = i.Id,
@@ -48,6 +50,10 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                         : null,
                     EstimatedHours = i.EstimatedHours,
                     ActualHours = i.ActualHours,
+                    DelayReason = i.DelayReason,
+                    IsBlocked = i.IsBlocked,
+                    BlockedBy = i.BlockedBy,
+                    EscalationLevel = i.EscalationLevel,
                     StartDate = i.StartDate,
                     DueDate = i.DueDate,
                     StatusId = i.StatusId,
@@ -75,6 +81,29 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             return _db.Users.Where(u => !u.IsDeleted);
         }
 
+        private IQueryable<TaskTrackingSystem.Database.AppDbContextModels.Issue> BuildAccessibleIssueQuery(bool isAdmin, bool isManager, long currentUserId)
+        {
+            var query = _db.Issues
+                .Where(i => i.IsDeleted != true && i.Task.IsDeleted != true && i.Task.Project.IsDeleted != true);
+
+            if (isAdmin)
+            {
+                return query;
+            }
+
+            if (isManager)
+            {
+                return query.Where(i =>
+                    i.AssignedTo == currentUserId ||
+                    i.CreatedBy == currentUserId ||
+                    i.Task.Project.ProjectMembers.Any(pm => pm.UserId == currentUserId));
+            }
+
+            return query.Where(i =>
+                i.AssignedTo == currentUserId ||
+                i.CreatedBy == currentUserId);
+        }
+
         private static PagedResult<TDestination> MapPagedResult<TSource, TDestination>(
             PagedResult<TSource> source,
             Func<TSource, TDestination> map)
@@ -187,10 +216,96 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                 AssignedToUser = t.AssignedToNavigation != null ? $"{t.AssignedToNavigation.FirstName} {t.AssignedToNavigation.LastName}" : null,
                 AssignedByUser = t.AssignedByNavigation != null ? $"{t.AssignedByNavigation.FirstName} {t.AssignedByNavigation.LastName}" : null,
                 DueDate = t.DueDate,
-                CreatedAt = t.CreatedAt ?? DateTime.UtcNow
+                CreatedAt = t.CreatedAt ?? DateTime.UtcNow,
+                LastActivity = t.UpdatedAt ?? t.CreatedAt ?? DateTime.UtcNow
             };
         }
 
+        private async System.Threading.Tasks.Task EnrichTaskReportsAsync(List<TaskReportDto> reports)
+        {
+            if (reports.Count == 0)
+            {
+                return;
+            }
+
+            var today = DateTime.Today;
+            var taskIds = reports.Select(r => r.TaskId).ToList();
+            var issues = await _db.Issues
+                .Where(i => i.IsDeleted != true && taskIds.Contains(i.TaskId))
+                .Select(i => new
+                {
+                    i.TaskId,
+                    i.Title,
+                    i.StatusId,
+                    i.PriorityId,
+                    i.DueDate,
+                    i.UpdatedAt,
+                    i.CreatedAt,
+                    i.IsBlocked
+                })
+                .ToListAsync();
+
+            foreach (var report in reports)
+            {
+                var taskIssues = issues.Where(i => i.TaskId == report.TaskId).ToList();
+                report.OpenIssues = taskIssues.Count(i => i.StatusId != AppTaskStatus.Done);
+                report.OverdueIssues = taskIssues.Count(i => i.StatusId != AppTaskStatus.Done && i.DueDate.Date < today);
+                report.IssueSummary = taskIssues.Count == 0
+                    ? "No issues"
+                    : $"{report.OpenIssues} open, {report.OverdueIssues} overdue, {taskIssues.Count(i => i.IsBlocked)} blocked";
+                report.LastActivity = taskIssues
+                    .Select(i => i.UpdatedAt ?? i.CreatedAt ?? report.LastActivity)
+                    .DefaultIfEmpty(report.LastActivity)
+                    .Max();
+
+                report.TaskHealth = report.StatusId == AppTaskStatus.Done
+                    ? "Healthy"
+                    : report.OverdueIssues > 0 || report.DueDate.Date < today || taskIssues.Any(i => i.IsBlocked)
+                        ? "Critical"
+                        : report.PriorityId == TaskPriority.High || report.DueDate.Date <= today.AddDays(3)
+                            ? "At Risk"
+                            : "Healthy";
+            }
+        }
+
+        private async System.Threading.Tasks.Task EnrichOverdueTaskReportsAsync(List<OverdueCriticalTaskDto> reports)
+        {
+            if (reports.Count == 0)
+            {
+                return;
+            }
+
+            var today = DateTime.Today;
+            var taskIds = reports.Select(r => r.TaskId).ToList();
+            var issues = await _db.Issues
+                .Where(i => i.IsDeleted != true && taskIds.Contains(i.TaskId))
+                .Select(i => new
+                {
+                    i.TaskId,
+                    i.StatusId,
+                    i.DueDate,
+                    i.DelayReason,
+                    i.IsBlocked,
+                    i.BlockedBy,
+                    i.EscalationLevel
+                })
+                .ToListAsync();
+
+            foreach (var report in reports)
+            {
+                var taskIssues = issues.Where(i => i.TaskId == report.TaskId).ToList();
+                report.OverdueIssues = taskIssues.Count(i => i.StatusId != AppTaskStatus.Done && i.DueDate.Date < today);
+                var riskIssue = taskIssues
+                    .OrderByDescending(i => i.IsBlocked)
+                    .ThenByDescending(i => i.EscalationLevel)
+                    .ThenBy(i => i.DueDate)
+                    .FirstOrDefault();
+                report.DelayReason = riskIssue?.DelayReason ?? (report.DaysOverdue > 0 ? "Past due date" : "High priority due soon");
+                report.BlockedBy = riskIssue?.BlockedBy ?? string.Empty;
+                report.EscalationLevel = riskIssue?.EscalationLevel ?? 0;
+            }
+        }
+
         // ——— Legacy endpoints (kept for backward compatibility) ———
 
         public async Task<Result<IEnumerable<TaskReportDto>>> GetTasksReportAsync(
@@ -205,6 +320,7 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                 .ThenByDescending(t => t.CreatedAt ?? DateTime.UtcNow)
                 .ToListAsync();
             var list = tasks.Select(MapTaskReport).ToList();
+            await EnrichTaskReportsAsync(list);
             return Result<IEnumerable<TaskReportDto>>.Success(list);
         }
 
@@ -228,7 +344,9 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                 .ThenByDescending(t => t.CreatedAt ?? DateTime.UtcNow)
                 .ToPagedResultAsync(page, pageSize);
 
-            return MapPagedResult(paged, MapTaskReport);
+            var mapped = MapPagedResult(paged, MapTaskReport);
+            await EnrichTaskReportsAsync(mapped.Items);
+            return mapped;
         }
 
         public async Task<Result<IEnumerable<UserProductivityDto>>> GetUserProductivityReportAsync(long roleId, long currentUserId)
@@ -517,6 +635,7 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                 DaysOverdue = t.DueDate < now ? (int)(now - t.DueDate).TotalDays : 0,
                 CreatedAt = t.CreatedAt ?? DateTime.UtcNow
             }).ToList();
+            await EnrichOverdueTaskReportsAsync(list);
 
             return Result<IEnumerable<OverdueCriticalTaskDto>>.Success(list);
         }
@@ -598,6 +717,7 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                 DaysOverdue = t.DueDate < now ? (int)(now - t.DueDate).TotalDays : 0,
                 CreatedAt = t.CreatedAt ?? DateTime.UtcNow
             });
+            await EnrichOverdueTaskReportsAsync(mapped.Items);
 
             return mapped;
         }
@@ -659,12 +779,21 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             }
 
             var tasks = await BuildAccessibleTaskQuery(isAdmin, isManager, currentUserId).ToListAsync();
+            var issues = await BuildAccessibleIssueQuery(isAdmin, isManager, currentUserId)
+                .Include(i => i.Task)
+                .ToListAsync();
 
             if (startDate.HasValue)
+            {
                 tasks = tasks.Where(t => t.CreatedAt >= startDate.Value.Date).ToList();
+                issues = issues.Where(i => (i.CreatedAt ?? DateTime.UtcNow) >= startDate.Value.Date).ToList();
+            }
 
             if (endDate.HasValue)
+            {
                 tasks = tasks.Where(t => t.CreatedAt < endDate.Value.Date.AddDays(1)).ToList();
+                issues = issues.Where(i => (i.CreatedAt ?? DateTime.UtcNow) < endDate.Value.Date.AddDays(1)).ToList();
+            }
 
             if (!string.IsNullOrWhiteSpace(status))
             {
@@ -672,11 +801,15 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                 if (sl == "overdue")
                 {
                     tasks = tasks.Where(t => t.StatusId != AppTaskStatus.Done && t.DueDate < DateTime.Today).ToList();
+                    issues = issues.Where(i => i.StatusId != AppTaskStatus.Done && i.DueDate.Date < DateTime.Today).ToList();
                 }
                 else if (sl != "0")
                 {
                     if (Enum.TryParse<AppTaskStatus>(status, true, out var parsedStatus))
+                    {
                         tasks = tasks.Where(t => t.StatusId == parsedStatus).ToList();
+                        issues = issues.Where(i => i.StatusId == parsedStatus).ToList();
+                    }
                 }
             }
 
@@ -684,14 +817,25 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             foreach (var user in users)
             {
                 var userTasks = tasks.Where(t => t.AssignedTo == user.Id).ToList();
+                var userIssues = issues.Where(i => i.AssignedTo == user.Id).ToList();
                 int total = userTasks.Count;
                 var completedTasks = userTasks.Where(t => t.StatusId == AppTaskStatus.Done).ToList();
                 int done = completedTasks.Count;
+                var completedIssues = userIssues.Where(i => i.StatusId == AppTaskStatus.Done).ToList();
 
                 int onTimeCount = completedTasks.Count(t =>
                     (t.UpdatedAt ?? t.CreatedAt) <= t.DueDate);
 
-                double onTimeDeliveryRate = done > 0 ? Math.Round(((double)onTimeCount / done) * 100, 2) : 0;
+                var onTimeIssueCount = completedIssues.Count(i => (i.UpdatedAt ?? i.CreatedAt ?? DateTime.UtcNow) <= i.DueDate);
+                double onTimeDeliveryRate = completedIssues.Count > 0
+                    ? Math.Round(((double)onTimeIssueCount / completedIssues.Count) * 100, 2)
+                    : done > 0 ? Math.Round(((double)onTimeCount / done) * 100, 2) : 0;
+                var openIssues = userIssues.Count(i => i.StatusId != AppTaskStatus.Done);
+                var overdueIssues = userIssues.Count(i => i.StatusId != AppTaskStatus.Done && i.DueDate.Date < DateTime.Today);
+                var completionRate = userIssues.Count > 0 ? Math.Round(((double)completedIssues.Count / userIssues.Count) * 100, 2) : 0;
+                var avgCompletionDays = completedIssues.Count > 0
+                    ? Math.Round(completedIssues.Average(i => Math.Max(0, ((i.UpdatedAt ?? i.CreatedAt ?? DateTime.UtcNow).Date - i.StartDate.Date).TotalDays)), 1)
+                    : 0;
 
                 list.Add(new EmployeeProductivityReportDto
                 {
@@ -700,7 +844,15 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                     FullName = $"{user.FirstName} {user.LastName}".Trim(),
                     AssignedCount = total,
                     CompletedCount = done,
-                    Efficiency = total > 0 ? Math.Round(((double)done / total) * 100, 2) : 0,
+                    AssignedIssues = userIssues.Count,
+                    OpenIssues = openIssues,
+                    OverdueIssues = overdueIssues,
+                    ActualHours = userIssues.Sum(i => i.ActualHours ?? 0),
+                    WorkloadLevel = openIssues >= 10 || overdueIssues >= 3 ? "High" : openIssues <= 2 ? "Light" : "Balanced",
+                    AverageCompletionTimeDays = avgCompletionDays,
+                    Trend = overdueIssues > 0 ? "Declining" : completionRate >= 80 ? "Improving" : "Stable",
+                    CompletionRate = completionRate,
+                    Efficiency = completionRate,
                     OnTimeDeliveryRate = onTimeDeliveryRate
                 });
             }
@@ -711,7 +863,7 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                 list = list.Where(u => u.FullName.ToLower().Contains(s) || u.Username.ToLower().Contains(s)).ToList();
             }
 
-            return Result<IEnumerable<EmployeeProductivityReportDto>>.Success(list.OrderByDescending(u => u.Efficiency));
+            return Result<IEnumerable<EmployeeProductivityReportDto>>.Success(list.OrderByDescending(u => u.OpenIssues).ThenByDescending(u => u.ActualHours));
         }
 
         public async Task<PagedResult<EmployeeProductivityReportDto>> GetPagedEmployeeProductivityReportAsync(
@@ -732,7 +884,7 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                 return new PagedResult<EmployeeProductivityReportDto>();
             }
 
-            var ordered = full.Value.OrderByDescending(u => u.Efficiency).ToList();
+            var ordered = full.Value.OrderByDescending(u => u.OpenIssues).ThenByDescending(u => u.ActualHours).ToList();
             var normalizedPageSize = PaginationExtensions.NormalizePageSize(pageSize);
             var totalCount = ordered.Count;
             var totalPages = totalCount == 0 ? 0 : (int)Math.Ceiling(totalCount / (double)normalizedPageSize);
@@ -781,6 +933,9 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             }
 
             var tasks = await BuildAccessibleTaskQuery(isAdmin, isManager, currentUserId).ToListAsync();
+            var issues = await BuildAccessibleIssueQuery(isAdmin, isManager, currentUserId)
+                .Include(i => i.Task)
+                .ToListAsync();
             var today = DateTime.Today;
 
             if (startDate.HasValue)
@@ -793,16 +948,19 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             foreach (var project in projects)
             {
                 var projectTasks = tasks.Where(t => t.ProjectId == project.Id).ToList();
+                var projectIssues = issues.Where(i => i.Task.ProjectId == project.Id).ToList();
 
                 if (!string.IsNullOrWhiteSpace(status))
                 {
                     if (status.Equals("overdue", StringComparison.OrdinalIgnoreCase))
                     {
                         projectTasks = projectTasks.Where(t => t.DueDate.Date < today && t.StatusId != AppTaskStatus.Done).ToList();
+                        projectIssues = projectIssues.Where(i => i.DueDate.Date < today && i.StatusId != AppTaskStatus.Done).ToList();
                     }
                     else if (status != "0" && Enum.TryParse<AppTaskStatus>(status, true, out var parsedStatus))
                     {
                         projectTasks = projectTasks.Where(t => t.StatusId == parsedStatus).ToList();
+                        projectIssues = projectIssues.Where(i => i.StatusId == parsedStatus).ToList();
                     }
                 }
 
@@ -821,8 +979,19 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                 }
 
                 bool isAhead = progress > elapsedPct && progress > 0 && progress < 100;
+                var openIssues = projectIssues.Count(i => i.StatusId != AppTaskStatus.Done);
+                var overdueIssues = projectIssues.Count(i => i.StatusId != AppTaskStatus.Done && i.DueDate.Date < today);
+                var blockedIssues = projectIssues.Count(i => i.IsBlocked);
                 bool isAtRisk = (projectTasks.Any(t => t.StatusId != AppTaskStatus.Done && t.DueDate.Date < today)) ||
+                                overdueIssues > 0 ||
+                                blockedIssues > 0 ||
                                 (project.EndDate.Date < today && progress < 100);
+                var health = isAtRisk && (overdueIssues > 0 || blockedIssues > 0) ? "Critical" : isAtRisk ? "At Risk" : "Healthy";
+                var lastActivity = projectIssues
+                    .Select(i => i.UpdatedAt ?? i.CreatedAt ?? project.CreatedAt ?? DateTime.UtcNow)
+                    .Concat(projectTasks.Select(t => t.UpdatedAt ?? t.CreatedAt ?? DateTime.UtcNow))
+                    .DefaultIfEmpty(project.CreatedAt ?? DateTime.UtcNow)
+                    .Max();
 
                 list.Add(new ProjectProgressReportDto
                 {
@@ -832,9 +1001,16 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                     EndDate = project.EndDate,
                     TotalTasks = totalTasks,
                     CompletedTasks = completedTasks,
+                    OpenIssues = openIssues,
+                    OverdueIssues = overdueIssues,
+                    BlockedIssues = blockedIssues,
                     Progress = progress,
                     IsAhead = isAhead,
-                    IsAtRisk = isAtRisk
+                    IsAtRisk = isAtRisk,
+                    ProjectHealth = health,
+                    LastActivity = lastActivity,
+                    NextMilestone = project.EndDate.Date >= today ? project.EndDate : null,
+                    ActualHours = projectIssues.Sum(i => i.ActualHours ?? 0)
                 });
             }
 

TaskTrackingSystem.WebApi/Program.cs

@@ -134,6 +134,8 @@ static async System.Threading.Tasks.Task EnsureSeedDataAsync(WebApplication app)
     using var scope = app.Services.CreateScope();
     var db = scope.ServiceProvider.GetRequiredService<AppDbContext>();
 
+    await EnsureReportUpgradeSchemaAsync(db);
+
     var dashboardMenu = await db.Menus.FirstOrDefaultAsync(m => m.MenuCode == "DASHBOARD");
     if (dashboardMenu == null)
     {
@@ -316,6 +318,8 @@ static async System.Threading.Tasks.Task EnsureSeedDataAsync(WebApplication app)
 
     await db.SaveChangesAsync();
 
+    await EnsureIssueReportMenuAsync(db);
+
     // Soft-delete existing tasks that belong to deleted projects
     var orphanedTasks = await db.Tasks
         .Where(t => t.IsDeleted != true && t.Project.IsDeleted == true)
@@ -332,3 +336,82 @@ static async System.Threading.Tasks.Task EnsureSeedDataAsync(WebApplication app)
 
     await db.SaveChangesAsync();
 }
+
+static async System.Threading.Tasks.Task EnsureReportUpgradeSchemaAsync(AppDbContext db)
+{
+    await db.Database.ExecuteSqlRawAsync(@"
+IF COL_LENGTH('dbo.Issues', 'DelayReason') IS NULL
+    ALTER TABLE [dbo].[Issues] ADD [DelayReason] NVARCHAR(300) NULL;
+
+IF COL_LENGTH('dbo.Issues', 'IsBlocked') IS NULL
+    ALTER TABLE [dbo].[Issues] ADD [IsBlocked] BIT NOT NULL CONSTRAINT [DF_Issues_IsBlocked] DEFAULT ((0));
+
+IF COL_LENGTH('dbo.Issues', 'BlockedBy') IS NULL
+    ALTER TABLE [dbo].[Issues] ADD [BlockedBy] NVARCHAR(200) NULL;
+
+IF COL_LENGTH('dbo.Issues', 'EscalationLevel') IS NULL
+    ALTER TABLE [dbo].[Issues] ADD [EscalationLevel] INT NOT NULL CONSTRAINT [DF_Issues_EscalationLevel] DEFAULT ((0));
+");
+}
+
+static async System.Threading.Tasks.Task EnsureIssueReportMenuAsync(AppDbContext db)
+{
+    var reportsMenu = await db.Menus.FirstOrDefaultAsync(m => m.MenuCode == "REPORTS" && !m.IsDeleted);
+    var issueReportMenu = await db.Menus.FirstOrDefaultAsync(m => m.MenuCode == "REPORTS_ISSUES");
+
+    if (issueReportMenu == null)
+    {
+        issueReportMenu = new Menu
+        {
+            MenuCode = "REPORTS_ISSUES",
+            ParentMenuId = reportsMenu?.MenuId,
+            MenuName = "Issue Report",
+            MenuUrl = "/reports/issues",
+            Icon = "file-pen-line",
+            Visible = true,
+            OrderNo = 15,
+            IsDeleted = false,
+            CreatedAt = DateTime.UtcNow
+        };
+        db.Menus.Add(issueReportMenu);
+        await db.SaveChangesAsync();
+    }
+    else
+    {
+        issueReportMenu.ParentMenuId = reportsMenu?.MenuId;
+        issueReportMenu.MenuName = "Issue Report";
+        issueReportMenu.MenuUrl = "/reports/issues";
+        issueReportMenu.Icon = "file-pen-line";
+        issueReportMenu.Visible = true;
+        issueReportMenu.OrderNo = 15;
+        issueReportMenu.IsDeleted = false;
+        issueReportMenu.UpdatedAt = DateTime.UtcNow;
+        await db.SaveChangesAsync();
+    }
+
+    var reportRoles = await db.Roles
+        .Where(role => !role.IsDeleted && (role.Name == "Admin" || role.Name == "Manager" || role.Name == "Employee"))
+        .ToListAsync();
+
+    foreach (var role in reportRoles)
+    {
+        var roleMenu = await db.RoleMenus.FirstOrDefaultAsync(rm => rm.RoleId == role.Id && rm.MenuId == issueReportMenu.MenuId);
+        if (roleMenu == null)
+        {
+            db.RoleMenus.Add(new RoleMenu
+            {
+                RoleId = role.Id,
+                MenuId = issueReportMenu.MenuId,
+                IsDeleted = false,
+                CreatedAt = DateTime.UtcNow
+            });
+        }
+        else
+        {
+            roleMenu.IsDeleted = false;
+            roleMenu.UpdatedAt = DateTime.UtcNow;
+        }
+    }
+
+    await db.SaveChangesAsync();
+}

TaskTrackingSystem.WebApp/Components/Pages/Features/Issues/AddIssue.razor

@@ -111,6 +111,36 @@
                     </select>
                 </div>
 
+                <div>
+                    <label class="block text-sm font-medium text-slate-700 mb-1.5">Blocked Status</label>
+                    <label class="flex h-10 items-center gap-2 rounded-lg border border-slate-200 px-3 text-sm text-slate-700">
+                        <input type="checkbox" @bind="formIsBlocked" class="h-4 w-4 rounded border-slate-300 text-violet-600 focus:ring-violet-500" />
+                        <span>Blocked</span>
+                    </label>
+                </div>
+
+                <div>
+                    <label class="block text-sm font-medium text-slate-700 mb-1.5">Escalation Level</label>
+                    <select @bind="formEscalationLevel" class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 focus:outline-none focus:ring-2 focus:ring-violet-600 focus:border-transparent transition-all">
+                        <option value="0">None</option>
+                        <option value="1">Team Lead</option>
+                        <option value="2">PM</option>
+                        <option value="3">Manager</option>
+                    </select>
+                </div>
+
+                <div>
+                    <label class="block text-sm font-medium text-slate-700 mb-1.5">Blocked By</label>
+                    <input @bind="formBlockedBy" type="text" placeholder="Dependency, person, or team"
+                           class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 placeholder:text-slate-400 focus:outline-none focus:ring-2 focus:ring-violet-600 focus:border-transparent transition-all" />
+                </div>
+
+                <div>
+                    <label class="block text-sm font-medium text-slate-700 mb-1.5">Delay Reason</label>
+                    <input @bind="formDelayReason" type="text" placeholder="Why is this issue delayed?"
+                           class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 placeholder:text-slate-400 focus:outline-none focus:ring-2 focus:ring-violet-600 focus:border-transparent transition-all" />
+                </div>
+
                 <div>
                     <label class="block text-sm font-medium text-slate-700 mb-1.5">Project</label>
                     <input value="@SelectedProjectLabel" readonly
@@ -251,6 +281,10 @@
     private DateTime formDueDate = DateTime.Today;
     private AppTaskStatus formStatusId = AppTaskStatus.Todo;
     private TaskPriority formPriorityId = TaskPriority.Medium;
+    private string? formDelayReason;
+    private bool formIsBlocked;
+    private string? formBlockedBy;
+    private int formEscalationLevel;
     private string assigneeSearchInput = "";
     private bool isAssigneeDropdownOpen;
     private bool isLoadingProjectMembers;
@@ -471,6 +505,10 @@
                 AssignedTo = formAssignedTo,
                 EstimatedHours = formEstimatedHours,
                 ActualHours = formActualHours,
+                DelayReason = formDelayReason,
+                IsBlocked = formIsBlocked,
+                BlockedBy = formBlockedBy,
+                EscalationLevel = formEscalationLevel,
                 StartDate = formStartDate,
                 DueDate = formDueDate,
                 StatusId = formStatusId,
@@ -512,6 +550,10 @@
         formDueDate = DateTime.Today;
         formStatusId = AppTaskStatus.Todo;
         formPriorityId = TaskPriority.Medium;
+        formDelayReason = null;
+        formIsBlocked = false;
+        formBlockedBy = null;
+        formEscalationLevel = 0;
         taskErrorMessage = "";
         titleErrorMessage = "";
         isTaskError = false;

TaskTrackingSystem.WebApp/Components/Pages/Features/Issues/Issues.razor

@@ -108,8 +108,9 @@
                         <col class="w-[11%]" />
                         <col class="w-[11%]" />
                         <col class="w-[12%]" />
-                        <col class="w-[16%]" />
-                        <col class="w-[14%]" />
+                        <col class="w-[12%]" />
+                        <col class="w-[12%]" />
+                        <col class="w-[8%]" />
                         <col class="w-[10%]" />
                     </colgroup>
                     <thead>
@@ -121,6 +122,7 @@
                             <th class="px-5 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Priority</th>
                             <th class="px-5 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Dates</th>
                             <th class="px-5 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Assignee</th>
+                            <th class="px-5 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Risk</th>
                             <th class="px-5 py-3 text-center text-xs font-semibold text-slate-500 uppercase tracking-wider">Actions</th>
                         </tr>
                     </thead>
@@ -160,6 +162,20 @@
                                     <td class="px-5 py-4 text-sm text-slate-600 break-words">
                                         @(!string.IsNullOrWhiteSpace(issue.AssignedToName) ? issue.AssignedToName : "Unassigned")
                                     </td>
+                                    <td class="px-5 py-4">
+                                        @if (issue.IsBlocked)
+                                        {
+                                            <span class="inline-flex items-center rounded-full bg-rose-50 px-2 py-0.5 text-xs font-semibold text-rose-700">Blocked</span>
+                                        }
+                                        else if (issue.EscalationLevel > 0)
+                                        {
+                                            <span class="inline-flex items-center rounded-full bg-amber-50 px-2 py-0.5 text-xs font-semibold text-amber-700">@GetEscalationLabel(issue.EscalationLevel)</span>
+                                        }
+                                        else
+                                        {
+                                            <span class="text-xs text-slate-400">Clear</span>
+                                        }
+                                    </td>
                                     <td class="px-5 py-4 text-center">
                                         <div class="flex items-center justify-center gap-1">
                                             @if (canEditIssue)
@@ -181,7 +197,7 @@
                     }
                     else
                     {
-                            <EmptyState ColSpan="8" Icon="file-pen-line" Title="No issues yet" Subtitle="Create your first issue to start tracking daily work." />
+                            <EmptyState ColSpan="9" Icon="file-pen-line" Title="No issues yet" Subtitle="Create your first issue to start tracking daily work." />
                     }
                     </tbody>
                 </table>
@@ -199,9 +215,9 @@
 
 @if (showModal)
 {
-    <div class="fixed inset-0 z-50 flex items-center justify-center bg-black/40 backdrop-blur-sm">
-        <div class="bg-white rounded-2xl shadow-lg w-full max-w-2xl mx-4 overflow-hidden">
-            <div class="flex items-center justify-between px-6 py-4 border-b border-slate-100">
+    <div class="fixed inset-0 z-50 flex items-start justify-center overflow-y-auto bg-black/40 p-4 backdrop-blur-sm sm:p-6">
+        <div class="flex max-h-[calc(100vh-2rem)] w-full max-w-4xl flex-col overflow-hidden rounded-2xl bg-white shadow-xl sm:max-h-[calc(100vh-3rem)]">
+            <div class="shrink-0 flex items-center justify-between px-6 py-4 border-b border-slate-100">
                 <div>
                     <h3 class="text-lg font-semibold text-slate-900">Edit Issue</h3>
                     <p class="text-xs text-slate-500 mt-0.5">Issue #@editingId</p>
@@ -211,18 +227,50 @@
                 </button>
             </div>
 
-            <div class="p-6 space-y-4">
+            <div class="min-h-0 flex-1 overflow-y-auto p-6 space-y-4">
                 <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                    <div class="rounded-xl border border-slate-200 bg-slate-50 p-4">
+                    <div class="rounded-xl border border-slate-200 bg-slate-50 p-3">
                         <p class="text-xs font-semibold uppercase tracking-wider text-slate-400">Task</p>
                         <p class="mt-1 text-sm font-semibold text-slate-900">@SelectedTaskLabel</p>
                     </div>
-                    <div class="rounded-xl border border-slate-200 bg-slate-50 p-4">
+                    <div class="rounded-xl border border-slate-200 bg-slate-50 p-3">
                         <p class="text-xs font-semibold uppercase tracking-wider text-slate-400">Project</p>
                         <p class="mt-1 text-sm font-semibold text-slate-900">@SelectedProjectLabel</p>
                     </div>
                 </div>
 
+                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                    <div>
+                        <label class="block text-sm font-medium text-slate-700 mb-1.5">Blocked Status</label>
+                        <label class="flex h-10 items-center gap-2 rounded-lg border border-slate-200 px-3 text-sm text-slate-700">
+                            <input type="checkbox" @bind="formIsBlocked" class="h-4 w-4 rounded border-slate-300 text-violet-600 focus:ring-violet-500" />
+                            <span>Blocked</span>
+                        </label>
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium text-slate-700 mb-1.5">Escalation Level</label>
+                        <select @bind="formEscalationLevel" class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 focus:outline-none focus:ring-2 focus:ring-violet-600 focus:border-transparent transition-all">
+                            <option value="0">None</option>
+                            <option value="1">Team Lead</option>
+                            <option value="2">PM</option>
+                            <option value="3">Manager</option>
+                        </select>
+                    </div>
+                </div>
+
+                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                    <div>
+                        <label class="block text-sm font-medium text-slate-700 mb-1.5">Blocked By</label>
+                        <input @bind="formBlockedBy" type="text" placeholder="Dependency, person, or team"
+                               class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 placeholder:text-slate-400 focus:outline-none focus:ring-2 focus:ring-violet-600 focus:border-transparent transition-all" />
+                    </div>
+                    <div>
+                        <label class="block text-sm font-medium text-slate-700 mb-1.5">Delay Reason</label>
+                        <input @bind="formDelayReason" type="text" placeholder="Why is this issue delayed?"
+                               class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 placeholder:text-slate-400 focus:outline-none focus:ring-2 focus:ring-violet-600 focus:border-transparent transition-all" />
+                    </div>
+                </div>
+
                 <div>
                     <label class="block text-sm font-medium text-slate-700 mb-1.5">Title <span class="text-red-500">*</span></label>
                     <input @bind="formTitle" type="text" placeholder="Issue title"
@@ -231,7 +279,7 @@
 
                 <div>
                     <label class="block text-sm font-medium text-slate-700 mb-1.5">Description</label>
-                    <textarea @bind="formDescription" rows="4" placeholder="Describe the work..."
+                    <textarea @bind="formDescription" rows="3" placeholder="Describe the work..."
                               class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 placeholder:text-slate-400 focus:outline-none focus:ring-2 focus:ring-violet-600 focus:border-transparent transition-all"></textarea>
                 </div>
 
@@ -293,7 +341,7 @@
                 }
             </div>
 
-            <div class="flex items-center justify-end gap-3 px-6 py-4 border-t border-slate-100 bg-slate-50/50">
+            <div class="shrink-0 flex items-center justify-end gap-3 border-t border-slate-100 bg-white px-6 py-4 shadow-[0_-12px_24px_rgba(15,23,42,0.06)]">
                 <button @onclick="CloseModal" class="rounded-lg px-4 py-2 text-sm font-medium text-slate-600 hover:bg-slate-100 transition-colors">Cancel</button>
                 <button @onclick="RequestSaveConfirmation" disabled="@isSaving" class="rounded-lg bg-violet-600 px-4 py-2 text-sm font-medium text-white hover:bg-violet-700 disabled:opacity-50 transition-colors">
                     @(isSaving ? "Saving..." : "Update")
@@ -369,6 +417,10 @@
     private DateTime formDueDate = DateTime.Today;
     private AppTaskStatus formStatusId = AppTaskStatus.Todo;
     private TaskPriority formPriorityId = TaskPriority.Medium;
+    private string? formDelayReason;
+    private bool formIsBlocked;
+    private string? formBlockedBy;
+    private int formEscalationLevel;
 
     private string SelectedTaskLabel => tasks.FirstOrDefault(t => t.Id == formTaskId)?.Title ?? $"Task #{formTaskId}";
     private string SelectedProjectLabel => tasks.FirstOrDefault(t => t.Id == formTaskId) is { } task
@@ -539,6 +591,10 @@
         formDueDate = issue.DueDate;
         formStatusId = issue.StatusId;
         formPriorityId = issue.PriorityId;
+        formDelayReason = issue.DelayReason;
+        formIsBlocked = issue.IsBlocked;
+        formBlockedBy = issue.BlockedBy;
+        formEscalationLevel = issue.EscalationLevel;
         errorMessage = null;
         showModal = true;
 
@@ -612,6 +668,10 @@
                 Description = formDescription,
                 AssignedTo = formAssignedTo,
                 ActualHours = formActualHours,
+                DelayReason = formDelayReason,
+                IsBlocked = formIsBlocked,
+                BlockedBy = formBlockedBy,
+                EscalationLevel = formEscalationLevel,
                 StartDate = formStartDate,
                 DueDate = formDueDate,
                 StatusId = formStatusId,
@@ -735,4 +795,12 @@
         TaskPriority.High => "High",
         _ => "Unknown"
     };
+
+    private static string GetEscalationLabel(int level) => level switch
+    {
+        1 => "Team Lead",
+        2 => "PM",
+        3 => "Manager",
+        _ => "None"
+    };
 }

TaskTrackingSystem.WebApp/Components/Pages/Features/Reports/EmployeeReport.razor

@@ -10,14 +10,14 @@
 @inject ApiClientService ApiClient
 @inject IJSRuntime JS
 
-<PageTitle>Employee Productivity Report</PageTitle>
+<PageTitle>Employee Workload &amp; Performance</PageTitle>
 
 <div class="space-y-6">
     <!-- Page Header -->
     <div class="flex flex-col md:flex-row md:items-center md:justify-between gap-4">
         <div>
-            <h2 class="text-3xl font-bold tracking-tight text-slate-900">Employee Productivity</h2>
-            <p class="text-slate-500 mt-1">Monitor task completion and performance metric charts.</p>
+            <h2 class="text-3xl font-bold tracking-tight text-slate-900">Employee Workload &amp; Performance</h2>
+            <p class="text-slate-500 mt-1">Monitor issue workload, execution health, and actual effort.</p>
         </div>
         <div class="flex items-center space-x-3">
             <div class="inline-flex rounded-lg border border-slate-200 bg-white p-0.5 shadow-sm">
@@ -113,7 +113,7 @@
         {
             <!-- Chart View: SVG Horizontal Bar Chart showing Efficiency -->
             <div class="rounded-xl border border-slate-200 bg-white p-6 shadow-sm">
-                <h3 class="font-semibold text-slate-900 mb-4 font-sans text-md">Employee Productivity Chart</h3>
+                <h3 class="font-semibold text-slate-900 mb-4 font-sans text-md">Workload by Employee</h3>
                 @if (!allEmployees.Any())
                 {
                     <p class="text-slate-400 text-center py-8">No data available.</p>
@@ -126,10 +126,10 @@
                             <div>
                                 <div class="flex justify-between text-xs font-semibold text-slate-700 mb-1.5">
                                     <span>@emp.FullName (@emp.Username)</span>
-                                    <span>@emp.CompletedCount / @emp.AssignedCount tasks (@emp.Efficiency.ToString("F0")% efficiency)</span>
+                                    <span>@emp.OpenIssues open, @emp.OverdueIssues overdue, @emp.ActualHours.ToString("N1") hrs</span>
                                 </div>
                                 <div class="h-4 rounded-full bg-slate-100 overflow-hidden flex">
-                                    <div class="h-full bg-emerald-500 rounded-full transition-all" style="width: @(Math.Min(emp.Efficiency, 100))%"></div>
+                                    <div class="h-full bg-violet-600 rounded-full transition-all" style="width: @(Math.Min(emp.OpenIssues * 10, 100))%"></div>
                                 </div>
                             </div>
                         }
@@ -146,10 +146,11 @@
                         <tr class="border-b border-slate-100 bg-slate-50/60">
                             <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">No.</th>
                             <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Employee</th>
-                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Total Assigned</th>
-                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Completed Tasks</th>
-                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Efficiency</th>
-                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">On-Time Delivery</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Assigned Issues</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Open / Overdue</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Actual Hours</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Workload</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Trend</th>
                         </tr>
                     </thead>
                     <tbody class="divide-y divide-slate-100">
@@ -171,34 +172,18 @@
                                             </div>
                                         </div>
                                     </td>
-                                    <td class="px-6 py-4 text-sm font-medium text-slate-900">@emp.AssignedCount</td>
-                                    <td class="px-6 py-4 text-sm font-medium text-emerald-600">@emp.CompletedCount</td>
-                                    <td class="px-6 py-4">
-                                        <div class="flex items-center space-x-3">
-                                            <div class="flex-1 h-2.5 rounded-full bg-slate-100 overflow-hidden max-w-[120px]">
-                                                <div class="h-full rounded-full bg-emerald-500 transition-all" style="width: @(Math.Min(emp.Efficiency, 100))%"></div>
-                                            </div>
-                                            <span class="text-sm font-semibold text-slate-700">@emp.Efficiency.ToString("F0")%</span>
-                                        </div>
-                                    </td>
-                                    <td class="px-6 py-4">
-                                        <div class="flex items-center space-x-3">
-                                            <div class="flex-1 h-2.5 rounded-full bg-slate-100 overflow-hidden max-w-[120px]">
-                                                <div class="h-full rounded-full @(emp.OnTimeDeliveryRate >= 80 ? "bg-emerald-500" : emp.OnTimeDeliveryRate >= 50 ? "bg-amber-400" : "bg-rose-500") transition-all" 
-                                                     style="width: @(Math.Min(emp.OnTimeDeliveryRate, 100))%"></div>
-                                            </div>
-                                            <span class="text-sm font-semibold @(emp.OnTimeDeliveryRate >= 80 ? "text-emerald-600" : emp.OnTimeDeliveryRate >= 50 ? "text-amber-500" : "text-rose-600")">
-                                                @emp.OnTimeDeliveryRate.ToString("F0")%
-                                            </span>
-                                        </div>
-                                    </td>
+                                    <td class="px-6 py-4 text-sm font-medium text-slate-900">@emp.AssignedIssues</td>
+                                    <td class="px-6 py-4 text-sm font-medium"><span class="text-blue-600">@emp.OpenIssues</span> / <span class="text-rose-600">@emp.OverdueIssues</span></td>
+                                    <td class="px-6 py-4 text-sm font-semibold text-slate-800">@emp.ActualHours.ToString("N1") hrs</td>
+                                    <td class="px-6 py-4"><span class="inline-flex rounded-full px-2.5 py-0.5 text-xs font-semibold @GetWorkloadBadge(emp.WorkloadLevel)">@emp.WorkloadLevel</span></td>
+                                    <td class="px-6 py-4"><span class="inline-flex rounded-full px-2.5 py-0.5 text-xs font-semibold @GetTrendBadge(emp.Trend)">@emp.Trend</span></td>
                                 </tr>
                             }
                         }
                         else
                         {
                             <tr>
-                                <td colspan="6" class="px-6 py-12 text-center">
+                                <td colspan="7" class="px-6 py-12 text-center">
                                     <p class="text-sm text-slate-400">No employee data found matching criteria.</p>
                                 </td>
                             </tr>
@@ -365,16 +350,18 @@
         {
             emp.FullName,
             emp.Username,
-            emp.AssignedCount,
-            emp.CompletedCount,
-            $"{emp.Efficiency:F0}%",
-            $"{emp.OnTimeDeliveryRate:F0}%"
+            emp.AssignedIssues,
+            emp.OpenIssues,
+            emp.OverdueIssues,
+            emp.ActualHours,
+            emp.WorkloadLevel,
+            emp.Trend
         });
 
         var workbookBytes = SpreadsheetReportBuilder.BuildTableWorkbook(
-            "Employee Productivity",
-            "Employee Productivity Report",
-            new[] { "Employee", "Username", "Total Assigned", "Completed", "Efficiency", "On-Time Delivery" },
+            "Employee Workload",
+            "Employee Workload & Performance Report",
+            new[] { "Employee", "Username", "Assigned Issues", "Open Issues", "Overdue Issues", "Actual Hours", "Workload", "Trend" },
             rows,
             new[]
             {
@@ -386,7 +373,7 @@
 
         await JS.InvokeVoidAsync(
             "downloadFileFromBase64",
-            $"EmployeeProductivityReport_{DateTime.Today:yyyyMMdd}.xlsx",
+            $"EmployeeWorkloadPerformance_{DateTime.Today:yyyyMMdd}.xlsx",
             "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
             Convert.ToBase64String(workbookBytes));
     }
@@ -405,22 +392,38 @@
         {
             emp.FullName,
             emp.Username,
-            emp.AssignedCount.ToString(),
-            emp.CompletedCount.ToString(),
-            $"{emp.Efficiency:F0}%",
-            $"{emp.OnTimeDeliveryRate:F0}%"
+            emp.AssignedIssues.ToString(),
+            emp.OpenIssues.ToString(),
+            emp.OverdueIssues.ToString(),
+            emp.ActualHours.ToString("N1"),
+            emp.WorkloadLevel,
+            emp.Trend
         });
 
         var pdfBytes = SimplePdfReportBuilder.BuildTableReport(
-            "Employee Productivity Report",
+            "Employee Workload & Performance Report",
             summaryLines,
-            new[] { "Employee", "Username", "Total Assigned", "Completed", "Efficiency", "On-Time Delivery" },
+            new[] { "Employee", "Username", "Assigned Issues", "Open", "Overdue", "Hours", "Workload", "Trend" },
             rows);
 
         await JS.InvokeVoidAsync(
             "downloadFileFromBase64",
-            $"EmployeeProductivityReport_{DateTime.Today:yyyyMMdd}.pdf",
+            $"EmployeeWorkloadPerformance_{DateTime.Today:yyyyMMdd}.pdf",
             "application/pdf",
             Convert.ToBase64String(pdfBytes));
     }
+
+    private static string GetWorkloadBadge(string workload) => workload switch
+    {
+        "High" => "bg-rose-50 text-rose-700",
+        "Light" => "bg-slate-100 text-slate-600",
+        _ => "bg-emerald-50 text-emerald-700"
+    };
+
+    private static string GetTrendBadge(string trend) => trend switch
+    {
+        "Improving" => "bg-emerald-50 text-emerald-700",
+        "Declining" => "bg-rose-50 text-rose-700",
+        _ => "bg-blue-50 text-blue-700"
+    };
 }

TaskTrackingSystem.WebApp/Components/Pages/Features/Reports/IssueReport.razor

@@ -0,0 +1,325 @@
+@page "/reports/issues"
+@using Microsoft.AspNetCore.Authorization
+@using TaskTrackingSystem.Shared
+@using TaskTrackingSystem.Shared.Enums
+@using TaskTrackingSystem.Shared.Models.Issue
+@using TaskTrackingSystem.Shared.Models.Project
+@rendermode @(new InteractiveServerRenderMode(prerender: false))
+@attribute [Authorize]
+@inject ApiClientService ApiClient
+@inject IJSRuntime JS
+
+<PageTitle>Issue Report</PageTitle>
+
+<div class="space-y-6">
+    <div class="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
+        <div>
+            <h2 class="text-3xl font-bold tracking-tight text-slate-900">Issue Report</h2>
+            <p class="mt-1 text-slate-500">Track daily execution, backlog health, and issue-level effort.</p>
+        </div>
+        <div class="flex flex-wrap items-center gap-3">
+            <div class="inline-flex rounded-lg border border-slate-200 bg-white p-0.5 shadow-sm">
+                <button @onclick="() => SetView(false)" class="inline-flex items-center rounded-md px-3 py-1.5 text-xs font-semibold @(!isChartView ? "bg-violet-600 text-white" : "text-slate-600 hover:text-slate-900")">
+                    <i data-lucide="list" class="mr-1 h-3.5 w-3.5"></i> List View
+                </button>
+                <button @onclick="() => SetView(true)" class="inline-flex items-center rounded-md px-3 py-1.5 text-xs font-semibold @(isChartView ? "bg-violet-600 text-white" : "text-slate-600 hover:text-slate-900")">
+                    <i data-lucide="bar-chart-3" class="mr-1 h-3.5 w-3.5"></i> Chart View
+                </button>
+            </div>
+            <button @onclick="DownloadExcel" class="inline-flex items-center rounded-lg border border-slate-200 bg-white px-4 py-2 text-sm font-medium text-slate-700 shadow-sm hover:bg-slate-50">
+                <i data-lucide="download" class="mr-2 h-4 w-4"></i> Export Excel
+            </button>
+            <button @onclick="DownloadPdf" class="inline-flex items-center rounded-lg border border-slate-200 bg-white px-4 py-2 text-sm font-medium text-slate-700 shadow-sm hover:bg-slate-50">
+                <i data-lucide="file-text" class="mr-2 h-4 w-4"></i> Export PDF
+            </button>
+        </div>
+    </div>
+
+    <div class="rounded-xl border border-slate-200 bg-white p-4 shadow-sm">
+        <div class="flex flex-wrap items-end gap-3">
+            <div class="min-w-[220px] flex-1">
+                <label class="mb-1.5 block text-xs font-medium text-slate-500">Search</label>
+                <input @bind="searchInput" type="text" placeholder="Search issue, task, project, assignee..."
+                       class="w-full rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 placeholder:text-slate-400 focus:outline-none focus:ring-2 focus:ring-violet-600" />
+            </div>
+            <div>
+                <label class="mb-1.5 block text-xs font-medium text-slate-500">Project</label>
+                <select @bind="filterProjectId" class="rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 focus:outline-none focus:ring-2 focus:ring-violet-600">
+                    <option value="0">All Projects</option>
+                    @foreach (var project in projects)
+                    {
+                        <option value="@project.Id">@project.Name</option>
+                    }
+                </select>
+            </div>
+            <div>
+                <label class="mb-1.5 block text-xs font-medium text-slate-500">Status</label>
+                <select @bind="filterStatus" class="rounded-lg border border-slate-200 px-3 py-2 text-sm text-slate-900 focus:outline-none focus:ring-2 focus:ring-violet-600">
+                    <option value="0">All Statuses</option>
+                    <option value="1">To Do</option>
+                    <option value="2">In Progress</option>
+                    <option value="3">Done</option>
+                    <option value="overdue">Overdue</option>
+                    <option value="blocked">Blocked</option>
+                </select>
+            </div>
+            <button @onclick="ApplyFilters" class="inline-flex items-center rounded-lg bg-violet-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-violet-700">
+                <i data-lucide="search" class="mr-2 h-4 w-4"></i> Search
+            </button>
+            <button @onclick="ResetFilters" class="inline-flex items-center rounded-lg border border-slate-200 bg-white px-4 py-2 text-sm font-medium text-slate-700 shadow-sm hover:bg-slate-50">
+                <i data-lucide="rotate-ccw" class="mr-2 h-4 w-4"></i> Reset
+            </button>
+        </div>
+    </div>
+
+    @if (isLoading)
+    {
+        <LoadingSpinner Message="Loading issue report..." />
+    }
+    else
+    {
+        <div class="grid grid-cols-1 gap-4 sm:grid-cols-2 xl:grid-cols-4">
+            @MetricCard("Total Issues", FilteredIssues.Count().ToString(), "file-pen-line", "violet")
+            @MetricCard("Open Issues", OpenIssues.ToString(), "list-todo", "blue")
+            @MetricCard("Overdue Issues", OverdueIssues.ToString(), "alarm-clock", "rose")
+            @MetricCard("Blocked Issues", BlockedIssues.ToString(), "ban", "amber")
+        </div>
+
+        <div class="rounded-xl border border-slate-200 bg-white p-5 shadow-sm">
+            <h3 class="text-sm font-semibold text-slate-900">Key Insights</h3>
+            <div class="mt-4 grid grid-cols-1 gap-3 md:grid-cols-3">
+                @foreach (var insight in Insights)
+                {
+                    <div class="rounded-lg border border-slate-100 bg-slate-50 px-3 py-2 text-sm text-slate-700">@insight</div>
+                }
+            </div>
+        </div>
+
+        <div class="rounded-xl border border-slate-200 bg-white p-5 shadow-sm">
+                @if (isChartView)
+                {
+                    <div class="grid grid-cols-1 gap-5 md:grid-cols-2">
+                        @BarChart("Issues by Status", StatusChart)
+                        @BarChart("Issues by Priority", PriorityChart)
+                        @BarChart("Issues by Employee", EmployeeChart)
+                        @BarChart("Issues by Project", ProjectChart)
+                    </div>
+                }
+                else
+                {
+                    <div class="overflow-x-auto">
+                        <table class="w-full">
+                            <thead>
+                                <tr class="border-b border-slate-100 bg-slate-50/60">
+                                    <th class="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-slate-500">Issue</th>
+                                    <th class="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-slate-500">Task / Project</th>
+                                    <th class="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-slate-500">Assignee</th>
+                                    <th class="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-slate-500">Status</th>
+                                    <th class="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-slate-500">Hours</th>
+                                    <th class="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-slate-500">Due</th>
+                                    <th class="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-slate-500">Risk</th>
+                                </tr>
+                            </thead>
+                            <tbody class="divide-y divide-slate-100">
+                                @foreach (var issue in PagedIssues)
+                                {
+                                    <tr class="align-top hover:bg-slate-50/50">
+                                        <td class="px-4 py-3">
+                                            <button @onclick="() => ToggleExpanded(issue.Id)" class="text-left text-sm font-semibold text-slate-900 hover:text-violet-600">@issue.Title</button>
+                                            @if (expandedIssues.Contains(issue.Id))
+                                            {
+                                                <div class="mt-2 rounded-lg bg-slate-50 p-3 text-xs text-slate-600">
+                                                    <div>@(string.IsNullOrWhiteSpace(issue.Description) ? "No description" : issue.Description)</div>
+                                                    <div class="mt-1">Delay: @(string.IsNullOrWhiteSpace(issue.DelayReason) ? "None recorded" : issue.DelayReason)</div>
+                                                    <div>Blocked by: @(string.IsNullOrWhiteSpace(issue.BlockedBy) ? "None" : issue.BlockedBy)</div>
+                                                </div>
+                                            }
+                                        </td>
+                                        <td class="px-4 py-3 text-sm text-slate-600"><div class="font-medium text-slate-800">@issue.TaskTitle</div><div class="text-xs text-slate-400">@issue.ProjectName</div></td>
+                                        <td class="px-4 py-3 text-sm text-slate-600">@(issue.AssignedToName ?? "Unassigned")</td>
+                                        <td class="px-4 py-3"><span class="rounded-full px-2 py-0.5 text-xs font-medium @GetStatusBadge(issue.StatusId)">@GetStatusLabel(issue.StatusId)</span></td>
+                                        <td class="px-4 py-3 text-sm text-slate-700">@((issue.EstimatedHours ?? 0).ToString("N1")) / @((issue.ActualHours ?? 0).ToString("N1"))</td>
+                                        <td class="px-4 py-3 text-sm @(IsOverdue(issue) ? "font-semibold text-rose-600" : "text-slate-600")">@DisplayFormats.Date(issue.DueDate)</td>
+                                        <td class="px-4 py-3">@RiskBadge(issue)</td>
+                                    </tr>
+                                }
+                                @if (!PagedIssues.Any())
+                                {
+                                    <EmptyState ColSpan="7" Icon="file-pen-line" Title="No issues found" Subtitle="No issues matched the current report filters." />
+                                }
+                            </tbody>
+                        </table>
+                    </div>
+                    <Pagination CurrentPage="currentPage" TotalPages="TotalPages" PageSize="pageSize" TotalCount="FilteredIssues.Count()" OnPageChanged="HandlePageChanged" OnPageSizeChanged="HandlePageSizeChanged" />
+                }
+        </div>
+    }
+</div>
+
+@code {
+    private bool isLoading = true;
+    private bool isChartView;
+    private List<IssueDto> issues = new();
+    private List<ProjectDto> projects = new();
+    private HashSet<long> expandedIssues = new();
+    private string searchInput = string.Empty;
+    private string appliedSearch = string.Empty;
+    private long filterProjectId;
+    private long appliedProjectId;
+    private string filterStatus = "0";
+    private string appliedStatus = "0";
+    private int currentPage = 1;
+    private int pageSize = 10;
+    private const string StorageKey = "tts.report.issues.filters";
+
+    private IEnumerable<IssueDto> FilteredIssues => issues.Where(MatchesFilters).OrderBy(i => i.DueDate).ThenBy(i => i.Title);
+    private IEnumerable<IssueDto> PagedIssues => FilteredIssues.Skip((currentPage - 1) * pageSize).Take(pageSize);
+    private int TotalPages => (int)Math.Ceiling((double)FilteredIssues.Count() / pageSize);
+    private int OpenIssues => FilteredIssues.Count(i => i.StatusId != AppTaskStatus.Done);
+    private int OverdueIssues => FilteredIssues.Count(IsOverdue);
+    private int BlockedIssues => FilteredIssues.Count(i => i.IsBlocked);
+
+    protected override async Task OnInitializedAsync()
+    {
+        var client = ApiClient.CreateClient();
+        try
+        {
+            var issuesTask = client.GetFromJsonAsync<Result<List<IssueDto>>>("Report/issues", Serialization.CaseInsensitive);
+            var projectsTask = client.GetFromJsonAsync<List<ProjectDto>>("Project", Serialization.CaseInsensitive);
+            await Task.WhenAll(issuesTask, projectsTask);
+            issues = issuesTask.Result?.Value ?? new();
+            projects = projectsTask.Result ?? new();
+        }
+        finally
+        {
+            isLoading = false;
+        }
+    }
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        await JS.InvokeVoidAsync("initIcons");
+        if (firstRender)
+        {
+            await LoadSavedFilters();
+        }
+    }
+
+    private bool MatchesFilters(IssueDto issue)
+    {
+        if (appliedProjectId > 0 && issue.ProjectId != appliedProjectId) return false;
+        if (appliedStatus == "overdue" && !IsOverdue(issue)) return false;
+        if (appliedStatus == "blocked" && !issue.IsBlocked) return false;
+        if (int.TryParse(appliedStatus, out var statusValue) && statusValue > 0 && (int)issue.StatusId != statusValue) return false;
+        if (!string.IsNullOrWhiteSpace(appliedSearch))
+        {
+            var s = appliedSearch.Trim();
+            return issue.Title.Contains(s, StringComparison.OrdinalIgnoreCase)
+                || issue.TaskTitle.Contains(s, StringComparison.OrdinalIgnoreCase)
+                || issue.ProjectName.Contains(s, StringComparison.OrdinalIgnoreCase)
+                || (issue.AssignedToName?.Contains(s, StringComparison.OrdinalIgnoreCase) == true);
+        }
+        return true;
+    }
+
+    private async Task ApplyFilters()
+    {
+        appliedSearch = searchInput;
+        appliedProjectId = filterProjectId;
+        appliedStatus = filterStatus;
+        currentPage = 1;
+        await SaveFilters();
+    }
+
+    private async Task ResetFilters()
+    {
+        searchInput = appliedSearch = string.Empty;
+        filterProjectId = appliedProjectId = 0;
+        filterStatus = appliedStatus = "0";
+        currentPage = 1;
+        await SaveFilters();
+    }
+
+    private void SetView(bool chartView) => isChartView = chartView;
+    private void ToggleExpanded(long id) { if (!expandedIssues.Remove(id)) expandedIssues.Add(id); }
+    private Task HandlePageChanged(int page) { currentPage = page; return Task.CompletedTask; }
+    private Task HandlePageSizeChanged(int size) { pageSize = size; currentPage = 1; return Task.CompletedTask; }
+
+    private async Task SaveFilters()
+    {
+        await JS.InvokeVoidAsync("localStorage.setItem", StorageKey, System.Text.Json.JsonSerializer.Serialize(new SavedFilter(appliedSearch, appliedProjectId, appliedStatus)));
+    }
+
+    private async Task LoadSavedFilters()
+    {
+        var json = await JS.InvokeAsync<string?>("localStorage.getItem", StorageKey);
+        if (string.IsNullOrWhiteSpace(json)) return;
+        var saved = System.Text.Json.JsonSerializer.Deserialize<SavedFilter>(json);
+        if (saved == null) return;
+        searchInput = appliedSearch = saved.Search;
+        filterProjectId = appliedProjectId = saved.ProjectId;
+        filterStatus = appliedStatus = saved.Status;
+        StateHasChanged();
+    }
+
+    private static bool IsOverdue(IssueDto issue) => issue.StatusId != AppTaskStatus.Done && issue.DueDate.Date < DateTime.Today;
+    private static string GetStatusLabel(AppTaskStatus status) => status == AppTaskStatus.InProgress ? "In Progress" : status == AppTaskStatus.Done ? "Done" : "To Do";
+    private static string GetStatusBadge(AppTaskStatus status) => status == AppTaskStatus.Done ? "bg-emerald-50 text-emerald-700" : status == AppTaskStatus.InProgress ? "bg-blue-50 text-blue-700" : "bg-slate-100 text-slate-700";
+    private static string GetPriorityLabel(TaskPriority priority) => priority == TaskPriority.High ? "High" : priority == TaskPriority.Medium ? "Medium" : "Low";
+    private static string EscalationLabel(int level) => level switch { 1 => "Team Lead", 2 => "PM", 3 => "Manager", _ => "None" };
+
+    private RenderFragment RiskBadge(IssueDto issue) => builder =>
+    {
+        var text = issue.IsBlocked ? "Blocked" : issue.EscalationLevel > 0 ? EscalationLabel(issue.EscalationLevel) : IsOverdue(issue) ? "Overdue" : "Clear";
+        var cls = issue.IsBlocked || IsOverdue(issue) ? "bg-rose-50 text-rose-700" : issue.EscalationLevel > 0 ? "bg-amber-50 text-amber-700" : "bg-emerald-50 text-emerald-700";
+        builder.OpenElement(0, "span");
+        builder.AddAttribute(1, "class", $"rounded-full px-2 py-0.5 text-xs font-semibold {cls}");
+        builder.AddContent(2, text);
+        builder.CloseElement();
+    };
+
+    private IReadOnlyList<(string Label, int Value)> StatusChart => new[] { ("To Do", FilteredIssues.Count(i => i.StatusId == AppTaskStatus.Todo)), ("In Progress", FilteredIssues.Count(i => i.StatusId == AppTaskStatus.InProgress)), ("Done", FilteredIssues.Count(i => i.StatusId == AppTaskStatus.Done)), ("Overdue", OverdueIssues) };
+    private IReadOnlyList<(string Label, int Value)> PriorityChart => Enum.GetValues<TaskPriority>().Select(p => (GetPriorityLabel(p), FilteredIssues.Count(i => i.PriorityId == p))).ToList();
+    private IReadOnlyList<(string Label, int Value)> EmployeeChart => FilteredIssues.GroupBy(i => i.AssignedToName ?? "Unassigned").OrderByDescending(g => g.Count()).Take(5).Select(g => (g.Key, g.Count())).ToList();
+    private IReadOnlyList<(string Label, int Value)> ProjectChart => FilteredIssues.GroupBy(i => i.ProjectName).OrderByDescending(g => g.Count()).Take(5).Select(g => (g.Key, g.Count())).ToList();
+    private IEnumerable<string> Insights => new[] { $"{OverdueIssues} overdue issues need attention.", $"{BlockedIssues} issues are blocked.", $"Actual hours are {FilteredIssues.Sum(i => i.ActualHours ?? 0):N1} against {FilteredIssues.Sum(i => i.EstimatedHours ?? 0):N1} estimated." };
+
+    private RenderFragment MetricCard(string label, string value, string icon, string color) => builder =>
+    {
+        builder.OpenElement(0, "div");
+        builder.AddAttribute(1, "class", $"rounded-xl border border-{color}-100 bg-{color}-50 p-5 shadow-sm");
+        builder.AddMarkupContent(2, $"<div class=\"flex items-center justify-between\"><div><p class=\"text-xs font-semibold uppercase tracking-wider text-{color}-600\">{label}</p><p class=\"mt-1 text-3xl font-bold text-{color}-700\">{value}</p></div><span class=\"flex h-11 w-11 items-center justify-center rounded-xl bg-white/70\"><i data-lucide=\"{icon}\" class=\"h-6 w-6 text-{color}-600\"></i></span></div>");
+        builder.CloseElement();
+    };
+
+    private RenderFragment BarChart(string title, IReadOnlyList<(string Label, int Value)> rows) => builder =>
+    {
+        var max = Math.Max(1, rows.Select(r => r.Value).DefaultIfEmpty(0).Max());
+        builder.OpenElement(0, "div");
+        builder.AddAttribute(1, "class", "rounded-xl border border-slate-100 bg-slate-50 p-4");
+        builder.AddMarkupContent(2, $"<h3 class=\"mb-4 text-sm font-semibold text-slate-900\">{title}</h3>");
+        var seq = 3;
+        foreach (var row in rows)
+        {
+            var width = row.Value * 100 / max;
+            builder.AddMarkupContent(seq++, $"<div class=\"mb-3\"><div class=\"mb-1 flex justify-between text-xs font-semibold text-slate-600\"><span>{row.Label}</span><span>{row.Value}</span></div><div class=\"h-2.5 rounded-full bg-white\"><div class=\"h-full rounded-full bg-violet-600\" style=\"width:{width}%\"></div></div></div>");
+        }
+        builder.CloseElement();
+    };
+
+    private async Task DownloadExcel()
+    {
+        var rows = FilteredIssues.Select(i => new object?[] { i.Title, i.TaskTitle, i.ProjectName, i.AssignedToName ?? "Unassigned", GetStatusLabel(i.StatusId), GetPriorityLabel(i.PriorityId), i.EstimatedHours ?? 0, i.ActualHours ?? 0, i.DueDate, i.IsBlocked ? "Blocked" : "Clear", EscalationLabel(i.EscalationLevel), i.DelayReason ?? "" });
+        var bytes = SpreadsheetReportBuilder.BuildTableWorkbook("Issue Report", "Issue Report", new[] { "Issue", "Task", "Project", "Assignee", "Status", "Priority", "Estimated", "Actual", "Due Date", "Blocked", "Escalation", "Delay Reason" }, rows, new[] { $"Generated: {DisplayFormats.Date(DateTime.Today)}" });
+        await JS.InvokeVoidAsync("downloadFileFromBase64", $"IssueReport_{DateTime.Today:yyyyMMdd}.xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", Convert.ToBase64String(bytes));
+    }
+
+    private async Task DownloadPdf()
+    {
+        var rows = FilteredIssues.Select(i => new[] { i.Title, i.TaskTitle, i.ProjectName, i.AssignedToName ?? "Unassigned", GetStatusLabel(i.StatusId), DisplayFormats.Date(i.DueDate), i.IsBlocked ? "Blocked" : "Clear" });
+        var bytes = SimplePdfReportBuilder.BuildTableReport("Issue Report", new[] { $"Generated: {DisplayFormats.Date(DateTime.Today)}" }, new[] { "Issue", "Task", "Project", "Assignee", "Status", "Due Date", "Risk" }, rows);
+        await JS.InvokeVoidAsync("downloadFileFromBase64", $"IssueReport_{DateTime.Today:yyyyMMdd}.pdf", "application/pdf", Convert.ToBase64String(bytes));
+    }
+
+    private sealed record SavedFilter(string Search, long ProjectId, string Status);
+}

TaskTrackingSystem.WebApp/Components/Pages/Features/Reports/OverdueTasksReport.razor

@@ -51,7 +51,7 @@
             <div class="rounded-xl border border-amber-100 bg-amber-50 p-5 shadow-sm">
                 <div class="flex items-center justify-between">
                     <div>
-                        <p class="text-xs font-semibold uppercase tracking-wider text-amber-500">Critical (High Priority)</p>
+                        <p class="text-xs font-semibold uppercase tracking-wider text-amber-500">High Priority Overdue</p>
                         <p class="mt-1 text-3xl font-bold text-amber-700">@criticalCount</p>
                     </div>
                     <span class="flex h-11 w-11 items-center justify-center rounded-xl bg-amber-100">
@@ -151,8 +151,8 @@
                         <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Assignee</th>
                         <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Due Date</th>
                         <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Days Overdue</th>
-                        <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Priority</th>
-                        <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Status</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Issues</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Delay / Escalation</th>
                     </tr>
                 </thead>
                 <tbody class="divide-y divide-slate-100">
@@ -215,26 +215,13 @@
                                         </span>
                                     }
                                 </td>
+                                <td class="px-6 py-4 text-sm text-slate-700">
+                                    <span class="font-semibold text-rose-600">@task.OverdueIssues</span> overdue
+                                </td>
                                 <td class="px-6 py-4">
-                                     @{
-                                         var priorityClass = task.PriorityName switch {
-                                             "High" => "bg-rose-50 text-rose-700",
-                                             "Medium" => "bg-amber-50 text-amber-700",
-                                             _ => "bg-slate-100 text-slate-600"
-                                         };
-                                     }
-                                     <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium @priorityClass">@task.PriorityName</span>
-                                 </td>
-                                 <td class="px-6 py-4">
-                                     @{
-                                         var statusClass = task.StatusName switch {
-                                             "In Progress" => "bg-blue-50 text-blue-700",
-                                             "Done" => "bg-emerald-50 text-emerald-700",
-                                             _ => "bg-slate-100 text-slate-600"
-                                         };
-                                     }
-                                     <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium @statusClass">@task.StatusName</span>
-                                 </td>
+                                    <div class="text-sm font-medium text-slate-800">@(string.IsNullOrWhiteSpace(task.DelayReason) ? "No reason recorded" : task.DelayReason)</div>
+                                    <div class="mt-1 text-xs text-slate-500">Blocked by: @(string.IsNullOrWhiteSpace(task.BlockedBy) ? "None" : task.BlockedBy) · Escalation: @GetEscalationLabel(task.EscalationLevel)</div>
+                                </td>
                             </tr>
                         }
                     }
@@ -320,7 +307,7 @@
                 var now = DateTime.UtcNow;
                 
                 overdueCount = allOverdue.Count(t => t.DueDate < now);
-                criticalCount = allOverdue.Count(t => t.PriorityName == "High");
+                criticalCount = allOverdue.Count(t => t.PriorityName == "High" && t.DaysOverdue > 0);
                 dueSoonCount = allOverdue.Count(t => t.DueDate >= now && t.DueDate <= now.AddDays(3));
                 avgDaysOverdue = overdueCount > 0
                     ? (int)allOverdue.Where(t => t.DueDate < now).Average(t => t.DaysOverdue)
@@ -443,4 +430,12 @@
             "application/pdf",
             Convert.ToBase64String(pdfBytes));
     }
+
+    private static string GetEscalationLabel(int level) => level switch
+    {
+        1 => "Team Lead",
+        2 => "PM",
+        3 => "Manager",
+        _ => "None"
+    };
 }

TaskTrackingSystem.WebApp/Components/Pages/Features/Reports/ProjectProgressReport.razor

@@ -19,7 +19,7 @@
     <div class="flex flex-col md:flex-row md:items-center md:justify-between gap-4">
         <div>
             <h2 class="text-3xl font-bold tracking-tight text-slate-900">Project Progress</h2>
-            <p class="text-slate-500 mt-1">View project completion status, timelines, and progress charts.</p>
+            <p class="text-slate-500 mt-1">View project health using both planning tasks and daily execution issues.</p>
         </div>
         <div class="flex items-center space-x-3">
             <div class="inline-flex rounded-lg border border-slate-200 bg-white p-0.5 shadow-sm">
@@ -154,7 +154,7 @@
         {
             <!-- Chart View: SVG Project Progress Bars -->
             <div class="rounded-xl border border-slate-200 bg-white p-6 shadow-sm">
-                <h3 class="font-semibold text-slate-900 mb-4 font-sans text-md">Project Completion Chart</h3>
+                <h3 class="font-semibold text-slate-900 mb-4 font-sans text-md">Project Health Chart</h3>
                 @if (!allProjects.Any())
                 {
                     <p class="text-slate-400 text-center py-8">No data available.</p>
@@ -167,10 +167,10 @@
                             <div>
                                 <div class="flex justify-between text-xs font-semibold text-slate-700 mb-1.5">
                                     <span>@proj.ProjectName</span>
-                                    <span>@proj.CompletedTasks / @proj.TotalTasks tasks (@proj.Progress.ToString("F0")% completed)</span>
+                                    <span>@proj.OpenIssues open, @proj.OverdueIssues overdue, @proj.BlockedIssues blocked</span>
                                 </div>
                                 <div class="h-4 rounded-full bg-slate-100 overflow-hidden flex">
-                                    <div class="h-full bg-emerald-500 rounded-full transition-all" style="width: @(Math.Min(proj.Progress, 100))%"></div>
+                                    <div class="h-full @(proj.ProjectHealth == "Critical" ? "bg-rose-500" : proj.ProjectHealth == "At Risk" ? "bg-amber-500" : "bg-emerald-500") rounded-full transition-all" style="width: @(Math.Min(Math.Max(proj.OpenIssues + proj.OverdueIssues + proj.BlockedIssues, 1) * 10, 100))%"></div>
                                 </div>
                             </div>
                         }
@@ -189,9 +189,10 @@
                             <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Project Name</th>
                             <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Start Date</th>
                             <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">End Date</th>
-                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Total Tasks</th>
-                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Completed Tasks</th>
-                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Completeness</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Open Issues</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Blocked / Overdue</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Health</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Last Activity</th>
                         </tr>
                     </thead>
                     <tbody class="divide-y divide-slate-100">
@@ -205,23 +206,17 @@
                                     <td class="px-6 py-4 text-sm font-semibold text-slate-900">@proj.ProjectName</td>
                                     <td class="px-6 py-4 text-sm text-slate-600">@DisplayFormats.Date(proj.StartDate)</td>
                                     <td class="px-6 py-4 text-sm text-slate-600">@DisplayFormats.Date(proj.EndDate)</td>
-                                    <td class="px-6 py-4 text-sm text-slate-900">@proj.TotalTasks</td>
-                                    <td class="px-6 py-4 text-sm text-emerald-600">@proj.CompletedTasks</td>
-                                    <td class="px-6 py-4">
-                                        <div class="flex items-center space-x-3">
-                                            <div class="flex-1 h-2.5 rounded-full bg-slate-100 overflow-hidden max-w-[120px]">
-                                                <div class="h-full rounded-full bg-emerald-500 transition-all" style="width: @(Math.Min(proj.Progress, 100))%"></div>
-                                            </div>
-                                            <span class="text-sm font-semibold text-slate-700">@proj.Progress.ToString("F0")%</span>
-                                        </div>
-                                    </td>
+                                    <td class="px-6 py-4 text-sm text-slate-900">@proj.OpenIssues</td>
+                                    <td class="px-6 py-4 text-sm font-medium"><span class="text-amber-600">@proj.BlockedIssues</span> / <span class="text-rose-600">@proj.OverdueIssues</span></td>
+                                    <td class="px-6 py-4"><span class="inline-flex rounded-full px-2.5 py-0.5 text-xs font-semibold @GetProjectHealthBadge(proj.ProjectHealth)">@proj.ProjectHealth</span></td>
+                                    <td class="px-6 py-4 text-sm text-slate-600">@DisplayFormats.Date(proj.LastActivity)</td>
                                 </tr>
                             }
                         }
                         else
                         {
                             <tr>
-                                <td colspan="7" class="px-6 py-12 text-center">
+                                <td colspan="8" class="px-6 py-12 text-center">
                                     <p class="text-sm text-slate-400">No project data found matching criteria.</p>
                                 </td>
                             </tr>
@@ -398,15 +393,17 @@
             proj.ProjectName,
             proj.StartDate,
             proj.EndDate,
-            proj.TotalTasks,
-            proj.CompletedTasks,
-            $"{proj.Progress:F0}%"
+            proj.OpenIssues,
+            proj.OverdueIssues,
+            proj.BlockedIssues,
+            proj.ProjectHealth,
+            proj.ActualHours
         });
 
         var workbookBytes = SpreadsheetReportBuilder.BuildTableWorkbook(
             "Project Progress",
             "Project Progress Report",
-            new[] { "Project", "Start Date", "End Date", "Total Tasks", "Completed Tasks", "Completeness" },
+            new[] { "Project", "Start Date", "End Date", "Open Issues", "Overdue Issues", "Blocked Issues", "Health", "Actual Hours" },
             rows,
             new[]
             {
@@ -438,15 +435,17 @@
             proj.ProjectName,
             DisplayFormats.Date(proj.StartDate),
             DisplayFormats.Date(proj.EndDate),
-            proj.TotalTasks.ToString(),
-            proj.CompletedTasks.ToString(),
-            $"{proj.Progress:F0}%"
+            proj.OpenIssues.ToString(),
+            proj.OverdueIssues.ToString(),
+            proj.BlockedIssues.ToString(),
+            proj.ProjectHealth,
+            proj.ActualHours.ToString("N1")
         });
 
         var pdfBytes = SimplePdfReportBuilder.BuildTableReport(
             "Project Progress Report",
             summaryLines,
-            new[] { "Project", "Start Date", "End Date", "Total Tasks", "Completed Tasks", "Completeness" },
+            new[] { "Project", "Start Date", "End Date", "Open", "Overdue", "Blocked", "Health", "Hours" },
             rows);
 
         await JS.InvokeVoidAsync(
@@ -455,4 +454,11 @@
             "application/pdf",
             Convert.ToBase64String(pdfBytes));
     }
+
+    private static string GetProjectHealthBadge(string health) => health switch
+    {
+        "Critical" => "bg-rose-50 text-rose-700",
+        "At Risk" => "bg-amber-50 text-amber-700",
+        _ => "bg-emerald-50 text-emerald-700"
+    };
 }

TaskTrackingSystem.WebApp/Components/Pages/Features/Reports/TaskReport.razor

@@ -152,8 +152,37 @@
             </div>
         </div>
     }
+    else if (!string.IsNullOrWhiteSpace(errorMessage))
+    {
+        <div class="rounded-xl border border-rose-200 bg-rose-50 p-5 text-sm text-rose-700 shadow-sm">
+            <div class="flex items-start gap-3">
+                <i data-lucide="alert-triangle" class="mt-0.5 h-5 w-5 shrink-0"></i>
+                <div>
+                    <p class="font-semibold">Task report could not load.</p>
+                    <p class="mt-1">@errorMessage</p>
+                </div>
+            </div>
+        </div>
+    }
     else
     {
+        <div class="grid grid-cols-1 sm:grid-cols-2 xl:grid-cols-4 gap-4">
+            @TaskMetricCard("Total", FilteredList.Count().ToString(), "file-text", "violet")
+            @TaskMetricCard("Completed", FilteredList.Count(t => t.StatusId == AppTaskStatus.Done).ToString(), "check-circle-2", "emerald")
+            @TaskMetricCard("In Progress", FilteredList.Count(t => t.StatusId == AppTaskStatus.InProgress).ToString(), "timer", "blue")
+            @TaskMetricCard("Overdue", FilteredList.Count(t => t.DueDate.Date < DateTime.Today && t.StatusId != AppTaskStatus.Done).ToString(), "alarm-clock", "rose")
+        </div>
+
+        <div class="rounded-xl border border-slate-200 bg-white p-5 shadow-sm">
+            <h3 class="text-sm font-semibold text-slate-900">Key Insights</h3>
+            <div class="mt-3 grid grid-cols-1 gap-3 md:grid-cols-3">
+                @foreach (var insight in TaskInsights)
+                {
+                    <div class="rounded-lg bg-slate-50 px-3 py-2 text-sm text-slate-700">@insight</div>
+                }
+            </div>
+        </div>
+
         @if (isChartView)
         {
             <!-- Chart View -->
@@ -250,6 +279,16 @@
                         }
                     </div>
                 </div>
+
+                <div class="rounded-xl border border-slate-200 bg-white p-6 shadow-sm">
+                    <h3 class="font-semibold text-slate-900 mb-4">Tasks by Project</h3>
+                    @MiniBars(FilteredList.GroupBy(t => t.ProjectName).OrderByDescending(g => g.Count()).Take(5).Select(g => (g.Key, g.Count())).ToArray())
+                </div>
+
+                <div class="rounded-xl border border-slate-200 bg-white p-6 shadow-sm">
+                    <h3 class="font-semibold text-slate-900 mb-4">Tasks with Most Issues</h3>
+                    @MiniBars(FilteredList.OrderByDescending(t => t.OpenIssues + t.OverdueIssues).Take(5).Select(t => (t.Title, t.OpenIssues + t.OverdueIssues)).ToArray())
+                </div>
             </div>
         }
         else
@@ -264,8 +303,8 @@
                             <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Project</th>
                             <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Status</th>
                             <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Priority</th>
-                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Assigned To</th>
-                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Due Date</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Health</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Issues</th>
                         </tr>
                     </thead>
                     <tbody class="divide-y divide-slate-100">
@@ -276,7 +315,9 @@
                                 var t = entry.t;
                                 <tr class="hover:bg-slate-50/50 transition-colors">
                                     <td class="px-6 py-3 text-sm font-semibold text-slate-500">@((currentPage - 1) * pageSize + entry.index + 1)</td>
-                                    <td class="px-6 py-3 text-sm font-medium text-slate-900">@t.Title</td>
+                                    <td class="px-6 py-3">
+                                        <button @onclick="() => ToggleExpanded(t.TaskId)" class="text-left text-sm font-medium text-slate-900 hover:text-violet-600">@t.Title</button>
+                                    </td>
                                     <td class="px-6 py-3 text-sm text-slate-500">@t.ProjectName</td>
                                     <td class="px-6 py-3">
                                         <span class="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium @GetStatusBadge(t.StatusId)">@t.StatusName</span>
@@ -284,9 +325,24 @@
                                     <td class="px-6 py-3">
                                         <span class="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium @GetPriorityBadge(t.PriorityId)">@t.PriorityName</span>
                                     </td>
-                                    <td class="px-6 py-3 text-sm text-slate-500">@(t.AssignedToUser ?? "Unassigned")</td>
-                                    <td class="px-6 py-3 text-sm text-slate-500">@DisplayFormats.Date(t.DueDate)</td>
+                                    <td class="px-6 py-3">
+                                        <span class="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-semibold @GetHealthBadge(t.TaskHealth)">@t.TaskHealth</span>
+                                    </td>
+                                    <td class="px-6 py-3 text-sm text-slate-600">@t.IssueSummary</td>
                                 </tr>
+                                @if (expandedTasks.Contains(t.TaskId))
+                                {
+                                    <tr class="bg-slate-50/60">
+                                        <td colspan="7" class="px-6 py-4">
+                                            <div class="grid grid-cols-1 gap-3 text-sm text-slate-600 md:grid-cols-4">
+                                                <div><span class="font-semibold text-slate-800">Assignee:</span> @(t.AssignedToUser ?? "Unassigned")</div>
+                                                <div><span class="font-semibold text-slate-800">Due:</span> @DisplayFormats.Date(t.DueDate)</div>
+                                                <div><span class="font-semibold text-slate-800">Open issues:</span> @t.OpenIssues</div>
+                                                <div><span class="font-semibold text-slate-800">Last activity:</span> @DisplayFormats.Date(t.LastActivity)</div>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                }
                             }
                         }
                         else
@@ -327,8 +383,10 @@
     private bool isLoading = true;
     private bool isChartView = false;
     private List<TaskReportDto> taskReports = new();
+    private HashSet<long> expandedTasks = new();
     private PagedResult<TaskReportDto>? taskReportPage;
     private List<ProjectDto> projects = new();
+    private string? errorMessage;
 
     // Filters
     private string filterPeriod = "all";
@@ -399,6 +457,13 @@
 
     private IEnumerable<TaskReportDto> PagedList => taskReportPage?.Items ?? Enumerable.Empty<TaskReportDto>();
 
+    private IEnumerable<string> TaskInsights => new[]
+    {
+        $"{FilteredList.Count(t => t.TaskHealth == "Critical")} critical tasks need attention.",
+        $"{FilteredList.Sum(t => t.OpenIssues)} open issues are attached to reported tasks.",
+        $"{FilteredList.Count(t => t.OverdueIssues > 0)} tasks have overdue issues."
+    };
+
     protected override async Task OnInitializedAsync()
     {
         var client = ApiClient.CreateClient();
@@ -426,6 +491,14 @@
         isChartView = chartView;
     }
 
+    private void ToggleExpanded(long taskId)
+    {
+        if (!expandedTasks.Remove(taskId))
+        {
+            expandedTasks.Add(taskId);
+        }
+    }
+
     private void ShowProjectSuggestions()
     {
         projectSearchQuery = projectSearchInput;
@@ -489,6 +562,7 @@
         var client = ApiClient.CreateClient();
         try
         {
+            errorMessage = null;
             var query = BuildTaskReportQuery();
             var fullTask = client.GetFromJsonAsync<Result<List<TaskReportDto>>>(query);
             var pagedTask = client.GetFromJsonAsync<PagedResult<TaskReportDto>>(BuildTaskReportQuery(includePaging: true));
@@ -498,6 +572,10 @@
             {
                 taskReports = fullTask.Result.Value;
             }
+            else if (fullTask.Result?.IsSuccess == false)
+            {
+                errorMessage = fullTask.Result.ErrorMessage ?? "The server returned an error while loading task report data.";
+            }
 
             if (pagedTask.Result != null)
             {
@@ -509,6 +587,9 @@
         catch (Exception ex)
         {
             Console.WriteLine($"Task report error: {ex.Message}");
+            errorMessage = ex.Message;
+            taskReports = new();
+            taskReportPage = null;
         }
         finally
         {
@@ -616,4 +697,33 @@
         TaskPriority.High => "bg-red-100 text-red-700",
         _ => "bg-slate-100 text-slate-600"
     };
+
+    private static string GetHealthBadge(string health) => health switch
+    {
+        "Critical" => "bg-rose-50 text-rose-700",
+        "At Risk" => "bg-amber-50 text-amber-700",
+        _ => "bg-emerald-50 text-emerald-700"
+    };
+
+    private RenderFragment TaskMetricCard(string label, string value, string icon, string color) => builder =>
+    {
+        builder.OpenElement(0, "div");
+        builder.AddAttribute(1, "class", $"rounded-xl border border-{color}-100 bg-{color}-50 p-5 shadow-sm");
+        builder.AddMarkupContent(2, $"<div class=\"flex items-center justify-between\"><div><p class=\"text-xs font-semibold uppercase tracking-wider text-{color}-600\">{label}</p><p class=\"mt-1 text-3xl font-bold text-{color}-700\">{value}</p></div><span class=\"flex h-11 w-11 items-center justify-center rounded-xl bg-white/70\"><i data-lucide=\"{icon}\" class=\"h-6 w-6 text-{color}-600\"></i></span></div>");
+        builder.CloseElement();
+    };
+
+    private RenderFragment MiniBars(IReadOnlyList<(string Label, int Value)> rows) => builder =>
+    {
+        var max = Math.Max(1, rows.Select(r => r.Value).DefaultIfEmpty(0).Max());
+        var seq = 0;
+        builder.OpenElement(seq++, "div");
+        builder.AddAttribute(seq++, "class", "space-y-3");
+        foreach (var row in rows)
+        {
+            var width = row.Value * 100 / max;
+            builder.AddMarkupContent(seq++, $"<div><div class=\"mb-1 flex justify-between text-xs font-semibold text-slate-600\"><span>{row.Label}</span><span>{row.Value}</span></div><div class=\"h-2.5 rounded-full bg-slate-100\"><div class=\"h-full rounded-full bg-violet-600\" style=\"width:{width}%\"></div></div></div>");
+        }
+        builder.CloseElement();
+    };
 }

TaskTrackingSystem.WebApp/Components/Pages/Features/Reports/TimeTrackingReport.razor

@@ -22,6 +22,14 @@
             <p class="text-slate-500 mt-1">Review estimated hours, completion timelines, and resource effort distribution across issues.</p>
         </div>
         <div class="flex items-center space-x-3">
+            <div class="inline-flex rounded-lg border border-slate-200 bg-white p-0.5 shadow-sm">
+                <button @onclick="() => SetView(false)" class="inline-flex items-center rounded-md px-3 py-1.5 text-xs font-semibold @(!isChartView ? "bg-violet-600 text-white" : "text-slate-600 hover:text-slate-900") transition-colors">
+                    <i data-lucide="list" class="h-3.5 w-3.5 mr-1"></i> List View
+                </button>
+                <button @onclick="() => SetView(true)" class="inline-flex items-center rounded-md px-3 py-1.5 text-xs font-semibold @(isChartView ? "bg-violet-600 text-white" : "text-slate-600 hover:text-slate-900") transition-colors">
+                    <i data-lucide="bar-chart-3" class="h-3.5 w-3.5 mr-1"></i> Chart View
+                </button>
+            </div>
             <button @onclick="DownloadExcel" class="inline-flex items-center rounded-lg border border-slate-200 bg-white px-4 py-2 text-sm font-medium text-slate-700 hover:bg-slate-50 transition-colors shadow-sm">
                 <i data-lucide="download" class="h-4 w-4 mr-2"></i> Export Excel
             </button>
@@ -49,8 +57,8 @@
             <div class="rounded-xl border border-emerald-100 bg-emerald-50 p-5 shadow-sm">
                 <div class="flex items-center justify-between">
                     <div>
-                        <p class="text-xs font-semibold uppercase tracking-wider text-emerald-500">Completed Effort</p>
-                        <p class="mt-1 text-3xl font-bold text-emerald-700">@completedHours.ToString("N1") hrs</p>
+                        <p class="text-xs font-semibold uppercase tracking-wider text-emerald-500">Actual Hours</p>
+                        <p class="mt-1 text-3xl font-bold text-emerald-700">@actualHours.ToString("N1") hrs</p>
                     </div>
                     <span class="flex h-11 w-11 items-center justify-center rounded-xl bg-emerald-100">
                         <i data-lucide="check-circle-2" class="h-6 w-6 text-emerald-600"></i>
@@ -60,8 +68,8 @@
             <div class="rounded-xl border border-amber-100 bg-amber-50 p-5 shadow-sm">
                 <div class="flex items-center justify-between">
                     <div>
-                        <p class="text-xs font-semibold uppercase tracking-wider text-amber-500">Active Effort (In-Flight)</p>
-                        <p class="mt-1 text-3xl font-bold text-amber-700">@activeHours.ToString("N1") hrs</p>
+                        <p class="text-xs font-semibold uppercase tracking-wider text-amber-500">Variance</p>
+                        <p class="mt-1 text-3xl font-bold text-amber-700">@varianceHours.ToString("+0.0;-0.0;0.0") hrs</p>
                     </div>
                     <span class="flex h-11 w-11 items-center justify-center rounded-xl bg-amber-100">
                         <i data-lucide="timer" class="h-6 w-6 text-amber-600"></i>
@@ -71,8 +79,8 @@
             <div class="rounded-xl border border-rose-100 bg-rose-50 p-5 shadow-sm">
                 <div class="flex items-center justify-between">
                     <div>
-                        <p class="text-xs font-semibold uppercase tracking-wider text-rose-500">Overdue Effort</p>
-                        <p class="mt-1 text-3xl font-bold text-rose-700">@overdueHours.ToString("N1") hrs</p>
+                        <p class="text-xs font-semibold uppercase tracking-wider text-rose-500">Utilization</p>
+                        <p class="mt-1 text-3xl font-bold text-rose-700">@utilizationPercent.ToString("N0")%</p>
                     </div>
                     <span class="flex h-11 w-11 items-center justify-center rounded-xl bg-rose-100">
                         <i data-lucide="alert-triangle" class="h-6 w-6 text-rose-600"></i>
@@ -137,6 +145,17 @@
     }
     else
     {
+        @if (isChartView)
+        {
+            <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+                @EffortChart("Estimated vs Actual", new[] { ("Estimated", (double)totalHours), ("Actual", (double)actualHours) })
+                @EffortChart("Effort by Project", FilteredIssues.GroupBy(i => i.ProjectName).OrderByDescending(g => g.Sum(i => i.ActualHours ?? 0)).Take(5).Select(g => (g.Key, (double)g.Sum(i => i.ActualHours ?? 0))).ToArray())
+                @EffortChart("Effort by Employee", FilteredIssues.GroupBy(i => i.AssignedToName ?? "Unassigned").OrderByDescending(g => g.Sum(i => i.ActualHours ?? 0)).Take(5).Select(g => (g.Key, (double)g.Sum(i => i.ActualHours ?? 0))).ToArray())
+                @EffortChart("Estimate Accuracy", new[] { ("On / Under", (double)FilteredIssues.Count(i => (i.ActualHours ?? 0) <= (i.EstimatedHours ?? 0))), ("Over", (double)FilteredIssues.Count(i => (i.ActualHours ?? 0) > (i.EstimatedHours ?? 0))) })
+            </div>
+        }
+        else
+        {
         <!-- Table -->
         <div class="rounded-xl border border-slate-200 bg-white shadow-sm overflow-hidden">
             <div class="px-6 py-4 border-b border-slate-100 flex items-center justify-between">
@@ -151,7 +170,8 @@
                         <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Issue</th>
                         <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Task &amp; Project</th>
                         <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Assignee</th>
-                        <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Est. Hours</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Est. Hours</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Actual Hours</th>
                         <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Due Date</th>
                         <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Status</th>
                     </tr>
@@ -195,6 +215,9 @@
                                 <td class="px-6 py-4 text-sm font-semibold text-slate-800">
                                     @((issue.EstimatedHours ?? 0).ToString("N1")) hrs
                                 </td>
+                                <td class="px-6 py-4 text-sm font-semibold @(GetVariance(issue) > 0 ? "text-rose-600" : "text-emerald-600")">
+                                    @((issue.ActualHours ?? 0).ToString("N1")) hrs
+                                </td>
                                 <td class="px-6 py-4 text-sm text-slate-600">
                                     @DisplayFormats.Date(issue.DueDate)
                                 </td>
@@ -213,7 +236,7 @@
                     }
                     else
                     {
-                        <EmptyState ColSpan="7" Icon="clock" Title="No effort entries" Subtitle="No timesheet effort entries matched your filters." />
+                        <EmptyState ColSpan="8" Icon="clock" Title="No effort entries" Subtitle="No timesheet effort entries matched your filters." />
                     }
                 </tbody>
             </table>
@@ -226,11 +249,13 @@
                         OnPageChanged="HandlePageChanged"
                         OnPageSizeChanged="HandlePageSizeChanged" />
         </div>
+        }
     }
 </div>
 
 @code {
     private bool isLoading = true;
+    private bool isChartView = false;
     private List<IssueDto> allIssues = new();
     private List<ProjectDto> allProjects = new();
 
@@ -254,9 +279,9 @@
 
     // Metrics
     private decimal totalHours = 0;
-    private decimal completedHours = 0;
-    private decimal activeHours = 0;
-    private decimal overdueHours = 0;
+    private decimal actualHours = 0;
+    private decimal varianceHours = 0;
+    private double utilizationPercent = 0;
 
     private int TotalPages => (int)Math.Ceiling((double)FilteredIssues.Count() / pageSize);
 
@@ -353,16 +378,38 @@
         await JS.InvokeVoidAsync("initIcons");
     }
 
+    private void SetView(bool chartView)
+    {
+        isChartView = chartView;
+    }
+
     private void ComputeMetrics()
     {
         var today = DateTime.Today;
         var list = FilteredIssues.ToList();
         totalHours = list.Sum(i => i.EstimatedHours ?? 0);
-        completedHours = list.Where(i => i.StatusId == AppTaskStatus.Done).Sum(i => i.EstimatedHours ?? 0);
-        activeHours = list.Where(i => i.StatusId != AppTaskStatus.Done).Sum(i => i.EstimatedHours ?? 0);
-        overdueHours = list.Where(i => i.StatusId != AppTaskStatus.Done && i.DueDate < today).Sum(i => i.EstimatedHours ?? 0);
+        actualHours = list.Sum(i => i.ActualHours ?? 0);
+        varianceHours = actualHours - totalHours;
+        utilizationPercent = totalHours > 0 ? Math.Round((double)(actualHours / totalHours) * 100, 1) : 0;
     }
 
+    private static decimal GetVariance(IssueDto issue) => (issue.ActualHours ?? 0) - (issue.EstimatedHours ?? 0);
+
+    private RenderFragment EffortChart(string title, IReadOnlyList<(string Label, double Value)> rows) => builder =>
+    {
+        var max = Math.Max(1, rows.Select(r => r.Value).DefaultIfEmpty(0).Max());
+        builder.OpenElement(0, "div");
+        builder.AddAttribute(1, "class", "rounded-xl border border-slate-200 bg-white p-6 shadow-sm");
+        builder.AddMarkupContent(2, $"<h3 class=\"mb-4 text-sm font-semibold text-slate-900\">{title}</h3>");
+        var seq = 3;
+        foreach (var row in rows)
+        {
+            var width = row.Value * 100 / max;
+            builder.AddMarkupContent(seq++, $"<div class=\"mb-4\"><div class=\"mb-1 flex justify-between text-xs font-semibold text-slate-600\"><span>{row.Label}</span><span>{row.Value:N1}</span></div><div class=\"h-3 rounded-full bg-slate-100\"><div class=\"h-full rounded-full bg-violet-600\" style=\"width:{width}%\"></div></div></div>");
+        }
+        builder.CloseElement();
+    };
+
     private Task ApplyFilters()
     {
         appliedSearch = searchInput;
@@ -455,7 +502,7 @@
             $"Assigned To Me: {(filterAssignToMe ? "Yes" : "No")}",
             $"Assigned To My Team: {(filterAssignToMyTeam ? "Yes" : "No")}",
             $"Total Effort: {totalHours.ToString("N1")} hrs",
-            $"Completed Effort: {completedHours.ToString("N1")} hrs",
+            $"Actual Hours: {actualHours.ToString("N1")} hrs",
             $"Generated: {DisplayFormats.Date(DateTime.Today)}"
         };