This commit is contained in:
Christian
2018-05-21 16:39:24 +02:00
parent a44b59079c
commit d20b2ec5bf
102 changed files with 20992 additions and 20197 deletions

View File

@@ -198,7 +198,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="SchulbegleitenderDienst\SchulbegleitenderDienstMitarbeiterBearbeitungsView.xaml">
<Page Include="SchulbegleitenderDienst\VertretenderKlientSearchView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
@@ -206,7 +206,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="SchulbegleitenderDienst\SchulbegleitenderDienstBearbeitungsView.xaml">
<Page Include="SchulbegleitenderDienst\VertretungsSearchView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
@@ -583,21 +583,21 @@
<Compile Include="ProxyLoginView.xaml.cs">
<DependentUpon>ProxyLoginView.xaml</DependentUpon>
</Compile>
<Compile Include="SchulbegleitenderDienst\SchulbegleitenderDienstMitarbeiterBearbeitungsView.xaml.cs">
<DependentUpon>SchulbegleitenderDienstMitarbeiterBearbeitungsView.xaml</DependentUpon>
<Compile Include="SchulbegleitenderDienst\VertretenderKlientSearchView.xaml.cs">
<DependentUpon>VertretenderKlientSearchView.xaml</DependentUpon>
</Compile>
<Compile Include="SchulbegleitenderDienst\KrankheitsZeitraumView.xaml.cs">
<DependentUpon>KrankheitsZeitraumView.xaml</DependentUpon>
</Compile>
<Compile Include="SchulbegleitenderDienst\SchulbegleitenderDienstBearbeitungsView.xaml.cs">
<DependentUpon>SchulbegleitenderDienstBearbeitungsView.xaml</DependentUpon>
<Compile Include="SchulbegleitenderDienst\VertretungsSearchView.xaml.cs">
<DependentUpon>VertretungsSearchView.xaml</DependentUpon>
</Compile>
<Compile Include="SchulbegleitenderDienst\VertretungsMainView.xaml.cs">
<DependentUpon>VertretungsMainView.xaml</DependentUpon>
</Compile>
<Compile Include="SchulbegleitenderDienst\TagesAnsicht.cs" />
<Compile Include="SchulbegleitenderDienst\TagesansichtVM.cs" />
<Compile Include="SchulbegleitenderDienst\TagesVertretung.cs" />
<Compile Include="SchulbegleitenderDienst\WochenAnsicht.cs" />
<Compile Include="SchulbegleitenderDienst\WochenansichtVM.cs" />
<Compile Include="SchulbegleitenderDienst\WochenVertretung.cs" />
<Compile Include="UploadDialog.xaml.cs">
<DependentUpon>UploadDialog.xaml</DependentUpon>
@@ -2002,7 +2002,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Chat\ChatController\ChatController.csproj">
<ProjectReference Include="..\..\..\Chat\ChatController\ChatController.csproj">
<Project>{8a83c4dc-a0b1-4a51-ae1d-366d7a05b298}</Project>
<Name>ChatController</Name>
</ProjectReference>

View File

@@ -46,7 +46,7 @@ namespace BeWo
//public static string Version = "Version 2.0";
public static string Version = "Version 2.4.2";
public static string Version = "Version 2.4.3";
public static int RenderTier = 0;
@@ -486,7 +486,7 @@ namespace BeWo
#if DEBUG
url = String.Format("http://localhost:3777/Host");
//return new Uri("https://app2.bewoplaner.de/service45");
//return new Uri("https://app1.bewoplaner.de/service45");
//url = String.Format("app1.bewoplaner.de/service");
#endif

View File

@@ -295,6 +295,9 @@ namespace BeWo
linkLine.Margin = new Thickness(linkLine.Margin.Left, linkLine.Margin.Top + 25, linkLine.Margin.Right, linkLine.Margin.Bottom);
gridLogin.Height += 25;
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
PinCertificate();
}

View File

@@ -21,16 +21,16 @@ namespace BeWo.SchulbegleitenderDienst
public event EventHandler<KrankheitsEventArgs> RaiseCustomEvent;
private TagesAnsicht tagesAansicht;
private TagesansichtVM tagesAnsicht;
public KrankheitsZeitraumView( DateTime start,DateTime ende, TagesAnsicht tansicht)
public KrankheitsZeitraumView( DateTime start,DateTime ende, TagesansichtVM ta)
{
InitializeComponent();
DateVon.EditValue = start;
DateBis.EditValue = ende;
tagesAansicht = tansicht;
tagesAnsicht = ta;
CloseWindow();
@@ -67,7 +67,7 @@ namespace BeWo.SchulbegleitenderDienst
var b = DateBis.DateTime;
RaiseCustomEvent(this, new KrankheitsEventArgs(a,b,tagesAansicht));
RaiseCustomEvent(this, new KrankheitsEventArgs(a,b,tagesAnsicht));
}
private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
@@ -78,7 +78,7 @@ namespace BeWo.SchulbegleitenderDienst
public class KrankheitsEventArgs : EventArgs
{
public KrankheitsEventArgs(DateTime s, DateTime e, TagesAnsicht t)
public KrankheitsEventArgs(DateTime s, DateTime e, TagesansichtVM t)
{
_start = s;
_end = e;
@@ -87,7 +87,7 @@ namespace BeWo.SchulbegleitenderDienst
private DateTime _start;
private DateTime _end;
private TagesAnsicht _tagesAnsicht;
private TagesansichtVM _tagesAnsicht;
public DateTime Start
{
@@ -98,7 +98,7 @@ namespace BeWo.SchulbegleitenderDienst
get { return _end; }
}
public TagesAnsicht TagesItem
public TagesansichtVM TagesItem
{
get { return _tagesAnsicht; }
}

View File

@@ -1,241 +0,0 @@
<Window x:Class="BeWo.SchulbegleitenderDienst.SchulbegleitenderDienstBearbeitungsView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:view="clr-namespace:BeWo.View"
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:search="clr-namespace:BeWo.View.Search"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
Title="Vertretung auswählen" Height="650" Width="750" WindowStartupLocation="CenterScreen"
ResizeMode="CanResizeWithGrip" WindowStyle="None" Background="Transparent">
<GroupBox Header="Vertretung auswählen" x:Name="rootGroupBox" Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}" MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown" >
<Grid>
<Grid Background="White" x:Name="rootGroupBoxMitarbeiter" Visibility="Collapsed">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="225"/>
<RowDefinition Height="125"/>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<!-- ############################### Oberes 1/3 auswahl Kriterien ################################################ -->
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="250" />
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="100"/>
<RowDefinition Height="125"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<GroupBox Header="Klient Wunsch Kriterien" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
<dxg:LookUpEdit Margin="3" x:Name="TokenBoxWunschAnzeige" ValidateOnTextInput="True" ValidateOnEnterKeyPressed="True" TextWrapping="Wrap" IsReadOnly="True"
MinHeight="50" Width="200" PopupHeight="500" PopupWidth="750" PopupMinHeight="100" PopupMinWidth="100" IsPopupAutoWidth="False" >
<dxg:LookUpEdit.StyleSettings>
<dxg:TokenLookUpEditStyleSettings EnableTokenWrapping="True"/>
</dxg:LookUpEdit.StyleSettings>
</dxg:LookUpEdit>
</GroupBox>
<GroupBox Header="Klient Ausschluss Kriterien" Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="2" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3">
<dxg:LookUpEdit Margin="3" x:Name="TokenBoxAusschlussAnzeige" ValidateOnTextInput="True" ValidateOnEnterKeyPressed="True" TextWrapping="Wrap" IsReadOnly="True"
MinHeight="50" Width="200" PopupHeight="500" PopupWidth="750" PopupMinHeight="100" PopupMinWidth="100" IsPopupAutoWidth="False" >
<dxg:LookUpEdit.StyleSettings>
<dxg:TokenLookUpEditStyleSettings EnableTokenWrapping="True"/>
</dxg:LookUpEdit.StyleSettings>
</dxg:LookUpEdit>
</GroupBox>
<GroupBox Header="Mitarbeiter Wunsch Kriterien" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
<dxe:ComboBoxEdit Margin="3" MinHeight="50" Width="200" x:Name="TokenComboboxWK" TextWrapping="Wrap" VerticalContentAlignment="Top" ImmediatePopup="True" IncrementalFiltering="True" IsKeyboardFocusWithinChanged="TokenComboboxWK_OnIsKeyboardFocusWithinChanged" >
<dxe:ComboBoxEdit.StyleSettings>
<dxe:TokenComboBoxStyleSettings NewTokenPosition="Far" EnableTokenWrapping="True" />
</dxe:ComboBoxEdit.StyleSettings>
<dxmvvm:Interaction.Behaviors>
<dxe:TokenEditorBehavior x:Name="tokenEditorWunschKriterienBehavior" TokensChanged="TokenEditorWunschKriterienBehavior_OnTokensChanged"/>
</dxmvvm:Interaction.Behaviors>
</dxe:ComboBoxEdit>
</GroupBox>
<GroupBox Header="Mitarbeiter Ausschluss Kriterien" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
<dxe:ComboBoxEdit Margin="3" MinHeight="50" Width="200" x:Name="TokenComboboxAK" TextWrapping="Wrap" VerticalContentAlignment="Top" ImmediatePopup="True" IncrementalFiltering="True" IsKeyboardFocusWithinChanged="TokenComboboxAK_OnIsKeyboardFocusWithinChanged" >
<dxe:ComboBoxEdit.StyleSettings>
<dxe:TokenComboBoxStyleSettings NewTokenPosition="Far" EnableTokenWrapping="True" />
</dxe:ComboBoxEdit.StyleSettings>
<dxmvvm:Interaction.Behaviors>
<dxe:TokenEditorBehavior x:Name="tokenEditorAusschlussKriterienBehavior" TokensChanged="TokenEditorAusschlussKriterienBehavior_OnTokensChanged"/>
</dxmvvm:Interaction.Behaviors>
</dxe:ComboBoxEdit>
</GroupBox>
<!-- ########################################### Ende Kriterien ################################################################### -->
<GroupBox Header="Geschlecht" Grid.Row="0" Grid.Column="4" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3">
<WrapPanel Orientation="Horizontal">
<CheckBox Content="männlich" Margin="3,3,3,3" Click="RBMaennlich_OnClick" x:Name="RBMaennlich" IsChecked="True"/>
<CheckBox Content="weiblich" Margin="3,3,3,3" Click="RBWeiblich_OnClick" x:Name="RBWeiblich" IsChecked="True" />
</WrapPanel>
</GroupBox>
<Grid Column="4" Grid.Row="1" Margin="3,3,3,3">
<Grid.RowDefinitions>
<RowDefinition Height="60"/>
<RowDefinition Height="60"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<GroupBox Grid.Row="0" Margin="1" Style="{StaticResource ObjectEditGroupBox}" Header="Klienten PLZ">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<WrapPanel Orientation="Horizontal" Margin="1" HorizontalAlignment="Left" Grid.Column="0">
<Label Content ="Plz:" />
<Label x:Name="LabelPlzKlient" Width="50" />
</WrapPanel>
<WrapPanel Orientation="Horizontal" Margin="1" HorizontalAlignment="Right" Grid.Column="1">
<Label Content="Ort:"/>
<Label x:Name="LabelOrtKlient" Width="100" />
</WrapPanel>
</Grid>
</GroupBox>
<GroupBox Grid.Row="1" Margin="1" Style="{StaticResource ObjectEditGroupBox}" Header="Suche nach">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<WrapPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="1" Grid.Column="0">
<Label Content="Plz:" />
<dxe:TextEdit x:Name="PlzKlient" Height="23" Width="50" VerticalContentAlignment="Center" EditValueChanged="PlzKlient_OnTextChanged" MaskType="RegEx" Mask="\d{1,5}" ShowError="False" />
</WrapPanel>
<WrapPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="1" Grid.Column="1">
<Label Content="Ort:" />
<TextBox x:Name="OrtKlient" Height="23" Width="100" VerticalContentAlignment="Center" TextChanged="OrtKlient_OnTextChanged" />
</WrapPanel>
</Grid>
</GroupBox>
</Grid>
</Grid>
<!-- ################################ 2/3 Vertretungsgedönse ##################################################################################### -->
<GroupBox Header="Vertretungs Zeitraum" Grid.Row="1" Grid.Column="0" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<CheckBox Grid.Column="6" Grid.Row="0" Content="ganztägig" Unchecked="KVCheckBox_OnUnchecked" Checked="KVCheckBox_OnChecked"
Grid.ColumnSpan="2" HorizontalAlignment="Right" x:Name="KVCheckBox" />
<Label Grid.Row="1" Grid.Column="0" Content="Vertretung ab" Margin="3"/>
<Label Grid.Row="2" Grid.Column="0" Content="Vertretung bis" Margin="3" />
<Label Grid.Row="1" Grid.Column="2" Content="Uhrzeit von" Margin="3" x:Name="KVLabelUhrzeitVon" />
<Label Grid.Row="2" Grid.Column="2" Content="Uhrzeit bis" Margin="3" x:Name="KVLabelUhrzeitBis" />
<dxe:DateEdit x:Name="KVDatepickerVon" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="1" Margin="3" Height="23" Width="125" EditValueChanged="KVDatepickerVon_OnEditValueChanged"/>
<dxe:DateEdit x:Name="KVDatepickerBis" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="2" Margin="3" Height="23" Width="125" EditValueChanged="KVDatepickerBis_OnEditValueChanged" />
<dxe:TextEdit Grid.Column="3" Grid.Row="1" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" x:Name="KVDatepicker_UhrzeitVon"
MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
Height="23" Grid.ColumnSpan="2" Visibility="Visible" Width="75"
Margin="3,3,3,3"/>
<dxe:TextEdit Grid.Column="3" Grid.Row="2" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" x:Name="KVDatepicker_UhrzeitBis"
MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor" Width="75"
Height="23" Grid.ColumnSpan="2" Visibility="Visible"
Margin="3,3,3,3"/>
<Label x:Name="lblZuletztVertreten" Grid.Row="1" Grid.Column="5" Margin="3" Content="Zuletzt Vertreten" />
<ListBox Grid.Row="1" Grid.Column="6" Width="100" Grid.RowSpan="2" Margin="3" x:Name="LetzteVertreter" LostFocus="LetzteVertreter_OnLostFocus" SelectionChanged="LetzteVertreter_OnSelectionChanged" />
<!-- ##################### -->
</Grid>
</GroupBox>
<!-- ##################################### unterer 3/3 Mitarbeiter Controll ####################################### -->
<dxg:GridControl x:Name="GridDataControlMitarbeiterVertretungsearchview" Visibility="Visible" Grid.Row="2" Grid.Column="0" AllowDrop="true" Margin="3,3,3,3" VerticalContentAlignment="Center" >
<dxg:GridControl.Columns >
<dxg:GridColumn FieldName="Nachname" Width="125" ReadOnly="True" Header="Nachname"/>
<dxg:GridColumn FieldName="Vorname" Width="125" ReadOnly="True" Header="Vorname"/>
<dxg:GridColumn FieldName="Arbeitszeit" MinWidth="60" ReadOnly="True" Header="Arbeitzeit"/>
<dxg:GridColumn FieldName="Postleitzahl" Width="75" ReadOnly="True" Header="Postleitzahl" />
<dxg:GridColumn FieldName="Straße" Width="100" ReadOnly="True" Header="Starße" />
<dxg:GridColumn FieldName="Stadt" Width="75" ReadOnly="True" Header="Stadt" />
<dxg:GridColumn FieldName="Geschlecht" Width="75" ReadOnly="True" Header="Geschlecht" />
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView AllowPerPixelScrolling="True" ShowTotalSummary="False" AutoWidth="True" />
</dxg:GridControl.View>
</dxg:GridControl>
<StackPanel Grid.Row="3" Grid.Column="0" >
<WrapPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" >
<Button Content="Übernehmen" Width="90" Click="ButtonBase_OnClick" Margin="3,3,3,3" />
<Button Content="Schließen" Width="90" Click="ButtonClose_OnClick" Margin="3,3,3,3"/>
</WrapPanel>
</StackPanel>
</Grid>
</Grid>
</GroupBox>
</Window>

View File

@@ -1,297 +0,0 @@
<Window x:Class="BeWo.SchulbegleitenderDienst.SchulbegleitenderDienstMitarbeiterBearbeitungsView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:view="clr-namespace:BeWo.View"
xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
xmlns:search="clr-namespace:BeWo.View.Search"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
Title="Vertretung auswählen" Height="650" Width="750" WindowStartupLocation="CenterScreen"
ResizeMode="CanResizeWithGrip" WindowStyle="None" Background="Transparent">
<GroupBox Header="Vertretenden auswählen" x:Name="rootGroupBox" Style="{DynamicResource MainContentGroupBoxWithoutMaximizeBtnStyle}" MouseLeftButtonDown="RootGroupBox_OnMouseLeftButtonDown" >
<Grid>
<Grid Background="White" x:Name="rootGroupBoxMitarbeiter" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="225"/>
<RowDefinition Height="125"/>
<RowDefinition Height="*"/>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<!-- ############################### Oberes 1/3 auswahl Kriterien ################################################ -->
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="250" />
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="100"/>
<RowDefinition Height="125"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<GroupBox Header="Mitarbeiter Wunsch Kriterien" Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
<!-- Ready machen für teilweise funktion / Combobox zur auswahl der tokens und TextBox zur anzeige der ausgewählten tokens -->
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<!-- <controls:NullItemComboBox Grid.Row="0" Grid.Column="0" x:Name="MitarbeiterWunschAuswahl" SelectionChanged="MitarbeiterWunschAuswahl_OnSelectionChanged" Width="200" Height="23" Visibility="Collapsed" /> -->
<TextBox Grid.Row="1" Grid.Column="0" Margin="3" x:Name="MitarbeiterWunschAnzeige" MinHeight="50" TextWrapping="Wrap" Width="200" IsReadOnly="True" />
</Grid>
</GroupBox>
<GroupBox Header="Mitarbeiter Ausschluss Kriterien" Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="2" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3">
<!-- Ready machen für teilweise funktion <ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/> <RowDefinition Height="Auto"/>-->
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<!-- <controls:NullItemComboBox Grid.Row="0" Grid.Column="0" x:Name="MitarbeiterAussschlussAuswahl" SelectionChanged="MitarbeiterAussschlussAuswahl_OnSelectionChanged" Width="200" Height="23" Visibility="Collapsed"/> -->
<TextBox Grid.Row="1" Margin="3" Grid.Column="0" x:Name="MitarbeiterAussschlussAnzeige" Width="200" MinHeight="50" TextWrapping="Wrap" IsReadOnly="True"/>
</Grid>
</GroupBox>
<GroupBox Header="Klient Wunsch Kriterien" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
<!-- ############### wird durch Token Combobox mit devexpress vers. 17 ersetzt ################################## -->
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<controls:NullItemComboBox Grid.Row="0" Grid.Column="0" x:Name="KlientWunschAuswahl" SelectionChanged="KlientWunschAuswahl_OnSelectionChanged" Width="200" Height="23" />
<TextBox Grid.Row="1" Margin="3" Grid.Column="0" x:Name="KlientWunschAnzeige" Width="200" MinHeight="50" TextWrapping="Wrap" IsReadOnly="True"/>
</Grid>
<!-- ############################################################################################################## -->
</GroupBox>
<GroupBox Header="Klient Ausschluss Kriterien" Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
<!-- ############### wird durch Token Combobox mit devexpress vers. 17 ersetzt ################################## -->
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<controls:NullItemComboBox Grid.Row="0" Grid.Column="0" x:Name="KlientAussschlussAuswahl" SelectionChanged="KlientAussschlussAuswahl_OnSelectionChanged" Width="200" Height="23" />
<TextBox Grid.Row="1" Margin="3" Grid.Column="0" x:Name="KlientAussschlussAnzeige" Width="200" MinHeight="50" TextWrapping="Wrap" IsReadOnly="True"/>
</Grid>
<!-- ############################################################################################################## -->
</GroupBox>
<GroupBox Header="Geschlecht" Grid.Row="0" Grid.Column="4" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3">
<WrapPanel Orientation="Horizontal">
<CheckBox Content="männlich" Margin="3,3,3,3" Click="RBMaennlich_OnClick" x:Name="RBMaennlich" IsChecked="True"/>
<CheckBox Content="weiblich" Margin="3,3,3,3" Click="RBWeiblich_OnClick" x:Name="RBWeiblich" IsChecked="True" />
</WrapPanel>
</GroupBox>
<Grid Column="4" Grid.Row="1" Margin="3,3,3,3">
<Grid.RowDefinitions>
<RowDefinition Height="60"/>
<RowDefinition Height="60"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<GroupBox Grid.Row="0" Margin="1" Style="{StaticResource ObjectEditGroupBox}" Header="Klienten PLZ">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<WrapPanel Orientation="Horizontal" Margin="1" HorizontalAlignment="Left" Grid.Column="0">
<Label Content ="Plz:" />
<Label x:Name="LabelPlzMitarbeiter" Width="50" />
</WrapPanel>
<WrapPanel Orientation="Horizontal" Margin="1" HorizontalAlignment="Right" Grid.Column="1">
<Label Content="Ort:"/>
<Label x:Name="LabelOrtMitarbeiter" Width="100" />
</WrapPanel>
</Grid>
</GroupBox>
<GroupBox Grid.Row="1" Margin="1" Style="{StaticResource ObjectEditGroupBox}" Header="Suche nach">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<WrapPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="1" Grid.Column="0">
<Label Content="Plz:" />
<dxe:TextEdit x:Name="PlzMitarbeiter" Height="23" Width="50" VerticalContentAlignment="Center" EditValueChanged="PlzMitarbeiter_OnEditValueChanged" MaskType="RegEx" Mask="\d{1,5}" ShowError="False" />
</WrapPanel>
<WrapPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="1" Grid.Column="1">
<Label Content="Ort:" />
<TextBox x:Name="OrtMitarbeiter" Height="23" Width="100" VerticalContentAlignment="Center" TextChanged="OrtMitarbeiter_OnTextChanged" />
</WrapPanel>
</Grid>
</GroupBox>
</Grid>
</Grid>
<!-- ##################################################################################################################### -->
<!--Bereich einfügen um auszuwählen ob ganzen tag oder nur teilweise -->
<GroupBox Header="Vertretungs Zeitraum" Grid.Row="1" Grid.Column="0" Style="{StaticResource ObjectEditGroupBox}" Margin="3,3,3,3" >
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<CheckBox Grid.Column="2" Grid.Row="0" Grid.ColumnSpan="2" Content="ganztägig" Unchecked="KVCheckBox_OnUnchecked" Checked="KVCheckBox_OnChecked"
HorizontalAlignment="Left" x:Name="KVCheckBox" />
<Label Grid.Row="1" Grid.Column="0" Content="Vertretung ab" />
<Label Grid.Row="2" Grid.Column="0" Content="Vertretung bis" />
<Label Grid.Row="1" Grid.Column="2" Content="Uhrzeit von" x:Name="KVLabelUhrzeitVon" />
<Label Grid.Row="2" Grid.Column="2" Content="Uhrzeit bis" x:Name="KVLabelUhrzeitBis" />
<dxe:DateEdit x:Name="KVDatepickerVon" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="1" Margin="3" Height="23" Width="125" EditValueChanged="KVDatepickerVon_OnEditValueChanged"/>
<dxe:DateEdit x:Name="KVDatepickerBis" MaskType="DateTimeAdvancingCaret" Grid.Column="1" Grid.Row="2" Margin="3" Height="23" Width="125" EditValueChanged="KVDatepickerBis_OnEditValueChanged" />
<dxe:TextEdit Grid.Column="3" Grid.Row="1" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" x:Name="KVDatepicker_UhrzeitVon"
MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor"
Height="23" Grid.ColumnSpan="2" Visibility="Visible" Width="75"
Margin="3,3,3,3"/>
<dxe:TextEdit Grid.Column="3" Grid.Row="2" MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" ShowError="False" MaskShowPlaceHolders="True" x:Name="KVDatepicker_UhrzeitBis"
MaskUseAsDisplayFormat="True" InvalidValueBehavior="AllowLeaveEditor" Width="75"
Height="23" Grid.ColumnSpan="2" Visibility="Visible"
Margin="3,3,3,3"/>
</Grid>
</GroupBox>
<!--##################################################################-->
<!-- ##################################### unterer 2/3 Mitarbeiter Controll ####################################### -->
<!--<search:EmployeeSearchView Grid.Row="2" Grid.Column="0" x:Name="MitarbeiterVertretungsearchview" Margin="3,3,3,3" ItemSelected="MitarbeiterVertretungsearchview_OnItemSelected" />-->
<!-- Aus der SearchView ein Grid Bauen das mehr Informationen Enthält / zurzeit Name Adresse Arbeitszeit -->
<dxg:GridControl x:Name="GridDataControlKlientVertretungsearchview" Visibility="Visible" Grid.Row="2" Grid.Column="0" AllowDrop="true" Margin="3,3,3,3" VerticalContentAlignment="Center" >
<dxg:GridControl.Columns >
<dxg:GridColumn FieldName="Name" Width="155" ReadOnly="True" Header="Name"/>
<dxg:GridColumn FieldName="Postleitzahl" Width="75" ReadOnly="True" Header="Postleitzahl" />
<dxg:GridColumn FieldName="Straße" Width="100" ReadOnly="True" Header="Starße" />
<dxg:GridColumn FieldName="Stadt" Width="105" ReadOnly="True" Header="Stadt" />
<dxg:GridColumn FieldName="Geschlecht" Width="75" ReadOnly="True" Header="Geschlecht" />
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView AllowPerPixelScrolling="True" ShowTotalSummary="False" AutoWidth="True" />
</dxg:GridControl.View>
</dxg:GridControl>
<!-- ################################################################################################## Margin="3,3,3,3"-->
<StackPanel Grid.Row="3" Grid.Column="0" >
<WrapPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" >
<Button Content="Übernehmen" Width="90" Click="ButtonBase_OnClick" Margin="3,3,3,3" />
<Button Content="Schließen" Width="90" Click="ButtonClose_OnClick" Margin="3,3,3,3"/>
</WrapPanel>
</StackPanel>
<!-- ####################### Closed="popup_Closed" Opened="popup_Opened"###StaysOpen="False"Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" #################################################################################### -->
</Grid>
</Grid>
</GroupBox>
</Window>

View File

@@ -1,645 +0,0 @@
using System;
using System.Linq;
using System.Windows;
using System.Windows.Input;
using System.Windows.Media;
using BeWo.ServiceProxy;
using BeWo.ViewModel;
using BS.Shared.Extensions;
using System.Windows.Controls;
using System.Net.Sockets;
using System.Threading;
using System.Windows.Threading;
using System.Collections;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
using System.Globalization;
using System.IO;
using System.Net;
using System.Text;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Forms;
using System.Windows.Media.Imaging;
using BeWo.Controls;
using BeWo.Core;
using BeWo.Core.Service;
using BeWo.View.Detail;
using BeWo.ViewModel.ListViewModel;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using DevExpress.Xpf.Core;
using DevExpress.Xpf.Editors;
using DevExpress.XtraPrinting.Native;
using DevExpress.XtraPrinting.XamlExport;
using Microsoft.Office.Interop.Word;
using Color = System.Drawing.Color;
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
using MessageBox = System.Windows.MessageBox;
using TextBox = System.Windows.Controls.TextBox;
namespace BeWo.SchulbegleitenderDienst
{
public partial class SchulbegleitenderDienstMitarbeiterBearbeitungsView
{
public event EventHandler<CustomKlientEventArgs> RaiseCustomEvent;
//public event EventHandler<CustomKlientEventArgs> RaiseKlientCustomEvent;
private DateTime? _startDate;
private DateTime? _endDate;
private List<SearchKlientViewDaten> _dataListEmployee = new List<SearchKlientViewDaten>();
private readonly long? _employeeOid = 10;
List<SearchKlientViewDaten> aktuelleDaten = new List<SearchKlientViewDaten>();
List<SearchKlientViewDaten> alleMitarbeiterDaten = new List<SearchKlientViewDaten>();
private Dictionary<string, CompactTokenDC> verfuegbareW = new Dictionary<string, CompactTokenDC>();
private Dictionary<string, CompactTokenDC> gesetzteW = new Dictionary<string, CompactTokenDC>();
private Dictionary<string, CompactTokenDC> verfuegbareA = new Dictionary<string, CompactTokenDC>();
private Dictionary<string, CompactTokenDC> gesetzteA = new Dictionary<string, CompactTokenDC>();
public SchulbegleitenderDienstMitarbeiterBearbeitungsView(DateTime? startdate, DateTime? enddate, DateTime currentDate, long? employeeOid)
{
InitializeComponent();
CloseWindow();
SetMitarbeiterKriteria();
SetMitarbeiterInformationen();
GetAllKlienttokens();
LoadAllKlientenIngridData();
rootGroupBox.Header += " / " + currentDate.ToString("dddd dd.MM.yyyy");
_startDate = startdate;
_endDate = enddate;
_employeeOid = employeeOid;
if (_startDate != null)
KVDatepickerVon.EditValue = _startDate;
if (_endDate != null)
KVDatepickerBis.EditValue = _endDate;
KVCheckBox.IsChecked = true;
//Width = System.Windows.SystemParameters.PrimaryScreenWidth / 2;
//Height = System.Windows.SystemParameters.PrimaryScreenWidth / 2;
}
private void RootGroupBox_OnMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
try
{
DragMove();
}
catch (Exception)
{
}
}
private void CloseWindow()
{
CommandBindings.Add(
new CommandBinding(
ApplicationCommands.Close,
(s, e) =>
{
Close();
}));
}
private void SetMitarbeiterKriteria()
{
var tokenlist = ServiceFacade.DoOperationsServiceSync(r => r.GetAllTokens(SchulbegleitenderZugehoerigkeitsTyp.Mitarbeiter, _employeeOid));
foreach (var tkList in tokenlist)
{
if (tkList.TokenType == TokenTyp.WunschKriterium)
{
MitarbeiterWunschAnzeige.Text = tkList.Beschreibung + "; ";
}
else if (tkList.TokenType == TokenTyp.AusschlussKriterium)
{
MitarbeiterAussschlussAnzeige.Text = tkList.Beschreibung + "; ";
}
}
}
private void GetAllKlienttokens()
{
verfuegbareW.Clear();
gesetzteW.Clear();
verfuegbareA.Clear();
gesetzteA.Clear();
ServiceFacade.DoOperationsServiceAsync(
r => r.GetAllTokens(SchulbegleitenderZugehoerigkeitsTyp.Klient, 0), x => this.Dispatch(delegate
{
List<string> wunschliste = new List<string>();
List<string> ausschlussliste = new List<string>();
foreach (var token in x)
{
if (token.TokenType == TokenTyp.WunschKriterium)
{
if (!verfuegbareW.ContainsKey(token.Beschreibung))
verfuegbareW.Add(token.Beschreibung, token);
wunschliste.Add(token.Beschreibung);
}
if (token.TokenType == TokenTyp.AusschlussKriterium)
{
if (!verfuegbareA.ContainsKey(token.Beschreibung))
verfuegbareA.Add(token.Beschreibung, token);
ausschlussliste.Add(token.Beschreibung);
}
}
KlientWunschAuswahl.ItemsSource = wunschliste;
KlientAussschlussAuswahl.ItemsSource = ausschlussliste;
}));
}
private void KlientWunschAuswahl_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
{
var item = sender as NullItemComboBox;
if (item.SelectedItem != null && !item.SelectedItem.ToString().Equals(""))
{
KlientWunschAnzeige.Text += item.SelectedItem + "; ";
KlientWunschAuswahl.SelectedIndex = 0;
SortKlientliste();
}
}
private void KlientAussschlussAuswahl_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
{
var item = sender as NullItemComboBox;
if (item.SelectedItem != null && !item.SelectedItem.ToString().Equals(""))
{
KlientAussschlussAnzeige.Text += item.SelectedItem + "; ";
KlientAussschlussAuswahl.SelectedIndex = 0;
SortKlientliste();
}
}
public void SortKlientliste()
{
List<SearchKlientViewDaten> nSVD = new List<SearchKlientViewDaten>();
var x = ServiceFacade.DoOperationsServiceSync(r => r.GetCustomer2TokenList());
bool isAusschluss = false;
foreach (var daten in alleMitarbeiterDaten)
{
foreach (var item in x)
{
if (daten.CustomerDC.CustomerOid == item.Customer.CustomerOid)
{
foreach (var gesA in gesetzteA)
{
if (item.Token.TokenOid == gesA.Value.TokenOid)
{
if (!nSVD.Contains(daten))
nSVD.Add(daten);
isAusschluss = true;
}
}
foreach (var gesW in gesetzteW)
{
if (item.Token.TokenOid == gesW.Value.TokenOid)
{
if (isAusschluss)
{
isAusschluss = false;
}
else
{
if (!nSVD.Contains(daten))
nSVD.Add(daten);
}
}
}
if (isAusschluss)
{
isAusschluss = false;
}
}
}
}
GridDataControlKlientVertretungsearchview.ItemsSource = nSVD;
GridDataControlKlientVertretungsearchview.RefreshData();
GridDataControlKlientVertretungsearchview.RefreshUI();
aktuelleDaten = nSVD;
}
private void RBMaennlich_OnClick(object sender, RoutedEventArgs e)
{
bool isOtherActive = RBWeiblich.IsChecked.Value;
if (RBMaennlich.IsChecked.Value)
{
GeschlechtsUmwandlung(3, isOtherActive);
}
else
{
GeschlechtsUmwandlung(1, isOtherActive);
}
}
private void RBWeiblich_OnClick(object sender, RoutedEventArgs e)
{
bool isOtherActive = RBMaennlich.IsChecked.Value;
if (RBWeiblich.IsChecked.Value)
{
GeschlechtsUmwandlung(4, isOtherActive);
}
else
{
GeschlechtsUmwandlung(2, isOtherActive);
}
}
private void GeschlechtsUmwandlung(int i, bool isOtherActive)
{
List<SearchKlientViewDaten> newItems = new List<SearchKlientViewDaten>();
// 1 == entferne jungs | 2 == entferne mädels | 3 füge jungs hinzu | 4 füge mädels hinzu
if (i == 1)
{
foreach (var item in aktuelleDaten)
{
if (item.Geschlecht.Equals("Weiblich") && isOtherActive)
{
newItems.Add(item);
}
}
}
else if (i == 2)
{
foreach (var item in aktuelleDaten)
{
if (item.Geschlecht.Equals("Männlich") && isOtherActive)
{
newItems.Add(item);
}
}
}
else if (i == 3)
{
foreach (var item in aktuelleDaten)
{
if (!item.Geschlecht.Equals("Weiblich") && isOtherActive == false)
{
newItems.Add(item);
}
else if (isOtherActive)
{
newItems.Add(item);
}
}
}
else if (i == 4)
{
foreach (var item in aktuelleDaten)
{
if (!item.Geschlecht.Equals("Männlich") && isOtherActive == false)
{
newItems.Add(item);
}
else if (isOtherActive)
{
newItems.Add(item);
}
}
}
GridDataControlKlientVertretungsearchview.ItemsSource = newItems;
GridDataControlKlientVertretungsearchview.RefreshData();
GridDataControlKlientVertretungsearchview.RefreshUI();
}
private void SetMitarbeiterInformationen()
{
var employee = ServiceFacade.DoEmployeeServiceSync(r => r.GetEmployeeByID(_employeeOid.Value));
LabelPlzMitarbeiter.Content = employee.PostalCode;
LabelOrtMitarbeiter.Content = employee.Town;
}
private void PlzMitarbeiter_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
{
bool ruecksetzpunkt = false;
List<SearchKlientViewDaten> ndaten = new List<SearchKlientViewDaten>();
foreach (var daten in alleMitarbeiterDaten)
{
if (daten.Postleitzahl != null)
{
if (daten.Postleitzahl.StartsWith(PlzMitarbeiter.Text))
{
ndaten.Add(daten);
}
}
if (daten.Postleitzahl != null && PlzMitarbeiter.Text.Length == 0)
{
if (!ruecksetzpunkt)
ruecksetzpunkt = true;
}
}
if (ruecksetzpunkt)
{
GridDataControlKlientVertretungsearchview.ItemsSource = alleMitarbeiterDaten;
//aktuelleDaten = alleMitarbeiterDaten; // sollte sich so verhalten wie bei geschlecht
}
else
{
GridDataControlKlientVertretungsearchview.ItemsSource = ndaten;
// aktuelleDaten = ndaten;
}
GridDataControlKlientVertretungsearchview.RefreshData();
GridDataControlKlientVertretungsearchview.RefreshUI();
}
private void OrtMitarbeiter_OnTextChanged(object sender, TextChangedEventArgs e)
{
bool ruecksetzpunkt = false;
List<SearchKlientViewDaten> ndaten = new List<SearchKlientViewDaten>();
foreach (var daten in alleMitarbeiterDaten)
{
if (daten.Stadt != null)
{
if (daten.Stadt.StartsWith(OrtMitarbeiter.Text))
{
ndaten.Add(daten);
}
}
if (daten.Stadt != null && OrtMitarbeiter.Text.Length == 0)
{
if (!ruecksetzpunkt)
ruecksetzpunkt = true;
}
}
if (ruecksetzpunkt)
{
GridDataControlKlientVertretungsearchview.ItemsSource = alleMitarbeiterDaten;
//aktuelleDaten = alleMitarbeiterDaten;
}
else
{
GridDataControlKlientVertretungsearchview.ItemsSource = ndaten;
// aktuelleDaten = ndaten;
}
GridDataControlKlientVertretungsearchview.RefreshData();
GridDataControlKlientVertretungsearchview.RefreshUI();
}
// ################ Vertretungszeitraumswahl ##############################################
private void KVCheckBox_OnUnchecked(object sender, RoutedEventArgs e)
{
KVDatepicker_UhrzeitBis.Text = "";
KVDatepicker_UhrzeitBis.Visibility = Visibility.Visible;
KVLabelUhrzeitVon.Visibility = Visibility.Visible;
KVDatepicker_UhrzeitVon.Text = "";
KVDatepicker_UhrzeitVon.Visibility = Visibility.Visible;
KVLabelUhrzeitBis.Visibility = Visibility.Visible;
}
private void KVCheckBox_OnChecked(object sender, RoutedEventArgs e)
{
KVDatepicker_UhrzeitBis.Visibility = Visibility.Collapsed;
KVLabelUhrzeitVon.Visibility = Visibility.Collapsed;
KVDatepicker_UhrzeitVon.Visibility = Visibility.Collapsed;
KVLabelUhrzeitBis.Visibility = Visibility.Collapsed;
}
private void KVDatepickerVon_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
{
DateEdit ed = (DateEdit)sender;
DateTime date = ed.DateTime;
if (date > _endDate.Value || date < _startDate.Value)
{
KVDatepickerVon.EditValue = _startDate.Value;
}
}
private void KVDatepickerBis_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
{
DateEdit ed = (DateEdit)sender;
DateTime date = ed.DateTime;
if (date < _startDate.Value || date > _endDate.Value)
{
KVDatepickerBis.EditValue = _endDate.Value;
}
}
//################################################################################################
private void LoadAllKlientenIngridData()
{
ServiceFacade.DoCustomerServiceAsync(s => s.GetAllActiveCompactCustomers(), customerList => this.Dispatch(
delegate
{
foreach (var cus in customerList)
{
var geschlecht = cus.Sex == Sex.Male ? "Männlich" : "Weiblich";
_dataListEmployee.Add(
new SearchKlientViewDaten(cus.FirstName + " " + cus.LastName, cus.PostalCode, cus.Street, cus.Town, cus, geschlecht));
}
GridDataControlKlientVertretungsearchview.ItemsSource = _dataListEmployee;
aktuelleDaten = _dataListEmployee;
alleMitarbeiterDaten = _dataListEmployee;
}));
}
private void ButtonClose_OnClick(object sender, RoutedEventArgs e)
{
Close();
}
private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
{
//Rückgabe der Daten
var item = GridDataControlKlientVertretungsearchview.SelectedItem as SearchKlientViewDaten;
CompactCustomerDC x = item.CustomerDC;
if (GridDataControlKlientVertretungsearchview.SelectedItem != null)
{
if (_startDate.HasValue && _endDate.HasValue && KVCheckBox.IsChecked.Value)
{
RaiseCustomEvent(this, new CustomKlientEventArgs(x, _startDate, _endDate));
Close();
}
else if (!KVDatepickerVon.Text.Equals("") && !KVDatepickerBis.Text.Equals("") && _startDate.HasValue && _endDate.HasValue && !KVDatepicker_UhrzeitVon.Text.Equals("") && !KVDatepicker_UhrzeitBis.Text.Equals(""))
{
var von = KVDatepicker_UhrzeitVon.Text;
var bis = KVDatepicker_UhrzeitBis.Text;
if (von.Length < 5)
{
von = "0" + von;
}
if (bis.Length < 5)
{
bis = "0" + bis;
}
DateTime dateVon = DateTime.ParseExact(von, "HH:mm", CultureInfo.CurrentCulture);
DateTime dateBis = DateTime.ParseExact(bis, "HH:mm", CultureInfo.CurrentCulture);
if (dateVon > dateBis)
{
MessageBox.Show("Die Startzeit darf nicht größer sein als die Endzeit.");
}
else
{
DateTime? xVon = new DateTime(_startDate.Value.Year, _startDate.Value.Month, _startDate.Value.Day, dateVon.Hour, dateVon.Minute, dateVon.Second);
DateTime? xBis = new DateTime(_endDate.Value.Year, _endDate.Value.Month, _endDate.Value.Day, dateBis.Hour, dateBis.Minute, dateBis.Second);
RaiseCustomEvent(this, new CustomKlientEventArgs(x, xVon, xBis));
Close();
}
}
else
{
if (_startDate.HasValue && _endDate.HasValue && (KVDatepicker_UhrzeitVon.Text.Equals("") || KVDatepicker_UhrzeitBis.Text.Equals("")) && !KVCheckBox.IsChecked.Value)
{
MessageBox.Show("Bitte Geben sie eine Start Uhrzeit und eine End Uhrzeit an.");
}
else
{
MessageBox.Show("Bitte Geben sie ein Start und ein Enddatum an.");
}
}
}
else
{
MessageBox.Show("Bitte wählen sie zuerst einen Klienten aus.");
}
}
}
public class CustomKlientEventArgs : EventArgs
{
private CompactCustomerDC dc;
private DateTime? startdt;
private DateTime? enddt;
public CustomKlientEventArgs(CompactCustomerDC s, DateTime? start, DateTime? ende)
{
dc = s;
startdt = start;
enddt = ende;
}
public CompactCustomerDC Message
{
get { return dc; }
}
public DateTime? StartDate
{
get { return startdt; }
}
public DateTime? EndDate
{
get { return enddt; }
}
}
public class SearchKlientViewDaten
{
public string Name { get; set; }
public string Postleitzahl { get; set; }
public string Straße { get; set; }
public string Stadt { get; set; }
public string Geschlecht { get; set; }
public CompactCustomerDC CustomerDC { get; set; }
public SearchKlientViewDaten(string name, string postleitzahl, string strasse, string stadt, CompactCustomerDC comcudc, string geschlecht)
{
Name = name;
Postleitzahl = postleitzahl;
Straße = strasse;
Stadt = stadt;
CustomerDC = comcudc;
Geschlecht = geschlecht;
}
}
}

