From 864c76f827103e1a636e001ae7750cc4299e6c90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Szab=C3=B3?= Date: Tue, 1 Jul 2025 10:47:47 +0200 Subject: [PATCH] =?UTF-8?q?BUGFIX=20Scroll=20jav=C3=ADt=C3=A1sa=201.1.035?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DTO/CheckListRowDTO.cs | 2 +- src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs | 2 +- .../Pages/CheckList/CheckListWorkPage.xaml | 20 +++++++------- .../Pages/CheckList/CheckListWorkPage.xaml.cs | 27 +++++++++++++++++++ 4 files changed, 39 insertions(+), 12 deletions(-) diff --git a/src/WorkFlowCheck.Common/DTO/CheckListRowDTO.cs b/src/WorkFlowCheck.Common/DTO/CheckListRowDTO.cs index 129476e..01b3d9e 100644 --- a/src/WorkFlowCheck.Common/DTO/CheckListRowDTO.cs +++ b/src/WorkFlowCheck.Common/DTO/CheckListRowDTO.cs @@ -14,7 +14,7 @@ namespace WorkFlowCheck.Common.DTO public int CheckListHeaderId { get; set; } public int CheckListTemplateRowId { get; set; } public CheckListTemplateRowDTO? CheckListTemplateRowDTO { get; set; } - public string GroupName => $"AnswerGroup_{CheckListTemplateRowDTO?.RowIndex ?? 0}"; + public string GroupName => $"AnswerGroup_{CheckListTemplateRowDTO?.Id ?? 0}"; [DisplayName("Eredmény")] public string Answer { get; set; } = null!; diff --git a/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs b/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs index 444266a..520e745 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.033"; + public static string ProgramVersion = "v1.1.035"; #if DEBUG //public static string ApiBaseUrl = $"http://10.0.2.2:59027/"; diff --git a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml index 7d968db..ff95f4c 100644 --- a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml +++ b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml @@ -104,14 +104,14 @@ Content="Igen" Value="Igen" BindableGroupName="{Binding GroupName}" - IsChecked="{Binding AnswerYes}" + IsChecked="{Binding AnswerYes, Mode=TwoWay}" HorizontalOptions="Center" VerticalOptions="Center"/> @@ -185,14 +185,14 @@ Content="Igen" Value="Igen" BindableGroupName="{Binding GroupName}" - IsChecked="{Binding AnswerYes}" + IsChecked="{Binding AnswerYes, Mode=TwoWay}" HorizontalOptions="Center" VerticalOptions="Center"/> @@ -219,14 +219,14 @@ Content="Igen" Value="Igen" BindableGroupName="{Binding GroupName}" - IsChecked="{Binding AnswerYes}" + IsChecked="{Binding AnswerYes, Mode=TwoWay}" HorizontalOptions="Center" VerticalOptions="Center"/> @@ -253,14 +253,14 @@ Content="Igen" Value="Igen" BindableGroupName="{Binding GroupName}" - IsChecked="{Binding AnswerYes}" + IsChecked="{Binding AnswerYes, Mode=TwoWay}" HorizontalOptions="Center" VerticalOptions="Center"/> @@ -287,14 +287,14 @@ Content="Igen" Value="Igen" BindableGroupName="{Binding GroupName}" - IsChecked="{Binding AnswerYes}" + IsChecked="{Binding AnswerYes, Mode=TwoWay}" HorizontalOptions="Center" VerticalOptions="Center"/> diff --git a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml.cs b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml.cs index d26043c..a68c7f9 100644 --- a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml.cs +++ b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml.cs @@ -239,6 +239,33 @@ public class BindableRadioButton : RadioButton radioButton.GroupName = newGroupName; } } + public BindableRadioButton() + { + CheckedChanged += OnCheckedChangedInternal; + } + private void OnCheckedChangedInternal(object sender, CheckedChangedEventArgs e) + { + if (e.Value && BindingContext is CheckListRowDTO dto) + { + if (Value?.ToString() == "Igen") + dto.Answer = "Igen"; + else if (Value?.ToString() == "Nem") + dto.Answer = "Nem"; + } + } + + protected override void OnBindingContextChanged() + { + base.OnBindingContextChanged(); + + if (BindingContext is CheckListRowDTO dto) + { + if (Value?.ToString() == "Igen") + IsChecked = dto.Answer == "Igen"; + else if (Value?.ToString() == "Nem") + IsChecked = dto.Answer == "Nem"; + } + } } public class ByteArrayToImageSourceConverter : IValueConverter {