Merge pull request 'Ashutosh_Enhancement_#622' (#98) from Ashutosh_Enhancement_#622 into Issues_June_3W

Reviewed-on: #98

Marco.Pms.DataAccess/Data/ApplicationDbContext.cs

@@ -511,14 +511,14 @@ namespace Marco.Pms.DataAccess.Data
 
 
             modelBuilder.Entity<Feature>().HasData(
-                new Feature { Id = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"), Description = "Manage Project", Name = "Manage Project", ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"), IsActive = true },
+                new Feature { Id = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"), Description = "Manage Project", Name = "Project Management", ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"), IsActive = true },
-                new Feature { Id = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"), Description = "Manage Infra", Name = "Manage Infra", ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"), IsActive = true },
+                //new Feature { Id = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"), Description = "Manage Infra", Name = "Manage Infra", ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"), IsActive = true },
                 new Feature { Id = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"), Description = "Manage Tasks", Name = "Task Management", ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"), IsActive = true },
 
                 new Feature { Id = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"), Description = "Manage Employee", Name = "Employee Management", ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"), IsActive = true },
-                new Feature { Id = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"), Description = "Attendance", Name = "Attendance", ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"), IsActive = true },
+                new Feature { Id = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"), Description = "Attendance", Name = "Attendance Management", ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"), IsActive = true },
 
-                 new Feature { Id = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"), Description = "Global Masters", Name = "Global Masters", ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"), IsActive = true },
+                 new Feature { Id = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"), Description = "Global Masters", Name = "Masters", ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"), IsActive = true },
                 new Feature { Id = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"), Description = "Managing all directory related rights", Name = "Directory Management", ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"), IsActive = true }
 
              //new Feature { Id = new Guid("660131a4-788c-4739-a082-cbbf7879cbf2"), Description = "Tenant Masters", Name = "Tenant Masters", ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"), IsActive = true }
