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

Organisation Verfahrensstufe

Browse Source
This commit is contained in:
Rene Evertz
2024-10-09 15:04:33 +02:00
parent 7f19262220
commit 34bea0e059
14 changed files with 1207 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BeWo/BeWo.csproj
View File

@@ -984,6 +984,7 @@
<Compile Include="Converter\BoolVisibilityMultiConverter.cs" /> <Compile Include="Converter\BoolVisibilityMultiConverter.cs" />
<Compile Include="Converter\NullableBoolToBoolConverter.cs" /> <Compile Include="Converter\NullableBoolToBoolConverter.cs" />
<Compile Include="Converter\Object2ToStringConverter.cs" /> <Compile Include="Converter\Object2ToStringConverter.cs" />
<Compile Include="Converter\RadioBoolToIntConverter.cs" />
<Compile Include="Converter\TestDebugConverter.cs" /> <Compile Include="Converter\TestDebugConverter.cs" />
<Compile Include="Converter\ParticipationBrushConverter.cs" /> <Compile Include="Converter\ParticipationBrushConverter.cs" />
<Compile Include="Converter\ArchiveRight2VisibilityConverter.cs" /> <Compile Include="Converter\ArchiveRight2VisibilityConverter.cs" />

2
BeWo/BeWo.csproj.user
View File

@@ -9,7 +9,7 @@
<ErrorReportUrlHistory /> <ErrorReportUrlHistory />
<FallbackCulture>de-DE</FallbackCulture> <FallbackCulture>de-DE</FallbackCulture>
<VerifyUploadedFiles>false</VerifyUploadedFiles> <VerifyUploadedFiles>false</VerifyUploadedFiles>
<ProjectView>ShowAllFiles</ProjectView> <ProjectView>ProjectFiles</ProjectView>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<EnableSecurityDebugging>false</EnableSecurityDebugging> <EnableSecurityDebugging>false</EnableSecurityDebugging>

1
BeWo/BeWoApp.xaml
View File

@@ -88,6 +88,7 @@
<conv:DeleteForGoodRight2VisibilityConverter x:Key="DeleteForGoodRight2VisibilityConverter" /> <conv:DeleteForGoodRight2VisibilityConverter x:Key="DeleteForGoodRight2VisibilityConverter" />
<conv:AnonymizationRight2VisibilityConverter x:Key="AnonymizationRight2VisibilityConverter" /> <conv:AnonymizationRight2VisibilityConverter x:Key="AnonymizationRight2VisibilityConverter" />
<conv:GkvState2StringConverter x:Key="GkvState2StringConverter" /> <conv:GkvState2StringConverter x:Key="GkvState2StringConverter" />
<conv:RadioBoolToIntConverter x:Key="RadioBoolToIntConverter" />
<conv:EnumTranslationConverter x:Key="EnumTranslationConverter" /> <conv:EnumTranslationConverter x:Key="EnumTranslationConverter" />
<Style x:Key="SupportConceptDetailStyle" TargetType="{x:Type ListBoxItem}"> <Style x:Key="SupportConceptDetailStyle" TargetType="{x:Type ListBoxItem}">

23
BeWo/Converter/RadioBoolToIntConverter.cs Normal file
View File

@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data;
namespace BeWo.Converter
{
public class RadioBoolToIntConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
return value?.Equals(int.Parse(parameter.ToString()));
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
return value?.Equals(true) == true ? int.Parse(parameter.ToString()) : Binding.DoNothing;
}
}
}

293
BeWo/View/CostRatePeriodControl.xaml
View File