View File

@@ -35,8 +35,33 @@
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<GroupBox Header="Wunschkriterien" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="0" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<GroupBox Header="Ausschlusskriterien" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="0" >
<dxe:ComboBoxEdit Margin="3" MinHeight="150" Width="400" x:Name="ComboWunschAnzeige" TextWrapping="Wrap" VerticalContentAlignment="Top" ImmediatePopup="True"
IncrementalFiltering="True" Grid.Row="0" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="2" IsKeyboardFocusWithinChanged="ComboWunschAnzeige_OnIsKeyboardFocusWithinChanged" >
<dxe:ComboBoxEdit.StyleSettings>
<dxe:TokenComboBoxStyleSettings NewTokenPosition="Far" EnableTokenWrapping="True" />
</dxe:ComboBoxEdit.StyleSettings>
<dxmvvm:Interaction.Behaviors>
<dxe:TokenEditorBehavior x:Name="tokenEditorBehavior" TokensChanged="TokenEditorWunschBehavior_OnTokensChanged"/>
</dxmvvm:Interaction.Behaviors>
</dxe:ComboBoxEdit>
</Grid>
</GroupBox>
<GroupBox Header="Ausschlusskriterien" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -65,35 +90,6 @@
<GroupBox Header="Wunschkriterien" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="1" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<dxe:ComboBoxEdit Margin="3" MinHeight="150" Width="400" x:Name="ComboWunschAnzeige" TextWrapping="Wrap" VerticalContentAlignment="Top" ImmediatePopup="True"
IncrementalFiltering="True" Grid.Row="0" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="2" IsKeyboardFocusWithinChanged="ComboWunschAnzeige_OnIsKeyboardFocusWithinChanged" >
<dxe:ComboBoxEdit.StyleSettings>
<dxe:TokenComboBoxStyleSettings NewTokenPosition="Far" EnableTokenWrapping="True" />
</dxe:ComboBoxEdit.StyleSettings>
<dxmvvm:Interaction.Behaviors>
<dxe:TokenEditorBehavior x:Name="tokenEditorBehavior" TokensChanged="TokenEditorWunschBehavior_OnTokensChanged"/>
</dxmvvm:Interaction.Behaviors>
</dxe:ComboBoxEdit>
</Grid>
</GroupBox>
<GroupBox Header="Vertretungs-Einstellungen" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="2" Visibility="Collapsed" x:Name="VertretungsEinstellungen">
<Grid>
<Grid.ColumnDefinitions>

View File

@@ -1,58 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using BS.Shared;
using BS.Shared.DataContracts;
namespace BeWo.SchulbegleitenderDienst
{
public class TagesAnsicht
{
public VertretungDC VertretungsDC { get; set; }
public AbsenceTimeDC AbsenceTimeDC { get; set; }
public DateTime StartD { get; set; }
public DateTime EndD { get; set; }
public Dictionary<AppointmentDayOfWeek, string> Wochentagsarbeitszeit { get; set; }
public long MitarbeiterOid { get; set; }
public long KlientOid { get; set; }
public long VertreterOid { get; set; }
//----------------------------------------------------------------
public string KrankerMitarbeiter { get; set; }
public string Arbeitszeit { get; set; }
public string Kunde { get; set; }
public string Vertretung { get; set; }
public DateTime KrankheitsMeldung { get; set; }
public string KrankheitsZeitraum { get; set; }
public string VertretungsZeitraum { get; set; }
public AbsenceReasonDC AbwesenheitsKategorie { get; set; }
public string Beschreibung { get; set; }
//public string MaFehlzeit { get; set; }
//public string KindFehlzeit { get; set; }
//public int ParentId { get; set; }
//public int Oid { get; set; }
//Farbe der Jeweiligen Zeile
public int IsKunde { get; set; }
public int IsMitarbeiter { get; set; }
public bool IsMitarbeiterKrank { get; set; }
public bool IsCustomerKrank { get; set; }
public string WochenansichtBemerkung { get; set; }
}
}

View File

@@ -15,287 +15,85 @@ namespace BeWo.SchulbegleitenderDienst
{
class TagesVertretung
{
#region variablen
private SchulbegleitenderDienstBearbeitungsView _view;
private VertretungsSearchView _view;
private KrankheitsZeitraumView _krankView;
private List<TagesAnsicht> _items;
#endregion
#region Lade Tages Ansicht
public List<TagesAnsicht> VerarbeiteItemZuTagesAnsicht(VertretungsListeItemsDC item)
public TagesansichtVM ErstelleTagesansichtVM(VertretungsItemDC item)
{
_items = new List<TagesAnsicht>();
int i = 0, y = 0;
if (!item.VertretenderMitarbeiter.Equals(""))
var vm = new TagesansichtVM()
{
i = 1;
}
if (!item.EmployeeName.Equals(""))
{
y = 1;
}
if (item.Customer.Count != 0)
{
#region add Foreach Customers
foreach (var customer in item.Customer)
{
TagesAnsicht xyc = CreateSchulbegleitenderDienst(item, y);
if (item.Vertretung != null)
{
if (item.Vertretung.CustomerOid == customer.Key)
{
xyc = Vertretungsgedoense(xyc, item, i);
xyc.VertreterOid = item.VertetenderMit;
}
else
{
xyc.Vertretung = "";
}
if (item.Vertretung.VertretenderMitarbeiterOid == 0)
{
xyc.IsKunde = 0;
}
}
else
{
xyc.IsKunde = 0;
xyc.Vertretung = "";
}
xyc.AbsenceTimeDC = item.Absencetime;
xyc.MitarbeiterOid = item.EmployeeOid;
xyc.KlientOid = customer.Key;
xyc.Kunde = customer.Value;
xyc.WochenansichtBemerkung = item.WochenansichtBemerkung;
//xyc.Beschreibung = item.Bemerkung;//nur anzeigen wenn gewollt das man die Message Von der Krankmeldung sieht
if (item.EmployeeName.Equals(""))
{
i = 2;
xyc.IsKunde = i;
}
//neu
if (item.isMitarbeiterKrank)
{
xyc.IsMitarbeiterKrank = true;
xyc.IsKunde = 2;
// hier den Tag merken um auch für WOCHEN bereich die spalte orange zu machen
}
if (item.isCustomerKrank)
{
xyc.IsCustomerKrank = true;
xyc.IsKunde = 2;
}
//hier bereich zu abfrage Vertretung Gewünscht / nicht gewünscht
//################## Besser auf Server auslagern ?? #############################################
List<long> custOid = new List<long>();
custOid.Add(customer.Key);
var cus = ServiceFacade.DoCustomerServiceSync(r => r.GetCustomersById(custOid));
foreach (var c in cus)
{
// 1 für Grün | 0 für Rot
if (c.VertretungDringendErforderlich == false && c.VertretungGewuenscht == false)
{
//anzeige Grün machen
xyc.IsKunde = 1;
}
//else if (c.VertretungDringendErforderlich == false && c.VertretungGewuenscht == true)
//{
// // anzeige noral halten
// xyc.IsKunde = 2;
//}
//else if (c.VertretungDringendErforderlich == true && c.VertretungGewuenscht == true)
//{
// //anzeige normal halten
// xyc.IsKunde = 2;
//}
}
//############################
_items.Add(xyc);
}
#endregion
}
else
{
#region add without customer
TagesAnsicht xyc = CreateSchulbegleitenderDienst(item, y);
if (item.Vertretung != null)
{
xyc = Vertretungsgedoense(xyc, item, i);
// Vertretung zwar vorhanden aber ohne einem Vertreter
if (item.Vertretung.VertretenderMitarbeiterOid == 0)
{
xyc.IsKunde = 0;
}
}
else
{
xyc.IsKunde = 0;
xyc.Vertretung = "";
}
xyc.AbsenceTimeDC = item.Absencetime;
xyc.VertreterOid = item.VertetenderMit;
xyc.MitarbeiterOid = item.EmployeeOid;
xyc.WochenansichtBemerkung = item.WochenansichtBemerkung;
//xyc.Beschreibung = item.Bemerkung; //nur anzeigen wenn gewollt das man die Message Von der Krankmeldung sieht
xyc.Kunde = "";
xyc.KlientOid = 0;
if (item.EmployeeName.Equals(""))
{
i = 2;
xyc.IsKunde = i;
}
_items.Add(xyc);
#endregion
}
return _items;
}
private TagesAnsicht Vertretungsgedoense(TagesAnsicht xyc, VertretungsListeItemsDC item, int i)
{
if (item.Vertretung.VertretungsZeitraumVon.Date != item.Vertretung.VertretungsZeitraumBis.Date)
{
if (item.Vertretung.VertretungsZeitraumVon.Hour == 0 && item.Vertretung.VertretungsZeitraumVon.Minute == 0 &&
item.Vertretung.VertretungsZeitraumBis.Hour == 0 && item.Vertretung.VertretungsZeitraumBis.Minute == 0)
{
xyc.VertretungsZeitraum = item.Vertretung.VertretungsZeitraumVon.Date.ToString("dd.MM.yyyy") + " - " +
item.Vertretung.VertretungsZeitraumBis.Date.ToString("dd.MM.yyyy");
}
else
{
xyc.VertretungsZeitraum = item.Vertretung.VertretungsZeitraumVon.Date.ToString("dd.MM.yyyy HH:mm") + " - " +
item.Vertretung.VertretungsZeitraumBis.Date.ToString("dd.MM.yyyy HH:mm");
}
}
else
{
if (item.Vertretung.VertretungsZeitraumVon.Hour == 0 && item.Vertretung.VertretungsZeitraumVon.Minute == 0 &&
item.Vertretung.VertretungsZeitraumBis.Hour == 0 && item.Vertretung.VertretungsZeitraumBis.Minute == 0)
{
xyc.VertretungsZeitraum = item.Vertretung.VertretungsZeitraumVon.Date.ToString("dd.MM.yyyy");
}
else
{
xyc.VertretungsZeitraum = item.Vertretung.VertretungsZeitraumVon.Date.ToString("dd.MM.yyyy HH:mm") + " - " + item.Vertretung.VertretungsZeitraumBis.Date.ToString("HH:mm");
}
}
xyc.VertretungsDC = item.Vertretung;
xyc.Vertretung = item.VertretenderMitarbeiter;
xyc.IsKunde = i;
xyc.Beschreibung = item.Vertretung.Notice;
return xyc;
}
private TagesAnsicht CreateSchulbegleitenderDienst(VertretungsListeItemsDC item, int y)
{
TagesAnsicht xyc = new TagesAnsicht()
{
KrankheitsZeitraum = item.Krankheitszeitraum,
KrankerMitarbeiter = item.EmployeeName,
KrankheitsMeldung = item.Krankheitsmeldung,
IsMitarbeiter = y,
Arbeitszeit = item.Worktime,
Wochentagsarbeitszeit = item.Wochentagsarbeitszeit
Absencetime = item.Absencetime,
VertretungsStatus = item.VertretungsStatus,
Employee = item.Employee,
Customer = item.Customer,
Schule = item.Schule,
Arbeitszeiten = item.Arbeitszeiten,
Bemerkung = item.Bemerkung,
Vertretung = item.Vertretung,
Datum = item.Datum,
Vertreter = item.Vertreter,
Krankheitsmeldung = item.Krankheitsmeldung,
Krankheitszeitraum = item.Krankheitszeitraum,
MitarbeiterStatusColor = item.MitarbeiterStatusColor,
KlientStatusColor = item.KlientStatusColor,
WochenansichtBemerkung = item.WochenansichtBemerkung
};
if (item.Abwesenheitskategorie != null)
xyc.AbwesenheitsKategorie = item.Abwesenheitskategorie;
if (item.Absencetime.End != null && item.Absencetime.Start != null)
{
xyc.EndD = item.Absencetime.End.Value;
xyc.StartD = item.Absencetime.Start.Value;
}
return xyc;
return vm;
}
#endregion
#region Adde Der Tagesansicht Eine Vertretung
public void AddeNeueTagesVertretung(TagesAnsicht a , DateTime dateTime)
public void AddeNeueTagesVertretung(TagesansichtVM vm, DateTime dateTime)
{
if (a.MitarbeiterOid != 0)
if (vm.Employee != null)
{
_view = new SchulbegleitenderDienstBearbeitungsView(1, a.StartD, a.EndD, dateTime, a.KlientOid,a,null,"");
_view = new VertretungsSearchView(dateTime, vm.Customer, vm, null);
_view.RaiseCustomEvent += new EventHandler<CustomEventArgs>(Tagesansicht_RaiseCustomEvent);
_view.RaiseCustomEvent += new EventHandler<VertretungSelectedEventArgs>(Tagesansicht_RaiseCustomEvent);
_view.ShowDialog();
}
else
{
MessageBox.Show("Du kannst einem kranken Klienten keine Mitarbeiter hinzufügen.");
}
}
private void Tagesansicht_RaiseCustomEvent(object sender, CustomEventArgs e)
private void Tagesansicht_RaiseCustomEvent(object sender, VertretungSelectedEventArgs e)
{
UpdateMitarbeiterToVertretung(e.Message, e.StartDate, e.EndDate, e.TagesItem);
UpdateMitarbeiterToVertretung(e.Employee, e.VertretungVon, e.VertretungBis, e.TagesItem);
_view.Close();
}
private void UpdateMitarbeiterToVertretung(CompactEmployeeDC employee, DateTime? startDate, DateTime? endDate, TagesAnsicht a)
private void UpdateMitarbeiterToVertretung(CompactEmployeeDC employee, DateTime? startDate, DateTime? endDate, TagesansichtVM vm)
{
VertretungDC vert = new VertretungDC()
{
CustomerOid = a.KlientOid,
EmployeeOid = a.MitarbeiterOid,
VertretungsZeitraumVon = startDate.Value,
VertretungsZeitraumBis = endDate.Value,
AbsenceTimeOid = a.AbsenceTimeDC.AbsenceTimeOid,
VertretenderMitarbeiterOid = employee.EmployeeOid,
Notice = a.Beschreibung
Notice = vm.Bemerkung
};
if (a.VertretungsDC != null)
if (vm.Customer != null)
{
vert.VertretungOid = a.VertretungsDC.VertretungOid;
vert.CustomerOid = vm.Customer.CustomerOid;
}
if (vm.Employee != null)
{
vert.EmployeeOid = vm.Employee.EmployeeOid;
}
if (vm.Absencetime != null)
{
vert.AbsenceTimeOid = vm.Absencetime.AbsenceTimeOid;
}
if (vm.Vertretung != null)
{
vert.VertretungOid = vm.Vertretung.VertretungOid;
ServiceFacade.DoOperationsServiceSync(s => s.UpdateVertretung(vert));
}
else
@@ -303,42 +101,32 @@ namespace BeWo.SchulbegleitenderDienst
ServiceFacade.DoOperationsServiceSync(s => s.CreateVertretung(vert));
}
}
#endregion
#region Delete KrankMeldung / Vertretung
public void DeleteKrankmeldung(TagesAnsicht a)
public void DeleteKrankmeldung(TagesansichtVM vm)
{
Dictionary<long, long> ahh = new Dictionary<long, long>();
ahh.Add(a.AbsenceTimeDC.AbsenceTimeOid.Value, a.AbsenceTimeDC.AbsenceTimeVersion.Value);
ServiceFacade.DoOperationsServiceSync(s => s.DeactivateAbsenceTime(ahh));
VertretungDC vert = new VertretungDC();
if (a.VertretungsDC != null)
if (vm.Absencetime != null)
{
vert = a.VertretungsDC;
ServiceFacade.DoOperationsServiceSync(s => s.DeleteVertretung(vert.VertretungOid.Value));
Dictionary<long, long> ahh = new Dictionary<long, long>();
ahh.Add(vm.Absencetime.AbsenceTimeOid.Value, vm.Absencetime.AbsenceTimeVersion.Value);
ServiceFacade.DoOperationsServiceSync(s => s.DeactivateAbsenceTime(ahh));
DeleteVertretung(vm);
}
}
public void DeleteVertretung(TagesAnsicht a)
public void DeleteVertretung(TagesansichtVM vm)
{
VertretungDC vert = new VertretungDC();
if (a.VertretungsDC != null)
if (vm.Vertretung != null)
{
vert = a.VertretungsDC;
ServiceFacade.DoOperationsServiceSync(s => s.DeleteVertretung(vert.VertretungOid.Value));
ServiceFacade.DoOperationsServiceSync(s => s.DeleteVertretung(vm.Vertretung.VertretungOid.Value));
}
}
#endregion
#region KrankheitsZeitraum Bearbeiten
public void KrankMeldeZeitraumBearbeiten(TagesAnsicht a)
public void KrankMeldeZeitraumBearbeiten(TagesansichtVM a)
{
_krankView = new KrankheitsZeitraumView(a.StartD, a.EndD,a);
_krankView = new KrankheitsZeitraumView(a.StartDate.Value, a.EndDate.Value,a);
_krankView.RaiseCustomEvent += new EventHandler<KrankheitsEventArgs>(newWindowKrankzeitraum_RaiseCustomEvent);
_krankView.ShowDialog();
@@ -351,49 +139,55 @@ namespace BeWo.SchulbegleitenderDienst
_krankView.Close();
}
private void UpdateKrankheitsZeitraum(DateTime startZeit, DateTime endZeit, TagesAnsicht ab)
private void UpdateKrankheitsZeitraum(DateTime startZeit, DateTime endZeit, TagesansichtVM ab)
{
ab.AbsenceTimeDC.Start = startZeit;
ab.AbsenceTimeDC.End = endZeit;
ab.Absencetime.Start = startZeit;
ab.Absencetime.End = endZeit;
List<AbsenceTimeDC> a = new List<AbsenceTimeDC>();
a.Add(ab.AbsenceTimeDC);
a.Add(ab.Absencetime);
ServiceFacade.DoCustomerServiceSync(s => s.UpdateAbsenceTimes(a));
}
#endregion
#region Update das Bearbeitete Item (Row)
public void UpdateRowData(TagesAnsicht a)
public void UpdateRowData(TagesansichtVM vm)
{
AbsenceTimeDC abstime = new AbsenceTimeDC()
{
AbsenceTimeOid = a.AbsenceTimeDC.AbsenceTimeOid,
Start = a.StartD,
End = a.EndD,
Reason = a.AbwesenheitsKategorie,
KrankheitsMeldung = a.KrankheitsMeldung
AbsenceTimeOid = vm.Absencetime.AbsenceTimeOid,
Start = vm.StartDate,
End = vm.EndDate,
Reason = vm.Absencetime.Reason,
KrankheitsMeldung = vm.Absencetime.KrankheitsMeldung
};
VertretungDC vert = new VertretungDC()
{
CustomerOid = a.KlientOid,
EmployeeOid = a.MitarbeiterOid,
AbsenceTimeOid = a.AbsenceTimeDC.AbsenceTimeOid,
VertretenderMitarbeiterOid = a.VertreterOid,
Notice = a.Beschreibung
Notice = vm.Bemerkung
};
vert.VertretungsZeitraumVon = a.StartD;
vert.VertretungsZeitraumBis = a.EndD;
if (a.VertretungsDC != null)
if (vm.Customer != null)
{
vert.VertretungOid = a.VertretungsDC.VertretungOid;
abstime.CustomerOid = vm.Customer.CustomerOid;
}
if (vm.Employee != null)
{
abstime.EmployeeOid = vm.Employee.EmployeeOid;
}
if (vm.Absencetime != null)
{
abstime.AbsenceTimeOid = vm.Absencetime.AbsenceTimeOid;
}
vert.VertretungsZeitraumVon = vm.StartDate.Value;
vert.VertretungsZeitraumBis = vm.EndDate.Value;
if (vm.Vertretung != null)
{
vert.VertretungOid = vm.Vertretung.VertretungOid;
ServiceFacade.DoOperationsServiceSync(s => s.UpdateVertretungAndAbsenceTime(vert, abstime));
}
@@ -404,8 +198,7 @@ namespace BeWo.SchulbegleitenderDienst
ServiceFacade.DoOperationsServiceSync(s => s.UpdateAbsenceTime(abstime));
}
}
#endregion
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,61 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BeWo.SchulbegleitenderDienst
{
public class WochenAnsicht
{
//public long? VertretungsOid { get; set; }
public string MaFrei { get; set; }
public string MaKrank { get; set; }
public string Kind { get; set; }
public bool IsMitarbeiterKrank { get; set; }
public bool isCustomerKrank { get; set; }
public string Bemerkung { get; set; }
public string WochenBeschreibung { get; set; }
//Fürs WPF Klient Wochenanzeige
public string VertretungMo { get; set; }
public string VertretungDi { get; set; }
public string VertretungMi { get; set; }
public string VertretungDo { get; set; }
public string VertretungFr { get; set; }
public string VertretungSa { get; set; }
public string Mo { get; set; }
public string Di { get; set; }
public string Mi { get; set; }
public string Do { get; set; }
public string Fr { get; set; }
public string Sa { get; set; }
public string So { get; set; }
//KlientenView
public Dictionary<String, Dictionary<DateTime, TagesAnsicht>> VertretungsWoche { get; set; }
//Fürs WPF Employee Wochenanzeige
public string EingesetztBeiMo { get; set; }
public string EingesetztBeiDi { get; set; }
public string EingesetztBeiMi { get; set; }
public string EingesetztBeiDo { get; set; }
public string EingesetztBeiFr { get; set; }
public string EingesetztBeiSa { get; set; }
//MitarbeiterView
public Dictionary<String, Dictionary<DateTime, TagesAnsicht>> KlientvertretungsWoche { get; set; }
}
}

View File

