From ea305ebbf4d85ab6f6017ff297eaee40c2ee7e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Szab=C3=B3?= Date: Mon, 31 Mar 2025 22:13:28 +0200 Subject: [PATCH] BUGFIXEK UI oldalon --- .../DataLayer/Entities/CheckListHeader.cs | 4 +++- src/WorkFlowCheck.MAUI/Mapper/MapperProfile.cs | 3 ++- .../Pages/CheckList/CheckListPage.xaml.cs | 16 +++++++++++----- .../Services/CheckListService.cs | 10 ++-------- .../Services/Interfaces/ICheckListService.cs | 2 +- src/WorkFlowCheck.MAUI/Services/SyncService.cs | 4 +++- 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/WorkFlowCheck.MAUI/DataLayer/Entities/CheckListHeader.cs b/src/WorkFlowCheck.MAUI/DataLayer/Entities/CheckListHeader.cs index d691c7d..ec2e9d6 100644 --- a/src/WorkFlowCheck.MAUI/DataLayer/Entities/CheckListHeader.cs +++ b/src/WorkFlowCheck.MAUI/DataLayer/Entities/CheckListHeader.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using WorkFlowCheck.Common.Enums; namespace WorkFlowCheck.MAUI.DataLayer.Entities { @@ -10,7 +11,8 @@ namespace WorkFlowCheck.MAUI.DataLayer.Entities { public int Id { get; set; } public int CheckListTemplateHeaderId { get; set; } - public virtual CheckListTemplateHeader CheckListTemplateHeader { get; set; } + public virtual CheckListTemplateHeader? CheckListTemplateHeader { get; set; } + public CheckStatus CheckStatus { get; set; } public DateTime DateExecution { get; set; } public int UserId { get; set; } public string ShortName { get; set; } = null!; diff --git a/src/WorkFlowCheck.MAUI/Mapper/MapperProfile.cs b/src/WorkFlowCheck.MAUI/Mapper/MapperProfile.cs index f7feae6..9e54424 100644 --- a/src/WorkFlowCheck.MAUI/Mapper/MapperProfile.cs +++ b/src/WorkFlowCheck.MAUI/Mapper/MapperProfile.cs @@ -29,7 +29,8 @@ namespace WorkFlowCheck.MAUI.Mapper .ForMember(dest => dest.CheckListRows, opt => opt.MapFrom(src => src.CheckListRowDTO)); CreateMap() .ForMember(dest => dest.CheckListTemplateRowDTO, opt => opt.MapFrom(src => src.CheckListTemplateRow)); - CreateMap(); + CreateMap() + .ForMember(dest => dest.CheckListTemplateRow, opt => opt.MapFrom(src => src.CheckListTemplateRowDTO)); } } } diff --git a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs index 888110d..cae5bd8 100644 --- a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs +++ b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs @@ -12,7 +12,7 @@ public partial class CheckListPage : ContentPage private readonly ICheckListService _checkListService; private readonly IUserService _userService; private bool _isLoading; - + public ICommand NewCommand { get; set; } public ICommand ContinueCommand { get; set; } @@ -25,7 +25,7 @@ public partial class CheckListPage : ContentPage OnPropertyChanged(nameof(IsLoading)); } } - + public CheckListPage() { @@ -44,15 +44,21 @@ public partial class CheckListPage : ContentPage protected override async void OnAppearing() { base.OnAppearing(); - + BindingContext = this; await LoadCheckListTemplate(); await LoadCheckList(); } private async void OnNewItem(CheckListTemplateHeaderDTO checkListTemplateHeaderDTO) { - - //await Navigation.PushAsync(new CheckPointEditPage(checkPointDTO)); + IsLoading = true; + await _checkListService.StartNew( + new CheckListHeaderNewDTO() + { + UserId = _userService.GetCurrentUser().Id, + CheckListTemplateHeaderId = checkListTemplateHeaderDTO.Id + }); + IsLoading = false; } private async void OnContinueItem(CheckListHeaderDTO checkListHeaderDTO) { diff --git a/src/WorkFlowCheck.MAUI/Services/CheckListService.cs b/src/WorkFlowCheck.MAUI/Services/CheckListService.cs index 3f2e59b..2f5b099 100644 --- a/src/WorkFlowCheck.MAUI/Services/CheckListService.cs +++ b/src/WorkFlowCheck.MAUI/Services/CheckListService.cs @@ -56,7 +56,7 @@ namespace WorkFlowCheck.MAUI.Services return retVal; } - public async Task> StartNew(CheckListTemplateHeaderDTO checkListTemplateHeaderDTO) + public async Task> StartNew(CheckListHeaderNewDTO checkListHeaderNewDTO) { try { @@ -64,13 +64,7 @@ namespace WorkFlowCheck.MAUI.Services // Az API végpont meghatározása string endpoint = $"{_httpClient.BaseAddress}api/checklist/StartNewCheckList"; - // HTTP POST kérés küldése - ApiRequestDTO request = new ApiRequestDTO(); - request.UserDTO = _userService.GetCurrentUser(); - request.Data = checkListTemplateHeaderDTO; - - - using (HttpResponseMessage httpResponseMessage = await _httpClient.PostAsJsonAsync(endpoint, request)) + using (HttpResponseMessage httpResponseMessage = await _httpClient.PostAsJsonAsync(endpoint, checkListHeaderNewDTO)) { httpResponseMessage.EnsureSuccessStatusCode(); diff --git a/src/WorkFlowCheck.MAUI/Services/Interfaces/ICheckListService.cs b/src/WorkFlowCheck.MAUI/Services/Interfaces/ICheckListService.cs index 2a5ac8b..abd7fea 100644 --- a/src/WorkFlowCheck.MAUI/Services/Interfaces/ICheckListService.cs +++ b/src/WorkFlowCheck.MAUI/Services/Interfaces/ICheckListService.cs @@ -9,7 +9,7 @@ namespace WorkFlowCheck.MAUI.Services.Interfaces { public interface ICheckListService { - Task> StartNew(CheckListTemplateHeaderDTO checkListTemplateHeaderDTO); + Task> StartNew(CheckListHeaderNewDTO checkListHeaderNewDTO); Task> GetCheckPoint(int checkPointId); Task> GetCheckPoint(string checkPointCode); diff --git a/src/WorkFlowCheck.MAUI/Services/SyncService.cs b/src/WorkFlowCheck.MAUI/Services/SyncService.cs index a988969..8685882 100644 --- a/src/WorkFlowCheck.MAUI/Services/SyncService.cs +++ b/src/WorkFlowCheck.MAUI/Services/SyncService.cs @@ -262,9 +262,11 @@ namespace WorkFlowCheck.MAUI.Services await PrepareAuthenticatedRequestAsync(); var checkListHeader = await _dbContext.CheckListHeaders + .Where(w => w.Id == Id) .Include(i => i.CheckListRows) .AsNoTracking() - .ToListAsync(); + .FirstOrDefaultAsync(); + var checkListHeaderDTO = _mapper.Map(checkListHeader);