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

Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo

Browse Source
This commit is contained in:
Alexandra
2024-10-16 15:31:42 +02:00
parent 1b98333201 3d84598eb6
commit 94f839f19b
37 changed files with 1295 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWo/BeWo.csproj
View File

@@ -962,12 +962,14 @@
<DependentUpon>BSLogoControl.xaml</DependentUpon>
</Compile>
<Compile Include="Converter\AnonymizationRight2VisibilityConverter.cs" />
<Compile Include="Converter\AppSettingsConverter.cs" />
<Compile Include="Converter\BooleanOrVisibilityMultiConverter.cs" />
<Compile Include="Converter\BooleanAndVisibilityMultiConverter.cs" />
<Compile Include="Converter\BoolNullCheckConverter.cs" />
<Compile Include="Converter\BoolReverseConverter.cs" />
<Compile Include="Converter\BoolEnabledToTabitemBackgroundConverter.cs" />
<Compile Include="Converter\BoolToParameterReturnConverter.cs" />
<Compile Include="Converter\BoolVisibilityCollapsedConverter.cs" />
<Compile Include="Converter\CellColorConverter.cs" />
<Compile Include="Converter\CollectionContainsTag2BoolConverter.cs" />
<Compile Include="Converter\CollectionCountToBoolConverter.cs" />

5
BeWo/BeWoApp.xaml
View File

@@ -90,6 +90,11 @@
<conv:GkvState2StringConverter x:Key="GkvState2StringConverter" />
<conv:RadioBoolToIntConverter x:Key="RadioBoolToIntConverter" />
<conv:EnumTranslationConverter x:Key="EnumTranslationConverter" />
<conv:AppSettingsConverter x:Key="AppSettingsConverter" />
<conv:ValueConverterGroup x:Key="AppSettings2Visible">
<conv:AppSettingsConverter />
<conv:BoolVisibilityCollapsedConverter />
</conv:ValueConverterGroup>
<Style x:Key="SupportConceptDetailStyle" TargetType="{x:Type ListBoxItem}">
<Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />

36
BeWo/Converter/AppSettingsConverter.cs Normal file
View File

@@ -0,0 +1,36 @@
using BeWo.Core.Config;
using BS.Shared.Core;
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 AppSettingsConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (parameter == null)
return false;
if(parameter is string setting)
{
// Kann gerne erweitert werden
// Achtung! Verwende bei Parameter SettingsKeys
if (setting == SettingsKeys.AllowGkvAbrechnung)
return BeWoApp.AppSettings.AllowGkvAbrechnung;
}
return false;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}

30
BeWo/Converter/BoolVisibilityCollapsedConverter.cs Normal file
View File

@@ -0,0 +1,30 @@
using System;
using System.Globalization;
using System.Windows;
using System.Windows.Data;
namespace BeWo.Converter
{
public class BoolVisibilityCollapsedConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (value == null)
{
return Visibility.Visible;
}
if(value is bool b)
{
return (bool)value ? Visibility.Visible : Visibility.Collapsed;
}
return Visibility.Visible;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
}

2
BeWo/MainWindow.xaml
View File

@@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Title="BeWoPlaner" Height="768" Width="1024" WindowStartupLocation="CenterScreen" WindowState="Maximized"
BorderThickness="1" Closing="MainWindow_OnClosing">
BorderThickness="1" Closing="MainWindow_OnClosing" SizeChanged="Window_SizeChanged">
<Grid x:Name="rootGrid">
<ComboBox Width="100"></ComboBox>
</Grid>

10
BeWo/MainWindow.xaml.cs
View File

@@ -105,5 +105,13 @@ namespace BeWo
Application.Current.Shutdown();
}
}
private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
{
#if DEBUG
// Setze den Titel auf die aktuelle Breite und Höhe
this.Title = $"BeWoPlaner ({e.NewSize.Width}x{e.NewSize.Height})";
#endif
}
}
}

1
BeWo/Styles/ControlStyles/TextBoxStyles.xaml
View File

@@ -2,6 +2,7 @@
<Style x:Key="TextBoxBase" TargetType="{x:Type TextBox}">
<Setter Property="Margin" Value="3" />
<Setter Property="Padding" Value="3" />
<Setter Property="Height" Value="23" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
</Style>

5
BeWo/View/Controls/YearMonthFilter.xaml
View File

@@ -1,7 +1,8 @@
<UserControl
x:Class="BeWo.View.YearMonthFilter"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Name="root">
<Grid>
@@ -22,7 +23,7 @@
Grid.Column="1"
Margin="8,0,0,0"
Content="Nach Monat filtern"
IsChecked="True"
IsChecked="{Binding Path=FilterMonth, ElementName=root}"
IsEnabled="{Binding Path=IsChecked, ElementName=checkbox_yearfilter}" />
<ComboBox
x:Name="combobox_year"