@@ -15,38 +15,43 @@ namespace BeWo.SchulbegleitenderDienst
{
class WochenVertretung
{
#region variablen
private SchulbegleitenderDienstBearbeitungsView _view;
private Dictionary<string, Dictionary<DateTime, TagesAnsicht>> a;
private Dictionary<String, Dictionary<DateTime, TagesAnsicht>> klientb;
#endregion
#region Lade Wochen Ansicht
public Dictionary<string, List<WochenAnsicht>> GetWochenAnsichtFromItems(DateTime time,List<TagesAnsicht> _items)
public List<WochenansichtVM> GetWochenAnsichtFromItems(DateTime time, List<TagesansichtVM> _items)
{
List<WochenAnsicht> _itemsWochen = new List<WochenAnsicht>();
List<WochenAnsicht> _itemsWochenKrankerMitarbeiter = new List<WochenAnsicht>();
List<WochenansichtVM> _itemsWochen = new List<WochenansichtVM>();
DateTime dt = time;
DateTime startdt = dt.FirstDateOfWeek(dt.GetIso8601WeekOfYear());
DateTime startdt = time.FirstDateOfWeek(time.GetIso8601WeekOfYear());
Dictionary<String, WochenansichtVM> key2WochenAnsicht = new Dictionary<string, WochenansichtVM>();
foreach (var item in _items)
{
a = new Dictionary<string, Dictionary<DateTime, TagesAnsicht>>();
{
String key = String.Format("{0}_{1}_{2}", item.Absencetime.AbsenceTimeOid,
item.Customer != null ? item.Customer.CustomerOid : 0,
item.Employee != null ? item.Employee.EmployeeOid : 0);
klientb = new Dictionary<string, Dictionary<DateTime, TagesAnsicht>>();
WochenansichtVM wochenansicht = null;
if (!key2WochenAnsicht.ContainsKey(key))
{
wochenansicht = new WochenansichtVM();
wochenansicht.VertretungsWoche = new Dictionary<string, Dictionary<DateTime, TagesansichtVM>>();
wochenansicht.KlientvertretungsWoche =
new Dictionary<string, Dictionary<DateTime, TagesansichtVM>>();
wochenansicht.WochenBeschreibung = item.WochenansichtBemerkung;
DateTime anfangDt;
DateTime endeDt;
wochenansicht.Customer = item.Customer;
wochenansicht.Employee = item.Employee;
anfangDt = item.StartD;
endeDt = item.EndD;
key2WochenAnsicht.Add(key, wochenansicht);
_itemsWochen.Add(wochenansicht);
}
else
{
wochenansicht = key2WochenAnsicht[key];
}
DateTime montagDt = startdt.Date;
DateTime dienstagDt = startdt.Date.AddDays(1);
@@ -56,395 +61,67 @@ namespace BeWo.SchulbegleitenderDienst
DateTime samstagDt = startdt.Date.AddDays(5);
WochenAnsicht wwk = new WochenAnsicht()
{
MaKrank = item.KrankerMitarbeiter,
Kind = item.Kunde,
MaFrei = item.Vertretung,
WochenBeschreibung = item.WochenansichtBemerkung,
//Bemerkung = item.Beschreibung
};
// Montag | 0
wwk = WochentagVerarbeitung(anfangDt, endeDt, montagDt, item, "VertretungMo", "EingesetztBeiMo", wwk, 0);
WochentagVerarbeitung(montagDt, item, wochenansicht);
//Dienstag | 1
wwk = WochentagVerarbeitung(anfangDt, endeDt, dienstagDt, item, "VertretungDi", "EingesetztBeiDi", wwk,
1);
WochentagVerarbeitung(dienstagDt, item, wochenansicht);
//Mittwoch | 2
wwk = WochentagVerarbeitung(anfangDt, endeDt, mittwochDt, item, "VertretungMi", "EingesetztBeiMi", wwk,
2);
WochentagVerarbeitung(mittwochDt, item, wochenansicht);
//Donnerstag | 3
wwk = WochentagVerarbeitung(anfangDt, endeDt, donnerstagDt, item, "VertretungDo", "EingesetztBeiDo", wwk,
3);
WochentagVerarbeitung(donnerstagDt, item, wochenansicht);
//Freitag | 4
wwk = WochentagVerarbeitung(anfangDt, endeDt, freitagDt, item, "VertretungFr", "EingesetztBeiFr", wwk, 4);
WochentagVerarbeitung(freitagDt, item, wochenansicht);
//Samstag | 5
wwk = WochentagVerarbeitung(anfangDt, endeDt, samstagDt, item, "VertretungSa", "EingesetztBeiSa", wwk, 5);
wwk.VertretungsWoche = a;
wwk.KlientvertretungsWoche = klientb;
//Abfrage für Klienten Krank
if (wwk.IsMitarbeiterKrank)
{
_itemsWochenKrankerMitarbeiter.Add(wwk);
}
else
{
_itemsWochen.Add(wwk);
}
WochentagVerarbeitung(samstagDt, item, wochenansicht);
}
Dictionary<string, List<WochenAnsicht>> dic = new Dictionary<string, List<WochenAnsicht>>();
dic.Add("_itemsWochenKrankerMitarbeiter", _itemsWochenKrankerMitarbeiter);
dic.Add("_itemsWochen", _itemsWochen);
return dic;
return _itemsWochen;
}
private WochenAnsicht WochentagVerarbeitung(DateTime anfangDt, DateTime endeDt, DateTime wochentagDt, TagesAnsicht item, string vertretungstag, string einsetzungstag, WochenAnsicht wwk, int i)
private void WochentagVerarbeitung(DateTime wochentagDt, TagesansichtVM item, WochenansichtVM wwk)
{
if (anfangDt.Date <= wochentagDt && wochentagDt <= endeDt.Date)
if (wochentagDt == item.Datum)
{
if (item.VertretungsDC != null)
switch (wochentagDt.DayOfWeek)
{
if (item.VertretungsDC.VertretungsZeitraumVon.Date <= wochentagDt.Date &&
item.VertretungsDC.VertretungsZeitraumBis.Date >= wochentagDt.Date)
{
Dictionary<DateTime, TagesAnsicht> sa = new Dictionary<DateTime, TagesAnsicht>();
sa.Add(wochentagDt, item); // item.vertreteroid
case DayOfWeek.Monday:
wwk.ItemMo = item;
break;
case DayOfWeek.Tuesday:
wwk.ItemDi = item;
break;
case DayOfWeek.Wednesday:
wwk.ItemMi= item;
break;
case DayOfWeek.Thursday:
wwk.ItemDo = item;
break;
case DayOfWeek.Friday:
wwk.ItemFr = item;
break;
case DayOfWeek.Saturday:
wwk.ItemSa = item;
break;
a.Add(vertretungstag, sa);
klientb.Add(einsetzungstag, sa);
switch (i)
{
case 0:
if (item.IsCustomerKrank)
{
wwk.isCustomerKrank = true;
}
else
{
wwk.VertretungMo = item.Vertretung;
}
// wwk.EingesetztBeiMo = item.Kunde;
wwk.Mo = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
break;
case 1:
if (item.IsCustomerKrank)
{
wwk.isCustomerKrank = true;
}
else
{
wwk.VertretungDi = item.Vertretung;
}
// wwk.EingesetztBeiDi = item.Kunde;
wwk.Di = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
break;
case 2:
if (item.IsCustomerKrank)
{
wwk.isCustomerKrank = true;
}
else
{
wwk.VertretungMi = item.Vertretung;
}
// wwk.EingesetztBeiMi = item.Kunde;
wwk.Mi = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
break;
case 3:
if (item.IsCustomerKrank)
{
wwk.isCustomerKrank = true;
}
else
{
wwk.VertretungDo = item.Vertretung;
}
// wwk.EingesetztBeiDo = item.Kunde;
wwk.Do = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
break;
case 4:
if (item.IsCustomerKrank)
{
wwk.isCustomerKrank = true;
}
else
{
wwk.VertretungFr = item.Vertretung;
}
// wwk.EingesetztBeiFr = item.Kunde;
wwk.Fr = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
break;
case 5:
if (item.IsCustomerKrank)
{
wwk.isCustomerKrank = true;
}
else
{
wwk.VertretungSa = item.Vertretung;
}
// wwk.EingesetztBeiSa = item.Kunde;
wwk.Sa = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
break;
}
}
else
{
switch (i)
{
case 0:
if (item.IsMitarbeiterKrank)
{
wwk.VertretungMo = " ";
//wwk.isCustomerKrank = true;
wwk.IsMitarbeiterKrank = true;
}
else
{
wwk.VertretungMo = "";
}
// wwk.EingesetztBeiMo = "";
wwk.Mo = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
break;
case 1:
if (item.IsMitarbeiterKrank)
{
wwk.VertretungDi = " ";
//wwk.isCustomerKrank = true;
wwk.IsMitarbeiterKrank = true;
}
else
{
wwk.VertretungDi = "";
}
wwk.Di = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
// wwk.EingesetztBeiDi = "";
break;
case 2:
if (item.IsMitarbeiterKrank)
{
wwk.VertretungMi = " ";
//wwk.isCustomerKrank = true;
wwk.IsMitarbeiterKrank = true;
}
else
{
wwk.VertretungMi = " ";
}
wwk.Mi = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
// wwk.EingesetztBeiMi = "";
break;
case 3:
if (item.IsMitarbeiterKrank)
{
wwk.VertretungDo = " ";
//wwk.isCustomerKrank = true;
wwk.IsMitarbeiterKrank = true;
}
else
{
wwk.VertretungDo = "";
}
wwk.Do = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
//wwk.EingesetztBeiDo = "";
break;
case 4:
if (item.IsMitarbeiterKrank)
{
wwk.VertretungFr = " ";
//wwk.isCustomerKrank = true;
wwk.IsMitarbeiterKrank = true;
}
else
{
wwk.VertretungFr = "";
}
wwk.Fr = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
// wwk.EingesetztBeiFr = "";
break;
case 5:
if (item.IsMitarbeiterKrank)
{
wwk.VertretungSa = " ";
//wwk.isCustomerKrank = true;
wwk.IsMitarbeiterKrank = true;
}
else
{
wwk.VertretungSa = "";
}
wwk.Sa = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
// wwk.EingesetztBeiSa = "";
break;
}
}
}
else
{
Dictionary<DateTime, TagesAnsicht> sa = new Dictionary<DateTime, TagesAnsicht>();
sa.Add(wochentagDt, item); // item.vertreteroid
a.Add(vertretungstag, sa);
klientb.Add(einsetzungstag, sa);
switch (i)
{
case 0:
if (item.IsMitarbeiterKrank)
{
wwk.VertretungMo = " ";
//wwk.isCustomerKrank = true;
wwk.IsMitarbeiterKrank = true;
}
else
{
wwk.VertretungMo = item.Vertretung;
}
// wwk.EingesetztBeiMo = item.Kunde;
wwk.Mo = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
break;
case 1:
if (item.IsMitarbeiterKrank)
{
wwk.VertretungDi = " ";
//wwk.isCustomerKrank = true;
wwk.IsMitarbeiterKrank = true;
}
else
{
wwk.VertretungDi = item.Vertretung;
}
// wwk.EingesetztBeiDi = item.Kunde;
wwk.Di = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
break;
case 2:
if (item.IsMitarbeiterKrank)
{
wwk.VertretungMi = " ";
//wwk.isCustomerKrank = true;
wwk.IsMitarbeiterKrank = true;
}
else
{
wwk.VertretungMi = item.Vertretung;
}
// wwk.EingesetztBeiMi = item.Kunde;
wwk.Mi = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
break;
case 3:
if (item.IsMitarbeiterKrank)
{
wwk.VertretungDo = " ";
//wwk.isCustomerKrank = true;
wwk.IsMitarbeiterKrank = true;
}
else
{
wwk.VertretungDo = item.Vertretung;
}
// wwk.EingesetztBeiDo = item.Kunde;
wwk.Do = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
break;
case 4:
if (item.IsMitarbeiterKrank)
{
wwk.VertretungFr = " ";
//wwk.isCustomerKrank = true;
wwk.IsMitarbeiterKrank = true;
}
else
{
wwk.VertretungFr = item.Vertretung;
}
// wwk.EingesetztBeiFr = item.Kunde;
wwk.Fr = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
break;
case 5:
if (item.IsMitarbeiterKrank)
{
wwk.VertretungSa = " ";
//wwk.isCustomerKrank = true;
wwk.IsMitarbeiterKrank = true;
}
else
{
wwk.VertretungSa = item.Vertretung;
}
// wwk.EingesetztBeiSa = item.Kunde;
wwk.Sa = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
break;
}
}
}
else
{
switch (i)
{
case 0:
wwk.VertretungMo = " ";
wwk.Mo = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
// wwk.EingesetztBeiMo = " ";
break;
case 1:
wwk.VertretungDi = " ";
wwk.Di = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
// wwk.EingesetztBeiDi = " ";
break;
case 2:
wwk.VertretungMi = " ";
wwk.Mi = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
// wwk.EingesetztBeiMi = " ";
break;
case 3:
wwk.VertretungDo = " ";
wwk.Do = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
// wwk.EingesetztBeiDo = " ";
break;
case 4:
wwk.VertretungFr = " ";
wwk.Fr = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
// wwk.EingesetztBeiFr = " ";
break;
case 5:
wwk.VertretungSa = " ";
wwk.Sa = WochenanzeigeHinzufügen(wochentagDt, item.Wochentagsarbeitszeit);
// wwk.EingesetztBeiSa = " ";
break;
}
}
return wwk;
}
private string WochenanzeigeHinzufügen(DateTime dayOfWeekDateTime, Dictionary<AppointmentDayOfWeek, string> wochentagsarbeitszeit)
{
if (wochentagsarbeitszeit.Count != 0)
if (wochentagsarbeitszeit != null && wochentagsarbeitszeit.Count != 0)
{
foreach (var wa in wochentagsarbeitszeit)
{
@@ -458,102 +135,94 @@ namespace BeWo.SchulbegleitenderDienst
return "";
}
#endregion
#region Adde der WochenAnsicht einen Vertreter
public void AddeNeueVertretungforWochenAnsicht(WochenAnsicht a,string tag, DateTime dateTime)
public void AddeNeueVertretungforWochenAnsicht(WochenansichtVM wochenVm, string tag)
{
if (!a.IsMitarbeiterKrank)
{
VertretungDC vertretung = new VertretungDC();
AbsenceTimeDC absenceTime = new AbsenceTimeDC();
foreach (var vert in a.KlientvertretungsWoche)
{
if (vert.Key.Equals(tag))
{
foreach (var val in vert.Value)
{
vertretung = val.Value.VertretungsDC;
absenceTime = val.Value.AbsenceTimeDC;
}
}
}
TagesansichtVM tagesVm = null;
if (!a.MaKrank.Equals(""))
{
_view = new SchulbegleitenderDienstBearbeitungsView(1, absenceTime.Start, absenceTime.End,
dateTime, vertretung.CustomerOid, null, a,tag);
if (tag.Contains("ItemMo"))
{
tagesVm = wochenVm.ItemMo;
}
else if (tag.Contains("ItemDi"))
{
tagesVm = wochenVm.ItemDi;
}
else if (tag.Contains("ItemMi"))
{
tagesVm = wochenVm.ItemMi;
}
else if (tag.Contains("ItemDo"))
{
tagesVm = wochenVm.ItemDo;
}
else if (tag.Contains("ItemFr"))
{
tagesVm = wochenVm.ItemFr;
}
else if (tag.Contains("ItemSa"))
{
tagesVm = wochenVm.ItemSa;
}
if (tagesVm != null)
{
_view.RaiseCustomEvent += new EventHandler<CustomEventArgs>(KlientenWochen_RaiseCustomEvent);
_view.ShowDialog();
}
else
{
MessageBox.Show("Fehler");
}
var view = new VertretungsSearchView(tagesVm.Datum, tagesVm.Customer, tagesVm, wochenVm);
view.RaiseCustomEvent += new EventHandler<VertretungSelectedEventArgs>(KlientenWochen_RaiseCustomEvent);
view.ShowDialog();
}
}
private void KlientenWochen_RaiseCustomEvent(object sender, VertretungSelectedEventArgs e)
{
UpdateMitarbeiterToVertretungKlientenWochenansicht(e.Employee, e.VertretungVon, e.VertretungBis, e.TagesItem, e.WochenItem);
}
private void UpdateMitarbeiterToVertretungKlientenWochenansicht(CompactEmployeeDC employee, DateTime? startDate, DateTime? endDate, TagesansichtVM tagesItem, WochenansichtVM wochenItem)
{
VertretungDC vert = new VertretungDC()
{
VertretungsZeitraumVon = startDate.Value,
VertretungsZeitraumBis = endDate.Value,
VertretenderMitarbeiterOid = employee.EmployeeOid,
Notice = tagesItem.Bemerkung
};
if (tagesItem.Employee != null)
{
vert.EmployeeOid = tagesItem.Employee.EmployeeOid;
}
if (tagesItem.Customer != null)
{
vert.CustomerOid = tagesItem.Customer.CustomerOid;
}
if (tagesItem.Absencetime != null)
{
vert.AbsenceTimeOid = tagesItem.Absencetime.AbsenceTimeOid;
}
if (tagesItem.Vertretung != null)
{
vert.VertretungOid = tagesItem.Vertretung.VertretungOid;
ServiceFacade.DoOperationsServiceSync(s => s.UpdateVertretung(vert));
}
else
{
MessageBox.Show("Du kannst einem kranken Klienten keine Mitarbeiter hinzufügen.", "Info");
}
}
private void KlientenWochen_RaiseCustomEvent(object sender, CustomEventArgs e)
{
UpdateMitarbeiterToVertretungKlientenWochenansicht(e.Message, e.StartDate, e.EndDate,e.WochenItem,e.WochenTag);
_view.Close();
}
private void UpdateMitarbeiterToVertretungKlientenWochenansicht(CompactEmployeeDC employee, DateTime? startDate, DateTime? endDate, WochenAnsicht a, string tag)
{
foreach (var woche in a.VertretungsWoche)
{
if (woche.Key.Equals(tag))
{
foreach (var item in woche.Value)
{
VertretungDC vert = new VertretungDC()
{
CustomerOid = item.Value.KlientOid,
AbsenceTimeOid = item.Value.AbsenceTimeDC.AbsenceTimeOid.Value,
VertretungsZeitraumVon = startDate.Value,
VertretungsZeitraumBis = endDate.Value,
VertretenderMitarbeiterOid = employee.EmployeeOid,
EmployeeOid = item.Value.MitarbeiterOid,
Notice = item.Value.Beschreibung,
};
if (item.Value.VertretungsDC != null)
{
//hier irgendwann ermöglichen dass eine bereits vorhandener vertretungszeitraum / also ein teil davon nochmals abgesplittet werden kann.
vert.VertretungOid = item.Value.VertretungsDC.VertretungOid;
vert.VertretenderMitarbeiterOid = employee.EmployeeOid;
vert.VertretungsZeitraumVon = item.Value.VertretungsDC.VertretungsZeitraumVon;
vert.VertretungsZeitraumBis = item.Value.VertretungsDC.VertretungsZeitraumBis;
ServiceFacade.DoOperationsServiceSync(s => s.UpdateVertretung(vert));
}
else
{
//ggf. ermöglichen das nicht der ganze zeitraum gesetzt wird.
//zur zeit wird hier die Gesamte Krankheitszeit übernommen
ServiceFacade.DoOperationsServiceSync(s => s.CreateVertretung(vert));
}
}
}
//ggf. ermöglichen das nicht der ganze zeitraum gesetzt wird.
//zur zeit wird hier die Gesamte Krankheitszeit übernommen
ServiceFacade.DoOperationsServiceSync(s => s.CreateVertretung(vert));
}
}
#endregion
#region Delete Vertretenden Mitarbeiter
public void DeletVertretendenMitarbeiter(WochenAnsicht a, string _deletVertretungsWeek)
public void DeletVertretendenMitarbeiter(WochenansichtVM a, string _deletVertretungsWeek)
{
foreach (var wochentag in a.VertretungsWoche)
{
@@ -566,7 +235,7 @@ namespace BeWo.SchulbegleitenderDienst
{
if (!item.Value.Vertretung.Equals(""))
{
ServiceFacade.DoOperationsServiceSync(s => s.DeleteVertretung(item.Value.VertretungsDC.VertretungOid.Value));
ServiceFacade.DoOperationsServiceSync(s => s.DeleteVertretung(item.Value.Vertretung.VertretungOid.Value));
}
}
}
@@ -574,7 +243,6 @@ namespace BeWo.SchulbegleitenderDienst
}
}
#endregion
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1952,7 +1952,7 @@
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<ScrollContentPresenter Grid.Column="0"/>
<ScrollContentPresenter Grid.Column="0" CanContentScroll="{TemplateBinding CanContentScroll}"/>
<ScrollBar Name="PART_VerticalScrollBar"
Value="{TemplateBinding VerticalOffset}"

View File

@@ -205,29 +205,27 @@
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" Grid.Row="1" Orientation="Horizontal" Grid.ColumnSpan="2">
<StackPanel Grid.Column="0" Grid.Row="1" Orientation="Horizontal" Grid.ColumnSpan="4">
<Button Content="Neue Zahlung hinzufügen" Margin="3" Tag="{Binding}" Click="ButtonOpenAddBargeldtransaktionClick" IsEnabled="{Binding Path=DarfBargeldTransaktionAnlegen, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}" />
<Label VerticalAlignment="Center">Kassenbestand</Label>
<dxe:TextEdit MaskType="Numeric" Mask="c" MaskUseAsDisplayFormat="True" Height="23" Margin="3" EditMode="InplaceInactive"
Width="80" EditValue="{Binding Path=Kassenbestand, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" FontWeight="Bold" />
<Label VerticalAlignment="Center">Auszahlungsintervall</Label>
<!--<Label VerticalAlignment="Center">Auszahlungsintervall</Label>
<dxe:ComboBoxEdit VerticalAlignment="Center" Height="23" HorizontalAlignment="Left" Width="100" IsTextEditable="False" Margin="3,0,3,3"
ItemsSource="{Binding Path=Values, Source={x:Static core:DisplayEnum.Auszahlungsintervall}}"
EditValue="{Binding Path=Auszahlungsintervall, UpdateSourceTrigger=PropertyChanged}"
IsEnabled="{Binding Path=DarfBargeldtransaktionenBearbeiten, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}"
EditValueChanged="AuszahlungsIntervallCBEditValueChanged"/>
</StackPanel>
EditValueChanged="AuszahlungsIntervallCBEditValueChanged"/>-->
<StackPanel Grid.Column="3" Grid.Row="1" HorizontalAlignment="Right" Orientation="Horizontal">
<Label Content="Startdatum" VerticalAlignment="Center"/>
<dxe:DateEdit x:Name="KassenBuchStartCB" MaskType="DateTimeAdvancingCaret" Height="23" Margin="3" EditValue="{Binding Path=PreselectedStartDate, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}" AllowNullInput="False" />
<Label Content="Startdatum" VerticalAlignment="Center"/>
<dxe:DateEdit x:Name="KassenBuchStartCB" MaskType="DateTimeAdvancingCaret" Height="23" Margin="3" EditValue="{Binding Path=PreselectedStartDate, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}" AllowNullInput="False" />
<Label Content="Enddatum" VerticalAlignment="Center"/>
<dxe:DateEdit x:Name="KassenBuchEndCB" MaskType="DateTimeAdvancingCaret" Height="23" Margin="3" EditValue="{Binding Path=PreselectedEndDate, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}" AllowNullInput="False"/>
<Label Content="Enddatum" VerticalAlignment="Center"/>
<dxe:DateEdit x:Name="KassenBuchEndCB" MaskType="DateTimeAdvancingCaret" Height="23" Margin="3" EditValue="{Binding Path=PreselectedEndDate, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}" AllowNullInput="False"/>
<!--<uc:NullItemComboBox x:Name="KassenbuchMonatsCB" Margin="3" ItemsSource="{Binding Path=MonatsComboBoxSource, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}"
SelectedItem="{Binding Path=PreselectedMonth, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}"/>
@@ -235,13 +233,15 @@
<uc:NullItemComboBox x:Name="KassenbuchJahresCB" Margin="3" ItemsSource="{Binding Path=JahresComboBoxSource, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}"
SelectedItem="{Binding Path=PreselectedYear, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}, Mode=OneWay}"/>-->
<TextBlock Margin="3" FontSize="14" VerticalAlignment="Center" PreviewMouseLeftButtonDown="KlassenbuchLinkOnPreviewMouseLeftButtonDown" Tag="{Binding}" IsEnabled="{Binding Path=Bargeldtransaktionen.VMList.Count, Converter={StaticResource CollectionCountToBoolConverter}, UpdateSourceTrigger=PropertyChanged}">
<Hyperlink x:Name="LinkKassenbuchDrucken" TargetName="_NewWindow" Style="{StaticResource HyperlinkStyle}">
<Run Text="Kassenbuch drucken" />
</Hyperlink>
</TextBlock>
<TextBlock Margin="3" FontSize="14" VerticalAlignment="Center" PreviewMouseLeftButtonDown="KlassenbuchLinkOnPreviewMouseLeftButtonDown" Tag="{Binding}" IsEnabled="{Binding Path=Bargeldtransaktionen.VMList.Count, Converter={StaticResource CollectionCountToBoolConverter}, UpdateSourceTrigger=PropertyChanged}">
<Hyperlink x:Name="LinkKassenbuchDrucken" TargetName="_NewWindow" Style="{StaticResource HyperlinkStyle}">
<Run Text="Kassenbuch drucken" />
</Hyperlink>
</TextBlock>
</StackPanel>
<GroupBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="4" x:Name="BlubbTest" Style="{StaticResource ObjectEditGroupBox}" Header="Ein- und Auszahlungen">
<dxg:GridControl Name="grid_bargeldtransaktionen" Tag="{Binding}" MaxWidth="{Binding ElementName=BlubbTest, Path=ActualWidth}" ItemsSource="{Binding Path=Bargeldtransaktionen.VMList}" CustomColumnSort="GridBargeldtransaktionenOnCustomColumnSort">
<dxg:GridControl.Columns>
@@ -252,7 +252,7 @@
</DataTemplate>
</dxg:GridColumn.CellTemplate>
</dxg:GridColumn>
<dxg:GridColumn Header="Datum" FixedWidth="True" SortOrder="Ascending" FieldName="Zahlungsdatum" EditSettings="{dxe:DateSettings DisplayFormat=d}" AllowEditing="{Binding Path=BargeldtransaktionenBearbeitenAlsDefaultBooelan, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}" />
<dxg:GridColumn Header="Datum" FixedWidth="True" SortOrder="Descending" FieldName="Zahlungsdatum" EditSettings="{dxe:DateSettings DisplayFormat=d}" AllowEditing="{Binding Path=BargeldtransaktionenBearbeitenAlsDefaultBooelan, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}" />
<dxg:GridColumn Header="Art" FixedWidth="True" FieldName="Zahlungstyp" AllowEditing="{Binding Path=BargeldtransaktionenBearbeitenAlsDefaultBooelan, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}">
<dxg:GridColumn.EditSettings>
<dxe:ComboBoxEditSettings ItemsSource="{Binding Path=Values, Source={x:Static core:DisplayEnum.Zahlungstyp}}" IsTextEditable="False" />
@@ -262,8 +262,12 @@
<dxg:GridColumn.EditSettings>
<dxe:TextEditSettings MaskType="Numeric" Mask="c" MaskUseAsDisplayFormat="True" />
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn Header="Angelegt von" FixedWidth="True" FieldName="InsUser" AllowEditing="False">
</dxg:GridColumn>
<dxg:GridColumn Header="Notiz" FieldName="Notice" AllowEditing="{Binding Path=BargeldtransaktionenBearbeitenAlsDefaultBooelan, RelativeSource={RelativeSource AncestorType={x:Type view:BargeldkassenView}}}"/>
<dxg:GridColumn FieldName="X" Header="Drucken" ReadOnly="True">
<dxg:GridColumn.CellTemplate>
<DataTemplate>

View File

@@ -44,7 +44,7 @@
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="250" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical" Margin="10,0,0,0">
<TextBlock x:Name="searchCountLabel" HorizontalAlignment="Left" Text="{Binding Path=Items.Count, Converter={StaticResource StringFormatConverter}, ConverterParameter=Suchergebnisse: \{0\}, ElementName=objectListBox}" FontFamily="Microsoft Sans Serif" FontSize="14" />

View File

@@ -16,9 +16,10 @@ namespace BeWo.ViewModel
public static string PropertyName_Betrag = "Betrag";
public static string PropertyName_Transaktionskassenbestand = "Transaktionskassenbestand";
public static string PropertyName_Notice = "Notice";
//private CompactCustomerDC _Customer;
private EnumValue<Zahlungstyp> _Zahlungstyp;
private EnumValue<Zahlungstyp> _Zahlungstyp;
private DateTime? _Zahlungsdatum;
private decimal? _Betrag;
private decimal? _Transaktionskassenbestand;
@@ -107,7 +108,12 @@ namespace BeWo.ViewModel
}
}
public decimal? Transaktionskassenbestand
public String InsUser
{
get { return DataContract.InsUser; }
}
public decimal? Transaktionskassenbestand
{
get { return _Transaktionskassenbestand; }
set

View File

@@ -574,31 +574,7 @@ namespace BeWo.ViewModel.ListViewModel
return lNewRecord;
}
public Dictionary<DateTimeSpan, decimal?> GetAbsencesTimesWholeWeeks(SupportConceptCostBearerRelDC relDc)
{
var lResult = new Dictionary<DateTimeSpan, decimal?>();
if (_CostBearer2SupportConceptOid2BookingInfoDict.ContainsKey(relDc.CostBearer2SupportConceptOid.Value))
{
SupportConceptTreeNodeDetailInfoDC info = _CostBearer2SupportConceptOid2BookingInfoDict[relDc.CostBearer2SupportConceptOid.Value];
if (info.CustomerAbsenceTimes != null)
{
info.CustomerAbsenceTimes.DoForEach(
at => at.AbsenceSpan.GetWholeWeeks().DoForEach(
ww =>
{
if (!lResult.ContainsKey(ww))
{
lResult.Add(ww, at.Reason.BillableMinutes);
}
}));
}
}
return lResult;
}
public List<AbsenceTimeDC> GetAbsencesTimeForDate(SupportConceptCostBearerRelDC relDc, DateTime dt)
{
if (_CostBearer2SupportConceptOid2BookingInfoDict.ContainsKey(relDc.CostBearer2SupportConceptOid.Value))

View File

@@ -440,7 +440,15 @@ namespace BeWo.ViewModel
if (BeWoApp.AppSettings.IsEndDateVisible && ServiceRecordFormat == null || ServiceRecordFormat == ServiceRecordFormate.ZeiterfassungMitEndDatum)
{
if (value.HasValue && EditableEndDate.HasValue)
{
if (value.Value.Date > EditableEndDate.Value.Date)
{
_EditableEndDate = new DateTime(value.Value.Year, value.Value.Month, value.Value.Day, EditableEndDate.Value.Hour, EditableEndDate.Value.Minute, EditableEndDate.Value.Second);
//_EditableEndDate = Date;
}
}
var x = _EditableEndDate.Value.Subtract(_Date.Value);
if (_DurationInStunden == ZeiterfassungsDauer.Minuten)
@@ -612,12 +620,12 @@ namespace BeWo.ViewModel
rd = rd * Category.Percentage / 100;
}
if(_ServiceRecordFormat == ServiceRecordFormate.ZeiterfassungMitEndDatum) {
//if(_ServiceRecordFormat == ServiceRecordFormate.ZeiterfassungMitEndDatum) {
var strResult = _GroupOid != null ? string.Format("{0} ({0})", rd) : $"{DurationSTD} ({rd})";
// var strResult = _GroupOid != null ? string.Format("{0} ({0})", rd) : $"{DurationSTD} ({rd})";
return strResult;
}
// return strResult;
//}
if (_ServiceRecordFormat == ServiceRecordFormate.ZeiterfassungMitMonatJahr)
{
@@ -628,7 +636,7 @@ namespace BeWo.ViewModel
if (DurationInStunden.HasValue && DurationInStunden.Value == ZeiterfassungsDauer.Stunden)
{
return _GroupOid != null ? string.Format("{0} ({0})", rd) : $"{DurationSTD:0.##} ({rd / 60:0.##})";
return _GroupOid != null ? string.Format("{0} ({0})", rd / 60) : $"{DurationSTD:0.##} ({rd / 60:0.##})";
}
return _GroupOid != null ? $"{rd} ({rd})" : $"{Duration} ({rd})";
@@ -881,18 +889,20 @@ namespace BeWo.ViewModel
if (BeWoApp.AppSettings.IsEndDateVisible && ServiceRecordFormat == null || ServiceRecordFormat == ServiceRecordFormate.ZeiterfassungMitEndDatum)
{
if (AreDifferent(_EditableEndDate, value))
{
if (value < Date)
{
_EditableEndDate = Date;
}
else
{
if (value.HasValue && DateAndTime.HasValue)
{
if (value.Value.Date < DateAndTime.Value.Date)
{
_Date = new DateTime(value.Value.Year, value.Value.Month, value.Value.Day, DateAndTime.Value.Hour, DateAndTime.Value.Minute, DateAndTime.Value.Second);
//_EditableEndDate = Date;
}
_EditableEndDate = value;
}
var x = _EditableEndDate.Value.Subtract(_Date.Value);
var x = _EditableEndDate.Value.Subtract(_Date.Value);
if (_DurationInStunden == ZeiterfassungsDauer.Minuten)
{

View File

@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2009
VisualStudioVersion = 15.0.27130.2010
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{E7543C39-A44C-40C9-82C9-E7FAA2D9A852}"
EndProject
@@ -25,15 +25,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Report", "Report\Report.csp
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Host", "Host\Host.csproj", "{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoPlanerMobil", "BeWoPlanerMobil\BeWoPlanerMobil.csproj", "{284B02ED-114A-426C-9162-31BB6CF05589}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportingService", "ReportService\ReportingService.csproj", "{663EFCB5-9E3E-4C76-97EE-3188E072634C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoPlanerAndroid", "BeWoPlanerAndroid\BeWoPlanerAndroid.csproj", "{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWoChatServer", "BeWoChatServer\BeWoChatServer.csproj", "{4E069DC0-8153-41E0-A89A-FC1916DF4A5F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatController", "..\Chat\ChatController\ChatController.csproj", "{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatController", "..\..\Chat\ChatController\ChatController.csproj", "{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -115,16 +109,6 @@ Global
{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Any CPU.Build.0 = Release|Any CPU
{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{284B02ED-114A-426C-9162-31BB6CF05589}.Debug|.NET.ActiveCfg = Debug|Any CPU
{284B02ED-114A-426C-9162-31BB6CF05589}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{284B02ED-114A-426C-9162-31BB6CF05589}.Debug|Any CPU.Build.0 = Debug|Any CPU
{284B02ED-114A-426C-9162-31BB6CF05589}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{284B02ED-114A-426C-9162-31BB6CF05589}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{284B02ED-114A-426C-9162-31BB6CF05589}.Release|.NET.ActiveCfg = Release|Any CPU
{284B02ED-114A-426C-9162-31BB6CF05589}.Release|Any CPU.ActiveCfg = Release|Any CPU
{284B02ED-114A-426C-9162-31BB6CF05589}.Release|Any CPU.Build.0 = Release|Any CPU
{284B02ED-114A-426C-9162-31BB6CF05589}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{284B02ED-114A-426C-9162-31BB6CF05589}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|.NET.ActiveCfg = Debug|Any CPU
{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -135,26 +119,6 @@ Global
{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Any CPU.Build.0 = Release|Any CPU
{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{663EFCB5-9E3E-4C76-97EE-3188E072634C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Debug|.NET.ActiveCfg = Debug|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Release|.NET.ActiveCfg = Release|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Release|Any CPU.Build.0 = Release|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{4E069DC0-8153-41E0-A89A-FC1916DF4A5F}.Debug|.NET.ActiveCfg = Debug|Any CPU
{4E069DC0-8153-41E0-A89A-FC1916DF4A5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4E069DC0-8153-41E0-A89A-FC1916DF4A5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E069DC0-8153-41E0-A89A-FC1916DF4A5F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{4E069DC0-8153-41E0-A89A-FC1916DF4A5F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{4E069DC0-8153-41E0-A89A-FC1916DF4A5F}.Release|.NET.ActiveCfg = Release|Any CPU
{4E069DC0-8153-41E0-A89A-FC1916DF4A5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4E069DC0-8153-41E0-A89A-FC1916DF4A5F}.Release|Any CPU.Build.0 = Release|Any CPU
{4E069DC0-8153-41E0-A89A-FC1916DF4A5F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{4E069DC0-8153-41E0-A89A-FC1916DF4A5F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|.NET.ActiveCfg = Debug|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|.NET.Build.0 = Debug|Any CPU
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -178,10 +142,8 @@ Global
{D5E53B0F-BF5A-41E8-93E2-0F32845FC729} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
{40D8B312-EA64-49E3-A31A-5E57ED4D5654} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{E1154C7B-BB77-4155-9854-DAD8FC5A8BC3} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{284B02ED-114A-426C-9162-31BB6CF05589} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{663EFCB5-9E3E-4C76-97EE-3188E072634C} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{D3E18AE6-05A4-44B3-B0F6-6EF696DD306C} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{4E069DC0-8153-41E0-A89A-FC1916DF4A5F} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5352BE53-F2FD-442F-85A8-4157599AA153}

View File

@@ -237,7 +237,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Data\Data.csproj">
<Project>{b0d73e3d-4ae7-4024-93a6-db1f46d7ccee}</Project>
<Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
<Name>Data</Name>
</ProjectReference>
<ProjectReference Include="..\Service\Service.csproj">
@@ -263,7 +263,7 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>True</UseIIS>
<UseIIS>False</UseIIS>
<AutoAssignPort>False</AutoAssignPort>
<DevelopmentServerPort>8808</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>

View File

@@ -4,7 +4,7 @@ using System.Diagnostics;
using System.Linq;
using System.Text.RegularExpressions;
using System.Web.Mvc;
using BeWo.Data.Access;
using BeWo.Service.ServiceImplementations;
using BeWoPlanerMobil.Models;
using BeWoPlanerMobil.Service;
@@ -97,15 +97,15 @@ namespace BeWoPlanerMobil.Controllers
if (MobileSessionFacade.CheckForUserRight(UserRightType.CustomerView_View))
{
Model.Customers = CustomerService.GetAllActiveCustomers().OrderBy(k => k.LastName).ToList();
Model.Customers = CustomerService.GetAllActiveCompactCustomers().OrderBy(k => k.LastName).ToList();
}
else if(MobileSessionFacade.CheckForUserRight(UserRightType.Customer_ViewMyCustomers))
{
Model.Customers = CustomerService.GetActiveCustomersById(myRelatedCustomers.Select(c => c.Customer.CustomerOid).ToList()).OrderBy(k => k.LastName).ToList();
Model.Customers = CustomerService.GetCompactCustomersById(myRelatedCustomers.Select(c => c.Customer.CustomerOid).ToList()).OrderBy(k => k.LastName).ToList();
}
else
{
Model.Customers = new List<CustomerDC>();
Model.Customers = new List<CompactCustomerDC>();
}
if(MobileSessionFacade.CheckForUserRight(UserRightType.ServiceRecord_AllowCreationForOtherEmployees))
@@ -127,7 +127,7 @@ namespace BeWoPlanerMobil.Controllers
}
else
{
Model.SupportConcepts = CustomerService.GetAllActiveSupportConceptsByCustomers(Model.Customers.Select(c => c.CustomerOid ?? 0));
Model.SupportConcepts = CustomerService.GetAllActiveSupportConceptsByCustomers(Model.Customers.Select(c => c.CustomerOid));
}
var test = Model.ServiceRecords.Any(a => a.GroupPersonCount != null && a.IsCreatedInMobileClient);
@@ -2303,8 +2303,9 @@ namespace BeWoPlanerMobil.Controllers
return "SessionTimeout";
}
Model.SelectedCustomer = Model.Customers.FirstOrDefault(f => f.CustomerOid.HasValue && f.CustomerOid.Value.Equals(customerOid));
Model.SelectedCustomer = CustomerService.LoadCustomer(customerOid);
Model.SelectedCustomerOid = customerOid;
return SerializeObject(GetJSONCustomer(Model.SelectedCustomer));
}

View File

@@ -227,7 +227,7 @@ namespace BeWoPlanerMobil.Models
}
}
public List<CustomerDC> Customers { get; set; }
public List<CompactCustomerDC> Customers { get; set; }
public List<CompactEmployeeDC> Employees { get; set; }
@@ -243,7 +243,7 @@ namespace BeWoPlanerMobil.Models
get
{
var result = new List<SelectListItem> {new SelectListItem {Value = "-1", Text = string.Empty}};
result.AddRange(Customers.Select(item => item.CustomerOid != null ? new SelectListItem { Value = item.CustomerOid.Value.ToString(), Text = string.Format("{1}, {0}", item.FirstName, item.LastName) } : null).ToList());
result.AddRange(Customers.Select(item => new SelectListItem { Value = item.CustomerOid.ToString(), Text = string.Format("{1}, {0}", item.FirstName, item.LastName) }).ToList());
return result;
}

View File

@@ -122,7 +122,7 @@ function showAjaxError(jqXHR, textStatus, errorThrown) {
console.log("status is 0; ajax call aborted");
return;
}
alert(test + ' ' + errorThrown)
toggleErrorPopup(jqXHR.status + " " + errorThrown);
}

View File

@@ -120,9 +120,11 @@
<add key="UnobtrusiveJavaScriptEnabled" value="true"/>
<!--<add key="MultitenancyPath" value="D:\Projects\beyondSoft\BeWoPlaner\BeWo\Host\Multitenancy\"/>-->
<!--<add key="MultitenancyPath" value="D:\Projects\beyondSoft\BeWoPlaner\BeWo\Host\Multitenancy\"/>-->
<add key="MultitenancyPath" value="D:\Projects\BeWo\Host\Multitenancy"/>
<!--<add key="MultitenancyPath" value="C:\Projekte\BeWo\Host\Multitenancy\"/>-->
<!--<add key="MultitenancyPath" value="..\Host\Multitenancy"/>-->
<add key="MultitenancyPath" value="D:\Projects\beyondSoft\BeWoPlaner\BeWo\Host\Multitenancy"/>
<add key="LicenseInfoUrl" value="https://support.bewoplaner.de/api/getlicensecount.php?k=[TENANT]" />
<add key="LicenseOrderUrl" value="https://support.bewoplaner.de/lizenzbestellung/?k=[TENANT]" />
<add key="LicenseCancellationUrl" value="https://support.bewoplaner.de/api/licencecancellation.php?k=[TENANT]" />
<add key="ContractStateUrl" value="https://support.bewoplaner.de/api/getcontractstate.php?CustomerID=[TENANT]" />
</appSettings>
<!--
Eine Beschreibung der Änderungen von 'web.config' finden Sie unter 'http://go.microsoft.com/fwlink/?LinkId=235367'.

View File

@@ -975,6 +975,48 @@ namespace BeWo.Data.Access
return criteria.List<AbsenceTime>().ToList();
}
public IEnumerable<AbsenceTime> FindAbsenceTimes(DateTime startDate, DateTime endDate)
{
var criteria = CreateCriteriaIsActive<AbsenceTime>()
.Add(
Restrictions.Or(
Restrictions.And(
Restrictions.Ge(AbsenceTime.PropertyName_End, startDate),
Restrictions.Le(AbsenceTime.PropertyName_Start, endDate)
),
Restrictions.And(
Restrictions.Le(AbsenceTime.PropertyName_Start, endDate),
Restrictions.IsNull(AbsenceTime.PropertyName_End)
)
)
);
return criteria.List<AbsenceTime>().ToList();
}
public IEnumerable<Vertretung> FindVertretungen(DateTime startDate, DateTime endDate)
{
var criteria = CreateCriteriaIsActive<Vertretung>()
.Add(
Restrictions.Or(
Restrictions.And(
Restrictions.Ge(Vertretung.PropertyName_VertretungsZeitraumBis, startDate),
Restrictions.Le(Vertretung.PropertyName_VertretungsZeitraumVon, endDate)
),
Restrictions.And(
Restrictions.Le(Vertretung.PropertyName_VertretungsZeitraumVon, endDate),
Restrictions.IsNull(Vertretung.PropertyName_VertretungsZeitraumBis)
)
)
);
return criteria.List<Vertretung>().ToList();
}
public IEnumerable<Appointment> FindAppointments(long? customerOid, long? employeeOid)

View File

@@ -16,11 +16,11 @@
</property>
<property name="connection.connection_string">
Server=localhost;Password=root;User ID=root;Initial Catalog=bewodemo
Server=localhost;Password=root;User ID=root;Initial Catalog=sbdtest
</property>
<!--<property name="connection.connection_string">
Server=localhost;Password=root;User ID=root;Initial Catalog=betreuwo
Server=localhost;Password=root;User ID=root;Initial Catalog=sbdtest
</property>-->
<property name="dialect">

View File

@@ -105,7 +105,9 @@ namespace BeWo.Report.ReportObjects
public string ApprovalDate { get; set; }
public InvoiceBaseDC InvoiceBase { get; set; }
public List<ServiceRecordDC> BillableServiceRecords { get; set; }
public static ServiceInvoiceRO Create(ServiceInvoiceDC pDC)
{
var lResult = new ServiceInvoiceRO
@@ -265,6 +267,28 @@ namespace BeWo.Report.ReportObjects
return lResult;
}
public void CreateBillableServiceRecords()
{
this.BillableServiceRecords = new List<ServiceRecordDC>();
if (ServiceInvoicePeriods != null)
{
foreach (var sip in ServiceInvoicePeriods)
{
if (sip.ServiceInvoiceItems != null)
{
foreach (var ii in sip.ServiceInvoiceItems)
{
if (ii.ServiceRecord != null)
{
BillableServiceRecords.Add(ii.ServiceRecord);
}
}
}
}
}
BillableServiceRecords.Sort((a, b) => a.Start.Value.CompareTo(b.Start.Value));
}
}
public class ServiceInvoicePeriodRO

View File

@@ -466,7 +466,8 @@ namespace BeWo.Report.ReportObjects
foreach (var iSr in lServiceRecords)
{
lResult.TotalGefahreneKilometer += Convert.ToDouble(iSr.DistanceInMeter);
lResult.TotalGefahreneKilometer += Convert.ToDouble(iSr.DistanceInMeter);
bool cont = !(empOid != 0 && iSr.EmployeeOid != null && iSr.EmployeeOid != empOid);
@@ -620,7 +621,7 @@ namespace BeWo.Report.ReportObjects
};
sd.ServiceRecordOid = iSr.Oid.Value;
sd.SignatureOid = iSr.SignatureOid;
sd.GefahreneKilometer = iSr.DistanceInMeter.HasValue ? (Convert.ToDouble(iSr.DistanceInMeter)).ToString("0.##") : string.Empty;
decimal roundedDur = iSr.RoundedDuration;
@@ -714,6 +715,9 @@ namespace BeWo.Report.ReportObjects
sd.EmployeeAbbr = employeeAbbr;
sd.EmployeeFullname = employeeFullName;
sd.EmployeeFirstName = iSr.Employee.Person.FirstName;
sd.EmployeeLastName = iSr.Employee.Person.LastName;
sd.EmployeeNameCommaSeparated = string.Format("{0}, {1}", iSr.Employee.Person.LastName, iSr.Employee.Person.FirstName);
sd.Notice = iSr.Notice;
@@ -1113,6 +1117,18 @@ namespace BeWo.Report.ReportObjects
}
}
public static void CreateSignatureString(ServiceDetail sd)
{
if (sd.SignatureOid.HasValue && String.IsNullOrEmpty(sd.Signature))
{
var sig = DAOFactory.GenericDAO.GetByID<Signature>(sd.SignatureOid.Value);
if (sig != null)
{
sd.Signature = sig.DataBild;
}
}
}
private static int GetKW(DateTime actualDate)
{
Calendar objCal = CultureInfo.CurrentCulture.Calendar;
@@ -1121,6 +1137,40 @@ namespace BeWo.Report.ReportObjects
return weekofyear;
}
public static ServicesOverviewRO CopyFromRO(ServicesOverviewRO ro)
{
ServicesOverviewRO newRo = new ServicesOverviewRO();
newRo.StartDate = ro.StartDate;
newRo.AbsenceTimes = ro.AbsenceTimes;
newRo.ApprovedEndDate = ro.ApprovedEndDate;
newRo.ApprovedFLSPerMonth = ro.ApprovedFLSPerMonth;
newRo.ApprovedFLSPerMonthTotal = ro.ApprovedFLSPerMonthTotal;
newRo.ApprovedFLSPerWeek = ro.ApprovedFLSPerWeek;
newRo.ApprovedFLSPerWeekTotal = ro.ApprovedFLSPerWeekTotal;
newRo.ApprovedFLSTotal = ro.ApprovedFLSTotal;
newRo.ApprovedStartDate = ro.ApprovedStartDate;
newRo.ContactEmployee = ro.ContactEmployee;
newRo.CostBearer2SupportConceptList = ro.CostBearer2SupportConceptList;
newRo.Costbearer = ro.Costbearer;
newRo.CustomerBirthday = ro.CustomerBirthday;
newRo.CustomerLastName = ro.CustomerLastName;
newRo.CustomerCity = ro.CustomerCity;
newRo.CustomerFirstName = ro.CustomerFirstName;
newRo.CustomerName = ro.CustomerName;
newRo.CustomerPostalCode = ro.CustomerPostalCode;
newRo.CustomerStreet = ro.CustomerStreet;
newRo.EndDate = ro.EndDate;
newRo.FreeMinutesThisMonth = ro.FreeMinutesThisMonth;
newRo.Month = ro.Month;
newRo.Year = ro.Year;
newRo.MainAttendant = ro.MainAttendant;
newRo.MainAttendantCommaSeperated = ro.MainAttendantCommaSeperated;
newRo.ReferenceNumber = ro.ReferenceNumber;
return newRo;
}
public class EmployeeDetail
{
public string EmployeeName { get; set; }
@@ -1215,6 +1265,12 @@ namespace BeWo.Report.ReportObjects
public bool IstFerien { get; set; }
public bool IstSamstag { get; set; }
public bool IstSonntag { get; set; }
public long? SignatureOid { get; set; }
public String Signature { get; set; }
public string EmployeeFirstName { get; set; }
public string EmployeeLastName { get; set; }
}
public class ServiceDoubleDetail

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -44,43 +44,89 @@ namespace AlphaEv
private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid)
{
IBeWoReport<ServicesOverviewRO> report = null;
XtraReport report = null;
Dictionary<string, string> cats = new Dictionary<string, string>();
ServicesOverviewRO flsRo = ServicesOverviewRO.CopyFromRO(ro);
ServicesOverviewRO assiRo = ServicesOverviewRO.CopyFromRO(ro);
if (ro.Services != null)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
foreach (ServicesOverviewRO.ServiceDetail s in ro.Services)
foreach (ServicesOverviewRO.ServiceDetail s in ro.Services)
{
if (s.IsBillable)
{
if (!cats.ContainsKey(s.ServiceCategory))
if (!String.IsNullOrWhiteSpace(s.EmployeeFirstName) && !String.IsNullOrWhiteSpace(s.EmployeeLastName) && s.EmployeeFirstName.Length > 1 && s.EmployeeLastName.Length > 1)
{
cats.Add(s.ServiceCategory, s.ServiceCategory);
s.EmployeeAbbr = s.EmployeeFirstName.Substring(0, 2) + s.EmployeeLastName.Substring(0, 2);
}
ServicesOverviewRO.CreateSignatureString(s);
if (s.ServiceCategory.ToLower().Contains("assistenz"))
{
assiRo.Services.Add(s);
}
else
{
flsRo.Services.Add(s);
}
}
}
}
bool istAssistenz = false;
if (cats.Count == 1 && cats.ContainsKey("Assistenz"))
{
istAssistenz = true;
}
report = AddReportToReport(report, flsRo, false);
report = AddReportToReport(report, assiRo, true);
//report = AddReportToReport(report, eingliederungshilfe);
if (istAssistenz)
{
report = new AlphaEv.StundenzettelAssistenz();
}
if (report == null)
report = new AlphaEv.Stundenzettel();
report.SetReportDataSource(ro);
if (report == null)
report = new XtraReport();
return report;
}
return report as XtraReport;
}
}
private XtraReport AddReportToReport(XtraReport report, ServicesOverviewRO ro, bool isAssi)
{
if (ro.Services.Count > 0)
{
if (report == null)
{
if (isAssi)
{
report = new StundenzettelAssistenz();
((StundenzettelAssistenz)report).SetReportDataSource(ro);
}
else
{
report = new Stundenzettel();
((Stundenzettel)report).SetReportDataSource(ro);
}
}
else
{
if (report.Pages.Count == 0)
{
report.CreateDocument();
}
XtraReport newReport = null;
if (isAssi)
{
newReport = new StundenzettelAssistenz();
((StundenzettelAssistenz)newReport).SetReportDataSource(ro);
}
else
{
newReport = new Stundenzettel();
((Stundenzettel)newReport).SetReportDataSource(ro);
}
if (newReport != null)
{
newReport.CreateDocument();
report.Pages.AddRange(newReport.Pages);
}
}
}
return report;
}
}
}

View File

@@ -34,11 +34,7 @@ namespace AlphaEv
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
@@ -51,10 +47,16 @@ namespace AlphaEv
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -67,15 +69,18 @@ namespace AlphaEv
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrRichText2,
this.xrLabel5,
this.xrLabel11,
this.xrLabel7,
this.xrLabel8,
this.xrLabel9,
this.xrLabel10,
this.xrLabel1,
this.xrLabel17,
this.xrRichText3,
this.xrRichText4,
this.lblAdresse,
this.xrLabel10,
this.xrLabel11,
this.xrLabel12});
this.ReportHeader.HeightF = 395F;
this.ReportHeader.HeightF = 411.5988F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
@@ -84,7 +89,7 @@ namespace AlphaEv
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.xrLabel1.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 352.6563F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 385F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(153.2499F, 23F);
@@ -96,33 +101,19 @@ namespace AlphaEv
// xrLabel17
//
this.xrLabel17.Font = new System.Drawing.Font("Calibri", 8F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 73.4375F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(308.33F, 17F);
this.xrLabel17.StylePriority.UseFont = false;
this.xrLabel17.Text = "alpha e.V. | Telegrafenstr. 11 | 42929 Wermelskirchen";
//
// xrRichText3
//
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 0F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(153.2499F, 82.10417F);
//
// xrRichText4
//
this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 95.3125F);
this.xrRichText4.Name = "xrRichText4";
this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString");
this.xrRichText4.SizeF = new System.Drawing.SizeF(153.2499F, 156.8542F);
//
// lblAdresse
//
this.lblAdresse.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.lblAdresse.CanGrow = false;
this.lblAdresse.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108.4375F);
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 135F);
this.lblAdresse.Multiline = true;
this.lblAdresse.Name = "lblAdresse";
this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -130,37 +121,15 @@ namespace AlphaEv
this.lblAdresse.StylePriority.UseBorders = false;
this.lblAdresse.StylePriority.UseFont = false;
//
// xrLabel10
//
this.xrLabel10.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 290.7083F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(153.2499F, 61.94791F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "Unser Zeichen: 292300\r\nRechnungs-Nr.:\r\n[InvoiceNumber]";
//
// xrLabel11
//
this.xrLabel11.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 252.1667F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(153.2499F, 38.5416F);
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "(bei Zahlung bitte angeben:)";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrLabel12
//
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 327.3229F);
this.xrLabel12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 350F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(308.33F, 25.33328F);
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.StylePriority.UseForeColor = false;
this.xrLabel12.Text = "Rechnung Eigenanteil Betreutes Wohnen ";
//
// ruleRateFactorNull
@@ -255,6 +224,98 @@ namespace AlphaEv
this.xrLabel6});
this.GroupHeader1.HeightF = 241.2291F;
this.GroupHeader1.Name = "GroupHeader1";
//
// xrRichText2
//
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 48.96F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(153.2498F, 77.41667F);
//
// xrLabel5
//
this.xrLabel5.CanGrow = false;
this.xrLabel5.CanShrink = true;
this.xrLabel5.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 320.4216F);
this.xrLabel5.Multiline = true;
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(93.88F, 18F);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.StylePriority.UseForeColor = false;
this.xrLabel5.StylePriority.UsePadding = false;
this.xrLabel5.Text = "Unser Zeichen:";
//
// xrLabel11
//
this.xrLabel11.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 281.8799F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(153.2499F, 38.5416F);
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UseForeColor = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "(bei Zahlung bitte angeben:)";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrLabel7
//
this.xrLabel7.CanGrow = false;
this.xrLabel7.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 356.4308F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(153.2499F, 19.24997F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "[InvoiceNumber]";
//
// xrLabel8
//
this.xrLabel8.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(655.63F, 320.4216F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(60F, 18F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.Text = "292300";
//
// xrLabel9
//
this.xrLabel9.CanGrow = false;
this.xrLabel9.CanShrink = true;
this.xrLabel9.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 338.4215F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(93.88F, 18F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseForeColor = false;
this.xrLabel9.StylePriority.UsePadding = false;
this.xrLabel9.Text = "Rechnungs-Nr.:";
//
// xrLabel10
//
this.xrLabel10.CanGrow = false;
this.xrLabel10.CanShrink = true;
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 144.38F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(160.2498F, 137.5F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.StylePriority.UseForeColor = false;
this.xrLabel10.StylePriority.UsePadding = false;
this.xrLabel10.Text = "Ihr Ansprechpartner:\r\nFrau Howe-Jakob\r\nFon: 0 21 96 - 72 63 - 16\r\nFax: 0 21 96 - " +
"72 63 - 32\r\njakob@alphaev.de\r\nwww.alphaev.de";
//
// InvoiceCustomerReport
//
@@ -275,10 +336,9 @@ namespace AlphaEv
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -295,15 +355,18 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
private DevExpress.XtraReports.UI.XRRichText xrRichText3;
private DevExpress.XtraReports.UI.XRRichText xrRichText4;
private DevExpress.XtraReports.UI.XRLabel lblAdresse;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
private DevExpress.XtraReports.UI.XRRichText xrRichText1;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
private DevExpress.XtraReports.UI.XRRichText xrRichText2;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
}
}

View File

@@ -117,12 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="xrRichText3.SerializableRtfString" xml:space="preserve">
<data name="xrRichText2.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwALQAyADQAMABcAHMAbABtAHUAbAB0ADAAewBcAGIAXABmAHMAMgAwAFwAYwBmADEAIABWAGUAcgB3AGEAbAB0AHUAbgBnAH0AXABiAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsAC0AMgA0ADAAXABzAGwAbQB1AGwAdAAwAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsADMANgAwAFwAcwBsAG0AdQBsAHQAMQB7AFwAZgBzADIAMABcAGMAZgAxACAAVABlAGwAZQBnAHIAYQBmAGUAbgBzAHQAcgAuACAAMQAxAH0AXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABmAHMAMgAwAFwAYwBmADEAIAA0ADIAOQAyADkAIABXAGUAcgBtAGUAbABzAGsAaQByAGMAaABlAG4AfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
</data>
<data name="xrRichText4.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABmAHMAMgAwAFwAYwBmADEAIABJAGgAcgAgAEEAbgBzAHAAcgBlAGMAaABwAGEAcgB0AG4AZQByADoAfQBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAzADYAMABcAHMAbABtAHUAbAB0ADEAewBcAGYAcwAyADAAXABjAGYAMQAgAEYAcgBhAHUAIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxACAAUwBjAGgAaQBmAGYAbABlAHIAfQBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAzADYAMABcAHMAbABtAHUAbAB0ADEAewBcAGYAcwAyADAAXABjAGYAMQAgAEYAbwBuADoAIAAwACAAMgAxACAAOQA2ACAALQAgADcAMgAgADYAMwAgAC0AIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxACAAMQA2AH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsADMANgAwAFwAcwBsAG0AdQBsAHQAMQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADAAXABjAGYAMQAgAEYAYQB4ADoAIAAwACAAMgAxACAAOQA2ACAALQAgADcAMgAgADYAMwAgAC0AIAAzADIAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxACAAcwBjAGgAaQBmAGYAbABlAHIAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADAAXABjAGYAMQAgAEAAYQBsAHAAaABhAGUAdgAuAGQAZQB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAzADYAMABcAHMAbABtAHUAbAB0ADEAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgAwAFwAYwBmADEAIAB3AHcAdwAuAGEAbABwAGgAYQBlAHYALgBkAGUAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgB9AA==</value>
</data>
<data name="xrLabel6.Text" xml:space="preserve">
<value>Abrechnungsmonat: [AccountingPeriodStart!MMMM yyyy]

View File

@@ -36,11 +36,7 @@ namespace AlphaEv
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
@@ -76,13 +72,19 @@ namespace AlphaEv
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -95,17 +97,20 @@ namespace AlphaEv
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrRichText2,
this.xrLabel3,
this.xrLabel11,
this.xrLabel4,
this.xrLabel7,
this.xrLabel8,
this.xrLabel10,
this.xrLabel9,
this.xrLabel6,
this.xrLabel1,
this.xrLabel17,
this.xrRichText3,
this.xrRichText4,
this.lblAdresse,
this.xrLabel10,
this.xrLabel11,
this.xrLabel12});
this.ReportHeader.HeightF = 437.7083F;
this.ReportHeader.HeightF = 470F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
@@ -114,7 +119,7 @@ namespace AlphaEv
this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerName")});
this.xrLabel9.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 382.6042F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 405.5209F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(371.88F, 18F);
@@ -124,7 +129,7 @@ namespace AlphaEv
//
// xrLabel6
//
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 400.6042F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 423.5208F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(333.8542F, 17F);
@@ -136,7 +141,7 @@ namespace AlphaEv
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.xrLabel1.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 352.6563F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 385F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(153.2499F, 23F);
@@ -148,33 +153,19 @@ namespace AlphaEv
// xrLabel17
//
this.xrLabel17.Font = new System.Drawing.Font("Calibri", 8F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 73.4375F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(308.33F, 17F);
this.xrLabel17.StylePriority.UseFont = false;
this.xrLabel17.Text = "alpha e.V. | Telegrafenstr. 11 | 42929 Wermelskirchen";
//
// xrRichText3
//
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 0F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(153.2499F, 82.10417F);
//
// xrRichText4
//
this.xrRichText4.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 95.3125F);
this.xrRichText4.Name = "xrRichText4";
this.xrRichText4.SerializableRtfString = resources.GetString("xrRichText4.SerializableRtfString");
this.xrRichText4.SizeF = new System.Drawing.SizeF(153.2499F, 156.8542F);
//
// lblAdresse
//
this.lblAdresse.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.lblAdresse.CanGrow = false;
this.lblAdresse.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108.4375F);
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 135F);
this.lblAdresse.Multiline = true;
this.lblAdresse.Name = "lblAdresse";
this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -182,37 +173,15 @@ namespace AlphaEv
this.lblAdresse.StylePriority.UseBorders = false;
this.lblAdresse.StylePriority.UseFont = false;
//
// xrLabel10
//
this.xrLabel10.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 290.7083F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(153.2499F, 61.94791F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "Unser Zeichen: 292300\r\nRechnungs-Nr.:\r\n[InvoiceNumber]";
//
// xrLabel11
//
this.xrLabel11.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 252.1667F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(153.2499F, 38.5416F);
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "(bei Zahlung bitte angeben:)";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrLabel12
//
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 327.3229F);
this.xrLabel12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 350F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(308.33F, 25.33328F);
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.StylePriority.UseForeColor = false;
this.xrLabel12.Text = "Abrechnung Betreutes Wohnen ";
//
// ruleRateFactorNull
@@ -418,9 +387,11 @@ namespace AlphaEv
// xrTableCell7
//
this.xrTableCell7.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTableCell7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell7.StylePriority.UseBorders = false;
this.xrTableCell7.StylePriority.UseForeColor = false;
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "gel. Std.";
@@ -430,9 +401,11 @@ namespace AlphaEv
// xrTableCell8
//
this.xrTableCell8.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTableCell8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell8.StylePriority.UseBorders = false;
this.xrTableCell8.StylePriority.UseForeColor = false;
this.xrTableCell8.StylePriority.UsePadding = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "zzgl. mittelb.";
@@ -443,11 +416,13 @@ namespace AlphaEv
//
this.xrTableCell10.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTableCell10.CanShrink = true;
this.xrTableCell10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell10.StylePriority.UseBorderColor = false;
this.xrTableCell10.StylePriority.UseBorders = false;
this.xrTableCell10.StylePriority.UseFont = false;
this.xrTableCell10.StylePriority.UseForeColor = false;
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "Betrag";
@@ -555,6 +530,98 @@ namespace AlphaEv
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell13.Weight = 0.030769235304504289D;
//
// xrRichText2
//
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 48.96F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(153.2498F, 77.41667F);
//
// xrLabel3
//
this.xrLabel3.CanGrow = false;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 320.4215F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(93.88F, 18F);
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.StylePriority.UseForeColor = false;
this.xrLabel3.StylePriority.UsePadding = false;
this.xrLabel3.Text = "Unser Zeichen:";
//
// xrLabel11
//
this.xrLabel11.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 281.88F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(153.2499F, 38.5416F);
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UseForeColor = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "(bei Zahlung bitte angeben:)";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrLabel4
//
this.xrLabel4.CanGrow = false;
this.xrLabel4.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 356.4308F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(153.2499F, 19.24997F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "[InvoiceNumber]";
//
// xrLabel7
//
this.xrLabel7.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(655.63F, 320.4215F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(60F, 18F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "292300";
//
// xrLabel8
//
this.xrLabel8.CanGrow = false;
this.xrLabel8.CanShrink = true;
this.xrLabel8.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 338.4216F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(93.88F, 18F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UseForeColor = false;
this.xrLabel8.StylePriority.UsePadding = false;
this.xrLabel8.Text = "Rechnungs-Nr.:";
//
// xrLabel10
//
this.xrLabel10.CanGrow = false;
this.xrLabel10.CanShrink = true;
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 144.38F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(160.2498F, 137.5F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.StylePriority.UseForeColor = false;
this.xrLabel10.StylePriority.UsePadding = false;
this.xrLabel10.Text = "Ihr Ansprechpartner:\r\nFrau Howe-Jakob\r\nFon: 0 21 96 - 72 63 - 16\r\nFax: 0 21 96 - " +
"72 63 - 32\r\njakob@alphaev.de\r\nwww.alphaev.de";
//
// ServiceInvoiceReport
//
@@ -577,13 +644,12 @@ namespace AlphaEv
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -599,11 +665,7 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
private DevExpress.XtraReports.UI.XRRichText xrRichText3;
private DevExpress.XtraReports.UI.XRRichText xrRichText4;
private DevExpress.XtraReports.UI.XRLabel lblAdresse;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
private DevExpress.XtraReports.UI.XRRichText xrRichText1;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
@@ -635,5 +697,12 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRRichText xrRichText2;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
}
}

View File

@@ -117,12 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="xrRichText3.SerializableRtfString" xml:space="preserve">
<data name="xrRichText2.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwALQAyADQAMABcAHMAbABtAHUAbAB0ADAAewBcAGIAXABmAHMAMgAwAFwAYwBmADEAIABWAGUAcgB3AGEAbAB0AHUAbgBnAH0AXABiAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsAC0AMgA0ADAAXABzAGwAbQB1AGwAdAAwAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsADMANgAwAFwAcwBsAG0AdQBsAHQAMQB7AFwAZgBzADIAMABcAGMAZgAxACAAVABlAGwAZQBnAHIAYQBmAGUAbgBzAHQAcgAuACAAMQAxAH0AXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABmAHMAMgAwAFwAYwBmADEAIAA0ADIAOQAyADkAIABXAGUAcgBtAGUAbABzAGsAaQByAGMAaABlAG4AfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
</data>
<data name="xrRichText4.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABmAHMAMgAwAFwAYwBmADEAIABJAGgAcgAgAEEAbgBzAHAAcgBlAGMAaABwAGEAcgB0AG4AZQByADoAfQBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAzADYAMABcAHMAbABtAHUAbAB0ADEAewBcAGYAcwAyADAAXABjAGYAMQAgAEYAcgBhAHUAIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxACAAUwBjAGgAaQBmAGYAbABlAHIAfQBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAzADYAMABcAHMAbABtAHUAbAB0ADEAewBcAGYAcwAyADAAXABjAGYAMQAgAEYAbwBuADoAIAAwACAAMgAxACAAOQA2ACAALQAgADcAMgAgADYAMwAgAC0AIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxACAAMQA2AH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsADMANgAwAFwAcwBsAG0AdQBsAHQAMQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADAAXABjAGYAMQAgAEYAYQB4ADoAIAAwACAAMgAxACAAOQA2ACAALQAgADcAMgAgADYAMwAgAC0AIAAzADIAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxACAAcwBjAGgAaQBmAGYAbABlAHIAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADAAXABjAGYAMQAgAEAAYQBsAHAAaABhAGUAdgAuAGQAZQB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAzADYAMABcAHMAbABtAHUAbAB0ADEAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgAwAFwAYwBmADEAIAB3AHcAdwAuAGEAbABwAGgAYQBlAHYALgBkAGUAfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgB9AA==</value>
</data>
<data name="xrRichText1.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBhAG4AawB2AGUAcgBiAGkAbgBkAHUAbgBnADoAfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAHsAXABmAHMAMQA4AFwAYwBmADEAIABCAGEAbgBrACAAZgBcAHUAMgA1ADIAXAAnAGYAYwByACAAUwBvAHoAaQBhAGwAdwBpAHIAdABzAGMAaABhAGYAdAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEkAQgBBAE4AOgB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEQARQA4ADUAIAAzADcAMAAyACAAMAA1ADAAMAAgADAAMAAwADcAIAAwADMANAA0ACAAMAAwAH0AXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBJAEMAOgAgAEIARgBTAFcARABFADMAMwBYAFgAWAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADIAMABcAGMAZgAxACAAUwB0AC4ALQBOAHIALgA6ACAAMgAzADAALwA1ADcAMgAxAC8ANAA3ADkANgB9AFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAATQBpAHQAZwBsAGkAZQBkACAAaQBtACAAUABhAHIAaQB0AFwAdQAyADIAOABcACcAZQA0AHQAaQBzAGMAaABlAG4AfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgBzADEAOABcAGMAZgAxACAAVwBvAGgAbABmAGEAaAByAHQAcwB2AGUAcgBiAGEAbgBkAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAfQA=</value>
</data>

View File

@@ -99,8 +99,6 @@ namespace AlphaEv
this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.GroupFooter3 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrSubreport1 = new DevExpress.XtraReports.UI.XRSubreport();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -216,7 +214,7 @@ namespace AlphaEv
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable3});
this.Detail1.Font = new System.Drawing.Font("Arial", 10F);
this.Detail1.HeightF = 20F;
this.Detail1.HeightF = 40F;
this.Detail1.Name = "Detail1";
this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail1.StylePriority.UseFont = false;
@@ -232,7 +230,7 @@ namespace AlphaEv
this.xrTable3.Name = "xrTable3";
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow6});
this.xrTable3.SizeF = new System.Drawing.SizeF(684.9999F, 20F);
this.xrTable3.SizeF = new System.Drawing.SizeF(684.9999F, 40F);
this.xrTable3.StylePriority.UseFont = false;
this.xrTable3.StylePriority.UsePadding = false;
this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -252,7 +250,7 @@ namespace AlphaEv
this.xrTableRow6.StylePriority.UsePadding = false;
this.xrTableRow6.StylePriority.UseTextAlignment = false;
this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableRow6.Weight = 1D;
this.xrTableRow6.Weight = 2D;
//
// xrTableCell13
//
@@ -262,7 +260,7 @@ namespace AlphaEv
this.xrTableCell13.StylePriority.UseFont = false;
this.xrTableCell13.StylePriority.UsePadding = false;
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell13.Weight = 0.063131301935241468D;
//
// xrTableCell8
@@ -272,7 +270,7 @@ namespace AlphaEv
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "xrTableCell8";
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell8.Weight = 0.15151504675839139D;
//
// xrTableCell15
@@ -283,7 +281,7 @@ namespace AlphaEv
this.xrTableCell15.StylePriority.UseFont = false;
this.xrTableCell15.StylePriority.UsePadding = false;
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell15.Weight = 0.075757560444321248D;
//
// xrTableCell10
@@ -294,7 +292,7 @@ namespace AlphaEv
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "xrTableCell10";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell10.Weight = 0.10101008081190632D;
//
// xrTableCell11
@@ -304,7 +302,7 @@ namespace AlphaEv
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UsePadding = false;
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell11.Weight = 0.088383820628113785D;
//
// xrTableCell12
@@ -314,7 +312,7 @@ namespace AlphaEv
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell12.Weight = 0.088383820628113785D;
//
// xrTableCell14
@@ -324,7 +322,7 @@ namespace AlphaEv
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UsePadding = false;
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell14.Weight = 0.088383820628113785D;
//
// xrTableCell16
@@ -341,13 +339,13 @@ namespace AlphaEv
//
this.xrPictureBox2.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Tag", null, "ServiceRecordDetailList.Signature")});
new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(165F, 20F);
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(165F, 40F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.xrPictureBox2.StylePriority.UseBorders = false;
this.xrPictureBox2.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.xrPictureBox2_BeforePrint);
this.xrPictureBox2.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.xrPictureBox1_BeforePrint);
//
// GroupFooter1
//
@@ -806,21 +804,6 @@ namespace AlphaEv
this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS";
//
// GroupFooter3
//
this.GroupFooter3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrSubreport1});
this.GroupFooter3.HeightF = 21.875F;
this.GroupFooter3.Name = "GroupFooter3";
this.GroupFooter3.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand;
//
// xrSubreport1
//
this.xrSubreport1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrSubreport1.Name = "xrSubreport1";
this.xrSubreport1.ReportSource = new AlphaEv.StundenzettelAssistenz();
this.xrSubreport1.SizeF = new System.Drawing.SizeF(686.9999F, 21.875F);
//
// Stundenzettel
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -828,8 +811,7 @@ namespace AlphaEv
this.DetailReport,
this.ReportHeader,
this.topMarginBand1,
this.bottomMarginBand1,
this.GroupFooter3});
this.bottomMarginBand1});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldAbrechenbareMinuten,
this.fieldBillableFLS,
@@ -886,10 +868,8 @@ namespace AlphaEv
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRSubreport xrSubreport1;
private DevExpress.XtraReports.UI.FormattingRule formattingRuleRowInvisible;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter3;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRRichText xrRichText3;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;

