add: Timelog table, BudgetedHours, estimated hours

README.md

@@ -0,0 +1,5 @@
+dotnet tool install --global dotnet-ef
+
+dotnet ef dbcontext scaffold "Server=.;Database=TTS;User Id=sa;Password=sasa@123;TrustServerCertificate=True;" Microsoft.EntityFrameworkCore.SqlServer --output-dir AppDbContextModels --context AppDbContext --force
+
+

TaskTrackingSystem.Database/AppDbContextModels/AppDbContext.cs

@@ -21,7 +21,9 @@ public partial class AppDbContext : DbContext
 
     public virtual DbSet<FileAttachment> FileAttachments { get; set; }
 
-    public virtual DbSet<Permission> Permissions { get; set; }
+    public virtual DbSet<MenuAdmin> MenuAdmins { get; set; }
+
+    public virtual DbSet<MenuAdminDetail> MenuAdminDetails { get; set; }
 
     public virtual DbSet<Project> Projects { get; set; }
 
@@ -29,35 +31,25 @@ public partial class AppDbContext : DbContext
 
     public virtual DbSet<Role> Roles { get; set; }
 
-    public virtual DbSet<RolePermission> RolePermissions { get; set; }
+    public virtual DbSet<RoleMenu> RoleMenus { get; set; }
 
     public virtual DbSet<Task> Tasks { get; set; }
 
     public virtual DbSet<TaskHistory> TaskHistories { get; set; }
 
-    public virtual DbSet<User> Users { get; set; }
+    public virtual DbSet<TimeLog> TimeLogs { get; set; }
 
-    public virtual DbSet<RoleMenu> RoleMenus { get; set; }
-
-    public virtual DbSet<MenuAdmin> MenuAdmins { get; set; }
-    public virtual DbSet<MenuAdminDetail> MenuAdminDetails { get; set; }
+    public virtual DbSet<User> Users { get; set; }
 
-    //    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-    //#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see https://go.microsoft.com/fwlink/?LinkId=723263.
-    //        => optionsBuilder.UseSqlServer("Server=.;Database=TTS;User Id=sa;Password=sasa@123;TrustServerCertificate=True;");
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-    {
-        if (!optionsBuilder.IsConfigured)
-        {
-            // This tells EF Core to look for a connection string named "DefaultConnection" in appsettings.json
-            optionsBuilder.UseSqlServer("Name=DefaultConnection");
-        }
-    }
+#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see https://go.microsoft.com/fwlink/?LinkId=723263.
+        => optionsBuilder.UseSqlServer("Server=.;Database=TTS;User Id=sa;Password=sasa@123;TrustServerCertificate=True;");
+
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         modelBuilder.Entity<AuditLog>(entity =>
         {
-            entity.HasKey(e => e.Id).HasName("PK__AuditLog__3214EC07894BB819");
+            entity.HasIndex(e => e.UserId, "IX_AuditLogs_UserId");
 
             entity.Property(e => e.Action).HasMaxLength(100);
             entity.Property(e => e.CreatedAt)
@@ -70,66 +62,75 @@ public partial class AppDbContext : DbContext
 
             entity.HasOne(d => d.User).WithMany(p => p.AuditLogs)
                 .HasForeignKey(d => d.UserId)
-                .HasConstraintName("FK__AuditLogs__UserI__06CD04F7");
+                .HasConstraintName("FK_AuditLogs_Users");
         });
 
         modelBuilder.Entity<Comment>(entity =>
         {
-            entity.HasKey(e => e.Id).HasName("PK__Comments__3214EC0759C18B1B");
+            entity.HasIndex(e => e.TaskId, "IX_Comments_TaskId");
+
+            entity.HasIndex(e => e.UserId, "IX_Comments_UserId");
 
             entity.Property(e => e.CreatedAt)
                 .HasDefaultValueSql("(getdate())")
                 .HasColumnType("datetime");
-            entity.Property(e => e.IsDeleted).HasDefaultValue(false);
             entity.Property(e => e.UpdatedAt).HasColumnType("datetime");
 
             entity.HasOne(d => d.Task).WithMany(p => p.Comments)
                 .HasForeignKey(d => d.TaskId)
-                .HasConstraintName("FK__Comments__TaskId__7C4F7684");
+                .HasConstraintName("FK_Comments_Tasks");
 
             entity.HasOne(d => d.User).WithMany(p => p.Comments)
                 .HasForeignKey(d => d.UserId)
                 .OnDelete(DeleteBehavior.ClientSetNull)
-                .HasConstraintName("FK__Comments__UserId__7D439ABD");
+                .HasConstraintName("FK_Comments_Users");
         });
 
         modelBuilder.Entity<FileAttachment>(entity =>
         {
-            entity.HasKey(e => e.Id).HasName("PK__FileAtta__3214EC070C2F3CA2");
+            entity.HasIndex(e => e.TaskId, "IX_FileAttachments_TaskId");
 
             entity.Property(e => e.CreatedAt)
                 .HasDefaultValueSql("(getdate())")
                 .HasColumnType("datetime");
             entity.Property(e => e.FileName).HasMaxLength(255);
             entity.Property(e => e.FileType).HasMaxLength(100);
-            entity.Property(e => e.IsDeleted).HasDefaultValue(false);
             entity.Property(e => e.UpdatedAt).HasColumnType("datetime");
 
             entity.HasOne(d => d.Task).WithMany(p => p.FileAttachments)
                 .HasForeignKey(d => d.TaskId)
                 .OnDelete(DeleteBehavior.ClientSetNull)
-                .HasConstraintName("FK__FileAttac__TaskI__02084FDA");
+                .HasConstraintName("FK_FileAttachments_Tasks");
         });
 