@@ -528,9 +528,8 @@ namespace Marco.Pms.DataAccess.Data
                 new FeaturePermission { Id = new Guid("6ea44136-987e-44ba-9e5d-1cf8f5837ebc"), FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"), IsEnabled = true, Name = "View Project", Description = "Access all information related to the project." },
                  new FeaturePermission { Id = new Guid("172fc9b6-755b-4f62-ab26-55c34a330614"), FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"), IsEnabled = true, Name = "Manage Project", Description = "Potentially edit the project name, description, start/end dates, or status." },
                  new FeaturePermission { Id = new Guid("b94802ce-0689-4643-9e1d-11c86950c35b"), FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"), IsEnabled = true, Name = "Manage Team", Description = "The \"Manage Team\" feature allows authorized users to organize project personnel by adding, removing, and assigning employee to projects." },
-
+                   new FeaturePermission { Id = new Guid("8d7cc6e3-9147-41f7-aaa7-fa507e450bd4"), FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"), IsEnabled = true, Name = "View Project Infra", Description = "Grants a user comprehensive read-only access to all details concerning the project's underlying systems, technologies, resources, and configurations" },
-                   new FeaturePermission { Id = new Guid("c7b68e33-72f0-474f-bd96-77636427ecc8"), FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"), IsEnabled = true, Name = "View Project Infra", Description = "Grants a user comprehensive read-only access to all details concerning the project's underlying systems, technologies, resources, and configurations" },
+                   new FeaturePermission { Id = new Guid("cf2825ad-453b-46aa-91d9-27c124d63373"), FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"), IsEnabled = true, Name = "Manage Project Infra", Description = "This allows them to create, modify, and manage all aspects of the supporting infrastructure." },
-                   new FeaturePermission { Id = new Guid("f2aee20a-b754-4537-8166-f9507b44585b"), FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"), IsEnabled = true, Name = "Manage Project Infra", Description = "This allows them to create, modify, and manage all aspects of the supporting infrastructure." },
 
 
                    new FeaturePermission { Id = new Guid("9fcc5f87-25e3-4846-90ac-67a71ab92e3c"), FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"), IsEnabled = true, Name = "View Task", Description = "Grants a user comprehensive read-only access to all details associated with tasks within a project. This includes task descriptions, statuses, assignees, due dates, dependencies, progress, history, and any related attachments or discussions." },
@@ -539,7 +538,8 @@ namespace Marco.Pms.DataAccess.Data
                   new FeaturePermission { Id = new Guid("db4e40c5-2ba9-4b6d-b8a6-a16a250ff99c"), FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"), IsEnabled = true, Name = "Approve Task", Description = "Grants a user the authority to officially confirm the completion or acceptance of a task, often signifying that it meets the required standards or criteria" },
 
 
-                  new FeaturePermission { Id = new Guid("b82d2b7e-0d52-45f3-997b-c008ea460e7f"), FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"), IsEnabled = true, Name = "View Employee", Description = "Grants a user read-only access to details about the individuals within the system. This typically includes names, contact information, roles, departments, and potentially other relevant employee data" },
+                  new FeaturePermission { Id = new Guid("60611762-7f8a-4fb5-b53f-b1139918796b"), FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"), IsEnabled = true, Name = "View All Employee", Description = "Grants a user read-only access to details about the all individuals within the system. This typically includes names, contact information, roles, departments, and potentially other relevant employee data" },
+                  new FeaturePermission { Id = new Guid("b82d2b7e-0d52-45f3-997b-c008ea460e7f"), FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"), IsEnabled = true, Name = "View Employee", Description = "Grants a user read-only access to details about the individuals within the system which are is assigned to same projects as user. This typically includes names, contact information, roles, departments, and potentially other relevant employee data" },
                    new FeaturePermission { Id = new Guid("a97d366a-c2bb-448d-be93-402bd2324566"), FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"), IsEnabled = true, Name = "Add/Edit Employee", Description = "Grants a user the authority to create new employee profiles and modify existing employee details within the system. This typically includes adding or updating information such as names, contact details, roles, departments, skills, and potentially other personal or professional data" },
                    new FeaturePermission { Id = new Guid("fbd213e0-0250-46f1-9f5f-4b2a1e6e76a3"), FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"), IsEnabled = true, Name = "Assign Roles", Description = "Grants a user the authority to manage employee application roles, enabling them to assign or revoke access privileges within the system." },
 

Marco.Pms.DataAccess/Migrations/20250630071352_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.Designer.cs

@@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace Marco.Pms.DataAccess.Migrations
 {
     [DbContext(typeof(ApplicationDbContext))]
-    [Migration("20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table")]
+    [Migration("20250630071352_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table")]
     partial class Added_UpdatedBy_In_Contacts_And_ContactNotes_Table
     {
         /// <inheritdoc />
@@ -31,6 +31,12 @@ namespace Marco.Pms.DataAccess.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
+                    b.Property<Guid?>("ApprovedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ApprovedDate")
+                        .HasColumnType("datetime(6)");
+
                     b.Property<Guid>("AssignedBy")
                         .HasColumnType("char(36)");
 
@@ -43,29 +49,64 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.Property<string>("Description")
                         .HasColumnType("longtext");
 
+                    b.Property<Guid?>("ParentTaskId")
+                        .HasColumnType("char(36)");
+
                     b.Property<double>("PlannedTask")
                         .HasColumnType("double");
 
+                    b.Property<Guid?>("ReportedById")
+                        .HasColumnType("char(36)");
+
                     b.Property<DateTime?>("ReportedDate")
                         .HasColumnType("datetime(6)");
 
+                    b.Property<double>("ReportedTask")
+                        .HasColumnType("double");
+
                     b.Property<Guid>("TenantId")
                         .HasColumnType("char(36)");
 
                     b.Property<Guid>("WorkItemId")
                         .HasColumnType("char(36)");
 
+                    b.Property<Guid?>("WorkStatusId")
+                        .HasColumnType("char(36)");
+
                     b.HasKey("Id");
 
+                    b.HasIndex("ApprovedById");
+
                     b.HasIndex("AssignedBy");
 
+                    b.HasIndex("ReportedById");
+
                     b.HasIndex("TenantId");
 
                     b.HasIndex("WorkItemId");
 
+                    b.HasIndex("WorkStatusId");
+
                     b.ToTable("TaskAllocations");
                 });
 
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ReferenceId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TaskAttachments");
+                });
+
             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
                 {
                     b.Property<Guid>("Id")
@@ -1661,17 +1702,23 @@ namespace Marco.Pms.DataAccess.Migrations
                         },
                         new
                         {
-                            Id = new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
+                            Id = new Guid("cdad86aa-8a56-4ff4-b633-9c629057dfef"),
                             Status = "In Progress",
                             TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
                         },
                         new
                         {
-                            Id = new Guid("ef1c356e-0fe0-42df-a5d3-8daee355492d"),
+                            Id = new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
                             Status = "On Hold",
                             TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
                         },
                         new
+                        {
+                            Id = new Guid("ef1c356e-0fe0-42df-a5d3-8daee355492d"),
+                            Status = "In Active",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
                         {
                             Id = new Guid("33deaef9-9af1-4f2a-b443-681ea0d04f81"),
                             Status = "Completed",
@@ -1922,6 +1969,59 @@ namespace Marco.Pms.DataAccess.Migrations
                         });
                 });
 
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkStatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkStatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("030bb085-e230-4370-aec7-9a74d652864e"),
+                            Description = "Confirm the tasks are actually finished as reported",
+                            IsSystem = true,
+                            Name = "Approve",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("2a1a5b96-cf93-4111-b4b1-76c19d6333b4"),
+                            Description = "Not all tasks are actually finished as reported",
+                            IsSystem = true,
+                            Name = "Partially Approve",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("00a062e6-62e6-42c5-b6b1-024328651b72"),
+                            Description = "Tasks are not finished as reported or have any issues in al the tasks",
+                            IsSystem = true,
+                            Name = "NCR",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
             modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
                 {
                     b.Property<Guid>("Id")
@@ -2101,6 +2201,12 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.Property<double>("CompletedWork")
                         .HasColumnType("double");
 
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentTaskId")
+                        .HasColumnType("char(36)");
+
                     b.Property<double>("PlannedWork")
                         .HasColumnType("double");
 
@@ -2431,12 +2537,20 @@ namespace Marco.Pms.DataAccess.Migrations
 
             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
                 {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "ApprovedBy")
+                        .WithMany()
+                        .HasForeignKey("ApprovedById");
+
                     b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
                         .WithMany()
                         .HasForeignKey("AssignedBy")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "ReportedBy")
+                        .WithMany()
+                        .HasForeignKey("ReportedById");
+
                     b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
                         .WithMany()
                         .HasForeignKey("TenantId")
@@ -2449,11 +2563,21 @@ namespace Marco.Pms.DataAccess.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("Marco.Pms.Model.Master.WorkStatusMaster", "WorkStatus")
+                        .WithMany()
+                        .HasForeignKey("WorkStatusId");
+
+                    b.Navigation("ApprovedBy");
+
                     b.Navigation("Employee");
 
+                    b.Navigation("ReportedBy");
+
                     b.Navigation("Tenant");
 
                     b.Navigation("WorkItem");
+
+                    b.Navigation("WorkStatus");
                 });
 
             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
@@ -3066,6 +3190,17 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.Navigation("Tenant");
                 });
 
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkStatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
             modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
                 {
                     b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")

Marco.Pms.DataAccess/Migrations/20250630073319_Added_New_Feature_Permissiom_View_All_Employee.cs

@@ -0,0 +1,131 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_New_Feature_Permissiom_View_All_Employee : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DeleteData(
+                table: "FeaturePermissions",
+                keyColumn: "Id",
+                keyValue: new Guid("c7b68e33-72f0-474f-bd96-77636427ecc8"));
+
+            migrationBuilder.DeleteData(
+                table: "FeaturePermissions",
+                keyColumn: "Id",
+                keyValue: new Guid("f2aee20a-b754-4537-8166-f9507b44585b"));
+
+            migrationBuilder.DeleteData(
+                table: "Features",
+                keyColumn: "Id",
+                keyValue: new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"));
+
+            migrationBuilder.UpdateData(
+                table: "FeaturePermissions",
+                keyColumn: "Id",
+                keyValue: new Guid("b82d2b7e-0d52-45f3-997b-c008ea460e7f"),
+                column: "Description",
+                value: "Grants a user read-only access to details about the individuals within the system which are is assigned to same projects as user. This typically includes names, contact information, roles, departments, and potentially other relevant employee data");
+
+            migrationBuilder.InsertData(
+                table: "FeaturePermissions",
+                columns: new[] { "Id", "Description", "FeatureId", "IsEnabled", "Name" },
+                values: new object[,]
+                {
+                    { new Guid("60611762-7f8a-4fb5-b53f-b1139918796b"), "Grants a user read-only access to details about the all individuals within the system. This typically includes names, contact information, roles, departments, and potentially other relevant employee data", new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"), true, "View All Employee" },
+                    { new Guid("8d7cc6e3-9147-41f7-aaa7-fa507e450bd4"), "Grants a user comprehensive read-only access to all details concerning the project's underlying systems, technologies, resources, and configurations", new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"), true, "View Project Infra" },
+                    { new Guid("cf2825ad-453b-46aa-91d9-27c124d63373"), "This allows them to create, modify, and manage all aspects of the supporting infrastructure.", new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"), true, "Manage Project Infra" }
+                });
+
+            migrationBuilder.UpdateData(
+                table: "Features",
+                keyColumn: "Id",
+                keyValue: new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                column: "Name",
+                value: "Attendance Management");
+
+            migrationBuilder.UpdateData(
+                table: "Features",
+                keyColumn: "Id",
+                keyValue: new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                column: "Name",
+                value: "Project Management");
+
+            migrationBuilder.UpdateData(
+                table: "Features",
+                keyColumn: "Id",
+                keyValue: new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                column: "Name",
+                value: "Masters");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DeleteData(
+                table: "FeaturePermissions",
+                keyColumn: "Id",
+                keyValue: new Guid("60611762-7f8a-4fb5-b53f-b1139918796b"));
+
+            migrationBuilder.DeleteData(
+                table: "FeaturePermissions",
+                keyColumn: "Id",
+                keyValue: new Guid("8d7cc6e3-9147-41f7-aaa7-fa507e450bd4"));
+
+            migrationBuilder.DeleteData(
+                table: "FeaturePermissions",
+                keyColumn: "Id",
+                keyValue: new Guid("cf2825ad-453b-46aa-91d9-27c124d63373"));
+
+            migrationBuilder.UpdateData(
+                table: "FeaturePermissions",
+                keyColumn: "Id",
+                keyValue: new Guid("b82d2b7e-0d52-45f3-997b-c008ea460e7f"),
+                column: "Description",
+                value: "Grants a user read-only access to details about the individuals within the system. This typically includes names, contact information, roles, departments, and potentially other relevant employee data");
+
+            migrationBuilder.UpdateData(
+                table: "Features",
+                keyColumn: "Id",
+                keyValue: new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                column: "Name",
+                value: "Attendance");
+
+            migrationBuilder.UpdateData(
+                table: "Features",
+                keyColumn: "Id",
+                keyValue: new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                column: "Name",
+                value: "Manage Project");
+
+            migrationBuilder.UpdateData(
+                table: "Features",
+                keyColumn: "Id",
+                keyValue: new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                column: "Name",
+                value: "Global Masters");
+
+            migrationBuilder.InsertData(
+                table: "Features",
+                columns: new[] { "Id", "Description", "IsActive", "ModuleId", "Name" },
+                values: new object[] { new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"), "Manage Infra", true, new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"), "Manage Infra" });
+
+            migrationBuilder.InsertData(
+                table: "FeaturePermissions",
+                columns: new[] { "Id", "Description", "FeatureId", "IsEnabled", "Name" },
+                values: new object[,]
+                {
+                    { new Guid("c7b68e33-72f0-474f-bd96-77636427ecc8"), "Grants a user comprehensive read-only access to all details concerning the project's underlying systems, technologies, resources, and configurations", new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"), true, "View Project Infra" },
+                    { new Guid("f2aee20a-b754-4537-8166-f9507b44585b"), "This allows them to create, modify, and manage all aspects of the supporting infrastructure.", new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"), true, "Manage Project Infra" }
+                });
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -987,17 +987,17 @@ namespace Marco.Pms.DataAccess.Migrations
                         },
                         new
                         {
-                            Id = new Guid("c7b68e33-72f0-474f-bd96-77636427ecc8"),
+                            Id = new Guid("8d7cc6e3-9147-41f7-aaa7-fa507e450bd4"),
                             Description = "Grants a user comprehensive read-only access to all details concerning the project's underlying systems, technologies, resources, and configurations",
-                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
                             IsEnabled = true,
                             Name = "View Project Infra"
                         },
                         new
                         {
-                            Id = new Guid("f2aee20a-b754-4537-8166-f9507b44585b"),
+                            Id = new Guid("cf2825ad-453b-46aa-91d9-27c124d63373"),
                             Description = "This allows them to create, modify, and manage all aspects of the supporting infrastructure.",
-                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
                             IsEnabled = true,
                             Name = "Manage Project Infra"
                         },
@@ -1034,9 +1034,17 @@ namespace Marco.Pms.DataAccess.Migrations
                             Name = "Approve Task"
                         },
                         new
+                        {
+                            Id = new Guid("60611762-7f8a-4fb5-b53f-b1139918796b"),
+                            Description = "Grants a user read-only access to details about the all individuals within the system. This typically includes names, contact information, roles, departments, and potentially other relevant employee data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "View All Employee"
+                        },
+                        new
                         {
                             Id = new Guid("b82d2b7e-0d52-45f3-997b-c008ea460e7f"),
-                            Description = "Grants a user read-only access to details about the individuals within the system. This typically includes names, contact information, roles, departments, and potentially other relevant employee data",
+                            Description = "Grants a user read-only access to details about the individuals within the system which are is assigned to same projects as user. This typically includes names, contact information, roles, departments, and potentially other relevant employee data",
                             FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
                             IsEnabled = true,
                             Name = "View Employee"
@@ -1514,15 +1522,7 @@ namespace Marco.Pms.DataAccess.Migrations
                             Description = "Manage Project",
                             IsActive = true,
                             ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
-                            Name = "Manage Project"
+                            Name = "Project Management"
-                        },
-                        new
-                        {
-                            Id = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
-                            Description = "Manage Infra",
-                            IsActive = true,
-                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
-                            Name = "Manage Infra"
                         },
                         new
                         {
@@ -1546,7 +1546,7 @@ namespace Marco.Pms.DataAccess.Migrations
                             Description = "Attendance",
                             IsActive = true,
                             ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
-                            Name = "Attendance"
+                            Name = "Attendance Management"
                         },
                         new
                         {
@@ -1554,7 +1554,7 @@ namespace Marco.Pms.DataAccess.Migrations
                             Description = "Global Masters",
                             IsActive = true,
                             ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
-                            Name = "Global Masters"
+                            Name = "Masters"
                         },
                         new
                         {

Marco.Pms.Services/Controllers/EmployeeController.cs

@@ -10,6 +10,7 @@ using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.Employee;
 using Marco.Pms.Services.Hubs;
+using Marco.Pms.Services.Service;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Service;
 using Microsoft.AspNetCore.Authorization;
@@ -35,10 +36,13 @@ namespace MarcoBMS.Services.Controllers
         private readonly IConfiguration _configuration;
         private readonly ILoggingService _logger;
         private readonly IHubContext<MarcoHub> _signalR;
+        private readonly PermissionServices _permission;
+        private readonly Guid ViewAllEmployee;
+        private readonly Guid ViewEmployee;
 
         public EmployeeController(UserManager<ApplicationUser> userManager, IEmailSender emailSender,
             ApplicationDbContext context, EmployeeHelper employeeHelper, UserHelper userHelper, IConfiguration configuration, ILoggingService logger,
-            IHubContext<MarcoHub> signalR)
+            IHubContext<MarcoHub> signalR, PermissionServices permission)
         {
             _context = context;
             _userManager = userManager;
@@ -48,6 +52,9 @@ namespace MarcoBMS.Services.Controllers
             _configuration = configuration;
             _logger = logger;
             _signalR = signalR;
+            _permission = permission;
+            ViewAllEmployee = Guid.Parse("60611762-7f8a-4fb5-b53f-b1139918796b");
+            ViewEmployee = Guid.Parse("b82d2b7e-0d52-45f3-997b-c008ea460e7f");
         }
 
         [HttpGet]
@@ -93,18 +100,39 @@ namespace MarcoBMS.Services.Controllers
         [Route("list/{projectid?}")]
         public async Task<IActionResult> GetEmployeesByProject(Guid? projectid, [FromQuery] bool ShowInactive)
         {
+            // Step 1: Validate incoming request model state
             if (!ModelState.IsValid)
             {
                 var errors = ModelState.Values
                     .SelectMany(v => v.Errors)
                     .Select(e => e.ErrorMessage)
                     .ToList();
+
+                _logger.LogWarning("Invalid request model in GetEmployeesByProject. Errors: {@Errors}", errors);
                 return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", errors, 400));
             }
+
+            // Step 2: Get currently logged-in employee
+            var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+            _logger.LogInfo("GetEmployeesByProject called by EmployeeId: {EmployeeId}, ProjectId: {ProjectId}, ShowInactive: {ShowInactive}",
+                loggedInEmployee.Id, projectid ?? Guid.Empty, ShowInactive);
+
+            // Step 3: Check permission (if project ID is not provided, user must have global view permission)
+            var hasViewAllEmployeePermission = await _permission.HasPermission(ViewAllEmployee, loggedInEmployee.Id);
+            if (projectid == null && !hasViewAllEmployeePermission)
+            {
+                _logger.LogWarning("Access denied. EmployeeId: {EmployeeId} tried to access employees without project filter", loggedInEmployee.Id);
+                return StatusCode(403, ApiResponse<object>.ErrorResponse("You don't have access", "You don't have access", 403));
+            }
+
+            // Step 4: Get employee list from helper based on project and visibility flag
             var result = await _employeeHelper.GetEmployeeByProjectId(GetTenantId(), projectid, ShowInactive);
 
-            return Ok(ApiResponse<object>.SuccessResponse(result, "Filter applied.", 200));
+            _logger.LogInfo("Employees fetched successfully for ProjectId: {ProjectId} by EmployeeId: {EmployeeId}. Result Count: {Count}",
+                projectid ?? Guid.Empty, loggedInEmployee.Id, result.Count());
 
+            // Step 5: Return success response with employee data
+            return Ok(ApiResponse<object>.SuccessResponse(result, "Filter applied.", 200));
         }
 
         [HttpGet]