View File

@@ -23,12 +23,7 @@ namespace AlphaEv
public void SetReportDataSource(ServicesOverviewRO pRO)
{
bool showAssi = false;
var ba = GetTeam(pRO);
var ba = GetTeam(pRO);
if (!String.IsNullOrEmpty(ba))
{
lblHeader.Text += " " + ba;
@@ -37,8 +32,7 @@ namespace AlphaEv
double minutesEinzel = 0;
double minutesGruppe = 0;
Dictionary<string, string> cats = new Dictionary<string, string>();
if (pRO.Services != null)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
@@ -47,10 +41,6 @@ namespace AlphaEv
{
if (s.IsBillable)
{
if (!cats.ContainsKey(s.ServiceCategory))
{
cats.Add(s.ServiceCategory, s.ServiceCategory);
}
if (s.IsGroup)
{
minutesGruppe += s.Minutes;
@@ -68,10 +58,6 @@ namespace AlphaEv
s.Notice4 = "";
}
if (s.ServiceCategory.StartsWith("Assistenz"))
{
//showAssi = true;
}
servicesBillable.Add(s);
@@ -82,25 +68,6 @@ namespace AlphaEv
}
if (cats.Count == 1 && cats.ContainsKey("Assistenz"))
{
showAssi = true;
}
if (showAssi)
{
//var subReport = xrSubreport1.ReportSource as Assistenzstunden;
//if (subReport != null)
// subReport.SetReportDataSource(pRO);
}
else
{
GroupFooter3.Visible = false;
//xrSubreport1.Visible = false;
}
bindingSource1.DataSource = pRO;
cellGesamtEinzel.Text = string.Format("{0:0.##}", minutesEinzel);
cellGesamtGruppe.Text = string.Format("{0:0.##}", minutesGruppe);
@@ -141,7 +108,7 @@ namespace AlphaEv
{
var c2s = pRO.CostBearer2SupportConceptList[0];
var c = c2s.SupportConcept.Customer;
pRO.Costbearer = c.DebitorNumber;
foreach (var t2c in c.Team2CustomerList)
{
return t2c.Team.Name;
@@ -183,7 +150,7 @@ namespace AlphaEv
return null;
}
private void xrPictureBox2_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs e)
private void xrPictureBox1_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs e)
{
XRPictureBox xrBox = sender as XRPictureBox;
//var test = this.GetCurrent
@@ -206,7 +173,7 @@ namespace AlphaEv
Image returnImage = null;
MemoryStream ms = new System.IO.MemoryStream(byteArrayIn);
returnImage = Image.FromStream(ms);
return returnImage;
}
}

View File

@@ -121,7 +121,7 @@
<value>21, 17</value>
</metadata>
<data name="xrRichText3.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAHIAXAB0AHgAMgAwADEAXAB0AHEAcgBcAHQAeAA5ADcAMwA3AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYgBcAGYAMgBcAGYAcwAyADQAXABjAGYAMQAgAFsAQwB1AHMAdABvAG0AZQByAEYAaQByAHMAdABOAGEAbQBlAF0AIABbAEMAdQBzAHQAbwBtAGUAcgBMAGEAcwB0AE4AYQBtAGUAXQB9AFwAYgBcAGYAMgBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAcgBcAHQAeAAyADAAMQBcAHQAcQByAFwAdAB4ADkANwAzADcAewBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABBAFoAIAAoAEwAVgBSACkAOgAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAWwBSAGUAZgBlAHIAZQBuAGMAZQBOAHUAbQBiAGUAcgBdAH0AewBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIAAsAH0AewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAYgBlAHcALgAgAEYATABTADoAIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYgBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAFsAQQBwAHAAcgBvAHYAZQBkAEYATABTAFAAZQByAFcAZQBlAGsAIQAwAC4AIwAjAF0AfQB7AFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAIAAvACAAVwBvAH0AXABmADIAXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAHIAXAB0AHgAMgAwADEAXAB0AHEAcgBcAHQAeAA5ADcAMwA3AHsAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABGAGEAbABsAHYAZQByAGEAbgB0AHcAbwByAHQAbABpAGMAaAA6ACAAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGIAXABmADIAXABmAHMAMgA0AFwAYwBmADEAIABbAE0AYQBpAG4AQQB0AHQAZQBuAGQAYQBuAHQAXQB9AFwAYgBcAGYAMgBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAcgBcAHQAeAAyADAAMQBcAHQAcQByAFwAdAB4ADkANwAzADcAXABiAFwAZgAyAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQByAFwAdAB4ADIAMAAxAFwAdABxAHIAXAB0AHgAOQA3ADMANwB7AFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAYQBsAHAAaABhAC0AQQBaADoAIAAyADkANwAyADAAMAB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAHIAXAB0AHgAMgAwADEAXAB0AHEAcgBcAHQAeAA5ADcAMwA3AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYgBcAGYAMgBcAGYAcwAyADQAXABjAGYAMQAgAFsAQwB1AHMAdABvAG0AZQByAEYAaQByAHMAdABOAGEAbQBlAF0AIABbAEMAdQBzAHQAbwBtAGUAcgBMAGEAcwB0AE4AYQBtAGUAXQB9AFwAYgBcAGYAMgBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAcgBcAHQAeAAyADAAMQBcAHQAcQByAFwAdAB4ADkANwAzADcAewBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABBAFoAIAAoAEwAVgBSACkAOgAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAWwBSAGUAZgBlAHIAZQBuAGMAZQBOAHUAbQBiAGUAcgBdAH0AewBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIAAsAH0AewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAYgBlAHcALgAgAEYATABTADoAIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYgBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAFsAQQBwAHAAcgBvAHYAZQBkAEYATABTAFAAZQByAFcAZQBlAGsAIQAwAC4AIwAjAF0AfQB7AFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAIAAvACAAVwBvAH0AXABmADIAXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAHIAXAB0AHgAMgAwADEAXAB0AHEAcgBcAHQAeAA5ADcAMwA3AHsAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABGAGEAbABsAHYAZQByAGEAbgB0AHcAbwByAHQAbABpAGMAaAA6ACAAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGIAXABmADIAXABmAHMAMgA0AFwAYwBmADEAIABbAE0AYQBpAG4AQQB0AHQAZQBuAGQAYQBuAHQAXQB9AFwAYgBcAGYAMgBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAcgBcAHQAeAAyADAAMQBcAHQAcQByAFwAdAB4ADkANwAzADcAXABiAFwAZgAyAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQByAFwAdAB4ADIAMAAxAFwAdABxAHIAXAB0AHgAOQA3ADMANwB7AFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAYQBsAHAAaABhAC0AQQBaADoAIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAWwBDAG8AcwB0AGIAZQBhAHIAZQByAF0AfQBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgB9AA==</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="xrPictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

View File

@@ -178,7 +178,7 @@ namespace AlphaEv
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable3});
this.Detail1.Font = new System.Drawing.Font("Arial", 10F);
this.Detail1.HeightF = 20F;
this.Detail1.HeightF = 40F;
this.Detail1.Name = "Detail1";
this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail1.StylePriority.UseFont = false;
@@ -194,7 +194,7 @@ namespace AlphaEv
this.xrTable3.Name = "xrTable3";
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow6});
this.xrTable3.SizeF = new System.Drawing.SizeF(609.9999F, 20F);
this.xrTable3.SizeF = new System.Drawing.SizeF(609.9999F, 40F);
this.xrTable3.StylePriority.UseFont = false;
this.xrTable3.StylePriority.UsePadding = false;
this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -211,7 +211,7 @@ namespace AlphaEv
this.xrTableRow6.StylePriority.UsePadding = false;
this.xrTableRow6.StylePriority.UseTextAlignment = false;
this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableRow6.Weight = 1D;
this.xrTableRow6.Weight = 2D;
//
// xrTableCell13
//
@@ -221,7 +221,7 @@ namespace AlphaEv
this.xrTableCell13.StylePriority.UseFont = false;
this.xrTableCell13.StylePriority.UsePadding = false;
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell13.Weight = 0.088383830382983919D;
//
// xrTableCell8
@@ -231,7 +231,7 @@ namespace AlphaEv
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "xrTableCell8";
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell8.Weight = 0.20202019895814016D;
//
// xrTableCell15
@@ -242,7 +242,7 @@ namespace AlphaEv
this.xrTableCell15.StylePriority.UseFont = false;
this.xrTableCell15.StylePriority.UsePadding = false;
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell15.Weight = 0.10100999864121729D;
//
// xrTableCell10
@@ -253,7 +253,7 @@ namespace AlphaEv
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "xrTableCell10";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell10.Weight = 0.11363634325918627D;
//
// xrTableCell16
@@ -270,13 +270,13 @@ namespace AlphaEv
//
this.xrPictureBox2.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Tag", null, "ServiceRecordDetailList.Signature")});
new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrPictureBox2.Name = "xrPictureBox2";
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(210F, 20F);
this.xrPictureBox2.SizeF = new System.Drawing.SizeF(210F, 40F);
this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.xrPictureBox2.StylePriority.UseBorders = false;
this.xrPictureBox2.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.xrPictureBox2_BeforePrint);
this.xrPictureBox2.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.xrPictureBox1_BeforePrint);
//
// GroupFooter1
//