-        modelBuilder.Entity<Permission>(entity =>
+        modelBuilder.Entity<MenuAdmin>(entity =>
         {
-            entity.HasKey(e => e.Id).HasName("PK__Permissi__3214EC07C57993E8");
+            entity.HasKey(e => e.AdminMenuId);
 
-            entity.HasIndex(e => e.Name, "UQ__Permissi__737584F6C5746589").IsUnique();
+            entity.Property(e => e.AdminMenuId).HasMaxLength(50);
+            entity.Property(e => e.CreatedUserId).HasMaxLength(50);
+            entity.Property(e => e.Icon).HasMaxLength(50);
+            entity.Property(e => e.MenuCode).HasMaxLength(50);
+            entity.Property(e => e.MenuName).HasMaxLength(100);
+            entity.Property(e => e.MenuUrl).HasMaxLength(200);
+            entity.Property(e => e.ModifiedUserId).HasMaxLength(50);
+            entity.Property(e => e.ParentCode).HasMaxLength(50);
+        });
 
-            entity.Property(e => e.CreatedAt)
-                .HasDefaultValueSql("(getdate())")
-                .HasColumnType("datetime");
-            entity.Property(e => e.Description).HasMaxLength(200);
-            entity.Property(e => e.IsDeleted).HasDefaultValue(false);
-            entity.Property(e => e.Module).HasMaxLength(50);
-            entity.Property(e => e.Name).HasMaxLength(100);
-            entity.Property(e => e.UpdatedAt).HasColumnType("datetime");
+        modelBuilder.Entity<MenuAdminDetail>(entity =>
+        {
+            entity.Property(e => e.MenuAdminDetailId).HasMaxLength(50);
+            entity.Property(e => e.ActionName).HasMaxLength(50);
+            entity.Property(e => e.ApiName).HasMaxLength(100);
+            entity.Property(e => e.CreatedUserId).HasMaxLength(50);
+            entity.Property(e => e.MenuDetailCode).HasMaxLength(50);
+            entity.Property(e => e.ModifiedUserId).HasMaxLength(50);
+            entity.Property(e => e.ParentMenuCode).HasMaxLength(50);
         });
 
         modelBuilder.Entity<Project>(entity =>
         {
-            entity.HasKey(e => e.Id).HasName("PK__Projects__3214EC072A5DAE2F");
+            entity.HasIndex(e => e.CreatedById, "IX_Projects_CreatedById");
 
             entity.Property(e => e.CreatedAt)
                 .HasDefaultValueSql("(getdate())")
@@ -138,20 +139,20 @@ public partial class AppDbContext : DbContext
                 .HasDefaultValueSql("(getdate())")
                 .HasColumnType("datetime");
             entity.Property(e => e.EndDate).HasColumnType("datetime");
-            entity.Property(e => e.IsDeleted).HasDefaultValue(false);
             entity.Property(e => e.Name).HasMaxLength(150);
             entity.Property(e => e.StartDate).HasColumnType("datetime");
             entity.Property(e => e.UpdatedAt).HasColumnType("datetime");
 
             entity.HasOne(d => d.CreatedByNavigation).WithMany(p => p.Projects)
                 .HasForeignKey(d => d.CreatedById)
-                .OnDelete(DeleteBehavior.ClientSetNull)
-                .HasConstraintName("FK__Projects__Create__693CA210");
+                .OnDelete(DeleteBehavior.ClientSetNull);
         });
 
         modelBuilder.Entity<ProjectMember>(entity =>
         {
-            entity.HasKey(e => new { e.ProjectId, e.UserId }).HasName("PK__ProjectM__A76232349193C33E");
+            entity.HasKey(e => new { e.ProjectId, e.UserId });
+
+            entity.HasIndex(e => e.UserId, "IX_ProjectMembers_UserId");
 
             entity.Property(e => e.CreatedAt)
                 .HasDefaultValueSql("(getdate())")
@@ -159,75 +160,64 @@ public partial class AppDbContext : DbContext
 
             entity.HasOne(d => d.Project).WithMany(p => p.ProjectMembers)
                 .HasForeignKey(d => d.ProjectId)
-                .HasConstraintName("FK__ProjectMe__Proje__6EF57B66");
+                .HasConstraintName("FK_ProjectMembers_Projects");
 
             entity.HasOne(d => d.User).WithMany(p => p.ProjectMembers)
                 .HasForeignKey(d => d.UserId)
-                .HasConstraintName("FK__ProjectMe__UserI__6FE99F9F");
+                .HasConstraintName("FK_ProjectMembers_Users");
         });
 
         modelBuilder.Entity<Role>(entity =>
         {
-            entity.HasKey(e => e.Id).HasName("PK__Roles__3214EC07269DAA6F");
-
-            entity.HasIndex(e => e.Name, "UQ__Roles__737584F64A9432D8").IsUnique();
+            entity.HasIndex(e => e.Name, "UQ_Roles_Name").IsUnique();
 
             entity.Property(e => e.CreatedAt)
                 .HasDefaultValueSql("(getdate())")
                 .HasColumnType("datetime");
             entity.Property(e => e.Description).HasMaxLength(200);
-            entity.Property(e => e.IsDeleted).HasDefaultValue(false);
             entity.Property(e => e.Name).HasMaxLength(50);
             entity.Property(e => e.UpdatedAt).HasColumnType("datetime");
         });
 
-        modelBuilder.Entity<RolePermission>(entity =>
+        modelBuilder.Entity<RoleMenu>(entity =>
         {
-            entity.HasKey(e => new { e.RoleId, e.PermissionId }).HasName("PK__RolePerm__6400A1A84E655E36");
-
-            entity.Property(e => e.CreatedAt)
-                .HasDefaultValueSql("(getdate())")
-                .HasColumnType("datetime");
-
-            entity.HasOne(d => d.Permission).WithMany(p => p.RolePermissions)
-                .HasForeignKey(d => d.PermissionId)
-                .HasConstraintName("FK__RolePermi__Permi__5EBF139D");
-
-            entity.HasOne(d => d.Role).WithMany(p => p.RolePermissions)
-                .HasForeignKey(d => d.RoleId)
-                .HasConstraintName("FK__RolePermi__RoleI__5DCAEF64");
+            entity.Property(e => e.RoleMenuId).HasMaxLength(50);
+            entity.Property(e => e.CreatedUserId).HasMaxLength(50);
+            entity.Property(e => e.MenuCode).HasMaxLength(50);
+            entity.Property(e => e.ModifiedUserId).HasMaxLength(50);
+            entity.Property(e => e.RoleCode).HasMaxLength(50);
         });
 
         modelBuilder.Entity<Task>(entity =>
         {
-            entity.HasKey(e => e.Id).HasName("PK__Tasks__3214EC074B47FE29");
+            entity.HasIndex(e => e.AssignedBy, "IX_Tasks_AssignedBy");
+
+            entity.HasIndex(e => e.AssignedTo, "IX_Tasks_AssignedTo");
+
+            entity.HasIndex(e => e.ProjectId, "IX_Tasks_ProjectId");
 
             entity.Property(e => e.CreatedAt)
                 .HasDefaultValueSql("(getdate())")
                 .HasColumnType("datetime");
             entity.Property(e => e.DueDate).HasColumnType("datetime");
-            entity.Property(e => e.IsDeleted).HasDefaultValue(false);
+            entity.Property(e => e.EstimatedHours).HasColumnType("decimal(5, 2)");
             entity.Property(e => e.PriorityId).HasDefaultValue(2L);
             entity.Property(e => e.StatusId).HasDefaultValue(1L);
             entity.Property(e => e.Title).HasMaxLength(200);
             entity.Property(e => e.UpdatedAt).HasColumnType("datetime");
 
-            entity.HasOne(d => d.AssignedByNavigation).WithMany(p => p.TaskAssignedByNavigations)
-                .HasForeignKey(d => d.AssignedBy)
-                .HasConstraintName("FK__Tasks__AssignedB__778AC167");
+            entity.HasOne(d => d.AssignedByNavigation).WithMany(p => p.TaskAssignedByNavigations).HasForeignKey(d => d.AssignedBy);
 
-            entity.HasOne(d => d.AssignedToNavigation).WithMany(p => p.TaskAssignedToNavigations)
-                .HasForeignKey(d => d.AssignedTo)
-                .HasConstraintName("FK__Tasks__AssignedT__76969D2E");
+            entity.HasOne(d => d.AssignedToNavigation).WithMany(p => p.TaskAssignedToNavigations).HasForeignKey(d => d.AssignedTo);
 
             entity.HasOne(d => d.Project).WithMany(p => p.Tasks)
                 .HasForeignKey(d => d.ProjectId)
-                .HasConstraintName("FK__Tasks__ProjectId__73BA3083");
+                .HasConstraintName("FK_Tasks_Projects");
         });
 
         modelBuilder.Entity<TaskHistory>(entity =>
         {
-            entity.HasKey(e => e.Id).HasName("PK__TaskHist__3214EC07A77801AE");
+            entity.HasIndex(e => e.TaskId, "IX_TaskHistories_TaskId");
 
             entity.Property(e => e.CreatedAt)
                 .HasDefaultValueSql("(getdate())")
@@ -236,26 +226,50 @@ public partial class AppDbContext : DbContext
 
             entity.HasOne(d => d.CreatedByNavigation).WithMany(p => p.TaskHistoryCreatedByNavigations)
                 .HasForeignKey(d => d.CreatedBy)
-                .OnDelete(DeleteBehavior.ClientSetNull)
-                .HasConstraintName("FK__TaskHisto__Creat__0C85DE4D");
+                .OnDelete(DeleteBehavior.ClientSetNull);
 
             entity.HasOne(d => d.ModifiedBy).WithMany(p => p.TaskHistoryModifiedBies)
                 .HasForeignKey(d => d.ModifiedById)
                 .OnDelete(DeleteBehavior.ClientSetNull)
-                .HasConstraintName("FK__TaskHisto__Modif__0B91BA14");
+                .HasConstraintName("FK_TaskHistories_Users_ModifiedBy");
 
             entity.HasOne(d => d.Task).WithMany(p => p.TaskHistories)
                 .HasForeignKey(d => d.TaskId)
-                .HasConstraintName("FK__TaskHisto__TaskI__0A9D95DB");
+                .HasConstraintName("FK_TaskHistories_Tasks");
+        });
+
+        modelBuilder.Entity<TimeLog>(entity =>
+        {
+            entity.HasIndex(e => e.LogDate, "IX_TimeLogs_LogDate");
+
+            entity.HasIndex(e => e.TaskId, "IX_TimeLogs_TaskId");
+
+            entity.HasIndex(e => e.UserId, "IX_TimeLogs_UserId");
+
+            entity.Property(e => e.CreatedAt)
+                .HasDefaultValueSql("(getdate())")
+                .HasColumnType("datetime");
+            entity.Property(e => e.HoursLogged).HasColumnType("decimal(5, 2)");
+            entity.Property(e => e.Notes).HasMaxLength(500);
+            entity.Property(e => e.UpdatedAt).HasColumnType("datetime");
+
+            entity.HasOne(d => d.Task).WithMany(p => p.TimeLogs)
+                .HasForeignKey(d => d.TaskId)
+                .HasConstraintName("FK_TimeLogs_Tasks");
+
+            entity.HasOne(d => d.User).WithMany(p => p.TimeLogs)
+                .HasForeignKey(d => d.UserId)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("FK_TimeLogs_Users");
         });
 
         modelBuilder.Entity<User>(entity =>
         {
-            entity.HasKey(e => e.Id).HasName("PK__Users__3214EC07F132A452");
+            entity.HasIndex(e => e.RoleId, "IX_Users_RoleId");
 
-            entity.HasIndex(e => e.Username, "UQ__Users__536C85E43F85AAB5").IsUnique();
+            entity.HasIndex(e => e.Email, "UQ_Users_Email").IsUnique();
 
-            entity.HasIndex(e => e.Email, "UQ__Users__A9D10534D2661DAC").IsUnique();
+            entity.HasIndex(e => e.Username, "UQ_Users_Username").IsUnique();
 
             entity.Property(e => e.CreatedAt)
                 .HasDefaultValueSql("(getdate())")
@@ -263,7 +277,6 @@ public partial class AppDbContext : DbContext
             entity.Property(e => e.Email).HasMaxLength(256);
             entity.Property(e => e.FirstName).HasMaxLength(50);
             entity.Property(e => e.IsActive).HasDefaultValue(true);
-            entity.Property(e => e.IsDeleted).HasDefaultValue(false);
             entity.Property(e => e.LastName).HasMaxLength(50);
             entity.Property(e => e.Phone).HasMaxLength(20);
             entity.Property(e => e.UpdatedAt).HasColumnType("datetime");
@@ -272,45 +285,7 @@ public partial class AppDbContext : DbContext
             entity.HasOne(d => d.Role).WithMany(p => p.Users)
                 .HasForeignKey(d => d.RoleId)
                 .OnDelete(DeleteBehavior.ClientSetNull)
-                .HasConstraintName("FK__Users__RoleId__6383C8BA");
-        });
-
-        modelBuilder.Entity<MenuAdmin>(entity =>
-        {
-            entity.ToTable("AdminMenus");
-            entity.HasKey(e => e.AdminMenuId);
-            entity.Property(e => e.AdminMenuId).HasMaxLength(50);
-            entity.Property(e => e.MenuCode).HasMaxLength(50).IsRequired();
-            entity.Property(e => e.ParentCode).HasMaxLength(50).IsRequired();
-            entity.Property(e => e.MenuName).HasMaxLength(100).IsRequired();
-            entity.Property(e => e.MenuUrl).HasMaxLength(200);
-            entity.Property(e => e.Icon).HasMaxLength(50);
-            entity.Ignore(e => e.CreatedUserId);
-            entity.Ignore(e => e.CreatedDateTime);
-            entity.Ignore(e => e.ModifiedUserId);
-            entity.Ignore(e => e.ModifiedDateTime);
-        });
-
-        modelBuilder.Entity<MenuAdminDetail>(entity =>
-        {
-            entity.HasKey(e => e.MenuAdminDetailId);
-            entity.Property(e => e.MenuAdminDetailId).HasMaxLength(50);
-            entity.Property(e => e.MenuDetailCode).HasMaxLength(50).IsRequired();
-            entity.Property(e => e.ParentMenuCode).HasMaxLength(50).IsRequired();
-            entity.Property(e => e.ActionName).HasMaxLength(50).IsRequired();
-            entity.Property(e => e.ApiName).HasMaxLength(100).IsRequired();
-            entity.Property(e => e.CreatedUserId).HasMaxLength(50);
-            entity.Property(e => e.ModifiedUserId).HasMaxLength(50);
-        });
-
-        modelBuilder.Entity<RoleMenu>(entity =>
-        {
-            entity.HasKey(e => e.RoleMenuId);
-            entity.Property(e => e.RoleMenuId).HasMaxLength(50);
-            entity.Property(e => e.RoleCode).HasMaxLength(50).IsRequired();
-            entity.Property(e => e.MenuCode).HasMaxLength(50).IsRequired();
-            entity.Property(e => e.CreatedUserId).HasMaxLength(50);
-            entity.Property(e => e.ModifiedUserId).HasMaxLength(50);
+                .HasConstraintName("FK_Users_Roles");
         });
 
         OnModelCreatingPartial(modelBuilder);

TaskTrackingSystem.Database/AppDbContextModels/Comment.cs

@@ -21,7 +21,7 @@ public partial class Comment
 
     public long? UpdatedBy { get; set; }
 
-    public bool? IsDeleted { get; set; }
+    public bool IsDeleted { get; set; }
 
     public virtual Task Task { get; set; } = null!;
 

TaskTrackingSystem.Database/AppDbContextModels/FileAttachment.cs

@@ -25,7 +25,7 @@ public partial class FileAttachment
 
     public long? UpdatedBy { get; set; }
 
-    public bool? IsDeleted { get; set; }
+    public bool IsDeleted { get; set; }
 
     public virtual Task Task { get; set; } = null!;
 }

TaskTrackingSystem.Database/AppDbContextModels/MenuAdmin.cs

@@ -1,35 +1,33 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace TaskTrackingSystem.Database.AppDbContextModels
+namespace TaskTrackingSystem.Database.AppDbContextModels;
+
+public partial class MenuAdmin
 {
-    public partial class MenuAdmin
-    {
-        public string AdminMenuId { get; set; } = null!;
+    public string AdminMenuId { get; set; } = null!;
 
-        public string MenuCode { get; set; } = null!;
+    public string MenuCode { get; set; } = null!;
 
-        public string ParentCode { get; set; } = null!;
+    public string ParentCode { get; set; } = null!;
 
-        public string MenuName { get; set; } = null!;
+    public string MenuName { get; set; } = null!;
 
-        public string? MenuUrl { get; set; }
+    public string? MenuUrl { get; set; }
 
-        public bool Visible { get; set; }
+    public bool Visible { get; set; }
 
-        public int OrderNo { get; set; }
+    public int OrderNo { get; set; }
 
-        public string? Icon { get; set; }
+    public string? Icon { get; set; }
 
-        public int DelFlag { get; set; }
+    public int DelFlag { get; set; }
 
-        public string? CreatedUserId { get; set; }
-        public DateTime CreatedDateTime { get; set; }
-        public string? ModifiedUserId { get; set; }
-        public DateTime? ModifiedDateTime { get; set; }
-    }
-}
+    public string? CreatedUserId { get; set; }
+
+    public DateTime CreatedDateTime { get; set; }
 
+    public string? ModifiedUserId { get; set; }
+
+    public DateTime? ModifiedDateTime { get; set; }
+}

TaskTrackingSystem.Database/AppDbContextModels/MenuAdminDetail.cs

@@ -1,34 +1,31 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace TaskTrackingSystem.Database.AppDbContextModels
+namespace TaskTrackingSystem.Database.AppDbContextModels;
+
+public partial class MenuAdminDetail
 {
-    public partial class MenuAdminDetail
-    {
-        public string MenuAdminDetailId { get; set; } = null!;
+    public string MenuAdminDetailId { get; set; } = null!;
 
-        public string MenuDetailCode { get; set; } = null!;
+    public string MenuDetailCode { get; set; } = null!;
 
-        public string ParentMenuCode { get; set; } = null!;
+    public string ParentMenuCode { get; set; } = null!;
 
-        public string ActionName { get; set; } = null!;
+    public string ActionName { get; set; } = null!;
 
-        public string ApiName { get; set; } = null!;
+    public string ApiName { get; set; } = null!;
 
-        public bool Visible { get; set; }
+    public bool Visible { get; set; }
 
-        public int OrderNo { get; set; }
+    public int OrderNo { get; set; }
 
-        public int DelFlag { get; set; }
+    public int DelFlag { get; set; }
 
-        public string? CreatedUserId { get; set; }
-        public DateTime CreatedDateTime { get; set; }
-        public string? ModifiedUserId { get; set; }
-        public DateTime? ModifiedDateTime { get; set; }
-    }
-}
+    public string? CreatedUserId { get; set; }
 
+    public DateTime CreatedDateTime { get; set; }
 
+    public string? ModifiedUserId { get; set; }
+
+    public DateTime? ModifiedDateTime { get; set; }
+}

TaskTrackingSystem.Database/AppDbContextModels/Project.cs

@@ -27,7 +27,9 @@ public partial class Project
 
     public long? UpdatedBy { get; set; }
 
-    public bool? IsDeleted { get; set; }
+    public bool IsDeleted { get; set; }
+
+    public int? BudgetedHours { get; set; }
 
     public virtual User CreatedByNavigation { get; set; } = null!;
 

TaskTrackingSystem.Database/AppDbContextModels/Role.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace TaskTrackingSystem.Database.AppDbContextModels;
@@ -21,7 +21,5 @@ public partial class Role
 
     public bool IsDeleted { get; set; }
 
-    public virtual ICollection<RolePermission> RolePermissions { get; set; } = new List<RolePermission>();
-
     public virtual ICollection<User> Users { get; set; } = new List<User>();
 }

TaskTrackingSystem.Database/AppDbContextModels/RoleMenu.cs

@@ -1,21 +1,23 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace TaskTrackingSystem.Database.AppDbContextModels
+namespace TaskTrackingSystem.Database.AppDbContextModels;
+
+public partial class RoleMenu
 {
-    public partial class RoleMenu
-    {
-        public string RoleMenuId { get; set; } = null!;
-        public string RoleCode { get; set; } = null!;
-        public string MenuCode { get; set; } = null!;
-        public int DelFlag { get; set; }
-
-        public string? CreatedUserId { get; set; }
-        public DateTime CreatedDateTime { get; set; }
-        public string? ModifiedUserId { get; set; }
-        public DateTime? ModifiedDateTime { get; set; }
-    }
+    public string RoleMenuId { get; set; } = null!;
+
+    public string RoleCode { get; set; } = null!;
+
+    public string MenuCode { get; set; } = null!;
+
+    public int DelFlag { get; set; }
+
+    public string? CreatedUserId { get; set; }
+
+    public DateTime CreatedDateTime { get; set; }
+
+    public string? ModifiedUserId { get; set; }
+
+    public DateTime? ModifiedDateTime { get; set; }
 }

