ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sende Button mehr logik - orga

Browse Source
This commit is contained in:
Rene Evertz
2024-10-18 16:09:17 +02:00
parent 37a215ac13
commit 915ebfbc6e
9 changed files with 120 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BeWo/Converter/TestDebugConverter.cs
View File

@@ -12,11 +12,6 @@ namespace BeWo.Converter
if (value is null)
return null;
if (value is InvoiceBaseVM invoice)
{
return invoice.IsGkvValidError;
}
return "Test";
}

11
BeWo/Converter/TooltipTextConverter.cs
View File

@@ -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;

36
BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
View File

@@ -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">
<Grid>
<GroupBox
x:Name="groupbox_editArea"
Grid.Row="0"
Margin="0"
Padding="0"
Header="GKV-Abrechnungen"
Style="{DynamicResource ObjectEditGroupBox}">
@@ -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." />
</StackPanel>
<Grid Grid.Column="2">
<Grid.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Grid.Resources>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" />
@@ -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}}" />
<Button
x:Name="button_reload"
Grid.Column="1"
@@ -104,6 +105,13 @@
VerticalAlignment="Stretch"
DataSource="{Binding VMList}"
Visibility="Visible">
<dxg:GridControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</dxg:GridControl.Resources>
<dxg:GridControl.Effect>
<DropShadowEffect Color="#FFC7D9E2" />
</dxg:GridControl.Effect>
@@ -123,7 +131,9 @@
Header=" ">
<dxg:GridColumn.DisplayTemplate>
<ControlTemplate>
<ControlTemplate.Resources />
<StackPanel Margin="1" Orientation="Horizontal">
<StackPanel.Resources />
<Button
x:Name="btn_details"
Width="20"
@@ -151,7 +161,9 @@
FontFamily="Wingdings"
FontSize="11"
Foreground="#ffffff"
ToolTip="Senden"
IsEnabled="{Binding Row.IsReady2Send}"
ToolTip="{Binding Row, Converter={StaticResource TooltipTextConverter}, ConverterParameter=Send}"
ToolTipService.ShowOnDisabled="True"
Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static shared:UserRightType.Finance_Gkv_Send}}" />
<Button
x:Name="btn_delete"

13
BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
View File

@@ -205,9 +205,7 @@ namespace BeWo.View.Detail.Accounting
{
var vm = datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
var dc = vm.CommitToDataContract();
var state = dc.GetState();
var state = vm.GetState();
var can_send = false;
@@ -318,12 +316,12 @@ namespace BeWo.View.Detail.Accounting
if (gkvAbrechnungVM is null)
return;
if (GkvAbrechnungVM.GetState(gkvAbrechnungVM) == GkvState.OldAndNoFeedback)
if (gkvAbrechnungVM.GkvState == GkvState.OldAndNoFeedback)
{
e.Result = Brushes.Orange;
e.Handled = true;
}
else if (GkvAbrechnungVM.GetState(gkvAbrechnungVM) == GkvState.Waiting4Urbelege)
else if (gkvAbrechnungVM.GkvState == GkvState.Waiting4Urbelege)
{
e.Result = Brushes.Green;
e.Handled = true;
@@ -386,5 +384,10 @@ namespace BeWo.View.Detail.Accounting
}
}
}
private void BeWoView_Loaded(object sender, RoutedEventArgs e)
{
_Viewmodel.FirePropertyChangedItself();
}
}
}

17
BeWo/ViewModel/AbstractBaseVM.cs
View File