@@ -1,28 +1,52 @@
<UserControl xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" <UserControl
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" x:Class="BeWo.View.CostRatePeriodControl" VerticalAlignment="Top" x:Name="UserControl" Background="{x:Null}"> x:Class="BeWo.View.CostRatePeriodControl"
<UserControl.Resources> xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
<DataTemplate x:Key="CostRateItemTemplate"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
<Border BorderThickness="0 1 0 0" BorderBrush="Gray" Margin="0 2 0 0"> xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
<Grid Grid.Row="2" Grid.ColumnSpan="2" Margin="0 2 0 0"> x:Name="UserControl"
<Grid.ColumnDefinitions> VerticalAlignment="Top"
<ColumnDefinition Width="Auto" SharedSizeGroup="c1" /> Background="{x:Null}">
<ColumnDefinition Width="Auto" SharedSizeGroup="c2" /> <UserControl.Resources>
<ColumnDefinition Width="*" /> <DataTemplate x:Key="CostRateItemTemplate">
</Grid.ColumnDefinitions> <Border
<Grid.RowDefinitions> Margin="0,2,0,0"
<RowDefinition Height="Auto" /> BorderBrush="Gray"
<RowDefinition Height="Auto" /> BorderThickness="0,1,0,0">
</Grid.RowDefinitions> <Grid
<Grid> Grid.Row="2"
<Grid.ColumnDefinitions> Grid.ColumnSpan="2"
<ColumnDefinition Width="*" /> Margin="0,2,0,0">
<ColumnDefinition Width="Auto" /> <Grid.ColumnDefinitions>
</Grid.ColumnDefinitions> <ColumnDefinition Width="Auto" SharedSizeGroup="c1" />
<TextBlock Text="Gültig bis" Margin="0,4,3,0" /> <ColumnDefinition Width="Auto" SharedSizeGroup="c2" />
<dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" x:Name="datepicker_validUntil" EditValue="{Binding Path=EndDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Height="23" /> <ColumnDefinition Width="*" />
</Grid> </Grid.ColumnDefinitions>
<dxe:TextEdit Height="23" HorizontalAlignment="Stretch" MaskType="Numeric" MaskUseAsDisplayFormat="True" Grid.Column="1" Margin="3,0,0,0" EditValue="{Binding Path=CostRateValue, UpdateSourceTrigger=PropertyChanged}" <Grid.RowDefinitions>
Mask="########0.00##"/> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TextBlock Margin="0,4,3,0" Text="Gültig bis" />
<dxe:DateEdit
x:Name="datepicker_validUntil"
Grid.Column="1"
Height="23"
EditValue="{Binding Path=EndDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
MaskType="DateTimeAdvancingCaret" />
</Grid>
<dxe:TextEdit
Grid.Column="1"
Height="23"
Margin="3,0,0,0"
HorizontalAlignment="Stretch"
EditValue="{Binding Path=CostRateValue, UpdateSourceTrigger=PropertyChanged}"
Mask="########0.00##"
MaskType="Numeric"
MaskUseAsDisplayFormat="True" />
<!--<dxe:TextEdit Height="23" HorizontalAlignment="Stretch" MaskType="Numeric" MaskUseAsDisplayFormat="True" Grid.Column="1" Margin="3,0,0,0" EditValue="{Binding Path=CostRateValue, UpdateSourceTrigger=PropertyChanged}" > <!--<dxe:TextEdit Height="23" HorizontalAlignment="Stretch" MaskType="Numeric" MaskUseAsDisplayFormat="True" Grid.Column="1" Margin="3,0,0,0" EditValue="{Binding Path=CostRateValue, UpdateSourceTrigger=PropertyChanged}" >
<dxe:TextEdit.Mask> <dxe:TextEdit.Mask>
<MultiBinding Converter="{StaticResource CostRatePeriodValueConverter}" UpdateSourceTrigger="PropertyChanged"> <MultiBinding Converter="{StaticResource CostRatePeriodValueConverter}" UpdateSourceTrigger="PropertyChanged">
@@ -33,59 +57,168 @@
</MultiBinding> </MultiBinding>
</dxe:TextEdit.Mask> </dxe:TextEdit.Mask>
</dxe:TextEdit>--> </dxe:TextEdit>-->
<TextBlock Padding="0 4 0 0" Height="23" x:Name="lblOldUnitName" Text="{Binding Text, ElementName=lblActualUnitName}" Grid.Row="1" Visibility="{Binding Visibility, ElementName=lblActualUnitName}" /> <TextBlock
<TextBox Height="23" x:Name="txtOldUnitName" Grid.Row="1" Text="{Binding UnitName, UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding Visibility, ElementName=lblActualUnitName}" Grid.Column="1" Margin="3,3,0,0" HorizontalAlignment="Stretch" /> x:Name="lblOldUnitName"
<Button x:Name="button_deleteCostRatePeriod" Grid.RowSpan="2" VerticalAlignment="Bottom" Grid.Column="2" Width="20" Height="20" HorizontalAlignment="Right" Style="{DynamicResource CloseButtonStyle}" Click="button_deleteCostRatePeriod_Click" Margin="3,0,0,3" /> Grid.Row="1"
</Grid> Height="23"
</Border> Padding="0,4,0,0"
</DataTemplate> Text="{Binding Text, ElementName=lblActualUnitName}"
</UserControl.Resources> Visibility="{Binding Visibility, ElementName=lblActualUnitName}" />
<Grid x:Name="LayoutRoot" Grid.IsSharedSizeScope="True"> <TextBox
<Border x:Name="border" BorderBrush="#FF6A6A6A" BorderThickness="0" Padding="0"> x:Name="txtOldUnitName"
<Grid> Grid.Row="1"
<Grid.RowDefinitions> Grid.Column="1"
<RowDefinition Height="Auto" /> Height="23"
<RowDefinition Height="Auto" /> Margin="3,3,0,0"
</Grid.RowDefinitions> HorizontalAlignment="Stretch"
<Grid Margin="3 0"> Text="{Binding UnitName, UpdateSourceTrigger=PropertyChanged}"
<Grid.ColumnDefinitions> Visibility="{Binding Visibility, ElementName=lblActualUnitName}" />
<ColumnDefinition Width="Auto" MinWidth="160" SharedSizeGroup="c1" /> <Button
<ColumnDefinition Width="Auto" MinWidth="70" SharedSizeGroup="c2" /> x:Name="button_deleteCostRatePeriod"
<ColumnDefinition Width="*" /> Grid.RowSpan="2"
</Grid.ColumnDefinitions> Grid.Column="2"
<Grid.RowDefinitions> Width="20"
<RowDefinition Height="Auto" /> Height="20"
<RowDefinition Height="Auto" /> Margin="3,0,0,3"
<RowDefinition Height="Auto" /> HorizontalAlignment="Right"
</Grid.RowDefinitions> VerticalAlignment="Bottom"
<TextBlock Height="23" x:Name="lblActualValue" Text="Aktueller Stundensatz (€)" Padding="0,4,0,0" /> Click="button_deleteCostRatePeriod_Click"
<TextBlock Height="23" Padding="0 4 0 0" x:Name="lblActualUnitName" Text="UnitName" Grid.Row="1" Visibility="Collapsed" /> Style="{DynamicResource CloseButtonStyle}" />
<TextBlock x:Name="lblValidUntil" Text="(gültig ab 01.01.2009)" Grid.Row="2" Margin="0,-3,0,0" /> </Grid>
<TextBox Height="23" x:Name="txtActualUnitName" Text="{Binding UnitName, UpdateSourceTrigger=PropertyChanged}" Visibility="Collapsed" Grid.Column="1" Grid.Row="1" Margin="3,3,0,0" HorizontalAlignment="Stretch" /> </Border>
<dxe:TextEdit Height="23" HorizontalAlignment="Stretch" MaskType="Numeric" MaskUseAsDisplayFormat="True" Grid.Column="1" Margin="3,0,0,0" EditValue="{Binding Path=CostRateValue, UpdateSourceTrigger=PropertyChanged}" </DataTemplate>
Mask="########0.00##"/> </UserControl.Resources>
<Grid x:Name="LayoutRoot" Grid.IsSharedSizeScope="True">
<Border
<Button x:Name="button_addCostRatePeriod" HorizontalAlignment="Center" Grid.Column="2" Width="21" Height="21" Margin="3,0,0,0" VerticalAlignment="Center" Click="button_addCostRatePeriod_Click"> x:Name="border"
<Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center"> Padding="0"
<Line X1="4" X2="12" Y1="8" Y2="8" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" /> BorderBrush="#FF6A6A6A"
<Line X1="8" X2="8" Y1="4" Y2="12" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" /> BorderThickness="0">
</Grid> <Grid>
</Button> <Grid.RowDefinitions>
</Grid> <RowDefinition Height="Auto" />
<ListBox x:Name="listBoxOldValues" IsSynchronizedWithCurrentItem="True" Grid.Row="3" Grid.ColumnSpan="3" Margin="0,3,0,0" BorderBrush="Transparent" BorderThickness="0" ItemTemplate="{DynamicResource CostRateItemTemplate}" Background="{x:Null}"> <RowDefinition Height="Auto" />
<ListBox.ItemContainerStyle> </Grid.RowDefinitions>
<Style TargetType="{x:Type ListBoxItem}"> <Grid Margin="3,0">
<Setter Property="Focusable" Value="false" /> <Grid.ColumnDefinitions>
</Style> <ColumnDefinition
</ListBox.ItemContainerStyle> Width="Auto"
<ListBox.Resources> MinWidth="160"
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" /> SharedSizeGroup="c1" />
<SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="Transparent" /> <ColumnDefinition
</ListBox.Resources> Width="Auto"
</ListBox> MinWidth="70"
</Grid> SharedSizeGroup="c2" />
</Border> <ColumnDefinition Width="*" />
</Grid> </Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<TextBlock
x:Name="lblActualValue"
Height="23"
Padding="0,4,0,0"
Text="Aktueller Stundensatz (€)" />
<TextBlock
x:Name="lblActualUnitName"
Grid.Row="1"
Height="23"
Padding="0,4,0,0"
Text="UnitName"
Visibility="Collapsed" />
<TextBlock
x:Name="lblValidUntil"
Grid.Row="2"
Margin="0,-3,0,0"
Text="(gültig ab 01.01.2009)" />
<TextBox
x:Name="txtActualUnitName"
Grid.Row="1"
Grid.Column="1"
Height="23"
Margin="3,3,0,0"
HorizontalAlignment="Stretch"
Text="{Binding UnitName, UpdateSourceTrigger=PropertyChanged}"
Visibility="Collapsed" />
<dxe:TextEdit
Grid.Column="1"
Height="23"
Margin="3,0,0,0"
HorizontalAlignment="Stretch"
EditValue="{Binding Path=CostRateValue, UpdateSourceTrigger=PropertyChanged}"
Mask="########0.00##"
MaskType="Numeric"
MaskUseAsDisplayFormat="True" />
<Button
x:Name="button_addCostRatePeriod"
Grid.Column="2"
Width="21"
Height="21"
Margin="3,0,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Click="button_addCostRatePeriod_Click">
<Grid
Width="18"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<Line
Width="16"
Height="16"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Fill="{x:Null}"
Stroke="#FFFFFFFF"
StrokeEndLineCap="Round"
StrokeStartLineCap="Round"
StrokeThickness="2"
X1="4"
X2="12"
Y1="8"
Y2="8" />
<Line
Width="16"
Height="16"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Fill="{x:Null}"
Stroke="#FFFFFFFF"
StrokeEndLineCap="Round"
StrokeStartLineCap="Round"
StrokeThickness="2"
X1="8"
X2="8"
Y1="4"
Y2="12" />
</Grid>
</Button>
</Grid>
<ListBox
x:Name="listBoxOldValues"
Grid.Row="3"
Grid.ColumnSpan="3"
Margin="0,3,0,0"
Background="{x:Null}"
BorderBrush="Transparent"
BorderThickness="0"
IsSynchronizedWithCurrentItem="True"
ItemTemplate="{DynamicResource CostRateItemTemplate}">
<ListBox.ItemContainerStyle>
<Style TargetType="{x:Type ListBoxItem}">
<Setter Property="Focusable" Value="false" />
</Style>
</ListBox.ItemContainerStyle>
<ListBox.Resources>
<SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent" />
<SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}" Color="Transparent" />
</ListBox.Resources>
</ListBox>
</Grid>
</Border>
</Grid>
</UserControl> </UserControl>