View File

@@ -82,7 +82,7 @@ namespace AlphaEv
{
var c2s = pRO.CostBearer2SupportConceptList[0];
var c = c2s.SupportConcept.Customer;
pRO.Costbearer = c.DebitorNumber;
foreach (var t2c in c.Team2CustomerList)
{
return t2c.Team.Name;
@@ -124,7 +124,7 @@ namespace AlphaEv
return null;
}
private void xrPictureBox2_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs e)
private void xrPictureBox1_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs e)
{
XRPictureBox xrBox = sender as XRPictureBox;
//var test = this.GetCurrent

View File

@@ -121,7 +121,7 @@
<value>21, 17</value>
</metadata>
<data name="xrRichText3.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAHIAXAB0AHgAMgAwADEAXAB0AHEAcgBcAHQAeAA5ADcAMwA3AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYgBcAGYAMgBcAGYAcwAyADQAXABjAGYAMQAgAFsAQwB1AHMAdABvAG0AZQByAEYAaQByAHMAdABOAGEAbQBlAF0AIABbAEMAdQBzAHQAbwBtAGUAcgBMAGEAcwB0AE4AYQBtAGUAXQB9AFwAYgBcAGYAMgBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAcgBcAHQAeAAyADAAMQBcAHQAcQByAFwAdAB4ADkANwAzADcAewBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABBAFoAIAAoAEwAVgBSACkAOgAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAWwBSAGUAZgBlAHIAZQBuAGMAZQBOAHUAbQBiAGUAcgBdAH0AewBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIAAsAH0AewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAYgBlAHcALgAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABBAHMAcwBpAHMAdABlAG4AegAtAFMAdABkAC4AfQB7AFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAOgAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAWwBBAHAAcAByAG8AdgBlAGQARgBMAFMAUABlAHIAVwBlAGUAawAhADAALgAjACMAXQB9AHsAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIAAgAC8AIABXAG8AfQBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAcgBcAHQAeAAyADAAMQBcAHQAcQByAFwAdAB4ADkANwAzADcAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEYAYQBsAGwAdgBlAHIAYQBuAHQAdwBvAHIAdABsAGkAYwBoADoAIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYgBcAGYAMgBcAGYAcwAyADQAXABjAGYAMQAgAFsATQBhAGkAbgBBAHQAdABlAG4AZABhAG4AdABdAH0AXABiAFwAZgAyAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQByAFwAdAB4ADIAMAAxAFwAdABxAHIAXAB0AHgAOQA3ADMANwBcAGIAXABmADIAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAHIAXAB0AHgAMgAwADEAXAB0AHEAcgBcAHQAeAA5ADcAMwA3AHsAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABhAGwAcABoAGEALQBBAFoAOgAgADIAOQA3ADIAMAAwAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=</value>
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAHIAXAB0AHgAMgAwADEAXAB0AHEAcgBcAHQAeAA5ADcAMwA3AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYgBcAGYAMgBcAGYAcwAyADQAXABjAGYAMQAgAFsAQwB1AHMAdABvAG0AZQByAEYAaQByAHMAdABOAGEAbQBlAF0AIABbAEMAdQBzAHQAbwBtAGUAcgBMAGEAcwB0AE4AYQBtAGUAXQB9AFwAYgBcAGYAMgBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAcgBcAHQAeAAyADAAMQBcAHQAcQByAFwAdAB4ADkANwAzADcAewBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIABBAFoAIAAoAEwAVgBSACkAOgAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAWwBSAGUAZgBlAHIAZQBuAGMAZQBOAHUAbQBiAGUAcgBdAH0AewBcAGIAXABmADIAXABmAHMAMQA4AFwAYwBmADEAIAAsAH0AewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAYgBlAHcALgAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABBAHMAcwBpAHMAdABlAG4AegAtAFMAdABkAC4AfQB7AFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAOgAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABiAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAWwBBAHAAcAByAG8AdgBlAGQARgBMAFMAUABlAHIAVwBlAGUAawAhADAALgAjACMAXQB9AHsAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIAAgAC8AIABXAG8AfQBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAcgBcAHQAeAAyADAAMQBcAHQAcQByAFwAdAB4ADkANwAzADcAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEYAYQBsAGwAdgBlAHIAYQBuAHQAdwBvAHIAdABsAGkAYwBoADoAIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYgBcAGYAMgBcAGYAcwAyADQAXABjAGYAMQAgAFsATQBhAGkAbgBBAHQAdABlAG4AZABhAG4AdABdAH0AXABiAFwAZgAyAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQByAFwAdAB4ADIAMAAxAFwAdABxAHIAXAB0AHgAOQA3ADMANwBcAGIAXABmADIAXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAHIAXAB0AHgAMgAwADEAXAB0AHEAcgBcAHQAeAA5ADcAMwA3AHsAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABhAGwAcABoAGEALQBBAFoAOgAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABbAEMAbwBzAHQAYgBlAGEAcgBlAHIAXQB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="xrPictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

View File

@@ -36,7 +36,6 @@ namespace AlphaEv.Alt
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
@@ -86,7 +85,19 @@ namespace AlphaEv.Alt
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.fieldMittelbareStunden = new DevExpress.XtraReports.UI.CalculatedField();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrRichText5 = new DevExpress.XtraReports.UI.XRRichText();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -94,6 +105,8 @@ namespace AlphaEv.Alt
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -106,57 +119,69 @@ namespace AlphaEv.Alt
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel4,
this.xrLabel7,
this.xrLabel3,
this.xrLabel1,
this.xrLabel12,
this.xrLabel11,
this.xrLabel5,
this.lblAdresse,
this.xrRichText2,
this.xrRichText1,
this.xrLabel17,
this.xrLabel8});
this.ReportHeader.HeightF = 378F;
this.ReportHeader.HeightF = 408F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrLabel12
//
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 328.8854F);
this.xrLabel12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 350F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(308.33F, 25.33328F);
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.StylePriority.UseForeColor = false;
this.xrLabel12.Text = "Abrechnung Betreutes Wohnen ";
//
// xrLabel11
//
this.xrLabel11.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 253.7292F);
this.xrLabel11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(561.7503F, 281.875F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(153.2499F, 38.5416F);
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UseForeColor = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "(bei Zahlung bitte angeben:)";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
//
// xrLabel5
//
this.xrLabel5.CanGrow = false;
this.xrLabel5.CanShrink = true;
this.xrLabel5.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 292.2708F);
this.xrLabel5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(561.7503F, 320.4166F);
this.xrLabel5.Multiline = true;
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(153.2499F, 61.94791F);
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(93.88F, 18F);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "Unser Zeichen: 292300\r\nRechnungs-Nr.:\r\n[InvoiceNumber]";
this.xrLabel5.StylePriority.UseForeColor = false;
this.xrLabel5.StylePriority.UsePadding = false;
this.xrLabel5.Text = "Unser Zeichen:";
//
// lblAdresse
//
this.lblAdresse.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.lblAdresse.CanGrow = false;
this.lblAdresse.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 110F);
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 135F);
this.lblAdresse.Multiline = true;
this.lblAdresse.Name = "lblAdresse";
this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -164,24 +189,17 @@ namespace AlphaEv.Alt
this.lblAdresse.StylePriority.UseBorders = false;
this.lblAdresse.StylePriority.UseFont = false;
//
// xrRichText2
//
this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 96.875F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(153.2499F, 156.8542F);
//
// xrRichText1
//
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 0F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(561.7503F, 48.95833F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(153.2499F, 82.10417F);
this.xrRichText1.SizeF = new System.Drawing.SizeF(153.2498F, 77.41667F);
//
// xrLabel17
//
this.xrLabel17.Font = new System.Drawing.Font("Calibri", 8F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 75F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(308.33F, 17F);
@@ -193,7 +211,7 @@ namespace AlphaEv.Alt
this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.xrLabel8.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 354.2188F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 385F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(153.2499F, 23F);
@@ -251,6 +269,9 @@ namespace AlphaEv.Alt
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable2,
this.xrRichText5,
this.xrLabel6,
this.xrTable1,
this.xrRichText3,
this.xrLabel9,
@@ -292,9 +313,11 @@ namespace AlphaEv.Alt
// xrTableCell7
//
this.xrTableCell7.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTableCell7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell7.StylePriority.UseBorders = false;
this.xrTableCell7.StylePriority.UseForeColor = false;
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "gel. Std.";
@@ -304,9 +327,11 @@ namespace AlphaEv.Alt
// xrTableCell8
//
this.xrTableCell8.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTableCell8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell8.StylePriority.UseBorders = false;
this.xrTableCell8.StylePriority.UseForeColor = false;
this.xrTableCell8.StylePriority.UsePadding = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "zzgl. mittelb.";
@@ -317,11 +342,13 @@ namespace AlphaEv.Alt
//
this.xrTableCell10.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTableCell10.CanShrink = true;
this.xrTableCell10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell10.StylePriority.UseBorderColor = false;
this.xrTableCell10.StylePriority.UseBorders = false;
this.xrTableCell10.StylePriority.UseFont = false;
this.xrTableCell10.StylePriority.UseForeColor = false;
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "Betrag";
@@ -341,11 +368,13 @@ namespace AlphaEv.Alt
//
// xrRichText3
//
this.xrRichText3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.99997F);
this.xrRichText3.Name = "xrRichText3";
this.xrRichText3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString");
this.xrRichText3.SizeF = new System.Drawing.SizeF(611.5832F, 82.10417F);
this.xrRichText3.SizeF = new System.Drawing.SizeF(210F, 28.98F);
this.xrRichText3.StylePriority.UseForeColor = false;
this.xrRichText3.StylePriority.UsePadding = false;
//
// xrLabel9
@@ -363,12 +392,12 @@ namespace AlphaEv.Alt
//
// xrLabel2
//
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 18F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(30.00005F, 17.99997F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(333.8542F, 17F);
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "AZ.: [CustomerReferenceNumber]";
this.xrLabel2.Text = "[CustomerReferenceNumber]";
//
// DetailReport
//
@@ -412,10 +441,12 @@ namespace AlphaEv.Alt
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.ItemDescription")});
this.xrTableCell3.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseBorders = false;
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.StylePriority.UseForeColor = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "xrTableCell3";
@@ -687,6 +718,165 @@ namespace AlphaEv.Alt
this.fieldMittelbareStunden.DataMember = "InvoiceItems";
this.fieldMittelbareStunden.Expression = "([UnitCount] * [RateFactor]) -[UnitCount]";
this.fieldMittelbareStunden.Name = "fieldMittelbareStunden";
//
// xrLabel1
//
this.xrLabel1.CanGrow = false;
this.xrLabel1.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(561.7503F, 356.4258F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(153.2499F, 19.24997F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.Text = "[InvoiceNumber]";
//
// xrLabel3
//
this.xrLabel3.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(655.6305F, 320.4166F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(60F, 18F);
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "292300";
//
// xrLabel7
//
this.xrLabel7.CanGrow = false;
this.xrLabel7.CanShrink = true;
this.xrLabel7.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(561.7503F, 338.4165F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(93.88F, 18F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.StylePriority.UseForeColor = false;
this.xrLabel7.StylePriority.UsePadding = false;
this.xrLabel7.Text = "Rechnungs-Nr.:";
//
// xrLabel6
//
this.xrLabel6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 17.99997F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(30F, 17F);
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.StylePriority.UseForeColor = false;
this.xrLabel6.StylePriority.UsePadding = false;
this.xrLabel6.Text = "AZ.:";
//
// xrRichText5
//
this.xrRichText5.LocationFloat = new DevExpress.Utils.PointFloat(210.0001F, 35.0008F);
this.xrRichText5.Name = "xrRichText5";
this.xrRichText5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
this.xrRichText5.SerializableRtfString = resources.GetString("xrRichText5.SerializableRtfString");
this.xrRichText5.SizeF = new System.Drawing.SizeF(411.58F, 28.98F);
this.xrRichText5.StylePriority.UsePadding = false;
//
// xrTable2
//
this.xrTable2.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 63.9808F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9,
this.xrTableRow10});
this.xrTable2.SizeF = new System.Drawing.SizeF(489.9999F, 34F);
this.xrTable2.StylePriority.UseBorderColor = false;
//
// xrTableRow9
//
this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell19,
this.xrTableCell13});
this.xrTableRow9.Name = "xrTableRow9";
this.xrTableRow9.Weight = 0.085D;
//
// xrTableCell19
//
this.xrTableCell19.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell19.StylePriority.UseBorderColor = false;
this.xrTableCell19.StylePriority.UseBorders = false;
this.xrTableCell19.StylePriority.UseFont = false;
this.xrTableCell19.Text = "Bewilligte Fachleistungsstunden (FLS) gesamt:";
this.xrTableCell19.Weight = 0.4769232177734376D;
//
// xrTableCell13
//
this.xrTableCell13.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell13.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell13.StylePriority.UseBorderColor = false;
this.xrTableCell13.StylePriority.UseBorders = false;
this.xrTableCell13.StylePriority.UseFont = false;
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.Text = "[ApprovedFLS]";
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell13.Weight = 0.27692279522235574D;
//
// xrTableRow10
//
this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell20,
this.xrTableCell14});
this.xrTableRow10.FormattingRules.Add(this.ruleRateFactorNull);
this.xrTableRow10.Name = "xrTableRow10";
this.xrTableRow10.Weight = 0.085D;
//
// xrTableCell20
//
this.xrTableCell20.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell20.FormattingRules.Add(this.ruleRateFactorNull);
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell20.StylePriority.UseBorderColor = false;
this.xrTableCell20.StylePriority.UseBorders = false;
this.xrTableCell20.StylePriority.UseFont = false;
this.xrTableCell20.Text = "- zzgl. Faktor [RateFactorText2]:";
this.xrTableCell20.Weight = 0.49307720477764433D;
//
// xrTableCell14
//
this.xrTableCell14.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell14.FormattingRules.Add(this.ruleRateFactorNull);
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell14.StylePriority.UseBorderColor = false;
this.xrTableCell14.StylePriority.UseBorders = false;
this.xrTableCell14.StylePriority.UseFont = false;
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.Text = "[ApprovedFLSWithFactor]";
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell14.Weight = 0.26076880821814907D;
//
// xrLabel4
//
this.xrLabel4.CanGrow = false;
this.xrLabel4.CanShrink = true;
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(561.7503F, 144.375F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(160.2498F, 137.5F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UseForeColor = false;
this.xrLabel4.StylePriority.UsePadding = false;
this.xrLabel4.Text = "Ihr Ansprechpartner:\r\nFrau Howe-Jakob\r\nFon: 0 21 96 - 72 63 - 16\r\nFax: 0 21 96 - " +
"72 63 - 32\r\njakob@alphaev.de\r\nwww.alphaev.de";
//
// Spitzabrechnung
//
@@ -711,7 +901,6 @@ namespace AlphaEv.Alt
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
@@ -719,6 +908,8 @@ namespace AlphaEv.Alt
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -765,7 +956,6 @@ namespace AlphaEv.Alt
private DevExpress.XtraReports.UI.XRRichText xrRichText1;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRRichText xrRichText2;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
private DevExpress.XtraReports.UI.XRRichText xrRichText4;
private DevExpress.XtraReports.UI.XRTable xrTable1;
@@ -781,5 +971,18 @@ namespace AlphaEv.Alt
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRRichText xrRichText5;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
}
}

View File

@@ -117,17 +117,17 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="xrRichText2.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABmAHMAMgAwAFwAYwBmADEAIABJAGgAcgAgAEEAbgBzAHAAcgBlAGMAaABwAGEAcgB0AG4AZQByADoAfQBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAzADYAMABcAHMAbABtAHUAbAB0ADEAewBcAGYAcwAyADAAXABjAGYAMQAgAEYAcgBhAHUAIABIAG8AdwBlAC0ASgBhAGsAbwBiAH0AXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABmAHMAMgAwAFwAYwBmADEAIABGAG8AbgA6ACAAMAAgADIAMQAgADkANgAgAC0AIAA3ADIAIAA2ADMAIAAtACAAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADAAXABjAGYAMQAgADEANgB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAzADYAMABcAHMAbABtAHUAbAB0ADEAewBcAGYAcwAyADAAXABjAGYAMQAgAEYAYQB4ADoAIAAwACAAMgAxACAAOQA2ACAALQAgADcAMgAgADYAMwAgAC0AIAAzADIAfQBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHMAbAAzADYAMABcAHMAbABtAHUAbAB0ADEAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgAwAFwAYwBmADEAIABqAGEAawBvAGIAQABhAGwAcABoAGEAZQB2AC4AZABlAH0AXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxACAAdwB3AHcALgBhAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgAwAFwAYwBmADEAIABsAHAAaABhAGUAdgAuAGQAZQB9AFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAfQA=</value>
</data>
<data name="xrRichText1.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwALQAyADQAMABcAHMAbABtAHUAbAB0ADAAewBcAGIAXABmAHMAMgAwAFwAYwBmADEAIABWAGUAcgB3AGEAbAB0AHUAbgBnAH0AXABiAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsAC0AMgA0ADAAXABzAGwAbQB1AGwAdAAwAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsADMANgAwAFwAcwBsAG0AdQBsAHQAMQB7AFwAZgBzADIAMABcAGMAZgAxACAAVABlAGwAZQBnAHIAYQBmAGUAbgBzAHQAcgAuACAAMQAxAH0AXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABmAHMAMgAwAFwAYwBmADEAIAA0ADIAOQAyADkAIABXAGUAcgBtAGUAbABzAGsAaQByAGMAaABlAG4AfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
</data>
<data name="xrRichText4.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBhAG4AawB2AGUAcgBiAGkAbgBkAHUAbgBnADoAfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAHsAXABmAHMAMQA4AFwAYwBmADEAIABCAGEAbgBrACAAZgBcAHUAMgA1ADIAXAAnAGYAYwByACAAUwBvAHoAaQBhAGwAdwBpAHIAdABzAGMAaABhAGYAdAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEkAQgBBAE4AOgB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEQARQA4ADUAIAAzADcAMAAyACAAMAA1ADAAMAAgADAAMAAwADcAIAAwADMANAA0ACAAMAAwAH0AXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBJAEMAOgAgAEIARgBTAFcARABFADMAMwBYAFgAWAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADIAMABcAGMAZgAxACAAUwB0AC4ALQBOAHIALgA6ACAAMgAzADAALwA1ADcAMgAxAC8ANAA3ADkANgB9AFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAATQBpAHQAZwBsAGkAZQBkACAAaQBtACAAUABhAHIAaQB0AFwAdQAyADIAOABcACcAZQA0AHQAaQBzAGMAaABlAG4AfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgBzADEAOABcAGMAZgAxACAAVwBvAGgAbABmAGEAaAByAHQAcwB2AGUAcgBiAGEAbgBkAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAfQA=</value>
</data>
<data name="xrRichText5.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwBcAHIAZQBkADEAOQAyAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADQAXABjAGYAMQAgAFsAQQBjAGMAbwB1AG4AdABpAG4AZwBTAHQAYQByAHQARABhAHQAZQBTAHQAcgBpAG4AZwBdAH0AewBcAGYAcwAyADQAXABjAGYAMQAgACAAfQB7AFwAZgBzADIAMABcAGMAZgAzACAAYgBpAHMAfQB7AFwAZgBzADIAMABcAGMAZgAxACAAIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIANABcAGMAZgAxACAAWwBBAGMAYwBvAHUAbgB0AGkAbgBnAEUAbgBkAEQAYQB0AGUAUwB0AHIAaQBuAGcAXQB9AFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsADMANgAwAFwAcwBsAG0AdQBsAHQAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
</data>
<data name="xrRichText3.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwBcAHIAZQBkADIANQA1AFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgBzADIAMABcAGMAZgAxACAAQgBlAHcAaQBsAGwAaQBnAHUAbgBnAHMALQAvAEEAYgByAGUAYwBoAG4AdQBuAGcAcwB6AGUAaQB0AHIAYQB1AG0AfQB7AFwAZgBzADIAMABcAGMAZgAzACAAIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIANABcAGMAZgAxACAAWwBBAGMAYwBvAHUAbgB0AGkAbgBnAFMAdABhAHIAdABEAGEAdABlAFMAdAByAGkAbgBnAF0AfQB7AFwAZgBzADIANABcAGMAZgAxACAAIAB9AHsAXABmAHMAMgAwAFwAYwBmADEAIABiAGkAcwAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMgA0AFwAYwBmADEAIABbAEEAYwBjAG8AdQBuAHQAaQBuAGcARQBuAGQARABhAHQAZQBTAHQAcgBpAG4AZwBdAH0AXABmAHMAMgA0AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=</value>
<value>ewBcAHIAdABmADEAXABhAG4AcwBpAGMAcABnADEAMgA1ADIADQAKAHsADQAKAFwAZgBvAG4AdAB0AGIAbAANAAoAewBcAGYAMAAgAFQAaQBtAGUAcwAgAE4AZQB3ACAAUgBvAG0AYQBuADsAfQANAAoAewBcAGYAMQAgAEMAYQBsAGkAYgByAGkAOwB9AA0ACgB9AA0ACgB7AA0ACgBcAGMAbwBsAG8AcgB0AGIAbAANAAoAOwANAAoAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAOwANAAoAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ADsADQAKAFwAcgBlAGQAMQA5ADIAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAA7AA0ACgB9AA0ACgBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAHsAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADEAXABmAHMAMgAwAFwAYwBmADMAIABCAGUAdwBpAGwAbABpAGcAdQBuAGcAcwAtAC8AQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQANAAoAfQANAAoA</value>
</data>
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>

View File

@@ -69,6 +69,12 @@
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServiceInvoiceReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ServiceInvoiceReport.Designer.cs">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
</Compile>
<Compile Include="ServicesOverviewReport.cs">
<SubType>Component</SubType>
</Compile>
@@ -112,6 +118,10 @@
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="ServiceInvoiceReport.resx">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ServicesOverviewReport.resx">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</EmbeddedResource>

View File

@@ -429,9 +429,6 @@ namespace BeWo.BAPBielefelderAmbulantePflege
// ruleRateFactorNull
//
this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
//
//
//
this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.ruleRateFactorNull.Name = "ruleRateFactorNull";
//
@@ -492,8 +489,8 @@ namespace BeWo.BAPBielefelderAmbulantePflege
this.xrLabel19.SizeF = new System.Drawing.SizeF(329.0833F, 73.24998F);
this.xrLabel19.StylePriority.UseBorders = false;
this.xrLabel19.StylePriority.UseFont = false;
this.xrLabel19.Text = "Ansprechpartner/in: Sonja Sala\r\nTelefon: 0521-55734131\r\nFax: 0521-5573402\r\n" +
"E-Mail: s.sala@bi-bap.de\r\n";
this.xrLabel19.Text = "Ansprechpartner/in: [SenderContactPerson]\r\nTelefon: [SenderContactPersonPhone]\r\nF" +
"ax: [SenderContactPersonFax]\r\nE-Mail: [SenderContactPersonMail]";
//
// xrLabel9
//
@@ -509,7 +506,7 @@ namespace BeWo.BAPBielefelderAmbulantePflege
//
// xrCrossBandBox1
//
this.xrCrossBandBox1.BorderWidth = 1;
this.xrCrossBandBox1.BorderWidth = 1F;
this.xrCrossBandBox1.EndBand = this.bottomMarginBand1;
this.xrCrossBandBox1.EndPointFloat = new DevExpress.Utils.PointFloat(0F, 21.87494F);
this.xrCrossBandBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 29.99999F);
@@ -539,7 +536,7 @@ namespace BeWo.BAPBielefelderAmbulantePflege
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "13.1";
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();

View File

@@ -19,11 +19,19 @@ namespace BeWo.Club74
if (duration != sr.RoundedDuration)
{
if (sr.ServiceDescription != null && sr.ServiceDescription.Name.Contains("Telefonate"))
{
sr.RoundedDuration = duration;
}
//else
if (sr.ServiceDescription != null)
{
if (sr.ServiceDescription.Name.Contains("Telefonate"))
{
sr.RoundedDuration = duration;
}
else if (sr.ServiceDescription.ServiceCategory.Name.Contains("§67"))
{
sr.RoundedDuration = duration;
}
}
//else
//{
// if (duration < 5)
// {

View File

@@ -59,6 +59,12 @@
<Compile Include="ServiceInvoiceReport.Designer.cs">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
</Compile>
<Compile Include="ServicesOverviewReport67Direkt.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ServicesOverviewReport67Direkt.Designer.cs">
<DependentUpon>ServicesOverviewReport67Direkt.cs</DependentUpon>
</Compile>
<Compile Include="ServicesOverviewReport67.cs">
<SubType>Component</SubType>
</Compile>
@@ -85,6 +91,10 @@
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ServicesOverviewReport67Direkt.resx">
<DependentUpon>ServicesOverviewReport67Direkt.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ServicesOverviewReport67.resx">
<DependentUpon>ServicesOverviewReport67.cs</DependentUpon>
<SubType>Designer</SubType>

View File

@@ -47,6 +47,8 @@ namespace CaritasAhlen
{
IBeWoReport<ServicesOverviewRO> report = null;
bool is67 = false;
String kt = "";
if (!String.IsNullOrWhiteSpace(ro.Costbearer))
{
@@ -55,20 +57,109 @@ namespace CaritasAhlen
if (kt.Contains("67"))
{
report = new CaritasAhlen.Stundenzettel67();
is67 = true;
}
foreach (var s in ro.Services)
if (!is67)
{
if (report == null && s.ServiceCategory.Contains("§67"))
report = new CaritasAhlen.Stundenzettel67();
}
foreach (var s in ro.Services)
{
if (s.ServiceCategory.Contains("§67"))
{
is67 = true;
}
}
}
if (report == null)
report = new CaritasAhlen.Stundenzettel();
if (is67)
{
return Create67ReportForRo(ro, serviceCategoryOid);
}
report = new CaritasAhlen.Stundenzettel();
report.SetReportDataSource(ro);
return report as XtraReport;
}
}
private XtraReport Create67ReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid)
{
XtraReport report = null;
ServicesOverviewRO direktRo = ServicesOverviewRO.CopyFromRO(ro);
ServicesOverviewRO indirektRo = ServicesOverviewRO.CopyFromRO(ro);
if (ro.Services != null)
{
foreach (ServicesOverviewRO.ServiceDetail s in ro.Services)
{
if (s.IsBillable)
{
if (s.ServiceCategory.Contains("§67"))
{
indirektRo.Services.Add(s);
}
else
{
direktRo.Services.Add(s);
}
}
}
}
report = AddReportToReport(report, direktRo, false);
report = AddReportToReport(report, indirektRo, true);
//report = AddReportToReport(report, eingliederungshilfe);
if (report == null)
report = new XtraReport();
return report;
}
private XtraReport AddReportToReport(XtraReport report, ServicesOverviewRO ro, bool is67)
{
if (ro.Services.Count > 0)
{
if (report == null)
{
if (is67)
{
report = new Stundenzettel67();
((Stundenzettel67)report).SetReportDataSource(ro);
}
else
{
report = new Stundenzettel67Direkt();
((Stundenzettel67Direkt)report).SetReportDataSource(ro);
}
}
else
{
if (report.Pages.Count == 0)
{
report.CreateDocument();
}
XtraReport newReport = null;
if (is67)
{
newReport = new Stundenzettel67();
((Stundenzettel67)newReport).SetReportDataSource(ro);
}
else
{
newReport = new Stundenzettel67Direkt();
((Stundenzettel67Direkt)newReport).SetReportDataSource(ro);
}
if (newReport != null)
{
newReport.CreateDocument();
report.Pages.AddRange(newReport.Pages);
}
}
}
return report;
}
}
}

View File

@@ -122,7 +122,7 @@ namespace CaritasAhlen.Export
{
sb.AppendLine();
}
for (int i = 0; i < row.ItemArray.Length; i++)
for (int i = 0; i < row.ItemArray.Length - 1; i++)
{
if (i > 0)
{
@@ -146,7 +146,7 @@ namespace CaritasAhlen.Export
sb.Append(item);
}
}
ErstelleKostenstellenZeilen(row, sb);
}
//F,0,050,,BEWO,DA,01012016,012016,iBelegNr1,Belegnr1,220001,,,,999.99, "Name AZ Abrechnung 01/2016 LVR",,,EUR,,,,,,,,,,,R,,,
//G,0,1695,,,-999.99,"Name AZ Abrechnung 01/2016 LVR",
@@ -154,6 +154,30 @@ namespace CaritasAhlen.Export
return sb.ToString();
}
private static void ErstelleKostenstellenZeilen(DataRow row, StringBuilder sb)
{
if (row.ItemArray.Length > 15)
{
var betragObj = row[14];
decimal gesamtbetrag = 0;
if (betragObj != null)
{
Decimal.TryParse(betragObj.ToString().Replace(".", ","), out gesamtbetrag);
}
var kstItem = row[row.ItemArray.Length - 1];
String kst = "";
if (kstItem != null)
kst = kstItem.ToString();
sb.AppendLine();
sb.Append(String.Format("K,0,{0},,,,,,", kst));
sb.Append(String.Format("{0:0.00}", gesamtbetrag).Replace(",", "."));
sb.Append(",");
}
}
public static String GetAbschlagszahlungenString(DateTime date)
{
var dt = ExecuteQuery(GetAbschlagszahlungenSql(date), date);
@@ -384,7 +408,8 @@ null,
null,
null,
null,
null
null,
c.CostCenter
FROM `supportconcept` sc
INNER JOIN `costbearer2supportconcept` cb2sc ON sc.`Oid` = cb2sc.`SupportConceptOid`
INNER JOIN `costbearer` cb ON cb2sc.`CostBearerOid` = cb.`Oid`

View File

@@ -44,6 +44,7 @@ namespace CaritasAhlen
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -85,11 +86,10 @@ namespace CaritasAhlen
this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -274,6 +274,10 @@ namespace CaritasAhlen
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell6.Weight = 0.77930571912647739D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -772,10 +776,6 @@ namespace CaritasAhlen
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// Stundenzettel
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -798,8 +798,8 @@ namespace CaritasAhlen
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}

View File

