Marco.Pms.DataAccess/Initializer/DBInitializer.cs

@@ -78,10 +78,8 @@ namespace Marco.Pms.DataAccess.Initializer
                     Gender = "",
                     EmergencyPhoneNumber = "1234567890",
                     CurrentAddress = "",
-                    AadharNumber = "1234567890",
                     ApplicationUserId = user.Id,
                     BirthDate = DateTime.MinValue,
-                    PanNumber = "",
                     PermanentAddress = "",
                     PhoneNumber = "",
                     TenantId = user.TenantId

Marco.Pms.DataAccess/Migrations/20250917063934_Updated_EMployee_Table.cs

@@ -0,0 +1,136 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Updated_EMployee_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Employees_JobRoles_JobRoleId",
+                table: "Employees");
+
+            migrationBuilder.DropColumn(
+                name: "AadharNumber",
+                table: "Employees");
+
+            migrationBuilder.DropColumn(
+                name: "PanNumber",
+                table: "Employees");
+
+            migrationBuilder.DropColumn(
+                name: "RoleId",
+                table: "Employees");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "JobRoleId",
+                table: "Employees",
+                type: "char(36)",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
+                collation: "ascii_general_ci",
+                oldClrType: typeof(Guid),
+                oldType: "char(36)",
+                oldNullable: true)
+                .OldAnnotation("Relational:Collation", "ascii_general_ci");
+
+            migrationBuilder.UpdateData(
+                table: "Employees",
+                keyColumn: "FirstName",
+                keyValue: null,
+                column: "FirstName",
+                value: "");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "FirstName",
+                table: "Employees",
+                type: "longtext",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "HasApplicationAccess",
+                table: "Employees",
+                type: "tinyint(1)",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Employees_JobRoles_JobRoleId",
+                table: "Employees",
+                column: "JobRoleId",
+                principalTable: "JobRoles",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Employees_JobRoles_JobRoleId",
+                table: "Employees");
+
+            migrationBuilder.DropColumn(
+                name: "HasApplicationAccess",
+                table: "Employees");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "JobRoleId",
+                table: "Employees",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci",
+                oldClrType: typeof(Guid),
+                oldType: "char(36)")
+                .OldAnnotation("Relational:Collation", "ascii_general_ci");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "FirstName",
+                table: "Employees",
+                type: "longtext",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "longtext")
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AddColumn<string>(
+                name: "AadharNumber",
+                table: "Employees",
+                type: "longtext",
+                nullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AddColumn<string>(
+                name: "PanNumber",
+                table: "Employees",
+                type: "longtext",
+                nullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "RoleId",
+                table: "Employees",
+                type: "char(36)",
+                nullable: false,
+                defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Employees_JobRoles_JobRoleId",
+                table: "Employees",
+                column: "JobRoleId",
+                principalTable: "JobRoles",
+                principalColumn: "Id");
+        }
+    }
+}

Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -1189,9 +1189,6 @@ namespace Marco.Pms.DataAccess.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
-                    b.Property<string>("AadharNumber")
-                        .HasColumnType("longtext");
-
                     b.Property<string>("ApplicationUserId")
                         .HasColumnType("varchar(255)");
 
@@ -1211,18 +1208,22 @@ namespace Marco.Pms.DataAccess.Migrations
                         .HasColumnType("longtext");
 
                     b.Property<string>("FirstName")
+                        .IsRequired()
                         .HasColumnType("longtext");
 
                     b.Property<string>("Gender")
                         .HasColumnType("longtext");
 
+                    b.Property<bool>("HasApplicationAccess")
+                        .HasColumnType("tinyint(1)");
+
                     b.Property<bool>("IsActive")
                         .HasColumnType("tinyint(1)");
 
                     b.Property<bool>("IsSystem")
                         .HasColumnType("tinyint(1)");
 
-                    b.Property<Guid?>("JobRoleId")
+                    b.Property<Guid>("JobRoleId")
                         .HasColumnType("char(36)");
 
                     b.Property<DateTime?>("JoiningDate")
@@ -1234,9 +1235,6 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.Property<string>("MiddleName")
                         .HasColumnType("longtext");
 
-                    b.Property<string>("PanNumber")
-                        .HasColumnType("longtext");
-
                     b.Property<string>("PermanentAddress")
                         .HasColumnType("longtext");
 
@@ -1246,9 +1244,6 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.Property<byte[]>("Photo")
                         .HasColumnType("longblob");
 
-                    b.Property<Guid>("RoleId")
-                        .HasColumnType("char(36)");
-
                     b.Property<Guid>("TenantId")
                         .HasColumnType("char(36)");
 
@@ -5132,7 +5127,9 @@ namespace Marco.Pms.DataAccess.Migrations
 
                     b.HasOne("Marco.Pms.Model.Roles.JobRole", "JobRole")
                         .WithMany()