1229
BeWo/View/Detail/OrganisationView.xaml
View File

File diff suppressed because it is too large Load Diff

40
BeWo/ViewModel/OrganisationVM.cs
View File

@@ -84,13 +84,9 @@ namespace BeWo.ViewModel
public static string PropertyName_Feiertage = "Feiertage"; public static string PropertyName_Feiertage = "Feiertage";
public static string PropertyName_IKKrankenkasse = nameof(IKKrankenkasse); public static string PropertyName_IKKrankenkasse = nameof(IKKrankenkasse);
public static string PropertyName_IKKostentrager = nameof(IKKostentrager); public static string PropertyName_IKKostentrager = nameof(IKKostentrager);
public static string PropertyName_IKDatenannahmestelle = nameof(IKDatenannahmestelle); public static string PropertyName_IKDatenannahmestelle = nameof(IKDatenannahmestelle);
public static string PropertyName_Leistungserbringergruppe = nameof(Leistungserbringergruppe); public static string PropertyName_Leistungserbringergruppe = nameof(Leistungserbringergruppe);
public static string PropertyName_BusinessPartnerId = nameof(BusinessPartnerId); public static string PropertyName_BusinessPartnerId = nameof(BusinessPartnerId);
private readonly List<ValueListEntryDC> _AllQualifications; private readonly List<ValueListEntryDC> _AllQualifications;
@@ -166,14 +162,11 @@ namespace BeWo.ViewModel
private FeiertagListVM _Feiertage; private FeiertagListVM _Feiertage;
private string _IKKrankenkasse; private string _IKKrankenkasse;
private string _IKKostentrager; private string _IKKostentrager;
private string _IKDatenannahmestelle; private string _IKDatenannahmestelle;
private string _Leistungserbringergruppe; private string _Leistungserbringergruppe;
private string _BusinessPartnerId; private string _BusinessPartnerId;
private GkvVerfahrensstufe _Verfahrensstufe;
public OrganisationVM(OrganisationDC pDataContract, List<ValueListEntryDC> pAllQualifications, List<ValueListEntryDC> pPossibleFunctions, List<ValueListEntryDC> pPossibleRoleInOrganisations) public OrganisationVM(OrganisationDC pDataContract, List<ValueListEntryDC> pAllQualifications, List<ValueListEntryDC> pPossibleFunctions, List<ValueListEntryDC> pPossibleRoleInOrganisations)
: base(pDataContract, pDataContract.OrganisationOid == null) : base(pDataContract, pDataContract.OrganisationOid == null)
@@ -850,6 +843,35 @@ namespace BeWo.ViewModel
} }
} }
public GkvVerfahrensstufe Verfahrensstufe
{
get { return this._Verfahrensstufe; }
set
{
if (this.AreDifferent(this._Verfahrensstufe, value))
{
this._Verfahrensstufe = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Verfahrensstufe, value), nameof(Verfahrensstufe));
this.FirePropertyChanged(nameof(Verfahrensstufe));
}
}
}
public int VerfahrensstufeInt
{
get { return (int)Verfahrensstufe; }
set
{
if (!AreDifferent(this.VerfahrensstufeInt, value))
return;
Verfahrensstufe = (GkvVerfahrensstufe)value;
//FirePropertyChanged(nameof(VerfahrensstufeInt));
}
}
protected void CommitContact(string pValue, ContactType pContactType) protected void CommitContact(string pValue, ContactType pContactType)
{ {
List<ContactDC> lOldContactDCs; List<ContactDC> lOldContactDCs;
@@ -916,6 +938,7 @@ namespace BeWo.ViewModel
this._IKDatenannahmestelle = pDataContract.IKDatenannahmestelle; this._IKDatenannahmestelle = pDataContract.IKDatenannahmestelle;
_Leistungserbringergruppe = pDataContract.Leistungserbringergruppe; _Leistungserbringergruppe = pDataContract.Leistungserbringergruppe;
_BusinessPartnerId = pDataContract.BusinessPartnerId; _BusinessPartnerId = pDataContract.BusinessPartnerId;
_Verfahrensstufe = pDataContract.Verfahrensstufe;
_Function = pDataContract.Function; _Function = pDataContract.Function;
@@ -1024,6 +1047,7 @@ namespace BeWo.ViewModel
pDataContract.IKKrankenkasse = this._IKKrankenkasse; pDataContract.IKKrankenkasse = this._IKKrankenkasse;
pDataContract.Leistungserbringergruppe = _Leistungserbringergruppe; pDataContract.Leistungserbringergruppe = _Leistungserbringergruppe;
pDataContract.BusinessPartnerId = _BusinessPartnerId; pDataContract.BusinessPartnerId = _BusinessPartnerId;
pDataContract.Verfahrensstufe = _Verfahrensstufe;
this.CommitContact(this._Phone, ContactType.business_Phone); this.CommitContact(this._Phone, ContactType.business_Phone);
this.CommitContact(this._Website, ContactType.business_Homepage); this.CommitContact(this._Website, ContactType.business_Homepage);

2
Data/Entities/Organisation.cs
View File

@@ -351,5 +351,7 @@ namespace BeWo.Data.Entities
} }
} }
} }
public virtual GkvVerfahrensstufe Verfahrensstufe { get; set; }
} }
} }

