admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 8 Actions Packages Projects Releases Wiki Activity

Tenant_Management #114

Merged
ashutosh.nehete merged 73 commits from Tenant_Management into main 2025-08-28 05:13:10 +00:00
Conversation 0 Commits 73 Files Changed 93 +3 -1
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bd4f1d5e69 - Show all commits

1
Marco.Pms.Model/Mapper/EmployeeMapper.cs
View File

@ -35,6 +35,7 @@ namespace Marco.Pms.Model.Mapper
PhoneNumber = model.PhoneNumber,
Photo = base64String,
IsActive = model.IsActive,
IsRootUser = model.ApplicationUser!.IsRootUser!.Value,
IsSystem = model.IsSystem,
JoiningDate = model.JoiningDate,
TenantId = model.TenantId

1
Marco.Pms.Model/ViewModels/Employee/EmployeeVM.cs
View File

@ -21,6 +21,7 @@
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

2
Marco.Pms.Services/Helpers/EmployeeHelper.cs
View File

@ -29,7 +29,7 @@ namespace MarcoBMS.Services.Helpers
{
var result = await _context.Employees.Where(c => c.ApplicationUserId == ApplicationUserID && c.IsActive == true).ToListAsync();
return await _context.Employees.Where(c => c.ApplicationUserId == ApplicationUserID && c.IsActive == true).SingleOrDefaultAsync() ?? new Employee { };
return await _context.Employees.Include(e => e.ApplicationUser).Where(c => c.ApplicationUserId == ApplicationUserID && c.ApplicationUser != null && c.IsActive == true).SingleOrDefaultAsync() ?? new Employee { };
}
catch (Exception ex)
{