TaskTrackingSystem.Database/AppDbContextModels/Task.cs

@@ -21,7 +21,7 @@ public partial class Task
 
     public long? AssignedBy { get; set; }
 
-    public int? EstimatedHours { get; set; }
+    public decimal? EstimatedHours { get; set; }
 
     public DateTime DueDate { get; set; }
 
@@ -46,4 +46,6 @@ public partial class Task
     public virtual Project Project { get; set; } = null!;
 
     public virtual ICollection<TaskHistory> TaskHistories { get; set; } = new List<TaskHistory>();
+
+    public virtual ICollection<TimeLog> TimeLogs { get; set; } = new List<TimeLog>();
 }

TaskTrackingSystem.Database/AppDbContextModels/TimeLog.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+
+namespace TaskTrackingSystem.Database.AppDbContextModels;
+
+public partial class TimeLog
+{
+    public long Id { get; set; }
+
+    public long TaskId { get; set; }
+
+    public long UserId { get; set; }
+
+    public decimal HoursLogged { get; set; }
+
+    public DateOnly LogDate { get; set; }
+
+    public string? Notes { get; set; }
+
+    public DateTime? CreatedAt { get; set; }
+
+    public long? CreatedBy { get; set; }
+
+    public DateTime? UpdatedAt { get; set; }
+
+    public long? UpdatedBy { get; set; }
+
+    public bool IsDeleted { get; set; }
+
+    public virtual Task Task { get; set; } = null!;
+
+    public virtual User User { get; set; } = null!;
+}

TaskTrackingSystem.Database/AppDbContextModels/User.cs

@@ -7,6 +7,8 @@ public partial class User
 {
     public long Id { get; set; }
 
+    public string Username { get; set; } = null!;
+
     public string FirstName { get; set; } = null!;
 
     public string LastName { get; set; } = null!;
@@ -31,8 +33,6 @@ public partial class User
 
     public bool IsDeleted { get; set; }
 
-    public string Username { get; set; } = null!;
-
     public virtual ICollection<AuditLog> AuditLogs { get; set; } = new List<AuditLog>();
 
     public virtual ICollection<Comment> Comments { get; set; } = new List<Comment>();
@@ -50,4 +50,6 @@ public partial class User
     public virtual ICollection<TaskHistory> TaskHistoryCreatedByNavigations { get; set; } = new List<TaskHistory>();
 
     public virtual ICollection<TaskHistory> TaskHistoryModifiedBies { get; set; } = new List<TaskHistory>();
+
+    public virtual ICollection<TimeLog> TimeLogs { get; set; } = new List<TimeLog>();
 }

TaskTrackingSystem.Shared/Models/Project/CreateProjectDto.cs

@@ -22,5 +22,7 @@ namespace TaskTrackingSystem.Shared.Models.Project
 
         [Required]
         public long CreatedById { get; set; }
+
+        public int? BudgetedHours { get; set; }
     }
 }

TaskTrackingSystem.Shared/Models/Project/ProjectDto.cs

@@ -15,5 +15,6 @@ namespace TaskTrackingSystem.Shared.Models.Project
         public DateTime EndDate { get; set; }
         public long CreatedById { get; set; }
         public DateTime CreatedAt { get; set; }
+        public int? BudgetedHours { get; set; }
     }
 }

TaskTrackingSystem.Shared/Models/Project/UpdateProjectDto.cs

@@ -19,5 +19,7 @@ namespace TaskTrackingSystem.Shared.Models.Project
 
         [Required]
         public DateTime EndDate { get; set; }
+
+        public int? BudgetedHours { get; set; }
     }
 }

TaskTrackingSystem.Shared/Models/Report/TaskReportDto.cs

@@ -16,7 +16,7 @@ namespace TaskTrackingSystem.Shared.Models.Report
         public string? AssignedToUser { get; set; }
         public long? AssignedToUserId { get; set; }
         public string? AssignedByUser { get; set; }
-        public int? EstimatedHours { get; set; }
+        public decimal? EstimatedHours { get; set; }
         public DateTime DueDate { get; set; }
         public DateTime CreatedAt { get; set; }
     }

TaskTrackingSystem.Shared/Models/Report/TimeTrackingReportDto.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+
+namespace TaskTrackingSystem.Shared.Models.Report
+{
+    public class TimeTrackingReportDto
+    {
+        public decimal TotalEstimatedHrs { get; set; }
+        public decimal CompletedHours { get; set; }
+        public decimal Variance { get; set; }
+        public double CompletionPercentage { get; set; }
+        public int TasksWithHours { get; set; }
+        public decimal AvgHoursPerTask { get; set; }
+
+        public List<EmployeeTimeSummaryDto> EmployeeSummary { get; set; } = new();
+        public List<ProjectTimeSummaryDto> ProjectSummary { get; set; } = new();
+        public List<TaskTimeDetailDto> TaskDetail { get; set; } = new();
+    }
+
+    public class EmployeeTimeSummaryDto
+    {
+        public long UserId { get; set; }
+        public string FullName { get; set; } = string.Empty;
+        public string Username { get; set; } = string.Empty;
+        public int TotalTasks { get; set; }
+        public int CompletedTasks { get; set; }
+        public decimal EstHours { get; set; }
+        public decimal CompletedHours { get; set; }
+        public decimal Variance { get; set; }
+        public double CompletionPercentage { get; set; }
+    }
+
+    public class ProjectTimeSummaryDto
+    {
+        public long ProjectId { get; set; }
+        public string ProjectName { get; set; } = string.Empty;
+        public int TotalTasks { get; set; }
+        public int CompletedTasks { get; set; }
+        public decimal EstHours { get; set; }
+        public decimal CompletedHours { get; set; }
+        public decimal Variance { get; set; }
+        public double CompletionPercentage { get; set; }
+    }
+
+    public class TaskTimeDetailDto
+    {
+        public long TaskId { get; set; }
+        public string Title { get; set; } = string.Empty;
+        public long ProjectId { get; set; }
+        public string ProjectName { get; set; } = string.Empty;
+        public long? AssignedTo { get; set; }
+        public string AssigneeName { get; set; } = string.Empty;
+        public string AssigneeUsername { get; set; } = string.Empty;
+        public decimal? EstimatedHours { get; set; }
+        public decimal CompletedHours { get; set; }
+        public DateTime DueDate { get; set; }
+        public long StatusId { get; set; }
+    }
+}

TaskTrackingSystem.Shared/Models/Report/UserProductivityDto.cs

@@ -8,5 +8,6 @@ namespace TaskTrackingSystem.Shared.Models.Report
         public int TotalAssignedTasks { get; set; }
         public int CompletedTasksCount { get; set; }
         public double EfficiencyRatio { get; set; } // Completed / Total Asssined (percentage or ratio)
+        public double OnTimeDeliveryRate { get; set; }
     }
 }

TaskTrackingSystem.Shared/Models/Task/CreateTaskDto.cs

@@ -25,7 +25,7 @@ namespace TaskTrackingSystem.Shared.Models.Task
 
         public long? AssignedBy { get; set; }
 
-        public int? EstimatedHours { get; set; }
+        public decimal? EstimatedHours { get; set; }
 
         [Required]
         public DateTime DueDate { get; set; }

TaskTrackingSystem.Shared/Models/Task/TaskDto.cs

@@ -16,8 +16,9 @@ namespace TaskTrackingSystem.Shared.Models.Task
         public long PriorityId { get; set; }
         public long? AssignedTo { get; set; }
         public long? AssignedBy { get; set; }
-        public int? EstimatedHours { get; set; }
+        public decimal? EstimatedHours { get; set; }
         public DateTime DueDate { get; set; }
         public DateTime CreatedAt { get; set; }
+        public DateTime? CompletedAt { get; set; }
     }
 }

TaskTrackingSystem.Shared/Models/Task/UpdateTaskDto.cs

@@ -24,7 +24,7 @@ namespace TaskTrackingSystem.Shared.Models.Task
 
         public long? AssignedBy { get; set; }
 
-        public int? EstimatedHours { get; set; }
+        public decimal? EstimatedHours { get; set; }
 
         [Required]
         public DateTime DueDate { get; set; }

TaskTrackingSystem.WebApi/Features/Project/ProjectService.cs

@@ -24,6 +24,8 @@ namespace TaskTrackingSystem.WebApi.Features.Project
         {
             return await _db.Projects
                 .Where(p => p.IsDeleted != true)
+                .OrderBy(p => p.EndDate)
+                .ThenByDescending(p => p.CreatedAt ?? DateTime.UtcNow)
                 .Select(p => new ProjectDto
                 {
                     Id = p.Id,
@@ -32,7 +34,8 @@ namespace TaskTrackingSystem.WebApi.Features.Project
                     StartDate = p.StartDate,
                     EndDate = p.EndDate,
                     CreatedById = p.CreatedById,
-                    CreatedAt = p.CreatedAt ?? DateTime.UtcNow
+                    CreatedAt = p.CreatedAt ?? DateTime.UtcNow,
+                    BudgetedHours = p.BudgetedHours
                 }).ToListAsync();
         }
 
@@ -51,7 +54,8 @@ namespace TaskTrackingSystem.WebApi.Features.Project
                 StartDate = project.StartDate,
                 EndDate = project.EndDate,
                 CreatedById = project.CreatedById,
-                CreatedAt = project.CreatedAt ?? DateTime.UtcNow
+                CreatedAt = project.CreatedAt ?? DateTime.UtcNow,
+                BudgetedHours = project.BudgetedHours
             };
         }
 
@@ -71,7 +75,8 @@ namespace TaskTrackingSystem.WebApi.Features.Project
                 CreatedById = dto.CreatedById,
                 IsDeleted = false,
                 CreatedAt = DateTime.UtcNow,
-                CreatedBy = currentUserId
+                CreatedBy = currentUserId,
+                BudgetedHours = dto.BudgetedHours
             };
 
             _db.Projects.Add(project);
@@ -85,7 +90,8 @@ namespace TaskTrackingSystem.WebApi.Features.Project
                 StartDate = project.StartDate,
                 EndDate = project.EndDate,
                 CreatedById = project.CreatedById,
-                CreatedAt = project.CreatedAt ?? DateTime.UtcNow
+                CreatedAt = project.CreatedAt ?? DateTime.UtcNow,
+                BudgetedHours = project.BudgetedHours
             };
 
             return Result<ProjectDto>.Success(resultDto, 201);
@@ -105,6 +111,7 @@ namespace TaskTrackingSystem.WebApi.Features.Project
             project.Description = dto.Description;
             project.StartDate = dto.StartDate;
             project.EndDate = dto.EndDate;
+            project.BudgetedHours = dto.BudgetedHours;
             project.UpdatedAt = DateTime.UtcNow;
             project.UpdatedBy = currentUserId;
 
@@ -251,7 +258,12 @@ namespace TaskTrackingSystem.WebApi.Features.Project
                     AssignedBy = t.AssignedBy,
                     EstimatedHours = t.EstimatedHours,
                     DueDate = t.DueDate,
-                    CreatedAt = t.CreatedAt ?? DateTime.UtcNow
+                    CreatedAt = t.CreatedAt ?? DateTime.UtcNow,
+                    CompletedAt = t.TaskHistories
+                        .Where(th => th.NewStatusId == 3)
+                        .OrderBy(th => th.CreatedAt)
+                        .Select(th => th.CreatedAt)
+                        .FirstOrDefault()
                 })
                 .ToListAsync();
 

TaskTrackingSystem.WebApi/Features/Report/ReportController.cs

@@ -110,5 +110,17 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             return File(bytes, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
                         $"OverdueCriticalTasks_{DateTime.Today:yyyyMMdd}.xlsx");
         }
+
+        // ─── Report 4: Time Tracking ──────────────────────────────────────────────
+
+        [HttpGet("time-tracking")]
+        public async Task<ActionResult<Result<TimeTrackingReportDto>>> GetTimeTracking(
+            [FromQuery] string? search,
+            [FromQuery] long? projectId,
+            [FromQuery] long? statusId)
+        {
+            var result = await _reportService.GetTimeTrackingReportAsync(search, projectId, statusId);
+            return StatusCode(result.StatusCode, result);
+        }
     }
 }

TaskTrackingSystem.WebApi/Features/Report/ReportService.cs

@@ -39,12 +39,22 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             if (!string.IsNullOrWhiteSpace(status))
             {
                 var sl = status.Trim().ToLower();
-                long? sid = sl switch { "to do" => 1, "in progress" => 2, "done" => 3, _ => null };
-                if (sid.HasValue) query = query.Where(t => t.StatusId == sid.Value);
-                else if (long.TryParse(status, out var pid)) query = query.Where(t => t.StatusId == pid);
+                if (sl == "uncompleted")
+                {
+                    query = query.Where(t => t.StatusId != 3);
+                }
+                else
+                {
+                    long? sid = sl switch { "to do" => 1, "in progress" => 2, "done" => 3, _ => null };
+                    if (sid.HasValue) query = query.Where(t => t.StatusId == sid.Value);
+                    else if (long.TryParse(status, out var pid)) query = query.Where(t => t.StatusId == pid);
+                }
             }
 
