ivanszabo/WorkFlowCheck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

CheckListHeader lista javítva

Browse Source
This commit is contained in:
ivanszabo
2025-03-22 11:19:18 +01:00
parent 15e6aac88c
commit 6d78762275
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/WorkFlowCheck.BL/Mappings/MapperProfile.cs
+8 -7
View File
@@ -15,28 +15,28 @@ namespace WorkFlowCheck.BL.Mappings
public MapperProfile() public MapperProfile()
{ {
CreateMap<User, UserDTO>().ForMember(dest => dest.RoleDTO, opt => opt.MapFrom(src => src.UserRoles.Select(ur => ur.Role))); CreateMap<User, UserDTO>().ForMember(dest => dest.RoleDTO, opt => opt.MapFrom(src => src.UserRoles.Select(ur => ur.Role)));
CreateMap<Role, RoleDTO>(); CreateMap<Role, RoleDTO>();
CreateMap<UserRole, UserRoleDTO>() CreateMap<UserRole, UserRoleDTO>()
.ForMember(dest => dest.RoleDTO, opt => opt.MapFrom(src => src.Role)) .ForMember(dest => dest.RoleDTO, opt => opt.MapFrom(src => src.Role))
.ForMember(dest => dest.UserDTO, opt => opt.MapFrom(src => src.User)); .ForMember(dest => dest.UserDTO, opt => opt.MapFrom(src => src.User));
CreateMap<UserDTO, User>() CreateMap<UserDTO, User>()
.ForMember(dest => dest.PasswordHash, opt => opt.MapFrom<PasswordHashResolver>()); .ForMember(dest => dest.PasswordHash, opt => opt.MapFrom<PasswordHashResolver>());
CreateMap<CheckListTemplateHeader, CheckListTemplateHeaderDTO>() CreateMap<CheckListTemplateHeader, CheckListTemplateHeaderDTO>()
.ForMember(dest => dest.CheckListTemplateRowDTO, opt => opt.MapFrom(src => src.CheckListTemplateRows)); .ForMember(dest => dest.CheckListTemplateRowDTO, opt => opt.MapFrom(src => src.CheckListTemplateRows));
CreateMap<CheckListTemplateRow, CheckListTemplateRowDTO>() CreateMap<CheckListTemplateRow, CheckListTemplateRowDTO>()
.ForMember(dest => dest.EquipmentDTO, opt => opt.MapFrom(src => src.Equipment)) .ForMember(dest => dest.EquipmentDTO, opt => opt.MapFrom(src => src.Equipment))
.ForMember(dest => dest.CheckPointDTO, opt => opt.MapFrom(src => src.CheckPoint)); .ForMember(dest => dest.CheckPointDTO, opt => opt.MapFrom(src => src.CheckPoint));
CreateMap<CheckPoint, CheckPointDTO>().ForMember(dest => dest.CheckListTemplateRowDTO, opt => opt.MapFrom(src => src.CheckListTemplateRows)); CreateMap<CheckPoint, CheckPointDTO>().ForMember(dest => dest.CheckListTemplateRowDTO, opt => opt.MapFrom(src => src.CheckListTemplateRows));
CreateMap<CheckPointDTO, CheckPoint>(); CreateMap<CheckPointDTO, CheckPoint>();
CreateMap<Location, LocationDTO>(); CreateMap<Location, LocationDTO>();
CreateMap<LocationDTO, Location>(); CreateMap<LocationDTO, Location>();
@@ -44,6 +44,7 @@ namespace WorkFlowCheck.BL.Mappings
CreateMap<EquipmentDTO, Equipment>(); CreateMap<EquipmentDTO, Equipment>();
CreateMap<CheckListHeader, CheckListHeaderDTO>() CreateMap<CheckListHeader, CheckListHeaderDTO>()
.ForMember(dest => dest.UserDTO, opt => opt.MapFrom(src => src.User))
.ForMember(dest => dest.CheckListRowDTO, opt => opt.MapFrom(src => src.CheckListRows)); .ForMember(dest => dest.CheckListRowDTO, opt => opt.MapFrom(src => src.CheckListRows));
} }
} }
src/WorkFlowCheck.BL/Services/CheckListService.cs
+1
View File
@@ -61,6 +61,7 @@ namespace WorkFlowCheck.BL.Services
{ {
var roles = await _dbContext.CheckListHeaders var roles = await _dbContext.CheckListHeaders
.Include(i => i.CheckListRows) .Include(i => i.CheckListRows)
.Include(i=>i.User)
.AsNoTracking() .AsNoTracking()
.ToListAsync(); .ToListAsync();
if (roles != null) if (roles != null)
src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderPage.cshtml
+10 -10
View File
@@ -66,19 +66,19 @@
} }
}, },
{ data: "documentNumber", { data: "documentNumber"},
render: function (data, type, row) { { data: "dateExecution",
if (!data) return ''; render: function (data, type, row) {
if (type === 'display' || type === 'filter') { if (!data) return '';
return dayjs(data).format('YYYY.MM.DD'); if (type === 'display' || type === 'filter') {
} return dayjs(data).format('YYYY.MM.DD');
return data; }
} return data;
}
}, },
{ data: "dateExecution" },
{ data: "shortName" }, { data: "shortName" },
{ data: "description" }, { data: "description" },
{ data: "user.userName" }, { data: "userDTO.userName" },
{ data: null, render: function (data, type, row) { { data: null, render: function (data, type, row) {
return renderActionButtons(row.id); return renderActionButtons(row.id);
}} }}