1
Data/Mappings/Organisation.hbm.xml
View File

@@ -20,6 +20,7 @@
<property column="IKKostentrager" type="String" name="IKKostentrager" length="256" /> <property column="IKKostentrager" type="String" name="IKKostentrager" length="256" />
<property column="IKDatenannahmestelle" type="String" name="IKDatenannahmestelle" length="256" /> <property column="IKDatenannahmestelle" type="String" name="IKDatenannahmestelle" length="256" />
<property column="Leistungserbringergruppe" type="String" name="Leistungserbringergruppe" length="256" /> <property column="Leistungserbringergruppe" type="String" name="Leistungserbringergruppe" length="256" />
<property column="Verfahrensstufe" type="BS.Shared.GkvVerfahrensstufe, BS.Shared" name="Verfahrensstufe"/>
<property column="BusinessPartnerId" type="String" name="BusinessPartnerId" length="256" /> <property column="BusinessPartnerId" type="String" name="BusinessPartnerId" length="256" />
<many-to-one name="Address" column="AddressOid" class="BeWo.Data.Entities.Address, BeWo.Data" cascade="all" fetch="join"/> <many-to-one name="Address" column="AddressOid" class="BeWo.Data.Entities.Address, BeWo.Data" cascade="all" fetch="join"/>