-            var tasks = await query.ToListAsync();
+            var tasks = await query
+                .OrderBy(t => t.DueDate)
+                .ThenByDescending(t => t.CreatedAt ?? DateTime.UtcNow)
+                .ToListAsync();
             var list = tasks.Select(t => new TaskReportDto
             {
                 TaskId = t.Id,
@@ -72,8 +82,21 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             var list = new List<UserProductivityDto>();
             foreach (var user in users)
             {
-                var tasks = await _db.Tasks.Where(t => t.AssignedTo == user.Id && t.IsDeleted != true).ToListAsync();
-                int total = tasks.Count, done = tasks.Count(t => t.StatusId == 3);
+                var tasks = await _db.Tasks
+                    .Include(t => t.TaskHistories)
+                    .Where(t => t.AssignedTo == user.Id && t.IsDeleted != true)
+                    .ToListAsync();
+                
+                int total = tasks.Count;
+                var completedTasks = tasks.Where(t => t.StatusId == 3).ToList();
+                int done = completedTasks.Count;
+                
+                int onTimeCount = completedTasks.Count(t => 
+                    t.TaskHistories.Any(th => th.NewStatusId == 3 && th.CreatedAt <= t.DueDate)
+                );
+                
+                double onTimeDeliveryRate = done > 0 ? Math.Round(((double)onTimeCount / done) * 100, 2) : 0;
+
                 list.Add(new UserProductivityDto
                 {
                     UserId = user.Id,
@@ -81,7 +104,8 @@ namespace TaskTrackingSystem.WebApi.Features.Report
                     FullName = $"{user.FirstName} {user.LastName}".Trim(),
                     TotalAssignedTasks = total,
                     CompletedTasksCount = done,
-                    EfficiencyRatio = total > 0 ? Math.Round(((double)done / total) * 100, 2) : 0
+                    EfficiencyRatio = total > 0 ? Math.Round(((double)done / total) * 100, 2) : 0,
+                    OnTimeDeliveryRate = onTimeDeliveryRate
                 });
             }
             return Result<IEnumerable<UserProductivityDto>>.Success(list);
@@ -102,7 +126,7 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             if (projectId.HasValue && projectId > 0)
                 query = query.Where(t => t.ProjectId == projectId.Value);
 
-            var tasks = await query.OrderByDescending(t => t.CreatedAt).ToListAsync();
+            var tasks = await query.OrderBy(t => t.DueDate).ThenByDescending(t => t.CreatedAt ?? DateTime.UtcNow).ToListAsync();
 
             if (!string.IsNullOrWhiteSpace(search))
             {
@@ -304,5 +328,138 @@ namespace TaskTrackingSystem.WebApi.Features.Report
             wb.SaveAs(ms);
             return ms.ToArray();
         }
+
+        public async Task<Result<TimeTrackingReportDto>> GetTimeTrackingReportAsync(
+            string? search, long? projectId, long? statusId)
+        {
+            var query = _db.Tasks
+                .Include(t => t.Project)
+                .Include(t => t.AssignedToNavigation)
+                .Include(t => t.TimeLogs.Where(tl => !tl.IsDeleted))
+                .Where(t => t.IsDeleted != true);
+
+            if (projectId.HasValue && projectId > 0)
+                query = query.Where(t => t.ProjectId == projectId.Value);
+            if (statusId.HasValue && statusId > 0)
+                query = query.Where(t => t.StatusId == statusId.Value);
+
+            var tasks = await query.ToListAsync();
+
+            if (!string.IsNullOrWhiteSpace(search))
+            {
+                var s = search.Trim().ToLower();
+                tasks = tasks.Where(t =>
+                    t.Title.ToLower().Contains(s) ||
+                    (t.Project?.Name.ToLower().Contains(s) == true) ||
+                    (t.AssignedToNavigation != null &&
+                     ($"{t.AssignedToNavigation.FirstName} {t.AssignedToNavigation.LastName}").ToLower().Contains(s))
+                ).ToList();
+            }
+
+            var totalEstimatedHrs = tasks.Sum(t => t.EstimatedHours ?? 0m);
+            var completedHours = tasks.Sum(t => t.TimeLogs.Sum(tl => tl.HoursLogged));
+            var variance = totalEstimatedHrs - completedHours;
+            var completionPercentage = totalEstimatedHrs > 0m 
+                ? (double)Math.Round((completedHours / totalEstimatedHrs) * 100m, 2) 
+                : 0.0;
+
+            var tasksWithHours = tasks.Count(t => t.EstimatedHours.HasValue || t.TimeLogs.Any());
+            var avgHoursPerTask = tasksWithHours > 0 
+                ? Math.Round(totalEstimatedHrs / tasksWithHours, 2) 
+                : 0m;
+
+            var result = new TimeTrackingReportDto
+            {
+                TotalEstimatedHrs = totalEstimatedHrs,
+                CompletedHours = completedHours,
+                Variance = variance,
+                CompletionPercentage = completionPercentage,
+                TasksWithHours = tasksWithHours,
+                AvgHoursPerTask = avgHoursPerTask
+            };
+
+            // Group by Employee
+            var employeeGroups = tasks
+                .GroupBy(t => t.AssignedTo)
+                .ToList();
+
+            foreach (var group in employeeGroups)
+            {
+                var userId = group.Key;
+                var user = userId.HasValue ? await _db.Users.FindAsync(userId.Value) : null;
+
+                var total = group.Count();
+                var completed = group.Count(t => t.StatusId == 3);
+                var est = group.Sum(t => t.EstimatedHours ?? 0m);
+                var comp = group.Sum(t => t.TimeLogs.Sum(tl => tl.HoursLogged));
+                var employeeVariance = est - comp;
+                var employeePct = est > 0m 
+                    ? (double)Math.Round((comp / est) * 100m, 2) 
+                    : 0.0;
+
+                result.EmployeeSummary.Add(new EmployeeTimeSummaryDto
+                {
+                    UserId = group.Key ?? 0,
+                    FullName = user != null ? $"{user.FirstName} {user.LastName}".Trim() : "Unassigned",
+                    Username = user?.Username ?? "unassigned",
+                    TotalTasks = total,
+                    CompletedTasks = completed,
+                    EstHours = est,
+                    CompletedHours = comp,
+                    Variance = employeeVariance,
+                    CompletionPercentage = employeePct
+                });
+            }
+
+            // Group by Project
+            var projectGroups = tasks
+                .GroupBy(t => new { t.ProjectId, ProjectName = t.Project?.Name ?? "Unknown Project" })
+                .ToList();
+
+            foreach (var group in projectGroups)
+            {
+                var total = group.Count();
+                var completed = group.Count(t => t.StatusId == 3);
+                var est = group.Sum(t => t.EstimatedHours ?? 0m);
+                var comp = group.Sum(t => t.TimeLogs.Sum(tl => tl.HoursLogged));
+                var projectVariance = est - comp;
+                var projectPct = est > 0m 
+                    ? (double)Math.Round((comp / est) * 100m, 2) 
+                    : 0.0;
+
+                result.ProjectSummary.Add(new ProjectTimeSummaryDto
+                {
+                    ProjectId = group.Key.ProjectId,
+                    ProjectName = group.Key.ProjectName,
+                    TotalTasks = total,
+                    CompletedTasks = completed,
+                    EstHours = est,
+                    CompletedHours = comp,
+                    Variance = projectVariance,
+                    CompletionPercentage = projectPct
+                });
+            }
+
+            // Task Details
+            foreach (var t in tasks)
+            {
+                result.TaskDetail.Add(new TaskTimeDetailDto
+                {
+                    TaskId = t.Id,
+                    Title = t.Title,
+                    ProjectId = t.ProjectId,
+                    ProjectName = t.Project?.Name ?? "",
+                    AssignedTo = t.AssignedTo,
+                    AssigneeName = t.AssignedToNavigation != null ? $"{t.AssignedToNavigation.FirstName} {t.AssignedToNavigation.LastName}".Trim() : "Unassigned",
+                    AssigneeUsername = t.AssignedToNavigation?.Username ?? "",
+                    EstimatedHours = t.EstimatedHours,
+                    CompletedHours = t.TimeLogs.Sum(tl => tl.HoursLogged),
+                    DueDate = t.DueDate,
+                    StatusId = t.StatusId
+                });
+            }
+
+            return Result<TimeTrackingReportDto>.Success(result);
+        }
     }
 }

TaskTrackingSystem.WebApi/Features/Role/RoleController.cs

@@ -58,27 +58,6 @@ namespace TaskTrackingSystem.WebApi.Features.Role
             return StatusCode(result.StatusCode, result);
         }
 
-        [HttpPost("{id}/permissions")]
-        public async Task<IActionResult> AssignPermissions(long id, [FromBody] AssignPermissionsDto dto)
-        {
-            var result = await _roleService.AssignPermissionsToRoleAsync(id, dto);
-            if (!result.IsSuccess)
-            {
-                return StatusCode(result.StatusCode, new { message = result.ErrorMessage });
-            }
-            return Ok();
-        }
-
-        [HttpGet("{id}/permissions")]
-        public async Task<ActionResult<Result<List<long>>>> GetAssignedPermissions(long id)
-        {
-            var result = await _roleService.GetAssignedPermissionsByRoleIdAsync(id);
-            if (!result.IsSuccess)
-            {
-                return StatusCode(result.StatusCode, new { message = result.ErrorMessage });
-            }
-            return Ok(result);
-        }
 
         [HttpGet("{id}/menus")]
         public async Task<ActionResult<Result<List<string>>>> GetAssignedMenus(long id)

TaskTrackingSystem.WebApi/Features/Role/RoleService.cs

@@ -137,74 +137,6 @@ namespace TaskTrackingSystem.WebApi.Features.Role
             return Result.Success(200);
         }
 
-        public async Task<Result> AssignPermissionsToRoleAsync(long roleId, AssignPermissionsDto dto)
-        {
-            var role = await _db.Roles.FirstOrDefaultAsync(r => r.Id == roleId && r.IsDeleted != true);
-            if (role == null)
-            {
-                return Result.Failure(ResultMessages.RoleNotFound(roleId), 404);
-            }
-
-            if (dto.PermissionIds == null)
-            {
-                return Result.Failure(ResultMessages.PermissionIdsCannotBeNull, 400);
-            }
-
-            // Verify that all requested permission IDs are valid (not deleted)
-            if (dto.PermissionIds.Any())
-            {
-                var validPermissionIds = await _db.Permissions
-                    .Where(p => dto.PermissionIds.Contains(p.Id) && p.IsDeleted != true)
-                    .Select(p => p.Id)
-                    .ToListAsync();
-
-                var invalidPermissionIds = dto.PermissionIds.Except(validPermissionIds).ToList();
-                if (invalidPermissionIds.Any())
-                {
-                    return Result.Failure(ResultMessages.InvalidPermissionIds(string.Join(", ", invalidPermissionIds)), 400);
-                }
-            }
-
-            // Remove existing role permissions matching roleId
-            var existingRolePermissions = await _db.RolePermissions
-                .Where(rp => rp.RoleId == roleId)
-                .ToListAsync();
-
-            if (existingRolePermissions.Any())
-            {
-                _db.RolePermissions.RemoveRange(existingRolePermissions);
-            }
-
-            // Bulk insert new RolePermission links
-            foreach (var permissionId in dto.PermissionIds)
-            {
-                _db.RolePermissions.Add(new RolePermission
-                {
-                    RoleId = roleId,
-                    PermissionId = permissionId,
-                    CreatedAt = DateTime.UtcNow
-                });
-            }
-
-            await _db.SaveChangesAsync();
-            return Result.Success(200);
-        }
-
-        public async Task<Result<List<long>>> GetAssignedPermissionsByRoleIdAsync(long roleId)
-        {
-            var roleExists = await _db.Roles.AnyAsync(r => r.Id == roleId && r.IsDeleted != true);
-            if (!roleExists)
-            {
-                return Result<List<long>>.Failure(ResultMessages.RoleNotFound(roleId), 404);
-            }
-
-            var permissionIds = await _db.RolePermissions
-                .Where(rp => rp.RoleId == roleId)
-                .Select(rp => rp.PermissionId)
-                .ToListAsync();
-
-            return Result<List<long>>.Success(permissionIds);
-        }
 
         public async Task<Result<List<string>>> GetAssignedMenusByRoleIdAsync(long roleId)
         {

TaskTrackingSystem.WebApi/Features/Task/TaskService.cs

@@ -24,6 +24,8 @@ namespace TaskTrackingSystem.WebApi.Features.Task
         {
             return await _db.Tasks
                 .Where(t => t.IsDeleted != true)
+                .OrderBy(t => t.DueDate)
+                .ThenByDescending(t => t.CreatedAt ?? DateTime.UtcNow)
                 .Select(t => new TaskDto
                 {
                     Id = t.Id,
@@ -36,13 +38,19 @@ namespace TaskTrackingSystem.WebApi.Features.Task
                     AssignedBy = t.AssignedBy,
                     EstimatedHours = t.EstimatedHours,
                     DueDate = t.DueDate,
-                    CreatedAt = t.CreatedAt ?? DateTime.UtcNow
+                    CreatedAt = t.CreatedAt ?? DateTime.UtcNow,
+                    CompletedAt = t.TaskHistories
+                        .Where(th => th.NewStatusId == 3)
+                        .OrderBy(th => th.CreatedAt)
+                        .Select(th => th.CreatedAt)
+                        .FirstOrDefault()
                 }).ToListAsync();
         }
 
         public async Task<TaskDto?> GetTaskByIdAsync(long id)
         {
             var task = await _db.Tasks
+                .Include(t => t.TaskHistories)
                 .FirstOrDefaultAsync(t => t.Id == id && t.IsDeleted != true);
 
             if (task == null) return null;
@@ -59,7 +67,12 @@ namespace TaskTrackingSystem.WebApi.Features.Task
                 AssignedBy = task.AssignedBy,
                 EstimatedHours = task.EstimatedHours,
                 DueDate = task.DueDate,
-                CreatedAt = task.CreatedAt ?? DateTime.UtcNow
+                CreatedAt = task.CreatedAt ?? DateTime.UtcNow,
+                CompletedAt = task.TaskHistories
+                    .Where(th => th.NewStatusId == 3)
+                    .OrderBy(th => th.CreatedAt)
+                    .Select(th => th.CreatedAt)
+                    .FirstOrDefault()
             };
         }
 