14
BeWo/View/Controls/YearMonthFilter.xaml.cs
View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
using BS.Shared.Core;
@@ -14,7 +15,16 @@ namespace BeWo.View
/// </summary>
public partial class YearMonthFilter : UserControl
{
public YearMonthFilter()
public bool FilterMonth
{
get { return (bool)GetValue(FilterMonthProperty); }
set { SetValue(FilterMonthProperty, value); }
}
public static readonly DependencyProperty FilterMonthProperty =
DependencyProperty.Register("FilterMonth", typeof(bool), typeof(YearMonthFilter), new PropertyMetadata(true));
public YearMonthFilter()
{
this.InitializeComponent();
this.InitDateCombos();
@@ -55,7 +65,7 @@ namespace BeWo.View
private void FireFilterSpanChanged()
{
if (this.FilterSpanChanged != null)
if (this.FilterSpanChanged != null && IsLoaded)
{
this.FilterSpanChanged(this, new EventArgs<DateTimeSpan>(this.FilterSpan));
}

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

@@ -13,6 +13,7 @@
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"
@@ -46,6 +47,7 @@
Margin="3,0,0,3"
HorizontalAlignment="Left"
VerticalAlignment="Bottom"
FilterMonth="False"
FilterSpanChanged="YearMonthFilter_FilterSpanChanged" />
<StackPanel
Grid.Column="1"
@@ -79,7 +81,8 @@
VerticalAlignment="Bottom"
Click="NewButton_OnClick"
Content="Neue Abrechnung"
ToolTip="Neue GKV-Abrechnung erstellen" />
ToolTip="Neue GKV-Abrechnung erstellen"
Visibility="{Binding Converter={StaticResource UserRightType2Visible}, ConverterParameter={x:Static shared:UserRightType.Finance_Gkv_Create}}" />
<Button
x:Name="button_reload"
Grid.Column="1"
@@ -144,6 +147,7 @@
Padding="0"
VerticalAlignment="Center"
Click="btn_send_Click"
Visibility="{Binding Converter={StaticResource UserRightType2Visible}, ConverterParameter={x:Static shared:UserRightType.Finance_Gkv_Send}}"
Content="*"
FontFamily="Wingdings"
FontSize="11"
@@ -157,6 +161,7 @@
Padding="0"
VerticalAlignment="Center"
Click="btn_delete_Click"
Visibility="{Binding Converter={StaticResource UserRightType2Visible}, ConverterParameter={x:Static shared:UserRightType.Finance_Gkv_Delete}}"
Content="r"
FontFamily="Webdings"
FontSize="11"

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

@@ -9,7 +9,7 @@
xmlns:search="clr-namespace:BeWo.View.Search"
xmlns:shared="clr-namespace:BS.Shared;assembly=BS.Shared"
xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:val="clr-namespace:BeWo.Validation"
xmlns:val="clr-namespace:BeWo.Validation" xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
Width="Auto"
Height="Auto"
HorizontalAlignment="Stretch"
@@ -163,9 +163,11 @@
x:Name="tabitem_details"
Header="Details"
IsSelected="True">
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<GroupBox Header="Eigenschaften" Style="{StaticResource ObjectEditGroupBox}">
<Grid x:Name="grid_details">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
@@ -174,7 +176,6 @@
<ColumnDefinition Width="*" MaxWidth="300" />
<ColumnDefinition Width="*" MaxWidth="300" />
<ColumnDefinition Width="*" MaxWidth="300" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid Grid.ColumnSpan="3">
<Grid.ColumnDefinitions>
@@ -292,7 +293,10 @@
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" SharedSizeGroup="label" />
<ColumnDefinition Width="*" MaxWidth="200" />
<ColumnDefinition
Width="*"
MinWidth="50"
MaxWidth="200" />
</Grid.ColumnDefinitions>
<Label
Grid.Row="0"
@@ -377,7 +381,10 @@
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" SharedSizeGroup="label" />
<ColumnDefinition Width="*" MaxWidth="200" />
<ColumnDefinition
Width="*"
MinWidth="50"
MaxWidth="200" />
</Grid.ColumnDefinitions>
<Label
Grid.Row="0"
@@ -464,7 +471,10 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" SharedSizeGroup="label" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" MaxWidth="200" />
<ColumnDefinition
Width="*"
MinWidth="50"
MaxWidth="200" />
</Grid.ColumnDefinitions>
<Label
Grid.Row="0"
@@ -546,9 +556,12 @@
</Grid>
</GroupBox>
<GroupBox
Grid.Row="1"
Grid.Column="3"
Margin="8,8,0,0"
Grid.Row="2"
Grid.Column="0"
Grid.ColumnSpan="3"
Width="360"
HorizontalAlignment="Left"
Margin="0,8,0,0"
Header="GKV-Abrechnung"
Style="{StaticResource ObjectEditGroupBox}">
<GroupBox.Resources>
@@ -565,82 +578,88 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" SharedSizeGroup="label" />
<ColumnDefinition Width="*" MaxWidth="200" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition
Width="*"
MinWidth="50"
MaxWidth="200" />
</Grid.ColumnDefinitions>
<Label
Grid.Row="0"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Grid.Row="0"
Grid.Column="0"
VerticalAlignment="Center">
IK Krankenkasse
</Label>
<TextBox
Grid.Row="0"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=IKKrankenkasse, UpdateSourceTrigger=PropertyChanged}" />
Grid.Row="0"
Grid.Column="1"
Text="{Binding Path=IKKrankenkasse, UpdateSourceTrigger=PropertyChanged}" />
<Label
Grid.Row="1"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Grid.Row="1"
Grid.Column="0"
VerticalAlignment="Center">
IK Kostenträger
</Label>
<TextBox
Grid.Row="1"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=IKKostentrager, UpdateSourceTrigger=PropertyChanged}" />
Grid.Row="1"
Grid.Column="1"
Text="{Binding Path=IKKostentrager, UpdateSourceTrigger=PropertyChanged}" />
<Label
Grid.Row="2"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Grid.Row="2"
Grid.Column="0"
VerticalAlignment="Center">
IK Datenannahmestelle
</Label>
<TextBox
Grid.Row="2"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=IKDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}" />
Grid.Row="2"
Grid.Column="1"
Text="{Binding Path=IKDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}" />
<Label
Grid.Row="3"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center"
ToolTip="Abrechnungscode + Tarifkennzeichen. Zum Beispiel: 6901000">
Grid.Row="3"
Grid.Column="0"
VerticalAlignment="Center"
Visibility="{Binding Converter={StaticResource AppSettings2Visible}, ConverterParameter=AllowGkvAbrechnung}"
ToolTip="Bezeichnung Datenannahmestelle">
Bez. Datenannahmeste...
</Label>
<TextBox
Grid.Row="3"
Grid.Column="1"
Visibility="{Binding Converter={StaticResource AppSettings2Visible}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}"
Text="{Binding Path=BezDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}" />
<Label
Grid.Row="4"
Grid.Column="0"
VerticalAlignment="Center"
ToolTip="Abrechnungscode + Tarifkennzeichen. Zum Beispiel: 6901000">
Leistungserbringergruppe
</Label>
<TextBox
Grid.Row="3"
Grid.Column="1"
Height="23"
Margin="3"
Text="{Binding Path=Leistungserbringergruppe, UpdateSourceTrigger=PropertyChanged}" />
Grid.Row="4"
Grid.Column="1"
Text="{Binding Path=Leistungserbringergruppe, UpdateSourceTrigger=PropertyChanged}" />
<Label
Grid.Row="4"
Grid.Column="0"
Margin="3"
VerticalAlignment="Center">
Grid.Row="5"
Grid.Column="0"
VerticalAlignment="Center"
Visibility="{Binding Converter={StaticResource AppSettings2Visible}, ConverterParameter=AllowGkvAbrechnung}">
Verfahrensstufe
</Label>
<StackPanel
Grid.Row="4"
Grid.Column="1"
Orientation="Horizontal">
Grid.Row="5"
Grid.Column="1"
Orientation="Horizontal"
Visibility="{Binding Converter={StaticResource AppSettings2Visible}, ConverterParameter=AllowGkvAbrechnung}">
<RadioButton GroupName="a" IsChecked="{Binding Path=VerfahrensstufeInt, Converter={StaticResource RadioBoolToIntConverter}, ConverterParameter=0}">Test</RadioButton>
<RadioButton GroupName="a" IsChecked="{Binding Path=VerfahrensstufeInt, Converter={StaticResource RadioBoolToIntConverter}, ConverterParameter=1}">Erprobung</RadioButton>
<RadioButton GroupName="a" IsChecked="{Binding Path=VerfahrensstufeInt, Converter={StaticResource RadioBoolToIntConverter}, ConverterParameter=2}">Echt</RadioButton>
</StackPanel>
</Grid>
</GroupBox>
<Grid Grid.Row="2" Grid.ColumnSpan="4">
<Grid Grid.Row="3" Grid.ColumnSpan="4">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
@@ -668,6 +687,7 @@
</Grid>
</Grid>
</GroupBox>
</ScrollViewer>
</TabItem>
<TabItem Name="tabitem_varFields" Header="{markup:Translate OrganisationVarFieldsTitle}">

208
BeWo/View/Master/FinanceView.xaml
View File

