From 400a459479987f4c14198cb838d9d83bc61b0f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Szab=C3=B3?= Date: Fri, 6 Jun 2025 08:46:12 +0200 Subject: [PATCH] Itt maradt --- src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs | 2 +- .../Pages/CheckList/CheckListPage.xaml.cs | 10 +++++++--- src/WorkFlowCheck.MAUI/Services/CheckListService.cs | 3 ++- src/WorkFlowCheck.MAUI/release.cmd | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs b/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs index e099ff0..a07517b 100644 --- a/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs +++ b/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs @@ -19,7 +19,7 @@ namespace WorkFlowCheck.MAUI.Helper public static string DatabaseName = ""; public static bool Syncronised = false; public static UserDTO SystemUserDTO; - public static string ProgramVersion = "v1.1.025"; + public static string ProgramVersion = "v1.1.027"; #if DEBUG public static string ApiBaseUrl = $"https://dev.wfcapi.nuvolar.hu/"; diff --git a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs index 64a902a..ac975af 100644 --- a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs +++ b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs @@ -251,7 +251,7 @@ public partial class CheckListPage : ContentPage } else { - + await SystemHelper.ShowSnackBar("Blokkolás feloldás SIKERTELEN!", SystemHelper.ColorToHex(Colors.Red), SystemHelper.ColorToHex(Colors.Red), @@ -293,7 +293,7 @@ public partial class CheckListPage : ContentPage var popup = new InputPopup("Kérem adja meg a lezárás okát!"); var (isConfirmed, userInput) = await popup.ShowAsync(); - + if (isConfirmed && !string.IsNullOrEmpty(userInput)) { var checkListHeaderCloseDTO = new CheckListHeaderCloseDTO() @@ -384,7 +384,11 @@ public partial class CheckListPage : ContentPage if (!isAdmin) { var result = checkListHeaderDTOs - .Where(w => w.UserId == userDTO.Id && w.CheckStatus != CheckStatus.Blocked).ToList(); + .Where(w => w.UserId == userDTO.Id && + //w.CheckStatus != CheckStatus.Blocked && + w.CheckStatus != CheckStatus.Sent && + w.CheckStatus != CheckStatus.Closed + ).ToList(); CheckList.ItemsSource = result; } diff --git a/src/WorkFlowCheck.MAUI/Services/CheckListService.cs b/src/WorkFlowCheck.MAUI/Services/CheckListService.cs index 0567d5c..762dcc6 100644 --- a/src/WorkFlowCheck.MAUI/Services/CheckListService.cs +++ b/src/WorkFlowCheck.MAUI/Services/CheckListService.cs @@ -99,7 +99,8 @@ namespace WorkFlowCheck.MAUI.Services .Include(i => i.CheckListTemplateHeader) .Where(w => w.CheckStatus == CheckStatus.Open || w.CheckStatus == CheckStatus.InProgress || - w.CheckStatus == CheckStatus.Blocked) + w.CheckStatus == CheckStatus.Blocked || + w.CheckStatus == CheckStatus.Sent) .ToListAsync(); retVal = _mapper.Map>(res); } diff --git a/src/WorkFlowCheck.MAUI/release.cmd b/src/WorkFlowCheck.MAUI/release.cmd index 66e5ab6..377e17d 100644 --- a/src/WorkFlowCheck.MAUI/release.cmd +++ b/src/WorkFlowCheck.MAUI/release.cmd @@ -1,2 +1,2 @@ -dotnet publish -f net8.0-android -c Release -p:AndroidPackageFormat=apk +dotnet publish -f net8.0-android -c Release -p:AndroidPackageFormat=apk pause \ No newline at end of file