2
Model/Changes_2024_10_09 GkvAbrechnung Verfahrensstufe.txt Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE `gkvabrechnung`
ADD COLUMN `UrbelegeGesendet` TINYINT NULL DEFAULT NULL AFTER `Bezahlt`;

2
Service/DCEntityMapper/OrganisationDC_Organisation.cs
View File

@@ -32,6 +32,7 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.IKKostentrager = pEntity.IKKostentrager; pDataContract.IKKostentrager = pEntity.IKKostentrager;
pDataContract.IKDatenannahmestelle = pEntity.IKDatenannahmestelle; pDataContract.IKDatenannahmestelle = pEntity.IKDatenannahmestelle;
pDataContract.Leistungserbringergruppe = pEntity.Leistungserbringergruppe; pDataContract.Leistungserbringergruppe = pEntity.Leistungserbringergruppe;
pDataContract.Verfahrensstufe = pEntity.Verfahrensstufe;
pDataContract.BusinessPartnerId = pEntity.BusinessPartnerId; pDataContract.BusinessPartnerId = pEntity.BusinessPartnerId;
@@ -109,6 +110,7 @@ namespace BeWo.Service.DCEntityMapper
pEntity.IKKostentrager = pDataContract.IKKostentrager; pEntity.IKKostentrager = pDataContract.IKKostentrager;
pEntity.IKDatenannahmestelle = pDataContract.IKDatenannahmestelle; pEntity.IKDatenannahmestelle = pDataContract.IKDatenannahmestelle;
pEntity.Leistungserbringergruppe = pDataContract.Leistungserbringergruppe; pEntity.Leistungserbringergruppe = pDataContract.Leistungserbringergruppe;
pEntity.Verfahrensstufe = pDataContract.Verfahrensstufe;
pEntity.BusinessPartnerId = pDataContract.BusinessPartnerId; pEntity.BusinessPartnerId = pDataContract.BusinessPartnerId;