@@ -1,66 +1,154 @@
<localView:BeWoView x:Class="BeWo.View.Master.FinanceView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" xmlns:val="clr-namespace:BeWo.Validation" xmlns:localView="clr-namespace:BeWo.View" xmlns:accounting="clr-namespace:BeWo.View.Detail.Accounting" Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<localView:BeWoView
x:Class="BeWo.View.Master.FinanceView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:accounting="clr-namespace:BeWo.View.Detail.Accounting"
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
xmlns:shared="clr-namespace:BS.Shared;assembly=BS.Shared"
xmlns:localView="clr-namespace:BeWo.View"
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">
<Grid>
<uc:ShadowChrome>
<GroupBox Style="{StaticResource MainContentGroupBoxStyle}">
<GroupBox.Header>
<StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0,11,0,0">
<Image Source="..\..\Ressources\Icons\CoinsDisabled.png" RenderTransformOrigin="0.5,0.5" Width="32">
<Image.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleX="1.3" ScaleY="1.3" />
<SkewTransform AngleX="0" AngleY="0" />
<RotateTransform Angle="0" />
<TranslateTransform X="0" Y="-2" />
</TransformGroup>
</Image.RenderTransform>
</Image>
<TextBox Text="Finanzen" Margin="10,0,0,0" Background="{x:Null}" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="22" BorderBrush="{x:Null}" VerticalAlignment="Stretch" Padding="0,0,0,0" BorderThickness="0,0,0,0" />
</StackPanel>
</GroupBox.Header>
<Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Rectangle Fill="{DynamicResource AccountingContentBrush}" Height="6" />
<TabControl x:Name="root" Grid.Row="1" Style="{StaticResource ObjectEditTabControl}" BorderThickness="0,0,0,0">
<TabItem Header="Abschlagszahlungen" IsSelected="True" Name="tabitem_financeBooking" Selector.Selected="tabitem_financeBooking_Selected" />
<!--<TabItem Header="Abschlagszahlungen2" Name="tabitem_financeBooking2" Selector.Selected="tabitem_financeBooking_Selected2" />-->
<TabItem Header="Buchungsübersicht" Name="tabitem_financeOverview" Selector.Selected="tabitem_financeOverview_Selected" />
<TabItem Header="Finanzauswertung" Name="tabitem_openClaims" Selector.Selected="tabitem_openClaims_Selected" />
<!--
<Grid>
<uc:ShadowChrome>
<GroupBox Style="{StaticResource MainContentGroupBoxStyle}">
<GroupBox.Header>
<StackPanel
Margin="0,11,0,0"
VerticalAlignment="Bottom"
Orientation="Horizontal">
<Image
Width="32"
RenderTransformOrigin="0.5,0.5"
Source="..\..\Ressources\Icons\CoinsDisabled.png">
<Image.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleX="1.3" ScaleY="1.3" />
<SkewTransform AngleX="0" AngleY="0" />
<RotateTransform Angle="0" />
<TranslateTransform X="0" Y="-2" />
</TransformGroup>
</Image.RenderTransform>
</Image>
<TextBox
Margin="10,0,0,0"
Padding="0,0,0,0"
VerticalAlignment="Stretch"
Background="{x:Null}"
BorderBrush="{x:Null}"
BorderThickness="0,0,0,0"
FontSize="22"
Foreground="{DynamicResource MainGroupBoxForegroundBrush}"
Text="Finanzen" />
</StackPanel>
</GroupBox.Header>
<Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Rectangle Height="6" Fill="{DynamicResource AccountingContentBrush}" />
<TabControl
x:Name="root"
Grid.Row="1"
BorderThickness="0,0,0,0"
Style="{StaticResource ObjectEditTabControl}">
<TabItem
Name="tabitem_financeBooking"
Header="Abschlagszahlungen"
IsSelected="True"
Selector.Selected="tabitem_financeBooking_Selected" />
<!--<TabItem Header="Abschlagszahlungen2" Name="tabitem_financeBooking2" Selector.Selected="tabitem_financeBooking_Selected2" />-->
<TabItem
Name="tabitem_financeOverview"
Header="Buchungsübersicht"
Selector.Selected="tabitem_financeOverview_Selected" />
<TabItem
Name="tabitem_openClaims"
Header="Finanzauswertung"
Selector.Selected="tabitem_openClaims_Selected" />
<!--
<TabItem Header="Rechnungen" Name="tabitem_invoice" Selector.Selected="tabitem_invoice_Selected"/>
<TabItem Header="Rechnungsübersicht" Name="tabitem_invoiceOverview" Selector.Selected="tabitem_invoiceOverview_Selected"/>
-->
<TabItem Header="Spitzabrechnungen" Name="tabitem_settlementinvoice" Selector.Selected="tabitem_settlementinvoice_Selected" />
<TabItem Header="Rechnungen für Eigenanteil" Name="tabitem_equityinvoice" Selector.Selected="tabitem_equityinvoice_Selected" />
<TabItem Header="Sammelrechnung" Name="tabitem_collectiveinvoice"
Selector.Selected="tabitem_collectiveinvoice_Selected" />
<TabItem Header="Allgemeine Rechnungen" Name="tabitem_otherinvoice" Selector.Selected="tabitem_otherinvoice_Selected" />
<TabItem Header="Rechnungsübersicht" Name="tabitem_overviewinvoice" Selector.Selected="tabitem_overviewinvoice_Selected" />
<TabItem Header="GKV-Abrechnungen" Name="tabitem_gkvabrechnung">
<accounting:GkvAbrechnungOverview/>
<TabItem
Name="tabitem_settlementinvoice"
Header="Spitzabrechnungen"
Selector.Selected="tabitem_settlementinvoice_Selected" />
<TabItem
Name="tabitem_equityinvoice"
Header="Rechnungen für Eigenanteil"
Selector.Selected="tabitem_equityinvoice_Selected" />
<TabItem
Name="tabitem_collectiveinvoice"
Header="Sammelrechnung"
Selector.Selected="tabitem_collectiveinvoice_Selected" />
<TabItem
Name="tabitem_otherinvoice"
Header="Allgemeine Rechnungen"
Selector.Selected="tabitem_otherinvoice_Selected" />
<TabItem
Name="tabitem_overviewinvoice"
Header="Rechnungsübersicht"
Selector.Selected="tabitem_overviewinvoice_Selected" />
<TabItem
Name="tabitem_gkvabrechnung"
Header="GKV-Abrechnungen">
<TabItem.Visibility>
<MultiBinding Converter="{StaticResource BooleanAndVisibilityMultiConverter}">
<Binding Converter="{StaticResource AppSettingsConverter}" ConverterParameter="{x:Static core:SettingsKeys.AllowGkvAbrechnung}"/>
<Binding Converter="{StaticResource UserRightType2Enabled}" ConverterParameter="{x:Static shared:UserRightType.Finance_Gkv_View}"/>
</MultiBinding>
</TabItem.Visibility>
<accounting:GkvAbrechnungOverview />
</TabItem>
<TabItem Header="Digitale Abrechnung" Name="tabitem_gkvabrechnung_alt" Selector.Selected="tabitem_gkvabrechnung_alt_Selected" />
<TabItem Header="Bargeldverwaltung" Name="tabitem_bargeldverwaltung" Selector.Selected="tabitem_bargeldverwaltung_Selected"/>
<TabItem Header="Dokumente" Name="tabitem_documents" Selector.Selected="tabitem_documents_Selected" />
</TabControl>
<Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,0,0,0" VerticalAlignment="Stretch" Background="#FF000000">
<Border.OpacityMask>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#19000000" Offset="0" />
<GradientStop Color="#33FFFFFF" Offset="1" />
</LinearGradientBrush>
</Border.OpacityMask>
</Border>
<StackPanel Grid.ColumnSpan="3" Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Height="Auto" Margin="0,5,5,0" HorizontalAlignment="Right">
<!--<Button x:Name="btnSave" Command="ApplicationCommands.Save" Content="Speichern" Margin="0,0,2,0" Height="25" />-->
<Button x:Name="btnClose" Command="ApplicationCommands.Close" Content="Schließen" Margin="0,0,0,0" Height="25" />
</StackPanel>
</Grid>
</GroupBox>
</uc:ShadowChrome>
</Grid>
<TabItem
Name="tabitem_bargeldverwaltung"
Header="Bargeldverwaltung"
Selector.Selected="tabitem_bargeldverwaltung_Selected" />
<TabItem
Name="tabitem_documents"
Header="Dokumente"
Selector.Selected="tabitem_documents_Selected" />
</TabControl>
<Border
Grid.Row="2"
Grid.ColumnSpan="3"
Height="40"
Margin="0,0,0,0"
VerticalAlignment="Stretch"
Background="#FF000000">
<Border.OpacityMask>
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
<GradientStop Offset="0" Color="#19000000" />
<GradientStop Offset="1" Color="#33FFFFFF" />
</LinearGradientBrush>
</Border.OpacityMask>
</Border>
<StackPanel
Grid.Row="2"
Grid.ColumnSpan="3"
Height="Auto"
Margin="0,5,5,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Orientation="Horizontal">
<!--<Button x:Name="btnSave" Command="ApplicationCommands.Save" Content="Speichern" Margin="0,0,2,0" Height="25" />-->
<Button
x:Name="btnClose"
Height="25"
Margin="0,0,0,0"
Command="ApplicationCommands.Close"
Content="Schließen" />
</StackPanel>
</Grid>
</GroupBox>
</uc:ShadowChrome>
</Grid>
</localView:BeWoView>

