From 915ebfbc6eb32a29ff9bf38e4cf5adf226087bbe Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Fri, 18 Oct 2024 16:09:17 +0200 Subject: [PATCH] Sende Button mehr logik - orga --- BeWo/Converter/TestDebugConverter.cs | 5 -- BeWo/Converter/TooltipTextConverter.cs | 11 ++++ .../Accounting/GkvAbrechnungOverview.xaml | 36 ++++++++----- .../Accounting/GkvAbrechnungOverview.xaml.cs | 13 +++-- BeWo/ViewModel/AbstractBaseVM.cs | 17 +++++- BeWo/ViewModel/BaseVM.cs | 13 +---- BeWo/ViewModel/GkvAbrechnungVM.cs | 52 +++++++++++++++++-- .../GkvAbrechnungDC_GkvAbrechnung.cs | 6 ++- .../GkvAbrechnung/GkvAbrechnungDC.cs | 8 ++- 9 files changed, 120 insertions(+), 41 deletions(-) diff --git a/BeWo/Converter/TestDebugConverter.cs b/BeWo/Converter/TestDebugConverter.cs index a5feb66c2..9bff02a21 100644 --- a/BeWo/Converter/TestDebugConverter.cs +++ b/BeWo/Converter/TestDebugConverter.cs @@ -12,11 +12,6 @@ namespace BeWo.Converter if (value is null) return null; - if (value is InvoiceBaseVM invoice) - { - return invoice.IsGkvValidError; - } - return "Test"; } diff --git a/BeWo/Converter/TooltipTextConverter.cs b/BeWo/Converter/TooltipTextConverter.cs index 4f32fc124..d3dd67712 100644 --- a/BeWo/Converter/TooltipTextConverter.cs +++ b/BeWo/Converter/TooltipTextConverter.cs @@ -13,6 +13,17 @@ namespace BeWo.Converter { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { + if(value is GkvAbrechnungVM gkv) + { + if (parameter is string s) + { + if (s == "Send") + { + return gkv.SendTooltip; + } + } + } + if (value is InvoiceBaseVM invoice) { return invoice.IsGkvValidError; diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml index b5b1c5d9d..4a1a6d0fe 100644 --- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml +++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml @@ -2,30 +2,24 @@ x:Class="BeWo.View.Detail.Accounting.GkvAbrechnungOverview" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic" - xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" xmlns:localView="clr-namespace:BeWo.View" - xmlns:localViewDetail="clr-namespace:BeWo.View.Detail.Accounting" - xmlns:localViewModel="clr-namespace:BeWo.ViewModel" xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" - xmlns:proxy="clr-namespace:BeWo.ServiceProxy" - xmlns:r="clr-namespace:BeWo.Security" - xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:shared="clr-namespace:BS.Shared;assembly=BS.Shared" - xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" - xmlns:val="clr-namespace:BeWo.Validation" Width="Auto" Height="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" - Focusable="True"> + Focusable="True" + Loaded="BeWoView_Loaded"> @@ -68,6 +62,13 @@ ToolTip="Filtert die angezeigten GKV-Abrechnungen nach ihrem Abrechnungszeitraum. Es werden alle Abrechnungen angezeigt, die den ausgewählten Monat bzw. Jahr beinhalten." /> + + + + + + + @@ -82,7 +83,7 @@ Click="NewButton_OnClick" Content="Neue Abrechnung" ToolTip="Neue GKV-Abrechnung erstellen" - Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static shared:UserRightType.Finance_Gkv_Create}}" /> + Visibility="{Binding Path=Itself, Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static shared:UserRightType.Finance_Gkv_Create}}" />