@@ -111,7 +124,8 @@ namespace TaskTrackingSystem.WebApi.Features.Task
                 AssignedBy = task.AssignedBy,
                 EstimatedHours = task.EstimatedHours,
                 DueDate = task.DueDate,
-                CreatedAt = task.CreatedAt ?? DateTime.UtcNow
+                CreatedAt = task.CreatedAt ?? DateTime.UtcNow,
+                CompletedAt = null
             };
 
             return Result<TaskDto>.Success(resultDto, 201);
@@ -176,7 +190,12 @@ namespace TaskTrackingSystem.WebApi.Features.Task
                     AssignedBy = t.AssignedBy,
                     EstimatedHours = t.EstimatedHours,
                     DueDate = t.DueDate,
-                    CreatedAt = t.CreatedAt ?? DateTime.UtcNow
+                    CreatedAt = t.CreatedAt ?? DateTime.UtcNow,
+                    CompletedAt = t.TaskHistories
+                        .Where(th => th.NewStatusId == 3)
+                        .OrderBy(th => th.CreatedAt)
+                        .Select(th => th.CreatedAt)
+                        .FirstOrDefault()
                 })
                 .ToListAsync();
 

TaskTrackingSystem.WebApp/Components/Pages/EmployeeReport.razor

@@ -132,6 +132,7 @@
                             <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>
                         </tr>
                     </thead>
                     <tbody class="divide-y divide-slate-100">
@@ -161,13 +162,24 @@
                                             <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>
                                 </tr>
                             }
                         }
                         else
                         {
                             <tr>
-                                <td colspan="4" class="px-6 py-12 text-center">
+                                <td colspan="5" class="px-6 py-12 text-center">
                                     <p class="text-sm text-slate-400">No employee data found matching criteria.</p>
                                 </td>
                             </tr>
@@ -331,13 +343,18 @@
             int completedCount = userTasks.Count(t => t.StatusId == 3); // Done = 3
             double efficiency = assignedCount > 0 ? ((double)completedCount / assignedCount) * 100 : 0;
 
+            var completedTasksList = userTasks.Where(t => t.StatusId == 3).ToList();
+            int onTimeCompletedCount = completedTasksList.Count(t => t.CompletedAt.HasValue && t.CompletedAt.Value.Date <= t.DueDate.Date);
+            double onTimeDeliveryRate = completedCount > 0 ? ((double)onTimeCompletedCount / completedCount) * 100 : 0;
+
             metrics.Add(new EmployeeMetric
             {
                 FullName = $"{u.FirstName} {u.LastName}".Trim(),
                 Username = u.Username,
                 AssignedCount = assignedCount,
                 CompletedCount = completedCount,
-                Efficiency = efficiency
+                Efficiency = efficiency,
+                OnTimeDeliveryRate = onTimeDeliveryRate
             });
         }
 
@@ -347,11 +364,11 @@
     private async Task DownloadCsv()
     {
         var csv = new StringBuilder();
-        csv.AppendLine("Employee Name,Username,Total Assigned,Completed Tasks,Efficiency %");
+        csv.AppendLine("Employee Name,Username,Total Assigned,Completed Tasks,Efficiency %,On-Time Delivery %");
 
         foreach (var emp in displayList)
         {
-            csv.AppendLine($"\"{emp.FullName}\",\"{emp.Username}\",\"{emp.AssignedCount}\",\"{emp.CompletedCount}\",\"{emp.Efficiency:F0}%\"");
+            csv.AppendLine($"\"{emp.FullName}\",\"{emp.Username}\",\"{emp.AssignedCount}\",\"{emp.CompletedCount}\",\"{emp.Efficiency:F0}%\",\"{emp.OnTimeDeliveryRate:F0}%\"");
         }
 
         await JS.InvokeVoidAsync("downloadFile", "EmployeeProductivityReport.csv", "text/csv;charset=utf-8;", csv.ToString());
@@ -364,5 +381,6 @@
         public int AssignedCount { get; set; }
         public int CompletedCount { get; set; }
         public double Efficiency { get; set; }
+        public double OnTimeDeliveryRate { get; set; }
     }
 }

TaskTrackingSystem.WebApp/Components/Pages/OverdueTasksReport.razor

@@ -133,6 +133,7 @@
                         <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-right text-xs font-semibold text-slate-500 uppercase tracking-wider">Actions</th>
                     </tr>
                 </thead>
                 <tbody class="divide-y divide-slate-100">
@@ -216,6 +217,14 @@
                                     }
                                     <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium @statusClass">@statusLabel</span>
                                 </td>
+                                <td class="px-6 py-4 text-right space-x-3 whitespace-nowrap">
+                                    <button @onclick="() => RemindAssignee(task)" class="text-xs font-semibold text-violet-600 hover:text-violet-900 transition-colors font-sans">
+                                        Remind
+                                    </button>
+                                    <button @onclick="() => OpenAdjustDueDateModal(task)" class="text-xs font-semibold text-slate-600 hover:text-slate-900 transition-colors font-sans">
+                                        Adjust Due Date
+                                    </button>
+                                </td>
                             </tr>
                         }
                     }
@@ -235,6 +244,41 @@
                         OnPageSizeChanged="HandlePageSizeChanged" />
         </div>
     }
+
+    @if (isAdjustModalOpen && selectedTaskForAdjustment != null)
+    {
+        <div class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-slate-900/40 backdrop-blur-sm transition-opacity">
+            <div class="relative w-full max-w-md rounded-2xl bg-white p-6 shadow-xl border border-slate-100 animate-in fade-in zoom-in duration-200">
+                <h3 class="text-lg font-bold text-slate-900 mb-2 font-sans">Adjust Due Date</h3>
+                <p class="text-sm text-slate-500 mb-4 font-sans">Update the due date for task: <span class="font-semibold text-slate-700">@selectedTaskForAdjustment.Title</span></p>
+
+                <div class="space-y-4">
+                    <div>
+                        <label class="block text-xs font-medium text-slate-500 mb-1.5 font-sans">New Due Date</label>
+                        <input @bind="adjustedDueDate" type="date" 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" />
+                    </div>
+
+                    @if (!string.IsNullOrEmpty(adjustError))
+                    {
+                        <div class="rounded-lg bg-rose-50 p-3 text-xs font-medium text-rose-700 font-sans">@adjustError</div>
+                    }
+
+                    <div class="flex items-center justify-end space-x-3 pt-2">
+                        <button @onclick="CloseAdjustModal" class="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 font-sans">
+                            Cancel
+                        </button>
+                        <button @onclick="SaveDueDateAdjustment" disabled="@isAdjusting" class="rounded-lg bg-violet-600 px-4 py-2 text-sm font-medium text-white hover:bg-violet-700 transition-colors disabled:opacity-50 shadow-sm flex items-center font-sans">
+                            @if (isAdjusting)
+                            {
+                                <svg class="animate-spin -ml-1 mr-2 h-4 w-4 text-white" fill="none" viewBox="0 0 24 24"><circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle><path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z"></path></svg>
+                            }
+                            Save Changes
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
 </div>
 
 @code {
@@ -378,4 +422,80 @@
         var base64 = Convert.ToBase64String(bytes);
         await JS.InvokeVoidAsync("downloadFile", $"overdue_tasks_{DateTime.Today:yyyy-MM-dd}.csv", "text/csv", base64);
     }
+
+    // Adjust Due Date modal variables and methods
+    private bool isAdjustModalOpen = false;
+    private TaskDto? selectedTaskForAdjustment;
+    private DateTime adjustedDueDate = DateTime.Today;
+    private string adjustError = string.Empty;
+    private bool isAdjusting = false;
+
+    private void RemindAssignee(TaskDto task)
+    {
+        var assigneeName = allUsers.FirstOrDefault(u => u.Id == task.AssignedTo) is { } usr ? $"{usr.FirstName} {usr.LastName}" : "Unassigned";
+        Console.WriteLine($"[REMINDER PLACEHOLDER] Sent reminder notification to assignee '{assigneeName}' for overdue task ID {task.Id} ('{task.Title}')");
+    }
+
+    private void OpenAdjustDueDateModal(TaskDto task)
+    {
+        selectedTaskForAdjustment = task;
+        adjustedDueDate = task.DueDate;
+        adjustError = string.Empty;
+        isAdjustModalOpen = true;
+    }
+
+    private void CloseAdjustModal()
+    {
+        isAdjustModalOpen = false;
+        selectedTaskForAdjustment = null;
+        adjustError = string.Empty;
+    }
+
+    private async Task SaveDueDateAdjustment()
+    {
+        if (selectedTaskForAdjustment == null) return;
+
+        isAdjusting = true;
+        adjustError = string.Empty;
+        var client = ApiClient.CreateClient();
+        try
+        {
+            var updateDto = new UpdateTaskDto
+            {
+                Title = selectedTaskForAdjustment.Title,
+                Description = selectedTaskForAdjustment.Description,
+                StatusId = selectedTaskForAdjustment.StatusId,
+                PriorityId = selectedTaskForAdjustment.PriorityId,
+                AssignedTo = selectedTaskForAdjustment.AssignedTo,
+                AssignedBy = selectedTaskForAdjustment.AssignedBy,
+                EstimatedHours = selectedTaskForAdjustment.EstimatedHours,
+                DueDate = adjustedDueDate
+            };
+
+            var response = await client.PutAsJsonAsync($"Task/{selectedTaskForAdjustment.Id}", updateDto);
+            if (response.IsSuccessStatusCode)
+            {
+                var t = allTasks.FirstOrDefault(x => x.Id == selectedTaskForAdjustment.Id);
+                if (t != null)
+                {
+                    t.DueDate = adjustedDueDate;
+                }
+                ComputeSummary();
+                CloseAdjustModal();
+            }
+            else
+            {
+                var errorRes = await response.Content.ReadFromJsonAsync<Result>();
+                adjustError = errorRes?.ErrorMessage ?? "Failed to update due date. Please try again.";
+            }
+        }
+        catch (Exception ex)
+        {
+            adjustError = $"Error: {ex.Message}";
+        }
+        finally
+        {
+            isAdjusting = false;
+        }
+    }
 }

TaskTrackingSystem.WebApp/Components/Pages/ProjectAssign.razor

@@ -218,6 +218,7 @@
     private List<ProjectDto> projects = new();
     private List<UserDto> allUsers = new();
     private List<RoleDto> roles = new();
+    private long? adminRoleId;
     
     private ProjectDto? SelectedProject { get; set; }
     private HashSet<long> SelectedUserIds { get; set; } = new();
@@ -240,7 +241,11 @@
 
             projects = projectsTask.Result ?? new();
             allUsers = usersTask.Result ?? new();