19
BeWo/View/Master/FinanceView.xaml.cs
View File

@@ -142,17 +142,6 @@ namespace BeWo.View.Master
tabitem_bargeldverwaltung.Visibility = Visibility.Collapsed;
}
if (BeWoApp.AppSettings.AllowGkvAbrechnung)
{
tabitem_gkvabrechnung.Visibility = Visibility.Visible;
tabitem_gkvabrechnung_alt.Visibility = Visibility.Collapsed;
}
else
{
tabitem_gkvabrechnung.Visibility = Visibility.Collapsed;
tabitem_gkvabrechnung_alt.Visibility = Visibility.Collapsed;
}
root.SelectedIndex = 0;
//foreach (TabItem tabitem in root.Items)
@@ -254,14 +243,6 @@ namespace BeWo.View.Master
}
}
private void tabitem_gkvabrechnung_alt_Selected(object sender, RoutedEventArgs e)
{
if (!_OpenViews.ContainsKey(tabitem_gkvabrechnung_alt) || _SavePerformed)
{
AddView(tabitem_gkvabrechnung_alt, new DigitalInvoiceOverview());
}
}
//Dokument Selection
private void tabitem_documents_Selected(object sender, RoutedEventArgs e)
{

18
BeWo/ViewModel/OrganisationVM.cs
View File

@@ -164,6 +164,7 @@ namespace BeWo.ViewModel
private string _IKKrankenkasse;
private string _IKKostentrager;
private string _IKDatenannahmestelle;
private string _BezDatenannahmestelle;
private string _Leistungserbringergruppe;
private string _BusinessPartnerId;
private GkvVerfahrensstufe _Verfahrensstufe;
@@ -813,6 +814,21 @@ namespace BeWo.ViewModel
}
}
public string BezDatenannahmestelle
{
get { return this._BezDatenannahmestelle; }
set
{
if (this.AreDifferent(this._BezDatenannahmestelle, value))
{
this._BezDatenannahmestelle = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.BezDatenannahmestelle, value), nameof(BezDatenannahmestelle));
this.FirePropertyChanged(nameof(BezDatenannahmestelle));
}
}
}
public string Leistungserbringergruppe
{
get { return this._Leistungserbringergruppe; }
@@ -936,6 +952,7 @@ namespace BeWo.ViewModel
this._IKKrankenkasse = pDataContract.IKKrankenkasse;
this._IKKostentrager = pDataContract.IKKostentrager;
this._IKDatenannahmestelle = pDataContract.IKDatenannahmestelle;
this._BezDatenannahmestelle = pDataContract.BezDatenannahmestelle;
_Leistungserbringergruppe = pDataContract.Leistungserbringergruppe;
_BusinessPartnerId = pDataContract.BusinessPartnerId;
_Verfahrensstufe = pDataContract.Verfahrensstufe;
@@ -1043,6 +1060,7 @@ namespace BeWo.ViewModel
pDataContract.ActivationType = this._IsArchived ? ActivationTypeId.Archived : ActivationTypeId.Active;
pDataContract.Function = this._Function;
pDataContract.IKDatenannahmestelle = this._IKDatenannahmestelle;
pDataContract.BezDatenannahmestelle = this._BezDatenannahmestelle;
pDataContract.IKKostentrager = this._IKKostentrager;
pDataContract.IKKrankenkasse = this._IKKrankenkasse;
pDataContract.Leistungserbringergruppe = _Leistungserbringergruppe;

15
BeWoDakota.sln
View File

@@ -39,6 +39,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DakotaUnitTest", "DakotaUnitTest\DakotaUnitTest.csproj", "{B1FF561D-1677-4B06-9168-E7B024084B69}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TranslationUnitTest", "TranslationUnitTest\TranslationUnitTest.csproj", "{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -185,6 +187,18 @@ Global
{B1FF561D-1677-4B06-9168-E7B024084B69}.Release|Any CPU.Build.0 = Release|Any CPU
{B1FF561D-1677-4B06-9168-E7B024084B69}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{B1FF561D-1677-4B06-9168-E7B024084B69}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|.NET.ActiveCfg = Debug|Any CPU
{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|.NET.Build.0 = Debug|Any CPU
{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|.NET.ActiveCfg = Release|Any CPU
{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|.NET.Build.0 = Release|Any CPU
{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|Any CPU.Build.0 = Release|Any CPU
{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{83C43FEC-233D-49EF-BD23-BF842A3EBDF5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -201,6 +215,7 @@ Global
{47331732-DD96-4075-869F-83AA9F3F9937} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{A959FE9A-1647-4C02-B2EE-6A95EBF6DC9A} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{B1FF561D-1677-4B06-9168-E7B024084B69} = {2AA59C1D-5537-4C49-9F9D-6E7CF827F687}
{83C43FEC-233D-49EF-BD23-BF842A3EBDF5} = {2AA59C1D-5537-4C49-9F9D-6E7CF827F687}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5352BE53-F2FD-442F-85A8-4157599AA153}

4
Dakota/DakotaValidator.cs
View File

@@ -65,8 +65,8 @@ namespace Dakota
throw new DakotaException(error);
}
public static bool ValidateIKNumbers(Organisation orga)
=> ValidateIKNumbers(orga.IKDatenannahmestelle, orga.IKKostentrager, orga.IKKrankenkasse);
public static bool ValidateOrganisationInformations(Organisation orga)
=> ValidateIKNumbers(orga.IKDatenannahmestelle, orga.IKKostentrager, orga.IKKrankenkasse) && !string.IsNullOrEmpty(orga.BezDatenannahmestelle);
private static bool ValidateIKNumbers(params string[] iks)
=> iks?.All(ValidateIKNumber) ?? false;

17
Dakota/Logic/DakotaKTDReader.cs
View File

@@ -44,14 +44,23 @@ namespace Dakota.Logic
/// <returns>Item1:Datenannahmestelle -
/// Item2:Kostenträger -
/// Item3:Krankenkasse</returns>
public Tuple<string, string, string> Resolve(string ikkrankenkasse, string abrechnungscode, string tarifkennzeichen)
public Tuple<string, string, string, string> Resolve(string ikkrankenkasse, string abrechnungscode, string tarifkennzeichen)
{
foreach (var kv in FileDictionary)
{
var search = GetIKNummern(kv.Value, ikkrankenkasse, abrechnungscode, tarifkennzeichen);
var dict = kv.Value;
var search = GetIKNummern(dict, ikkrankenkasse, abrechnungscode, tarifkennzeichen);
if (search is object)
return search;
{
var datenannahmestelle = search.Item1;
var bez = dict[datenannahmestelle].SegmentIDK.Kurzbezeichnung;
return new Tuple<string, string, string, string>(datenannahmestelle, search.Item2, search.Item3, bez);
}
}
return null;
@@ -88,7 +97,7 @@ namespace Dakota.Logic
if (datenannahmestellen_2.Count() == 1)
return GetIKNummern(datenannahmestellen_2.First(), kostentrager, ikkrankenkasse);
var datenannahmestellen_3 = datenannahmestellen.Where(x => x.Tarifkennzeichen == tarifkennzeichen);
var datenannahmestellen_3 = datenannahmestellen_2.Where(x => x.Tarifkennzeichen == tarifkennzeichen);
if (datenannahmestellen_3.Count() == 1)
return GetIKNummern(datenannahmestellen_3.First(), kostentrager, ikkrankenkasse);

18
Data/Entities/Organisation.cs
View File

@@ -66,6 +66,8 @@ namespace BeWo.Data.Entities
private string _IKDatenannahmestelle;
private string _BezDatenannahmestelle;
private string _Leistungserbringergruppe;
private string _BusinessPartnerId;
@@ -320,6 +322,22 @@ namespace BeWo.Data.Entities
}
}
public virtual string BezDatenannahmestelle
{
get
{
return this._BezDatenannahmestelle;
}
set
{
if (this.AreDifferent(this._BezDatenannahmestelle, value))
{
this._BezDatenannahmestelle = value;
}
}
}
public virtual string Leistungserbringergruppe
{
get

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

@@ -19,6 +19,7 @@
<property column="IKKrankenkasse" type="String" name="IKKrankenkasse" length="256" />
<property column="IKKostentrager" type="String" name="IKKostentrager" length="256" />
<property column="IKDatenannahmestelle" type="String" name="IKDatenannahmestelle" length="256" />
<property column="BezDatenannahmestelle" type="String" name="BezDatenannahmestelle" 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" />

4
Data/Security/UserRightHelper.cs
View File

@@ -169,6 +169,10 @@ namespace BeWo.Data.Security
UserRightType.Customer_GemeinnutzigeArbeit_Manage,
UserRightType.Customer_Wohnhilfe_View,
UserRightType.Customer_Wohnhilfe_Manage,
UserRightType.Finance_Gkv_View,
UserRightType.Finance_Gkv_Create,
UserRightType.Finance_Gkv_Send,
UserRightType.Finance_Gkv_Delete
};
if (rights_3_22.Contains(r))

1
Host/GkvAbrechnungView.aspx.cs
View File

@@ -269,6 +269,7 @@ namespace Host
response.IKDatenannahmestelle = resolved.Item1;
response.IKKostentrager = resolved.Item2;
response.IKKrankenkasse = resolved.Item3;
response.BezDatenannahmestelle = resolved.Item4;
}
SendResponse(response);

2
Model/Changes_2024_10_15 Organisation BezDatenannahmestelle.txt Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE `organisation`
ADD COLUMN `BezDatenannahmestelle` VARCHAR(4096) NULL DEFAULT NULL AFTER `IKDatenannahmestelle`;

634
ReportImp/KetteReports/FLSListReport.Designer.cs generated Normal file
View File

@@ -0,0 +1,634 @@
using BeWo.Report.ReportObjects;
namespace KetteReports
{
partial class Leistungsdokumentation
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
//
this.Detail.HeightF = 0F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTableCell1
//
this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.Name")});
this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.StylePriority.UseBorderColor = false;
this.xrTableCell1.StylePriority.UseBorders = false;
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.Text = "xrTableCell1";
this.xrTableCell1.Weight = 6.9183673469387754D;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 1D;
//
// xrTable1
//
this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(1017F, 25F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UsePadding = false;
//
// Detail1
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel9,
this.xrLabel8,
this.xrLabel7,
this.xrLabel6,
this.xrTable1});
this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.Detail1.HeightF = 83F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
//
// xrLabel9
//
this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(174.5833F, 50F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(70F, 25F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "entspricht";
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel8
//
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.fieldFLS", "{0:0.00} FLS")});
this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(244.5834F, 50F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(235.4167F, 25F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.Text = "xrLabel8";
//
// xrLabel7
//
this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(110F, 25F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "Minuten gesamt:";
//
// xrLabel6
//
this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.TotalFLM", "{0:0.##}")});
this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(110F, 50F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.SizeF = new System.Drawing.SizeF(64.58335F, 25F);
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.StylePriority.UsePadding = false;
this.xrLabel6.StylePriority.UseTextAlignment = false;
this.xrLabel6.Text = "xrLabel6";
this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1,
this.DetailReport1});
this.DetailReport.DataMember = "FLSReportGroups";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
this.DetailReport.Name = "DetailReport";
//
// DetailReport1
//
this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail2,
this.GroupHeader2,
this.GroupFooter1});
this.DetailReport1.DataMember = "FLSReportGroups.ServiceRecords";
this.DetailReport1.DataSource = this.bindingSource1;
this.DetailReport1.Level = 0;
this.DetailReport1.Name = "DetailReport1";
//
// Detail2
//
this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable4});
this.Detail2.HeightF = 25F;
this.Detail2.Name = "Detail2";
//
// xrTable4
//
this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable4.Name = "xrTable4";
this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow4});
this.xrTable4.SizeF = new System.Drawing.SizeF(1019F, 25F);
this.xrTable4.StylePriority.UseBorders = false;
this.xrTable4.StylePriority.UsePadding = false;
//
// xrTableRow4
//
this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell4,
this.xrTableCell9,
this.xrTableCell11,
this.xrTableCell13,
this.xrTableCell10});
this.xrTableRow4.Name = "xrTableRow4";
this.xrTableRow4.Weight = 1D;
//
// xrTableCell3
//
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.ServiceRecords.Start", "{0:dd/MM/yyyy}")});
this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.Text = "xrTableCell3";
this.xrTableCell3.Weight = 0.68027210884353728D;
//
// xrTableCell4
//
this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.ServiceRecords.TimeRange")});
this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.StylePriority.UseFont = false;
this.xrTableCell4.Text = "xrTableCell4";
this.xrTableCell4.Weight = 0.88092347580856223D;
//
// xrTableCell9
//
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.ServiceRecords.RoundedDuration", "{0:0.##}")});
this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
this.xrTableCell9.StylePriority.UseFont = false;
this.xrTableCell9.StylePriority.UsePadding = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "xrTableCell9";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell9.Weight = 0.56378697387958532D;
//
// xrTableCell11
//
this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.ServiceRecords.GroupName")});
this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseFont = false;
this.xrTableCell11.Text = "xrTableCell11";
this.xrTableCell11.Weight = 1.2843140200142866D;
//
// xrTableCell10
//
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.ServiceRecords.Notice")});
this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
this.xrTableCell10.Multiline = true;
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseFont = false;
this.xrTableCell10.Text = "xrTableCell10";
this.xrTableCell10.Weight = 3.6598639455782309D;
//
// GroupHeader2
//
this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable2});
this.GroupHeader2.HeightF = 25F;
this.GroupHeader2.Name = "GroupHeader2";
this.GroupHeader2.RepeatEveryPage = true;
//
// xrTable2
//
this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTable2.SizeF = new System.Drawing.SizeF(1019F, 25F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UsePadding = false;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell5,
this.xrTableCell6,
this.xrTableCell7,
this.xrTableCell2,
this.xrTableCell12,
this.xrTableCell8});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 1D;
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Text = "Datum";
this.xrTableCell5.Weight = 0.68027210884353728D;
//
// xrTableCell6
//
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Text = "Uhrzeit";
this.xrTableCell6.Weight = 0.88092347580856223D;
//
// xrTableCell7
//
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "Minuten";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell7.Weight = 0.56378697387958532D;
//
// xrTableCell2
//
this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "GroupTypeHeader")});
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Text = "xrTableCell2";
this.xrTableCell2.Weight = 1.2843140200142866D;
//
// xrTableCell8
//
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Text = "Dokumentation";
this.xrTableCell8.Weight = 3.6598639455782314D;
//
// GroupFooter1
//
this.GroupFooter1.HeightF = 0F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel5,
this.xrLabel4,
this.xrLabel3,
this.xrLabel2,
this.xrLabel1});
this.ReportHeader.HeightF = 50F;
this.ReportHeader.Name = "ReportHeader";
//
// xrLabel5
//
this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(175F, 25F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(17F, 25F);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.StylePriority.UseTextAlignment = false;
this.xrLabel5.Text = "-";
this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
//
// xrLabel4
//
this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportEndDate", "{0:dd/MM/yyyy}")});
this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(192.0001F, 25F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(288F, 25F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "xrLabel4";
//
// xrLabel3
//
this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "{0:dd/MM/yyyy}")});
this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(83F, 25F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(92F, 25F);
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.StylePriority.UseTextAlignment = false;
this.xrLabel3.Text = "xrLabel3";
this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrLabel2
//
this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(83F, 25F);
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "Zeitraum:";
//
// xrLabel1
//
this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.SizeF = new System.Drawing.SizeF(1017F, 25F);
this.xrLabel1.StyleName = "Title";
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "Auswertung über geleistete Fachleistungsstunden";
//
// pageFooterBand1
//
this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrPageInfo2,
this.xrPageInfo1});
this.pageFooterBand1.HeightF = 48F;
this.pageFooterBand1.Name = "pageFooterBand1";
//
// xrPageInfo2
//
this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(480.0001F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(536.9999F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
//
// xrPageInfo1
//
this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(7.999929F, 25F);
this.xrPageInfo1.Name = "xrPageInfo1";
this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(271.9999F, 23F);
this.xrPageInfo1.StyleName = "PageInfo";
this.xrPageInfo1.StylePriority.UseFont = false;
//
// Title
//
this.Title.BackColor = System.Drawing.Color.White;
this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.Title.BorderWidth = 1F;
this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
//
// FieldCaption
//
this.FieldCaption.BackColor = System.Drawing.Color.White;
this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.FieldCaption.BorderWidth = 1F;
this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.FieldCaption.ForeColor = System.Drawing.Color.Black;
this.FieldCaption.Name = "FieldCaption";
//
// PageInfo
//
this.PageInfo.BackColor = System.Drawing.Color.White;
this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.PageInfo.BorderWidth = 1F;
this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
//
// DataField
//
this.DataField.BackColor = System.Drawing.Color.White;
this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.DataField.BorderWidth = 1F;
this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
//
// fieldFLS
//
this.fieldFLS.DataMember = "FLSReportGroups";
this.fieldFLS.Expression = "[TotalFLM] / 60";
this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldFLS.Name = "fieldFLS";
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 50F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 50F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrTableCell12
//
this.xrTableCell12.Multiline = true;
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Text = "Leistung";
this.xrTableCell12.Weight = 1.216553761590083D;
//
// xrTableCell13
//
this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.ServiceRecords.ServiceDescription")});
this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
this.xrTableCell13.Multiline = true;
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.StylePriority.UseFont = false;
this.xrTableCell13.Weight = 1.216553761590083D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FLSReportRO);
//
// Leistungsdokumentation
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
this.DetailReport,
this.ReportHeader,
this.pageFooterBand1,
this.topMarginBand1,
this.bottomMarginBand1});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldFLS});
this.DataSource = this.bindingSource1;
this.Landscape = true;
this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 50F);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
this.Title,
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "23.2";
xrWatermark1.Id = "Watermark1";
this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
#endregion
private DevExpress.XtraReports.UI.DetailBand Detail;
private System.Windows.Forms.BindingSource bindingSource1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
private DevExpress.XtraReports.UI.XRControlStyle Title;
private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
private DevExpress.XtraReports.UI.XRControlStyle DataField;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport1;
private DevExpress.XtraReports.UI.DetailBand Detail2;
private DevExpress.XtraReports.UI.XRTable xrTable4;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
}
}

