From 3c394f632da4638759891a645a8cd1fad2dafabb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Szab=C3=B3?= <ivan.szabo.sis@gmail.com>
Date: Tue, 22 Apr 2025 14:17:11 +0200
Subject: [PATCH] =?UTF-8?q?Most=20m=C5=B1k=C3=B6dik=20egy=20tesztelhet?=
 =?UTF-8?q?=C5=91=20verzi=C3=B3.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs |  2 +
 src/WorkFlowCheck.MAUI/MainPage.xaml.cs       |  2 +-
 .../Pages/BaseStock/BaseStockPage.xaml.cs     |  2 +-
 .../Pages/CheckList/CheckListPage.xaml.cs     | 73 ++++++++++++++++---
 .../Pages/CheckList/CheckListWorkPage.xaml    |  2 +-
 .../Pages/CheckList/CheckListWorkPage.xaml.cs | 32 +++++---
 .../Pages/NFC/NFCTestPage.xaml.cs             |  2 +-
 .../Pages/Security/LoginPage.xaml.cs          |  3 +
 .../Pages/System/DownloadAPKPage.xaml.cs      |  2 +-
 .../Pages/System/SyncPage.xaml.cs             |  2 +-
 .../Services/CheckListService.cs              | 27 +++++++
 .../Services/Interfaces/ICheckListService.cs  |  3 +-
 12 files changed, 124 insertions(+), 28 deletions(-)