-            roles = rolesTask.Result ?? new();
+            
+            var allLoadedRoles = rolesTask.Result ?? new();
+            var adminRole = allLoadedRoles.FirstOrDefault(r => string.Equals(r.Name, "Admin", StringComparison.OrdinalIgnoreCase));
+            adminRoleId = adminRole?.Id;
+            roles = allLoadedRoles.Where(r => !string.Equals(r.Name, "Admin", StringComparison.OrdinalIgnoreCase)).ToList();
         }
         catch (Exception ex)
         {
@@ -267,6 +272,10 @@
         get
         {
             var result = allUsers.Where(u => u.IsActive);
+            if (adminRoleId.HasValue)
+            {
+                result = result.Where(u => u.RoleId != adminRoleId.Value);
+            }
             if (selectedRoleId > 0)
             {
                 result = result.Where(u => u.RoleId == selectedRoleId);

TaskTrackingSystem.WebApp/Components/Pages/ProjectProgressReport.razor

@@ -95,6 +95,45 @@
     }
     else
     {
+        <div class="grid grid-cols-1 md:grid-cols-3 gap-4 mb-6">
+            <!-- Total Active Projects Card -->
+            <div class="rounded-xl border border-violet-100 bg-violet-50 p-5 shadow-sm">
+                <div class="flex items-center justify-between">
+                    <div>
+                        <p class="text-xs font-semibold uppercase tracking-wider text-violet-500 font-sans">Total Active Projects</p>
+                        <p class="mt-1 text-3xl font-bold text-violet-700">@totalActiveProjects</p>
+                    </div>
+                    <span class="flex h-11 w-11 items-center justify-center rounded-xl bg-violet-100">
+                        <i data-lucide="folder" class="h-6 w-6 text-violet-600"></i>
+                    </span>
+                </div>
+            </div>
+            <!-- Ahead of Schedule Card -->
+            <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 font-sans">Ahead of Schedule</p>
+                        <p class="mt-1 text-3xl font-bold text-emerald-700">@aheadOfScheduleCount</p>
+                    </div>
+                    <span class="flex h-11 w-11 items-center justify-center rounded-xl bg-emerald-100">
+                        <i data-lucide="trending-up" class="h-6 w-6 text-emerald-600"></i>
+                    </span>
+                </div>
+            </div>
+            <!-- At Risk Card -->
+            <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 font-sans">At Risk</p>
+                        <p class="mt-1 text-3xl font-bold text-rose-700">@atRiskCount</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>
+                    </span>
+                </div>
+            </div>
+        </div>
+
         @if (isChartView)
         {
             <!-- Chart View: SVG Project Progress Bars -->
@@ -202,6 +241,11 @@
     private int currentPage = 1;
     private int pageSize = 10;
 
+    // Card stats
+    private int totalActiveProjects = 0;
+    private int aheadOfScheduleCount = 0;
+    private int atRiskCount = 0;
+
     private void ApplyAllFilters()
     {
         ApplyPeriodPreset();
@@ -308,6 +352,8 @@
             filteredProjects = filteredProjects.Where(p => p.StartDate <= filterEndDate.Value.AddDays(1)).ToList();
         }
 
+        var today = DateTime.Today;
+
         foreach (var p in filteredProjects)
         {
             var projectTasks = tasks.Where(t => t.ProjectId == p.Id).ToList();
@@ -315,7 +361,7 @@
             // Apply filter status on tasks if matching
             if (filterStatus == "overdue")
             {
-                projectTasks = projectTasks.Where(t => t.DueDate.Date < DateTime.Today && t.StatusId != 3).ToList();
+                projectTasks = projectTasks.Where(t => t.DueDate.Date < today && t.StatusId != 3).ToList();
             }
             else if (long.TryParse(filterStatus, out var statusId) && statusId > 0)
             {
@@ -326,6 +372,21 @@
             int completedTasks = projectTasks.Count(t => t.StatusId == 3); // Done = 3
             double progress = totalTasks > 0 ? ((double)completedTasks / totalTasks) * 100 : 0;
 
+            // Ahead of schedule calculation
+            double elapsedPct;
+            if (today < p.StartDate) elapsedPct = 0;
+            else if (today > p.EndDate) elapsedPct = 100;
+            else
+            {
+                var totalDays = (p.EndDate - p.StartDate).TotalDays;
+                var elapsedDays = (today - p.StartDate).TotalDays;
+                elapsedPct = totalDays > 0 ? (elapsedDays / totalDays) * 100 : 100;
+            }
+            bool isAhead = progress > elapsedPct && progress > 0 && progress < 100;
+
+            // At risk calculation
+            bool isAtRisk = (projectTasks.Any(t => t.StatusId != 3 && t.DueDate.Date < today)) || (p.EndDate.Date < today && progress < 100);
+
             metrics.Add(new ProjectMetric
             {
                 ProjectName = p.Name,
@@ -333,11 +394,18 @@
                 EndDate = p.EndDate,
                 TotalTasks = totalTasks,
                 CompletedTasks = completedTasks,
-                Progress = progress
+                Progress = progress,
+                IsAhead = isAhead,
+                IsAtRisk = isAtRisk
             });
         }
 
         displayList = metrics.OrderByDescending(m => m.Progress).ToList();
+
+        // Calculate card statistics
+        totalActiveProjects = displayList.Count;
+        aheadOfScheduleCount = displayList.Count(m => m.IsAhead);
+        atRiskCount = displayList.Count(m => m.IsAtRisk);
     }
 
     private async Task DownloadCsv()
@@ -361,5 +429,7 @@
         public int TotalTasks { get; set; }
         public int CompletedTasks { get; set; }
         public double Progress { get; set; }
+        public bool IsAhead { get; set; }
+        public bool IsAtRisk { get; set; }
     }
 }

TaskTrackingSystem.WebApp/Components/Pages/Projects.razor

@@ -177,6 +177,10 @@
                         </div>
                     </div>
                 </div>
+                <div>
+                    <label class="block text-sm font-medium text-slate-700 mb-1.5 font-sans">Budgeted Hours</label>
+                    <input @bind="formBudgetedHours" type="number" min="0" placeholder="Budgeted hours (optional)" 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-slate-900 focus:border-transparent transition-all font-sans" />
+                </div>
                 @if (isDateError)
                 {
                     <p class="mt-1 text-xs text-red-500">@dateErrorMessage</p>
@@ -358,6 +362,7 @@
     private string? formDescription;
     private DateTime formStartDate = DateTime.Today;
     private DateTime formEndDate = DateTime.Today.AddMonths(1);
+    private int? formBudgetedHours;
 
     // Validation states
     private bool isNameError;
@@ -439,6 +444,7 @@
         formDescription = null;
         formStartDate = DateTime.Today;
         formEndDate = DateTime.Today.AddMonths(1);
+        formBudgetedHours = null;
         ClearValidation();
         showModal = true;
     }
@@ -451,6 +457,7 @@
         formDescription = project.Description;
         formStartDate = project.StartDate;
         formEndDate = project.EndDate;
+        formBudgetedHours = project.BudgetedHours;
         ClearValidation();
         showModal = true;
     }
@@ -639,7 +646,8 @@
                     Name = formName,
                     Description = formDescription,
                     StartDate = formStartDate,
-                    EndDate = formEndDate
+                    EndDate = formEndDate,
+                    BudgetedHours = formBudgetedHours
                 };
                 var response = await client.PutAsJsonAsync($"Project/{editingId}", dto);
                 var res = await response.Content.ReadFromJsonAsync<Result>(Serialization.CaseInsensitive);
@@ -657,7 +665,8 @@
                     Description = formDescription,
                     StartDate = formStartDate,
                     EndDate = formEndDate,
-                    CreatedById = currentUserId
+                    CreatedById = currentUserId,
+                    BudgetedHours = formBudgetedHours
                 };
                 var response = await client.PostAsJsonAsync("Project", dto);
                 var res = await response.Content.ReadFromJsonAsync<Result<ProjectDto>>(Serialization.CaseInsensitive);

TaskTrackingSystem.WebApp/Components/Pages/TaskAssign.razor

@@ -253,6 +253,7 @@
     private List<ProjectDto> projects = new();
     private List<UserDto> allUsers = new();
     private List<RoleDto> roles = new();
+    private long? adminRoleId;
 
     private long selectedProjectId = 0;
     private long selectedProjectIdInput = 0;
@@ -279,7 +280,11 @@
             tasks = tasksTask.Result ?? new();
             projects = projectsTask.Result ?? new();
             allUsers = usersTask.Result ?? new();