33
ReportImp/KetteReports/FLSListReport.cs Normal file
View File

@@ -0,0 +1,33 @@
using System;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report.ReportObjects;
using BeWo.Report;
namespace KetteReports
{
public partial class Leistungsdokumentation : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<FLSReportRO>
{
public Leistungsdokumentation()
{
InitializeComponent();
}
public void SetReportDataSource(FLSReportRO pRO)
{
//foreach (var group in pRO.FLSReportGroups)
//{
// foreach (var sr in group.ServiceRecords)
// {
// if (!sr.DistanceInMeter.HasValue && sr.ServiceRecordOid.HasValue)
// {
// var srBO = DAOFactory.GenericDAO.LoadByID<ServiceRecord>(sr.ServiceRecordOid.Value);
// sr.DistanceInMeter = srBO.DistanceInMeter;
// }
// }
//}
this.bindingSource1.DataSource = pRO;
}
}
}

120
ReportImp/KetteReports/FLSListReport.resx Normal file
View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

10
ReportImp/KetteReports/KetteReports.csproj
View File

@@ -147,6 +147,12 @@
<Compile Include="FLSGroupReport.Designer.cs">
<DependentUpon>FLSGroupReport.cs</DependentUpon>
</Compile>
<Compile Include="FLSListReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="FLSListReport.Designer.cs">
<DependentUpon>FLSListReport.cs</DependentUpon>
</Compile>
<Compile Include="ListeAbschlagszahlungen.cs">
<SubType>Component</SubType>
</Compile>
@@ -249,6 +255,10 @@
<DependentUpon>FLSGroupReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="FLSListReport.resx">
<DependentUpon>FLSListReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ListeAbschlagszahlungen.resx">
<DependentUpon>ListeAbschlagszahlungen.cs</DependentUpon>
</EmbeddedResource>