diff --git a/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs b/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs
index d8cf74c..1c8b173 100644
--- a/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs
+++ b/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs
@@ -17,6 +17,8 @@ namespace WorkFlowCheck.MAUI.Helper
     {
         public static string DatabaseName = "";
         public static bool Syncronised = false;
+        public static UserDTO SystemUserDTO;
+
 #if DEBUG
         public static string ApiBaseUrl = $"https://dev.wfcapi.nuvolar.hu/";
         public static string ApiKey = $"RUJeLSpSMzVASUdaRCEzUyYxRSE0VyFISFRSJC0zRzhLM1hCSDU=";
diff --git a/src/WorkFlowCheck.MAUI/MainPage.xaml.cs b/src/WorkFlowCheck.MAUI/MainPage.xaml.cs
index 93d1896..9ad3656 100644
--- a/src/WorkFlowCheck.MAUI/MainPage.xaml.cs
+++ b/src/WorkFlowCheck.MAUI/MainPage.xaml.cs
@@ -21,7 +21,7 @@ namespace WorkFlowCheck.MAUI
         {
             _currentUser = _userService.GetCurrentUser();
             DeviceId.Text = $"{_userService.DeviceId}";
-            UserInfo.Text = $"{_currentUser?.FirstName} {_currentUser?.LastName}";
+            UserInfo.Text = $"{_currentUser?.LastName} {_currentUser?.FirstName}";
         }
         override protected async void OnAppearing()
         {
diff --git a/src/WorkFlowCheck.MAUI/Pages/BaseStock/BaseStockPage.xaml.cs b/src/WorkFlowCheck.MAUI/Pages/BaseStock/BaseStockPage.xaml.cs
index 2ff9ca1..4be65fc 100644
--- a/src/WorkFlowCheck.MAUI/Pages/BaseStock/BaseStockPage.xaml.cs
+++ b/src/WorkFlowCheck.MAUI/Pages/BaseStock/BaseStockPage.xaml.cs
@@ -19,7 +19,7 @@ public partial class BaseStockPage : ContentPage
     {
         _currentUser = _userService.GetCurrentUser();
         DeviceId.Text = _userService.DeviceId;
-        UserInfo.Text = $"{_currentUser?.FirstName} {_currentUser?.LastName}";
+        UserInfo.Text = $"{_currentUser?.LastName} {_currentUser?.FirstName}";
     }
 
     override protected async void OnAppearing()
diff --git a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs
index d4f83fd..81b0035 100644
--- a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs
+++ b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using System.Windows.Input;
 using WorkFlowCheck.Common.DTO;
 using WorkFlowCheck.Common.Enums;
+using WorkFlowCheck.MAUI.Helper;
 using WorkFlowCheck.MAUI.Pages.NFC;
 using WorkFlowCheck.MAUI.Services.Interfaces;
 
@@ -26,7 +27,7 @@ public partial class CheckListPage : ContentPage
     public ICommand UnblockCommand { get; set; }
     public ICommand BlockCommand { get; set; }
     public ICommand AcceptCommand { get; set; }
-    
+
     public bool IsLoading
     {
         get => _isLoading;
@@ -57,8 +58,8 @@ public partial class CheckListPage : ContentPage
         UnblockCommand = new Command<CheckListHeaderDTO>(OnUnblockItem);
         BlockCommand = new Command<CheckListHeaderDTO>(OnBlockItem);
         AcceptCommand = new Command<CheckListHeaderDTO>(OnAcceptItem);
-        
-        
+
+
     }
     private void SetInfo()
     {
@@ -132,15 +133,36 @@ public partial class CheckListPage : ContentPage
     }
     private async void OnContinueItem(CheckListHeaderDTO checkListHeaderDTO)
     {
-        var checkPointCode = await NFCWaiter.ShowModalAsync();
-        if (!string.IsNullOrEmpty(checkPointCode))
+        if (CrossNFC.IsSupported && CrossNFC.Current.IsAvailable)
         {
-            if (Navigation.ModalStack.Count > 0)
+            var checkPointCode = await NFCWaiter.ShowModalAsync();
+            if (!string.IsNullOrEmpty(checkPointCode))
             {
-                await Navigation.PopModalAsync();
+                if (Navigation.ModalStack.Count > 0)
+                {
+                    await Navigation.PopModalAsync();
+                }
+
+                await Navigation.PushAsync(new CheckListWorkPage(checkListHeaderDTO.Id, checkPointCode));
+            }
+        }
+        else
+        {
+            // Ha nincs NFC, akkor az utoljára beküldött és a sorrendben lévő checkpointra ugrik
+            var nextCheckPoint = await _checkListService.GetNextCheckpointNotSend(checkListHeaderDTO);
+            if (nextCheckPoint != null && nextCheckPoint.Id > 0)
+            {
+                if (!string.IsNullOrEmpty(nextCheckPoint.Code))
+                {
+                    if (Navigation.ModalStack.Count > 0)
+                    {
+                        await Navigation.PopModalAsync();
+                    }
+
+                    await Navigation.PushAsync(new CheckListWorkPage(checkListHeaderDTO.Id, nextCheckPoint.Code));
+                }
             }
 
-            await Navigation.PushAsync(new CheckListWorkPage(checkListHeaderDTO.Id, checkPointCode));
         }
     }
     private async void OnUnblockItem(CheckListHeaderDTO checkListHeaderDTO)
@@ -211,7 +233,16 @@ public class BlockedConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        if (value is CheckStatus status)
+        var canEnableBlocked = false;
+        foreach (var roleDTO in SystemHelper.SystemUserDTO.RoleDTO)
+        {
+            if (roleDTO.CanEnableBlocked)
+            {
+                canEnableBlocked = true;
+                break;
+            }
+        }
+        if (value is CheckStatus status && canEnableBlocked)
         {
             return status == CheckStatus.InProgress;
         }
@@ -227,9 +258,18 @@ public class UnBlockedConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
+        var canEnableBlocked = false;
+        foreach (var roleDTO in SystemHelper.SystemUserDTO.RoleDTO)
+        {
+            if (roleDTO.CanEnableBlocked)
+            {
+                canEnableBlocked = true;
+                break;
+            }
+        }
         if (value is CheckStatus status)
         {
-            if (status == CheckStatus.Blocked)
+            if (status == CheckStatus.Blocked && canEnableBlocked)
             {
                 return true;
             }
@@ -247,7 +287,7 @@ public class ContinueConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        if (value is CheckStatus status && CrossNFC.IsSupported && CrossNFC.Current.IsAvailable)
+        if (value is CheckStatus status)
         {
             if (status == CheckStatus.InProgress || status == CheckStatus.Open)
             {
@@ -267,7 +307,16 @@ public class AcceptConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        if (value is CheckStatus status)
+        var canEnableBlocked = false;
+        foreach (var roleDTO in SystemHelper.SystemUserDTO.RoleDTO)
+        {
+            if (roleDTO.CanEnableBlocked)
+            {
+                canEnableBlocked = true;
+                break;
+            }
+        }
+        if (value is CheckStatus status && canEnableBlocked)
         {
             if (status == CheckStatus.Sent)
             {
diff --git a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml
index eda4002..9bb60ed 100644
--- a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml
+++ b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml
@@ -8,7 +8,7 @@
              Title="">
     <Shell.TitleView>
         <Grid Padding="2" VerticalOptions="Center">
-            <Label Text=""
+            <Label x:Name="HeaderLabel" Text=""
                FontSize="22"
                FontAttributes="Bold"
                VerticalOptions="Center"
diff --git a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml.cs b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml.cs
index f51c3b1..2e21ae6 100644
--- a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml.cs
+++ b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml.cs
@@ -12,10 +12,11 @@ public partial class CheckListWorkPage : ContentPage
 {
     private readonly ICheckListService _checkListService;
     private readonly ISyncService _syncService;
+    private readonly IUserService _userService;
 
     private string _checkPointCode;
     private int _checkListHeaderId;
-    private UserDTO _userDTO;
+    private UserDTO _currentUser;
     private bool _isLoading;
 
 
@@ -40,12 +41,25 @@ public partial class CheckListWorkPage : ContentPage
         _checkListHeaderId = checkListHeaderId;
         _checkListService = MauiProgram.ServiceProvider.GetRequiredService<ICheckListService>();
         _syncService = MauiProgram.ServiceProvider.GetRequiredService<ISyncService>();
-        _userDTO = MauiProgram.ServiceProvider.GetRequiredService<IUserService>().GetCurrentUser();
+        _userService = MauiProgram.ServiceProvider.GetRequiredService<IUserService>();
 
         SaveCommand = new Command(OnSave);
         SendCommand = new Command(OnSend);
     }
+    private async Task SetInfo()
+    {
+        _currentUser = _userService.GetCurrentUser();
+        DeviceId.Text = _userService.DeviceId;
+        UserInfo.Text = $"{_currentUser?.LastName} {_currentUser?.FirstName}";
 
+        var checkPoint = await _checkListService.GetCheckPoint(_checkPointCode);
+
+        if (checkPoint != null && checkPoint.IsSuccess)
+        {
+            HeaderLabel.Text = checkPoint.Data.ShortName;
+        }
+
+    }
     private async void OnSend()
     {
         IsLoading = true;
@@ -55,8 +69,6 @@ public partial class CheckListWorkPage : ContentPage
         {
             OnSave();
 
-
-
             await Task.Run(async () =>
             {
                 var result = await _syncService.SyncCheckListHeader_Up(_checkListHeaderId, (percentage, infostring) =>
@@ -72,8 +84,7 @@ public partial class CheckListWorkPage : ContentPage
                 {
                     if (Navigation.ModalStack.Count > 0)
                     {
-                        //await Navigation.PopModalAsync();
-                        await Shell.Current.GoToAsync("//CheckListPage");
+                        await Navigation.PopModalAsync();
                     }
                 }
                 else
@@ -83,7 +94,8 @@ public partial class CheckListWorkPage : ContentPage
             });
 
             progressLabel.Text = "Szinkronizálás befejezve!";
-
+            await Shell.Current.GoToAsync("//CheckListPage");
+            
         }
         catch (Exception ex)
         {
@@ -132,9 +144,11 @@ public partial class CheckListWorkPage : ContentPage
     protected override async void OnAppearing()
     {
         base.OnAppearing();
+        BindingContext = this;
+        await SetInfo();
         CreatePhoto = new Command<CheckListRowDTO>(OnTakePhoto);
         await LoadCheckPointCheckListRows();
-        BindingContext = this;
+
     }
     private async void OnTakePhoto(CheckListRowDTO checkListRowDTO)
     {
@@ -188,7 +202,7 @@ public partial class CheckListWorkPage : ContentPage
         IsLoading = true;
 
         CheckListRows.Clear();
-        var checkListRowDTOs = await _checkListService.GetCheckListRowsByCheckPointCode(_userDTO.Id, _checkListHeaderId, _checkPointCode);
+        var checkListRowDTOs = await _checkListService.GetCheckListRowsByCheckPointCode(_currentUser.Id, _checkListHeaderId, _checkPointCode);
         foreach (var item in checkListRowDTOs)
         {
             if (item.Answer == "Igen")
diff --git a/src/WorkFlowCheck.MAUI/Pages/NFC/NFCTestPage.xaml.cs b/src/WorkFlowCheck.MAUI/Pages/NFC/NFCTestPage.xaml.cs
index 987627d..26e8f72 100644
--- a/src/WorkFlowCheck.MAUI/Pages/NFC/NFCTestPage.xaml.cs
+++ b/src/WorkFlowCheck.MAUI/Pages/NFC/NFCTestPage.xaml.cs
@@ -22,7 +22,7 @@ public partial class NFCTestPage : ContentPage
     {
         _currentUser = _userService.GetCurrentUser();
         DeviceId.Text = _userService.DeviceId;
-        UserInfo.Text = $"{_currentUser?.FirstName} {_currentUser?.LastName}";
+        UserInfo.Text = $"{_currentUser?.LastName} {_currentUser?.FirstName}";
     }
     public ObservableCollection<NFCData> NFCDataList { get; set; }
     public ICommand RefreshCommand { get; set; }
diff --git a/src/WorkFlowCheck.MAUI/Pages/Security/LoginPage.xaml.cs b/src/WorkFlowCheck.MAUI/Pages/Security/LoginPage.xaml.cs
index 719ace9..ee479f0 100644
--- a/src/WorkFlowCheck.MAUI/Pages/Security/LoginPage.xaml.cs
+++ b/src/WorkFlowCheck.MAUI/Pages/Security/LoginPage.xaml.cs
@@ -1,6 +1,7 @@
 using CommunityToolkit.Maui.Alerts;
 using CommunityToolkit.Maui.Core;
 using System.Drawing;
+using WorkFlowCheck.MAUI.Helper;
 using WorkFlowCheck.MAUI.Pages.NFC;
 using WorkFlowCheck.MAUI.Services.Interfaces;
 
@@ -32,6 +33,8 @@ public partial class LoginPage : BasePage
             {
                 _userService.SetCurrentUser(response.Data);
 
+                SystemHelper.SystemUserDTO = response.Data; 
+
                 //await _syncService.SyncDatas();
 
                 var wFCUser = Newtonsoft.Json.JsonConvert.SerializeObject(response.Data);
diff --git a/src/WorkFlowCheck.MAUI/Pages/System/DownloadAPKPage.xaml.cs b/src/WorkFlowCheck.MAUI/Pages/System/DownloadAPKPage.xaml.cs
index 9792aad..c855391 100644
--- a/src/WorkFlowCheck.MAUI/Pages/System/DownloadAPKPage.xaml.cs
+++ b/src/WorkFlowCheck.MAUI/Pages/System/DownloadAPKPage.xaml.cs
@@ -24,7 +24,7 @@ public partial class DownloadAPKPage : ContentPage
     {
         _currentUser = _userService.GetCurrentUser();
         DeviceId.Text = _userService.DeviceId;
-        UserInfo.Text = $"{_currentUser?.FirstName} {_currentUser?.LastName}";
+        UserInfo.Text = $"{_currentUser?.LastName} {_currentUser?.FirstName}";
     }
     private async void OnSyncClicked(object sender, EventArgs e)
     {
diff --git a/src/WorkFlowCheck.MAUI/Pages/System/SyncPage.xaml.cs b/src/WorkFlowCheck.MAUI/Pages/System/SyncPage.xaml.cs
index 6d1c863..99ba640 100644
--- a/src/WorkFlowCheck.MAUI/Pages/System/SyncPage.xaml.cs
+++ b/src/WorkFlowCheck.MAUI/Pages/System/SyncPage.xaml.cs
@@ -26,7 +26,7 @@ public partial class SyncPage : ContentPage
     {
         _currentUser = _userService.GetCurrentUser();
         DeviceId.Text = _userService.DeviceId;
-        UserInfo.Text = $"{_currentUser?.FirstName} {_currentUser?.LastName}";
+        UserInfo.Text = $"{_currentUser?.LastName} {_currentUser?.FirstName}";
     }
     private async void OnSyncClicked(object sender, EventArgs e)
     {
diff --git a/src/WorkFlowCheck.MAUI/Services/CheckListService.cs b/src/WorkFlowCheck.MAUI/Services/CheckListService.cs
index 5b3ec8a..fd33a3d 100644
--- a/src/WorkFlowCheck.MAUI/Services/CheckListService.cs
+++ b/src/WorkFlowCheck.MAUI/Services/CheckListService.cs
@@ -267,6 +267,33 @@ namespace WorkFlowCheck.MAUI.Services
             {
 
 
+            }
+            return retVal;
+        }
+
+        public async Task<CheckPointDTO> GetNextCheckpointNotSend(CheckListHeaderDTO checkListHeaderDTO)
+        {
+            var retVal = new CheckPointDTO();
+            try
+            {
+                var firstUnansweredCheckPoint = await _dbContext.CheckListRows
+                                                                .Include(i => i.CheckListTemplateRow)
+                                                                    .ThenInclude(i => i.CheckPoint)
+                                                                .Where(w => w.CheckListHeaderId == checkListHeaderDTO.Id
+                                                                         && string.IsNullOrEmpty(w.Answer.Trim()))
+                                                                .Select(w => w.CheckListTemplateRow.CheckPoint)
+                                                                .OrderBy(cp => cp.ShortName)
+                                                                .FirstOrDefaultAsync();
+
+                if (firstUnansweredCheckPoint != null)
+                {
+                    retVal = _mapper.Map<CheckPointDTO>(firstUnansweredCheckPoint);
+                }
+            }
+            catch (Exception ex)
+            {
+
+
             }
             return retVal;
         }
diff --git a/src/WorkFlowCheck.MAUI/Services/Interfaces/ICheckListService.cs b/src/WorkFlowCheck.MAUI/Services/Interfaces/ICheckListService.cs
index a014cf4..a80d423 100644
--- a/src/WorkFlowCheck.MAUI/Services/Interfaces/ICheckListService.cs
+++ b/src/WorkFlowCheck.MAUI/Services/Interfaces/ICheckListService.cs
@@ -21,6 +21,7 @@ namespace WorkFlowCheck.MAUI.Services.Interfaces
 
         Task<bool> UnBlockCheckListHeader(CheckListHeaderDTO checkListHeaderDTO);
         Task<bool> BlockCheckListHeader(CheckListHeaderDTO checkListHeaderDTO);
-        Task<bool> AcceptCheckListHeader(CheckListHeaderDTO checkListHeaderDTO);    
+        Task<bool> AcceptCheckListHeader(CheckListHeaderDTO checkListHeaderDTO); 
+        Task<CheckPointDTO> GetNextCheckpointNotSend(CheckListHeaderDTO checkListHeaderDTO);    
     }
 }