@@ -50,9 +50,22 @@ namespace BeWo.ViewModel
}
//public bool HasLoggedOnUserRight(UserRightType type)
// {
// {
// return BeWoApp.HasLoggedOnUserRight(type);
// }
// }
public object Itself
{
get
{
return this;
}
}
public void FirePropertyChangedItself()
{
FirePropertyChanged(nameof(Itself));
}
protected virtual void FirePropertyChanged(string pPropertyName)
{

13
BeWo/ViewModel/BaseVM.cs
View File

@@ -8,17 +8,6 @@ namespace BeWo.ViewModel
{
public class BaseVM : AbstractBaseVM
{
public object Itself
{
get
{
return this;
}
}
public void FirePropertyChangedItself()
{
FirePropertyChanged(nameof(Itself));
}
}
}

52
BeWo/ViewModel/GkvAbrechnungVM.cs
View File

@@ -39,6 +39,9 @@ namespace BeWo.ViewModel
internal bool _IsChecked;
private bool _IsReady2Send;
private string _SendTooltip;
private List<InvoiceBaseVM> _InvoiceBases2;
private BindingList<InvoiceBaseVM> _InvoiceBases;
private OrganisationDC _Organisation;
@@ -206,7 +209,7 @@ namespace BeWo.ViewModel
[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
public GkvState GkvState
{
get { return GetState(this); }
get { return GetState(); }
}
public bool IsChecked
@@ -218,7 +221,7 @@ namespace BeWo.ViewModel
if (AreDifferent(_IsChecked, value))
{
_IsChecked = value;
FirePropertyChanged("IsChecked");
FirePropertyChanged(nameof(IsChecked));
}
}
}
@@ -336,6 +339,44 @@ namespace BeWo.ViewModel
}
}
public bool IsReady2Send
{
get { return _IsReady2Send; }
set
{
if (!AreDifferent(IsReady2Send, value))
return;
_IsReady2Send = value;
FirePropertyChanged(nameof(IsReady2Send));
}
}
public string SendTooltip
{
get { return _SendTooltip; }
set
{
if (!AreDifferent(SendTooltip, value))
return;
_SendTooltip = value;
FirePropertyChanged(nameof(SendTooltip));
}
}
public GkvState GetState()
{
return GkvAbrechnungExtensions.GetState(
this,
() => Bezahlt,
() => UrbelegeGesendet,
() => TransferProtokolle,
(x) => x.Fehlerdatum,
(x) => x.Fehlerlevel,
(x) => x.ErstelltAm.Value);
}
public static GkvState GetState(GkvAbrechnungVM vm)
{
@@ -393,6 +434,9 @@ namespace BeWo.ViewModel
}
_Organisation = pDataContract.Organisation;
_IsReady2Send = pDataContract.IsReady2Send;
_SendTooltip = pDataContract.SendTooltip;
}
protected override GkvAbrechnungDC MapToDataContract(GkvAbrechnungDC pDataContract, bool doCommit)
{
@@ -430,7 +474,6 @@ namespace BeWo.ViewModel
ServiceFacade.DoAccountingServiceAsync(s => s.SendNewGkvAbrechnung(req),
cb => Application.Current.Dispatch(() => Update(cb)), true);
}
public void Update(GkvAbrechnungSendResponseDC cb)
{
var dc = cb.GkvAbrechnungDC;
@@ -444,6 +487,9 @@ namespace BeWo.ViewModel
GkvAbrechnungVersion = dc.GkvAbrechnungVersion;
TransferProtokolle = dc.TransferProtokolle.ToList();
IsReady2Send = dc.IsReady2Send;
SendTooltip = dc.SendTooltip;
var protokoll = cb.TransferProtokoll;
if (protokoll.Fehlerlevel == GkvTransferFehlerlevel.Soft)

6
Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs
View File

@@ -1,6 +1,6 @@
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.GkvAbrechnung;
using NHibernate.Linq;
@@ -38,6 +38,10 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.TransferProtokolle = MapperFactory.GkvTransferProtokollDC_GkvTransferprotokoll.MapToNewDCs(pEntity.GkvTransferProtokolle);
var isready = DakotaValidator.IsOrganisationInformationValid(orga.IKDatenannahmestelle, orga.IKKostentrager, orga.IKKrankenkasse, orga.BezDatenannahmestelle);
pDataContract.IsReady2Send = isready;
pDataContract.SendTooltip = isready ? "Senden" : "Orga Fehler";
return pDataContract;
}

8
Shared/DataContracts/GkvAbrechnung/GkvAbrechnungDC.cs
View File

@@ -45,6 +45,12 @@ namespace BS.Shared.DataContracts.GkvAbrechnung
public OrganisationDC Organisation { get; set; }
[DataMember]
public IList<GkvTransferProtokollDC> TransferProtokolle { get; set; }
public IList<GkvTransferProtokollDC> TransferProtokolle { get; set; }
[DataMember]
public bool IsReady2Send { get; set; }
[DataMember]
public string SendTooltip { get; set; }
}
}