46
ReportImp/KetteReports/ServiceRecordListReport.Designer.cs generated
View File

@@ -73,6 +73,9 @@ namespace KetteReports
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -114,6 +117,7 @@ namespace KetteReports
this.xrTableCell1,
this.xrTableCell2,
this.xrTableCell3,
this.xrTableCell14,
this.xrTableCell4});
this.xrTableRow1.FormattingRules.Add(this.formattingRuleGoalsInvisible);
this.xrTableRow1.Name = "xrTableRow1";
@@ -162,7 +166,7 @@ namespace KetteReports
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1,
this.xrTableRow3});
this.xrTable1.SizeF = new System.Drawing.SizeF(1017F, 50F);
this.xrTable1.SizeF = new System.Drawing.SizeF(1019F, 50F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UsePadding = false;
//
@@ -172,6 +176,7 @@ namespace KetteReports
this.xrTableCell9,
this.xrTableCell10,
this.xrTableCell11,
this.xrTableCell15,
this.cellGoalCaption,
this.xrTableCell12});
this.xrTableRow3.Name = "xrTableRow3";
@@ -231,7 +236,8 @@ namespace KetteReports
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.Detail1.HeightF = 50F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
@@ -265,7 +271,7 @@ namespace KetteReports
this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTable2.SizeF = new System.Drawing.SizeF(1017F, 25F);
this.xrTable2.SizeF = new System.Drawing.SizeF(1019F, 25F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UsePadding = false;
@@ -276,6 +282,7 @@ namespace KetteReports
this.xrTableCell5,
this.xrTableCell6,
this.xrTableCell7,
this.xrTableCell13,
this.xrTableCell8});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 1D;
@@ -348,13 +355,13 @@ namespace KetteReports
// xrPageInfo2
//
this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo2.Format = "Seite {0} von {1}";
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(390.4999F, 6.00001F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(626.4999F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
//
// xrPageInfo1
//
@@ -489,6 +496,30 @@ namespace KetteReports
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "xrLabel3";
//
// xrTableCell13
//
this.xrTableCell13.Multiline = true;
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Text = "Leistung";
this.xrTableCell13.Weight = 0.81972789115646261D;
//
// xrTableCell14
//
this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceRecordDetailList.ServiceDescription")});
this.xrTableCell14.Multiline = true;
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseBorders = false;
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell14.Weight = 0.81972789115646261D;
//
// xrTableCell15
//
this.xrTableCell15.Multiline = true;
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Weight = 0.81972789115646261D;
//
// Leistungen
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -505,7 +536,7 @@ namespace KetteReports
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.formattingRuleGoalsInvisible});
this.Landscape = true;
this.Margins = new DevExpress.Drawing.DXMargins(75, 75, 50, 50);
this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 50F);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -514,7 +545,7 @@ namespace KetteReports
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "17.1";
this.Version = "23.2";
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -567,5 +598,8 @@ namespace KetteReports
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
}
}