-            roles = rolesTask.Result ?? new();
+            
+            var allLoadedRoles = rolesTask.Result ?? new();
+            var adminRole = allLoadedRoles.FirstOrDefault(r => string.Equals(r.Name, "Admin", StringComparison.OrdinalIgnoreCase));
+            adminRoleId = adminRole?.Id;
+            roles = allLoadedRoles.Where(r => !string.Equals(r.Name, "Admin", StringComparison.OrdinalIgnoreCase)).ToList();
         }
         catch (Exception ex)
         {
@@ -319,6 +324,10 @@
         get
         {
             var result = allUsers.Where(u => u.IsActive);
+            if (adminRoleId.HasValue)
+            {
+                result = result.Where(u => u.RoleId != adminRoleId.Value);
+            }
             if (selectedRoleId > 0)
             {
                 result = result.Where(u => u.RoleId == selectedRoleId);

TaskTrackingSystem.WebApp/Components/Pages/TaskReport.razor

@@ -67,6 +67,7 @@
             <div>
                 <label class="block text-xs font-medium text-slate-500 mb-1.5">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 focus:border-transparent transition-all">
+                    <option value="uncompleted">Uncompleted</option>
                     <option value="">All</option>
                     <option value="1">To Do</option>
                     <option value="2">In Progress</option>
@@ -273,9 +274,19 @@
                         else
                         {
                             <tr>
-                                <td colspan="6" class="px-6 py-12 text-center">
-                                    <i data-lucide="file-search" class="h-10 w-10 mx-auto text-slate-300 mb-3"></i>
-                                    <p class="text-sm text-slate-400">No tasks found matching criteria.</p>
+                                <td colspan="6" class="px-6 py-16 text-center bg-slate-50/20">
+                                    <div class="flex flex-col items-center justify-center space-y-4">
+                                        <svg class="w-24 h-24 text-slate-300" viewBox="0 0 120 120" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                            <rect x="25" y="15" width="70" height="90" rx="8" stroke="currentColor" stroke-width="3" stroke-dasharray="6 4" />
+                                            <path d="M45 40H75" stroke="currentColor" stroke-width="3" stroke-linecap="round" />
+                                            <path d="M45 55H75" stroke="currentColor" stroke-width="3" stroke-linecap="round" />
+                                            <path d="M45 70H60" stroke="currentColor" stroke-width="3" stroke-linecap="round" />
+                                            <circle cx="85" cy="85" r="15" fill="white" stroke="#7c3aed" stroke-width="3" />
+                                            <path d="M80 85L90 85M85 80L85 90" stroke="#7c3aed" stroke-width="3" stroke-linecap="round" />
+                                        </svg>
+                                        <h3 class="text-lg font-semibold text-slate-700">No Tasks Found</h3>
+                                        <p class="text-sm text-slate-400 max-w-xs">There are no tasks matching your filters. Try adjusting your search query or filters.</p>
+                                    </div>
                                 </td>
                             </tr>
                         }
@@ -304,7 +315,7 @@
     private string filterPeriod = "all";
     private DateTime? filterStartDate;
     private DateTime? filterEndDate;
-    private string? filterStatus;
+    private string? filterStatus = "uncompleted";
     private int filterProjectId;
     private string projectSearchInput = string.Empty;
     private string projectSearchQuery = string.Empty;
@@ -337,7 +348,7 @@
         filterPeriod = "all";
         filterStartDate = null;
         filterEndDate = null;
-        filterStatus = null;
+        filterStatus = "uncompleted";
         filterProjectId = 0;
         projectSearchInput = string.Empty;
         projectSearchQuery = string.Empty;

TaskTrackingSystem.WebApp/Components/Pages/Tasks.razor

@@ -634,7 +634,7 @@
     private long formPriorityId = 2;
     private DateTime formDueDate = DateTime.Today.AddDays(7);
     private long? formAssignedTo;
-    private int? formEstimatedHours;
+    private decimal? formEstimatedHours;
 
     protected override async Task OnInitializedAsync()
     {

TaskTrackingSystem.WebApp/Components/Pages/TimeTrackingReport.razor

@@ -3,6 +3,7 @@
 @using TaskTrackingSystem.Shared.Models.Task
 @using TaskTrackingSystem.Shared.Models.User
 @using TaskTrackingSystem.Shared.Models.Project
+@using TaskTrackingSystem.Shared.Models.Report
 @using System.Text
 @rendermode @(new InteractiveServerRenderMode(prerender: false))
 @attribute [Authorize]
@@ -16,25 +17,25 @@
     <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">Time Tracking &amp; Timesheet</h2>
-            <p class="text-slate-500 mt-1">Estimated vs actual hours breakdown by user and project.</p>
+            <p class="text-slate-500 mt-1 font-sans">Estimated vs actual hours breakdown by user and project.</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='() => currentView = "user"'
-                        class="inline-flex items-center rounded-md px-3 py-1.5 text-xs font-semibold @(currentView == "user" ? "bg-violet-600 text-white" : "text-slate-600 hover:text-slate-900") transition-colors">
-                    <i data-lucide="users" class="h-3.5 w-3.5 mr-1"></i> By User
+                        class="inline-flex items-center rounded-md px-3 py-1.5 text-xs font-semibold @(currentView == "user" ? "bg-violet-600 text-white" : "text-slate-600 hover:text-slate-900") transition-colors font-sans">
+                    <i data-lucide="users" class="h-3.5 w-3.5 mr-1 font-sans"></i> By User
                 </button>
                 <button @onclick='() => currentView = "project"'
-                        class="inline-flex items-center rounded-md px-3 py-1.5 text-xs font-semibold @(currentView == "project" ? "bg-violet-600 text-white" : "text-slate-600 hover:text-slate-900") transition-colors">
-                    <i data-lucide="folder-kanban" class="h-3.5 w-3.5 mr-1"></i> By Project
+                        class="inline-flex items-center rounded-md px-3 py-1.5 text-xs font-semibold @(currentView == "project" ? "bg-violet-600 text-white" : "text-slate-600 hover:text-slate-900") transition-colors font-sans">
+                    <i data-lucide="folder-kanban" class="h-3.5 w-3.5 mr-1 font-sans"></i> By Project
                 </button>
                 <button @onclick='() => currentView = "detail"'
-                        class="inline-flex items-center rounded-md px-3 py-1.5 text-xs font-semibold @(currentView == "detail" ? "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> Detail
+                        class="inline-flex items-center rounded-md px-3 py-1.5 text-xs font-semibold @(currentView == "detail" ? "bg-violet-600 text-white" : "text-slate-600 hover:text-slate-900") transition-colors font-sans">
+                    <i data-lucide="list" class="h-3.5 w-3.5 mr-1 font-sans"></i> Detail
                 </button>
             </div>
-            <button @onclick="DownloadCsv" 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 CSV
+            <button @onclick="DownloadCsv" 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 font-sans">
+                <i data-lucide="download" class="h-4 w-4 mr-2 font-sans"></i> Export CSV
             </button>
         </div>
     </div>
@@ -46,8 +47,8 @@
             <div class="rounded-xl border border-violet-100 bg-violet-50 p-5 shadow-sm">
                 <div class="flex items-center justify-between">
                     <div>
-                        <p class="text-xs font-semibold uppercase tracking-wider text-violet-500">Total Estimated Hrs</p>
-                        <p class="mt-1 text-3xl font-bold text-violet-700">@totalEstimated</p>
+                        <p class="text-xs font-semibold uppercase tracking-wider text-violet-500 font-sans">Total Estimated Hrs</p>
+                        <p class="mt-1 text-3xl font-bold text-violet-700">@reportData.TotalEstimatedHrs.ToString("F1")</p>
                     </div>
                     <span class="flex h-11 w-11 items-center justify-center rounded-xl bg-violet-100">
                         <i data-lucide="clock" class="h-6 w-6 text-violet-600"></i>
@@ -57,8 +58,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">Tasks with Hours</p>
-                        <p class="mt-1 text-3xl font-bold text-emerald-700">@tasksWithHours</p>
+                        <p class="text-xs font-semibold uppercase tracking-wider text-emerald-500 font-sans">Tasks with Hours</p>
+                        <p class="mt-1 text-3xl font-bold text-emerald-700">@reportData.TasksWithHours</p>
                     </div>
                     <span class="flex h-11 w-11 items-center justify-center rounded-xl bg-emerald-100">
                         <i data-lucide="check-circle" class="h-6 w-6 text-emerald-600"></i>
@@ -68,8 +69,8 @@
             <div class="rounded-xl border border-blue-100 bg-blue-50 p-5 shadow-sm">
                 <div class="flex items-center justify-between">
                     <div>
-                        <p class="text-xs font-semibold uppercase tracking-wider text-blue-500">Avg Hrs / Task</p>
-                        <p class="mt-1 text-3xl font-bold text-blue-700">@avgHoursPerTask</p>
+                        <p class="text-xs font-semibold uppercase tracking-wider text-blue-500 font-sans">Avg Hrs / Task</p>
+                        <p class="mt-1 text-3xl font-bold text-blue-700">@reportData.AvgHoursPerTask.ToString("F1")</p>
                     </div>
                     <span class="flex h-11 w-11 items-center justify-center rounded-xl bg-blue-100">
                         <i data-lucide="bar-chart-2" class="h-6 w-6 text-blue-600"></i>
@@ -79,8 +80,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">Completed Hours</p>
-                        <p class="mt-1 text-3xl font-bold text-amber-700">@completedHours</p>
+                        <p class="text-xs font-semibold uppercase tracking-wider text-amber-500 font-sans">Completed Hours</p>
+                        <p class="mt-1 text-3xl font-bold text-amber-700">@reportData.CompletedHours.ToString("F1")</p>
                     </div>
                     <span class="flex h-11 w-11 items-center justify-center rounded-xl bg-amber-100">
                         <i data-lucide="trophy" class="h-6 w-6 text-amber-600"></i>
@@ -94,34 +95,34 @@
     <div class="rounded-xl border border-slate-200 bg-white p-6 shadow-sm">
         <div class="flex flex-wrap items-end gap-4">
             <div class="flex-1 min-w-[200px]">
-                <label class="block text-xs font-medium text-slate-500 mb-1.5">Search</label>
+                <label class="block text-xs font-medium text-slate-500 mb-1.5 font-sans">Search</label>
                 <input @bind="searchInput" type="text" placeholder="Search by user, task, or project..."
-                       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" />
+                       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 font-sans" />
             </div>
             <div>
-                <label class="block text-xs font-medium text-slate-500 mb-1.5">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 focus:border-transparent transition-all">
+                <label class="block text-xs font-medium text-slate-500 mb-1.5 font-sans">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 focus:border-transparent transition-all font-sans">
                     <option value="0">All Projects</option>
                     @foreach (var p in allProjects)
                     {
-                        <option value="@p.Id">@p.Name</option>
+                        <option value="@p.Id font-sans">@p.Name</option>
                     }
                 </select>
             </div>
             <div>
-                <label class="block text-xs font-medium text-slate-500 mb-1.5">Status</label>
-                <select @bind="filterStatusId" 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 focus:border-transparent transition-all">
-                    <option value="0">All</option>
-                    <option value="1">To Do</option>
-                    <option value="2">In Progress</option>
-                    <option value="3">Done</option>
+                <label class="block text-xs font-medium text-slate-500 mb-1.5 font-sans">Status</label>
+                <select @bind="filterStatusId" 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 focus:border-transparent transition-all font-sans">
+                    <option value="0 font-sans">All</option>
+                    <option value="1 font-sans">To Do</option>
+                    <option value="2 font-sans">In Progress</option>
+                    <option value="3 font-sans">Done</option>
                 </select>
             </div>
-            <button @onclick="ApplyFilters" class="inline-flex items-center rounded-lg bg-violet-600 px-5 py-2 text-sm font-medium text-white hover:bg-violet-700 transition-colors shadow-sm">
-                <i data-lucide="search" class="h-4 w-4 mr-2"></i> Search
+            <button @onclick="ApplyFilters" class="inline-flex items-center rounded-lg bg-violet-600 px-5 py-2 text-sm font-medium text-white hover:bg-violet-700 transition-colors shadow-sm font-sans">
+                <i data-lucide="search" class="h-4 w-4 mr-2 font-sans"></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-600 hover:bg-slate-50 transition-colors shadow-sm">
-                <i data-lucide="rotate-ccw" class="h-4 w-4 mr-2"></i> Reset
+            <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-600 hover:bg-slate-50 transition-colors shadow-sm font-sans">
+                <i data-lucide="rotate-ccw" class="h-4 w-4 mr-2 font-sans"></i> Reset
             </button>
         </div>
     </div>
@@ -137,66 +138,52 @@
         {
             <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">
-                    <h3 class="text-sm font-semibold text-slate-700">Hours Summary by Employee</h3>
+                    <h3 class="text-sm font-semibold text-slate-700 font-sans">Hours Summary by Employee</h3>
                 </div>
                 <table class="w-full">
                     <thead>
-                        <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">Employee</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</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">Completed Hrs</th>
-                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Completion %</th>
+                        <tr class="border-b border-slate-100 bg-slate-50/60 font-sans">
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Employee</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Total Tasks</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Completed</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Est. Hours</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Completed Hrs</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Variance</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Completion %</th>
                         </tr>
                     </thead>
                     <tbody class="divide-y divide-slate-100">
-                        @{
-                            var userGroups = GetFilteredTasks()
-                                .GroupBy(t => t.AssignedTo)
-                                .OrderByDescending(g => g.Sum(t => t.EstimatedHours ?? 0))
-                                .ToList();
-                        }
-                        @if (userGroups.Any())
+                        @if (reportData.EmployeeSummary.Any())
                         {
-                            @foreach (var group in userGroups)
+                            @foreach (var emp in reportData.EmployeeSummary)
                             {
-                                var user = allUsers.FirstOrDefault(u => u.Id == group.Key);
-                                var totalTasks = group.Count();
-                                var completedTasks = group.Count(t => t.StatusId == 3);
-                                var estHours = group.Sum(t => t.EstimatedHours ?? 0);
-                                var compHours = group.Where(t => t.StatusId == 3).Sum(t => t.EstimatedHours ?? 0);
-                                var pct = totalTasks > 0 ? (double)completedTasks / totalTasks * 100 : 0;
+                                var pct = emp.CompletionPercentage;
                                 <tr class="hover:bg-slate-50/50 transition-colors">
                                     <td class="px-6 py-4">
-                                        @if (user != null)
-                                        {
-                                            <div class="flex items-center gap-3">
-                                                <span class="flex h-9 w-9 items-center justify-center rounded-full bg-violet-100 text-violet-700 text-xs font-bold">
-                                                    @(user.FirstName.Length > 0 ? user.FirstName[0].ToString().ToUpper() : "")@(user.LastName.Length > 0 ? user.LastName[0].ToString().ToUpper() : "")
-                                                </span>
-                                                <div>
-                                                    <p class="text-sm font-semibold text-slate-900">@user.FirstName @user.LastName</p>
-                                                    <p class="text-xs text-slate-400">@@@user.Username</p>
-                                                </div>
+                                        <div class="flex items-center gap-3">
+                                            <span class="flex h-9 w-9 items-center justify-center rounded-full bg-violet-100 text-violet-700 text-xs font-bold">
+                                                @(emp.FullName.Length > 0 ? emp.FullName[0].ToString().ToUpper() : "")
+                                            </span>
+                                            <div>
+                                                <p class="text-sm font-semibold text-slate-900">@emp.FullName</p>
+                                                <p class="text-xs text-slate-400">@@@emp.Username</p>
                                             </div>
-                                        }
-                                        else
-                                        {
-                                            <span class="text-sm text-slate-400 italic">Unassigned</span>
-                                        }
+                                        </div>
+                                    </td>
+                                    <td class="px-6 py-4 text-sm text-slate-700 font-medium font-sans">@emp.TotalTasks</td>
+                                    <td class="px-6 py-4 text-sm text-emerald-600 font-medium font-sans">@emp.CompletedTasks</td>
+                                    <td class="px-6 py-4 text-sm font-semibold text-violet-700 font-sans">@emp.EstHours.ToString("F1") h</td>
+                                    <td class="px-6 py-4 text-sm font-semibold text-amber-600 font-sans">@emp.CompletedHours.ToString("F1") h</td>
+                                    <td class="px-6 py-4 text-sm font-semibold @(emp.CompletedHours > emp.EstHours ? "text-rose-600" : "text-emerald-600") font-sans">
+                                        @(emp.Variance.ToString("F1")) h
                                     </td>
-                                    <td class="px-6 py-4 text-sm text-slate-700 font-medium">@totalTasks</td>
-                                    <td class="px-6 py-4 text-sm text-emerald-600 font-medium">@completedTasks</td>
-                                    <td class="px-6 py-4 text-sm font-semibold text-violet-700">@estHours h</td>
-                                    <td class="px-6 py-4 text-sm font-semibold text-amber-600">@compHours h</td>
                                     <td class="px-6 py-4">
                                         <div class="flex items-center gap-3">
                                             <div class="flex-1 h-2 bg-slate-100 rounded-full overflow-hidden">
                                                 <div class="h-2 rounded-full @(pct >= 80 ? "bg-emerald-500" : pct >= 50 ? "bg-amber-400" : "bg-rose-400") transition-all"
                                                      style="width: @pct.ToString("F0")%"></div>
                                             </div>
-                                            <span class="text-xs font-semibold text-slate-600 w-10">@pct.ToString("F0")%</span>
+                                            <span class="text-xs font-semibold text-slate-600 w-10 font-sans">@pct.ToString("F0")%</span>
                                         </div>
                                     </td>
                                 </tr>
@@ -204,7 +191,7 @@
                         }
                         else
                         {
-                            <EmptyState ColSpan="6" Icon="clock" Title="No timesheet data" Subtitle="No tasks found with the current filters." />
+                            <EmptyState ColSpan="7" Icon="clock" Title="No timesheet data" Subtitle="No tasks found with the current filters." />
                         }
                     </tbody>
                 </table>
@@ -216,54 +203,43 @@
         {
             <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">
-                    <h3 class="text-sm font-semibold text-slate-700">Hours Summary by Project</h3>
+                    <h3 class="text-sm font-semibold text-slate-700 font-sans">Hours Summary by Project</h3>
                 </div>
                 <table class="w-full">
                     <thead>
                         <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">Project</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</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">Completed Hrs</th>
-                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Completion %</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Project</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Total Tasks</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Completed</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Est. Hours</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Completed Hrs</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Completion %</th>
                         </tr>
                     </thead>
                     <tbody class="divide-y divide-slate-100">
-                        @{
-                            var projGroups = GetFilteredTasks()
-                                .GroupBy(t => t.ProjectId)
-                                .OrderByDescending(g => g.Sum(t => t.EstimatedHours ?? 0))
-                                .ToList();
-                        }
-                        @if (projGroups.Any())
+                        @if (reportData.ProjectSummary.Any())
                         {
-                            @foreach (var group in projGroups)
+                            @foreach (var proj in reportData.ProjectSummary)
                             {
-                                var project = allProjects.FirstOrDefault(p => p.Id == group.Key);
-                                var totalTasks = group.Count();
-                                var completedTasks = group.Count(t => t.StatusId == 3);
-                                var estHours = group.Sum(t => t.EstimatedHours ?? 0);
-                                var compHours = group.Where(t => t.StatusId == 3).Sum(t => t.EstimatedHours ?? 0);
-                                var pct = totalTasks > 0 ? (double)completedTasks / totalTasks * 100 : 0;
+                                var pct = proj.CompletionPercentage;
                                 <tr class="hover:bg-slate-50/50 transition-colors">
                                     <td class="px-6 py-4">
                                         <div class="flex items-center gap-2">
                                             <i data-lucide="folder-kanban" class="h-4 w-4 text-violet-500"></i>
-                                            <span class="text-sm font-semibold text-slate-900">@(project?.Name ?? "Unknown Project")</span>
+                                            <span class="text-sm font-semibold text-slate-900">@proj.ProjectName</span>
                                         </div>
                                     </td>
-                                    <td class="px-6 py-4 text-sm text-slate-700 font-medium">@totalTasks</td>
-                                    <td class="px-6 py-4 text-sm text-emerald-600 font-medium">@completedTasks</td>
-                                    <td class="px-6 py-4 text-sm font-semibold text-violet-700">@estHours h</td>
-                                    <td class="px-6 py-4 text-sm font-semibold text-amber-600">@compHours h</td>
+                                    <td class="px-6 py-4 text-sm text-slate-700 font-medium font-sans">@proj.TotalTasks</td>
+                                    <td class="px-6 py-4 text-sm text-emerald-600 font-medium font-sans">@proj.CompletedTasks</td>
+                                    <td class="px-6 py-4 text-sm font-semibold text-violet-700 font-sans">@proj.EstHours.ToString("F1") h</td>
+                                    <td class="px-6 py-4 text-sm font-semibold text-amber-600 font-sans">@proj.CompletedHours.ToString("F1") h</td>
                                     <td class="px-6 py-4">
                                         <div class="flex items-center gap-3">
                                             <div class="flex-1 h-2 bg-slate-100 rounded-full overflow-hidden">
                                                 <div class="h-2 rounded-full @(pct >= 80 ? "bg-emerald-500" : pct >= 50 ? "bg-amber-400" : "bg-rose-400") transition-all"
                                                      style="width: @pct.ToString("F0")%"></div>
                                             </div>
-                                            <span class="text-xs font-semibold text-slate-600 w-10">@pct.ToString("F0")%</span>
+                                            <span class="text-xs font-semibold text-slate-600 w-10 font-sans">@pct.ToString("F0")%</span>
                                         </div>
                                     </td>
                                 </tr>
@@ -283,19 +259,20 @@
         {
             <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">
-                    <h3 class="text-sm font-semibold text-slate-700">
-                        Task-level Detail — <span class="text-violet-600">@FilteredDetailTasks.Count() task(s)</span>
+                    <h3 class="text-sm font-semibold text-slate-700 font-sans">
+                        Task-level Detail — <span class="text-violet-600 font-sans">@FilteredDetailTasks.Count() task(s)</span>
                     </h3>
                 </div>
                 <table class="w-full">
                     <thead>
                         <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">Task</th>
-                            <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">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">Due Date</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 font-sans">Task</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Project</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Assignee</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Est. Hours</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Logged Hours</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Due Date</th>
+                            <th class="px-6 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider font-sans">Status</th>
                         </tr>
                     </thead>
                     <tbody class="divide-y divide-slate-100">
@@ -303,8 +280,6 @@
                         {
                             @foreach (var task in PagedDetailTasks)
                             {
-                                var assignee = allUsers.FirstOrDefault(u => u.Id == task.AssignedTo);
-                                var project  = allProjects.FirstOrDefault(p => p.Id == task.ProjectId);
                                 var (statusLabel, statusClass) = task.StatusId switch {
                                     2 => ("In Progress", "bg-blue-50 text-blue-700"),
                                     3 => ("Done", "bg-emerald-50 text-emerald-700"),
@@ -314,39 +289,42 @@
                                     <td class="px-6 py-4">
                                         <p class="text-sm font-semibold text-slate-900">@task.Title</p>
                                     </td>
-                                    <td class="px-6 py-4 text-sm text-slate-600">@(project?.Name ?? "—")</td>
+                                    <td class="px-6 py-4 text-sm text-slate-600 font-sans">@task.ProjectName</td>
                                     <td class="px-6 py-4">
-                                        @if (assignee != null)
+                                        @if (!string.IsNullOrEmpty(task.AssigneeName))
                                         {
                                             <div class="flex items-center gap-2">
                                                 <span class="flex h-7 w-7 items-center justify-center rounded-full bg-violet-100 text-violet-700 text-xs font-bold">
-                                                    @(assignee.FirstName[0..1].ToUpper())@(assignee.LastName[0..1].ToUpper())
+                                                    @(task.AssigneeName.Length > 0 ? task.AssigneeName[0].ToString().ToUpper() : "")
                                                 </span>
-                                                <span class="text-sm text-slate-700">@assignee.FirstName @assignee.LastName</span>
+                                                <span class="text-sm text-slate-700 font-sans">@task.AssigneeName</span>
                                             </div>
                                         }
-                                        else { <span class="text-xs text-slate-400">Unassigned</span> }
+                                        else { <span class="text-xs text-slate-400 font-sans">Unassigned</span> }
                                     </td>
                                     <td class="px-6 py-4">
                                         @if (task.EstimatedHours.HasValue)
                                         {
-                                            <span class="text-sm font-semibold text-violet-700">@task.EstimatedHours h</span>
+                                            <span class="text-sm font-semibold text-violet-700 font-sans">@task.EstimatedHours.Value.ToString("F1") h</span>
                                         }
                                         else
                                         {
-                                            <span class="text-xs text-slate-400">—</span>
+                                            <span class="text-xs text-slate-400 font-sans">—</span>
                                         }
                                     </td>
-                                    <td class="px-6 py-4 text-sm text-slate-600">@task.DueDate.ToString("dd-MMM-yyyy")</td>
                                     <td class="px-6 py-4">
-                                        <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium @statusClass">@statusLabel</span>
+                                        <span class="text-sm font-semibold text-amber-600 font-sans">@task.CompletedHours.ToString("F1") h</span>
+                                    </td>
+                                    <td class="px-6 py-4 text-sm text-slate-600 font-sans">@task.DueDate.ToString("dd-MMM-yyyy")</td>
+                                    <td class="px-6 py-4">
+                                        <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium @statusClass font-sans">@statusLabel</span>
                                     </td>
                                 </tr>
                             }
                         }
                         else
                         {
-                            <EmptyState ColSpan="6" Icon="clock" Title="No tasks found" Subtitle="Try adjusting your filters." />
+                            <EmptyState ColSpan="7" Icon="clock" Title="No tasks found" Subtitle="Try adjusting your filters." />
                         }
                     </tbody>
                 </table>
@@ -367,7 +345,7 @@
     private bool isLoading = true;
     private string currentView = "user";
 
-    private List<TaskDto> allTasks = new();
+    private TimeTrackingReportDto reportData = new();
     private List<UserDto> allUsers = new();
     private List<ProjectDto> allProjects = new();
 
@@ -383,52 +361,23 @@
     private int detailPage = 1;
     private int pageSize = 10;
 
-    // Summary stats
-    private int totalEstimated = 0;
-    private int tasksWithHours = 0;
-    private int avgHoursPerTask = 0;
-    private int completedHours = 0;
-
-    private IEnumerable<TaskDto> GetFilteredTasks()
-    {
-        var result = allTasks.AsEnumerable();
-        if (!string.IsNullOrWhiteSpace(appliedSearch))
-        {
-            var q = appliedSearch.Trim().ToLower();
-            result = result.Where(t =>
-                t.Title.ToLower().Contains(q) ||
-                (allUsers.FirstOrDefault(u => u.Id == t.AssignedTo) is { } usr &&
-                 ($"{usr.FirstName} {usr.LastName}").ToLower().Contains(q)) ||
-                (allProjects.FirstOrDefault(p => p.Id == t.ProjectId) is { } prj &&
-                 prj.Name.ToLower().Contains(q))
-            );
-        }
-        if (appliedProjectId > 0)
-            result = result.Where(t => t.ProjectId == appliedProjectId);
-        if (appliedStatusId > 0)
-            result = result.Where(t => t.StatusId == appliedStatusId);
-        return result;
-    }
-
-    private IEnumerable<TaskDto> FilteredDetailTasks => GetFilteredTasks().OrderBy(t => t.ProjectId).ThenBy(t => t.Title);
+    private IEnumerable<TaskTimeDetailDto> FilteredDetailTasks => reportData.TaskDetail;
     private int DetailTotalPages => (int)Math.Ceiling((double)FilteredDetailTasks.Count() / pageSize);
-    private IEnumerable<TaskDto> PagedDetailTasks => FilteredDetailTasks.Skip((detailPage - 1) * pageSize).Take(pageSize);
+    private IEnumerable<TaskTimeDetailDto> PagedDetailTasks => FilteredDetailTasks.Skip((detailPage - 1) * pageSize).Take(pageSize);
 
     protected override async Task OnInitializedAsync()
     {
         var client = ApiClient.CreateClient();
         try
         {
-            var tasksTask    = client.GetFromJsonAsync<List<TaskDto>>("Task", Serialization.CaseInsensitive);
             var usersTask    = client.GetFromJsonAsync<List<UserDto>>("User", Serialization.CaseInsensitive);
             var projectsTask = client.GetFromJsonAsync<List<ProjectDto>>("Project", Serialization.CaseInsensitive);
-            await System.Threading.Tasks.Task.WhenAll(tasksTask, usersTask, projectsTask);
+            await System.Threading.Tasks.Task.WhenAll(usersTask, projectsTask);
 
-            allTasks    = tasksTask.Result    ?? new();
             allUsers    = usersTask.Result    ?? new();
             allProjects = projectsTask.Result ?? new();
 
-            ComputeSummary();
+            await LoadTimeTrackingData();
         }
         catch (Exception ex) { Console.WriteLine($"Load error: {ex.Message}"); }
         finally { isLoading = false; }
@@ -439,29 +388,47 @@
         await JS.InvokeVoidAsync("initIcons");
     }
 
-    private void ComputeSummary()
+    private async Task LoadTimeTrackingData()
     {
-        var withHours = allTasks.Where(t => t.EstimatedHours.HasValue).ToList();
-        tasksWithHours  = withHours.Count;
-        totalEstimated  = withHours.Sum(t => t.EstimatedHours ?? 0);
-        avgHoursPerTask = tasksWithHours > 0 ? totalEstimated / tasksWithHours : 0;
-        completedHours  = allTasks.Where(t => t.StatusId == 3 && t.EstimatedHours.HasValue).Sum(t => t.EstimatedHours ?? 0);
+        isLoading = true;
+        StateHasChanged();
+        var client = ApiClient.CreateClient();
+        try
+        {
+            var query = $"Report/time-tracking?search={Uri.EscapeDataString(appliedSearch)}&projectId={appliedProjectId}&statusId={appliedStatusId}";
+            var result = await client.GetFromJsonAsync<Result<TimeTrackingReportDto>>(query, Serialization.CaseInsensitive);
+            if (result?.IsSuccess == true && result.Value != null)
+            {
+                reportData = result.Value;
+            }
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Error loading time tracking data: {ex.Message}");
+        }
+        finally
+        {
+            isLoading = false;
+            StateHasChanged();
+        }
     }
 
-    private void ApplyFilters()
+    private async Task ApplyFilters()
     {
         appliedSearch    = searchInput;
         appliedProjectId = filterProjectId;
         appliedStatusId  = filterStatusId;
         detailPage = 1;
+        await LoadTimeTrackingData();
     }
 
-    private void ResetFilters()
+    private async Task ResetFilters()
     {
         searchInput = "";      appliedSearch    = "";
         filterProjectId = 0;   appliedProjectId = 0;
         filterStatusId = 0;    appliedStatusId  = 0;
         detailPage = 1;
+        await LoadTimeTrackingData();
     }
 
     private void HandleDetailPageChanged(int page) => detailPage = page;
@@ -470,13 +437,11 @@
     private async Task DownloadCsv()
     {
         var sb = new StringBuilder();
-        sb.AppendLine("Task Title,Project,Assignee,Estimated Hours,Due Date,Status");
-        foreach (var task in GetFilteredTasks())
+        sb.AppendLine("Task Title,Project,Assignee,Estimated Hours,Logged Hours,Due Date,Status");
+        foreach (var task in reportData.TaskDetail)
         {
-            var assignee = allUsers.FirstOrDefault(u => u.Id == task.AssignedTo);
-            var project  = allProjects.FirstOrDefault(p => p.Id == task.ProjectId);
-            var status   = task.StatusId switch { 2 => "In Progress", 3 => "Done", _ => "To Do" };
-            sb.AppendLine($"\"{task.Title}\",\"{project?.Name ?? ""}\",\"{(assignee != null ? $"{assignee.FirstName} {assignee.LastName}" : "Unassigned")}\",{task.EstimatedHours?.ToString() ?? ""},\"{task.DueDate:dd-MMM-yyyy}\",{status}");
+            var status = task.StatusId switch { 2 => "In Progress", 3 => "Done", _ => "To Do" };
+            sb.AppendLine($"\"{task.Title}\",\"{task.ProjectName}\",\"{task.AssigneeName}\",{task.EstimatedHours?.ToString() ?? ""},{task.CompletedHours},\"{task.DueDate:dd-MMM-yyyy}\",{status}");
         }
         var bytes  = Encoding.UTF8.GetBytes(sb.ToString());
         var base64 = Convert.ToBase64String(bytes);

TaskTrackingSystem.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.14.37301.10 d17.14
+# Visual Studio Version 18
+VisualStudioVersion = 18.7.11903.348 stable
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TaskTrackingSystem.WebApi", "TaskTrackingSystem.WebApi\TaskTrackingSystem.WebApi.csproj", "{45C2E476-C820-4461-A5A3-31AF6A189839}"
 EndProject
@@ -11,6 +11,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TaskTrackingSystem.Shared",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TaskTrackingSystem.WebApp", "TaskTrackingSystem.WebApp\TaskTrackingSystem.WebApp.csproj", "{6C65AAE1-991F-4E42-AFB9-B8BBA9D80A88}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{020D852B-0CDE-4177-87A2-6804A3043186}"
+	ProjectSection(SolutionItems) = preProject
+		README.md = README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU