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

Organization_Management #142

Merged
ashutosh.nehete merged 92 commits from Organization_Management into main 2025-09-30 09:05:14 +00:00
Conversation 0 Commits 92 Files Changed 126 +4 -1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cd175c4fdf - Show all commits

4
Marco.Pms.Model/ViewModels/Organization/OrganizationDetailsVM.cs
View File

@ -1,4 +1,5 @@
using Marco.Pms.Model.ViewModels.Activities; using Marco.Pms.Model.Master;
using Marco.Pms.Model.ViewModels.Activities;
namespace Marco.Pms.Model.ViewModels.Organization namespace Marco.Pms.Model.ViewModels.Organization
{ {
@ -19,6 +20,7 @@ namespace Marco.Pms.Model.ViewModels.Organization
public DateTime? UpdatedAt { get; set; } public DateTime? UpdatedAt { get; set; }
public bool IsActive { get; set; } public bool IsActive { get; set; }
public List<ProjectServiceMappingVM>? Projects { get; set; } public List<ProjectServiceMappingVM>? Projects { get; set; }
public List<GlobalServiceMaster>? Services { get; set; }
public string? logoImage { get; set; } public string? logoImage { get; set; }
} }
} }

1
Marco.Pms.Services/Controllers/OrganizationController.cs
View File

@ -233,6 +233,7 @@ namespace Marco.Pms.Services.Controllers
response.CreatedBy = _mapper.Map<BasicEmployeeVM>(createdByEmployee); response.CreatedBy = _mapper.Map<BasicEmployeeVM>(createdByEmployee);
response.UpdatedBy = _mapper.Map<BasicEmployeeVM>(updatedByEmployee); response.UpdatedBy = _mapper.Map<BasicEmployeeVM>(updatedByEmployee);
response.Projects = _mapper.Map<List<ProjectServiceMappingVM>>(projectOrgMappings.Select(po => po.ProjectService).ToList()); response.Projects = _mapper.Map<List<ProjectServiceMappingVM>>(projectOrgMappings.Select(po => po.ProjectService).ToList());
response.Services = orgServiceMappings.Where(os => os.Service != null).Select(os => os.Service!).ToList();
_logger.LogInfo("Fetched organization details for OrganizationId: {OrganizationId}, Employee count: {EmployeeCount}, App user count: {AppUserCount}, Project count: {ProjectCount}", _logger.LogInfo("Fetched organization details for OrganizationId: {OrganizationId}, Employee count: {EmployeeCount}, App user count: {AppUserCount}, Project count: {ProjectCount}",
id, activeEmployeeCount, activeApplicationUserCount, response.Projects.Count); id, activeEmployeeCount, activeApplicationUserCount, response.Projects.Count);