From 6d7876227523d0d11c368fb3d033679e3b0f288d Mon Sep 17 00:00:00 2001
From: ivanszabo <ivan.szabo.sis@gmail.com>
Date: Sat, 22 Mar 2025 11:18:59 +0100
Subject: [PATCH] =?UTF-8?q?CheckListHeader=20lista=20jav=C3=ADtva?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Mappings/MapperProfile.cs                 | 15 +++++++-------
 .../Services/CheckListService.cs              |  1 +
 .../CheckListHeaderPage.cshtml                | 20 +++++++++----------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/WorkFlowCheck.BL/Mappings/MapperProfile.cs b/src/WorkFlowCheck.BL/Mappings/MapperProfile.cs
index 4e572ff..b18d075 100644
--- a/src/WorkFlowCheck.BL/Mappings/MapperProfile.cs
+++ b/src/WorkFlowCheck.BL/Mappings/MapperProfile.cs
@@ -15,28 +15,28 @@ namespace WorkFlowCheck.BL.Mappings
         public MapperProfile()
         {
             CreateMap<User, UserDTO>().ForMember(dest => dest.RoleDTO, opt => opt.MapFrom(src => src.UserRoles.Select(ur => ur.Role)));
-            
+
             CreateMap<Role, RoleDTO>();
-            
+
             CreateMap<UserRole, UserRoleDTO>()
                 .ForMember(dest => dest.RoleDTO, opt => opt.MapFrom(src => src.Role))
                 .ForMember(dest => dest.UserDTO, opt => opt.MapFrom(src => src.User));
-            
+
             CreateMap<UserDTO, User>()
                   .ForMember(dest => dest.PasswordHash, opt => opt.MapFrom<PasswordHashResolver>());
 
 
             CreateMap<CheckListTemplateHeader, CheckListTemplateHeaderDTO>()
                 .ForMember(dest => dest.CheckListTemplateRowDTO, opt => opt.MapFrom(src => src.CheckListTemplateRows));
-            
+
             CreateMap<CheckListTemplateRow, CheckListTemplateRowDTO>()
                 .ForMember(dest => dest.EquipmentDTO, opt => opt.MapFrom(src => src.Equipment))
                 .ForMember(dest => dest.CheckPointDTO, opt => opt.MapFrom(src => src.CheckPoint));
-            
+
             CreateMap<CheckPoint, CheckPointDTO>().ForMember(dest => dest.CheckListTemplateRowDTO, opt => opt.MapFrom(src => src.CheckListTemplateRows));
-            
+
             CreateMap<CheckPointDTO, CheckPoint>();
-            
+
             CreateMap<Location, LocationDTO>();
             CreateMap<LocationDTO, Location>();
 
@@ -44,6 +44,7 @@ namespace WorkFlowCheck.BL.Mappings
             CreateMap<EquipmentDTO, Equipment>();
 
             CreateMap<CheckListHeader, CheckListHeaderDTO>()
+                .ForMember(dest => dest.UserDTO, opt => opt.MapFrom(src => src.User))
                 .ForMember(dest => dest.CheckListRowDTO, opt => opt.MapFrom(src => src.CheckListRows));
         }
     }
diff --git a/src/WorkFlowCheck.BL/Services/CheckListService.cs b/src/WorkFlowCheck.BL/Services/CheckListService.cs
index 856a823..2ecc619 100644
--- a/src/WorkFlowCheck.BL/Services/CheckListService.cs
+++ b/src/WorkFlowCheck.BL/Services/CheckListService.cs
@@ -61,6 +61,7 @@ namespace WorkFlowCheck.BL.Services
             {
                 var roles = await _dbContext.CheckListHeaders
                                             .Include(i => i.CheckListRows)
+                                            .Include(i=>i.User)
                                             .AsNoTracking()
                                             .ToListAsync();
                 if (roles != null)
diff --git a/src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderPage.cshtml b/src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderPage.cshtml
index be5e4fa..11ce7f4 100644
--- a/src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderPage.cshtml
+++ b/src/WorkFlowCheck.Web/Pages/CheckList/CheckListHeader/CheckListHeaderPage.cshtml
@@ -66,19 +66,19 @@
                             }
 
                     },
-                    { data: "documentNumber",
-                      render: function (data, type, row) {
-                                if (!data) return '';
-                                if (type === 'display' || type === 'filter') {
-                                    return dayjs(data).format('YYYY.MM.DD');
-                                }
-                                return data;
-                            }
+                    { data: "documentNumber"},
+                    { data: "dateExecution",
+                            render: function (data, type, row) {
+                                        if (!data) return '';
+                                        if (type === 'display' || type === 'filter') {
+                                            return dayjs(data).format('YYYY.MM.DD');
+                                        }
+                                        return data;
+                                    }
                     },
-                    { data: "dateExecution" },
                     { data: "shortName" },
                     { data: "description" },
-                    { data: "user.userName" },
+                    { data: "userDTO.userName" },
                     { data: null, render: function (data, type, row) {
                          return renderActionButtons(row.id);
                     }}