7
Shared/BeWoEntityEnums.cs
View File

@@ -1280,4 +1280,11 @@ namespace BS.Shared
Paid, Paid,
OldAndNoFeedback OldAndNoFeedback
} }
public enum GkvVerfahrensstufe
{
Test,
Erprobung,
Echt
}
} }

15
Shared/Core/EnumTranslations.cs
View File

@@ -31,6 +31,7 @@ namespace BS.Shared.Core
public static Dictionary<UserRightType, String> UserRightType2Translations; public static Dictionary<UserRightType, String> UserRightType2Translations;
public static Dictionary<Enum, string> Wohnhilfe2Translation; public static Dictionary<Enum, string> Wohnhilfe2Translation;
public static Dictionary<Enum, string> Gkv2Translation;
public static Dictionary<ValueListEntryType, String> ValueListEntryType2Header; public static Dictionary<ValueListEntryType, String> ValueListEntryType2Header;
@@ -64,6 +65,8 @@ namespace BS.Shared.Core
InitWohnhilfeEnums(); InitWohnhilfeEnums();
InitGkvTranslation();
#region FamilyStatusTranslations #region FamilyStatusTranslations
FamilyStatusTranslations = new Dictionary<object, String> FamilyStatusTranslations = new Dictionary<object, String>
{ {
@@ -629,9 +632,10 @@ namespace BS.Shared.Core
BehinderungsartTranslations.DoForEach(p => AllTranslations.AddAndIgnoreDuplicates(p.Key, p.Value)); BehinderungsartTranslations.DoForEach(p => AllTranslations.AddAndIgnoreDuplicates(p.Key, p.Value));
MerkzeichenTranslations.DoForEach(p => AllTranslations.AddAndIgnoreDuplicates(p.Key, p.Value)); MerkzeichenTranslations.DoForEach(p => AllTranslations.AddAndIgnoreDuplicates(p.Key, p.Value));
Wohnhilfe2Translation?.DoForEach(kv => AllTranslations.Add(kv.Key, kv.Value)); Wohnhilfe2Translation?.DoForEach(kv => AllTranslations.Add(kv.Key, kv.Value));
Gkv2Translation?.DoForEach(kv => AllTranslations.Add(kv.Key, kv.Value));
} }
private static void InitUserRightTranslation() private static void InitUserRightTranslation()
{ {
var dict = new Dictionary<UserRightType, String>(); var dict = new Dictionary<UserRightType, String>();
@@ -1072,5 +1076,14 @@ namespace BS.Shared.Core
Wohnhilfe2Translation = dict; Wohnhilfe2Translation = dict;
} }
private static void InitGkvTranslation()
{
var dict = new Dictionary<Enum, string>();
dict.Add(GkvVerfahrensstufe.Test, "Test");
dict.Add(GkvVerfahrensstufe.Erprobung, "Erprobung");
dict.Add(GkvVerfahrensstufe.Echt, "Echt");
}
} }
} }

3
Shared/DataContracts/OrganisationDC.cs
View File

@@ -183,5 +183,8 @@ namespace BS.Shared.DataContracts
[DataMember] [DataMember]
public string BusinessPartnerId { get; set; } public string BusinessPartnerId { get; set; }
[DataMember]
public GkvVerfahrensstufe Verfahrensstufe { get; set; }
} }
} }