-                        .HasForeignKey("JobRoleId");
+                        .HasForeignKey("JobRoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
 
                     b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant")
                         .WithMany()

Marco.Pms.Model/Dtos/Employees/CreateUserDto.cs

@@ -18,17 +18,7 @@
 
         public string? EmergencyPhoneNumber { get; set; }
         public string? EmergencyContactPerson { get; set; }
-
-        public string? AadharNumber { get; set; }
-
-        public string? PanNumber { get; set; }
-
-        //public IFormFile? Photo { get; set; } // To store the captured photo
-        //public List<IFormFile>? Documents { get; set; }
-
         public Guid JobRoleId { get; set; }
-
-        // public int TenantId { get; set; }
     }
     public class MobileUserManageDto
     {

Marco.Pms.Model/Employees/Employee.cs

@@ -1,52 +1,35 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using Marco.Pms.Model.Entitlements;
+using Marco.Pms.Model.Entitlements;
 using Marco.Pms.Model.Roles;
 using Marco.Pms.Model.Utilities;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Marco.Pms.Model.Employees
 {
     public class Employee : TenantRelation
     {
         public Guid Id { get; set; }
-        public string? FirstName { get; set; }
+        public string FirstName { get; set; } = string.Empty;
         public string? LastName { get; set; }
         public string? MiddleName { get; set; }
         public string? Email { get; set; }
-
         public string? Gender { get; set; }
         public DateTime? BirthDate { get; set; }
         public DateTime? JoiningDate { get; set; }
-
         public string? PermanentAddress { get; set; }
         public string? CurrentAddress { get; set; }
         public string? PhoneNumber { get; set; }
-
         public string? EmergencyPhoneNumber { get; set; }
         public string? EmergencyContactPerson { get; set; }
-
-
-        public string? AadharNumber { get; set; }
-
-        public string? PanNumber { get; set; }
-
         public byte[]? Photo { get; set; } // To store the captured photo
-
         public string? ApplicationUserId { get; set; }
         [ForeignKey("ApplicationUserId")]
         [ValidateNever]
         public ApplicationUser? ApplicationUser { get; set; }
-
-
         public bool IsActive { get; set; } = true;
-
+        public bool HasApplicationAccess { get; set; } = false;
         public bool IsSystem { get; set; } = false;
-
-        public Guid RoleId { get; set; }
-        //[ForeignKey(nameof(RoleId))]
-        //public EmployeeRole EmployeeRole { get; set; }
-
-        public Guid? JobRoleId { get; set; }
+        public Guid JobRoleId { get; set; }
         [ForeignKey("JobRoleId")]
         [ValidateNever]
         public JobRole? JobRole { get; set; }

Marco.Pms.Model/Mapper/EmployeeMapper.cs

@@ -23,14 +23,12 @@ namespace Marco.Pms.Model.Mapper
                 Email = model.Email,
                 CurrentAddress = model.CurrentAddress,
                 BirthDate = model.BirthDate,
-                AadharNumber = model.AadharNumber,
                 ApplicationUserId = model.ApplicationUserId,
                 EmergencyPhoneNumber = model.EmergencyPhoneNumber,
                 EmergencyContactPerson = model.EmergencyContactPerson,
                 Gender = model.Gender,
                 JobRole = (model.JobRole != null ? model.JobRole.Name : null),
                 JobRoleId = model.JobRoleId,
-                PanNumber = model.PanNumber,
                 PermanentAddress = model.PermanentAddress,
                 PhoneNumber = model.PhoneNumber,
                 Photo = base64String,
@@ -66,10 +64,8 @@ namespace Marco.Pms.Model.Mapper
                 BirthDate = null,
                 EmergencyPhoneNumber = string.Empty,
                 EmergencyContactPerson = string.Empty,
-                AadharNumber = string.Empty,
                 Gender = model.Gender,
                 MiddleName = string.Empty,
-                PanNumber = string.Empty,
                 PermanentAddress = string.Empty,
                 PhoneNumber = model.PhoneNumber,
                 Photo = image,

Marco.Pms.Model/ViewModels/Employee/EmployeeVM.cs

@@ -17,18 +17,11 @@
 
         public string? EmergencyPhoneNumber { get; set; }
         public string? EmergencyContactPerson { get; set; }
-
-        public string? AadharNumber { get; set; }
-
         public bool IsActive { get; set; } = true;
         public bool IsRootUser { get; set; }
-        public string? PanNumber { get; set; }
-
         public string? Photo { get; set; } // To store the captured photo
-
         public string? ApplicationUserId { get; set; }
-
-        public Guid? JobRoleId { get; set; }
+        public Guid JobRoleId { get; set; }
         public Guid TenantId { get; set; }
         public bool IsSystem { get; set; }
         public string? JobRole { get; set; }

Marco.Pms.Services/Controllers/EmployeeController.cs

@@ -628,10 +628,8 @@ namespace MarcoBMS.Services.Controllers
                 BirthDate = Convert.ToDateTime(model.BirthDate),
                 EmergencyPhoneNumber = model.EmergencyPhoneNumber,
                 EmergencyContactPerson = model.EmergencyContactPerson,
-                AadharNumber = model.AadharNumber,
                 Gender = model.Gender,
                 MiddleName = model.MiddleName,
-                PanNumber = model.PanNumber,
                 PermanentAddress = model.PermanentAddress,
                 PhoneNumber = model.PhoneNumber,
                 Photo = null, // GetFileDetails(model.Photo).Result.FileData,
@@ -654,10 +652,8 @@ namespace MarcoBMS.Services.Controllers
             existingEmployee.JoiningDate = Convert.ToDateTime(model.JoiningDate);
             existingEmployee.EmergencyPhoneNumber = model.EmergencyPhoneNumber;
             existingEmployee.EmergencyContactPerson = model.EmergencyContactPerson;
-            existingEmployee.AadharNumber = model.AadharNumber;
             existingEmployee.Gender = model.Gender;
             existingEmployee.MiddleName = model.MiddleName;
-            existingEmployee.PanNumber = model.PanNumber;
             existingEmployee.PermanentAddress = model.PermanentAddress;
             existingEmployee.PhoneNumber = model.PhoneNumber;
             existingEmployee.Photo = existingEmployee.Photo; // GetFileDetails(model.Photo).Result.FileData,