3
ReportImp/KetteReports/ServiceRecordListReport.resx
View File

@@ -117,7 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

2
ReportImp/Mittelpunkt/Mittelpunkt.csproj
View File

@@ -31,6 +31,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.DataAccess.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Office.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -39,6 +40,7 @@
<Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpo.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />

7
ReportImp/Mittelpunkt/Teamstundenkonto.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Linq;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
@@ -30,6 +31,8 @@ namespace Mittelpunkt
{
foreach (var emp in team.EmployeeDetailList)
{
emp.Custom4 = emp.Days.Sum(d => d.SpecialHours);
nacht += emp.Days.Sum(d => d.SpecialHours);
foreach (var day in emp.Days)
{
// Custom1 Samstagsarbeit 13-21 Uhr
@@ -56,10 +59,6 @@ namespace Mittelpunkt
// Custom3 Feiertagsarbeit
emp.Custom3 += day.HoursHoliday;
feiertag += day.HoursHoliday;
// Custom4 Nachtarbeit 21-05:59 Uhr
emp.Custom4 += day.SpecialHours;
nacht += day.SpecialHours;
}
}
}

54
ReportImp/Mittelpunkt/Teamstundenkonto.designer.cs generated
View File

@@ -36,7 +36,6 @@ namespace Mittelpunkt
DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
@@ -103,6 +102,8 @@ namespace Mittelpunkt
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -113,8 +114,6 @@ namespace Mittelpunkt
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.ReportFooter1 = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -361,8 +360,7 @@ namespace Mittelpunkt
this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "MittelbarIst")});
this.cellGesamtGesamt.Name = "cellGesamtGesamt";
xrSummary3.FormatString = "{0:0.00}";
this.cellGesamtGesamt.Summary = xrSummary3;
this.cellGesamtGesamt.TextFormatString = "{0:0.00}";
this.cellGesamtGesamt.Weight = 0.07034238466171662D;
//
// cellRelationGesamt
@@ -721,6 +719,18 @@ namespace Mittelpunkt
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell1.Weight = 0.1723637517853702D;
//
// xrTableCell40
//
this.xrTableCell40.Multiline = true;
this.xrTableCell40.Name = "xrTableCell40";
this.xrTableCell40.Weight = 0.091251378285254509D;
//
// xrTableCell36
//
this.xrTableCell36.Multiline = true;
this.xrTableCell36.Name = "xrTableCell36";
this.xrTableCell36.Weight = 0.10550482044001053D;
//
// xrTableCell7
//
this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -734,9 +744,9 @@ namespace Mittelpunkt
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Custom1")});
this.xrTableCell8.Name = "xrTableCell8";
xrSummary4.FormatString = "{0:0.00}";
xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell8.Summary = xrSummary4;
xrSummary3.FormatString = "{0:0.00}";
xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell8.Summary = xrSummary3;
this.xrTableCell8.Weight = 0.081112310652748321D;
//
// xrTableCell9
@@ -744,8 +754,8 @@ namespace Mittelpunkt
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Custom2")});
this.xrTableCell9.Name = "xrTableCell9";
xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell9.Summary = xrSummary5;
xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell9.Summary = xrSummary4;
this.xrTableCell9.TextFormatString = "{0:0.00}";
this.xrTableCell9.Weight = 0.081112343371616713D;
//
@@ -754,9 +764,9 @@ namespace Mittelpunkt
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Custom3")});
this.xrTableCell10.Name = "xrTableCell10";
xrSummary6.FormatString = "{0:0.00}";
xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell10.Summary = xrSummary6;
xrSummary5.FormatString = "{0:0.00}";
xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell10.Summary = xrSummary5;
this.xrTableCell10.TextFormatString = "{0:0.00}";
this.xrTableCell10.Weight = 0.081112307920662666D;
//
@@ -765,9 +775,9 @@ namespace Mittelpunkt
this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.Custom4")});
this.xrTableCell11.Name = "xrTableCell11";
xrSummary7.FormatString = "{0:0.00}";
xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell11.Summary = xrSummary7;
xrSummary6.FormatString = "{0:0.00}";
xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
this.xrTableCell11.Summary = xrSummary6;
this.xrTableCell11.Weight = 0.0811124973215744D;
//
// xrTableCell12
@@ -800,18 +810,6 @@ namespace Mittelpunkt
this.ReportFooter1.HeightF = 43.75F;
this.ReportFooter1.Name = "ReportFooter1";
//
// xrTableCell36
//
this.xrTableCell36.Multiline = true;
this.xrTableCell36.Name = "xrTableCell36";
this.xrTableCell36.Weight = 0.10550482044001053D;
//
// xrTableCell40
//
this.xrTableCell40.Multiline = true;
this.xrTableCell40.Name = "xrTableCell40";
this.xrTableCell40.Weight = 0.091251378285254509D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);