@@ -34,6 +34,7 @@ namespace CaritasAhlen
this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -42,6 +43,7 @@ namespace CaritasAhlen
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -52,6 +54,7 @@ namespace CaritasAhlen
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -60,39 +63,35 @@ namespace CaritasAhlen
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.rechnungsDatum = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.mitarbeiterName = new DevExpress.XtraReports.UI.XRLabel();
this.bewilligteFLSW = new DevExpress.XtraReports.UI.XRLabel();
this.aktenzeichenLV = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = 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.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
this.aktenzeichenLV = new DevExpress.XtraReports.UI.XRLabel();
this.bewilligteFLSW = new DevExpress.XtraReports.UI.XRLabel();
this.mitarbeiterName = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -147,6 +146,18 @@ namespace CaritasAhlen
this.xrTableCell3.Text = "Datum";
this.xrTableCell3.Weight = 0.16543926537210274D;
//
// xrTableCell10
//
this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell10.Multiline = true;
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 2, 100F);
this.xrTableCell10.StylePriority.UseBorders = false;
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.Text = "Tätigkeit\r\ngemäß\r\nFußnote²";
this.xrTableCell10.Weight = 0.19301246437612846D;
//
// xrTableCell4
//
this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
@@ -172,7 +183,7 @@ namespace CaritasAhlen
this.xrTableCell11.StylePriority.UsePadding = false;
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.Text = "Anzahl Minuten";
this.xrTableCell11.Weight = 0.11029283646384648D;
this.xrTableCell11.Weight = 0.19301246491840912D;
//
// xrTableCell9
//
@@ -243,6 +254,18 @@ namespace CaritasAhlen
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell2.Weight = 0.4675835803565655D;
//
// xrTableCell12
//
this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceDescription")});
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.StylePriority.UseBorders = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.Text = "xrTableCell12";
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell12.Weight = 0.5455140877656931D;
//
// xrTableCell7
//
this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
@@ -252,7 +275,7 @@ namespace CaritasAhlen
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "[TimeRangeString]";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell7.Weight = 0.54551408776569332D;
this.xrTableCell7.Weight = 0.54551408776569343D;
//
// xrTableCell5
//
@@ -263,11 +286,13 @@ namespace CaritasAhlen
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "[Minutes]";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell5.Weight = 0.31172235476764726D;
this.xrTableCell5.Weight = 0.54551410970044678D;
//
// xrTableCell6
//
this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeAbbr")});
this.xrTableCell6.Font = new System.Drawing.Font("Arial", 9.75F);
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.StylePriority.UseBorders = false;
@@ -340,11 +365,25 @@ namespace CaritasAhlen
this.xrLabel5,
this.xrLabel3,
this.xrLabel4});
this.Detail2.HeightF = 291.67F;
this.Detail2.HeightF = 294.17F;
this.Detail2.Name = "Detail2";
this.Detail2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel1
//
this.xrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 159.5833F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(669.9999F, 87.91669F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.StylePriority.UseTextAlignment = false;
this.xrLabel1.Text = resources.GetString("xrLabel1.Text");
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTable2
//
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0.0001033147F, 0F);
@@ -374,7 +413,7 @@ namespace CaritasAhlen
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "Summe";
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell8.Weight = 1.7924027556336046D;
this.xrTableCell8.Weight = 1.5586114977092673D;
//
// summeMinuten
//
@@ -386,7 +425,7 @@ namespace CaritasAhlen
this.summeMinuten.StylePriority.UseFont = false;
this.summeMinuten.StylePriority.UseTextAlignment = false;
this.summeMinuten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.summeMinuten.Weight = 0.311722430345741D;
this.summeMinuten.Weight = 0.54551368827007829D;
//
// xrTableCell13
//
@@ -447,15 +486,26 @@ namespace CaritasAhlen
this.xrLabel5.Text = "Unterschrift Mitarbeiter / in³";
this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
//
// xrLabel3
//
this.xrLabel3.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid;
this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(369.39F, 77F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(300.61F, 24F);
this.xrLabel3.StylePriority.UseBorderDashStyle = false;
this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel4
//
this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel4.Font = new System.Drawing.Font("Arial", 9F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(120F, 235F);
this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 257.4999F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(566.9999F, 56.67001F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(669.9999F, 36.67004F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UseTextAlignment = false;
this.xrLabel4.Text = "³ Die weiteren abrechnungsfähigen Betreuungsleistungen können zeitnah einzeln (in" +
@@ -466,239 +516,28 @@ namespace CaritasAhlen
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrRichText1,
this.xrLabel21,
this.xrLabel19,
this.xrLabel20,
this.xrLabel18,
this.xrLabel17,
this.mitarbeiterName,
this.bewilligteFLSW,
this.aktenzeichenLV,
this.xrLabel16,
this.xrLabel9,
this.xrLabel15,
this.xrLabel11,
this.xrLabel10,
this.xrLabel8,
this.xrLabel6,
this.xrLabel7,
this.xrLabel6});
this.xrLabel8,
this.xrLabel10,
this.xrLabel11,
this.xrLabel15,
this.xrLabel9,
this.xrLabel16,
this.aktenzeichenLV,
this.bewilligteFLSW,
this.mitarbeiterName,
this.xrLabel17,
this.xrLabel18,
this.xrLabel20,
this.xrLabel19,
this.xrLabel21,
this.xrLabel2});
this.ReportHeader.Font = new System.Drawing.Font("Arial", 11F);
this.ReportHeader.HeightF = 388.3333F;
this.ReportHeader.HeightF = 330F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrLabel21
//
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 265.1042F);
this.xrLabel21.Multiline = true;
this.xrLabel21.Name = "xrLabel21";
this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel21.SizeF = new System.Drawing.SizeF(233.18F, 20F);
this.xrLabel21.StylePriority.UseFont = false;
this.xrLabel21.StylePriority.UseTextAlignment = false;
this.xrLabel21.Text = "Verantwortliche Mitarbeiter / in";
this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel19
//
this.xrLabel19.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel19.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(369.3878F, 332.2916F);
this.xrLabel19.Multiline = true;
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.SizeF = new System.Drawing.SizeF(55.48785F, 24.08337F);
this.xrLabel19.StylePriority.UseBorders = false;
this.xrLabel19.StylePriority.UseFont = false;
this.xrLabel19.StylePriority.UseTextAlignment = false;
this.xrLabel19.Text = "Jahr:";
this.xrLabel19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel20
//
this.xrLabel20.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(424.8756F, 332.2916F);
this.xrLabel20.Multiline = true;
this.xrLabel20.Name = "xrLabel20";
this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel20.SizeF = new System.Drawing.SizeF(81.52945F, 24.08336F);
this.xrLabel20.StylePriority.UseBorders = false;
this.xrLabel20.StylePriority.UseFont = false;
this.xrLabel20.StylePriority.UseTextAlignment = false;
this.xrLabel20.Text = "[Year]";
this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel18
//
this.xrLabel18.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(119.9999F, 332.2916F);
this.xrLabel18.Multiline = true;
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.SizeF = new System.Drawing.SizeF(200F, 24.08337F);
this.xrLabel18.StylePriority.UseBorders = false;
this.xrLabel18.StylePriority.UseFont = false;
this.xrLabel18.StylePriority.UseTextAlignment = false;
this.xrLabel18.Text = "[Month]";
this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel17
//
this.xrLabel17.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel17.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(56.17878F, 332.2916F);
this.xrLabel17.Multiline = true;
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(63.82112F, 24.08337F);
this.xrLabel17.StylePriority.UseBorders = false;
this.xrLabel17.StylePriority.UseFont = false;
this.xrLabel17.StylePriority.UseTextAlignment = false;
this.xrLabel17.Text = "Monat:";
this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// mitarbeiterName
//
this.mitarbeiterName.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.mitarbeiterName.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")});
this.mitarbeiterName.LocationFloat = new DevExpress.Utils.PointFloat(369.39F, 265.1042F);
this.mitarbeiterName.Multiline = true;
this.mitarbeiterName.Name = "mitarbeiterName";
this.mitarbeiterName.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.mitarbeiterName.SizeF = new System.Drawing.SizeF(252.06F, 20F);
this.mitarbeiterName.StylePriority.UseBorders = false;
this.mitarbeiterName.StylePriority.UseFont = false;
this.mitarbeiterName.StylePriority.UseTextAlignment = false;
this.mitarbeiterName.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// bewilligteFLSW
//
this.bewilligteFLSW.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.bewilligteFLSW.LocationFloat = new DevExpress.Utils.PointFloat(369.39F, 225.1042F);
this.bewilligteFLSW.Multiline = true;
this.bewilligteFLSW.Name = "bewilligteFLSW";
this.bewilligteFLSW.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.bewilligteFLSW.SizeF = new System.Drawing.SizeF(252.06F, 20F);
this.bewilligteFLSW.StylePriority.UseBorders = false;
this.bewilligteFLSW.StylePriority.UseFont = false;
this.bewilligteFLSW.StylePriority.UseTextAlignment = false;
this.bewilligteFLSW.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// aktenzeichenLV
//
this.aktenzeichenLV.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.aktenzeichenLV.LocationFloat = new DevExpress.Utils.PointFloat(369.39F, 205.1042F);
this.aktenzeichenLV.Multiline = true;
this.aktenzeichenLV.Name = "aktenzeichenLV";
this.aktenzeichenLV.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.aktenzeichenLV.SizeF = new System.Drawing.SizeF(252.06F, 20F);
this.aktenzeichenLV.StylePriority.UseBorders = false;
this.aktenzeichenLV.StylePriority.UseFont = false;
this.aktenzeichenLV.StylePriority.UseTextAlignment = false;
this.aktenzeichenLV.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel16
//
this.xrLabel16.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(369.39F, 185.1042F);
this.xrLabel16.Multiline = true;
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel16.SizeF = new System.Drawing.SizeF(252.06F, 20F);
this.xrLabel16.StylePriority.UseBorders = false;
this.xrLabel16.StylePriority.UseFont = false;
this.xrLabel16.StylePriority.UseTextAlignment = false;
this.xrLabel16.Text = "[CustomerFirstName]";
this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel9
//
this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(369.39F, 165.1042F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(252.06F, 20F);
this.xrLabel9.StylePriority.UseBorders = false;
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "[CustomerLastName]";
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel15
//
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 205.1042F);
this.xrLabel15.Multiline = true;
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(260.9F, 20F);
this.xrLabel15.StylePriority.UseFont = false;
this.xrLabel15.StylePriority.UseTextAlignment = false;
this.xrLabel15.Text = "Aktenzeichen Landschaftsverband";
this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel11
//
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 225.1042F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(305.49F, 20F);
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "Bewilligte Fachleistungsstunden / wöchentl.";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel10
//
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0.000111262F, 185.1042F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(169.03F, 20F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.StylePriority.UseTextAlignment = false;
this.xrLabel10.Text = "Vorname Klient / in";
this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel8
//
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 165.1042F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(169.03F, 20F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "Name Klient / in";
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel7
//
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(136.0289F, 110.9375F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(466.0289F, 24.08336F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.StylePriority.UseTextAlignment = false;
this.xrLabel7.Text = "Caritasverband für das Dekanat Ahlen e.V.";
this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel6
//
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(63.82117F, 110.9375F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(72.20772F, 24.08336F);
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.StylePriority.UseTextAlignment = false;
this.xrLabel6.Text = "Anbieter:";
this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// formattingRuleServiceDesc
//
this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
@@ -730,63 +569,230 @@ namespace CaritasAhlen
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// xrRichText1
// xrLabel2
//
this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0.000111262F, 0F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(605.1297F, 98.0196F);
this.xrRichText1.StylePriority.UseFont = false;
this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))));
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel2.Multiline = true;
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(677F, 80.20834F);
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
this.xrLabel2.Text = "Nachweis über weitere abrechnungsfähige Betreuungsleistungen im\r\nRahmen der ambul" +
"anten Hilfen zur Überwindung besonderer sozialer\r\nSchwierigkeiten";
this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
//
// xrTableCell10
// xrLabel6
//
this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell10.Multiline = true;
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 2, 100F);
this.xrTableCell10.StylePriority.UseBorders = false;
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.Text = "Tätigkeit\r\ngemäß\r\nFußnote²";
this.xrTableCell10.Weight = 0.27573209283069111D;
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(63.82116F, 80.20834F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(72.20772F, 24.08336F);
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.StylePriority.UseTextAlignment = false;
this.xrLabel6.Text = "Anbieter:";
this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTableCell12
// xrLabel7
//
this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceDescription")});
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.StylePriority.UseBorders = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.Text = "xrTableCell12";
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell12.Weight = 0.77930584269849268D;
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(136.0293F, 80.20834F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(466.0289F, 24.08336F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.StylePriority.UseTextAlignment = false;
this.xrLabel7.Text = "Caritasverband für das Dekanat Ahlen e.V.";
this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel3
// xrLabel8
//
this.xrLabel3.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid;
this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(369.39F, 77F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(300.61F, 24F);
this.xrLabel3.StylePriority.UseBorderDashStyle = false;
this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 134.375F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(169.03F, 20F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "Name Klient / in";
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel1
// xrLabel10
//
this.xrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrLabel1.Font = new System.Drawing.Font("Arial", 9F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(120F, 147.0833F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(567F, 87.91669F);
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.StylePriority.UseTextAlignment = false;
this.xrLabel1.Text = resources.GetString("xrLabel1.Text");
this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 154.375F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(169.03F, 20F);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.StylePriority.UseTextAlignment = false;
this.xrLabel10.Text = "Vorname Klient / in";
this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel11
//
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 194.375F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(305.49F, 20F);
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "Bewilligte Fachleistungsstunden / wöchentl.";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel15
//
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 174.375F);
this.xrLabel15.Multiline = true;
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(260.9F, 20F);
this.xrLabel15.StylePriority.UseFont = false;
this.xrLabel15.StylePriority.UseTextAlignment = false;
this.xrLabel15.Text = "Aktenzeichen Landschaftsverband";
this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel9
//
this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(325.1498F, 134.375F);
this.xrLabel9.Multiline = true;
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(252.06F, 20F);
this.xrLabel9.StylePriority.UseBorders = false;
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.Text = "[CustomerLastName]";
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel16
//
this.xrLabel16.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(325.1498F, 154.375F);
this.xrLabel16.Multiline = true;
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel16.SizeF = new System.Drawing.SizeF(252.06F, 20F);
this.xrLabel16.StylePriority.UseBorders = false;
this.xrLabel16.StylePriority.UseFont = false;
this.xrLabel16.StylePriority.UseTextAlignment = false;
this.xrLabel16.Text = "[CustomerFirstName]";
this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// aktenzeichenLV
//
this.aktenzeichenLV.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.aktenzeichenLV.LocationFloat = new DevExpress.Utils.PointFloat(325.1498F, 174.375F);
this.aktenzeichenLV.Multiline = true;
this.aktenzeichenLV.Name = "aktenzeichenLV";
this.aktenzeichenLV.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.aktenzeichenLV.SizeF = new System.Drawing.SizeF(252.06F, 20F);
this.aktenzeichenLV.StylePriority.UseBorders = false;
this.aktenzeichenLV.StylePriority.UseFont = false;
this.aktenzeichenLV.StylePriority.UseTextAlignment = false;
this.aktenzeichenLV.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// bewilligteFLSW
//
this.bewilligteFLSW.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.bewilligteFLSW.LocationFloat = new DevExpress.Utils.PointFloat(325.1498F, 194.375F);
this.bewilligteFLSW.Multiline = true;
this.bewilligteFLSW.Name = "bewilligteFLSW";
this.bewilligteFLSW.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.bewilligteFLSW.SizeF = new System.Drawing.SizeF(252.06F, 20F);
this.bewilligteFLSW.StylePriority.UseBorders = false;
this.bewilligteFLSW.StylePriority.UseFont = false;
this.bewilligteFLSW.StylePriority.UseTextAlignment = false;
this.bewilligteFLSW.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// mitarbeiterName
//
this.mitarbeiterName.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.mitarbeiterName.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")});
this.mitarbeiterName.LocationFloat = new DevExpress.Utils.PointFloat(325.1498F, 234.375F);
this.mitarbeiterName.Multiline = true;
this.mitarbeiterName.Name = "mitarbeiterName";
this.mitarbeiterName.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.mitarbeiterName.SizeF = new System.Drawing.SizeF(252.06F, 20F);
this.mitarbeiterName.StylePriority.UseBorders = false;
this.mitarbeiterName.StylePriority.UseFont = false;
this.mitarbeiterName.StylePriority.UseTextAlignment = false;
this.mitarbeiterName.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel17
//
this.xrLabel17.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel17.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 274.4791F);
this.xrLabel17.Multiline = true;
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(63.82112F, 24.08337F);
this.xrLabel17.StylePriority.UseBorders = false;
this.xrLabel17.StylePriority.UseFont = false;
this.xrLabel17.StylePriority.UseTextAlignment = false;
this.xrLabel17.Text = "Monat:";
this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel18
//
this.xrLabel18.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(63.82116F, 274.4791F);
this.xrLabel18.Multiline = true;
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.SizeF = new System.Drawing.SizeF(127.8836F, 24.08337F);
this.xrLabel18.StylePriority.UseBorders = false;
this.xrLabel18.StylePriority.UseFont = false;
this.xrLabel18.StylePriority.UseTextAlignment = false;
this.xrLabel18.Text = "[Month]";
this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel20
//
this.xrLabel20.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(380.6379F, 274.479F);
this.xrLabel20.Multiline = true;
this.xrLabel20.Name = "xrLabel20";
this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel20.SizeF = new System.Drawing.SizeF(81.52945F, 24.08336F);
this.xrLabel20.StylePriority.UseBorders = false;
this.xrLabel20.StylePriority.UseFont = false;
this.xrLabel20.StylePriority.UseTextAlignment = false;
this.xrLabel20.Text = "[Year]";
this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel19
//
this.xrLabel19.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel19.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(325.1498F, 274.479F);
this.xrLabel19.Multiline = true;
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.SizeF = new System.Drawing.SizeF(55.48785F, 24.08337F);
this.xrLabel19.StylePriority.UseBorders = false;
this.xrLabel19.StylePriority.UseFont = false;
this.xrLabel19.StylePriority.UseTextAlignment = false;
this.xrLabel19.Text = "Jahr:";
this.xrLabel19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel21
//
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 234.375F);
this.xrLabel21.Multiline = true;
this.xrLabel21.Name = "xrLabel21";
this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel21.SizeF = new System.Drawing.SizeF(233.18F, 20F);
this.xrLabel21.StylePriority.UseFont = false;
this.xrLabel21.StylePriority.UseTextAlignment = false;
this.xrLabel21.Text = "Verantwortliche Mitarbeiter / in";
this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// Stundenzettel67
//
@@ -812,7 +818,6 @@ namespace CaritasAhlen
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -856,26 +861,26 @@ namespace CaritasAhlen
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell summeMinuten;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRLabel mitarbeiterName;
private DevExpress.XtraReports.UI.XRLabel bewilligteFLSW;
private DevExpress.XtraReports.UI.XRLabel aktenzeichenLV;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel19;
private DevExpress.XtraReports.UI.XRLabel xrLabel20;
private DevExpress.XtraReports.UI.XRLabel xrLabel18;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
private DevExpress.XtraReports.UI.XRLabel xrLabel21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRRichText xrRichText1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel15;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel aktenzeichenLV;
private DevExpress.XtraReports.UI.XRLabel bewilligteFLSW;
private DevExpress.XtraReports.UI.XRLabel mitarbeiterName;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
private DevExpress.XtraReports.UI.XRLabel xrLabel18;
private DevExpress.XtraReports.UI.XRLabel xrLabel20;
private DevExpress.XtraReports.UI.XRLabel xrLabel19;
private DevExpress.XtraReports.UI.XRLabel xrLabel21;
}
}

View File

@@ -16,22 +16,36 @@ namespace CaritasAhlen
public void SetReportDataSource(ServicesOverviewRO pRO)
{
double minutes = 0;
if (pRO.Services != null)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services)
{
if (s.IsBillable)
servicesBillable.Add(s);
}
minutes += s.Minutes;
pRO.Services = servicesBillable;
if (s.ServiceDescription == "Aufsuchen von Behörden")
{
s.ServiceDescription = "1";
}
else if (s.ServiceDescription == "Gespräche im sozialen Umfeld")
{
s.ServiceDescription = "2";
}
else if (s.ServiceDescription == "Kooperationskontakte mit gesetzlichen Betreuer_innen")
{
s.ServiceDescription = "3";
}
else if (s.ServiceDescription == "Telefonate und Schriftverkehr bezgl. Alltagsangelegenheiten")
{
s.ServiceDescription = "4";
}
}
}
bindingSource1.DataSource = pRO;
// rechnungsDatum.Text = DateTime.Now.ToShortDateString();
summeMinuten.Text = string.Format("{0:0.##}", pRO.TotalFLMBillable);
summeMinuten.Text = string.Format("{0:0.##}", minutes);
if (pRO.SupportConceptCostBearer != null)
aktenzeichenLV.Text = pRO.SupportConceptCostBearer.CustomerReferenceNumber ?? string.Empty;

View File

@@ -127,7 +127,4 @@
gesetzlichen Betreuerinnen und Betreuern, 4) Telefonate und Schriftverkehr bzgl.
Alltagsangelegenheiten der leistungsberechtigten Person.</value>
</data>
<data name="xrRichText1.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXABzADEAXABzAGIAYQBzAGUAZABvAG4AMABcAHMAbgBlAHgAdAAxAFwAcQBsAFwAZgAyAFwAZgBzADIANABcAGMAZgAxACAARABlAGYAYQB1AGwAdAA7AH0AewBcACoAXABjAHMAMgBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADMAXABzAGIAYQBzAGUAZABvAG4AMgBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMANABcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADYAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA1AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHMAMQBcAHEAYwB7AFwAYgBcAHUAbABcAGYAMgBcAGYAcwAyADYAXABjAGYAMQAgAE4AYQBjAGgAdwBlAGkAcwAgAFwAdQAyADUAMgBcACcAZgBjAGIAZQByACAAdwBlAGkAdABlAHIAZQAgAGEAYgByAGUAYwBoAG4AdQBuAGcAcwBmAFwAdQAyADIAOABcACcAZQA0AGgAaQBnAGUAIABCAGUAdAByAGUAdQB1AG4AZwBzAGwAZQBpAHMAdAB1AG4AZwBlAG4AIAB9AFwAYgBcAHUAbABcAGYAMgBcAGYAcwAyADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHMAMQBcAHEAYwB7AFwAYgBcAHUAbABcAGYAMgBcAGYAcwAyADYAXABjAGYAMQAgAGkAbQAgAFIAYQBoAG0AZQBuACAAZABlAHIAIABhAG0AYgB1AGwAYQBuAHQAZQBuACAASABpAGwAZgBlACAAegB1AHIAIABcAHUAMgAyADAAXAAnAGQAYwBiAGUAcgB3AGkAbgBkAHUAbgBnACAAYgBlAHMAbwBuAGQAZQByAGUAcgB9AFwAYgBcAHUAbABcAGYAMgBcAGYAcwAyADYAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAYwBcAHMAbAAyADcANQBcAHMAbABtAHUAbAB0ADEAXABzAGEAMgAwADAAewBcAGIAXAB1AGwAXABmADIAXABmAHMAMgA2AFwAYwBmADEAIABzAG8AegBpAGEAbABlAHIAIABTAGMAaAB3AGkAZQByAGkAZwBrAGUAaQB0AGUAbgB9AHsAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIAAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABcAHUAMQA3ADgAXAAnAGIAMgB9AFwAZgBzADIAMgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=</value>
</data>
</root>

View File

@@ -172,7 +172,7 @@ SELECT
':Belegnr',
c.DebitorNumber as 'Konto Soll',
'' as 'Kostenstelle Soll',
'S865800' as 'Konto Haben',
'S86400' as 'Konto Haben',
c.CostCenter as 'Kostenstelle Haben',
IF(crpRateFactor.`CostRateValue` is null, ROUND((sr.`GeleisteteFLM` / 60) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 )),
ROUND(ROUND((sr.`GeleisteteFLM` / 60), 2) * (SELECT crp.`CostRateValue` FROM `costrateperiod` crp WHERE crp.`ObjectTid` = 22 AND crp.`CostRateType` = 0 AND crp.`ObjectOid` = cb2sc.`CostBearerOid` AND (crp.`EndDate` is null or crp.`EndDate` > ':Monat_Start') order by IF(crp.`EndDate` is null, MAKEDATE(9999,365),crp.`EndDate`) LIMIT 1 ) * ((100 + crpRateFactor.`CostRateValue`)/100), 2)) AS 'Betrag',
@@ -207,7 +207,7 @@ ORDER BY p.`LastName`, p.`FirstName`, cb2sc.`ApprovedStartDate`
SELECT
date_format(at.BookingDate, '%d.%m.%Y') as 'Belegdatum',
':Belegnr',
'S136900' as 'Konto Soll',
'S13690' as 'Konto Soll',
'' as 'Kostenstelle Soll',
c.DebitorNumber as 'Konto Haben',
'' as 'Kostenstelle Haben',
@@ -232,7 +232,7 @@ date_format(ib.InvoiceDate, '%d.%m.%Y') as 'Belegdatum',
ib.InvoiceNumber as 'Belegnummer',
c.DebitorNumber as 'Konto Soll',
'' as 'Kostenstelle Soll',
'S865800' as 'Konto Haben',
'S86400' as 'Konto Haben',
c.CostCenter as 'Kostenstelle Haben',
Round(ii.AmountTotal, 2) as 'Betrag',
CONCAT('Eigenanteil, ', p.`FirstName`, ' ', p.`LastName`) as 'Buchungstext'

View File

@@ -766,7 +766,7 @@ namespace FreundeskreisSuchthilfe
this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel24.SizeF = new System.Drawing.SizeF(632.12F, 20F);
this.xrLabel24.StylePriority.UseFont = false;
this.xrLabel24.Text = "Summe der mit dem LVR abzurechnenden Leistungen (= Summe x 120%):";
this.xrLabel24.Text = "Summe der abzurechnenden Leistungen (= Summe x 120%):";
//
// xrLabel7
//

File diff suppressed because it is too large Load Diff

View File

@@ -2,264 +2,38 @@ using System;
using System.Drawing;
using System.Collections;
using System.ComponentModel;
using System.Linq;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BS.Shared;
using BS.Shared.Core;
using DevExpress.XtraReports.UI;
using BeWo.Report.ReportObjects;
using BeWo.Service.DCEntityMapper;
using BS.Shared.DataContracts;
namespace BeWo.HPHBersenbrueck
namespace HphBersenbrueck
{
public partial class Klientenstammblatt : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<CustomerDataRO>
public partial class AufnahmeUndEntlassungsbogen : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<QueryRO>
{
public Klientenstammblatt()
public AufnahmeUndEntlassungsbogen()
{
InitializeComponent();
}
public void SetReportDataSource(CustomerDataRO pRO)
public void SetReportDataSource(QueryRO pRO)
{
SetVarFieldValues(pRO);
SetRelationFields(pRO);
this.bindingSource1.DataSource = pRO;
long oid = 0;
Int64.TryParse(pRO.Rows[0].Field1.ToString(), out oid);
if (oid > 0)
{
var c = DAOFactory.GenericDAO.LoadByID<Customer>(oid);
CustomerDC custDc = MapperFactory.CustomerDC_Customer.MapToNewDC(c);
CustomerDataRO cro = CustomerDataRO.Create(custDc);
this.bindingSource1.DataSource = cro;
}
}
private void SetRelationFields(CustomerDataRO pRO)
{
var x = pRO.EnvironmentPersons.FirstOrDefault(f => f.RelationRole.TypeDescription.ToLower().Equals("hausarzt"));
if (x != null)
{
lblHausarztName.Text = x.Person.TitleFirstNameLastNameToString();
lblHausarztStr.Text = x.Person.Street;
lblHausarztOrt.Text = String.Format("{0} {1}", x.Person.PostalCode, x.Person.Town);
lblHausarztTel.Text = x.Person.Communication1;
lblHausarztFax.Text = x.Person.Communication4;
}
x = pRO.EnvironmentPersons.FirstOrDefault(f => f.RelationRole.TypeDescription.ToLower().Equals("facharzt (psychiater)"));
if (x != null)
{
lblPsychaterName.Text = x.Person.TitleFirstNameLastNameToString();
lblPsychaterStr.Text = x.Person.Street;
lblPsychaterOrt.Text = String.Format("{0} {1}", x.Person.PostalCode, x.Person.Town);
lblPsychaterTel.Text = x.Person.Communication1;
lblPsychaterFax.Text = x.Person.Communication4;
}
x = pRO.EnvironmentPersons.FirstOrDefault(f => f.RelationRole.TypeDescription.ToLower().Equals("zahnarzt"));
if (x != null)
{
lblZahnarztName.Text = x.Person.TitleFirstNameLastNameToString();
lblZahnarztStr.Text = x.Person.Street;
lblZahnarztOrt.Text = String.Format("{0} {1}", x.Person.PostalCode, x.Person.Town);
lblZahnarztTel.Text = x.Person.Communication1;
lblZahnarztFax.Text = x.Person.Communication4;
}
x = pRO.EnvironmentPersons.FirstOrDefault(f => f.RelationRole.TypeDescription.ToLower().Equals("gynäkologe")) ??
pRO.EnvironmentPersons.FirstOrDefault(f => f.RelationRole.TypeDescription.ToLower().Equals("urologe"));
if (x != null)
{
lblGynName.Text = x.Person.TitleFirstNameLastNameToString();
lblGynStr.Text = x.Person.Street;
lblGynOrt.Text = String.Format("{0} {1}", x.Person.PostalCode, x.Person.Town);
lblGynTel.Text = x.Person.Communication1;
lblGynFax.Text = x.Person.Communication4;
}
x = pRO.EnvironmentPersons.FirstOrDefault(f => f.RelationRole.TypeDescription.ToLower().Equals("gesetzliche betreuung"));
if (x != null)
{
lblGesetzBetreuerName.Text = x.Person.TitleFirstNameLastNameToString();
lblGesetzBetreuerStr.Text = x.Person.Street;
lblGesetzBetreuerOrt.Text = String.Format("{0} {1}", x.Person.PostalCode, x.Person.Town);
lblGesetzBetreuerTel.Text = x.Person.Communication1;
lblGesetzBetreuerFax.Text = x.Person.Communication4;
}
var k = pRO.EnvironmentOrganisations.FirstOrDefault(f => f.RelationRole.TypeDescription.Equals("Krankenkasse"));
if (k != null)
{
var fod = pRO.CostBearers.FirstOrDefault(f => f.CostBearer.OrganisationOid.Equals(k.Organisation.OrganisationOid));
//kvNRTableCell.Text = fod.ReferenceNumber;
//krankenkasseTableCell.Text = fod.CostBearer.Name;
}
var e = pRO.RelatedEmployees.FirstOrDefault(f => f.RelationRole.TypeDescription.ToLower().Equals("hauptbetreuung i"));
if (e != null)
{
var emp = DAOFactory.GenericDAO.LoadByID<Employee>(e.Employee.EmployeeOid);
lblHauptbetreuer1Name.Text = e.Employee.LastName;
lblHauptbetreuer1Vorname.Text = e.Employee.FirstName;
if (emp.Person.Contacts != null)
{
var contact = emp.Person.Contacts.FirstOrDefault(c => c.Type == ContactType.business_Phone);
if (contact != null)
{
lblHauptbetreuer1Tel.Text = contact.Value;
}
contact = emp.Person.Contacts.FirstOrDefault(c => c.Type == ContactType.business_MobilePhone);
if (contact != null)
{
lblHauptbetreuer1Handy.Text = contact.Value;
}
}
}
e = pRO.RelatedEmployees.FirstOrDefault(f => f.RelationRole.TypeDescription.ToLower().Equals("hauptbetreuung ii"));
if (e != null)
{
var emp = DAOFactory.GenericDAO.LoadByID<Employee>(e.Employee.EmployeeOid);
lblHauptbetreuer2Name.Text = e.Employee.LastName;
lblHauptbetreuer2Vorname.Text = e.Employee.FirstName;
if (emp.Person.Contacts != null)
{
var contact = emp.Person.Contacts.FirstOrDefault(c => c.Type == ContactType.business_Phone);
if (contact != null)
{
lblHauptbetreuer2Tel.Text = contact.Value;
}
contact = emp.Person.Contacts.FirstOrDefault(c => c.Type == ContactType.business_MobilePhone);
if (contact != null)
{
lblHauptbetreuer2Handy.Text = contact.Value;
}
}
}
//var gb = pRO.EnvironmentPersons.FirstOrDefault(f => f.RelationRole.TypeDescription.Equals("Gesetzlicher Vertreter"));
//if (gb != null)
//{
// var gbt = !string.IsNullOrEmpty(gb.Person.Title) ? gb.Person.Title + " " : "";
// vertretungTableCell.Text = gbt + gb.Person.FullName;
//}
//var bp = pRO.EnvironmentPersons.FirstOrDefault(f => f.RelationRole.TypeDescription.Equals("Bezugsperson"));
//if (bp != null)
//{
// var bpt = !string.IsNullOrEmpty(bp.Person.Title) ? bp.Person.Title + " " : "";
// bezugspersonTableCell.Text = bpt + bp.Person.FullName;
//}
}
private void SetVarFieldValues(CustomerDataRO pRO)
{
String beruf = ""; // Oid = 1
String arbeitgeber = ""; // Oid = 2
String taetigkeit = ""; // Oid = 3
String gruppenleiter = ""; // Oid = 4
String leistungsart = ""; // Oid = 5
String zuzahlungsbefreiung = ""; // Oid = 6
String aufnahmedatum = ""; // Oid = 7
String schwgueltig = ""; // Oid = 8
String schwProzent = ""; // Oid = 9
String merkzeichen = ""; // Oid = 10
String sorgeGesundheit = ""; // Oid = 11
String aufenthaltbetimmungr = ""; // Oid = 12
String rechtsAntrags = ""; // Oid = 13
String behoerden = ""; // Oid = 14
String vermoegenssorge = ""; // Oid = 15
var c = DAOFactory.GenericDAO.LoadByID<Customer>(pRO.CustomerOid);
foreach (var vv in c.VarFieldValueList)
{
var varFieldValue = Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName));
if (varFieldValue != null)
{
if (vv.VarFieldDefOid.Value == 1)
{
beruf = varFieldValue.ToString();
}
else if (vv.VarFieldDefOid.Value == 2)
{
arbeitgeber = varFieldValue.ToString();
}
else if (vv.VarFieldDefOid.Value == 3)
{
taetigkeit = varFieldValue.ToString();
}
else if (vv.VarFieldDefOid.Value == 4)
{
gruppenleiter = varFieldValue.ToString();
}
else if (vv.VarFieldDefOid.Value == 5)
{
leistungsart = varFieldValue.ToString();
}
else if (vv.VarFieldDefOid.Value == 6)
{
zuzahlungsbefreiung = varFieldValue.ToString();
}
else if (vv.VarFieldDefOid.Value == 7)
{
aufnahmedatum = String.Format("{0:dd.MM.yyyy}", varFieldValue);
}
else if (vv.VarFieldDefOid.Value == 8)
{
schwgueltig = aufnahmedatum = String.Format("{0:dd.MM.yyyy}", varFieldValue);
}
else if (vv.VarFieldDefOid.Value == 9)
{
schwProzent = varFieldValue.ToString();
}
else if (vv.VarFieldDefOid.Value == 10)
{
merkzeichen = varFieldValue.ToString();
}
else if (vv.VarFieldDefOid.Value == 11)
{
sorgeGesundheit = varFieldValue.ToString() == "True" ? "x" : "";
}
else if (vv.VarFieldDefOid.Value == 12)
{
aufenthaltbetimmungr = varFieldValue.ToString() == "True" ? "x" : "";
}
else if (vv.VarFieldDefOid.Value == 13)
{
rechtsAntrags = varFieldValue.ToString() == "True" ? "x" : "";
}
else if (vv.VarFieldDefOid.Value == 14)
{
behoerden = varFieldValue.ToString() == "True" ? "x" : "";
}
else if (vv.VarFieldDefOid.Value == 15)
{
vermoegenssorge = varFieldValue.ToString() == "True" ? "x" : "";
}
}
}
lblBeruf.Text = beruf;
lblArbeitg.Text = arbeitgeber;
lblTaetigkeit.Text = taetigkeit;
lblGruppenleiter.Text = gruppenleiter;
lblLeistungsart.Text = leistungsart;
lblZuzahlungsbefreiung.Text = zuzahlungsbefreiung;
lblAufnahmeDatum.Text = aufnahmedatum;
lblSchwGueltigBis.Text = schwgueltig;
lblSchwProzent.Text = schwProzent;
lblSchwMerkz.Text = merkzeichen;
lblSorgeGesundheit.Text = sorgeGesundheit;
lblAufenthaltbestimmung.Text = aufenthaltbetimmungr;
lblRechtsAntrag.Text = rechtsAntrags;
lblBehoerden.Text = behoerden;
lblVermoegenssorge.Text = vermoegenssorge;
}
}
}

View File

@@ -69,6 +69,12 @@
<Compile Include="CustomerDataReport.Designer.cs">
<DependentUpon>CustomerDataReport.cs</DependentUpon>
</Compile>
<Compile Include="Klientenstammblatt.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Klientenstammblatt.Designer.cs">
<DependentUpon>Klientenstammblatt.cs</DependentUpon>
</Compile>
<Compile Include="Abrechnungsbogen.cs">
<SubType>Component</SubType>
</Compile>
@@ -101,6 +107,10 @@
<DependentUpon>CustomerDataReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Klientenstammblatt.resx">
<DependentUpon>Klientenstammblatt.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Abrechnungsbogen.resx">
<DependentUpon>Abrechnungsbogen.cs</DependentUpon>
</EmbeddedResource>

View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@@ -114,6 +114,8 @@
<Compile Include="CustomerDataReport.designer.cs">
<DependentUpon>CustomerDataReport.cs</DependentUpon>
</Compile>
<Compile Include="Invoicing\CustomInvoiceFactory.cs" />
<Compile Include="Invoicing\DefaultInvoiceCreation.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServiceInvoiceReport.cs">
<SubType>Component</SubType>
@@ -161,6 +163,10 @@
<Project>{40D8B312-EA64-49E3-A31A-5E57ED4D5654}</Project>
<Name>Report</Name>
</ProjectReference>
<ProjectReference Include="..\..\Service\Service.csproj">
<Project>{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}</Project>
<Name>Service</Name>
</ProjectReference>
<ProjectReference Include="..\..\Shared\Shared.csproj">
<Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
<Name>Shared</Name>
@@ -183,6 +189,7 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

View File

@@ -38,7 +38,7 @@ namespace BeWo.KontaktUndKrisenhilfeReports
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAdresse = 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();
@@ -131,7 +131,7 @@ namespace BeWo.KontaktUndKrisenhilfeReports
// Page1
//
this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel7,
this.lblAdresse,
this.xrLabel4,
this.xrLabel3,
this.xrLabel2,
@@ -143,15 +143,15 @@ namespace BeWo.KontaktUndKrisenhilfeReports
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
// xrLabel7
// lblAdresse
//
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(317F, 111.5F);
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" +
this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblAdresse.Multiline = true;
this.lblAdresse.Name = "lblAdresse";
this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAdresse.SizeF = new System.Drawing.SizeF(384.7082F, 126.0833F);
this.lblAdresse.StylePriority.UseFont = false;
this.lblAdresse.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" +
"tStreet]\r\n[RecipientPostCodeAndTown]";
//
// xrLabel4
@@ -549,7 +549,7 @@ namespace BeWo.KontaktUndKrisenhilfeReports
this.xrTableCell47.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "NetClaim")});
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell47.StylePriority.UseBorderColor = false;
@@ -661,7 +661,7 @@ namespace BeWo.KontaktUndKrisenhilfeReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell45;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell46;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel lblAdresse;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3;
private DevExpress.XtraReports.UI.XRRichText xrRichText3;

View File

