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

Added contact details of the project in service project list view model

Browse Source
This commit is contained in:
ashutosh.nehete 2025-11-12 09:44:02 +05:30
parent 31cfe2b581
commit d18bdb1363
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Marco.Pms.Model/ViewModels/ServiceProject/ServiceProjectVm.cs
View File

@ -8,17 +8,17 @@ namespace Marco.Pms.Model.ViewModels.ServiceProject
public class ServiceProjectVM public class ServiceProjectVM
{ {
public Guid Id { get; set; } public Guid Id { get; set; }
public string Name { get; set; } = string.Empty; public string? Name { get; set; }
public string ShortName { get; set; } = string.Empty; public string? ShortName { get; set; }
public string Address { get; set; } = string.Empty; public string? Address { get; set; }
public DateTime AssignedDate { get; set; } public DateTime AssignedDate { get; set; }
public StatusMaster? Status { get; set; } public StatusMaster? Status { get; set; }
public BasicOrganizationVm? Client { get; set; } public BasicOrganizationVm? Client { get; set; }
public List<ServiceMasterVM>? Services { get; set; } public List<ServiceMasterVM>? Services { get; set; }
public BasicEmployeeVM? CreatedBy { get; set; } public string? ContactName { get; set; }
public BasicEmployeeVM? UpdatedBy { get; set; } public string? ContactPhone { get; set; }
public DateTime? UpdatedAt { get; set; } public string? ContactEmail { get; set; }
public DateTime CreatedAt { get; set; } public DateTime CreatedAt { get; set; }
public BasicEmployeeVM? CreatedBy { get; set; }
} }
} }

3
Marco.Pms.Services/Service/ServiceProjectService.cs
View File

@ -105,7 +105,6 @@ namespace Marco.Pms.Services.Service
serviceProjectVM.Services = services.Where(s => serviceIds.Contains(s.Id)).Select(s => _mapper.Map<ServiceMasterVM>(s)).ToList(); serviceProjectVM.Services = services.Where(s => serviceIds.Contains(s.Id)).Select(s => _mapper.Map<ServiceMasterVM>(s)).ToList();
serviceProjectVM.CreatedAt = DateTime.UtcNow;
serviceProjectVM.CreatedBy = _mapper.Map<BasicEmployeeVM>(loggedInEmployee); serviceProjectVM.CreatedBy = _mapper.Map<BasicEmployeeVM>(loggedInEmployee);
return ApiResponse<object>.SuccessResponse(serviceProjectVM, "An Successfullly occurred while saving the project.", 201); return ApiResponse<object>.SuccessResponse(serviceProjectVM, "An Successfullly occurred while saving the project.", 201);
@ -127,7 +126,6 @@ namespace Marco.Pms.Services.Service
.Include(sp => sp.Client) .Include(sp => sp.Client)
.Include(sp => sp.Status) .Include(sp => sp.Status)
.Include(sp => sp.CreatedBy).ThenInclude(e => e!.JobRole) .Include(sp => sp.CreatedBy).ThenInclude(e => e!.JobRole)
.Include(sp => sp.UpdatedBy).ThenInclude(e => e!.JobRole)
.Where(sp => sp.TenantId == tenantId && sp.IsActive); .Where(sp => sp.TenantId == tenantId && sp.IsActive);
var serviceProjects = await serviceProjectQuery var serviceProjects = await serviceProjectQuery
@ -254,7 +252,6 @@ namespace Marco.Pms.Services.Service
.Include(sp => sp.Client) .Include(sp => sp.Client)
.Include(sp => sp.Status) .Include(sp => sp.Status)
.Include(sp => sp.CreatedBy).ThenInclude(e => e!.JobRole) .Include(sp => sp.CreatedBy).ThenInclude(e => e!.JobRole)
.Include(sp => sp.UpdatedBy).ThenInclude(e => e!.JobRole)
.Where(sp => sp.TenantId == tenantId && sp.IsActive).FirstOrDefaultAsync(); .Where(sp => sp.TenantId == tenantId && sp.IsActive).FirstOrDefaultAsync();
}); });