2
Service/DCEntityMapper/OrganisationDC_Organisation.cs
View File

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

12
Service/ServiceImplementations/AccountingServiceImp.cs
View File

@@ -936,7 +936,7 @@ namespace BeWo.Service.ServiceImplementations
DakotaValidator.ValidateOrganisation(orga);
if (!DakotaValidator.ValidateIKNumbers(orga))
if (!DakotaValidator.ValidateOrganisationInformations(orga))
{
var res = SendApp8GetIKRequest(orga);
@@ -950,10 +950,10 @@ namespace BeWo.Service.ServiceImplementations
orga.IKDatenannahmestelle = res.IKDatenannahmestelle;
orga.IKKostentrager = res.IKKostentrager;
// orgadc.IKKrankenkasse = res.IKKrankenkasse;
orga.BezDatenannahmestelle = res.BezDatenannahmestelle;
if (!DakotaValidator.ValidateIKNumbers(orga))
throw new DakotaException($"Für die Organisation \"{orga.Name}\" konnten die hinterlegten IKs nicht verifiziert werden: \"{orga.IKDatenannahmestelle}\", \"{orga.IKKostentrager}\", \"{orga.IKKrankenkasse}\"", "Interner Fehler");
if (!DakotaValidator.ValidateOrganisationInformations(orga))
throw new DakotaException($"Für die Organisation \"{orga.Name}\" konnten die hinterlegten IKs nicht verifiziert werden: \"{orga.BezDatenannahmestelle}\", \"{orga.IKDatenannahmestelle}\", \"{orga.IKKostentrager}\", \"{orga.IKKrankenkasse}\"", "Interner Fehler");
DAOFactory.GenericDAO.Update(orga);
@@ -1021,8 +1021,8 @@ namespace BeWo.Service.ServiceImplementations
protokoll.Dateityp = "Nutzdatendatei";
protokoll.Dateiname = protokoll.Transfername;
protokoll.AbsenderBezeichnung = "TestAbsBez";
protokoll.EmpfangerBezeichnung = "TestEmpBez";
protokoll.AbsenderBezeichnung = "ownSoft GmbH";
protokoll.EmpfangerBezeichnung = orga.BezDatenannahmestelle;
}
catch (DakotaException de)
{

5
Shared/BeWoEntityEnums.cs
View File

@@ -560,6 +560,11 @@ namespace BS.Shared
BargeldverwaltungFinanzenBearbeiten = 26002,
BargeldverwaltungFinanzenLoeschen = 26003,
Finance_Gkv_View = 26110,
Finance_Gkv_Create = 26111,
Finance_Gkv_Send = 26112,
Finance_Gkv_Delete = 26113,
Customer_EditMedication = 27000,
//MedRecordsAnsehen = 27001,
//MedRecordsAnlegen = 27002,

7
Shared/Core/EnumTranslations.cs
View File

@@ -639,7 +639,7 @@ namespace BS.Shared.Core
{
var dict = new Dictionary<UserRightType, String>();
var action_keywords = new string[] { "ansehen", "verwalten", "anlegen", "bearbeiten", "löschen" };
var action_keywords = new string[] { "ansehen", "verwalten", "anlegen", "bearbeiten", "löschen", "senden" };
dict.Add(UserRightType.CreateAll, Translator.Translate("Alles anlegen"));
@@ -710,6 +710,11 @@ namespace BS.Shared.Core
dict.Add(UserRightType.WohnheimView_Wohneinheit_Belegung_View, Translator.Translate($"Wohnprojekte-> Wohneinheitbelegung {action_keywords[0]}"));
dict.Add(UserRightType.WohnheimView_Wohneinheit_Belegung_Manage, Translator.Translate($"Wohnprojekte-> Wohneinheitbelegung {action_keywords[1]}"));
dict.Add(UserRightType.Finance_Gkv_View, Translator.Translate($"Finanzen-> Gkv Abrechnung {action_keywords[0]}"));
dict.Add(UserRightType.Finance_Gkv_Create, Translator.Translate($"Finanzen-> Gkv Abrechnung {action_keywords[2]}"));
dict.Add(UserRightType.Finance_Gkv_Send, Translator.Translate($"Finanzen-> Gkv Abrechnung {action_keywords[5]}"));
dict.Add(UserRightType.Finance_Gkv_Delete, Translator.Translate($"Finanzen-> Gkv Abrechnung {action_keywords[4]}"));
dict.Add(UserRightType.PersonView_Create, Translator.Translate("Personen anlegen"));
dict.Add(UserRightType.PersonView_Delete, Translator.Translate("Personen löschen"));
dict.Add(UserRightType.Person_AllowArchiving, Translator.Translate("Personen archivieren"));

3
Shared/DataContracts/GkvAbrechnung/GkvApp8GetIKResponse.cs
View File

@@ -20,5 +20,8 @@ namespace BS.Shared.DataContracts.GkvAbrechnung
[DataMember]
public string IKDatenannahmestelle { get; set; }
[DataMember]
public string BezDatenannahmestelle { get; set; }
}
}

3
Shared/DataContracts/OrganisationDC.cs
View File

@@ -45,6 +45,9 @@ namespace BS.Shared.DataContracts
[DataMember]
public string IKDatenannahmestelle { get; set; }
[DataMember]
public string BezDatenannahmestelle { get; set; }
[DataMember]
public ActivationTypeId ActivationType { get; set; }