@@ -1,4 +1,5 @@
using System;
using System.Text;
using BeWo.Report;
using BeWo.Report.ReportObjects;
@@ -15,7 +16,31 @@ namespace BeWo.KontaktUndKrisenhilfeReports
public void SetReportDataSource(ServiceInvoiceRO pRO)
{
DateTime start = pRO.AccountingPeriodStart;
StringBuilder sb = new StringBuilder();
if (!String.IsNullOrEmpty(pRO.RecipientOrganisation))
{
sb.AppendLine(pRO.RecipientOrganisation);
}
if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
{
sb.AppendLine(pRO.RecipientContactPerson);
}
if (!String.IsNullOrEmpty(pRO.RecipientDivision))
{
sb.AppendLine(pRO.RecipientDivision);
}
if (!String.IsNullOrEmpty(pRO.RecipientStreet))
{
sb.AppendLine(pRO.RecipientStreet);
}
if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown))
{
sb.AppendLine(pRO.RecipientPostCodeAndTown);
}
lblAdresse.Text = sb.ToString();
DateTime start = pRO.AccountingPeriodStart;
DateTime end = pRO.AccountingPeriodEnd;
if (start.Month == end.Month && start.Year == end.Year)
{
@@ -30,7 +55,15 @@ namespace BeWo.KontaktUndKrisenhilfeReports
{
foreach (var ii in sip.ServiceInvoiceItems)
{
ii.HourlyRateString = pRO.AmountEquityContribution;
if (pRO.AmountEquityContribution == "-")
{
ii.HourlyRateString = "";
}
else
{
ii.HourlyRateString = pRO.AmountEquityContribution;
}
}
}
this.bindingSource1.DataSource = pRO;

View File

@@ -108,13 +108,8 @@ namespace LebenshilfeKoblenz
this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSummeAllerStunden = new DevExpress.XtraReports.UI.XRTableCell();
this.cellPreis = new DevExpress.XtraReports.UI.XRTableCell();
this.cellBetragStunden = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow();
this.tableAbrechnung = new DevExpress.XtraReports.UI.XRTable();
this.rowKm = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSummeKmBlatt2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -162,13 +157,13 @@ namespace LebenshilfeKoblenz
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAbrechnungTitel = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tableAbrechnung)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
@@ -1027,7 +1022,7 @@ namespace LebenshilfeKoblenz
// GroupHeader2
//
this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable4,
this.tableAbrechnung,
this.cellSollProzentGesamt,
this.cellSummeProzentIst,
this.cellSonstigeProzentSoll,
@@ -1048,93 +1043,39 @@ namespace LebenshilfeKoblenz
this.xrLabel2,
this.xrLabel5,
this.xrLabel6,
this.xrLabel7});
this.lblAbrechnungTitel});
this.GroupHeader2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.GroupHeader2.HeightF = 640.0001F;
this.GroupHeader2.HeightF = 600.0001F;
this.GroupHeader2.Name = "GroupHeader2";
this.GroupHeader2.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand;
this.GroupHeader2.StylePriority.UseFont = false;
//
// xrTable4
// tableAbrechnung
//
this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
this.tableAbrechnung.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0.002825702F, 510.0001F);
this.xrTable4.Name = "xrTable4";
this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow13,
this.xrTableRow14,
this.tableAbrechnung.LocationFloat = new DevExpress.Utils.PointFloat(0.002825702F, 510.0001F);
this.tableAbrechnung.Name = "tableAbrechnung";
this.tableAbrechnung.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 0, 0, 100F);
this.tableAbrechnung.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.rowKm,
this.xrTableRow18});
this.xrTable4.SizeF = new System.Drawing.SizeF(720F, 130F);
this.xrTable4.StylePriority.UseBackColor = false;
this.xrTable4.StylePriority.UsePadding = false;
this.xrTable4.StylePriority.UseTextAlignment = false;
this.xrTable4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.tableAbrechnung.SizeF = new System.Drawing.SizeF(720F, 90F);
this.tableAbrechnung.StylePriority.UseBackColor = false;
this.tableAbrechnung.StylePriority.UsePadding = false;
this.tableAbrechnung.StylePriority.UseTextAlignment = false;
this.tableAbrechnung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrTableRow13
// rowKm
//
this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell34,
this.cellSummeAllerStunden,
this.cellPreis,
this.cellBetragStunden});
this.xrTableRow13.Name = "xrTableRow13";
this.xrTableRow13.StylePriority.UsePadding = false;
this.xrTableRow13.StylePriority.UseTextAlignment = false;
this.xrTableRow13.Weight = 2D;
//
// xrTableCell34
//
this.xrTableCell34.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell34.Name = "xrTableCell34";
this.xrTableCell34.StylePriority.UseFont = false;
this.xrTableCell34.StylePriority.UsePadding = false;
this.xrTableCell34.StylePriority.UseTextAlignment = false;
this.xrTableCell34.Text = "Summe aller Stunden";
this.xrTableCell34.Weight = 0.43898377315617243D;
//
// cellSummeAllerStunden
//
this.cellSummeAllerStunden.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.cellSummeAllerStunden.Multiline = true;
this.cellSummeAllerStunden.Name = "cellSummeAllerStunden";
this.cellSummeAllerStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.cellSummeAllerStunden.StylePriority.UseFont = false;
this.cellSummeAllerStunden.StylePriority.UsePadding = false;
this.cellSummeAllerStunden.StylePriority.UseTextAlignment = false;
this.cellSummeAllerStunden.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.cellSummeAllerStunden.Weight = 0.21949187701693085D;
//
// cellPreis
//
this.cellPreis.Name = "cellPreis";
this.cellPreis.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.cellPreis.StylePriority.UsePadding = false;
this.cellPreis.StylePriority.UseTextAlignment = false;
this.cellPreis.Text = "x 36,25 €/h";
this.cellPreis.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.cellPreis.Weight = 0.32923781743762737D;
//
// cellBetragStunden
//
this.cellBetragStunden.Name = "cellBetragStunden";
this.cellBetragStunden.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.cellBetragStunden.StylePriority.UsePadding = false;
this.cellBetragStunden.StylePriority.UseTextAlignment = false;
this.cellBetragStunden.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.cellBetragStunden.Weight = 0.32923781743762737D;
//
// xrTableRow14
//
this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.rowKm.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell38,
this.cellSummeKmBlatt2,
this.xrTableCell41,
this.cellBetragKm});
this.xrTableRow14.Name = "xrTableRow14";
this.xrTableRow14.Weight = 2D;
this.rowKm.Name = "rowKm";
this.rowKm.Weight = 2D;
//
// xrTableCell38
//
@@ -1714,24 +1655,24 @@ namespace LebenshilfeKoblenz
this.xrLabel6.Text = "Lebenshilfe Koblenz";
this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrLabel7
// lblAbrechnungTitel
//
this.xrLabel7.BackColor = System.Drawing.Color.WhiteSmoke;
this.xrLabel7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
this.lblAbrechnungTitel.BackColor = System.Drawing.Color.WhiteSmoke;
this.lblAbrechnungTitel.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrLabel7.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 470F);
this.xrLabel7.Multiline = true;
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(720F, 40F);
this.xrLabel7.StylePriority.UseBackColor = false;
this.xrLabel7.StylePriority.UseBorders = false;
this.xrLabel7.StylePriority.UseFont = false;
this.xrLabel7.StylePriority.UsePadding = false;
this.xrLabel7.StylePriority.UseTextAlignment = false;
this.xrLabel7.Text = "Abrechnung der erbrachten Leistungen";
this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.lblAbrechnungTitel.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblAbrechnungTitel.LocationFloat = new DevExpress.Utils.PointFloat(0F, 470F);
this.lblAbrechnungTitel.Multiline = true;
this.lblAbrechnungTitel.Name = "lblAbrechnungTitel";
this.lblAbrechnungTitel.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.lblAbrechnungTitel.SizeF = new System.Drawing.SizeF(720F, 40F);
this.lblAbrechnungTitel.StylePriority.UseBackColor = false;
this.lblAbrechnungTitel.StylePriority.UseBorders = false;
this.lblAbrechnungTitel.StylePriority.UseFont = false;
this.lblAbrechnungTitel.StylePriority.UsePadding = false;
this.lblAbrechnungTitel.StylePriority.UseTextAlignment = false;
this.lblAbrechnungTitel.Text = "Abrechnung der erbrachten Leistungen";
this.lblAbrechnungTitel.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// LeistungsnachweiseSpfh
//
@@ -1761,7 +1702,7 @@ namespace LebenshilfeKoblenz
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tableAbrechnung)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
@@ -1871,7 +1812,7 @@ namespace LebenshilfeKoblenz
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel lblAbrechnungTitel;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
@@ -1885,13 +1826,8 @@ namespace LebenshilfeKoblenz
private DevExpress.XtraReports.UI.XRLabel xrLabel30;
private DevExpress.XtraReports.UI.XRLabel xrLabel29;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
private DevExpress.XtraReports.UI.XRTable xrTable4;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
private DevExpress.XtraReports.UI.XRTableCell cellSummeAllerStunden;
private DevExpress.XtraReports.UI.XRTableCell cellPreis;
private DevExpress.XtraReports.UI.XRTableCell cellBetragStunden;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow14;
private DevExpress.XtraReports.UI.XRTable tableAbrechnung;
private DevExpress.XtraReports.UI.XRTableRow rowKm;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
private DevExpress.XtraReports.UI.XRTableCell cellSummeKmBlatt2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell41;

View File

@@ -28,6 +28,7 @@ namespace LebenshilfeKoblenz
double minutenAusfall = 0;
double gesamtMinuten = 0;
Dictionary<decimal, decimal> betragZuMinuten = new Dictionary<decimal, decimal>();
if (pRO.Services != null)
{
foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services)
@@ -39,35 +40,49 @@ namespace LebenshilfeKoblenz
s.Notice3 = "";
s.Notice4 = "";
s.Notice5 = "";
decimal? preis = null;
if (s.ServiceDescription.EndsWith(" DF"))
{
minutenDirekt += s.Minutes;
s.Notice = String.Format("{0:0.00}", s.Minutes / 60);
preis = GetPreis(pRO, s);
}
else if (s.ServiceDescription.EndsWith(" IF"))
{
minutenIndirekt += s.Minutes;
s.Notice2 = String.Format("{0:0.00}", s.Minutes / 60);
preis = GetPreis(pRO, s);
}
else if (s.ServiceDescription.EndsWith(" FA"))
{
minutenFallbeglAz += s.Minutes;
s.Notice3 = String.Format("{0:0.00}", s.Minutes / 60);
preis = GetPreis(pRO, s);
}
else if (s.ServiceDescription.EndsWith(" FZ"))
{
minutenFahrt += s.Minutes;
s.Notice4 = String.Format("{0:0.00}", s.Minutes / 60);
preis = GetPreis(pRO, s);
}
else if (s.ServiceDescription.EndsWith(" UA"))
{
minutenAusfall += s.Minutes;
s.Notice5 = String.Format("{0:0.00}", s.Minutes / 60);
preis = GetPreis(pRO, s);
}
if (preis.HasValue)
{
if (!betragZuMinuten.ContainsKey(preis.Value))
{
betragZuMinuten.Add(preis.Value, 0);
}
betragZuMinuten[preis.Value] += (decimal)s.Minutes;
}
}
}
@@ -89,16 +104,14 @@ namespace LebenshilfeKoblenz
cellSummeBlatt2.Text = String.Format("{0:0.00}", gesamtMinuten / 60);
cellSummeAllerStunden.Text = String.Format("{0:0.00}", gesamtMinuten / 60);
//cellSummeAllerStunden.Text = String.Format("{0:0.00}", gesamtMinuten / 60);
cellSummeKmBlatt2.Text = String.Format("{0:0.##}", pRO.TotalGefahreneKilometer);
decimal einzelPreis = GetPreis(pRO);
cellPreis.Text = String.Format("x {0:0:00} €/ h", einzelPreis);
cellBetragKm.Text = String.Format("{0:0.00} €", Math.Round(pRO.TotalGefahreneKilometer * 0.3, 2, MidpointRounding.AwayFromZero));
cellBetragStunden.Text = String.Format("{0:0.00}", Math.Round((gesamtMinuten / 60) * (double)einzelPreis, 2, MidpointRounding.AwayFromZero));
cellBetragKm.Text = String.Format("{0:0.00}", Math.Round(pRO.TotalGefahreneKilometer * 0.3, 2, MidpointRounding.AwayFromZero));
var gesamtPreis = SetzePreise(betragZuMinuten);
cellRechnungsbetrag.Text = String.Format("{0:0.00}", Math.Round((gesamtMinuten / 60) * (double)einzelPreis, 2, MidpointRounding.AwayFromZero) + Math.Round(pRO.TotalGefahreneKilometer * 0.3, 2, MidpointRounding.AwayFromZero));
cellRechnungsbetrag.Text = String.Format("{0:0.00}", gesamtPreis + (decimal)Math.Round(pRO.TotalGefahreneKilometer * 0.3, 2, MidpointRounding.AwayFromZero));
if (gesamtMinuten > 0)
{
@@ -112,32 +125,53 @@ namespace LebenshilfeKoblenz
bindingSource1.DataSource = pRO;
}
private decimal GetPreis(ServicesOverviewRO pRo)
private decimal SetzePreise(Dictionary<decimal, decimal> betragZuMinuten)
{
decimal gesamtpreis = 0;
foreach (var preis in betragZuMinuten.Keys)
{
var row = tableAbrechnung.InsertRowAbove(rowKm);
if (row.Cells.Count > 3)
{
row.Cells[0].Text = "Summe aller Stunden";
row.Cells[1].Text = String.Format("{0:0.00}", betragZuMinuten[preis] / 60);
row.Cells[2].Text = String.Format("x {0:0.00} €/h", preis);
row.Cells[3].Text = String.Format("{0:0.00} €", (betragZuMinuten[preis] / 60) * preis);
gesamtpreis += (betragZuMinuten[preis] / 60) * preis;
}
}
tableAbrechnung.Top = lblAbrechnungTitel.Top + lblAbrechnungTitel.Height;
return gesamtpreis;
//cellPreis.Text = String.Format("x {0:0:00} €/ h", einzelPreis);
//cellBetragStunden.Text = String.Format("{0:0.00}", Math.Round((gesamtMinuten / 60) * (double)einzelPreis, 2, MidpointRounding.AwayFromZero));
//cellRechnungsbetrag.Text = String.Format("{0:0.00}", Math.Round((gesamtMinuten / 60) * (double)einzelPreis, 2, MidpointRounding.AwayFromZero) + Math.Round(pRO.TotalGefahreneKilometer * 0.3, 2, MidpointRounding.AwayFromZero));
}
private decimal GetPreis(ServicesOverviewRO pRo, ServicesOverviewRO.ServiceDetail s)
{
decimal preis = 0;
if (pRo.Services != null)
var sr = DAOFactory.GenericDAO.LoadByID<ServiceRecord>(s.ServiceRecordOid);
if (sr.ServiceDescription.CostRatePeriods != null)
{
foreach (ServicesOverviewRO.ServiceDetail s in pRo.Services)
var crList =
MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(sr.ServiceDescription
.CostRatePeriods);
var cr = crList.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, pRo.StartDate);
if (cr != null && cr.CostRateValue.HasValue)
{
var sr = DAOFactory.GenericDAO.LoadByID<ServiceRecord>(s.ServiceRecordOid);
if (sr.ServiceDescription.CostRatePeriods != null)
{
var crList =
MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(sr.ServiceDescription
.CostRatePeriods);
var cr = crList.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, pRo.StartDate);
if (cr != null && cr.CostRateValue.HasValue)
{
return cr.CostRateValue.Value;
}
}
return cr.CostRateValue.Value;
}
}
return preis;
}

View File

@@ -70,6 +70,7 @@ namespace LebenshilfeKusel
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
@@ -205,7 +206,7 @@ namespace LebenshilfeKusel
this.xrLabel4,
this.xrLabel3,
this.xrLabel2});
this.ReportHeader.HeightF = 518.875F;
this.ReportHeader.HeightF = 388.9999F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
@@ -213,7 +214,7 @@ namespace LebenshilfeKusel
//
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(448.9583F, 297.9167F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(448.9586F, 168.0417F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(201.0417F, 23.95834F);
@@ -223,7 +224,7 @@ namespace LebenshilfeKusel
//
// lblAddress
//
this.lblAddress.LocationFloat = new DevExpress.Utils.PointFloat(0F, 129.875F);
this.lblAddress.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblAddress.Multiline = true;
this.lblAddress.Name = "lblAddress";
this.lblAddress.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -234,7 +235,7 @@ namespace LebenshilfeKusel
//
// xrTable3
//
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 493.8749F);
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 363.9999F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow10});
@@ -339,7 +340,7 @@ namespace LebenshilfeKusel
//
// xrLabel6
//
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 446.875F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 317F);
this.xrLabel6.Multiline = true;
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -349,7 +350,7 @@ namespace LebenshilfeKusel
//
// xrLabel5
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 413.875F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 284F);
this.xrLabel5.Multiline = true;
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -362,7 +363,7 @@ namespace LebenshilfeKusel
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 357.625F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 227.75F);
this.xrLabel4.Multiline = true;
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -377,7 +378,7 @@ namespace LebenshilfeKusel
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 340.625F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 210.75F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F);
@@ -391,7 +392,7 @@ namespace LebenshilfeKusel
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 321.875F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 17F);
@@ -412,9 +413,8 @@ namespace LebenshilfeKusel
this.xrLabel8,
this.xrLabel10,
this.xrLabel12,
this.lblNotice,
this.xrTable4});
this.ReportFooter.HeightF = 247.5417F;
this.lblNotice});
this.ReportFooter.HeightF = 226.7084F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
@@ -422,7 +422,7 @@ namespace LebenshilfeKusel
// xrLabel8
//
this.xrLabel8.CanShrink = true;
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 75F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 54.16667F);
this.xrLabel8.Multiline = true;
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -432,7 +432,7 @@ namespace LebenshilfeKusel
//
// xrLabel10
//
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 155.5417F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 134.7084F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(175F, 17F);
@@ -441,7 +441,7 @@ namespace LebenshilfeKusel
//
// xrLabel12
//
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 230.5417F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 209.7084F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(292F, 17.00002F);
@@ -452,7 +452,7 @@ namespace LebenshilfeKusel
//
this.lblNotice.CanShrink = true;
this.lblNotice.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 46.54166F);
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25.70833F);
this.lblNotice.Name = "lblNotice";
this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 28.45834F);
@@ -494,7 +494,7 @@ namespace LebenshilfeKusel
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 100F;
this.topMarginBand1.HeightF = 230F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
@@ -505,7 +505,8 @@ namespace LebenshilfeKusel
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1});
this.Detail1,
this.GroupFooter1});
this.DetailReport.DataMember = "InvoiceItems";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
@@ -523,6 +524,13 @@ namespace LebenshilfeKusel
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable4});
this.GroupFooter1.HeightF = 25F;
this.GroupFooter1.Name = "GroupFooter1";
//
// InvoiceCustomerReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -537,7 +545,7 @@ namespace LebenshilfeKusel
this.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(95, 50, 100, 100);
this.Margins = new System.Drawing.Printing.Margins(95, 50, 230, 100);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
@@ -593,5 +601,6 @@ namespace LebenshilfeKusel
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.XRLabel lblAddress;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
}
}

View File

@@ -4,7 +4,7 @@ using BeWo.Service.Plugins;
using BS.Shared.Core;
using BS.Shared.DataContracts;
namespace Lori
namespace Lori.Calculation
{
public class FibMarburgGroupDurationCalculator : GroupDurationCalculator
{

View File

@@ -31,8 +31,15 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Printing.v17.1.Core, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraPrinting.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
@@ -43,8 +50,24 @@
<ItemGroup>
<Compile Include="Calculation\GroupDurationCalculator.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServicesOverviewReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ServicesOverviewReport.Designer.cs">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</Compile>
<Compile Include="SettlementReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="SettlementReport.Designer.cs">
<DependentUpon>SettlementReport.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Report\Report.csproj">
<Project>{40D8B312-EA64-49E3-A31A-5E57ED4D5654}</Project>
<Name>Report</Name>
</ProjectReference>
<ProjectReference Include="..\..\Service\Service.csproj">
<Project>{094331C3-ECEE-4C89-BBFD-4C9DED89F0EF}</Project>
<Name>Service</Name>
@@ -54,5 +77,15 @@
<Name>Shared</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="ServicesOverviewReport.resx">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SettlementReport.resx">
<DependentUpon>SettlementReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@@ -1,28 +0,0 @@
using System;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
namespace BeWo.PsychosozialerTraegervereinReports
{
[IDSpecificClass(Identifier = "Mitarbeiterstundenkonto")]
public partial class MitarbeiterstundenkontoMonat : DevExpress.XtraReports.UI.XtraReport//, IBeWoReport<MitarbeiterstundenkontoRO>
{
public MitarbeiterstundenkontoMonat()
{
InitializeComponent();
}
public void SetReportDataSource(MitarbeiterstundenkontoRO pRO)
{
var msb = new PstMitarbeiterstundenkontoBerechnung();
msb.CreateReport(pRO);
this.bindingSource1.DataSource = pRO;
}
}
}

View File

@@ -1,717 +0,0 @@
using BeWo.Report.ReportObjects;
namespace BeWo.PsychosozialerTraegervereinReports
{
partial class MitarbeiterstundenkontoMonat
{
/// <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();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.lblMonat = 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();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).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;
//
// Detail1
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableDetail});
this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Detail1.HeightF = 25F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
//
// xrTableDetail
//
this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableDetail.Name = "xrTableDetail";
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
this.xrTableDetail.SizeF = new System.Drawing.SizeF(1005F, 25F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UseFont = false;
this.xrTableDetail.StylePriority.UsePadding = false;
this.xrTableDetail.StylePriority.UseTextAlignment = false;
this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRowDetail
//
this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell19,
this.xrTableCell20,
this.xrTableCell28,
this.xrTableCell16,
this.xrTableCell27,
this.xrTableCell22,
this.xrTableCell23,
this.xrTableCell21,
this.xrTableCell25,
this.xrTableCell24,
this.xrTableCell26});
this.xrTableRowDetail.Name = "xrTableRowDetail";
this.xrTableRowDetail.Weight = 1D;
//
// xrTableCell3
//
this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")});
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseFont = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "xrTableCell3";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell3.Weight = 0.15329125338142471D;
//
// xrTableCell19
//
this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")});
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Text = "xrTableCell19";
this.xrTableCell19.Weight = 0.081154151689479551D;
//
// xrTableCell20
//
this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")});
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Text = "xrTableCell20";
this.xrTableCell20.Weight = 0.094679933071566441D;
//
// xrTableCell28
//
this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.Text = "xrTableCell28";
this.xrTableCell28.Weight = 0.0721370604147881D;
//
// xrTableCell16
//
this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsSoll", "{0:0.00}")});
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Text = "xrTableCell16";
this.xrTableCell16.Weight = 0.063119927862939587D;
//
// xrTableCell27
//
this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst", "{0:0.00}")});
this.xrTableCell27.Name = "xrTableCell27";
this.xrTableCell27.Text = "xrTableCell27";
this.xrTableCell27.Weight = 0.063119927862939615D;
//
// xrTableCell22
//
this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsDiff", "{0:0.00}")});
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.Text = "xrTableCell22";
this.xrTableCell22.Weight = 0.063119927862939587D;
//
// xrTableCell23
//
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Text = "xrTableCell23";
this.xrTableCell23.Weight = 0.063119927862939559D;
//
// xrTableCell21
//
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.RelationFlsZuMittelbar", "{0:0.00}")});
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Text = "xrTableCell21";
this.xrTableCell21.Weight = 0.063119927862939615D;
//
// xrTableCell25
//
this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.Text = "xrTableCell25";
this.xrTableCell25.Weight = 0.063119927862939587D;
//
// xrTableCell24
//
this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
this.xrTableCell24.Name = "xrTableCell24";
this.xrTableCell24.Text = "xrTableCell24";
this.xrTableCell24.Weight = 0.0631199278629396D;
//
// xrTableCell26
//
this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
this.xrTableCell26.Name = "xrTableCell26";
this.xrTableCell26.Text = "xrTableCell26";
this.xrTableCell26.Weight = 0.063119927862939573D;
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1,
this.GroupHeader1,
this.GroupFooter1});
this.DetailReport.DataMember = "EmployeeDetailList";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
this.DetailReport.Name = "DetailReport";
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableHeader});
this.GroupHeader1.HeightF = 70F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
//
// xrTableHeader
//
this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableHeader.Name = "xrTableHeader";
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowHeader});
this.xrTableHeader.SizeF = new System.Drawing.SizeF(1005F, 70F);
this.xrTableHeader.StylePriority.UseBorders = false;
this.xrTableHeader.StylePriority.UseFont = false;
this.xrTableHeader.StylePriority.UsePadding = false;
this.xrTableHeader.StylePriority.UseTextAlignment = false;
this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRowHeader
//
this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell5,
this.xrTableCell4,
this.xrTableCell2,
this.xrTableCell9,
this.xrTableCell8,
this.xrTableCell10,
this.xrTableCell7,
this.xrTableCell11,
this.xrTableCell12,
this.xrTableCell13,
this.xrTableCell14,
this.xrTableCell15});
this.xrTableRowHeader.Name = "xrTableRowHeader";
this.xrTableRowHeader.Weight = 2.8D;
//
// xrTableCell5
//
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Name";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell5.Weight = 0.15329125016467182D;
//
// xrTableCell4
//
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Text = "Reguläre SOLL Stunden";
this.xrTableCell4.Weight = 0.081154192324637608D;
//
// xrTableCell2
//
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)";
this.xrTableCell2.Weight = 0.094679896646570338D;
//
// xrTableCell9
//
this.xrTableCell9.Multiline = true;
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Text = "Tatsächliche SOLL Stunden";
this.xrTableCell9.Weight = 0.072137063712635591D;
//
// xrTableCell8
//
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Text = "FLS Stunden SOLL";
this.xrTableCell8.Weight = 0.063119927721024038D;
//
// xrTableCell10
//
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.StylePriority.UseBackColor = false;
this.xrTableCell10.Text = "FLS IST lfd. Monat";
this.xrTableCell10.Weight = 0.063119927721024D;
//
// xrTableCell7
//
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat";
this.xrTableCell7.Weight = 0.06311992757910842D;
//
// xrTableCell11
//
this.xrTableCell11.Multiline = true;
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseBackColor = false;
this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat";
this.xrTableCell11.Weight = 0.063119927721024011D;
//
// xrTableCell12
//
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST";
this.xrTableCell12.Weight = 0.063119929511863376D;
//
// xrTableCell13
//
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Text = "Überstd. neu";
this.xrTableCell13.Weight = 0.063119928687401447D;
//
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.StylePriority.UseBackColor = false;
this.xrTableCell14.Text = "Überstd. Vormonat";
this.xrTableCell14.Weight = 0.063119928275170531D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Text = "Überstd. Gesamt";
this.xrTableCell15.Weight = 0.0631199213956443D;
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.GroupFooter1.HeightF = 48.95833F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrTable1
//
this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(1005F, 25F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
this.xrTable1.StylePriority.UseTextAlignment = false;
this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell35,
this.xrTableCell37,
this.xrTableCell39,
this.cellSollGesamt,
this.cellFLSSollGesamt,
this.cellFLSIstGesamt,
this.cellFLSPlusMinusGesamt,
this.cellGesamtGesamt,
this.cellRelationGesamt,
this.xrTableCell47,
this.xrTableCell48,
this.xrTableCell51});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 1D;
//
// xrTableCell35
//
this.xrTableCell35.Name = "xrTableCell35";
this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
this.xrTableCell35.StylePriority.UseFont = false;
this.xrTableCell35.StylePriority.UsePadding = false;
this.xrTableCell35.StylePriority.UseTextAlignment = false;
this.xrTableCell35.Text = "Gesamt";
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell35.Weight = 0.15329126714047708D;
//
// xrTableCell37
//
this.xrTableCell37.Name = "xrTableCell37";
this.xrTableCell37.Weight = 0.081154151689479551D;
//
// xrTableCell39
//
this.xrTableCell39.Name = "xrTableCell39";
this.xrTableCell39.Weight = 0.094679919312514085D;
//
// cellSollGesamt
//
this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "SollGesamt", "{0:0.00}")});
this.cellSollGesamt.Name = "cellSollGesamt";
this.cellSollGesamt.Text = "cellSollGesamt";
this.cellSollGesamt.Weight = 0.0721370604147881D;
//
// cellFLSSollGesamt
//
this.cellFLSSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsSollGesamt", "{0:0.00}")});
this.cellFLSSollGesamt.Name = "cellFLSSollGesamt";
this.cellFLSSollGesamt.Text = "cellFLSSollGesamt";
this.cellFLSSollGesamt.Weight = 0.063119927862939587D;
//
// cellFLSIstGesamt
//
this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")});
this.cellFLSIstGesamt.Name = "cellFLSIstGesamt";
this.cellFLSIstGesamt.Text = "cellFLSIstGesamt";
this.cellFLSIstGesamt.Weight = 0.063119927862939615D;
//
// cellFLSPlusMinusGesamt
//
this.cellFLSPlusMinusGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsDiffGesamt", "{0:0.00}")});
this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt";
this.cellFLSPlusMinusGesamt.Text = "cellFLSPlusMinusGesamt";
this.cellFLSPlusMinusGesamt.Weight = 0.063119927862939587D;
//
// cellGesamtGesamt
//
this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")});
this.cellGesamtGesamt.Name = "cellGesamtGesamt";
this.cellGesamtGesamt.Text = "cellGesamtGesamt";
this.cellGesamtGesamt.Weight = 0.063119927862939573D;
//
// cellRelationGesamt
//
this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelationFlsZuMittelbar", "{0:0.00}")});
this.cellRelationGesamt.Name = "cellRelationGesamt";
this.cellRelationGesamt.Text = "cellRelationGesamt";
this.cellRelationGesamt.Weight = 0.0631199278629396D;
//
// xrTableCell47
//
this.xrTableCell47.Name = "xrTableCell47";
this.xrTableCell47.Weight = 0.063119927862939587D;
//
// xrTableCell48
//
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.Weight = 0.063119927862939587D;
//
// xrTableCell51
//
this.xrTableCell51.Name = "xrTableCell51";
this.xrTableCell51.Weight = 0.063119927862939573D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblMonat});
this.ReportHeader.HeightF = 35F;
this.ReportHeader.Name = "ReportHeader";
//
// lblMonat
//
this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yy}")});
this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblMonat.Multiline = true;
this.lblMonat.Name = "lblMonat";
this.lblMonat.SizeF = new System.Drawing.SizeF(1007F, 25F);
this.lblMonat.StyleName = "Title";
this.lblMonat.StylePriority.UseFont = false;
this.lblMonat.Text = "lblMonat";
//
// 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 System.Drawing.Font("Arial", 8F);
this.xrPageInfo2.Format = "Seite {0} von {1}";
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(522.0001F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(482.9998F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
//
// xrPageInfo1
//
this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(8F, 25F);
this.xrPageInfo1.Name = "xrPageInfo1";
this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
this.xrPageInfo1.SizeF = new System.Drawing.SizeF(497F, 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 = 1;
this.Title.Font = new System.Drawing.Font("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 = 1;
this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.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 = 1;
this.PageInfo.Font = new System.Drawing.Font("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 = 1;
this.DataField.Font = new System.Drawing.Font("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 = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// Mitarbeiterstundenkonto
//
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 System.Drawing.Printing.Margins(75, 75, 50, 30);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
this.Title,
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "13.1";
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).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.DetailBand Detail1;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.XRLabel lblMonat;
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 xrTableHeader;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRTable xrTableDetail;
private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
private DevExpress.XtraReports.UI.XRTableCell cellSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSSollGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt;
private DevExpress.XtraReports.UI.XRTableCell cellRelationGesamt;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
}
}

View File

@@ -1,123 +0,0 @@
<?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>
<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>

View File

@@ -11,7 +11,7 @@ using BS.Shared.Core;
namespace BeWo.PsychosozialerTraegervereinReports
{
//[IDSpecificClass(Identifier = "Mitarbeiterstundenkonto")]
public partial class Mitarbeiterstundenzettel : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<MitarbeiterstundenkontoRO>
public partial class Mitarbeiterstundenzettel : DevExpress.XtraReports.UI.XtraReport//, IBeWoReport<MitarbeiterstundenkontoRO>
{

View File

@@ -10,195 +10,11 @@ namespace BeWo.PsychosozialerTraegervereinReports
{
public class PstMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung
{
public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed)
{
var dd = base.CreateDayDetail(date, ed);
dd.MaxHoursUntilBreak2 = 9;
dd.BreakMinutes2 = 15;
return dd;
}
public override bool ShouldCreateDayDetails()
{
return true;
}
public override bool SollPauseBerechnen()
{
return true;
}
public override bool AddServiceRecordToDuration(ServiceRecord item)
{
if (item.ServiceDescription.ServiceCategory.Name.ToLower().Contains("arbeitszeit"))
{
if (!item.ServiceDescription.Name.ToLower().Contains("krank") && !item.ServiceDescription.Name.ToLower().Contains("urlaub"))
return true;
}
return false;
}
protected override ServiceRecordSummary BerechneStunden(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, IList<ServiceRecord> groupFilteredRecords, DateTime berichtsAnfang,
DateTime berichtsEnde)
{
decimal flsGesamt = 0;
decimal arbeitszeit = 0;
var sum = new ServiceRecordSummary();
sum.RecordsImBerichtszeitraum = new List<ServiceRecord>();
empDetail.ServiceRecordsInSelectedTimeSpan = new List<ServiceRecord>();
foreach (var item in groupFilteredRecords)
{
if (!IsServiceRecordFehlzeit(item))
{
if (item.Start.Value >= berichtsAnfang && item.Start.Value < berichtsEnde)
{
//if (AddServiceRecordToDuration(item))
//{
empDetail.ServiceRecordsInSelectedTimeSpan.Add(item);
decimal duration = 0;
if (item.GroupRoundedDuration.HasValue)
{
duration = item.GroupRoundedDuration.Value;
}
else
{
duration = item.RoundedDuration;
}
if (item.ServiceDescription != null &&
item.ServiceDescription.ServiceCategory != null)
{
if (!item.ServiceDescription.ServiceCategory.Name.ToLower().Contains("arbeitszeit"))
{
flsGesamt += duration;
}
else if (!item.ServiceDescription.Name.ToLower().Contains("krank") && !item.ServiceDescription.Name.ToLower().Contains("urlaub"))
{
arbeitszeit += duration;
}
}
//}
sum.RecordsImBerichtszeitraum.Add(item);
}
}
}
//base.CorrectOverlappingTimes(groupFilteredRecords);
//var summary = base.BerechneStunden(empDetail, groupFilteredRecords, berichtsAnfang, berichtsEnde);
//var gesamt = summary.IstAbrechenbar + summary.IstNichtAbrechenbar;
sum.IstAbrechenbar = flsGesamt;
sum.IstNichtAbrechenbar = arbeitszeit - flsGesamt;
//summary.IstAbrechenbar = flsGesamt;
//summary.IstNichtAbrechenbar = gesamt - summary.IstAbrechenbar;
return sum;
}
public override decimal GetSollArbeitszeitProArbeitstag(Contract contract, MitarbeiterstundenkontoRO.EmployeeDetail ed)
{
// -> Frau Boos: die Arbeitsstunden pro Monat : 4,348 = Arbeitsstunde pro Woche : tatsächliche Arbeitstage pro Woche = Sollarbeitszeit pro Arbeitstag
if (contract.MonthlyTotalHours.HasValue && contract.WeeklyDays.HasValue)
{
return contract.MonthlyTotalHours.Value / 4.348m / contract.WeeklyDays.Value;
}
return base.GetSollArbeitszeitProArbeitstag(contract, ed);
}
public override decimal GetAdditionalHours(IList<MitarbeiterstundenkontoRO.DayDetail> days, DateTime berichtStart, DateTime berichtEnde, MitarbeiterstundenkontoRO.EmployeeDetail ed, IList<ServiceRecord> recordsAll)
{
var ah = base.GetAdditionalHours(days, berichtStart, berichtEnde, ed, recordsAll);
foreach (var sr in recordsAll)
{
if (sr.Start.HasValue && sr.Start >= berichtStart && sr.Start < berichtEnde && sr.End.HasValue)
{
var addKrank = false;
var addUrlaub = false;
//var dayDetail = FindDayDetail(sr, days);
var day = sr.Start.Value;
var dayDetail = days.FirstOrDefault(dd => dd.Date.Day == day.Day);
var faktor = GetFeiertagsFaktor(day);
if (faktor < 1 && day.DayOfWeek != DayOfWeek.Saturday && day.DayOfWeek != DayOfWeek.Sunday)
{
if (sr.ServiceDescription.Name.ToLower().Contains("krank"))
{
if (dayDetail.HoursSick == 0)
{
addKrank = true;
}
}
else if (sr.ServiceDescription.Name.ToLower().Contains("urlaub"))
{
if (dayDetail.HoursInVacation == 0)
{
addUrlaub = true;
}
}
if (addKrank || addUrlaub)
{
var abwesenheitStunden = sr.RoundedDuration / 60;
if (ed.AbsenceTimeDays != null && ed.AbsenceTimeDays.TageProWocheDict != null && ed.AbsenceTimeDays.RestStundenProWocheDict != null)
{
foreach (var week in ed.AbsenceTimeDays.TageProWocheDict.Keys)
{
if (day.Date >= week.StartDate && day.Date <= week.EndDate)
{
if (!ed.AbsenceTimeDays.RestStundenProWocheDict.ContainsKey(week))
{
ed.AbsenceTimeDays.RestStundenProWocheDict.Add(week, ed.SollProWoche);
}
var rest = ed.AbsenceTimeDays.RestStundenProWocheDict[week];
if (rest < abwesenheitStunden)
{
abwesenheitStunden = rest;
}
rest -= abwesenheitStunden;
if (rest < 0)
{
rest = 0;
}
ed.AbsenceTimeDays.RestStundenProWocheDict[week] = rest;
}
}
}
if (addKrank)
dayDetail.HoursSick += abwesenheitStunden;
else
dayDetail.HoursInVacation += abwesenheitStunden;
//if (!ed.UrlaubUndKrankheit.HasValue)
//ed.UrlaubUndKrankheit = 0;
dayDetail.MinutesTotal += abwesenheitStunden * 60;
ah += abwesenheitStunden;
}
}
}
}
return ah;
}
// public override decimal? BerechneSollProMonat(Employee emp, DateTime start, DateTime ende)
//{

View File

@@ -72,11 +72,11 @@
</Compile>
<Compile Include="PstMitarbeiterstundenkontoBerechnungStundenzettel.cs" />
<Compile Include="PstMitarbeiterstundenkontoBerechnung.cs" />
<Compile Include="MitarbeiterstundenkontoMonat.cs">
<Compile Include="Mitarbeiterstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="MitarbeiterstundenkontoMonat.designer.cs">
<DependentUpon>MitarbeiterstundenkontoMonat.cs</DependentUpon>
<Compile Include="Mitarbeiterstundenkonto.designer.cs">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ServiceInvoiceReport.cs">
@@ -109,8 +109,8 @@
<EmbeddedResource Include="Mitarbeiterstundenzettel.resx">
<DependentUpon>Mitarbeiterstundenzettel.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MitarbeiterstundenkontoMonat.resx">
<DependentUpon>MitarbeiterstundenkontoMonat.cs</DependentUpon>
<EmbeddedResource Include="Mitarbeiterstundenkonto.resx">
<DependentUpon>Mitarbeiterstundenkonto.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="ServiceInvoiceReport.resx">

View File

@@ -0,0 +1 @@
DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@@ -56,7 +56,6 @@ namespace SBBMainzReports
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable7 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow19 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -104,7 +103,6 @@ namespace SBBMainzReports
this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellUebertragNaechsterMonat = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
@@ -149,15 +147,17 @@ namespace SBBMainzReports
this.cellBetreuer2 = new DevExpress.XtraReports.UI.XRTableCell();
this.field30Prozent = new DevExpress.XtraReports.UI.CalculatedField();
this.field70ProzentProWoche = new DevExpress.XtraReports.UI.CalculatedField();
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -274,8 +274,7 @@ namespace SBBMainzReports
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1,
this.GroupHeader1,
this.GroupFooter1});
this.GroupHeader1});
this.DetailReport.DataMember = "Services";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
@@ -297,20 +296,23 @@ namespace SBBMainzReports
// xrTable3
//
this.xrTable3.BorderColor = System.Drawing.Color.Black;
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow6});
this.xrTable3.SizeF = new System.Drawing.SizeF(1105F, 20F);
this.xrTable3.StylePriority.UseBorders = false;
this.xrTable3.StylePriority.UseFont = false;
this.xrTable3.StylePriority.UseTextAlignment = false;
this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow6
//
this.xrTableRow6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell13,
this.xrTableCell15,
@@ -323,6 +325,7 @@ namespace SBBMainzReports
this.xrTableCell9});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow6.StylePriority.UseBorders = false;
this.xrTableRow6.StylePriority.UseTextAlignment = false;
this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableRow6.Weight = 1D;
@@ -433,18 +436,6 @@ namespace SBBMainzReports
this.GroupHeader1.RepeatEveryPage = true;
this.GroupHeader1.StylePriority.UseFont = false;
//
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable7,
this.xrTable6,
this.xrTable5,
this.xrTable4});
this.GroupFooter1.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.GroupFooter1.HeightF = 128F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrTable7
//
this.xrTable7.BackColor = System.Drawing.Color.Yellow;
@@ -452,7 +443,7 @@ namespace SBBMainzReports
this.xrTable7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(773.2539F, 0F);
this.xrTable7.LocationFloat = new DevExpress.Utils.PointFloat(773.2544F, 0F);
this.xrTable7.Name = "xrTable7";
this.xrTable7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable7.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -596,7 +587,7 @@ namespace SBBMainzReports
this.xrTable6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(562F, 0F);
this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(562.0005F, 0F);
this.xrTable6.Name = "xrTable6";
this.xrTable6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -623,7 +614,8 @@ namespace SBBMainzReports
//
// xrTableCell33
//
this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell33.CanGrow = false;
this.xrTableCell33.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell33.Name = "xrTableCell33";
@@ -636,7 +628,8 @@ namespace SBBMainzReports
//
// xrTableCell38
//
this.xrTableCell38.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell38.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell38.CanGrow = false;
this.xrTableCell38.Font = new System.Drawing.Font("Calibri", 10.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -730,7 +723,7 @@ namespace SBBMainzReports
this.xrTable5.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(309F, 0F);
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(309.0004F, 0F);
this.xrTable5.Name = "xrTable5";
this.xrTable5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -754,7 +747,8 @@ namespace SBBMainzReports
//
// xrTableCell36
//
this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell36.CanGrow = false;
this.xrTableCell36.Name = "xrTableCell36";
@@ -788,7 +782,7 @@ namespace SBBMainzReports
this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 0F);
this.xrTable4.Name = "xrTable4";
this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -817,7 +811,8 @@ namespace SBBMainzReports
//
// xrTableCell30
//
this.xrTableCell30.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.xrTableCell30.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell30.CanGrow = false;
this.xrTableCell30.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -831,7 +826,8 @@ namespace SBBMainzReports
//
// cellMinutes
//
this.cellMinutes.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
this.cellMinutes.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.cellMinutes.CanGrow = false;
this.cellMinutes.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -973,17 +969,10 @@ namespace SBBMainzReports
this.cellUebertragNaechsterMonat.Weight = 0.075757585872756356D;
this.cellUebertragNaechsterMonat.WordWrap = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleStartDate.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleStartDate.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleStartDate.Name = "formattingRuleStartDate";
//
@@ -991,9 +980,6 @@ namespace SBBMainzReports
//
this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleServiceDesc.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleServiceDesc.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleServiceDesc.Name = "formattingRuleServiceDesc";
//
@@ -1001,9 +987,6 @@ namespace SBBMainzReports
//
this.formattingRuleCostBearer.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleCostBearer.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleCostBearer.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleCostBearer.Name = "formattingRuleCostBearer";
//
@@ -1011,9 +994,6 @@ namespace SBBMainzReports
//
this.formattingRuleEmployeeName.Condition = "[StartDate2] < [StartDate]";
this.formattingRuleEmployeeName.DataMember = "ServicesDouble";
//
//
//
this.formattingRuleEmployeeName.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.formattingRuleEmployeeName.Name = "formattingRuleEmployeeName";
//
@@ -1417,6 +1397,23 @@ namespace SBBMainzReports
this.field70ProzentProWoche.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.field70ProzentProWoche.Name = "field70ProzentProWoche";
//
// GroupFooter2
//
this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable7,
this.xrTable6,
this.xrTable5,
this.xrTable4});
this.GroupFooter2.Font = new System.Drawing.Font("Calibri", 11F);
this.GroupFooter2.HeightF = 130F;
this.GroupFooter2.KeepTogether = true;
this.GroupFooter2.Name = "GroupFooter2";
this.GroupFooter2.StylePriority.UseFont = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
//
// QuittierungsbelegJugendamt
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1426,7 +1423,8 @@ namespace SBBMainzReports
this.topMarginBand1,
this.bottomMarginBand1,
this.ReportFooter,
this.GroupHeader2});
this.GroupHeader2,
this.GroupFooter2});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldAbrechenbareMinuten,
this.fieldBillableFLS,
@@ -1445,16 +1443,16 @@ namespace SBBMainzReports
this.PageWidth = 1169;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.SnapGridSize = 9F;
this.Version = "13.1";
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1527,7 +1525,6 @@ namespace SBBMainzReports
private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
private DevExpress.XtraReports.UI.XRTableCell cellLeistung;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
private DevExpress.XtraReports.UI.XRTable xrTable4;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
@@ -1580,5 +1577,6 @@ namespace SBBMainzReports
private DevExpress.XtraReports.UI.CalculatedField field70ProzentProWoche;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
}
}

View File

@@ -15,11 +15,73 @@ using BS.Shared.Services;
namespace VkmAachenSbd.Invoicing
{
[IDSpecificClass(Identifiers = new string[] { "ABW" })]
public class CustomInvoiceCreation : InvoiceCreation
{
public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
public override void SetInvoiceId(ServiceInvoice invoice)
{
invoice.InvoiceBase.InvoiceId = "SBD";
invoice.InvoiceBase.InvoiceTypeText = "Abrechnung Schulbegleitender Dienst";
}
public override IList<InvoiceItem> CreateInvoiceItems(List<ServiceRecordDC> serviceRecordsInPeriod,
DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
Calculations calc)
{
var items = base.CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, scap, calc);
decimal hours = 0;
decimal hourlyRate = 0;
decimal ratefactor = 0;
InvoiceItem newItem = null;
foreach (var item in items)
{
if (newItem == null)
{
newItem = new InvoiceItem();
newItem.ItemPeriodStart = item.ItemPeriodStart;
newItem.ItemPeriodEnd = item.ItemPeriodEnd;
}
hours += item.UnitCount ?? 0;
hourlyRate = item.AmountPerUnit ?? 0;
ratefactor = item.RateFactor ?? 0;
item.AmountTotal = 0;
item.GrossAmountTotal = 0;
}
if (newItem != null)
{
newItem.ItemDescription = "Betreuungseinsätze";
newItem.AmountPerUnit = hourlyRate;
newItem.UnitCount = hours;
newItem.AmountTotal = Math.Round(hourlyRate * hours, 2, MidpointRounding.AwayFromZero);
newItem.GrossAmountTotal = newItem.AmountTotal;
items.Add(newItem);
if (ratefactor > 0)
{
var rfItem = new InvoiceItem();
rfItem.ItemPeriodStart = newItem.ItemPeriodStart;
rfItem.ItemPeriodEnd = newItem.ItemPeriodEnd;
rfItem.RateFactor = ratefactor;
rfItem.AmountPerUnit = Math.Round(hourlyRate * (ratefactor / 100), 2, MidpointRounding.AwayFromZero);
rfItem.UnitCount = hours;
rfItem.AmountTotal = Math.Round((rfItem.AmountPerUnit ?? 0) * hours, 2, MidpointRounding.AwayFromZero);
rfItem.GrossAmountTotal = rfItem.AmountTotal;
rfItem.ItemDescription = String.Format("{0:0.##}% Zuschlag auf Betreuungszeit", ratefactor);
items.Add(rfItem);
}
}
return items;
}
public override IList<InvoiceItem> CreateSummaryInvoiceItems(IList<InvoiceItem> itemList, DateTimeSpan invoicePeriod, SupportConceptApprovalPeriod scap,
Calculations calc)
{
return itemList;

View File

@@ -81,7 +81,7 @@ namespace VkmAachenSbd
sd.TimeRangeString += ",";
}
sd.TimeRangeString += serviceDetail.TimeRangeString;
sd.Minutes = serviceDetail.Minutes;
sd.Minutes += serviceDetail.Minutes;
if (sd.Notice.Length > 0)
{

View File

@@ -52,6 +52,23 @@ namespace VkmAachenSbd
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand();
@@ -76,28 +93,12 @@ namespace VkmAachenSbd
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.fieldStd = new DevExpress.XtraReports.UI.CalculatedField();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldTotalStd = new DevExpress.XtraReports.UI.CalculatedField();
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -188,9 +189,6 @@ namespace VkmAachenSbd
//
this.ruleIstFerien.Condition = "[IstSamstag] Or [IstSonntag] Or [IstFeiertag] Or [IstFerien]";
this.ruleIstFerien.DataMember = "Services";
//
//
//
this.ruleIstFerien.Formatting.BackColor = System.Drawing.Color.LightSteelBlue;
this.ruleIstFerien.Name = "ruleIstFerien";
//
@@ -326,6 +324,181 @@ namespace VkmAachenSbd
this.ReportHeader.HeightF = 175F;
this.ReportHeader.Name = "ReportHeader";
//
// xrLabel8
//
this.xrLabel8.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel8.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(521.25F, 0F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.SizeF = new System.Drawing.SizeF(138.75F, 25F);
this.xrLabel8.StylePriority.UseBorders = false;
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UsePadding = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "nur vom VKM auszufüllen:";
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
//
// 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 System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(521.25F, 25F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2,
this.xrTableRow3,
this.xrTableRow4,
this.xrTableRow5,
this.xrTableRow6});
this.xrTable2.SizeF = new System.Drawing.SizeF(140F, 125F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UsePadding = false;
this.xrTable2.StylePriority.UseTextAlignment = false;
this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1,
this.xrTableCell15});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 0.66666666666666674D;
//
// xrTableCell1
//
this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 8, 0, 0, 100F);
this.xrTableCell1.StylePriority.UseBorders = false;
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "TL";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell1.Weight = 0.110344870757529D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F);
this.xrTableCell15.StylePriority.UsePadding = false;
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.Weight = 0.082758652734980509D;
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell12,
this.xrTableCell14});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 0.66666666666666674D;
//
// xrTableCell12
//
this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell12.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 8, 0, 0, 100F);
this.xrTableCell12.StylePriority.UseBorders = false;
this.xrTableCell12.StylePriority.UseFont = false;
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.Text = "bew.";
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell12.Weight = 0.110344870757529D;
//
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Weight = 0.082758652734980509D;
//
// xrTableRow4
//
this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell16,
this.xrTableCell17});
this.xrTableRow4.Name = "xrTableRow4";
this.xrTableRow4.Weight = 0.66666666666666663D;
//
// xrTableCell16
//
this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell16.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 8, 0, 0, 100F);
this.xrTableCell16.StylePriority.UseBorders = false;
this.xrTableCell16.StylePriority.UseFont = false;
this.xrTableCell16.StylePriority.UsePadding = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.Text = "AV";
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell16.Weight = 0.110344870757529D;
//
// xrTableCell17
//
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Weight = 0.082758652734980509D;
//
// xrTableRow5
//
this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell18,
this.xrTableCell19});
this.xrTableRow5.Name = "xrTableRow5";
this.xrTableRow5.Weight = 0.66666666666666685D;
//
// xrTableCell18
//
this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell18.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 8, 0, 0, 100F);
this.xrTableCell18.StylePriority.UseBorders = false;
this.xrTableCell18.StylePriority.UseFont = false;
this.xrTableCell18.StylePriority.UsePadding = false;
this.xrTableCell18.StylePriority.UseTextAlignment = false;
this.xrTableCell18.Text = "JA";
this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell18.Weight = 0.110344870757529D;
//
// xrTableCell19
//
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Weight = 0.082758652734980509D;
//
// xrTableRow6
//
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell20,
this.xrTableCell21});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Weight = 0.66666666666666685D;
//
// xrTableCell20
//
this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell20.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 8, 0, 0, 100F);
this.xrTableCell20.StylePriority.UseBorders = false;
this.xrTableCell20.StylePriority.UseFont = false;
this.xrTableCell20.StylePriority.UsePadding = false;
this.xrTableCell20.StylePriority.UseTextAlignment = false;
this.xrTableCell20.Text = "FK";
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell20.Weight = 0.110344870757529D;
//
// xrTableCell21
//
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Weight = 0.082758652734980509D;
//
// xrLabel11
//
this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
@@ -530,7 +703,7 @@ namespace VkmAachenSbd
// xrTableCell23
//
this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLM", "{0:0.00}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldTotalStd", "{0:0.00}")});
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.StylePriority.UseTextAlignment = false;
this.xrTableCell23.Weight = 0.16551729631138867D;
@@ -554,180 +727,11 @@ namespace VkmAachenSbd
this.fieldStd.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldStd.Name = "fieldStd";
//
// xrTable2
// fieldTotalStd
//
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 System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(521.25F, 25F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2,
this.xrTableRow3,
this.xrTableRow4,
this.xrTableRow5,
this.xrTableRow6});
this.xrTable2.SizeF = new System.Drawing.SizeF(140F, 125F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
this.xrTable2.StylePriority.UsePadding = false;
this.xrTable2.StylePriority.UseTextAlignment = false;
this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1,
this.xrTableCell15});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 0.66666666666666674D;
//
// xrTableCell1
//
this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 8, 0, 0, 100F);
this.xrTableCell1.StylePriority.UseBorders = false;
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UsePadding = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "TL";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell1.Weight = 0.110344870757529D;
//
// xrTableCell15
//
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 3, 0, 0, 100F);
this.xrTableCell15.StylePriority.UsePadding = false;
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.Weight = 0.082758652734980509D;
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell12,
this.xrTableCell14});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 0.66666666666666674D;
//
// xrTableCell12
//
this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell12.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 8, 0, 0, 100F);
this.xrTableCell12.StylePriority.UseBorders = false;
this.xrTableCell12.StylePriority.UseFont = false;
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.Text = "bew.";
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell12.Weight = 0.110344870757529D;
//
// xrTableCell14
//
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Weight = 0.082758652734980509D;
//
// xrTableRow4
//
this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell16,
this.xrTableCell17});
this.xrTableRow4.Name = "xrTableRow4";
this.xrTableRow4.Weight = 0.66666666666666663D;
//
// xrTableCell16
//
this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell16.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 8, 0, 0, 100F);
this.xrTableCell16.StylePriority.UseBorders = false;
this.xrTableCell16.StylePriority.UseFont = false;
this.xrTableCell16.StylePriority.UsePadding = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.Text = "AV";
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell16.Weight = 0.110344870757529D;
//
// xrTableCell17
//
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Weight = 0.082758652734980509D;
//
// xrTableRow5
//
this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell18,
this.xrTableCell19});
this.xrTableRow5.Name = "xrTableRow5";
this.xrTableRow5.Weight = 0.66666666666666685D;
//
// xrTableCell18
//
this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell18.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 8, 0, 0, 100F);
this.xrTableCell18.StylePriority.UseBorders = false;
this.xrTableCell18.StylePriority.UseFont = false;
this.xrTableCell18.StylePriority.UsePadding = false;
this.xrTableCell18.StylePriority.UseTextAlignment = false;
this.xrTableCell18.Text = "JA";
this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell18.Weight = 0.110344870757529D;
//
// xrTableCell19
//
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Weight = 0.082758652734980509D;
//
// xrTableRow6
//
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell20,
this.xrTableCell21});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Weight = 0.66666666666666685D;
//
// xrTableCell20
//
this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell20.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 8, 0, 0, 100F);
this.xrTableCell20.StylePriority.UseBorders = false;
this.xrTableCell20.StylePriority.UseFont = false;
this.xrTableCell20.StylePriority.UsePadding = false;
this.xrTableCell20.StylePriority.UseTextAlignment = false;
this.xrTableCell20.Text = "FK";
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell20.Weight = 0.110344870757529D;
//
// xrTableCell21
//
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Weight = 0.082758652734980509D;
//
// xrLabel8
//
this.xrLabel8.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel8.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(521.25F, 0F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.SizeF = new System.Drawing.SizeF(138.75F, 25F);
this.xrLabel8.StylePriority.UseBorders = false;
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.StylePriority.UsePadding = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "nur vom VKM auszufüllen:";
this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.fieldTotalStd.Expression = "[TotalFLM] / 60";
this.fieldTotalStd.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldTotalStd.Name = "fieldTotalStd";
//
// LeistungsnachweisSbd
//
@@ -739,7 +743,8 @@ namespace VkmAachenSbd
this.DetailReport2});
this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
this.fieldFLS,
this.fieldStd});
this.fieldStd,
this.fieldTotalStd});
this.DataSource = this.bindingSource1;
this.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
@@ -753,12 +758,12 @@ namespace VkmAachenSbd
this.FieldCaption,
this.PageInfo,
this.DataField});
this.Version = "13.2";
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -828,5 +833,6 @@ namespace VkmAachenSbd
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.CalculatedField fieldTotalStd;
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,11 +1,13 @@
using System;
using System.Text;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using DevExpress.XtraReports.UI;
namespace VkmAachenSbd
{
[IDSpecificClass(Identifier = "SBD")]
public partial class ServiceInvoiceReport : XtraReport, IBeWoReport<ServiceInvoiceRO>
{
public ServiceInvoiceReport()
@@ -15,18 +17,104 @@ namespace VkmAachenSbd
public void SetReportDataSource(ServiceInvoiceRO pRO)
{
DateTime start = pRO.AccountingPeriodStart;
DateTime end = pRO.AccountingPeriodEnd;
if (start.Month == end.Month && start.Year == end.Year)
{
lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start);
}
else
{
lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
}
if (String.IsNullOrWhiteSpace(pRO.Notice))
{
lblNotice.Visible = false;
}
pRO.CreateBillableServiceRecords();
SetzeEmpfaengerAdresse(pRO);
SetzeBetraege(pRO);
var subReport = new VkmAachenSbd.LeistungsnachweisAbrechnung();
subReport.SetReportDataSource(pRO);
this.xrSubreport1.ReportSource = subReport;
this.bindingSource1.DataSource = pRO;
}
private void SetzeBetraege(ServiceInvoiceRO pRo)
{
lblZuschlagText.Text = "";
lblAnzahlZuschlag.Text = "";
lblBetragEinheitZuschlag.Text = "";
lblGesamtBetragZuschlag.Text = "";
decimal stundenAnzahl = 0;
decimal stundenSatz = 0;
String prozentZuschlag = "";
decimal anzahlZuschlag = 0;
decimal betragEinheitZuschlag = 0;
if (pRo.ServiceInvoicePeriods != null)
{
foreach (var sip in pRo.ServiceInvoicePeriods)
{
if (sip.ServiceInvoiceItems != null)
{
foreach (var ii in sip.ServiceInvoiceItems)
{
if (ii.ServiceDescription == "Betreuungseinsätze")
{
stundenAnzahl = ii.UnitCount ?? 0;
stundenSatz = ii.AmountPerUnit ?? 0;
}
else if (ii.ServiceDescription.Contains("Zuschlag auf Betreuungszeit"))
{
anzahlZuschlag = ii.UnitCount ?? 0;
betragEinheitZuschlag = ii.AmountPerUnit ?? 0;
prozentZuschlag = ii.RateFactor;
prozentZuschlag = prozentZuschlag.Replace(",00%", "%");
}
}
}
}
}
lblStunden.Text = String.Format("{0:0.00}", stundenAnzahl);
lblStundensatz.Text = String.Format("{0:c}", stundenSatz);
lblBetragStunden.Text = String.Format("{0:c}", stundenAnzahl * stundenSatz);
if (!String.IsNullOrWhiteSpace(prozentZuschlag))
{
lblZuschlagText.Text = String.Format("{0} Zuschlag auf Betreuungszeit", prozentZuschlag);
lblAnzahlZuschlag.Text = String.Format("{0:0.00}", anzahlZuschlag);
lblBetragEinheitZuschlag.Text = String.Format("{0:c}", betragEinheitZuschlag);
lblGesamtBetragZuschlag.Text = String.Format("{0:c}", anzahlZuschlag * betragEinheitZuschlag);
}
lblGesamtBetrag.Text = pRo.GrossClaim;
}
private void SetzeEmpfaengerAdresse(ServiceInvoiceRO pRO)
{
StringBuilder sb = new StringBuilder();
if (!String.IsNullOrEmpty(pRO.RecipientOrganisation))
{
sb.AppendLine(pRO.RecipientOrganisation);
}
if (!String.IsNullOrEmpty(pRO.RecipientContactPerson))
{
sb.AppendLine(pRO.RecipientContactPerson);
}
if (!String.IsNullOrEmpty(pRO.RecipientDivision))
{
sb.AppendLine(pRO.RecipientDivision);
}
if (!String.IsNullOrEmpty(pRO.RecipientStreet))
{
sb.AppendLine(pRO.RecipientStreet);
}
if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown))
{
sb.AppendLine(pRO.RecipientPostCodeAndTown);
}
lblAdresse.Text = sb.ToString();
}
}
}

View File

@@ -120,4 +120,11 @@
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="xrLabel6.Text" xml:space="preserve">
<value>Sehr geehrte Damen und Herren,
wir haben im o.g. Zeitraum für [CustomerFirstName] [CustomerLastName] Leistungen
im Bereich Schulbegleitender Dienst gem. § 53 SGB XII erbracht.
Wir stellen diese hiermit in Rechnung.</value>
</data>
</root>

View File

@@ -1,48 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Plugins;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
namespace VkmAachenSbd.Translation
{
public class ApiTranslationDictionary : TranslationDictionary
{
public override Dictionary<String, String> GetTranslationDictionary()
{
var dict = base.GetTranslationDictionary();
AddOrReplaceTranslation(dict, "Hilfepläne", "Bewilligungen");
AddOrReplaceTranslation(dict, "Hilfeplan", "Bewilligung");
//AddOrReplaceTranslation(dict, "Teilnahme an Hilfeplankonferenz", "Teilnahme an BEW-Begutachtung");
//AddOrReplaceTranslation(dict, "Hilfeplankonferenzen", "BEW-Begutachtungen");
//AddOrReplaceTranslation(dict, "Hilfeplankonferenz", "BEW-Begutachtung am");
AddOrReplaceTranslation(dict, "Bewilligung beantragt am", "Hilfeplan beantragt am");
AddOrReplaceTranslation(dict, "Bewilligung eingereicht am", "Hilfeplan eingereicht am");
//AddOrReplaceTranslation(dict, "Ort des Hilfeplangesprächs", "Ort der BEW-Begutachtung");
AddOrReplaceTranslation(dict, "Hilfeplanübersicht", "Bewilligungs-Übersicht");
AddOrReplaceTranslation(dict, "HilfepläneMenuItem", "Bewilligungen");
AddOrReplaceTranslation(dict, "<Kein Hilfeplan ausgewählt>", "<Keine Bewilligung ausgewählt>");
AddOrReplaceTranslation(dict, "Auch archivierte Hilfepläne anzeigen", "Auch archivierte Bewilligungen anzeigen");
AddOrReplaceTranslation(dict, "Nur Hilfepläne anzeigen, die innerhalb der nächsten {0} Monate auslaufen", "Nur Bewilligungen anzeigen, die innerhalb der nächsten {0} Monate auslaufen");
AddOrReplaceTranslation(dict, "Ausgewählte Hilfepläne", "Ausgewählte Bewilligungen");
AddOrReplaceTranslation(dict, "Abgelaufene Hilfepläne anzeigen", "Abgelaufene Bewilligungen anzeigen");
return dict;
}
}
}

View File

@@ -62,6 +62,14 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Invoicing\CustomInvoiceCreation.cs" />
<Compile Include="Invoicing\CustomInvoiceFactory.cs" />
<Compile Include="LeistungsnachweisAbrechnung.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="LeistungsnachweisAbrechnung.designer.cs">
<DependentUpon>LeistungsnachweisAbrechnung.cs</DependentUpon>
</Compile>
<Compile Include="LeistungsnachweisSbd.cs">
<SubType>Component</SubType>
</Compile>
@@ -75,9 +83,12 @@
<Compile Include="ServiceInvoiceReport.Designer.cs">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
</Compile>
<Compile Include="Tranlsation\TranslationDictionary.cs" />
<Compile Include="Translation\TranslationDictionary.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="LeistungsnachweisAbrechnung.resx">
<DependentUpon>LeistungsnachweisAbrechnung.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="LeistungsnachweisSbd.resx">
<DependentUpon>LeistungsnachweisSbd.cs</DependentUpon>
</EmbeddedResource>
@@ -88,6 +99,10 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Data\Data.csproj">
<Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
<Name>Data</Name>
</ProjectReference>
<ProjectReference Include="..\..\Report\Report.csproj">
<Project>{40D8B312-EA64-49E3-A31A-5E57ED4D5654}</Project>
<Name>Report</Name>

File diff suppressed because it is too large Load Diff

View File

@@ -15,6 +15,7 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.Zahlungsdatum = pEntity.Zahlungsdatum;
pDataContract.Transaktionskassenbestand = pEntity.Transaktionskassenbestand;
pDataContract.Notice = pEntity.Notice;
pDataContract.InsUser = pEntity.InsUser;
return pDataContract;
}

View File

@@ -117,7 +117,7 @@ namespace BeWo.Service.Plugins
//t = "4271389563"; // Komm Mit
//t = "5430005891"; // Marienhospital Eickel
//t = "3265049248"; // Gerdas Pflegedienst
t = "1549622397"; // Kontakt und Krisenhilfe
//t = "1549622397"; // Kontakt und Krisenhilfe
//t = "4782194565"; // Skm Rheydt
//t = "7535795843"; // Sozialwerk Dürener Christen
//t = "6388340414"; // Weitblick
@@ -169,13 +169,14 @@ namespace BeWo.Service.Plugins
//t = "8275654834"; //Twg Jonathan
//t = "6586058528"; //Freundeskreis Suchtkrankenhilfe e.V.
//t = "2632162696"; // Pro BeWo Düren
//t = "6340891020"; // Caritas Ahlen
t = "6340891020"; // Caritas Ahlen
//t = "3659854106"; // alpha e.V.
//t = "5809130435"; // Lebenshilfe Kusel
//t = "3367947706"; // PaS Mönchengladbach
//t = "2331203795"; // BeWo für dich
//t = "5426234256"; // SKM Leverkusen
//t = "4137042939"; //MLG Lebengestalten / Haus Müllestumpe
//t = "5260936181"; //LORI
return t;
#else

File diff suppressed because it is too large Load Diff

View File

@@ -336,7 +336,8 @@
<Compile Include="Plugins\TranslationDictionary.cs" />
<Compile Include="Plugins\VacationService.cs" />
<Compile Include="Reporting\AnnualReportFactory.cs" />
<Compile Include="SBD\Vertretung\VertretungsAlgorithmus.cs" />
<Compile Include="SBD\VertretungsAlgorithmus.cs" />
<Compile Include="SBD\VertretungsManager.cs" />
<Compile Include="Security\SecurityBehaviorExtension.cs" />
<Compile Include="Security\SecurityEndpointBehavior.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />

View File

@@ -617,11 +617,11 @@ namespace BeWo.Service.ServiceContracts
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<VertretungsListeItemsDC> VertretungsListe(DateTime datum);
List<VertretungsItemDC> GetVertretungsListe(DateTime datum);
[FaultContract(typeof(BeWoFault))]
[OperationContract]
List<VertretungsListeItemsDC> VertretungsListeWoechentlich(DateTime start, DateTime ende);
List<VertretungsItemDC> GetVertretungsListeForTimeSpan(DateTime start, DateTime ende);
[FaultContract(typeof(BeWoFault))]
[OperationContract]

View File

@@ -19,7 +19,7 @@ using BeWo.Service.Core;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Invoicing;
using BeWo.Service.Plugins;
using BeWo.Service.SBD.Vertretung;
using BeWo.Service.SBD;
using BeWo.Service.Security;
using BeWo.Service.ServiceContracts;
@@ -2796,8 +2796,14 @@ namespace BeWo.Service.ServiceImplementations
try
{
string url = ConfigurationManager.AppSettings.Get("ContractStateUrl");
url = url.Replace("[TENANT]", MultitenancyOperationContextExt.Current.Tenant);
if (MultitenancyOperationContextExt.Current != null)
{
url = url.Replace("[TENANT]", MultitenancyOperationContextExt.Current.Tenant);
}
else
{
url = url.Replace("[TENANT]", SessionFacade.Tenant);
}
url += "&t=1";
using (var client = new WebClient())
@@ -3832,31 +3838,14 @@ namespace BeWo.Service.ServiceImplementations
}
}
public List<VertretungsListeItemsDC> VertretungsListe(DateTime datum)
public List<VertretungsItemDC> GetVertretungsListe(DateTime datum)
{
try
{
VertretungsListe liste = new VertretungsListe();
VertretungsManager mgr = new VertretungsManager();
liste.Vertretunglist = (List<Vertretung>)DAOFactory.GenericDAO.GetAllActive<Vertretung>();
liste.AbsenceTimelist = (List<AbsenceTime>)DAOFactory.GenericDAO.GetAllActive<AbsenceTime>();
liste.Arbeitszeitliste = (List<Arbeitszeit>)DAOFactory.GenericDAO.GetAllActive<Arbeitszeit>();
liste.Employeelist = (List<Employee>)DAOFactory.GenericDAO.GetAllActive<Employee>(); ;
liste.Customerlist = (List<Customer>)DAOFactory.GenericDAO.GetAllActive<Customer>();
var schulbegleitenderDienst = MapperFactory.VertretungsListeDC_VertretungsListe.MapToNewDC(liste);
VertretungsAlgorithmus alorythmus = new VertretungsAlgorithmus(schulbegleitenderDienst,datum);
return alorythmus.vertretungsliste;
return mgr.CreateVertretungsListe(datum.Date, datum.Date);
}
catch (Exception e)
{
@@ -3868,11 +3857,12 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
VertretungsAlgorithmus alorythmus = new VertretungsAlgorithmus(start, ende);
// VertretungsManager mgr = new VertretungsManager();
var x = alorythmus.ErstelleItemVonWoechentlicherVorhandenerMitarbeiterVertretungen();
//var x = mgr.CreateVertretungsListe(start, ende);
return x;
// return x;
return null;
}
catch (Exception e)
{
@@ -3884,13 +3874,14 @@ namespace BeWo.Service.ServiceImplementations
{
try
{
VertretungsAlgorithmus alorythmus = new VertretungsAlgorithmus(start, end,3);
//VertretungsAlgorithmus alorythmus = new VertretungsAlgorithmus(start, end,3);
VertretungsKlientAccountingsListeItemsDC cusAcc = new VertretungsKlientAccountingsListeItemsDC();
//VertretungsKlientAccountingsListeItemsDC cusAcc = new VertretungsKlientAccountingsListeItemsDC();
cusAcc.CustomerAccountItemList = alorythmus.c2a;
//cusAcc.CustomerAccountItemList = alorythmus.c2a;
return cusAcc;
//return cusAcc;
return null;
}
catch (Exception e)
{
@@ -3898,31 +3889,14 @@ namespace BeWo.Service.ServiceImplementations
}
}
public List<VertretungsListeItemsDC> VertretungsListeWoechentlich(DateTime start, DateTime ende)
public List<VertretungsItemDC> GetVertretungsListeForTimeSpan(DateTime start, DateTime ende)
{
try
{
VertretungsListe x = new VertretungsListe();
var mgr = new VertretungsManager();
x.Vertretunglist = (List<Vertretung>)DAOFactory.GenericDAO.GetAllActive<Vertretung>();
x.AbsenceTimelist = (List<AbsenceTime>)DAOFactory.GenericDAO.GetAllActive<AbsenceTime>();
x.Arbeitszeitliste = (List<Arbeitszeit>)DAOFactory.GenericDAO.GetAllActive<Arbeitszeit>();
x.Employeelist = (List<Employee>)DAOFactory.GenericDAO.GetAllActive<Employee>(); ;
x.Customerlist = (List<Customer>)DAOFactory.GenericDAO.GetAllActive<Customer>();
var schulbegleitenderDienst = MapperFactory.VertretungsListeDC_VertretungsListe.MapToNewDC(x);
VertretungsAlgorithmus alorythmus = new VertretungsAlgorithmus(schulbegleitenderDienst, start,ende);
return alorythmus.vertretungsliste;
return mgr.CreateVertretungsListe(start.Date, ende.Date);
}
catch (Exception e)
{

View File

@@ -1156,6 +1156,17 @@ namespace BeWo.Service.ServiceImplementations
}
}
//Check fehlerhaftes RecurrenceInfos
foreach (var app in result)
{
if (!String.IsNullOrEmpty(app.RecurrenceInfo))
{
if (app.RecurrenceInfo.Contains("WeekDays=\"0\""))
{
app.RecurrenceInfo = app.RecurrenceInfo.Replace("WeekDays=\"0\"", "WeekDays=\"2\"");
}
}
}
return result;
////var appointments = DAOFactory.GenericDAO.GetAll<SchedulerAppointment>();
//var test = MapperFactory.SchedulerAppointmentDCSchedulerAppointment.MapToNewDCs(appointments).OrderBy(a => a.StartDate).ToList();

View File

@@ -946,4 +946,12 @@ namespace BS.Shared
Mitarbeiter,
Klient
}
public enum VertretungsStatus
{
MaKrankVertretungBenoetigt = 0,
MaKrankKeineVertretungBenoetigt = 1,
MaKrankVertretungVorhanden = 2,
KlientKrank = 3
}
}

View File

@@ -30,5 +30,8 @@ namespace BS.Shared.DataContracts
[DataMember]
public string Notice { get; set; }
[DataMember]
public string InsUser { get; set; }
}
}

Some files were not shown because too many files have changed in this diff Show More