This commit is contained in:
LynJet
2022-04-28 20:06:18 +02:00
188 changed files with 119972 additions and 37045 deletions

View File

@@ -521,6 +521,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akgg", "ReportImp\AKGG\Akgg
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AkggMid", "ReportImp\AkggMid\AkggMid.csproj", "{B02A94EB-8D34-41D0-8E53-20F116240101}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiakonieLennepJobfit", "ReportImp\DiakonieLennepJobfit\DiakonieLennepJobfit.csproj", "{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Biotop", "ReportImp\Biotop\Biotop.csproj", "{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -4076,6 +4080,38 @@ Global
{B02A94EB-8D34-41D0-8E53-20F116240101}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Release|x86.ActiveCfg = Release|Any CPU
{B02A94EB-8D34-41D0-8E53-20F116240101}.Release|x86.Build.0 = Release|Any CPU
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}.Debug|.NET.ActiveCfg = Debug|Any CPU
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}.Debug|.NET.Build.0 = Debug|Any CPU
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}.Debug|x86.ActiveCfg = Debug|Any CPU
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}.Debug|x86.Build.0 = Debug|Any CPU
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}.Release|.NET.ActiveCfg = Release|Any CPU
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}.Release|.NET.Build.0 = Release|Any CPU
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}.Release|Any CPU.Build.0 = Release|Any CPU
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}.Release|x86.ActiveCfg = Release|Any CPU
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F}.Release|x86.Build.0 = Release|Any CPU
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Debug|.NET.ActiveCfg = Debug|Any CPU
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Debug|.NET.Build.0 = Debug|Any CPU
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Debug|x86.ActiveCfg = Debug|Any CPU
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Debug|x86.Build.0 = Debug|Any CPU
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Release|.NET.ActiveCfg = Release|Any CPU
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Release|.NET.Build.0 = Release|Any CPU
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Release|Any CPU.Build.0 = Release|Any CPU
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Release|x86.ActiveCfg = Release|Any CPU
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -4332,6 +4368,8 @@ Global
{B104F622-7BE6-4DFE-9E20-32915507860D} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{39876291-220B-412E-8ADE-B7A24621656D} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{B02A94EB-8D34-41D0-8E53-20F116240101} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{370A9FEA-F0C5-469B-BFF7-C4049A08AC7F} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD} = {D8A691C5-146D-4613-86CC-438F02FE9106}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}

View File

@@ -317,6 +317,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Detail\Zeiterfassung\ServiceRecordCreationView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\UrlaubskontoView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -496,7 +500,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Detail\ServiceRecordRTFWindowView.xaml">
<Page Include="View\Detail\Zeiterfassung\ServiceRecordRTFWindowView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -640,7 +644,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="View\Detail\ServiceRecordRebookingView.xaml">
<Page Include="View\Detail\Zeiterfassung\ServiceRecordRebookingView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -648,7 +652,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\ServiceRecordHistoryView.xaml">
<Page Include="View\Detail\Zeiterfassung\ServiceRecordHistoryView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
@@ -1049,6 +1053,9 @@
<Compile Include="View\Detail\DebugMessageLogView.xaml.cs">
<DependentUpon>DebugMessageLogView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\Zeiterfassung\ServiceRecordCreationView.xaml.cs">
<DependentUpon>ServiceRecordCreationView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\UrlaubskontoView.xaml.cs">
<DependentUpon>UrlaubskontoView.xaml</DependentUpon>
</Compile>
@@ -1190,7 +1197,7 @@
<Compile Include="View\Controls\TextModuleTreeViewControl.xaml.cs">
<DependentUpon>TextModuleTreeViewControl.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\ServiceRecordRTFWindowView.xaml.cs">
<Compile Include="View\Detail\Zeiterfassung\ServiceRecordRTFWindowView.xaml.cs">
<DependentUpon>ServiceRecordRTFWindowView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\TextbausteinView.xaml.cs">
@@ -1301,13 +1308,13 @@
<Compile Include="View\Detail\ProfileEditView.xaml.cs">
<DependentUpon>ProfileEditView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\ServiceRecordRebookingView.xaml.cs">
<Compile Include="View\Detail\Zeiterfassung\ServiceRecordRebookingView.xaml.cs">
<DependentUpon>ServiceRecordRebookingView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\Report\AccountingReportView.xaml.cs">
<DependentUpon>AccountingReportView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\ServiceRecordHistoryView.xaml.cs">
<Compile Include="View\Detail\Zeiterfassung\ServiceRecordHistoryView.xaml.cs">
<DependentUpon>ServiceRecordHistoryView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\SchedulerSettingsView.xaml.cs">
@@ -1573,7 +1580,7 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\ServiceRecordGroupEditView.xaml">
<Page Include="View\Detail\Zeiterfassung\ServiceRecordGroupEditView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -1615,13 +1622,13 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\ServiceRecordEditView.xaml">
<Page Include="View\Detail\Zeiterfassung\ServiceRecordEditView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="View\Detail\ServiceRecordView2.xaml">
<Page Include="View\Detail\Zeiterfassung\ServiceRecordView2.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
<Generator>MSBuild:Compile</Generator>
@@ -2131,7 +2138,7 @@
<Compile Include="View\Detail\NewsItemView.xaml.cs">
<DependentUpon>NewsItemView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\ServiceRecordGroupEditView.xaml.cs">
<Compile Include="View\Detail\Zeiterfassung\ServiceRecordGroupEditView.xaml.cs">
<DependentUpon>ServiceRecordGroupEditView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\MandatorView.xaml.cs">
@@ -2152,10 +2159,10 @@
<Compile Include="View\Detail\BookingView.xaml.cs">
<DependentUpon>BookingView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\ServiceRecordEditView.xaml.cs">
<Compile Include="View\Detail\Zeiterfassung\ServiceRecordEditView.xaml.cs">
<DependentUpon>ServiceRecordEditView.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\ServiceRecordView2.xaml.cs">
<Compile Include="View\Detail\Zeiterfassung\ServiceRecordView2.xaml.cs">
<DependentUpon>ServiceRecordView2.xaml</DependentUpon>
</Compile>
<Compile Include="View\Detail\Report\ServicesReportView.xaml.cs">

View File

@@ -201,6 +201,7 @@ namespace BeWo
bool showDienstplanung = false;
var showEmployeeSignature = false;
var showMultipleResourceColors = false;
var showInfoButtonInCalender = false;
AppSettings.ShowAdvisedAttendedFlag = false;
@@ -451,7 +452,11 @@ namespace BeWo
{
AppSettings.ShowKlientenBetreuungszeiten = true;
}
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowInfoButtonInCalender);
if (val != null && val.Equals("1"))
{
AppSettings.ShowInfoButtonInCalender = true;
}
val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.AllowStorno);
AppSettings.AllowStorno = val != null && val.Equals("1");
@@ -513,6 +518,7 @@ namespace BeWo
showMarker = true;
showUrlaubsplanung = true;
showDienstplanung = true;
showInfoButtonInCalender = true;
#endif
AppSettings.ShowDatevFields = showDatevFields;
@@ -548,8 +554,9 @@ namespace BeWo
AppSettings.ShowUrlaubsplanung = showUrlaubsplanung;
AppSettings.DontShowSpitzabrechnung = dontShowSpitzabrechnung;
AppSettings.ShowDienstplanung = showDienstplanung;
AppSettings.ShowEmployeeSignature = showEmployeeSignature;
AppSettings.ShowMultipleResourceColors = showMultipleResourceColors;
AppSettings.ShowEmployeeSignature = showEmployeeSignature;
AppSettings.ShowMultipleResourceColors = showMultipleResourceColors;
AppSettings.ShowInfoButtonInCalender = showInfoButtonInCalender;
BS.Shared.Settings.ApplicationSettings.SupportConceptExpirationLimitInMonths = AppSettings.HilfeplanAuslaufAuswahl;
}
@@ -559,14 +566,19 @@ namespace BeWo
{
get
{
String url = ServerAddress.ToLower();
String url = "";
#if DEBUG
url = String.Format("http://localhost:3777/Host");
//return new Uri("https://app4.bewoplaner.de/service");
//url = String.Format("app1.bewoplaner.de/service");
url = String.Format("http://localhost:3777/Host");
//return new Uri("https://app4.bewoplaner.de/service");
//url = String.Format("app1.bewoplaner.de/service");
#endif
if (!String.IsNullOrEmpty(ServerAddress) && String.IsNullOrEmpty(url))
{
url = ServerAddress.ToLower();
}
if (url.IndexOf("localhost") < 0)
{
int i;

View File

@@ -59,6 +59,7 @@ using RestSharp;
using Control = System.Windows.Controls.Control;
using Utils = BS.Shared.Core.Utils;
using Brush = System.Windows.Media.Brush;
using BeWo.View.Detail.Zeiterfassung;
namespace BeWo.Core
{

View File

@@ -388,6 +388,8 @@ namespace BeWo.Core.Config
public int DienstplanungStandardZeilenAnzahl { get; set; }
public bool ShowInfoButtonInCalender{ get; set; }
public bool AllowStorno { get; set; }
public bool ShowEmployeeSignature { get; set; }

View File

@@ -54,9 +54,9 @@
<TextBox TabIndex="0" SnapsToDevicePixels="True" Grid.Column="2" Grid.Row="1" Margin="10,10,20,10" Height="24" x:Name="TextBoxUsername" HorizontalAlignment="Stretch" Text="" />
<PasswordBox Margin="10,0,20,0" Height="24" Grid.Column="2" Grid.Row="2" x:Name="PasswordBoxPassword" Password="" HorizontalAlignment="Stretch" TabIndex="1" />
<Button Margin="10,30,20,50" Height="30" x:Name="ButtonLogin" Grid.Column="2" Grid.Row="3" HorizontalAlignment="Stretch" Content="Anmelden" IsDefault="True" Foreground="White" TabIndex="2" />
<Label VerticalAlignment="Bottom" HorizontalAlignment="Left" Content="Copyright 2010 | beyondSoft GmbH" Foreground="#FF818181" Margin="5,0,0,3" Grid.Row="3" Grid.ColumnSpan="3" Grid.Column="0" FontSize="10" />
<Label VerticalAlignment="Bottom" HorizontalAlignment="Left" Content="Copyright 2010 | ownSoft GmbH" Foreground="#FF818181" Margin="5,0,0,3" Grid.Row="3" Grid.ColumnSpan="3" Grid.Column="0" FontSize="10" />
<TextBlock Grid.Row="3" Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="10" Margin="0,0,12,10">
<Hyperlink TargetName="newWindow" Foreground="#FF818181" NavigateUri="http://www.beyondsoft.de">www.beyondsoft.de</Hyperlink>
<Hyperlink TargetName="newWindow" Foreground="#FF818181" NavigateUri="https://www.ownsoft.de/">www.ownsoft.de</Hyperlink>
</TextBlock>
</Grid>
</Border>

View File

@@ -35,8 +35,8 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Image Grid.Row="0" Grid.ColumnSpan="4" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_big.png" Height="45" Margin="7,7,0,0"/>
<Image Grid.Row="0" Grid.ColumnSpan="4" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_small.png" Height="44" Margin="7,7,0,0"/>
<Label VerticalAlignment="Top" HorizontalAlignment="Right" Content="Version x.x.x" Foreground="#FF818181" Margin="5,7,3,0" Grid.Row="0" Grid.ColumnSpan="4"
Grid.Column="0" FontSize="10" x:Name="lblVersion" />
<StackPanel Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="0,80,0,0">
@@ -163,10 +163,10 @@
</Hyperlink>
</TextBlock>
</StackPanel>
<TextBlock x:Name="txtCopyright" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Bottom" FontSize="10" Margin="10,5,0,5" Text="Copyright 2017 | beyondSoft GmbH" Foreground="#FF818181"/>
<TextBlock x:Name="txtCopyright" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Bottom" FontSize="10" Margin="10,5,0,5" Text="Copyright 2022 | ownSoft GmbH" Foreground="#FF818181"/>
<TextBlock Grid.Row="7" Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="10" Margin="0,5,12,5">
<Hyperlink x:Name="hyperlink" TargetName="newWindow" Foreground="#FF818181" NavigateUri="http://www.beyondsoft.de" RequestNavigate="Hyperlink_OnRequestNavigate">www.beyondsoft.de</Hyperlink>
<Hyperlink x:Name="hyperlink" TargetName="newWindow" Foreground="#FF818181" NavigateUri="https://www.ownsoft.de" RequestNavigate="Hyperlink_OnRequestNavigate">www.ownsoft.de</Hyperlink>
</TextBlock>
</Grid>
</Border>

View File

@@ -78,7 +78,7 @@ namespace BeWo
if (DateTime.Now > dt)
dt = DateTime.Now;
txtCopyright.Text = String.Format("Copyright {0:yyyy} | beyondSoft GmbH", dt);
txtCopyright.Text = String.Format("Copyright {0:yyyy} | ownSoft GmbH", dt);
var checkPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\profiles.txt";
if (File.Exists(checkPath))

View File

@@ -51,9 +51,9 @@
</Grid.RowDefinitions>
<!--<Frame x:Name="chatFrame" Grid.Column="2" Grid.Row="0" />-->
<TextBlock HorizontalAlignment="Center" Width="Auto" Margin="5,2,0,0">
<Hyperlink NavigateUri="http://www.bewoplaner.de" TargetName="newWindow" Foreground="Transparent" RequestNavigate="Hyperlink_OnRequestNavigate">
<Hyperlink NavigateUri="https://www.bewoplaner.de" TargetName="newWindow" Foreground="Transparent" RequestNavigate="Hyperlink_OnRequestNavigate">
<InlineUIContainer>
<Image HorizontalAlignment="Left" Source="Ressources\Icons\bewoplaner_logo_small.png"
<Image HorizontalAlignment="Left" Source="Ressources\Icons\bewoplaner_logo_small.png" Width="130"
Style="{StaticResource toolbarImageStyle}" RenderTransformOrigin="0.5,0.5" x:Name="image">
<Image.RenderTransform>
<TransformGroup>

View File

@@ -21,6 +21,7 @@ using BeWo.SchulbegleitenderDienst;
using BeWo.ServiceProxy;
using BeWo.View;
using BeWo.View.Detail;
using BeWo.View.Detail.Zeiterfassung;
using BeWo.View.Master;
using BeWo.View.Navigation;
using BeWo.ViewModel;
@@ -1211,7 +1212,7 @@ namespace BeWo
/*
* <TextBlock Grid.Row="7" Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="10" Margin="0,5,12,5">
<Hyperlink x:Name="hyperlink" TargetName="newWindow" Foreground="#FF818181" NavigateUri="http://www.beyondsoft.de" RequestNavigate="Hyperlink_OnRequestNavigate">www.beyondsoft.de</Hyperlink>
<Hyperlink x:Name="hyperlink" TargetName="newWindow" Foreground="#FF818181" NavigateUri="https://www.ownsoft.de" RequestNavigate="Hyperlink_OnRequestNavigate">www.ownsoft.de</Hyperlink>
</TextBlock>
*/
var tvLabel = new Label

View File

@@ -54,5 +54,25 @@ namespace BeWo.MultiLanguage
}
return String.Format(this.currentCulture, input, args);
}
public String Translate(String key, String defaultText)
{
if (key != null && this.dict != null && this.dict.TryGetValue(key, out var translation))
{
return translation;
}
return defaultText;
}
public String Translate(String key, String defaultText, params Object[] args)
{
String translation;
if (!String.IsNullOrEmpty(key) && this.dict.TryGetValue(key, out translation))
{
return String.Format(this.currentCulture, translation, args);
}
return String.Format(this.currentCulture, defaultText, args);
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

@@ -26,8 +26,8 @@
<view:EmployeeBrushConverter x:Key="EmployeeBrushConverter" />
<view:AppointmentBorderZusageConverter x:Key="AppointmentBorderZusageConverter" />
<view:NichtNochEinConverter x:Key="NichtNochEinConverter" />
<!-- Region Appointment Templates -->
<view:InformationButtonVisibilityConverter x:Key="InformationButtonVisibilityConverter" />
<!-- Region Appointment Templates -->
<!-- Region VerticalAppointmentTemplate -->
<ControlTemplate x:Key="{dxscht:SchedulerViewThemeKey ResourceKey=VerticalAppointmentTemplate, IsThemeIndependent=true}" TargetType="{x:Type dxschint:VisualVerticalAppointmentControl}">
@@ -689,7 +689,7 @@
</CheckBox>
<Border Width="15" Height="15" Grid.Column="1" Background="{Binding Path=FilterableBrush}" CornerRadius="3" />
<Button x:Name="btn_showEmployeeInformation" Width="15" Height="15" Grid.Column="2" Margin="5 0 5 0" Click="btn_showEmployeeInformation_Click" FontFamily="Microsoft Sans Serif" Content="i"/>
<Button x:Name="btn_showEmployeeInformation" Width="15" Height="15" Grid.Column="2" Margin="5 0 5 0" Click="btn_showEmployeeInformation_Click" FontFamily="Microsoft Sans Serif" Content="i" Visibility="{Binding Converter={StaticResource InformationButtonVisibilityConverter}}"/>
</Grid>
</Border>
</Grid>
@@ -799,7 +799,7 @@
</CheckBox.IsChecked>
</CheckBox>
<Button x:Name="btn_showCustomerInformation" Width="15" Height="15" Grid.Column="1" Margin="5 0 5 0" Click="btn_showCustomerInformation_Click" FontFamily="Microsoft Sans Serif" Content="i"/>
<Button x:Name="btn_showCustomerInformation" Width="15" Height="15" Grid.Column="1" Margin="5 0 5 0" Click="btn_showCustomerInformation_Click" FontFamily="Microsoft Sans Serif" Content="i" Visibility="{Binding Converter={StaticResource InformationButtonVisibilityConverter}}"/>
</Grid>
</Border>
</Grid>
@@ -1056,7 +1056,7 @@
</dxe:DateNavigator>
</Grid>
<Border Grid.Row="0" Grid.RowSpan="2" x:Name="PopupContent" />
<Border Grid.Row="0" Grid.RowSpan="2" x:Name="PopupContent" Margin="0,-10,0,10" />
<Popup Grid.Row="0" StaysOpen="True" Placement="MousePoint" Width="290" Height="80" Closed="popup_Closed" Opened="popup_Opened" x:Name="DeleteAppointmentsPopup">
<Grid Background="{StaticResource ControlBackground}" Margin="2,2,2,2">
<Grid.ColumnDefinitions>

View File

@@ -3143,5 +3143,23 @@ namespace BeWo.Scheduler.View
}
}
public class InformationButtonVisibilityConverter : IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
if (BeWoApp.AppSettings.ShowInfoButtonInCalender == true)
{
return Visibility.Visible;
}
else
return Visibility.Collapsed;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotImplementedException();
}
}
#endregion
}

View File

@@ -14,6 +14,7 @@ namespace BeWo.Scheduler.ViewModel
{
public class NewSchedulerViewModel
{
public event EventHandler<EventArgs<ISchedulerViewModel>> ViewModelChanged;
private ISchedulerViewModel _ActiveAppointmentViewModel;

View File

@@ -224,6 +224,11 @@ namespace BeWo.ServiceProxy
"Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactEmployeeDC> GetActiveCompactEmployeesForEmployee(long employeeOid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetAllAuthorizedCompactEmployees", ReplyAction="http://tempuri.org/IEmployeeService/GetAllAuthorizedCompactEmployeesResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetAllAuthorizedCompactEmployeesBeWoFaultFaul" +
"t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactEmployeeDC> GetAllAuthorizedCompactEmployees();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetTeamRelatedCustomerOids", ReplyAction="http://tempuri.org/IEmployeeService/GetTeamRelatedCustomerOidsResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetTeamRelatedCustomerOidsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<long> GetTeamRelatedCustomerOids(long employeeOid, System.Nullable<long> teamOid);
@@ -772,6 +777,11 @@ namespace BeWo.ServiceProxy
return base.Channel.GetActiveCompactEmployeesForEmployee(employeeOid);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactEmployeeDC> GetAllAuthorizedCompactEmployees()
{
return base.Channel.GetAllAuthorizedCompactEmployees();
}
public System.Collections.Generic.List<long> GetTeamRelatedCustomerOids(long employeeOid, System.Nullable<long> teamOid)
{
return base.Channel.GetTeamRelatedCustomerOids(employeeOid, teamOid);
@@ -1517,8 +1527,8 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.WohnheimEmployeeRelationDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.WohnheimEmployeeRelationDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AppointmentCategoryDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactOrganisationDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactPersonDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactOrganisationDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactWohnheimDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactWohnheimDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.QBFilterEnum))]
@@ -1568,6 +1578,30 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Employee2SchedulerAppointmentDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.ValueListEntryDC, System.Collections.Generic.List<BS.Shared.DataContracts.ResourceDC>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<System.DateTime, System.Collections.Generic.List<BS.Shared.Core.DateTimeSpan>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.SignatureType, System.Collections.Generic.List<long>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<System.Collections.Generic.Dictionary<int, long>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<int, long>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<int, bool>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<int, BS.Shared.DataContracts.DienstInfoDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<string, string>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.Compact.CompactCustomerDC, System.Collections.Generic.List<BS.Shared.DataContracts.AccountingTransactionDC>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.UserRightType, bool>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, bool>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.ServiceRecordDC, System.Collections.Generic.List<BS.Shared.ServiceRecordValidationResult>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<System.DateTime, BS.Shared.DataContracts.Compact.CompactCustomerDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.Compact.CompactCustomerDC, bool>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordValidationResult))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SchulbegleitenderZugehoerigkeitsTyp))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.MessageType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.HomeViewPanelType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.ServiceRecordValidationResult>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UiElementType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Auszahlungsintervall))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Zahlungstyp))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.VertretungsStatus))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.StatementType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ConfirmationReceiptSignatureDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ConfirmationReceiptSignatureDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.VorlagentabelleDC>))]
@@ -1601,6 +1635,9 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AbwesenheitsInformationDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AbwesenheitsInformationDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceRecordValidationResultDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.VertretungsKlientAccountingsListeItemsDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AccountingTransactionDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AccountingTransactionDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.TextbausteinDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.TextbausteinDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.SbdConfigDC))]
@@ -1622,6 +1659,8 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.ReportTemplateDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ReportTemplateDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ReportTypes))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AdditionalServiceBookingDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AdditionalServiceRegionDC))]
@@ -1654,9 +1693,6 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.TokenDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.VertretungsListeMitarbeiterItemsDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.VertretungsListeMitarbeiterItemsDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.VertretungsKlientAccountingsListeItemsDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AccountingTransactionDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AccountingTransactionDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.InvoiceDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Settlement2DC>))]
@@ -1687,32 +1723,6 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.ServiceRecordHistoryDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleRelationDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordValidationResult))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SchulbegleitenderZugehoerigkeitsTyp))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.MessageType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.HomeViewPanelType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.ServiceRecordValidationResult>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UiElementType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Auszahlungsintervall))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Zahlungstyp))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.VertretungsStatus))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.StatementType))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.SignatureType, System.Collections.Generic.List<long>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<System.Collections.Generic.Dictionary<int, long>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<int, long>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<int, bool>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<int, BS.Shared.DataContracts.DienstInfoDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<string, string>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.UserRightType, bool>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, bool>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.ServiceRecordDC, System.Collections.Generic.List<BS.Shared.ServiceRecordValidationResult>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<System.DateTime, BS.Shared.DataContracts.Compact.CompactCustomerDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.Compact.CompactCustomerDC, System.Collections.Generic.List<BS.Shared.DataContracts.AccountingTransactionDC>>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.Compact.CompactCustomerDC, bool>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTokenDC>))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Reports.AuslastungAnalysisRootDC))]
[System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Reports.AuslastungAnalysisEmployeeDC>))]
@@ -1788,6 +1798,21 @@ namespace BeWo.ServiceProxy
"lt", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Nullable<long> GetActiveMedVerListOidForCustomer(long customerOid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactSupportConcepts", ReplyAction="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactSupportConceptsRespons" +
"e")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactSupportConceptsBeWoFau" +
"ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactSupportConceptDC> GetAllAuthorizedCompactSupportConcepts();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactCustomers", ReplyAction="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactCustomersResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactCustomersBeWoFaultFaul" +
"t", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCustomerDC> GetAllAuthorizedCompactCustomers();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactPersons", ReplyAction="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactPersonsResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllAuthorizedCompactPersonsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactPersonDC> GetAllAuthorizedCompactPersons();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ICustomerService/GetAllActiveCustomers", ReplyAction="http://tempuri.org/ICustomerService/GetAllActiveCustomersResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/ICustomerService/GetAllActiveCustomersBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.CustomerDC> GetAllActiveCustomers();
@@ -2616,6 +2641,21 @@ namespace BeWo.ServiceProxy
return base.Channel.GetActiveMedVerListOidForCustomer(customerOid);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactSupportConceptDC> GetAllAuthorizedCompactSupportConcepts()
{
return base.Channel.GetAllAuthorizedCompactSupportConcepts();
}
public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCustomerDC> GetAllAuthorizedCompactCustomers()
{
return base.Channel.GetAllAuthorizedCompactCustomers();
}
public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactPersonDC> GetAllAuthorizedCompactPersons()
{
return base.Channel.GetAllAuthorizedCompactPersons();
}
public System.Collections.Generic.List<BS.Shared.DataContracts.CustomerDC> GetAllActiveCustomers()
{
return base.Channel.GetAllActiveCustomers();
@@ -5073,6 +5113,20 @@ namespace BeWo.ServiceProxy
public interface IOperationsService
{
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignaturesByEmployeeA" +
"ndServiceRecords", ReplyAction="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignaturesByEmployeeA" +
"ndServiceRecordsResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignaturesByEmployeeA" +
"ndServiceRecordsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
bool HasConfirmationReceiptSignaturesByEmployeeAndServiceRecords(long employeeOid, System.Collections.Generic.List<long> serviceRecordOids);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignatureByDateAndCus" +
"tomer", ReplyAction="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignatureByDateAndCus" +
"tomerResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignatureByDateAndCus" +
"tomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
bool HasConfirmationReceiptSignatureByDateAndCustomer(long customerOid, BS.Shared.Core.DateTimeSpan timeSpan, BS.Shared.SignatureType signatureType);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/LoadServiceCategory", ReplyAction="http://tempuri.org/IOperationsService/LoadServiceCategoryResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/LoadServiceCategoryBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.ServiceCategoryDC LoadServiceCategory(long serviceCategoryOid);
@@ -5320,6 +5374,14 @@ namespace BeWo.ServiceProxy
"iterBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.DienstplanerMonthlySummaryDC BerechneSollSaldoUndIstFuerEinzelnenMitarbeiter(out long stundenBeiAbwesenheitKey, out decimal stundenBeiAbwesenheitValue, System.DateTime date, long empOid, System.Collections.Generic.List<BS.Shared.DataContracts.DienstEintragDC> dienstEintraege, System.Collections.Generic.List<BS.Shared.DataContracts.DienstvertretungDC> dienstvertretungen, System.Collections.Generic.List<BS.Shared.DataContracts.AbsenceTimeDC> absenceTimes, System.Collections.Generic.List<BS.Shared.DataContracts.OvertimeDC> overtimes);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/KlientenAbschlagsInfoListe", ReplyAction="http://tempuri.org/IOperationsService/KlientenAbschlagsInfoListeResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/KlientenAbschlagsInfoListeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.VertretungsKlientAccountingsListeItemsDC KlientenAbschlagsInfoListe(System.DateTime start, System.DateTime end);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DoTokenWunschOperation", ReplyAction="http://tempuri.org/IOperationsService/DoTokenWunschOperationResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DoTokenWunschOperationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DoTokenWunschOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerWunschToken, string token);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DoTokenAusschlussOperation", ReplyAction="http://tempuri.org/IOperationsService/DoTokenAusschlussOperationResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DoTokenAusschlussOperationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DoTokenAusschlussOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerAusschlussToken, string token);
@@ -5676,19 +5738,11 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetOwnChatSettingsUrlBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
string GetOwnChatSettingsUrl();
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignaturesByEmployeeA" +
"ndServiceRecords", ReplyAction="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignaturesByEmployeeA" +
"ndServiceRecordsResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignaturesByEmployeeA" +
"ndServiceRecordsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
bool HasConfirmationReceiptSignaturesByEmployeeAndServiceRecords(long employeeOid, System.Collections.Generic.List<long> serviceRecordOids);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignatureByDateAndCus" +
"tomer", ReplyAction="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignatureByDateAndCus" +
"tomerResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/HasConfirmationReceiptSignatureByDateAndCus" +
"tomerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
bool HasConfirmationReceiptSignatureByDateAndCustomer(long customerOid, BS.Shared.Core.DateTimeSpan timeSpan, BS.Shared.SignatureType signatureType);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeople", ReplyAction="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeopleRes" +
"ponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeopleBeW" +
"oFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<long> InsertNewAdditionalServiceGroupsOfPeople(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC> pGroups);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceBookings", ReplyAction="http://tempuri.org/IOperationsService/GetAllAdditionalServiceBookingsResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllAdditionalServiceBookingsBeWoFaultFau" +
@@ -5928,6 +5982,10 @@ namespace BeWo.ServiceProxy
"ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.OrganisationPersonRelationDC> LoadOrganisationPersonRelationsByOid(System.Collections.Generic.List<long> pOids);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/LoadArbeitszeitenForObject", ReplyAction="http://tempuri.org/IOperationsService/LoadArbeitszeitenForObjectResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/LoadArbeitszeitenForObjectBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.ArbeitszeitDC> LoadArbeitszeitenForObject(BS.Shared.TableID objectTid, long objectOid);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/LoadBargeldkassenForObject", ReplyAction="http://tempuri.org/IOperationsService/LoadBargeldkassenForObjectResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/LoadBargeldkassenForObjectBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.BargeldkassenDC> LoadBargeldkassenForObject(BS.Shared.TableID objectTid, long objectOid);
@@ -6069,14 +6127,6 @@ namespace BeWo.ServiceProxy
"FaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<BS.Shared.DataContracts.VertretungsListeMitarbeiterItemsDC> VertretungsMitarbeiterListeWoechentlich(System.DateTime start, System.DateTime ende);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/KlientenAbschlagsInfoListe", ReplyAction="http://tempuri.org/IOperationsService/KlientenAbschlagsInfoListeResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/KlientenAbschlagsInfoListeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.VertretungsKlientAccountingsListeItemsDC KlientenAbschlagsInfoListe(System.DateTime start, System.DateTime end);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DoTokenWunschOperation", ReplyAction="http://tempuri.org/IOperationsService/DoTokenWunschOperationResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DoTokenWunschOperationBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DoTokenWunschOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerWunschToken, string token);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/DeactivateInvoices", ReplyAction="http://tempuri.org/IOperationsService/DeactivateInvoicesResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeactivateInvoicesBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices);
@@ -6337,6 +6387,12 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateDefaultServiceRecordsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
string CreateDefaultServiceRecords(System.DateTime monat, System.Collections.Generic.List<long> oids);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CreateDefaultCustomerServiceRecords", ReplyAction="http://tempuri.org/IOperationsService/CreateDefaultCustomerServiceRecordsResponse" +
"")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CreateDefaultCustomerServiceRecordsBeWoFaul" +
"tFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
string CreateDefaultCustomerServiceRecords(System.DateTime start, System.DateTime end, System.Collections.Generic.List<long> cb2scOids);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/IsAlive", ReplyAction="http://tempuri.org/IOperationsService/IsAliveResponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/IsAliveBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
bool IsAlive();
@@ -6457,12 +6513,6 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateAdditionalServiceGroupOfPeopleBeWoFau" +
"ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC UpdateAdditionalServiceGroupOfPeople(BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC pAdditionalServiceGroupOfPeople);
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeople", ReplyAction="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeopleRes" +
"ponse")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertNewAdditionalServiceGroupsOfPeopleBeW" +
"oFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List<long> InsertNewAdditionalServiceGroupsOfPeople(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC> pGroups);
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -6499,6 +6549,16 @@ namespace BeWo.ServiceProxy
{
}
public bool HasConfirmationReceiptSignaturesByEmployeeAndServiceRecords(long employeeOid, System.Collections.Generic.List<long> serviceRecordOids)
{
return base.Channel.HasConfirmationReceiptSignaturesByEmployeeAndServiceRecords(employeeOid, serviceRecordOids);
}
public bool HasConfirmationReceiptSignatureByDateAndCustomer(long customerOid, BS.Shared.Core.DateTimeSpan timeSpan, BS.Shared.SignatureType signatureType)
{
return base.Channel.HasConfirmationReceiptSignatureByDateAndCustomer(customerOid, timeSpan, signatureType);
}
public BS.Shared.DataContracts.ServiceCategoryDC LoadServiceCategory(long serviceCategoryOid)
{
return base.Channel.LoadServiceCategory(serviceCategoryOid);
@@ -6749,6 +6809,16 @@ namespace BeWo.ServiceProxy
return base.Channel.BerechneSollSaldoUndIstFuerEinzelnenMitarbeiter(out stundenBeiAbwesenheitKey, out stundenBeiAbwesenheitValue, date, empOid, dienstEintraege, dienstvertretungen, absenceTimes, overtimes);
}
public BS.Shared.DataContracts.VertretungsKlientAccountingsListeItemsDC KlientenAbschlagsInfoListe(System.DateTime start, System.DateTime end)
{
return base.Channel.KlientenAbschlagsInfoListe(start, end);
}
public void DoTokenWunschOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerWunschToken, string token)
{
base.Channel.DoTokenWunschOperation(art, Oid, zugehoerigkeitsTyp, verfuegbarerWunschToken, token);
}
public void DoTokenAusschlussOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerAusschlussToken, string token)
{
base.Channel.DoTokenAusschlussOperation(art, Oid, zugehoerigkeitsTyp, verfuegbarerAusschlussToken, token);
@@ -7164,14 +7234,9 @@ namespace BeWo.ServiceProxy
return base.Channel.GetOwnChatSettingsUrl();
}
public bool HasConfirmationReceiptSignaturesByEmployeeAndServiceRecords(long employeeOid, System.Collections.Generic.List<long> serviceRecordOids)
public System.Collections.Generic.List<long> InsertNewAdditionalServiceGroupsOfPeople(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC> pGroups)
{
return base.Channel.HasConfirmationReceiptSignaturesByEmployeeAndServiceRecords(employeeOid, serviceRecordOids);
}
public bool HasConfirmationReceiptSignatureByDateAndCustomer(long customerOid, BS.Shared.Core.DateTimeSpan timeSpan, BS.Shared.SignatureType signatureType)
{
return base.Channel.HasConfirmationReceiptSignatureByDateAndCustomer(customerOid, timeSpan, signatureType);
return base.Channel.InsertNewAdditionalServiceGroupsOfPeople(pGroups);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceBookingDC> GetAllAdditionalServiceBookings(System.Nullable<long> regionOid, System.DateTime start, System.DateTime end)
@@ -7429,6 +7494,11 @@ namespace BeWo.ServiceProxy
return base.Channel.LoadOrganisationPersonRelationsByOid(pOids);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.ArbeitszeitDC> LoadArbeitszeitenForObject(BS.Shared.TableID objectTid, long objectOid)
{
return base.Channel.LoadArbeitszeitenForObject(objectTid, objectOid);
}
public System.Collections.Generic.List<BS.Shared.DataContracts.BargeldkassenDC> LoadBargeldkassenForObject(BS.Shared.TableID objectTid, long objectOid)
{
return base.Channel.LoadBargeldkassenForObject(objectTid, objectOid);
@@ -7589,16 +7659,6 @@ namespace BeWo.ServiceProxy
return base.Channel.VertretungsMitarbeiterListeWoechentlich(start, ende);
}
public BS.Shared.DataContracts.VertretungsKlientAccountingsListeItemsDC KlientenAbschlagsInfoListe(System.DateTime start, System.DateTime end)
{
return base.Channel.KlientenAbschlagsInfoListe(start, end);
}
public void DoTokenWunschOperation(int art, System.Nullable<long> Oid, BS.Shared.SchulbegleitenderZugehoerigkeitsTyp zugehoerigkeitsTyp, System.Collections.Generic.Dictionary<string, BS.Shared.DataContracts.Compact.CompactTokenDC> verfuegbarerWunschToken, string token)
{
base.Channel.DoTokenWunschOperation(art, Oid, zugehoerigkeitsTyp, verfuegbarerWunschToken, token);
}
public void DeactivateInvoices(System.Collections.Generic.List<BS.Shared.DataContracts.InvoiceDC> invoices)
{
base.Channel.DeactivateInvoices(invoices);
@@ -7894,6 +7954,11 @@ namespace BeWo.ServiceProxy
return base.Channel.CreateDefaultServiceRecords(monat, oids);
}
public string CreateDefaultCustomerServiceRecords(System.DateTime start, System.DateTime end, System.Collections.Generic.List<long> cb2scOids)
{
return base.Channel.CreateDefaultCustomerServiceRecords(start, end, cb2scOids);
}
public bool IsAlive()
{
return base.Channel.IsAlive();
@@ -8018,11 +8083,6 @@ namespace BeWo.ServiceProxy
{
return base.Channel.UpdateAdditionalServiceGroupOfPeople(pAdditionalServiceGroupOfPeople);
}
public System.Collections.Generic.List<long> InsertNewAdditionalServiceGroupsOfPeople(System.Collections.Generic.List<BS.Shared.DataContracts.AdditionalServiceGroupOfPeopleDC> pGroups)
{
return base.Channel.InsertNewAdditionalServiceGroupsOfPeople(pGroups);
}
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]

View File

@@ -51,7 +51,7 @@ namespace BeWo.View.Controls
c.Text = string.Empty;
c.ToolTip = "Kein gültiger Arbeitsvertrag";
}
else if (info.AbsenceTime != null && info.Feiertag == null)
else if (info.AbsenceTime != null && info.EnableDiensteAnFeiertagen == true)
{
string additionToTooltip = "";
var start = info.AbsenceTime.Start.Value;
@@ -160,7 +160,7 @@ namespace BeWo.View.Controls
if (info.Feiertag != null)
{
c.Background = Brushes.LightPink;
c.ToolTip = info.Feiertag.Name + " (gesetzl. Feiertag)";
c.ToolTip += "\n" + info.Feiertag.Name + " (gesetzl. Feiertag)";
}
}
}));
@@ -227,6 +227,8 @@ namespace BeWo.View.Controls
public double Dauer { get; set; }
public FeiertagDC Feiertag { get; set; }
public bool MarkierungBenoetigt { get; set; }
public bool EnableDiensteAnFeiertagen { get; set; }
}
public class StatusInformation

View File

@@ -19,6 +19,7 @@ using BeWo.Core.Service;
using BeWo.ServiceProxy;
using BeWo.Validation;
using BeWo.View.Controls;
using BeWo.View.Detail.Zeiterfassung;
using BeWo.ViewModel;
using BeWo.ViewModel.ListViewModel;

View File

@@ -160,6 +160,10 @@ namespace BeWo.View.Detail
}
#if DEBUG
tabitem_stundenplan.Visibility = Visibility.Visible;
#endif
if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ChatSettings) || !BeWoApp.AppSettings.ShowOwnChat)
{
tabitem_chatservice.Visibility = Visibility.Collapsed;

View File

@@ -913,7 +913,7 @@ namespace BeWo.View.Detail.Report
_AuswahlDienstZeileDC = _DienstplanerRootObj.DienstZeilenListe.First(z => z.Employee != null && z.Employee.EmployeeOid == employee.EmployeeOid && z.Zeile == zeile);
// Wenn Mitarbeiter im Wohnheim arbeiten
if (_AuswahlWohnheim.EmployeeOids.Contains(employee.EmployeeOid.Value))
if (_AuswahlWohnheim.EmployeeOids.Contains(employee.EmployeeOid.Value)) //BP
{
decimal stundenFuerSaldo = 0.0m;
@@ -1426,7 +1426,11 @@ namespace BeWo.View.Detail.Report
var endzeit = selectedDienst.Ende.TimeOfDay.ToString().Split(':');
textbox_startzeit.Text = startzeit[0] + ":" + startzeit[1];
textbox_endzeit.Text = endzeit[0] + ":" + endzeit[1];
textbox_dauer.Text = string.Format("{0:0.00}", selectedDienst.Dauer);
if (textbox_startzeit.Text == "00:00" && textbox_startzeit.Text == textbox_endzeit.Text)
{
textbox_dauer.Text = string.Format("{0:0.00}", selectedDienst.Dauer);
}
if (selectedDienst.Start.TimeOfDay.ToString() == "00:00:00" && selectedDienst.Ende.TimeOfDay.ToString() == "00:00:00")
textbox_dauer.IsEnabled = true;
@@ -1713,7 +1717,8 @@ namespace BeWo.View.Detail.Report
Zeiten = zeiten,
Dauer = dauer,
Feiertag = ft,
MarkierungBenoetigt = feldMarkieren
MarkierungBenoetigt = feldMarkieren,
EnableDiensteAnFeiertagen = _DienstplanerRootObj.EnableDiensteAnFeiertagen
};
}
// Wenn es die Statuszeile ist
@@ -1766,7 +1771,9 @@ namespace BeWo.View.Detail.Report
var eintraegeEinerWoche = eintraegeFuerMitarbeiter != null ? GetEintraegeEinerWoche(eintraegeFuerMitarbeiter, pos) : null;
var vertretungenEinerWoche = vertretungenFuerMitarbeiter != null ? GetVertretungenEinerWoche(vertretungenFuerMitarbeiter, pos) : null;
var ueberstundenEinerWoche = ueberstunden != null ? GetUeberstundenEinerWoche(ueberstunden, pos) : null;
var abwesenheitenEinerWoche = urlaubKrankheit != null ? GetAbwesenheitenEinerWoche(urlaubKrankheit, pos, eintraegeEinerWoche, vertretungenEinerWoche) : null;
// TODO: weeklydays aus Vertrag mitgeben und in der Methode einbeziehen (wie auf Server)
var abwesenheitenEinerWoche = urlaubKrankheit != null ? GetAbwesenheitenEinerWoche(selZeile, urlaubKrankheit, pos, eintraegeEinerWoche, vertretungenEinerWoche) : null;
// Für entweder Vertretung oder normale Einträge Stunden der Woche summieren
List<double> stundenWoche = new List<double>();
@@ -2034,15 +2041,18 @@ namespace BeWo.View.Detail.Report
return res;
}
// Abwesenheiten auswerten, also nur die einer Woche zurückgeben
private List<double> GetAbwesenheitenEinerWoche(List<AbsenceTimeDC> liste, int sonntag, List<DienstEintragDC> eintraegeDerWoche, List<DienstvertretungDC> vertretungenDerWoche)
// Abwesenheiten auswerten, also nur die einer Woche zurückgeben (Wird einmal für jede Woche jedes Mitarbeiters aufgerufen
private List<double> GetAbwesenheitenEinerWoche(DienstZeileDC selZeile, List<AbsenceTimeDC> liste, int sonntag, List<DienstEintragDC> eintraegeDerWoche, List<DienstvertretungDC> vertretungenDerWoche)
{
List<double> res = new List<double>();
var year = (int)_YearPicker.SelectedItem;
ContractDC contract = null;
List<DateTime> tage = new List<DateTime>();
foreach (var entry in liste)
{
contract = GetContract(selZeile.Contracts, entry.Start.Value);
var start = entry.Start.Value.Month == _AuswahlMonat.Month ? entry.Start : new DateTime(year, _AuswahlMonat.Month, 1);
var end = entry.End.HasValue ? entry.End : new DateTime(year, _AuswahlMonat.Month,
DateTime.DaysInMonth(year, _AuswahlMonat.Month));
@@ -2060,6 +2070,7 @@ namespace BeWo.View.Detail.Report
}
}
}
// Tage einer Woche
if (tage.Count > 0)
{
// Halbe Tage extra rechnen und dann entfernen
@@ -2067,9 +2078,11 @@ namespace BeWo.View.Detail.Report
tage.RemoveRange(halbeTage);
// Wochenend- und Feiertage entfernen
var wochenendeFeiertage = tage.FindAll(t => t.Date.DayOfWeek == DayOfWeek.Saturday || t.Date.DayOfWeek == DayOfWeek.Sunday ||
_DienstplanerRootObj.Feiertage.FindAll(f => f.Datum.Date == t.Date).Count > 0);
tage.RemoveRange(wochenendeFeiertage);
if (!_DienstplanerRootObj.EnableDiensteAnFeiertagen)
{
var feiertage = tage.FindAll(t => _DienstplanerRootObj.Feiertage.FindAll(f => f.Datum.Date == t.Date).Count > 0);
tage.RemoveRange(feiertage);
}
// Einträge und Vertretungen von Wochen- und Monats-Ist abziehen, wenn an diesem Tag eine ganztägige Abwesnheit ist ABCDEF
if (eintraegeDerWoche != null)
@@ -2097,13 +2110,64 @@ namespace BeWo.View.Detail.Report
}
}
res.Add(Convert.ToDouble(_DienstplanerRootObj.StundenBeiAbwesenheit[liste[0].EmployeeOid] * halbeTage.Count / 2));
res.Add(Convert.ToDouble(_DienstplanerRootObj.StundenBeiAbwesenheit[liste[0].EmployeeOid] * tage.Count));
decimal multiplikator = tage.Count + Convert.ToDecimal(halbeTage.Count) / 2;
// Ist alles folgende dann überhaupt noch relevant??? TESTEN
if (selZeile.Employee.EmployeeOid == 20)
Console.WriteLine();
if (contract != null)
{
if (multiplikator > contract.WeeklyDays)
multiplikator = contract.WeeklyDays;
else if (tage.Count + halbeTage.Count > contract.WeeklyDays && halbeTage.Count > 0)
{
multiplikator = 0;
tage.AddRange(halbeTage);
tage = tage.OrderBy(t => t.Date).ToList();
for (int i = 0; i < contract.WeeklyDays; i++)
{
var tag = tage[i];
if (tag.TimeOfDay.Hours != 0)
multiplikator += 0.5m;
else
multiplikator++;
}
}
#region auskommentiert zum testen
//if (tage.Count + halbeTage.Count > contract.WeeklyDays)
//{
// if (halbeTage.Count == 0)
// multiplikator = contract.WeeklyDays;
// else
// {
// multiplikator = 0;
// tage.AddRange(halbeTage);
// int counter = 1;
// foreach (var tag in tage)
// {
// if (counter <= contract.WeeklyDays)
// {
// if (tag.TimeOfDay.Hours == 0)
// multiplikator += 1;
// else
// multiplikator += 0.5m;
// }
// }
// }
//}
#endregion
}
res.Add(Convert.ToDouble(_DienstplanerRootObj.StundenBeiAbwesenheit[liste[0].EmployeeOid] * multiplikator));
}
return res;
}
public static ContractDC GetContract(List<ContractDC> contracts, DateTime absDatum) => contracts.FirstOrDefault(x => (!x.EntryDate.HasValue ||
x.EntryDate.Value <= absDatum.Date) &&
(!x.ContractEndDate.HasValue || x.ContractEndDate.Value >= absDatum.Date));
//Event, was bei Klick auf "Drucken" ausgelöst wird
private void LinkPdfExport_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
{

View File

@@ -489,7 +489,8 @@
IsReadOnly="True"
x:Name="popupedit_costBearerContactPersonSearch"
Grid.Column="1" Margin="3" Height="23" Grid.Row="8"
DeleteButtonVisibility="Collapsed"
DeleteButtonVisibility="Visible"
DeleteClick="popupedit_costBearerContactPersonSearch_DeleteClick"
PopUpClick="popupedit_costBearerContactPersonSearch_PopUpClick"
Text="{Binding Path=CostBearerContactPerson.FullName, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Cursor="Arrow" PreviewMouseDoubleClick="Popupedit_costBearerContactPersonSearch_OnPreviewMouseDoubleClick"/>

View File

@@ -1865,6 +1865,17 @@ namespace BeWo.View.Detail
{
FilterTreeItems();
}
private void popupedit_costBearerContactPersonSearch_DeleteClick(object sender, RoutedEventArgs e)
{
var vm = tabcontrol_costbearers.SelectedItem as SupportConceptCostBearerRelVM;
if (vm != null)
{
vm.CostBearerContactPerson = null;
}
}
}
public class ValueListEntryTypeToColorConverter : IValueConverter

View File

@@ -0,0 +1,83 @@
<view:BeWoView x:Class="BeWo.View.Detail.Zeiterfassung.ServiceRecordCreationView"
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.View.Controls"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:validation="clr-namespace:BeWo.Validation"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
Height="Auto" Width="Auto">
<GroupBox Name="root" Header="{markup:Translate Zeiterfassung erstellen}" Style="{StaticResource ObjectEditGroupBox}" Margin="3">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid Grid.Column="0" Grid.Row="0" VerticalAlignment="Center" Margin="3,3,3,3">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Startdatum:" />
<dxe:DateEdit Grid.Column="1" Grid.Row="0" x:Name="datepicker_StartDate" Height="23" Margin="3,0,3,3" MaskType="DateTimeAdvancingCaret" Width="150"
EditValue="{validation:ValidationBinding Path=StartDatum}"/>
<Label Grid.Column="2" Grid.Row="0" Content="Enddatum:" />
<dxe:DateEdit Grid.Column="3" Grid.Row="0" x:Name="datepicker_EndDate" Height="23" Margin="3,0,3,3" MaskType="DateTimeAdvancingCaret" Width="150"
EditValue="{validation:ValidationBinding Path=EndDatum}"/>
</Grid>
<Grid Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" Margin="3,3,3,3">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Folgende Einträge werden im ausgewählten Zeitraum in der Zeiterfassung angelegt:" />
</Grid>
<dxg:GridControl Name="grid_Arbeitszeiten" Grid.Row="2" Tag="{Binding}" ItemsSource="{Binding Path=SelectedArbeitszeitVM.ArbeitszeitEintraege.VMList, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}">
<dxg:GridControl.Columns>
<dxg:GridColumn Header="Tag" FieldName="Tag" SortOrder="Ascending" SortMode="Custom" ReadOnly="True">
</dxg:GridColumn>
<dxg:GridColumn Header="Uhrzeit von" FieldName="UhrzeitVon" ReadOnly="True">
<dxg:GridColumn.EditSettings>
<dxe:TextEditSettings MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" MaskShowPlaceHolders="True" MaskUseAsDisplayFormat="True" />
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn Header="Uhrzeit bis" FieldName="UhrzeitBis" ReadOnly="True">
<dxg:GridColumn.EditSettings>
<dxe:TextEditSettings MaskType="RegEx" Mask="(0?\d|1\d|2[0-3]):[0-5]\d" MaskShowPlaceHolders="True" MaskUseAsDisplayFormat="True" />
</dxg:GridColumn.EditSettings>
</dxg:GridColumn>
<dxg:GridColumn Header="{markup:Translate Mitarbeiter/in}" FieldName="Employee" ReadOnly="True">
</dxg:GridColumn>
<dxg:GridColumn Header="Bemerkungen" FieldName="Notice" ReadOnly="True"/>
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView NavigationStyle="Cell" Margin="2,2,2,2" AllowBestFit="True" BestFitMode="AllRows" AutoWidth="True" ShowGroupPanel="False" ShowGroupedColumns="False" ShowTotalSummary="False" HorizontalContentAlignment="Left" />
</dxg:GridControl.View>
</dxg:GridControl>
</Grid>
</GroupBox>
</view:BeWoView>

View File

@@ -0,0 +1,58 @@
using System;
using System.Collections.Generic;
using BeWo.ServiceProxy;
using BeWo.Validation;
using BeWo.ViewModel;
using BeWo.ViewModel.ListViewModel;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
namespace BeWo.View.Detail.Zeiterfassung
{
public partial class ServiceRecordCreationView
{
public DateTime StartDatum { get; set; }
public DateTime EndDatum { get; set; }
public SupportConceptCostBearerRelDC SupportConceptCostBearerRel { get; set; }
public ArbeitszeitListVM ArbeitszeitListVM { get; set; }
public ArbeitszeitVM SelectedArbeitszeitVM { get; set; }
public ServiceRecordCreationView(SupportConceptCostBearerRelDC c2s, List<ArbeitszeitDC> arbeitszeiten)
{
InitializeComponent();
SupportConceptCostBearerRel = c2s;
ArbeitszeitListVM = new ArbeitszeitListVM(arbeitszeiten);
StartDatum = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
EndDatum = StartDatum.AddMonths(1).AddDays(-1);
UpdateSelectedArbeitszeitVm();
DataContext = this;
}
private void UpdateSelectedArbeitszeitVm()
{
SelectedArbeitszeitVM = ArbeitszeitListVM.VMList[0];
}
public void Save(Action<String> pCallBack)
{
List<long> oids = new List<long>();
oids.Add(SupportConceptCostBearerRel.CostBearer2SupportConceptOid.Value);
ServiceFacade.DoOperationsServiceAsync(s => s.CreateDefaultCustomerServiceRecords(StartDatum, EndDatum, oids), result => pCallBack(result));
}
}
}

View File

@@ -1,167 +1,168 @@
<localView:BeWoView x:Class="BeWo.View.Detail.ServiceRecordHistoryView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:localView="clr-namespace:BeWo.View"
xmlns:detail="clr-namespace:BeWo.View.Detail"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup">
<localView:BeWoView.Resources>
<DataTemplate x:Key="DetailCoreTemplate">
<dx:MeasurePixelSnapper>
<Border BorderThickness="0,1,0,0" BorderBrush="#FFD2D2D2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="8" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<!-- <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />-->
</Grid.ColumnDefinitions>
<TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />
<!-- <TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice2}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />
<TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice3}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />
<TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice4}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />
<TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice5}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />-->
</Grid>
</Border>
</dx:MeasurePixelSnapper>
</DataTemplate>
<ControlTemplate x:Key="DetailContainerTemplate" TargetType="{x:Type ContentControl}">
<Border BorderThickness="0,0,0,0" BorderBrush="{TemplateBinding BorderBrush}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="0" Background="{TemplateBinding Background}">
<ContentPresenter />
</Border>
</ControlTemplate>
<DataTemplate x:Key="RowDetailTemplate">
<StackPanel Orientation="Vertical">
<dx:MeasurePixelSnapper>
<ContentPresenter x:Name="defaultRowPresenter" Content="{Binding}" ContentTemplate="{Binding View.DefaultDataRowTemplate}" />
</dx:MeasurePixelSnapper>
<detail:RowDetailContainerControl Template="{StaticResource DetailContainerTemplate}" Content="{Binding}" ContentTemplate="{DynamicResource DetailCoreTemplate}" />
</StackPanel>
</DataTemplate>
</localView:BeWoView.Resources>
<Grid Width="Auto" Height="Auto" x:Name="root">
<GroupBox Style="{StaticResource PopUpWindowStyle}">
<GroupBox.Header>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0">
<Image Source="..\..\Ressources\Icons\HistoryDisabled.png" RenderTransformOrigin="0.5,0.5" Width="Auto" Height="28" Margin="0,0,0,0">
<Image.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleX="1" ScaleY="1" />
<SkewTransform AngleX="0" AngleY="0" />
<RotateTransform Angle="0" />
<TranslateTransform X="0" Y="0" />
</TransformGroup>
</Image.RenderTransform>
</Image>
<TextBox Text="Änderungshistorie" Margin="10,4,0,0" Background="{x:Null}" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="20" BorderBrush="{x:Null}" VerticalAlignment="Stretch" BorderThickness="0,0,0,0" Padding="0,0,0,0" />
</StackPanel>
</GroupBox.Header>
<Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Rectangle Fill="{DynamicResource ServiceRecordContentBrush}" Height="6" />
<Grid x:Name="rootGrid" Grid.Row="1" Margin="10,10,10,0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid Grid.Row="1" Margin="0,0,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<dxg:GridControl VerticalAlignment="Stretch" HorizontalAlignment="Stretch" x:Name="datagrid_ServiceRecordHistory">
<dxg:GridControl.Columns>
<dxg:GridColumn AllowEditing="False" FieldName="TimeStamp" Header="Änderungsdatum" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=dd.MM.yyyy HH:mm}" x:Name="AenderungsdatumColumn" />
<dxg:GridColumn AllowEditing="False" FieldName="InsUser" Header="Geändert von" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Employee" Header="{markup:Translate Mitarbeiter}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="HistoryTypeString" Header="Art der Änderung" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Start" Header="Datum" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=dd.MM.yyyy}"/>
<dxg:GridColumn AllowEditing="False" FieldName="StartDate" Header="Start" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=HH:mm}"/>
<dxg:GridColumn AllowEditing="False" FieldName="EndDate" Header="Ende" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=HH:mm}"/>
<dxg:GridColumn AllowEditing="False" FieldName="RoundedDuration" Header="Dauer" ReadOnly="True" EditSettings="{dxe:TextSettings DisplayFormat=0}" x:Name="RoundedDHeader"/>
<dxg:GridColumn AllowEditing="False" FieldName="DurationInStunden" Header="Art (Dauer)" ReadOnly="True" x:Name="DurationInSTDHeader" />
<dxg:GridColumn AllowEditing="False" FieldName="Customer" Header="{markup:Translate Klient/in}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="SupportConcept" Header="{markup:Translate Hilfeplan}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Organisation.Name" Header="{markup:Translate Kostenträger}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="ServiceDescription.Category" Header="Leistungskategorie" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="ServiceDescription" Header="Leistung" ReadOnly="True" />
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView x:Name="GridView" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Row"
AllowPerPixelScrolling="True" UseLightweightTemplates="None"
DataRowTemplate="{DynamicResource RowDetailTemplate}"/>
</dxg:GridControl.View>
</dxg:GridControl>
</Grid>
</Grid>
</Grid>
<Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,10,0,0" VerticalAlignment="Stretch" Background="#FF000000">
<Border.OpacityMask>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#19000000" Offset="0" />
<GradientStop Color="#33FFFFFF" Offset="1" />
</LinearGradientBrush>
</Border.OpacityMask>
</Border>
<StackPanel Grid.ColumnSpan="3" Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Height="Auto" Margin="5,10,0,0" HorizontalAlignment="Right">
<Button x:Name="btnClose" Content="Schließen" Margin="0,0,3,0" Command="ApplicationCommands.Close" Height="25" />
</StackPanel>
</Grid>
</GroupBox>
</Grid>
<localView:BeWoView x:Class="BeWo.View.Detail.Zeiterfassung.ServiceRecordHistoryView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:localView="clr-namespace:BeWo.View"
xmlns:detail="clr-namespace:BeWo.View.Detail"
xmlns:zeit="clr-namespace:BeWo.View.Detail.Zeiterfassung"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup">
<localView:BeWoView.Resources>
<DataTemplate x:Key="DetailCoreTemplate">
<dx:MeasurePixelSnapper>
<Border BorderThickness="0,1,0,0" BorderBrush="#FFD2D2D2" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="8" >
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<!-- <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />-->
</Grid.ColumnDefinitions>
<TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />
<!-- <TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice2}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />
<TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice3}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />
<TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice4}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />
<TextBox
HorizontalAlignment="Stretch" Text="{Binding Path=Row.Notice5}"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Auto"
BorderThickness="0" BorderBrush="{x:Null}"
Background="{x:Null}" SnapsToDevicePixels="True"
MaxHeight="80" TextWrapping="Wrap" AutoWordSelection="True"
IsReadOnly="True" Tag="{Binding}"
IsEnabled="True" />-->
</Grid>
</Border>
</dx:MeasurePixelSnapper>
</DataTemplate>
<ControlTemplate x:Key="DetailContainerTemplate" TargetType="{x:Type ContentControl}">
<Border BorderThickness="0,0,0,0" BorderBrush="{TemplateBinding BorderBrush}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="0" Background="{TemplateBinding Background}">
<ContentPresenter />
</Border>
</ControlTemplate>
<DataTemplate x:Key="RowDetailTemplate">
<StackPanel Orientation="Vertical">
<dx:MeasurePixelSnapper>
<ContentPresenter x:Name="defaultRowPresenter" Content="{Binding}" ContentTemplate="{Binding View.DefaultDataRowTemplate}" />
</dx:MeasurePixelSnapper>
<zeit:RowDetailContainerControl Template="{StaticResource DetailContainerTemplate}" Content="{Binding}" ContentTemplate="{DynamicResource DetailCoreTemplate}" />
</StackPanel>
</DataTemplate>
</localView:BeWoView.Resources>
<Grid Width="Auto" Height="Auto" x:Name="root">
<GroupBox Style="{StaticResource PopUpWindowStyle}">
<GroupBox.Header>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0">
<Image Source="..\..\Ressources\Icons\HistoryDisabled.png" RenderTransformOrigin="0.5,0.5" Width="Auto" Height="28" Margin="0,0,0,0">
<Image.RenderTransform>
<TransformGroup>
<ScaleTransform ScaleX="1" ScaleY="1" />
<SkewTransform AngleX="0" AngleY="0" />
<RotateTransform Angle="0" />
<TranslateTransform X="0" Y="0" />
</TransformGroup>
</Image.RenderTransform>
</Image>
<TextBox Text="Änderungshistorie" Margin="10,4,0,0" Background="{x:Null}" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="20" BorderBrush="{x:Null}" VerticalAlignment="Stretch" BorderThickness="0,0,0,0" Padding="0,0,0,0" />
</StackPanel>
</GroupBox.Header>
<Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Rectangle Fill="{DynamicResource ServiceRecordContentBrush}" Height="6" />
<Grid x:Name="rootGrid" Grid.Row="1" Margin="10,10,10,0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid Grid.Row="1" Margin="0,0,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<dxg:GridControl VerticalAlignment="Stretch" HorizontalAlignment="Stretch" x:Name="datagrid_ServiceRecordHistory">
<dxg:GridControl.Columns>
<dxg:GridColumn AllowEditing="False" FieldName="TimeStamp" Header="Änderungsdatum" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=dd.MM.yyyy HH:mm}" x:Name="AenderungsdatumColumn" />
<dxg:GridColumn AllowEditing="False" FieldName="InsUser" Header="Geändert von" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Employee" Header="{markup:Translate Mitarbeiter}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="HistoryTypeString" Header="Art der Änderung" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Start" Header="Datum" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=dd.MM.yyyy}"/>
<dxg:GridColumn AllowEditing="False" FieldName="StartDate" Header="Start" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=HH:mm}"/>
<dxg:GridColumn AllowEditing="False" FieldName="EndDate" Header="Ende" ReadOnly="True" EditSettings="{dxe:DateSettings DisplayFormat=HH:mm}"/>
<dxg:GridColumn AllowEditing="False" FieldName="RoundedDuration" Header="Dauer" ReadOnly="True" EditSettings="{dxe:TextSettings DisplayFormat=0}" x:Name="RoundedDHeader"/>
<dxg:GridColumn AllowEditing="False" FieldName="DurationInStunden" Header="Art (Dauer)" ReadOnly="True" x:Name="DurationInSTDHeader" />
<dxg:GridColumn AllowEditing="False" FieldName="Customer" Header="{markup:Translate Klient/in}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="SupportConcept" Header="{markup:Translate Hilfeplan}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="Organisation.Name" Header="{markup:Translate Kostenträger}" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="ServiceDescription.Category" Header="Leistungskategorie" ReadOnly="True" />
<dxg:GridColumn AllowEditing="False" FieldName="ServiceDescription" Header="Leistung" ReadOnly="True" />
</dxg:GridControl.Columns>
<dxg:GridControl.View>
<dxg:TableView x:Name="GridView" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Row"
AllowPerPixelScrolling="True" UseLightweightTemplates="None"
DataRowTemplate="{DynamicResource RowDetailTemplate}"/>
</dxg:GridControl.View>
</dxg:GridControl>
</Grid>
</Grid>
</Grid>
<Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,10,0,0" VerticalAlignment="Stretch" Background="#FF000000">
<Border.OpacityMask>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#19000000" Offset="0" />
<GradientStop Color="#33FFFFFF" Offset="1" />
</LinearGradientBrush>
</Border.OpacityMask>
</Border>
<StackPanel Grid.ColumnSpan="3" Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Height="Auto" Margin="5,10,0,0" HorizontalAlignment="Right">
<Button x:Name="btnClose" Content="Schließen" Margin="0,0,3,0" Command="ApplicationCommands.Close" Height="25" />
</StackPanel>
</Grid>
</GroupBox>
</Grid>
</localView:BeWoView>

View File

@@ -1,43 +1,43 @@
using System.Collections.Generic;
using System.Windows;
using System.Windows.Controls;
using BS.Shared.DataContracts;
using DevExpress.Xpf.Core;
namespace BeWo.View.Detail
{
public partial class ServiceRecordHistoryView
{
public ServiceRecordHistoryView()
{
InitializeComponent();
}
public void InitView(List<ServiceRecordHistoryDC> historyList)
{
AenderungsdatumColumn.Visible = !BeWoApp.AppSettings.HideServiceRecordInsertedByAndInsertedOn;
InitializeComponent();
datagrid_ServiceRecordHistory.ItemsSource = historyList;
GridView.BestFitColumns();
Focus();
if (!BeWoApp.AppSettings.IsEndDateVisible && !BeWoApp.AppSettings.IsOnlyYearMonthVisible)
{
RoundedDHeader.Header = "Minuten";
DurationInSTDHeader.Visible = false;
}
}
}
public class RowDetailContainerControl : ContentControl
{
public RowDetailContainerControl()
{
this.SetDefaultStyleKey(typeof(RowDetailContainerControl));
}
}
using System.Collections.Generic;
using System.Windows;
using System.Windows.Controls;
using BS.Shared.DataContracts;
using DevExpress.Xpf.Core;
namespace BeWo.View.Detail.Zeiterfassung
{
public partial class ServiceRecordHistoryView
{
public ServiceRecordHistoryView()
{
InitializeComponent();
}
public void InitView(List<ServiceRecordHistoryDC> historyList)
{
AenderungsdatumColumn.Visible = !BeWoApp.AppSettings.HideServiceRecordInsertedByAndInsertedOn;
InitializeComponent();
datagrid_ServiceRecordHistory.ItemsSource = historyList;
GridView.BestFitColumns();
Focus();
if (!BeWoApp.AppSettings.IsEndDateVisible && !BeWoApp.AppSettings.IsOnlyYearMonthVisible)
{
RoundedDHeader.Header = "Minuten";
DurationInSTDHeader.Visible = false;
}
}
}
public class RowDetailContainerControl : ContentControl
{
public RowDetailContainerControl()
{
this.SetDefaultStyleKey(typeof(RowDetailContainerControl));
}
}
}

View File

@@ -1,4 +1,4 @@
<Window x:Class="BeWo.View.Detail.ServiceRecordRTFWindowView"
<Window x:Class="BeWo.View.Detail.Zeiterfassung.ServiceRecordRTFWindowView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

View File

@@ -10,7 +10,7 @@ using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
namespace BeWo.View.Detail
namespace BeWo.View.Detail.Zeiterfassung
{
public partial class ServiceRecordRTFWindowView
{

View File

@@ -1,50 +1,50 @@
<view:BeWoView x:Class="BeWo.View.Detail.ServiceRecordRebookingView"
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.View.Controls"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:validation="clr-namespace:BeWo.Validation"
Height="Auto" Width="Auto">
<GroupBox Name="root" Header="Einträge umbuchen" Style="{StaticResource ObjectEditGroupBox}">
<Grid VerticalAlignment="Stretch">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid Grid.Column="0" Grid.Row="0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Row="0" Content="Neuer Hilfeplan" />
<controls:SingleSupportConceptSelectionControl x:Name="supportConceptSelectionControl" Grid.Row="1"
ItemSelected="supportConceptSelectionControl_ItemSelected" Height="62" VerticalAlignment="Top"
HorizontalContentAlignment="Stretch" Width="250" />
</Grid>
<Grid Grid.Column="1" Grid.Row="0" VerticalAlignment="Center" Margin="0,25,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Von" />
<dxe:DateEdit Grid.Column="1" Grid.Row="0" x:Name="datepicker_StartDate" Height="23" Margin="3,0,3,3" MaskType="DateTimeAdvancingCaret" Width="150"
EditValue="{validation:ValidationBinding Path=StartDatum}"/>
<Label Grid.Column="0" Grid.Row="1" Content="Bis" />
<dxe:DateEdit Grid.Column="1" Grid.Row="1" x:Name="datepicker_EndDate" Height="23" Margin="3,0,3,3" MaskType="DateTimeAdvancingCaret" Width="150"
EditValue="{validation:ValidationBinding Path=EndDatum}"/>
</Grid>
</Grid>
</Grid>
</GroupBox>
</view:BeWoView>
<view:BeWoView x:Class="BeWo.View.Detail.Zeiterfassung.ServiceRecordRebookingView"
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.View.Controls"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:validation="clr-namespace:BeWo.Validation"
Height="Auto" Width="Auto">
<GroupBox Name="root" Header="Einträge umbuchen" Style="{StaticResource ObjectEditGroupBox}">
<Grid VerticalAlignment="Stretch">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid Grid.Column="0" Grid.Row="0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Row="0" Content="Neuer Hilfeplan" />
<controls:SingleSupportConceptSelectionControl x:Name="supportConceptSelectionControl" Grid.Row="1"
ItemSelected="supportConceptSelectionControl_ItemSelected" Height="62" VerticalAlignment="Top"
HorizontalContentAlignment="Stretch" Width="250" />
</Grid>
<Grid Grid.Column="1" Grid.Row="0" VerticalAlignment="Center" Margin="0,25,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Von" />
<dxe:DateEdit Grid.Column="1" Grid.Row="0" x:Name="datepicker_StartDate" Height="23" Margin="3,0,3,3" MaskType="DateTimeAdvancingCaret" Width="150"
EditValue="{validation:ValidationBinding Path=StartDatum}"/>
<Label Grid.Column="0" Grid.Row="1" Content="Bis" />
<dxe:DateEdit Grid.Column="1" Grid.Row="1" x:Name="datepicker_EndDate" Height="23" Margin="3,0,3,3" MaskType="DateTimeAdvancingCaret" Width="150"
EditValue="{validation:ValidationBinding Path=EndDatum}"/>
</Grid>
</Grid>
</Grid>
</GroupBox>
</view:BeWoView>

View File

@@ -1,75 +1,75 @@
using System;
using System.Collections.Generic;
using BeWo.ServiceProxy;
using BeWo.Validation;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
namespace BeWo.View.Detail
{
public partial class ServiceRecordRebookingView
{
[ValidationAttribute(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
public DateTime StartDatum { get; set; }
[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
public DateTime EndDatum { get; set; }
public CompactSupportConceptDC Zielhilfeplan { get; set; }
public SupportConceptCostBearerRelDC ZielhilfeplanKostentraegerRelDC { get; set; }
public SupportConceptCostBearerRelDC SupportConceptCostBearerRelDC { get; set; }
public ServiceRecordRebookingView(SupportConceptCostBearerRelDC supportConceptCostBearerRelDC)
{
InitializeComponent();
StartDatum = DateTime.Now;
EndDatum = DateTime.Now.AddDays(1);
SupportConceptCostBearerRelDC = supportConceptCostBearerRelDC;
DataContext = this;
}
public void SetSearchText(String text)
{
supportConceptSelectionControl.SearchText = text;
}
private void supportConceptSelectionControl_ItemSelected(object sender, EventArgs<FlatSupportConceptTreeNodeDC> e)
{
Zielhilfeplan = e.Data.SupportConceptTreeNodeDC.SupportConcept;
ZielhilfeplanKostentraegerRelDC = e.Data.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC;
}
public void Save(Action<List<ServiceRecordDC>> pCallBack)
{
var x = new DateTimeSpan
{
StartDate = StartDatum,
StartHours = 0,
StartMinutes = 0,
EndDate = EndDatum,
EndHours = 23,
EndMinutes = 59
};
ServiceFacade.DoOperationsServiceAsync(s => s.FindServiceRecordsInSpan(SupportConceptCostBearerRelDC.CostBearer2SupportConceptOid.Value, x),
records2Rebook =>
{
foreach (var record in records2Rebook)
{
record.SupportConcept = Zielhilfeplan;
record.CostBearer = ZielhilfeplanKostentraegerRelDC.CostBearer;
record.CostBearer2SupportConceptOid = ZielhilfeplanKostentraegerRelDC.CostBearer2SupportConceptOid;
record.Customer = Zielhilfeplan.Customer;
}
pCallBack(records2Rebook);
});
}
}
}
using System;
using System.Collections.Generic;
using BeWo.ServiceProxy;
using BeWo.Validation;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
namespace BeWo.View.Detail.Zeiterfassung
{
public partial class ServiceRecordRebookingView
{
[ValidationAttribute(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
public DateTime StartDatum { get; set; }
[Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
public DateTime EndDatum { get; set; }
public CompactSupportConceptDC Zielhilfeplan { get; set; }
public SupportConceptCostBearerRelDC ZielhilfeplanKostentraegerRelDC { get; set; }
public SupportConceptCostBearerRelDC SupportConceptCostBearerRelDC { get; set; }
public ServiceRecordRebookingView(SupportConceptCostBearerRelDC supportConceptCostBearerRelDC)
{
InitializeComponent();
StartDatum = DateTime.Now;
EndDatum = DateTime.Now.AddDays(1);
SupportConceptCostBearerRelDC = supportConceptCostBearerRelDC;
DataContext = this;
}
public void SetSearchText(String text)
{
supportConceptSelectionControl.SearchText = text;
}
private void supportConceptSelectionControl_ItemSelected(object sender, EventArgs<FlatSupportConceptTreeNodeDC> e)
{
Zielhilfeplan = e.Data.SupportConceptTreeNodeDC.SupportConcept;
ZielhilfeplanKostentraegerRelDC = e.Data.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC;
}
public void Save(Action<List<ServiceRecordDC>> pCallBack)
{
var x = new DateTimeSpan
{
StartDate = StartDatum,
StartHours = 0,
StartMinutes = 0,
EndDate = EndDatum,
EndHours = 23,
EndMinutes = 59
};
ServiceFacade.DoOperationsServiceAsync(s => s.FindServiceRecordsInSpan(SupportConceptCostBearerRelDC.CostBearer2SupportConceptOid.Value, x),
records2Rebook =>
{
foreach (var record in records2Rebook)
{
record.SupportConcept = Zielhilfeplan;
record.CostBearer = ZielhilfeplanKostentraegerRelDC.CostBearer;
record.CostBearer2SupportConceptOid = ZielhilfeplanKostentraegerRelDC.CostBearer2SupportConceptOid;
record.Customer = Zielhilfeplan.Customer;
}
pCallBack(records2Rebook);
});
}
}
}

View File

@@ -6,10 +6,22 @@
xmlns:dxa="http://schemas.devexpress.com/winfx/2008/xaml/accordion"
xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core" xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid" xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol" xmlns:controls="clr-namespace:BeWo.View.Controls"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
xmlns:controls="clr-namespace:BeWo.View.Controls"
Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
<localView:BeWoView.Resources>
<Style TargetType="dxg:RowControl">
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="AliceBlue" />
<Setter Property="Foreground" Value="Black" />
</Trigger>
</Style.Triggers>
</Style>
<ContextMenu x:Name="contextMenu" x:Key="cm" MenuItem.Click="ContextMenu_Click" Opened="ContextMenu_Opened">
<MenuItem Header="Neu" >
<MenuItem.Icon>
@@ -78,67 +90,86 @@
<TextBox Text="Dokumente" Margin="10,0,0,0" Background="{x:Null}" Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="22" BorderBrush="{x:Null}" VerticalAlignment="Stretch" Padding="0,0,0,0" BorderThickness="0,0,0,0" />
</StackPanel>
</GroupBox.Header>
<TabControl>
<TabItem>
<TabItem.Header>
<TextBlock Text="{markup:Translate Alle Dokumente}" TextElement.FontSize="16" TextElement.Foreground="{StaticResource TabItemHotTextBrush}" TextElement.FontFamily="Microsoft Sans Serif" Padding="3"></TextBlock>
</TabItem.Header>
<Grid Margin="0,3,0,0" Grid.Row="0" Background="{StaticResource ObjectEditBackgroundBrush}">
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<Grid Background="{StaticResource ObjectEditBackgroundBrush}">
<dxlc:LayoutControl Orientation="Horizontal">
<dxlc:LayoutGroup dxlc:LayoutControl.AllowHorizontalSizing="True" Width="300">
<Grid Margin="0,0,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0" Margin="2 0 5 0" HorizontalAlignment="Stretch">
<Label Margin="-5 0 0 0" Content="Suchen:"/>
<TextBox x:Name="textbox_searchForFileName" Margin="0 0 0 5" KeyDown="TextBox_KeyDown"></TextBox>
</StackPanel>
<Label Content="Suche" Margin="0,0,0,0" />
<TextBox Height="20" Grid.Column="1" x:Name="textbox_searchForFileName" Margin="3,2,0,5" HorizontalContentAlignment="Stretch" TabIndex="0" Template="{DynamicResource SearchTextBoxTemplate}" BorderThickness="0,0,0,0" KeyDown="TextBox_KeyDown"/>
<dxg:TreeListControl Grid.Row="1" x:Name="documents_treeview_control" Margin="0 2 5 0" DefaultSorting="Name" VerticalAlignment="Stretch" dx:ThemeManager.ThemeName="Office2010Black">
<dxg:TreeListControl.Columns>
<dxg:TreeListColumn FieldName="Name" AllowSorting="True"/>
</dxg:TreeListControl.Columns>
<dxg:TreeListControl.View>
<dxg:TreeListView x:Name="DocumentsTreeView" PreviewMouseLeftButtonDown="DocumentsTreeView_PreviewMouseLeftButtonDown" ShowColumnHeaders="False" ShowIndicator="False" ShowHorizontalLines="False" ShowVerticalLines="False"
<dxg:TreeListControl Grid.Row="1" Grid.ColumnSpan="2" x:Name="documents_treeview_control" Margin="0 0 0 0" VerticalAlignment="Stretch" dx:ThemeManager.ThemeName="Office2010Black">
<dxg:TreeListControl.Columns>
<dxg:TreeListColumn FieldName="Name" AllowSorting="False" Width="300">
<!--<dxg:TreeListColumn.CellStyle>
<Style TargetType="dxg:LightweightCellEditor" BasedOn="{StaticResource {dxgt:GridRowThemeKey ResourceKey=LightweightCellStyle}}">
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#B1D6F0" />
</Trigger>
</Style.Triggers>
<Setter Property="ToolTipService.ToolTip" Value="{Binding Path=RowData.Row.Text}" />
</Style>
</dxg:TreeListColumn.CellStyle>-->
</dxg:TreeListColumn>
</dxg:TreeListControl.Columns>
<dxg:TreeListControl.View>
<dxg:TreeListView x:Name="DocumentsTreeView" PreviewMouseLeftButtonDown="DocumentsTreeView_PreviewMouseLeftButtonDown" ShowColumnHeaders="False" ShowIndicator="False" ShowHorizontalLines="False" ShowVerticalLines="False"
FocusedRowChanged="DocumentsTreeView_FocusedRowChanged" LostFocus="DocumentsTreeView_LostFocus"
NodeExpanding="treeListView_NodeExpanding" AllowEditing="False" ShowNodeImages="True" PrintNodeImages="True"
KeyFieldName="{Binding DocumentTreeItemVM.DocTreeItemOid}" ParentFieldName="Binding DocumentTreeItemVM.ParentOid" ContextMenu="{StaticResource cm}">
</dxg:TreeListView>
</dxg:TreeListControl.View>
</dxg:TreeListControl>
NodeExpanding="treeListView_NodeExpanding" AllowEditing="False" ShowNodeImages="True" PrintNodeImages="True" AutoWidth="True"
KeyFieldName="{Binding DocumentTreeItemVM.DocTreeItemOid}" ParentFieldName="Binding DocumentTreeItemVM.ParentOid" ContextMenu="{StaticResource cm}" VerticalScrollbarVisibility="Auto" HorizontalScrollbarVisibility="Auto">
<!--<dxg:TreeListView.RowStyle>
<Style BasedOn="{StaticResource {dxgt:GridRowThemeKey ResourceKey=RowStyle}}" TargetType="dxg:rows">
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#B1D6F0"/>
</Trigger>
</Style.Triggers>
</Style>
</dxg:TreeListView.RowStyle>-->
</dxg:TreeListView>
</dxg:TreeListControl.View>
</dxg:TreeListControl>
</Grid>
</dxlc:LayoutGroup>
<dxlc:LayoutGroup dxlc:LayoutControl.AllowHorizontalSizing="True">
<Grid Grid.Column="1" Grid.Row="0" Grid.RowSpan="2">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<GroupBox Grid.ColumnSpan="2" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="Neue Datei hochladen">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<GroupBox x:Name="GroupBoxDokumentenListe" Grid.ColumnSpan="2" Padding="5" Style="{StaticResource ObjectEditGroupBox}" Header="">
<Button Name="button_uploadDocument" Click="button_OpenUploadDocument_Click" Grid.Column="0" Grid.Row="0">Datei hochladen</Button>
<controls:PopupNonTopmost Grid.Row="0" Topmost="False" x:Name="popup_UploadFiles" Width="350" StaysOpen="True" Placement="MousePoint">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Button Name="button_uploadDocument" Click="button_OpenUploadDocument_Click" Grid.Column="0" Grid.Row="0">Datei hochladen</Button>
<controls:PopupNonTopmost Grid.Row="0" Topmost="False" x:Name="popup_UploadFiles" Width="350" StaysOpen="True" Placement="MousePoint">
<Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
<GroupBox x:Name="groupbox_uploadDocument" Header="Dokument hochladen" Style="{StaticResource ObjectEditGroupBox}">
<Grid>
@@ -172,11 +203,11 @@
<!--<Label Grid.Column="1" Margin="25 1 0 0" FontSize="13">Beschreibung</Label>
<TextBox Name="textbox_fileNotice" Margin="3" Height="23" Grid.Column="2" Grid.Row="0" />-->
<ProgressBar Height="20" Margin="2" Name="progressbar_upload" Grid.Row="1" Grid.ColumnSpan="3" Minimum="0" Maximum="1" />
<Label HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="2" Grid.ColumnSpan="3" Name="text_progress" />
</Grid>
<ProgressBar Height="20" Margin="2" Name="progressbar_upload" Grid.Row="1" Grid.ColumnSpan="3" Minimum="0" Maximum="1" />
<Label HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="2" Grid.ColumnSpan="3" Name="text_progress" />
</Grid>
<!--<Grid>
<Grid.ColumnDefinitions>
@@ -240,7 +271,19 @@
</dxg:GridControl.View>
</dxg:GridControl>
</Grid>
</Grid>
</dxlc:LayoutGroup>
</dxlc:LayoutControl>
<TabControl Visibility="Collapsed">
<TabItem>
<TabItem.Header>
<TextBlock Text="{markup:Translate Alle Dokumente}" TextElement.FontSize="16" TextElement.Foreground="{StaticResource TabItemHotTextBrush}" TextElement.FontFamily="Microsoft Sans Serif" Padding="3"></TextBlock>
</TabItem.Header>
<!-- Hier kommt das Dokumentenzeug hin wenn Templates wieder angeschaltet werden/-->
</TabItem>
@@ -369,6 +412,7 @@
</Grid>
</TabItem>
</TabControl>
</Grid>
</GroupBox>
</uc:ShadowChrome>

View File

@@ -54,7 +54,7 @@ namespace BeWo.View.Master
{
InitializeComponent();
InitDocumentMenuItems();
InitTemplateMenuItems();
//InitTemplateMenuItems();
progressbar_upload.Visibility = Visibility.Collapsed;
text_progress.Visibility = Visibility.Collapsed;
@@ -64,122 +64,163 @@ namespace BeWo.View.Master
{
documents_treeview_control.BeginDataUpdate();
Dictionary<string, string> firstLevel = GetFirstLevelDictionaryForDocuments();
string[] iconNames = new string[] { "IDBadgeDisabled", "UserHomeMaleDisabled", "OfficeBulidingBlackDisabled", "AnonymousUserDisabled",
"UserBusinessMaleDisabled", "UserGroupBusinessDisabled", "UserBusinessMaleDisabled", "UserGroupBusinessDisabled" };
TableID[] tables = new TableID[] {TableID.SupportConcept, TableID.Customer, TableID.Organisation, TableID.Person, TableID.Employee,
TableID.Team, TableID.ApplicationUser, TableID.UserGroup};
var firstLevel = GetFirstLevelDictionaryForDocuments();
int counter = 1;
foreach (var pair in firstLevel)
foreach (var docNodeConfig in firstLevel)
{
TreeListNode node = new TreeListNode();
DocumentTreeItemDC dc = new DocumentTreeItemDC()
bool hatViewRight = false;
if (BeWoApp.LoggedOnUser.HasRight(docNodeConfig.DocumentRightNeeded))
{
DocTreeItemOid = counter,
ParentOid = null,
Name = pair.Value,
Table = tables[counter - 1]
};
DocumentTreeItemVM vm = new DocumentTreeItemVM(dc);
node.Content = vm;
DocumentsTreeView.Nodes.Add(node);
node.IsExpandButtonVisible = DefaultBoolean.True;
node.Tag = false;
node.Image = LoadImage(iconNames[counter - 1]);
foreach(var r in docNodeConfig.ListOfViewRightsNeeded)
{
if (BeWoApp.LoggedOnUser.HasRight(r))
{
hatViewRight = true;
}
}
}
if (hatViewRight)
{
TreeListNode node = new TreeListNode();
DocumentTreeItemDC dc = new DocumentTreeItemDC()
{
DocTreeItemOid = counter,
ParentOid = null,
Name = docNodeConfig.Title,
Table = docNodeConfig.TableID
};
DocumentTreeItemVM vm = new DocumentTreeItemVM(dc);
node.Content = vm;
node.Tag = docNodeConfig;
DocumentsTreeView.Nodes.Add(node);
node.IsExpandButtonVisible = DefaultBoolean.True;
node.Image = LoadImage(docNodeConfig.IconName);
}
counter++;
}
documents_treeview_control.EndDataUpdate();
}
private Dictionary<string, string> GetFirstLevelDictionaryForDocuments()
private IList<DocumentRootNodeConfig> GetFirstLevelDictionaryForDocuments()
{
Dictionary<string, string> firstLevel = new Dictionary<string, string>();
firstLevel.Add("supportConcepts", "Hilfepläne");
firstLevel.Add("customers", "Klienten");
firstLevel.Add("organisations", "Organisationen");
firstLevel.Add("people", "Personen");
firstLevel.Add("employee", "Mitarbeiter");
firstLevel.Add("teams", "Teams");
firstLevel.Add("users", "Benutzer");
firstLevel.Add("usergroups", "Benutzergruppen");
return firstLevel;
var list = new List<DocumentRootNodeConfig>();
list.Add(new DocumentRootNodeConfig { TableID = TableID.FinanzDokumente, Title = Translator.Translate("DocumentViewFinanzen", "Finanzen"), IconName = "CoinsDisabled", DocumentRightNeeded = UserRightType.DokumenteFinanzen, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.AccountingTransactionView_View } });
list.Add(new DocumentRootNodeConfig { TableID = TableID.SupportConcept, Title = Translator.Translate("DocumentViewSupportConcept", "Hilfepläne"), IconName = "IDBadgeDisabled", DocumentRightNeeded = UserRightType.DokumenteHilfeplaene, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.SupportConceptView_View, UserRightType.SupportConcept_ViewMyTeams, UserRightType.SupportConcept_ViewAllSupportConcepts } });
list.Add(new DocumentRootNodeConfig { TableID = TableID.Customer, Title = Translator.Translate("DocumentViewCustomer", "Klienten"), IconName = "UserHomeMaleDisabled", DocumentRightNeeded = UserRightType.DokumenteKlienten, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.CustomerView_View, UserRightType.Customer_ViewMyCustomers, UserRightType.Customer_ViewMyTeams } });
list.Add(new DocumentRootNodeConfig { TableID = TableID.Organisation, Title = Translator.Translate("DocumentViewOrganisation", "Organisationen"), IconName = "OfficeBulidingBlackDisabled", DocumentRightNeeded = UserRightType.DokumenteOrganisationen, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.OrganisationView_View } });
list.Add(new DocumentRootNodeConfig { TableID = TableID.Person, Title = Translator.Translate("DocumentViewPerson", "Personen"), IconName = "AnonymousUserDisabled", DocumentRightNeeded = UserRightType.DokumentePersonen, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.PersonView_View, UserRightType.Person_FamilyView } });
list.Add(new DocumentRootNodeConfig { TableID = TableID.Employee, Title = Translator.Translate("DocumentViewEmployee", "Mitarbeiter"), IconName = "UserBusinessMaleDisabled", DocumentRightNeeded = UserRightType.DokumenteMitarbeiter, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.EmployeeView_View, UserRightType.Employee_AllowViewOwnEmployees, UserRightType.Employee_AllowViewOwnTeam } });
list.Add(new DocumentRootNodeConfig { TableID = TableID.Team, Title = Translator.Translate("DocumentViewTeam", "Teams"), IconName = "UserGroupBusinessDisabled", DocumentRightNeeded = UserRightType.DokumenteTeams, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.TeamView_ViewAll, UserRightType.TeamView_ViewMyTeams, UserRightType.SupportConcept_ViewAllSupportConcepts } });
list.Add(new DocumentRootNodeConfig { TableID = TableID.ApplicationUser, Title = Translator.Translate("DocumentViewUser", "Benutzer"), IconName = "UserBusinessMaleDisabled", DocumentRightNeeded = UserRightType.UserView_View, ListOfViewRightsNeeded = new List<UserRightType> { UserRightType.UserView_View } });
//firstLevel.Add("usergroups", "Benutzergruppen");
return list;
}
private void treeListView_NodeExpanding(object sender, TreeListNodeAllowEventArgs e)
{
TreeListNode node = e.Node;
var vm = node.Content as DocumentTreeItemVM;
if (vm.ParentOid == null)
try
{
switch (vm.Name)
Mouse.OverrideCursor = System.Windows.Input.Cursors.Wait;
TreeListNode node = e.Node;
var dcNodeConfig = node.Tag as DocumentRootNodeConfig;
//var vm = node.Content as DocumentTreeItemVM;
if (dcNodeConfig != null)
{
case "Hilfepläne": SupportConcepts_Expended(node); break;
case "Klienten": Customers_Expended(node); break;
case "Organisationen": Organisations_Expended(node); break;
case "Personen": People_Expended(node); break;
case "Mitarbeiter": Employee_Expended(node); break;
case "Teams": Teams_Expended(node); break;
case "Benutzer": Users_Expended(node); break;
case "Benutzergruppen": UserGroups_Expended(node); break;
switch (dcNodeConfig.TableID)
{
case TableID.FinanzDokumente: SubNode_Expended(node); break;
case TableID.SupportConcept: SupportConcepts_Expended(node); break;
case TableID.Customer: Customers_Expended(node); break;
case TableID.Organisation: Organisations_Expended(node); break;
case TableID.Person: People_Expended(node); break;
case TableID.Employee: Employee_Expended(node); break;
case TableID.Team: Teams_Expended(node); break;
case TableID.ApplicationUser: Users_Expended(node); break;
case TableID.UserGroup: UserGroups_Expended(node); break;
}
}
else
{
SubNode_Expended(node);
}
}
else
finally
{
SubNode_Expended(node);
Mouse.OverrideCursor = null;
}
}
private void SubNode_Expended(TreeListNode node)
{
var parentNode = node.ParentNode;
var parentContent = parentNode.Content as DocumentTreeItemVM;
var childContent = node.Content as DocumentTreeItemVM;
List<BeWoFolderDC> folderDCs = new List<BeWoFolderDC>();
if (parentContent.DocTreeItemOid == 1 && parentContent.Name.Equals("Hilfepläne"))
var config = node.Tag as DocumentRootNodeConfig;
if (config != null && config.TableID == TableID.FinanzDokumente)
{
//SupportConcept
folderDCs = VMFactory.CreateFolderList(TableID.SupportConcept, (long)childContent.DocTreeItemOid);
folderDCs = VMFactory.CreateFolderList(TableID.FinanzDokumente, 0);
}
else if (parentContent.DocTreeItemOid == 2 && parentContent.Name.Equals("Klienten"))
else
{
//Customer
folderDCs = VMFactory.CreateFolderList(TableID.Customer, (long)childContent.DocTreeItemOid);
}
else if (parentContent.DocTreeItemOid == 3 && parentContent.Name.Equals("Organisationen"))
{
//Organisation
folderDCs = VMFactory.CreateFolderList(TableID.Organisation, (long)childContent.DocTreeItemOid);
}
else if (parentContent.DocTreeItemOid == 4 && parentContent.Name.Equals("Personen"))
{
//Person
folderDCs = VMFactory.CreateFolderList(TableID.Person, (long)childContent.DocTreeItemOid);
}
else if (parentContent.DocTreeItemOid == 5 && parentContent.Name.Equals("Mitarbeiter"))
{
//Employee
folderDCs = VMFactory.CreateFolderList(TableID.Employee, (long)childContent.DocTreeItemOid);
}
else if (parentContent.DocTreeItemOid == 6 && parentContent.Name.Equals("Teams"))
{
//Team
folderDCs = VMFactory.CreateFolderList(TableID.Team, (long)childContent.DocTreeItemOid);
}
else if (parentContent.DocTreeItemOid == 7 && parentContent.Name.Equals("Benutzer"))
{
//User
folderDCs = VMFactory.CreateFolderList(TableID.ApplicationUser, (long)childContent.DocTreeItemOid);
}
else if (parentContent.DocTreeItemOid == 8 && parentContent.Name.Equals("Benutzergruppen"))
{
//UserGroup
folderDCs = VMFactory.CreateFolderList(TableID.UserGroup, (long)childContent.DocTreeItemOid);
var treeItemVm = node.Content as DocumentTreeItemVM;
var parentNode = node.ParentNode;
var parentContent = parentNode.Content as DocumentTreeItemVM;
var parentConfig = parentNode.Tag as DocumentRootNodeConfig;
if (parentConfig != null && parentConfig.TableID == TableID.SupportConcept)
{
//SupportConcept
folderDCs = VMFactory.CreateFolderList(TableID.SupportConcept, (long)treeItemVm.DocTreeItemOid);
}
else if (parentConfig != null && parentConfig.TableID == TableID.Customer)
{
//Customer
folderDCs = VMFactory.CreateFolderList(TableID.Customer, (long)treeItemVm.DocTreeItemOid);
}
else if (parentConfig != null && parentConfig.TableID == TableID.Organisation)
{
//Organisation
folderDCs = VMFactory.CreateFolderList(TableID.Organisation, (long)treeItemVm.DocTreeItemOid);
}
else if (parentConfig != null && parentConfig.TableID == TableID.Person)
{
//Person
folderDCs = VMFactory.CreateFolderList(TableID.Person, (long)treeItemVm.DocTreeItemOid);
}
else if (parentConfig != null && parentConfig.TableID == TableID.Employee)
{
//Employee
folderDCs = VMFactory.CreateFolderList(TableID.Employee, (long)treeItemVm.DocTreeItemOid);
}
else if (parentConfig != null && parentConfig.TableID == TableID.Team)
{
//Team
folderDCs = VMFactory.CreateFolderList(TableID.Team, (long)treeItemVm.DocTreeItemOid);
}
else if (parentConfig != null && parentConfig.TableID == TableID.ApplicationUser)
{
//User
folderDCs = VMFactory.CreateFolderList(TableID.ApplicationUser, (long)treeItemVm.DocTreeItemOid);
}
else if (parentConfig != null && parentConfig.TableID == TableID.UserGroup)
{
//UserGroup
folderDCs = VMFactory.CreateFolderList(TableID.UserGroup, (long)treeItemVm.DocTreeItemOid);
}
}
GenerateFolderStructureForSelectedNode(node, folderDCs);
}
@@ -238,19 +279,13 @@ namespace BeWo.View.Master
//}
}
private void SupportConcepts_Expended(TreeListNode node)
private void Finanzen_Expended(TreeListNode node)
{
if (node.Nodes.Count == 0)
{
//Alle Hilfepläne in eine Liste holen
var liste = VMFactory.CreateSupportConceptList();
if (liste.Count == 0)
{
MessageBox.Show("Sie verfügen nicht über die Benutzerrechte, die zum Anzeigen der Hilfepläne benötigt werden. " +
"\nWenden Sie sich an den administrierenden Mitarbeiter.", "Information", MessageBoxButton.OK, MessageBoxImage.Information);
return;
}
//Liste durchlaufen und für jedes Elemement ein entsprechendes DocumentTreeItemDC/VM erstellen
List<DocumentTreeItemVM> docTreeItemVMs = new List<DocumentTreeItemVM>();
@@ -284,19 +319,54 @@ namespace BeWo.View.Master
}
}
}
private void SupportConcepts_Expended(TreeListNode node)
{
if (node.Nodes.Count == 0)
{
//Alle Hilfepläne in eine Liste holen
var liste = ServiceFacade.DoCustomerServiceSync(s => s.GetAllAuthorizedCompactSupportConcepts());
//Liste durchlaufen und für jedes Elemement ein entsprechendes DocumentTreeItemDC/VM erstellen
List<DocumentTreeItemVM> docTreeItemVMs = new List<DocumentTreeItemVM>();
var parentNode = node.Content as DocumentTreeItemVM;
foreach (var item in liste)
{
//string span = CustomizeDates(item.StartDate, item.EndDate);
DocumentTreeItemDC dc = new DocumentTreeItemDC()
{
DocTreeItemOid = item.SupportConceptOid,
ParentOid = parentNode.DocTreeItemOid,
Name = String.Format("{0} | {1}", item.CustomerName, item.FirstCostBearerDetailString),
Table = TableID.SupportConcept,
ObjectOid = item.SupportConceptOid
};
DocumentTreeItemVM vm = new DocumentTreeItemVM(dc);
docTreeItemVMs.Add(vm);
}
//VMs als neue Subnodes an DocumentsTreeView.Nodes hängen
foreach (var item in docTreeItemVMs)
{
TreeListNode newNode = new TreeListNode()
{
Content = item,
IsExpandButtonVisible = DefaultBoolean.True,
Tag = false,
Image = LoadImage("IDBadgeDisabled")
};
node.Nodes.Add(newNode);
}
}
}
private void Customers_Expended(TreeListNode node)
{
if (node.Nodes.Count == 0)
{
//Alle Klienten in eine Liste holen
var liste = VMFactory.CreateCustomerList();
if (liste.Count == 0)
{
MessageBox.Show("Sie verfügen nicht über die Benutzerrechte, die zum Anzeigen der Klienten benötigt werden. " +
"\nWenden Sie sich an den administrierenden Mitarbeiter.", "Information", MessageBoxButton.OK, MessageBoxImage.Information);
return;
}
var liste = ServiceFacade.DoCustomerServiceSync(s => s.GetAllAuthorizedCompactCustomers());
//Liste durchlaufen und für jedes Elemement ein entsprechendes DocumentTreeItemDC/VM erstellen
List<DocumentTreeItemVM> docTreeItemVMs = new List<DocumentTreeItemVM>();
@@ -334,15 +404,9 @@ namespace BeWo.View.Master
if (node.Nodes.Count == 0)
{
//Alle Klienten in eine Liste holen
var liste = VMFactory.CreateOrganisationList();
if (liste.Count == 0)
{
MessageBox.Show("Sie verfügen nicht über die Benutzerrechte, die zum Anzeigen der Organisationen benötigt werden. " +
"\nWenden Sie sich an den administrierenden Mitarbeiter.", "Information", MessageBoxButton.OK, MessageBoxImage.Information);
return;
}
var liste = VMFactory.CreateOrganisationList().OrderBy(o => o.Name).ToList();
//Liste durchlaufen und für jedes Elemement ein entsprechendes DocumentTreeItemDC/VM erstellen
List<DocumentTreeItemVM> docTreeItemVMs = new List<DocumentTreeItemVM>();
var parentNode = node.Content as DocumentTreeItemVM;
@@ -379,7 +443,8 @@ namespace BeWo.View.Master
if (node.Nodes.Count == 0)
{
//Alle Klienten in eine Liste holen
var liste = VMFactory.CreatePeopleList();
//var liste = VMFactory.CreatePeopleList();
var liste = ServiceFacade.DoCustomerServiceSync(s => s.GetAllAuthorizedCompactPersons());
//Liste durchlaufen und für jedes Elemement ein entsprechendes DocumentTreeItemDC/VM erstellen
List<DocumentTreeItemVM> docTreeItemVMs = new List<DocumentTreeItemVM>();
@@ -390,7 +455,7 @@ namespace BeWo.View.Master
{
DocTreeItemOid = item.PersonOid,
ParentOid = parentNode.DocTreeItemOid,
Name = item.FullName,
Name = item.DetailDescription,
Table = TableID.Person,
ObjectOid = item.PersonOid
};
@@ -417,7 +482,7 @@ namespace BeWo.View.Master
if (node.Nodes.Count == 0)
{
//Alle Klienten in eine Liste holen
var liste = VMFactory.CreateEmployeeList();
var liste = ServiceFacade.DoEmployeeServiceSync(s => s.GetAllAuthorizedCompactEmployees());
//Liste durchlaufen und für jedes Elemement ein entsprechendes DocumentTreeItemDC/VM erstellen
List<DocumentTreeItemVM> docTreeItemVMs = new List<DocumentTreeItemVM>();
@@ -455,7 +520,7 @@ namespace BeWo.View.Master
if (node.Nodes.Count == 0)
{
//Alle Hilfepläne in eine Liste holen
var liste = VMFactory.CreateTeamList();
var liste = VMFactory.CreateTeamList().OrderBy(t => t.Name).ToList();
//Liste durchlaufen und für jedes Elemement ein entsprechendes DocumentTreeItemDC/VM erstellen
@@ -635,7 +700,6 @@ namespace BeWo.View.Master
{
TreeListNode node = new TreeListNode();
node.IsExpandButtonVisible = DefaultBoolean.True;
node.Tag = false;
node.Image = LoadFolderImage();
BeWoFolderDC folderDC = new BeWoFolderDC()
@@ -735,6 +799,13 @@ namespace BeWo.View.Master
{
if (DocumentsTreeView.AllowEditing == true)
DocumentsTreeView.AllowEditing = false;
var vm = e.NewRow as DocumentTreeItemVM;
if (vm != null)
{
SetSelectedText(vm);
SetItemSourceForFileGrid(vm);
}
}
private void DocumentsTreeView_LostFocus(object sender, RoutedEventArgs e)
{
@@ -790,6 +861,7 @@ namespace BeWo.View.Master
var selectedTreeViewRow = DocumentsTreeView.SelectedRows[0] as DocumentTreeItemVM;
var selectedFolder = selectedTreeViewRow.DataContract.BeWoFolderDC;
long? bewoFolderOid = selectedFolder.BeWoFolderOid;
TableID tableID = selectedFolder.ObjectTid;
long? objectOid = selectedFolder.ObjectOid;
@@ -866,17 +938,50 @@ namespace BeWo.View.Master
}
private void DocumentsTreeView_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
var source = e.Source as TreeListView;
if (source.SelectedRows.Count == 1)
}
//private void SetSelectedText(TreeListNode node)
//{
// var dti = DocumentsTreeView.GetNodeByContent(node);
//}
private void SetSelectedText(DocumentTreeItemVM selected)
{
GroupBoxDokumentenListe.Header = "";
var node = DocumentsTreeView.GetNodeByContent(selected);
AddPathToSelectedText(selected, node);
//String path = selected.
}
private void AddPathToSelectedText(DocumentTreeItemVM vm, TreeListNode node)
{
if (vm != null && node != null)
{
var selected = source.SelectedRows[0] as DocumentTreeItemVM;
String path = vm.Name;
if (!String.IsNullOrEmpty((String)GroupBoxDokumentenListe.Header))
{
path = String.Format("{0} > {1}", vm.Name, GroupBoxDokumentenListe.Header);
}
GroupBoxDokumentenListe.Header = path;
if (node.ParentNode != null)
{
var parentVm = documents_treeview_control.GetRow(node.ParentNode.RowHandle) as DocumentTreeItemVM;
if (selected == null)
return;
AddPathToSelectedText(parentVm, node.ParentNode);
SetItemSourceForFileGrid(selected);
//DocumentsTreeView.GetRowElementByTreeElement(node.ParentNode);
}
}
}
private void DeleteButton_Click(object sender, RoutedEventArgs e)
{
var row = DocumentsTreeView.SelectedRows[0] as DocumentTreeItemVM;
@@ -1151,7 +1256,6 @@ namespace BeWo.View.Master
node.Content = vm;
TemplateTreeView.Nodes.Add(node);
node.IsExpandButtonVisible = DefaultBoolean.True;
node.Tag = false;
node.Image = LoadImage(iconNames[counter - 1]);
counter++;
}
@@ -1257,7 +1361,6 @@ namespace BeWo.View.Master
{
TreeListNode node = new TreeListNode();
node.IsExpandButtonVisible = DefaultBoolean.True;
node.Tag = false;
node.Image = LoadFolderImage();
BeWoFolderDC folderDC = new BeWoFolderDC()
@@ -1407,7 +1510,7 @@ namespace BeWo.View.Master
if (row == null)
return;
if (MessageBox.Show("ACHTUNG: Das Löschen von Ordnern kann nicht rückgängig gemacht werden!\nWollen Sie den Ordner '" + folder.Name + "' mit allen" +
" sich in diesem befindlichen Dateien und Ordnern wirklich löschen?", "Löschen bestätigen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
" enthaltenen Dateien und Unterordnern wirklich löschen?", "Löschen bestätigen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
return;
TemplateExecuteDelete(folder);
@@ -1852,7 +1955,17 @@ namespace BeWo.View.Master
private void button_OpenUploadDocument_Click(object sender, RoutedEventArgs e)
{
popup_UploadFiles.IsOpen = true;
var item = documents_treeview_control.SelectedItem as DocumentTreeItemVM;
if (item != null && item.DataContract != null && item.DataContract.BeWoFolderDC != null)
{
popup_UploadFiles.IsOpen = true;
}
else
{
MessageBox.Show(Translator.Translate("Bitte wählen Sie einen geeigneten Ordner aus!"), "Fehler", MessageBoxButton.OK, MessageBoxImage.Exclamation);
}
}
private void popupedit_file_PopUpClick_1(object sender, RoutedEventArgs e)
@@ -1878,5 +1991,15 @@ namespace BeWo.View.Master
{
popup_UploadFiles.IsOpen = false;
}
}
internal class DocumentRootNodeConfig
{
public TableID TableID { get; set; }
public String Title { get; set; }
public String IconName { get; set; }
public UserRightType DocumentRightNeeded { get; set; }
public IList<UserRightType> ListOfViewRightsNeeded { get; set; }
}
}

View File

@@ -16,6 +16,7 @@ using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using ChatController.ChatKlassen;
using DevExpress.XtraScheduler;
using BeWo.View.Detail.Zeiterfassung;
namespace BeWo.ownChat
{

View File

@@ -712,6 +712,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Biotop", "ReportImp\Biotop\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AidshilfeEssen", "ReportImp\AidshilfeEssen\AidshilfeEssen.csproj", "{C52AC467-D452-4396-8DB3-D04AC1045CFB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IlkaLinkAmbulanteHilfen", "ReportImp\IlkaLinkAmbulanteHilfen\IlkaLinkAmbulanteHilfen.csproj", "{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MuenchenerAidsHilfeEV", "ReportImp\MuenchenerAidsHilfeEV\MuenchenerAidsHilfeEV.csproj", "{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PerspektivenEV", "ReportImp\PerspektivenEV\PerspektivenEV.csproj", "{443E3556-DDEC-42DE-A97E-FD394579A1B3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -8639,6 +8645,78 @@ Global
{C52AC467-D452-4396-8DB3-D04AC1045CFB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{C52AC467-D452-4396-8DB3-D04AC1045CFB}.Release|x86.ActiveCfg = Release|Any CPU
{C52AC467-D452-4396-8DB3-D04AC1045CFB}.Release|x86.Build.0 = Release|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.Debug|.NET.ActiveCfg = Debug|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.Debug|.NET.Build.0 = Debug|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.Debug|x86.ActiveCfg = Debug|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.Debug|x86.Build.0 = Debug|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.DebugRemote|x86.Build.0 = Debug|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.Release|.NET.ActiveCfg = Release|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.Release|.NET.Build.0 = Release|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.Release|Any CPU.Build.0 = Release|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.Release|x86.ActiveCfg = Release|Any CPU
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4}.Release|x86.Build.0 = Release|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Debug|.NET.ActiveCfg = Debug|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Debug|.NET.Build.0 = Debug|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Debug|x86.ActiveCfg = Debug|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Debug|x86.Build.0 = Debug|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.DebugRemote|x86.Build.0 = Debug|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Release|.NET.ActiveCfg = Release|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Release|.NET.Build.0 = Release|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Release|Any CPU.Build.0 = Release|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Release|x86.ActiveCfg = Release|Any CPU
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4}.Release|x86.Build.0 = Release|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Debug|.NET.ActiveCfg = Debug|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Debug|.NET.Build.0 = Debug|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Debug|x86.ActiveCfg = Debug|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Debug|x86.Build.0 = Debug|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.DebugRemote|.NET.Build.0 = Debug|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.DebugRemote|x86.Build.0 = Debug|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Release|.NET.ActiveCfg = Release|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Release|.NET.Build.0 = Release|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Release|Any CPU.Build.0 = Release|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Release|x86.ActiveCfg = Release|Any CPU
{443E3556-DDEC-42DE-A97E-FD394579A1B3}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -8993,6 +9071,9 @@ Global
{54419AAB-93DB-482F-B304-035D001081DD} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{3B233B57-6F1C-4153-A0E6-C2739A3AEFBD} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{C52AC467-D452-4396-8DB3-D04AC1045CFB} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{AA0D5E5F-9690-4EDA-B1D8-7C883CC63DE4} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{F781BCF9-647F-441E-A3BD-9DC1FDBCA1A4} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{443E3556-DDEC-42DE-A97E-FD394579A1B3} = {D8A691C5-146D-4613-86CC-438F02FE9106}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}

View File

@@ -17,7 +17,7 @@
<AssemblyName>BeWoPlanerMobil</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<MvcBuildViews>false</MvcBuildViews>
<UseIISExpress>false</UseIISExpress>
<UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
@@ -1505,7 +1505,6 @@
<Content Include="node_modules\bootstrap\scss\_variables.scss" />
</ItemGroup>
<ItemGroup>
<Content Include="LICENSE" />
<Content Include="package-lock.json" />
<Content Include="package.json" />
</ItemGroup>
@@ -1555,9 +1554,6 @@
<ItemGroup>
<Content Include="Scripts\jquery-3.6.0.min.map" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\licenses.licx" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -1577,7 +1573,7 @@
<AutoAssignPort>False</AutoAssignPort>
<DevelopmentServerPort>8808</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost/BeWoPlanerMobil</IISUrl>
<IISUrl>http://localhost:8808/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<UseIISExpress>false</UseIISExpress>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>false</Use64BitIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<ProjectView>ShowAllFiles</ProjectView>
<WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>

View File

@@ -161,7 +161,7 @@
</system.Web>
-->
<system.web>
<!--<httpModules>
<!--<httpModules><
<add name="ASPHibernateSession" type="BeWoPlanerMobil.Service.ASPHibernateSessionManager, BeWoPlanerMobil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
</httpModules>-->
<compilation debug="true" defaultLanguage="c#" targetFramework="4.7.2">

View File

@@ -1993,6 +1993,23 @@ namespace BeWo.Data.Access
return c.List<Bargeldkasse>().ToList();
}
public IEnumerable<Arbeitszeit> FindArbeitszeiten(TableID objectTid, long objectOid)
{
var c = CreateCriteriaIsActive<Arbeitszeit>();
if (objectTid == TableID.Employee)
{
c.Add(Restrictions.Eq(Arbeitszeit.PropertyName_EmployeeOid, objectOid));
}
else
{
c.Add(Restrictions.Eq("Customer", DAOFactory.GenericDAO.GetByID<Customer>(objectOid)));
}
return c.List<Arbeitszeit>().ToList();
}
public IList<NotizenKategorie> FindNotizenKategorien(TableID objectTid, long objectOid)
{
var c = CreateCriteriaIsActiveOrArchived<NotizenKategorie>()

View File

@@ -199,8 +199,8 @@
</system.webServer>
<appSettings>
<add key="SendMailOnError" value="false" />
<add key="SmptServer" value="mail.beyondsoft.de" />
<add key="SmtpUser" value="bewoplaner.support@beyondsoft.de" />
<add key="SmptServer" value="mail.ownsoft.de" />
<add key="SmtpUser" value="bewoplaner.support@ownsoft.de" />
<add key="SmtpPassword" value="G57ojFhgZ" />
<add key="Recipient" value="error@bewoplaner.de" />
<add key="SupportEMail" value="support@bewoplaner.de" />

View File

@@ -1,9 +1,5 @@
ALTER TABLE `wohnheim`
ADD COLUMN `PflichtbesetzungStart` VARCHAR(45) NULL DEFAULT NULL AFTER `Bemerkung`,
ADD COLUMN `PflichtbesetzungEnde` VARCHAR(45) NULL DEFAULT NULL AFTER `PflichtbesetzungStart`;
ALTER TABLE `wohnheim`
ADD COLUMN `PflichtbesetzungEinblenden` INT NULL DEFAULT NULL AFTER `PflichtbesetzungEnde`;
ALTER TABLE `wohnheim`
ADD COLUMN `PflichtbesetzungEinblenden` INT NULL DEFAULT NULL AFTER `PflichtbesetzungEnde`,
ADD COLUMN `StandardZeilenanzahl` INT NULL DEFAULT NULL AFTER `PflichtbesetzungEinblenden`;

View File

@@ -964,7 +964,7 @@ namespace BeWo.Report.DefaultReports
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 75F;
this.bottomMarginBand1.HeightF = 50F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// ReportHeader
@@ -1017,11 +1017,11 @@ namespace BeWo.Report.DefaultReports
this.ReportHeader});
this.DataSource = this.bindingSource1;
this.Font = new System.Drawing.Font("Arial", 10F);
this.Margins = new System.Drawing.Printing.Margins(75, 75, 75, 75);
this.Margins = new System.Drawing.Printing.Margins(75, 75, 75, 50);
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.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -1083,7 +1083,6 @@ namespace BeWo.Report.DefaultReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell52;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell53;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell54;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
@@ -1116,5 +1115,6 @@ namespace BeWo.Report.DefaultReports
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
}
}

View File

@@ -44,6 +44,8 @@
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.TopMargin = new DevExpress.XtraReports.UI.TopMarginBand();
this.BottomMargin = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
@@ -51,6 +53,8 @@
// Detail
//
this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel2,
this.xrLabel3,
this.xrLabel10,
this.xrLabel11,
this.xrLabel8,
@@ -63,17 +67,17 @@
this.beguenstigterValueLabel,
this.beguenstigterLabel,
this.xrLabel1});
this.Detail.HeightF = 274.125F;
this.Detail.HeightF = 315.7917F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel10
//
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 152.2917F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 193.9583F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(110.5F, 23F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(120.9167F, 23F);
this.xrLabel10.StylePriority.UsePadding = false;
this.xrLabel10.StylePriority.UseTextAlignment = false;
this.xrLabel10.Text = "Notiz:";
@@ -81,11 +85,11 @@
//
// xrLabel11
//
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(110.5F, 152.2917F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(120.9167F, 193.9583F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(538.5001F, 50.08333F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(528.0833F, 50.08333F);
this.xrLabel11.StylePriority.UsePadding = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "[Notiz]";
@@ -93,10 +97,10 @@
//
// xrLabel8
//
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(110.5F, 129.2917F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(120.9167F, 129.2917F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(538.5001F, 23F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(528.0833F, 23F);
this.xrLabel8.StylePriority.UsePadding = false;
this.xrLabel8.StylePriority.UseTextAlignment = false;
this.xrLabel8.Text = "[Belegdatum!dd.MM.yyyy]";
@@ -115,7 +119,7 @@
//
// xrLabel7
//
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(316.455F, 218.8333F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(316.4551F, 260.4999F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(332.545F, 23F);
@@ -124,13 +128,13 @@
//
// xrLine1
//
this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(306.2917F, 245.8333F);
this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(306.2917F, 287.5F);
this.xrLine1.Name = "xrLine1";
this.xrLine1.SizeF = new System.Drawing.SizeF(342.7084F, 5.291687F);
//
// xrLabel6
//
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(325.4166F, 251.125F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(325.4166F, 292.7917F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(324.5834F, 22.99998F);
@@ -143,7 +147,7 @@
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 106.2917F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(110.5F, 23F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(120.9167F, 22.99999F);
this.xrLabel4.StylePriority.UsePadding = false;
this.xrLabel4.StylePriority.UseTextAlignment = false;
this.xrLabel4.Text = "Betrag:";
@@ -151,10 +155,10 @@
//
// xrLabel5
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(110.5F, 106.2917F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(120.9167F, 106.2917F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(538.5001F, 22.99999F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(528.0833F, 22.99998F);
this.xrLabel5.StylePriority.UsePadding = false;
this.xrLabel5.StylePriority.UseTextAlignment = false;
this.xrLabel5.Text = "[Betrag!c]";
@@ -164,10 +168,10 @@
//
this.beguenstigterValueLabel.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Beguenstigter")});
this.beguenstigterValueLabel.LocationFloat = new DevExpress.Utils.PointFloat(110.5F, 83.29166F);
this.beguenstigterValueLabel.LocationFloat = new DevExpress.Utils.PointFloat(120.9167F, 83.29166F);
this.beguenstigterValueLabel.Name = "beguenstigterValueLabel";
this.beguenstigterValueLabel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.beguenstigterValueLabel.SizeF = new System.Drawing.SizeF(538.5001F, 23F);
this.beguenstigterValueLabel.SizeF = new System.Drawing.SizeF(528.0833F, 23F);
this.beguenstigterValueLabel.StylePriority.UsePadding = false;
this.beguenstigterValueLabel.StylePriority.UseTextAlignment = false;
this.beguenstigterValueLabel.Text = "beguenstigterValueLabel";
@@ -178,7 +182,7 @@
this.beguenstigterLabel.LocationFloat = new DevExpress.Utils.PointFloat(0F, 83.29166F);
this.beguenstigterLabel.Name = "beguenstigterLabel";
this.beguenstigterLabel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.beguenstigterLabel.SizeF = new System.Drawing.SizeF(110.5F, 23F);
this.beguenstigterLabel.SizeF = new System.Drawing.SizeF(120.9167F, 23F);
this.beguenstigterLabel.StylePriority.UsePadding = false;
this.beguenstigterLabel.StylePriority.UseTextAlignment = false;
this.beguenstigterLabel.Text = "Begünstigter:";
@@ -188,7 +192,7 @@
//
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Titel")});
this.xrLabel1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold);
this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -198,16 +202,41 @@
//
// TopMargin
//
this.TopMargin.HeightF = 100F;
this.TopMargin.Name = "TopMargin";
this.TopMargin.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.TopMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// BottomMargin
//
this.BottomMargin.HeightF = 100F;
this.BottomMargin.Name = "BottomMargin";
this.BottomMargin.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.BottomMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel2
//
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 152.2917F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(120.9167F, 23F);
this.xrLabel2.StylePriority.UsePadding = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
this.xrLabel2.Text = "Belegnummer:";
this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel3
//
this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Belegnummer")});
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(120.9167F, 152.2917F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(528.0833F, 23F);
this.xrLabel3.StylePriority.UsePadding = false;
this.xrLabel3.StylePriority.UseTextAlignment = false;
this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.KassenbelegRO);
@@ -219,8 +248,8 @@
this.TopMargin,
this.BottomMargin});
this.DataSource = this.bindingSource1;
this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
this.Version = "13.1";
this.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
@@ -244,5 +273,7 @@
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
}
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
}
}

View File

@@ -53,6 +53,9 @@
this.Auszahlungstextsichtbarkeitsformatierungsregel = new DevExpress.XtraReports.UI.FormattingRule();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -61,35 +64,36 @@
//
// Detail
//
this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.Detail.HeightF = 41.66667F;
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;
//
// xrTable1
//
this.xrTable1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
this.xrTable1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow1});
this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 41.66667F);
this.xrTable1.SizeF = new System.Drawing.SizeF(700F, 25F);
this.xrTable1.StylePriority.UseFont = false;
//
// xrTableRow1
//
this.xrTableRow1.BackColor = System.Drawing.Color.Gainsboro;
this.xrTableRow1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)));
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell9,
this.xrTableCell1,
this.xrTableCell2,
this.xrTableCell11,
this.xrTableCell7,
this.xrTableCell3});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.StylePriority.UseBackColor = false;
this.xrTableRow1.StylePriority.UseBorders = false;
this.xrTableRow1.Weight = 1D;
this.xrTableRow1.Weight = 0.59999992675782143D;
//
// xrTableCell9
//
@@ -97,10 +101,11 @@
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.StylePriority.UseBorders = false;
this.xrTableCell9.StylePriority.UseFont = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "Datum";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell9.Weight = 0.528846153846154D;
this.xrTableCell9.Weight = 0.3692307574932393D;
//
// xrTableCell1
//
@@ -113,7 +118,7 @@
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Einzahlungen";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell1.Weight = 0.58653842632587139D;
this.xrTableCell1.Weight = 0.46153848501352163D;
//
// xrTableCell2
//
@@ -126,7 +131,7 @@
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "Auszahlungen";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell2.Weight = 0.56730772165151744D;
this.xrTableCell2.Weight = 0.46153846740722654D;
//
// xrTableCell7
//
@@ -134,10 +139,11 @@
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.StylePriority.UseBorders = false;
this.xrTableCell7.StylePriority.UseFont = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "Notiz";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell7.Weight = 0.85096157954289342D;
this.xrTableCell7.Weight = 1.0153846007127025D;
//
// xrTableCell3
//
@@ -151,7 +157,7 @@
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.Text = "Saldo";
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell3.Weight = 0.4663461186335639D;
this.xrTableCell3.Weight = 0.46153847327599179D;
//
// TopMargin
//
@@ -159,7 +165,7 @@
this.xrLabel2,
this.xrLabel1,
this.xrLabel3});
this.TopMargin.HeightF = 182.2917F;
this.TopMargin.HeightF = 156.6667F;
this.TopMargin.Name = "TopMargin";
this.TopMargin.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.TopMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -168,10 +174,10 @@
//
this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Anfangsbestand", "{0:c}")});
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(548.9583F, 157.2917F);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(600F, 131.6667F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(101.0384F, 25F);
this.xrLabel2.SizeF = new System.Drawing.SizeF(99.99823F, 25F);
this.xrLabel2.StylePriority.UsePadding = false;
this.xrLabel2.StylePriority.UseTextAlignment = false;
this.xrLabel2.Text = "xrLabel2";
@@ -179,8 +185,8 @@
//
// xrLabel1
//
this.xrLabel1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 52.66666F);
this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 71.41666F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.SizeF = new System.Drawing.SizeF(650F, 47.33333F);
@@ -189,10 +195,10 @@
//
// xrLabel3
//
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(364.5833F, 157.2917F);
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(414.5849F, 131.6667F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(184.375F, 25F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(185.4151F, 25F);
this.xrLabel3.StylePriority.UsePadding = false;
this.xrLabel3.StylePriority.UseTextAlignment = false;
this.xrLabel3.Text = "Anfangsbestand:";
@@ -200,7 +206,7 @@
//
// BottomMargin
//
this.BottomMargin.HeightF = 73.95834F;
this.BottomMargin.HeightF = 74F;
this.BottomMargin.Name = "BottomMargin";
this.BottomMargin.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.BottomMargin.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -208,7 +214,8 @@
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1});
this.Detail1,
this.GroupHeader1});
this.DetailReport.DataMember = "Transaktionen";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
@@ -224,12 +231,11 @@
// xrTable2
//
this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTable2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
this.xrTable2.SizeF = new System.Drawing.SizeF(650F, 25F);
this.xrTable2.SizeF = new System.Drawing.SizeF(700.0001F, 25F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
//
@@ -239,9 +245,12 @@
this.xrTableCell10,
this.xrTableCell4,
this.xrTableCell5,
this.xrTableCell12,
this.xrTableCell8,
this.xrTableCell6});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F);
this.xrTableRow2.StylePriority.UsePadding = false;
this.xrTableRow2.Weight = 1D;
//
// xrTableCell10
@@ -249,12 +258,12 @@
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Transaktionen.Belegdatum", "{0:dd.MM.yyyy}")});
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 3, 2, 100F);
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "xrTableCell10";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell10.Weight = 0.528846189058744D;
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell10.Weight = 0.36923100398137021D;
//
// xrTableCell4
//
@@ -262,20 +271,17 @@
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Transaktionen.Einzahlung", "{0:c}")});
this.xrTableCell4.FormattingRules.Add(this.Einzahlungstextsichtbarkeitsformatierungsregel);
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 3, 2, 100F);
this.xrTableCell4.StylePriority.UsePadding = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "xrTableCell4";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell4.Weight = 0.58653846153846156D;
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell4.Weight = 0.46153841458834133D;
//
// Einzahlungstextsichtbarkeitsformatierungsregel
//
this.Einzahlungstextsichtbarkeitsformatierungsregel.Condition = "[Einzahlung] == 0";
this.Einzahlungstextsichtbarkeitsformatierungsregel.DataMember = "Transaktionen";
//
//
//
this.Einzahlungstextsichtbarkeitsformatierungsregel.Formatting.ForeColor = System.Drawing.Color.Transparent;
this.Einzahlungstextsichtbarkeitsformatierungsregel.Name = "Einzahlungstextsichtbarkeitsformatierungsregel";
//
@@ -285,32 +291,30 @@
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Transaktionen.Auszahlung", "{0:c}")});
this.xrTableCell5.FormattingRules.Add(this.Auszahlungstextsichtbarkeitsformatierungsregel);
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 3, 2, 100F);
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "xrTableCell5";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell5.Weight = 0.56730747516338642D;
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell5.Weight = 0.46153853783240684D;
//
// Auszahlungstextsichtbarkeitsformatierungsregel
//
this.Auszahlungstextsichtbarkeitsformatierungsregel.Condition = "[Auszahlung] == 0";
this.Auszahlungstextsichtbarkeitsformatierungsregel.DataMember = "Transaktionen";
//
//
//
this.Auszahlungstextsichtbarkeitsformatierungsregel.Formatting.ForeColor = System.Drawing.Color.Transparent;
this.Auszahlungstextsichtbarkeitsformatierungsregel.Name = "Auszahlungstextsichtbarkeitsformatierungsregel";
//
// xrTableCell8
//
this.xrTableCell8.Multiline = true;
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 2, 2, 100F);
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 3, 2, 100F);
this.xrTableCell8.StylePriority.UsePadding = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "[Notiz]";
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell8.Weight = 0.8509615091177134D;
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell8.Weight = 1.0153846359252932D;
//
// xrTableCell6
//
@@ -319,13 +323,44 @@
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Transaktionen.Bestand", "{0:c}")});
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 2, 2, 100F);
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 3, 2, 100F);
this.xrTableCell6.StylePriority.UseBorders = false;
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.Text = "xrTableCell6";
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell6.Weight = 0.46634636512169492D;
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell6.Weight = 0.46153843806340167D;
//
// xrTableCell11
//
this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell11.Name = "xrTableCell11";
this.xrTableCell11.StylePriority.UseBorders = false;
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.Text = "Belegnummer";
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell11.Weight = 0.46153844686654888D;
//
// xrTableCell12
//
this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Transaktionen.Belegnummer")});
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 3, 2, 100F);
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.Text = "xrTableCell12";
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell12.Weight = 0.46153848207913922D;
//
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.GroupHeader1.HeightF = 25F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
//
// bindingSource1
//
@@ -339,12 +374,12 @@
this.BottomMargin,
this.DetailReport});
this.DataSource = this.bindingSource1;
this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
this.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.Einzahlungstextsichtbarkeitsformatierungsregel,
this.Auszahlungstextsichtbarkeitsformatierungsregel});
this.Margins = new System.Drawing.Printing.Margins(100, 100, 182, 74);
this.Version = "13.2";
this.Margins = new System.Drawing.Printing.Margins(75, 75, 157, 74);
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -379,5 +414,8 @@
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
}
private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
}
}

View File

@@ -13,15 +13,17 @@ namespace BeWo.Report.ReportObjects
public decimal Betrag { get; set; }
public DateTime Belegdatum { get; set; }
public string Beguenstigter { get; set; }
public string Belegnummer { get; set; }
public string Notiz { get; set; }
public static KassenbelegRO Create(BargeldtransaktionDC transaktion, BeWoEntityBase beguenstigter)
{
var beleg = new KassenbelegRO
{
Titel = string.Format("{0}zahlungsbeleg", (transaktion.Zahlungstyp == Zahlungstyp.Einzahlung ? "Ein" : "Aus")),
Betrag = transaktion.Betrag != null ? transaktion.Betrag.Value : 0m,
Titel = string.Format("{0}zahlungsbeleg", (transaktion.Zahlungstyp == Zahlungstyp.Einzahlung ? "Ein" : "Aus")),
Betrag = transaktion.Betrag != null ? transaktion.Betrag.Value : 0m,
Belegdatum = transaktion.Zahlungsdatum != null ? transaktion.Zahlungsdatum.Value : DateTime.Now,
Belegnummer = transaktion.Belegnummer,
Notiz = transaktion.Notice
};

View File

@@ -41,6 +41,7 @@ namespace BeWo.Report.ReportObjects
Einzahlung = tDC.Zahlungstyp == Zahlungstyp.Einzahlung && tDC.Betrag != null ? tDC.Betrag.Value : 0,
Auszahlung = tDC.Zahlungstyp == Zahlungstyp.Auszahlung && tDC.Betrag != null ? tDC.Betrag.Value : 0,
Belegdatum = tDC.Zahlungsdatum.Value,
Belegnummer = tDC.Belegnummer,
Notiz = tDC.Notice
}).ToList();
@@ -90,6 +91,8 @@ namespace BeWo.Report.ReportObjects
public decimal Auszahlung { get; set; }
public decimal Bestand { get; set; }
public DateTime? Belegdatum { get; set; }
public string Belegnummer { get; set; }
public string Notiz { get; set; }
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@@ -31,20 +31,15 @@ namespace Akgg
public override decimal GetFeiertagsFaktor(DateTime start)
{
if (BerechneFerienTage)
{
if (GetFerienTag(start) != null)
{
return 1;
}
}
//if (BerechneFerienTage)
//{
// if (GetFerienTag(start) != null)
// {
// return 1;
// }
//}
return base.GetFeiertagsFaktor(start);
}
public FerienDC GetFerienTag(DateTime start)
{
return VacationService.GetFerien(start, "Hessen");
}
}
}

View File

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

File diff suppressed because it is too large Load Diff

View File

@@ -5,7 +5,9 @@ using System.IO;
using System.Text.RegularExpressions;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BeWo.Service.ServiceImplementations;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using DevExpress.XtraReports.UI;
namespace Akgg
@@ -24,8 +26,6 @@ namespace Akgg
//StackTrace stackTrace = new StackTrace();
//Debug.WriteLine(stackTrace.GetFrame(1).GetMethod().Name);
bool hatGruppen = false;
//if (pRO == null)
// return;
@@ -38,11 +38,14 @@ namespace Akgg
if (sd.IsBillable)
{
ServicesOverviewRO.CreateSignatureString(sd);
if (sd.IsGroup)
{
//sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);
hatGruppen = true;
}
if (sd.ServiceCategory.Contains("FBF") && sd.ServiceCategory.Contains("FLS"))
lblKategorie.Text = "Fachleistungsstunde (FBF)";
else if (sd.ServiceCategory.Contains("FBF") && sd.ServiceCategory.Contains("Gruppe"))
lblKategorie.Text = "Gruppenunterstützung";
else if (sd.ServiceCategory.Contains("Ass"))
lblKategorie.Text = "Assistenz";
sd.Minutes = sd.Minutes / 60;
servicesBillable.Add(sd);
}
}
@@ -50,64 +53,47 @@ namespace Akgg
pRO.Services = servicesBillable;
}
if (String.IsNullOrWhiteSpace(pRO.AbsenceTimes))
{
lblHatAbwesenheiten.Text = "X";
}
var approved = pRO.ApprovedFLSPerWeek;
if (!hatGruppen)
{
lblHatGruppen.Text = "X";
}
var stats = GetStatistics(pRO);
if (stats != null)
approved = stats.MinutesApprovedPerWeek / 60;
lblBewilligteStunden.Text = string.Format("{0:0.##} Std./wöchentlich", approved);
ErstelleAbwesenheitenTabelle(pRO);
bindingSource1.DataSource = pRO;
}
private void ErstelleAbwesenheitenTabelle(ServicesOverviewRO pRo)
private SupportConceptPeriodStatisticsDC GetStatistics(ServicesOverviewRO ro)
{
if (pRo.Abwesenheiten != null)
if (ro.CostBearer2SupportConceptList != null && ro.CostBearer2SupportConceptList.Count > 0)
{
int newRows = 0;
int index = 1;
foreach (var at in pRo.Abwesenheiten)
var service = new OperationsServiceImp();
foreach (var cb2sc in ro.CostBearer2SupportConceptList)
{
DevExpress.XtraReports.UI.XRTableRow row = null;
if (index < xrTableAbwesenheiten.Rows.Count)
{
row = xrTableAbwesenheiten.Rows[index];
}
else
{
row = xrTableAbwesenheiten.InsertRowBelow(xrTableAbwesenheiten.Rows[xrTableAbwesenheiten.Rows.Count - 1]);
newRows++;
}
long cb2scOid = cb2sc.Oid.Value;
row.Cells[0].Text = String.Format("{0:dd.MM.yyyy}", at.Start);
int? days = null;
if (at.End.HasValue)
var stats = service.CreateSupportConceptStatistics(cb2scOid, ro.EndDate);
if (stats.PeriodStatistics != null && stats.PeriodStatistics.Count > 0)
{
row.Cells[1].Text = String.Format("{0:dd.MM.yyyy}", at.End);
days = (int)at.End.Value.Subtract(at.Start.Value).TotalDays + 1;
foreach (var ps in stats.PeriodStatistics)
{
if (ps.SupportConceptApprovalPeriod != null && ps.SupportConceptApprovalPeriod.ServiceCategory != null &&
ps.SupportConceptApprovalPeriod.ServiceCategory.Name == ro.Services[0].ServiceCategory)
{
return ps;
}
}
}
else
{
row.Cells[1].Text = "unbekannt";
}
row.Cells[2].Text = String.Format("{0:0}", days);
index++;
}
if (newRows > 0)
{
lblUnterschriftKlient.Top += newRows * 20;
lblUnterschriftMitarbeiter.Top += newRows * 20;
}
}
return null;
}
// TODO: Wie anzeigen? Alle?

View File

@@ -120,10 +120,184 @@
<metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>21, 17</value>
</metadata>
<data name="xrRichText2.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEsAZQBpAG4AZQAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXAB1AGwAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABLAHIAYQBuAGsAZQBuAGgAYQB1AHMAYQB1AGYAZQBuAHQAaABhAGwAdABlAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAYgBlAGsAYQBuAG4AdAAgAG8AZABlAHIAIAB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAGEAYgByAGUAYwBoAG4AdQBuAGcAcwByAGUAbABlAHYAYQBuAHQAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAaQBtACAAQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
</data>
<data name="xrRichText1.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEsAZQBpAG4AZQAgAH0AewBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEcAcgB1AHAAcABlAG4AYQBuAGcAZQBiAG8AdABlAH0AewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAaQBtACAAQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=</value>
<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">
<value>
iVBORw0KGgoAAAANSUhEUgAAAfQAAAC6CAYAAABY878iAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAu
IwAALiMBeKU/dgAAKJZJREFUeF7tnQl8VNW9x4dNFAQMAVy6WZfu2tfW9vW19dW2vq6vr33P9tW+VtkC
CAiEHSEhigiudWNTsG6IC1qXuiDiUhdwxbWiQIDMZCaZyZ7JMslk8n///7knGMJl5t7Jne3m9/98vh80
yT3n3P8k53eW//kfz5HswKjFJ5bnF0/zjSp+uDy/qJT/bQQAAABAmskv2u8bVfQY//fM8rwln9EyndjI
UzKQH7yGxbylfFQxAQAAACBraOdJ9o3+E0uGaNk2N39+yZdYyHebFAAAAACALIEn3mXlo0v+Rcv3oeYd
XXIaq36r2YMAAAAAyC5Y1GO+MSVnahk3jDy/H8Az84DZAwAAAADIVorq9n+u5Ggt5x4Pi/lN5j8IAAAA
gCznTiXmFceXjDH5JgAAAAByhMBxSz7n8eUXLzL7JgAAAAByA9by5R7fqKKtZt8EAAAAQK5Q9LoIepn5
NwEAAACQC/AMPSRL7k1m3wQAAABAbiBazoJeFDb7JgAAAAByA9Fyj+SJNfsmAAAAAHID0XIIOgAAAJDj
QNABAAAAFwBBBwAAAFwABB0AAABwARB0AAAAwAVA0AEAAAAXAEEHAAAAXAAEHQAAAHABEHQAAADABUDQ
AQAAABcAQQcAAABcAAQdAAAAcAEQdAAAAMAFQNABAAAAFwBBBwAAAFwABB0AAABwARB0AAAAwAVA0AEA
AAAXAEEHAAAAXAAEHQAAAHABEHQAAADABUDQAQAAABcAQQcAAABcAAQdAAAAcAEQdAAAAMAFQNABAAAA
FwBBBwAAAFwABB0AAABwARB0AAAAwAVA0AEAAAAXAEEHAAAAXAAEHQAAAHABEHQAAADABUDQAQAAABcA
QQcAAABcAAQdAAAAcAEQdAAAAMAFQNABAAAAFwBBBwAAAFwABB0AAABwARB0AAAAwAVA0AEAAAAXAEEH
AAAAXAAEHQAAAHABEHQAAADABUDQAQAAABcAQQcAAABcAAQdAOA8+czIIirPW0Llx3VD/j+Pv57PmD3n
duL5Rb7eV/0CHAGCDuwzeqn61+uZQ2WeQkt4+8+l8jH83GiT8jLFmBLVrjLPTEt4B85Tz5iW5ShLyXfs
Jbb8q0QhLW0zgQXaO2g+t2MmHfBMpf2eScwU/u9pzMX89Rnqe8a/F+uvX9Tt5y4mb7+55Bux2Lz8XEX8
clRPv0xW/93TL/L/fcYvIGVA0EESsOAcvZACp6+gim9cRxVfvzY+/DP+ky8n3zELDw4GMg7PlHx5iynw
1aup8l9voMrvJIB/JvClK9UzpuU5gP/4S9mvC1SHLoOHwOkrqeJfTPzZg9BP11Hg1JXkG77ItFzH4c9Q
BhwiztLWA57pVH78Uqr87g1U9Yc7qb7oSQqvepmaN75FLY+8T61bdlHr1o+p9emPqOWxD6j5/rcpvP5V
alixjWom3EfBH66iwOeXc3mzdHnT1O9X1vyuWOWgX2Z84pcxxVT57eup6nd3UP3iJ6jx5peo6e43Db88
ZeKXW3dQwxXaL+espsAp3f0yNTf9AtIGBB3YxjtgNvk/s4xidS2krLMzPmzRfTVK0H2DF5iWmXbylihB
anlyl2qfFWu66w3uVC8ylkbNyuwFIuZqtta/kDv+x6ntLR91trYbFYsLzfwqsEX3sm9HX0K+IfNNy3YE
EREeBBniMpF/B+ZQ5fdvpPriJ6nl7x9QR0WDakuyFmtspciLpdR47XMU+vkt5Bu6UNUjPlHL1NkqYrpd
skqi/NKf/fK9G6h+yRMs0u9TR6Bev2FyFgtHDL9c9zyFfnkrDxhyxC8gI0DQgT3GLKV9nvFUv+hx3eVY
t+o/3MWdUYEqw7TsdKIEfTq1PrNbty6xNW/ayYI+xXFB9x9fQmX9ZpJ3UCFFXirVtVm3wJlXqndJyZK7
FnKZbcosMfCFK3gG/gS17fTp2lNj7btD1LByKwW+dpWqV812s0nAVDuWcruMVYrA6cupbokMxLz6DVJj
0T1V1HDlMxQ4Q/wiy/dZ5heQUSDowBa+obKkOJOiH4d0F2PdItt2cyfEgnicedlppWuG/vd/6tYltqbb
X+cO1OEZOg9uvEMW8CCpgCLP7NE1WTeZzcoAy3Exl1gHLtOYkRdQxTeuofBtO1hpO3TN6bOmO1+jim9e
y+2Qmeks410zFYtx0C/GjLzi61dTeP126myL6tamz5ruep0qzrpOfT4Z9wvICiDowDosPiLIoV9u0F2K
fav40tVqNprxjicbBF18kFfEgjyWGq9+Qddi3eoXPcHPXsjt0WWZ1ZEMLAwSiLXfM4HKTyimxjUv6Roz
a+HVL1H58UVGuyRQTATMrP2pQuobscSo//gl1Hjzi7plmbXw2pep/MRi1S7f8Az4BWQNEHRgHRYOWV5s
fdy6CPY0CYQyZpQZXiLMAkH3jy5hX4yjqt/fqWuwbs2b3lF+9A1b5Kgvjb382fw5F1D1uI0Uq2nWNWaH
xaqbqfqCu1X7yvrNVu01ew+nkXq8XJ/yC9cfq2rSLcoOi9W2UPXYjWn3C8guIOjAMmX9Cilw8hUHg7GS
sY7yevIOmmdEvJvUkTYyLOjS4cp+vP/05exPXYFFa3+vgp+dRt6Bs3mm6NxszGjTVCobWKiWc7PZmm5/
jcr6z1J+SLV4HfQL1yf1ZrPJ51Y2oDAtfgHZBwQdWINngSoYbsmTuutI3qp+e7ua6Wd0lp5JQZcgOBaH
sgEzqWN/rS7dmsUaI+y3JUpgnOyw/WMuNT6Tk4rUgCEXrP1tP1WcdQ15j5lr+k5OYPhlMpWfsETVlwvW
/m4FVXwntX4B2QkEHVjCN+QSdaQqWlqtu43kTURUiUeeeV1pIVOCzoMYOXq0zzOBWh77UJds3Sp/cBM/
O1EJjWn5SdAl5v5TL6NYMLuWkhNZ+C8vcdsnGpHeJu/WG2TApMT85EupoyKsa8wNC9+8Xf2epMIvIHuB
oIPEjNbBcD9fr7uL3lvg5BVU1m+WeX3pIBOCLoFrI4u5o72Q6ouf1qVat9rpf+Nnx3In7eye+X55p08v
pVhtq67JGYs1RaijvI6ie6spurtK5SLo8DdQZ3Ob/oneWfRALXmHzePBpvO5DQ765cQiilU5G0cg7y9b
T4f4JeCcX9S21ogFPEPPkpwPIG1A0EFilAhNVJmsnLL64qe4zAwGx2VA0GUmLO8sR83sWvjWV5WYqyhm
h84cq/PvnpnkPXoOdZT1LgGKWPtHQRVxXVNwLwV/vIb8n7+c6ylSEfPSbp+kp+VBjf+U5RQ8ZxXVjNuk
EqZEduznp+3HZQR/uIZFd5KjcQQKlRdgFpUdVUgdpfa2RMwsureKwht2UM2U+yn4kzUUOHU519Pll0uM
tL3iF/568EerP/HL9n1JxauEfrKO/VLg6JYMyA0g6CAhZZIZ7qTLLJ1B7ozyz0Rj+v+ObLJ0X9Z/tlrK
N6sz5aRZ0KVzlX1vmQl3RuydWW7b4eUOejJ5B0s+fIfEiwcFvmMXKUGMPLtX15ScNd37JgV/sY7bN0+V
J3TlIfcetUCls5WUpfKv5DaXr4vv5Z3kZ2VQEfjqlVQ3/1Fqfy+gS41vTXe8yQOccc5v24hfholfCqh1
i/WkQ2bWfP9bFPqVZL2TdL7Guyq/eI7sFyNRTTe/fGUl1c59hNrftbZ/33zPztT4BeQEEHQQHxUMN4Hq
Zj2iu4z4Fr7xRWp54B39f/EtdO4t3IFNcWzGaYt0CjqLsPco6awvUgFLdizWECFf3iJ+drrDMy7jyFzd
3L/rmuxbZPt+qvz+9Ur8ZEvGN0Tnkrd5Jl5m75IYRX7P5CRFzeR7qcNXp2s53Dqb2sh77AIVze38Co/2
y0xrv+9mFnn1AFWefQP7ZKISZ5V/Xcq2+Xt+iF9Y3GsmbqKOsiOvGHS2Rsk7YqEKuMxowCnIGBB0EBff
MOlULqb2d6zNECrOvJY7nvv1/8W35nve4s5KAndcLOjSiY9YTKWesdS0wf5RsMrv3agE08kgOBlgqAHC
KZfrWuybpDmVFQcRLCOxjQOfIbdLjjOKgPmGL6T65eZxBnLRiREY6PxSu8yQ/Z9bpmuyb/VLn+Ayphl+
kWtiHfSLShwzbAHVL9vCI73Dl+Kr/3iX8p3kNzAtB7geCDo4MtwZSecU/N4q3WXEt872DhbJQqr41vX6
K/FNlp5l1ukdOMe8/lSSthm6zPjG8qxzsy7FutVM2ayelZzh5mUnyXDJdlZArc/ZTzUrFvr1rTxAuYC8
g+c7v38tyIpGvzn87uNVatXmu9+kDm8dtX9YyT55wPgMlFiaPNsbVBY49svTH+s3tWeh367nNqfHL5LL
venONwy/7ApS7dQHDb/o/XjT54HrgaCDOEh0+wR1paMVa31+j+oQpUOTqF0rVjfrYe6gJnBnleZZehoE
3YiULlD5tu1a0zodBCcpTp2Y5XXBfpb92aqfJXdiIfijm1nMu9LNpvAzk7IZ467waeprvqGy9aD97/Tv
C4ulzKplGygZC567Wg1yVNvS5pep6liaxEIYg5wM3okPsgIIOjgiktFNRvydjRHdbcW3urmPcaco+4YT
Se7DtmKylC/LnOXHcmdk0oaUkWJBlwhyFQB17DyKheyd7Y68fECJiwSZOd5BD1ushKB9Z7muzbrJbXlK
tGSLJJWi1R2ph/0tQWMpzS44TJL1XERtr9u/La36T/e41y8gp4CgA3N4BiT7lDWTHtDdVmILnH6lCmoS
wQj9aK3+amILfu9m9UzaOkMhlYLOvvMeM1/NhCMv7tNPW7NYMKwGAdI2x48dsX/lbHUys9DwqlcM0Tou
xTPQTMDvI59r6Bzrv7NdJisphl9kqdtlfgE5BwQdmDNcZizTqO3VMt11xbfWrR+zWBhXoxpZ5War87dW
rGmDLC9P4HpdIOjSqbPoybJ04/X2bymTPWMVBOe0mAvqcp0CannoPV2bNZPIanVe/Sg5NudC0co3/GI3
z4JK4NK/kLyD5rjTLyDngKCDwxldzMI1nSq/aS24Taz6wk3cKU40OjY1ux9PDZdt1d+Nb53hCAtskbHE
b9aeVJAiQe+6Qa36jxv1U9at+k8b1bMSSGdWdm/x9p9D/k9fzkqUOE9Ad6s+T6KnxzsfVZ4leAfMJf+J
l1Fnm7273qvPl8/LvX4BuQcEHRwOzzKlowrfYO2+587GVi3I8w+WIUE7FV+7Vv9EYqud9ADXqQcE3duS
KlIg6EYQ3GQKfHmFfsK6yX3o6m5zp4469YQHaTILrZ3+kK7RmkmiF1mp8Q3NUAKgVKP8Molqp9g7hRD9
sJL9crEK1DMtF4AMAEEHh6GyWHFHZfUu7KY7XjfEuPt58q4l++2S1jOxydK+2kcfHmc520mcFnRJF+qZ
SWWDCqnDay+NqmQkE//5hvCAKFUDGrWsPIVaHv1A12rNJIZCBneujZ5WfplMzQ+9q9/YmskxMVf7BeQk
EHRwKGq5vIBq/rxJd12JLfTTW1noemR8U+VMtDUjlCV+WepPS3CRk4LO7+obaiREaX3K3hnm6P46Khs4
Sw0GUnJ2WeOT1RMWL6uDNLHOcBu/61LyDnTvNZw+HrxKzEMsZP02tc7mdv4dLVFL9WZlApApIOjgUEYU
qZlc5Hlr+b2j+2u5Y5tDvmMOX3qUr/tPsL43Gb75JWPWk0uCLm3NkyC4C6hh2TP6Jy1aRyf5T1uuZogp
CYLrhiwPB3+4WldszZo3v6Paps6cm5TpBsQvld+/Wb+xNWt5+H3X+wXkJhB08Amj9d73V67RXVdia7hi
m156NBFhFVU9yXJUtcweJUmGmjX1LMtpkhb0KepZme0Kcg641PNHqvqf2/VPWbeq/7qNfTdOzfZM2+gg
8jnUzfibrtma1U57iJ+bmJ4BVoYQYa69yN7+eS370e1+AbkJBB18glomH08NK5/VXVdiC35XzpDLMrlJ
edzhSYdZ9bs79U8ntpoLJFq+wHyA4CRJCHrj9f+gPZ7fqHcSZLZe1l8uE7lP/4R1qy/ewr7uyrjWo21O
o/eJw7ds17Vbs+C/3aQGeKZlugQZ6IRXW0uC1GWVZ69SM3uz8gDIJBB0cBB1jePgedRR0ai7rvjW/s9K
dW+079jFpuUJvsELyDdkIXVYzJYmS/3qPPuIFAfHJSHo8r4Nf9nGAvAKhde8TM2b36bonpD+rnVrvk+W
siew3xamfuAi5BWpQVfLo+/rFiS2jlBYDQR8Az85ueA6Ropfptk6ly+rSPKZeQe42C8gZ4GgAwPupGS2
Um1jNl13yRNHXm7vgmfpEiwm++NWTZb81cwwlTPXJATdCWt96iMWkalGMpIUBsF1R/LBez2zqW37Ad2K
xNa2s5y8/efyoMOlx9UE9otcTxp5sVS/dWJre9dPXh7k4LgayEYg6MAgz1iWbX1yl+66ElvgtJVqhm5a
XhcsyjILCp5tPSCr8ernjIFCKvco0yzosboWarzpRTVQEZ+lOgiuO7LyItfgRvdW69YkNrlxTA2qJKWp
SZluQFaOJA96+4dB/daJrfXZPeyXma72C8hdIOhAISITOHWl7rYSW2TbbhZqSfWaeGncN9SYCUV3Wes4
5aY2ubHNd3QKL51Is6BLZLQEwEk0vP/EZakdrPTAO3Ae+U+6lGJV1i+Jadr4plpJOFISnaTJ5/LY947R
i/apREhjllq+GVCs+f531ADVcb9IeWbvlyxOtw/kBBB0oDo1mRHXL92iu63EVjP+Pp7RWwxeU+VPoPqi
J/XTia36vDvVFoCl8pOBO720Lrl3xKjt7XKq/MGN/F4TuQ38XmkSdVk695+8XKXYtWrhdduNAZsIsEmZ
yeAfcykP1BYovzvHbP4dKUlqe8Y7gAc6n1lGsdoW/daJrem219gv8dP/2kX5hQcX5u+XLIVJ+wXkLhB0
oC5T8fYrtLwk29nazs/ZSzgiy5R2jsO1PvqBIeh55uX1mnQLejcL/mwtv5tcRpOePXRvPxb0z7OgN7fp
FiQ2CfxTwYkOCnrZUTOo+vy7qOXxfyq/9xoup/HKZ41LYyRlrkmd8fD2Z0H/LAt6fat+68TWtP5VxwVd
/CIDZEf9cvVz7Jd55JPZukmdwJ1A0Ps66mjZFJXtzaoZt6PpWaZZmWaMMFLBRl6xlgqWOjspcPIKdSzM
tLzekkFBF6v45jVqwJKOvXQ1Q//c5RRrsCFct+4whMtBQZdVGhFgJy26p1p9jvL7ZVZnPNRWxKcuo1i1
ja2IBPn8k0FWx+weKUxk0QPGDXm+4Uc+gQLcBwS9r5MvHcpEar7X+tWRwXPWcqdm8/5ytew+kWqnWk8F
K0v0CaPokyXDgh4LNZH36DlU1i+1KV8FtVd8vOwVWzuOKNZ87041AHNSuCTosn7R47oGZ0yOOSYbpCZJ
gWTAEi2r06UltuYH3zP8ksSKwJGQgV3Dim26Bmcs8tI+9kuhOuFgVidwJxD0Pk6ZTs9K7dbSs0Z3h4yO
Yoj940wqFSzPSDsjUV1afIvuqUq6roQkI+jRmFq27mxpN7CxhG1mLU/sUrNW37BFKd1PlyNWkg+g/YMK
XXNia922m/3jbJR7tgm6ZCWUWXrbO35dWmKLvFDK9c1yVCgh6MApIOh9GR2sVjf7Ud0NJLaGy55Oftac
L51XgcoRbtVkK0Dt5To9S09C0Js37SRv3lwKnHoFBU5bof6tOOs6qjr/DiWAyVjd7MfYn2O5TakTdBE7
Eb3W5/boWhObOm89YJ6j562zTdCN34EZ1LrV+oU67e9XkHeQcRuhaZlJAEEHTgFB78NIhjfp0OzM3Iyk
L9yBmpSXELVfP5mq/ucOXVpia77/bRa8iSS3fpmWmSxJCHp47StU6vmTStLi9cwhb785yhcywFH7wzdY
T57T3Sq+dZ3q1FO2nz5SMqJNpeb7rG+rxKqb1eflZEY0JeiXPKFrcMZ6JejKLxdR8z1v6dISm+QTKD9B
blpz0i8s6A7HFkDQ+yYQ9L4Kd9bSyYf+fY3uAhKbiOtez//yc9OVGCaDdOpybCtqdRDR3qHObctyvel7
JEsSgn7EgKjjuYMfOJdFfZzKBGfXOnz1xhWqAwpTtp8uKyONVz2na7RmwR9Inv4ZpuUlg1zL23CFzRvp
ElivBJ1RYrrcXpuC56xmvziXy10GrHYyKVoxCHrfBILeZzGW25v++pruAhKbdMb+M5dR8Nx1FPzx2uT4
yTryf3mZWr62anVzZFl6grPL7k4KusBCLMJSNni2reCzLmt5UBLPjCff8EtSsp8u7a4+/25dmzWTu+yd
vFVMgsmqfnObLt0Z662gi1+qfmd9xUisdtbDDvtlKlX93l4bEhkEvW8CQe+jqDPkI4t7HdiVtHV26v9I
bLJvKVsD8S6BsY3Tgs7IkrnM+Cq+ea1+wp7VXvQQi7rspzs/S5fOveKr1vMAiDU/oO9Dzzcv0zZ5RdyO
WWqgIILT9paP2t7wHkZke6nlC4J6K+jKL1+8SpdmzRy/D/047ZfCRyjyciK/WMtqB0Hvm0DQ+yIqGE6O
kD2o//yz34Jnr1EzGcdmrykQdAPx7ViqnWbv7vEuC3z1SiUWju+nS7xE/9lqcGTVYo0R9pNxXtu0TLvI
Covat56qxEaC7uSM/CH0m0t7Pf9Hjdc+r1sR33or6OXD2C/9Cql9Z7kuMbF1NrXxs7KPbj2xUlxkm4V/
Hw2/zI7rF6t77RD0vgkEvS8yzEjy0vamT//5Z7813fG6sezu2GwxRYLOAw5J5iH76c33Wo/m77JoaQ23
awZ5B0lKUweX3rldMohrvOFFXZM1kwxmjm93MOIjucnNN6wH/DWVaOVGa+3staB3+eXaF3SJ1qx28mbt
F2dXUxL5pfE6a+2EoPdNIOh9DXX72XSq/PaN+k8/N0y2Bsrz7aWbjUvKZuiMCpKbrcqXTGZ2rXmjRPaP
486YRcqpFQn1uU+l0I/X6VqsWftbPvWco9sd8cg3ouHDq17WLYhvvRZ0Rga3QRvBoWLt7/rVc2m7Xlb7
xeqADILeN4Gg9zXUjGSC5Q4zm6x2muwxOzRbTKWgM8Z++hTyn75cP23PasbJzHgc+Uc7NwNUOfsHWM/Z
32VVv7iN32Uiv1NqIvAPIQOC7ht6CZX1n0XRj0O6VGtW9V+3c1snpNUvEHQQDwh6H0PSXcoSnpynzTWT
wCA1KxqWfOd9kBQLuoLFWES5+v826hLsmf+05VwfDwqc2k9XsRPjqW6hveQu0Y+C3I6p5D1mvnMrBkci
A4Ju+GWCOk1hxySToax2eY+e5/iWxGFA0IEFIOh9Ce50ZKZVM+5e/Wefe1Z51o1K1HstLGkRdG4jC80+
z1gKr92hS7Fu7btESKcZt4k5JBjeQXKev8hy+t0ua7j0GSr1/JmFhduRyis5MyHojHfQXPLlLbZ96qPh
imcNv0jEexr8AkEH8YCg9yVGGJmx5I/dqsnxocirpcZRmhQQea3U1mqB3NMts8xep0pNh6ALLMTewfPU
c+07recM77Km9RIMOJYFi+t0QjDUqsF4arjKWhR5dwues4qfdXYb4DAyJOjGVtQ4arjcfgrW0Llr0+YX
CDqIBwS9r8BiINHTFWdcp//krVnFl6/mjqRAHV1KBaWeC6nqvDt1bYlNZpZ+7ny9A3uZOS5dgs7Ikrla
VTiBZ8at9mbGYtV/uFsLhgNL7/x7ILN033GL1PErO9bZ3E6BLy5XAwIZGKRkRpoxQZftKJ6lD1tAnY0R
Xbo1k9/JwFdWdPOLM6sphwBBBxaAoPcV1AxkPDVeYz39Z+SFvaoT8Q1eSOooTQpQOdEHzaOYxUQiYrUz
HuZ36WVwXBoFXfCPkSC58RT61Xpdmg3riJH/s3pQ4EQA1hhjli6JbOxaZ10rBc68kp8fxz5kPzi9d5yf
IUEXuvwy8QFdunXrbIhQxTeu4ufHptQvEHQQDwh6H0GJ8tHzKRYM6z/5xCaJZ/Z5JjrfOXWna6Bxk/Vc
1pIERIKR5Dy9aZlWSLOgq9nsyGK1ItGYxHJ3+9sBrnuKEZjW28+D2yKDKRGI9jetJ1Q5aNFOCv12PX9u
FyrRUGexHZut69+HdCWW6Y74ZZj4ZRK1vVqma7BhMaKq825LoV8mUMNKJJYBRwaC3hdgAZDO29bSdlsH
+U9KwaUoPeEOT2aewR/aOwcs5+iVqCfbYaZb0AX+HESQ5bNoe81+Uh8ZCIhYOJJylGf64nf/qZfr0u1b
4w0vkO+4hdymceoGOlVuMsvN+hm5s13EdK/nj9R0q7UgQkcFXejyy8mX8R+BrsSmNd70D/KNXKT8Ipnf
ZHbtjF/Op/CaV3Qt8Q2C3jeBoPcF8mS5bhK1Pv6h/nNPbC0PvaeecSxfdRzUOeB+s9TxKKsWvvll7jBl
zzLJ2WomBJ2RM8syEPGNWkydYft59EM/XadmarKEb1a+LXSAXLLH6sQ6Khupbv4jVH6SDBonKUTc1X3h
IrL5PXwl/8/+E6HxHbNQiU7Xc77hi6jq939Vn4nVKHzHBZ2R4DbxS9X/Wh8A97RYKEx1Cx+l8k8Zg2l5
PyWwQ5LwyzD2y3nsl0c/sO4XCHqfBILudngGK2IZOGWF/lO3ZtU8m5fOJGnBtAPPXKUDrS9+Stee2CQy
XpZHvYOSvJc6Q4IuiBiLKAfPXatLtm6xhgj58hZxOy7u/X66rG4cV8RtGWf7CtGeFqtvoaY7XqPqP99F
gS+sIO/g+ezfGcpfhjAV6H+n8Nem8fdmsegvpIozrqbqsRspvGEHRQ/U6NKsWyoEXfklz/BL/aVP65qS
s1hjKzVtepOqx91Dga9cqVZo4vuFRfhY9svX2C8Xsl9u3U7R/Un4BYLeJ4Ggu52DYrlF/6knNpldyExC
lvpMy0wB0ilXfMnerVeSZ1w6xKQGHRkUdMVIuQf7QhaMrbp06xZ5YZ96bxHEXu+n8/NSjmQ8sxqIlsg6
26LU/kEFtT79ETXd9praD5dLReTf8NpXqHnzO+pWsfbdkpktyXVtbSkRdEH8cqwsm4+nRot55RNaR4za
d1VS6zMfq2uLP/HLC+o4ZpdfonvYLzZuIzQzCHrfBILucnzHLFK3bHXYGOWHV8ty9oT0zM67UGfkp1Lk
H6W6FYkt8uxuFqLJ3JmblJeITAu6FlIJOmzdulvXYN0aSraqAUH5SAc+I57pe4+Wvf0J1Hi9vUtKMm1t
2w+kRtAF8YuKeZhADTZOh2SDtb3uZb/MhqD3MSDoboYFWZbyQr/coP/MrVnwB6vU8l/SAWfJwAKnsthN
3qxbYcF4xhM4ZaW6/tK0zHhkWtAFFgx1s9qQuRQLNelarFvw31cpnzmyn95NvGRPPFes7Q25PIZ/V1Mh
6AL7xXfMAjXArZv9sK41+804FXExBL2PAUF3MyMlGK6AWja/q//ME1v7h5VqxuMbmv6OQN0vPbqEOlva
dWsSW0PJ02pZ1PbSczYIOmOcTy+gim//Rddi3WLVzeQ9dj63aYYSHrPybTGGxUstM4+j0M/XUIeNI46Z
sNbn91DgjJU8EHHovvYjIX4ZJteXjqPgf6xW2ROz2WSVq+LrV7FfHLqZEOQMEHQXI0vt/k8tI4rG9J96
YpPAtKQE0gnyjQFI831v69Yktui+GvWeKnrYrMwjkSWCbrCUSj1jqW7Wo7om69a6RbYdJighdmSLRD53
9TlMJN/oxdS08Q1dU/aYDGRqp29WM3M5MeDY5TXxEN/q309f/iXUdNfrujXZY7HaFqqd8aDyifgmLX4B
WQUE3a1wxyzCXDfP3g1SFV+8SkXFm5aZatQWwWSq+s3tujXWrOoXG9RztgYh2STo/N7GDHA8tWx+T9dm
3eoXPsHPjmXBcXAQxmIgKzUSgR369S3U9noSiVYcNklV23DVNpVCVw1iZBDnxMqEDUQkJUJf+eVX7JdX
D+jWZc5kRavxmmep/CQJtBS/LEy7X0B2AEF3KepsN3fI0V3Wz3ZHtu1RHZW6CMSkzHSggvgGFtrKaNfy
4Lvc7gIW2hwVdIE74LIBhTyYmkEdZfW6RutW+Z3rlQ8cnZVJpjP+XZDfCfldqr7gboq8Yv1iH6cs+nGQ
6kueVMleZOVAJWtxNAubTaTuvE/8UvWnuyjysvVgTqdMouHrL9tC/s8v035xOjsdyDUg6C5FguFq/rxJ
/+knto7yeir/LIvKwJn2ZrpOwx2SiGbl2Tfpllmzym9crzpX0zLNUII+Vd2xbtVaHv+n6sRTIuiMcYnL
RRT4wnKVsMWuBb54OZUN0hnbnIQ/E5kNy4BBfBz62Vpqum0HdQTsDzysmohV+JbtVPWbDeQdIkFpWrBk
6duJrQUnEL8M/cQvwf9YQ+H126nDn0K/7K2iJq6j6re3kXdolvoFZAwIuhvJL2Zhnk71S7eonNRt2/cf
kchze9SFD+Un6ZSXTkRM95oS7iRZ1HnW2XTHGxR5sZTbeuCwth9kZznVjN1EBwZMMynrCLAoewcVqrPA
ccs+yAEVX1A2aAb7N3UrGOJ/Ob5X/ulLqWHFM2oQIWeKE7Ux+nGIGoq3UFl/bl+KBhxKwIYtVu1TA5vR
RRT69Qblw9atH1FHMIlgsVgnDwwaVIBbeP0Oqp3xN6r87g0qJkDqkAGO7+iF2S1WPf0yiv3yn+vVRUit
T+9S72fblF8aqfUF9suGV6l2Fvvl39gvw3LILyDtQNBdihLmEYtVGs54yH6gdA7efnOyJ4hGOinuJI2M
WlNVG83a3h0lYnZXFrgOyTRnVp4ZKtEOP2NalpPw5yC30Mkqi2wLyAzMrD09kfdXnzsP6EzLdQotIuK7
LhGTz6r8xBKqPOt6Cv3iVpX0p27+31UGOkme0rBiGzVc+jTVzX2MaiY9QFX/fTsFf7SGKs64RrVbZrjy
vhILIWVJ+lOjrh51ZzOmfrlYvV/lt66j0M9v4YHnvSqupeHyrdSo/VJfsoX98ijVFNxv+OWc1d38Ivv1
3fwiIq7q6lE3AAwE3a3IH/xxS8g3fHF85JxqCmecvYaFWtpo2vZuqCsr7c5WrPpII8v0aZ0RiTBznVbe
X0jZWWwrcN0iZMYAUaLPJbWpkcP8UCbz9yTNqQzU9GDlqPk8+OS2p3ogkgkO8YtEn9vwCz/nWr+AlABB
BwAAAFwABB0AAABwARB0AAAAwAVA0AEAAAAXAEEHAAAAXAAEHQAAAHABEHQAAADABUDQAQAAABcAQQcA
AABcAAQdAAAAcAEQdAAAAMAFQNABAAAAFwBBBwAAAFwABB0AAABwARB0AAAAwAVA0AEAAAAXAEEHAAAA
XAAEHQAAAHABEHQAAADABUDQAQAAABcAQQcAAABcAAQdAAAAcAEQdAAAAMAFQNABAAAAFwBBBwAAAFwA
BB0AAABwARB0AAAAwAVA0AEAAAAXAEEHAAAAXAAEHQAAAHABEHQAAADABUDQAQAAABcAQQcAAABcAAQd
AAAAcAEQdAAAAMAFQNABAAAAFwBBBwAAAFwABB0AAABwARB0AAAAwAVA0AEAAAAXAEEHAAAAXAAEHQAA
AHABEHQAAADABUDQAQAAABcAQQcAAABcAAQdAAAAcAEQdAAAAMAFQNABAAAAF2AIen5R2OybAAAAAMgN
RMtF0JvNvgkAAACA3MCXX9zkKR9V5DP7JgAAAAByAxb0kMc3qmib2TcBAAAAkBv48ove4hl6cVHPbwAA
AAAgd+DJ+VWesvySk8y+CQAAAIDcwDu65DSPGE/VN5j9AAAAAACynPzizUrMxXafNmNw+aiiOtMfBAAA
AEB2kl/cUj2yZLiWc8N8Y0rONP1hAAAAAGQlvpGLv6tl/FALjCr+Fs/U/WYPAQAAACA78OUXVflHF39f
y7e5ydSdf3hdz4cBAAAAkHlYzP/qP7FklJbtxOYbVXS6L794kTqnnl+8lwsI+kYVV8uoAAAAAAApRmlu
cag8v6i0fFTRc8ySwMiiL2uZ7mEez/8DtcKrQsxaJFgAAAAASUVORK5CYII=
</value>
</data>
</root>

File diff suppressed because it is too large Load Diff

View File

@@ -1,222 +0,0 @@
using System;
using System.Collections.Generic;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.DataContracts;
namespace Kundexyz
{
public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<SettlementRO>
{
public Spitzabrechnung()
{
InitializeComponent();
}
public void SetReportDataSource(SettlementRO pRO)
{
bool isDefaultSpitzabrechnung = false;
if (String.IsNullOrEmpty(pRO.Notice))
{
lblNotice.Visible = false;
}
if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count == 1)
{
var ii = pRO.InvoiceItems[0];
if ((ii.ItemDescription == "Spitzabrechung" || ii.ItemDescription == "Spitzabrechnung") && ii.GrossAmountTotal == null && ii.RateFactor == null)
{
isDefaultSpitzabrechnung = true;
}
}
if (!isDefaultSpitzabrechnung)
{
if (pRO.DifferentHourlyRateCount > 0 && pRO.HourlyRateNew.HasValue)
{
isDefaultSpitzabrechnung = true;
}
}
if (isDefaultSpitzabrechnung)
{
//UpdateAbrechnungsFelder(pRO);
pRO.InvoiceItems = CreateDefaultSpitzabrechnungInvoiceItems(pRO);
}
else
{
var id = GetCustomerId(pRO);
if (id == "LWLNEU")
{
pRO.RateFactorText = null;
pRO.RateFactorText2 = null;
if (pRO.InvoiceItems != null)
{
foreach (var ii in pRO.InvoiceItems)
{
ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS x {3:c}",
ii.ItemPeriodStart, ii.ItemPeriodEnd, ii.UnitCount, ii.AmountPerUnit);
}
}
}
else
{
if (pRO.InvoiceItems != null)
{
foreach (var ii in pRO.InvoiceItems)
{
ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS {3}x {4:c}",
ii.ItemPeriodStart, ii.ItemPeriodEnd,
ii.UnitCount, ii.RateFactor == 0 ? "" : "x " + pRO.RateFactorText2 + " ",
ii.AmountPerUnit);
}
}
}
}
this.bindingSource1.DataSource = pRO;
}
private String GetCustomerId(SettlementRO pRO)
{
var cb2sc = DAOFactory.GenericDAO.LoadByID<CostBearer2SupportConcept>(pRO.CostBearer2SupportConceptOid);
return cb2sc.CostBearer.ID;
}
private IList<InvoiceItemDC> CreateDefaultSpitzabrechnungInvoiceItems(SettlementRO pRO)
{
IList<InvoiceItemDC> itemList = new List<InvoiceItemDC>();
if (pRO.DifferentHourlyRateCount == 3)
{
itemList.Add(new InvoiceItemDC
{
ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
pRO.AccountingStartDateString, pRO.HourlyRate3EndDateString,
pRO.GeleisteteFLSMitStundensatz3, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRate3),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatz3 * pRO.RateFactor * pRO.HourlyRate3
});
itemList.Add(new InvoiceItemDC
{
ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
pRO.HourlyRateOldStartDateString, pRO.HourlyRateOldEndDateString,
pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * pRO.RateFactor * pRO.HourlyRateOld
});
itemList.Add(new InvoiceItemDC
{
ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString,
pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew
});
}
else if (pRO.DifferentHourlyRateCount == 2)
{
itemList.Add(new InvoiceItemDC
{
ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
pRO.AccountingStartDateString, pRO.HourlyRateOldEndDateString,
pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld
});
itemList.Add(new InvoiceItemDC
{
ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString,
pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew
});
}
else
{
itemList.Add(new InvoiceItemDC
{
ItemDescription = String.Format("{0} bis {1}: {2:0.##} FLS {3}x {4:c}",
pRO.AccountingStartDateString, pRO.AccountingEndDateString,
pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew),
GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew
});
}
return itemList;
}
private void UpdateAbrechnungsFelder(SettlementRO pRO)
{
if (pRO.DifferentHourlyRateCount == 3)
{
//Erbrachte Leistungen (FLS) - bis [HourlyRateOldEndDateString] à [HourlyRateOldString] €
pRO.Abrechnungstext1 = String.Format("{0} bis {1}",
pRO.AccountingStartDateString, pRO.HourlyRate3EndDateString);
pRO.Abrechnungstext1 += String.Format(": {0:0.##} FLS {1}x {2:c}",
pRO.GeleisteteFLSMitStundensatz3, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRate3);
//[AccountingStartDateString] - [HourlyRate3EndDateString] sind [RecordedFLSWithHourlyRate3String] Std. x [HourlyRate3String] € =";
pRO.Betrag1 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatz3 * (decimal)pRO.RateFactor * pRO.HourlyRate3);
pRO.Abrechnungstext2 = String.Format("{0} bis {1}",
pRO.HourlyRateOldStartDateString, pRO.HourlyRateOldEndDateString);
pRO.Abrechnungstext2 += String.Format(": {0:0.##} FLS {1}x {2:c}",
pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld);
pRO.Betrag2 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld);
pRO.Abrechnungstext3 = String.Format("{0} bis {1}",
pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString);
pRO.Abrechnungstext3 += String.Format(": {0:0.##} FLS {1}x {2:c}",
pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew);
pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew);
}
else if (pRO.DifferentHourlyRateCount == 2)
{
pRO.Abrechnungstext2 = String.Format("{0} bis {1}",
pRO.AccountingStartDateString, pRO.HourlyRateOldEndDateString);
pRO.Abrechnungstext2 += String.Format(": {0:0.##} FLS {1}x {2:c}",
pRO.GeleisteteFLSMitStundensatzAlt, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateOld);
pRO.Betrag2 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAlt * (decimal)pRO.RateFactor * pRO.HourlyRateOld);
pRO.Abrechnungstext3 = String.Format("{0} bis {1}",
pRO.HourlyRateNewStartDateString, pRO.AccountingEndDateString);
pRO.Abrechnungstext3 += String.Format(": {0:0.##} FLS {1}x {2:c}",
pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew);
pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew);
}
else
{
pRO.Abrechnungstext3 = String.Format("{0} bis {1}",
pRO.AccountingStartDateString, pRO.AccountingEndDateString);
pRO.Abrechnungstext3 += String.Format(": {0:0.##} FLS {1}x {2:c}",
pRO.GeleisteteFLSMitStundensatzAktuell, pRO.RateFactor == 1 ? "" : "x " + pRO.RateFactorText2 + " ", pRO.HourlyRateNew);
pRO.Betrag3 = String.Format("{0:c}", pRO.GeleisteteFLSMitStundensatzAktuell * (decimal)pRO.RateFactor * pRO.HourlyRateNew);
}
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,39 +0,0 @@
using System;
using System.Drawing;
using System.Collections;
using System.ComponentModel;
using DevExpress.XtraReports.UI;
using BeWo.Report.ReportObjects;
using BeWo.Report;
namespace Kundexyz.Alt
{
public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<Settlement2RO>
{
public Spitzabrechnung()
{
InitializeComponent();
}
public void SetReportDataSource(Settlement2RO pRO)
{
if (String.IsNullOrEmpty(pRO.Notice))
{
lblNotice.Visible = false;
}
decimal rateFactor = 1;
foreach (var ii in pRO.InvoiceItems)
{
if (ii.RateFactor.HasValue)
{
rateFactor = (100 + ii.RateFactor.Value) / 100;
}
}
pRO.RateFactor = (double)rateFactor;
this.bindingSource1.DataSource = pRO;
}
}
}

View File

@@ -70,6 +70,8 @@
<Compile Include="InvoiceCustomerReport.Designer.cs">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
</Compile>
<Compile Include="Invoicing\CustomInvoiceCreation.cs" />
<Compile Include="Invoicing\CustomInvoiceFactory.cs" />
<Compile Include="Mitarbeiterstundenkonto.cs">
<SubType>Component</SubType>
</Compile>

View File

@@ -0,0 +1,54 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Invoicing;
using BeWo.Service.Plugins;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
using BS.Shared.Extensions;
using BS.Shared.Services;
namespace AdikKleve.Invoicing
{
public class CustomInvoiceCreation : InvoiceCreation
{
public override void SetInvoiceItems(ServiceInvoice invoice,
ServiceInvoicePeriod serviceInvoicePeriod,
SupportConceptApprovalPeriodDC supportConceptApprovalPeriod,
CostBearer2SupportConcept cb2sc,
DateTimeSpan invoicePeriod,
List<ServiceRecordDC> serviceRecords)
{
var calc = PluginLoader.FindClass<BS.Shared.Services.Calculations>(_SpecificID) ?? BS.Shared.Services.Calculations.GetInstance(_SpecificID);
if (ShouldCreateFixedAmounts(serviceInvoicePeriod, supportConceptApprovalPeriod, cb2sc))
{
CreateFixedAmounts(serviceInvoicePeriod, supportConceptApprovalPeriod, cb2sc);
}
else
{
List<ServiceRecordDC> serviceRecordsInPeriod = serviceRecords.Where(
i =>
{
bool valid = i.Start.Value.InBetween(serviceInvoicePeriod.Start.Value,
serviceInvoicePeriod.End.Value, true);
if (valid && serviceInvoicePeriod.SupportConceptApprovalPeriod != null && serviceInvoicePeriod.SupportConceptApprovalPeriod.ServiceCategory != null)
valid = serviceInvoicePeriod.SupportConceptApprovalPeriod.ServiceCategory.Oid ==
i.ServiceDescription.Category.ServiceCategoryOid;
return valid;
}).ToList();
if (serviceRecordsInPeriod.Count > 0)
{
var itemList = CreateInvoiceItems(serviceRecordsInPeriod, invoicePeriod, serviceInvoicePeriod.SupportConceptApprovalPeriod, calc);
serviceInvoicePeriod.InvoiceItemList.AddRange(itemList);
}
}
}
}
}

View File

@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using BeWo.Data.Entities;
using BeWo.Service.Invoicing;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Compact;
namespace AdikKleve.Invoicing
{
public class CustomInvoiceFactory : InvoiceFactory
{
public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary<CompactSupportConceptDC, List<ServiceRecordDC>> supportConcepts2ServiceRecords)
{
return new CustomInvoiceCreation();
}
}
}

View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BeWo.Data.Entities;
using BeWo.Service.Invoicing;
using BS.Shared.DataContracts;
@@ -10,9 +11,113 @@ namespace BeWo.AidshilfeDortmund
internal class CustomSettlementInvoiceCreation : LWLSettlementInvoiceCreation
{
public override List<InvoiceItemDC> CreateInvoiceItems(Settlement2DC si, IList<ApprovalPeriod> apList)
{
return base.CreateInvoiceItems(si, apList, true);
}
}
public override List<InvoiceItemDC> CreateInvoiceItems(Settlement2DC si, IList<ApprovalPeriod> apList, bool schneideBeiMaxAb)
{
var items = base.CreateInvoiceItems(si, apList, true);
decimal hours = 0;
foreach (var ap in apList)
{
hours += ap.RecordedMinutes;
}
if (si.RateFactor.HasValue)
{
hours *= (100 + si.RateFactor.Value) / 100;
}
hours /= 60;
si.RecordedBillableFLSNetto = hours;
si.RecordedBillableFLSBrutto = si.RecordedBillableFLSNetto;
return items;
}
//public override List<InvoiceItemDC> CreateInvoiceItems(Settlement2DC si, IList<ApprovalPeriod> apList, bool schneideBeiMaxAb)
//{
// List<InvoiceItemDC> iiList = new List<InvoiceItemDC>();
// var apsByHourlyRate = new Dictionary<String, IList<ApprovalPeriod>>();
// foreach (var ap in apList)
// {
// IList<ApprovalPeriod> list = null;
// String key = String.Format("{0}_{1}", ap.AmountPerUnit, ap.RateFactor);
// if (apsByHourlyRate.ContainsKey(key))
// {
// list = apsByHourlyRate[key];
// }
// else
// {
// list = new List<ApprovalPeriod>();
// apsByHourlyRate[key] = list;
// }
// list.Add(ap);
// }
// decimal maxApprovedFls = si.ApprovedFLS ?? 0;
// decimal totalHours = 0;
// foreach (var key in apsByHourlyRate.Keys)
// {
// IList<ApprovalPeriod> list = apsByHourlyRate[key];
// var ii = new InvoiceItemDC();
// decimal minutesTotal = 0;
// DateTime start = DateTime.MaxValue;
// DateTime end = DateTime.MinValue;
// decimal rf = si.RateFactor ?? 0;
// decimal hr = 0;
// foreach (var approvalPeriod in list)
// {
// minutesTotal += approvalPeriod.RecordedMinutes;
// if (approvalPeriod.PeriodStartDate < start)
// start = approvalPeriod.PeriodStartDate;
// if (approvalPeriod.PeriodEndDate > end)
// end = approvalPeriod.PeriodEndDate;
// hr = approvalPeriod.AmountPerUnit;
// if (approvalPeriod.RateFactor.HasValue)
// {
// rf = approvalPeriod.RateFactor.Value;
// }
// }
// ii.ItemPeriodStart = start;
// ii.ItemPeriodEnd = end;
// ii.RateFactor = rf;
// ii.AmountPerUnit = hr;
// decimal hours = Math.Round(minutesTotal / 60m, 2, MidpointRounding.AwayFromZero);
// hours *= (100 + rf) / 100;
// hours = Math.Round(hours, 2, MidpointRounding.AwayFromZero);
// if (schneideBeiMaxAb)
// {
// if (totalHours + hours > maxApprovedFls)
// {
// hours = maxApprovedFls - totalHours;
// if (hours < 0)
// hours = 0;
// }
// }
// totalHours += hours;
// ii.UnitCount = hours;
// ii.AmountTotal = Math.Round(hr * hours, 2, MidpointRounding.AwayFromZero);
// ii.GrossAmountTotal = ii.AmountTotal;
// iiList.Add(ii);
// }
// si.RecordedBillableFLSNetto = totalHours;
// si.RecordedBillableFLSBrutto = totalHours;
// return iiList.OrderBy(ii => ii.ItemPeriodStart).ToList();
//}
}
}

View File

@@ -38,10 +38,7 @@ namespace BeWo.AidshilfeDortmund.Alt
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow();
@@ -56,13 +53,15 @@ namespace BeWo.AidshilfeDortmund.Alt
this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrCheckBox1 = new DevExpress.XtraReports.UI.XRCheckBox();
this.xrCheckBox2 = new DevExpress.XtraReports.UI.XRCheckBox();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.xrPictureBox4 = new DevExpress.XtraReports.UI.XRPictureBox();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
@@ -91,13 +90,11 @@ namespace BeWo.AidshilfeDortmund.Alt
this.xrTableRow43 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell73 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell74 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.xrCheckBox1 = new DevExpress.XtraReports.UI.XRCheckBox();
this.xrCheckBox2 = new DevExpress.XtraReports.UI.XRCheckBox();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -143,10 +140,9 @@ namespace BeWo.AidshilfeDortmund.Alt
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9,
this.xrTableRow10,
this.xrTableRow11,
this.rowErbrachteLeistung});
this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 68F);
this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 51F);
this.xrTable1.StylePriority.UseBorderColor = false;
//
// xrTableRow9
@@ -167,7 +163,7 @@ namespace BeWo.AidshilfeDortmund.Alt
this.xrTableCell19.StylePriority.UseBorderColor = false;
this.xrTableCell19.StylePriority.UseBorders = false;
this.xrTableCell19.StylePriority.UseFont = false;
this.xrTableCell19.Text = "Bewilligte Fachleistungsstunden (FLS) gesamt:";
this.xrTableCell19.Text = "erbrachte Fachleistungsstunden (FLS) gesamt";
this.xrTableCell19.Weight = 0.78314100999098568D;
//
// xrTableCell6
@@ -175,6 +171,8 @@ namespace BeWo.AidshilfeDortmund.Alt
this.xrTableCell6.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecordedFLSTotal", "{0:0.00} FLS")});
this.xrTableCell6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -182,54 +180,15 @@ namespace BeWo.AidshilfeDortmund.Alt
this.xrTableCell6.StylePriority.UseBorders = false;
this.xrTableCell6.StylePriority.UseFont = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.Text = "[ApprovedFLS]";
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell6.Weight = 0.21685899000901443D;
//
// xrTableRow10
//
this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell20,
this.xrTableCell7});
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.78314100999098568D;
//
// ruleRateFactorNull
//
this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.ruleRateFactorNull.Name = "ruleRateFactorNull";
//
// xrTableCell7
//
this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
this.xrTableCell7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrTableCell7.FormattingRules.Add(this.ruleRateFactorNull);
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell7.StylePriority.UseBorderColor = false;
this.xrTableCell7.StylePriority.UseBorders = false;
this.xrTableCell7.StylePriority.UseFont = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "[ApprovedFLSWithFactor]";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell7.Weight = 0.21685899000901443D;
//
// xrTableRow11
//
this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
@@ -265,7 +224,7 @@ namespace BeWo.AidshilfeDortmund.Alt
this.xrTableCell22.StylePriority.UseBorderColor = false;
this.xrTableCell22.StylePriority.UseBorders = false;
this.xrTableCell22.StylePriority.UseFont = false;
this.xrTableCell22.Text = "Erbrachte Leistungen:";
this.xrTableCell22.Text = "abrechenbare Fachleistungsstunden";
this.xrTableCell22.Weight = 1D;
//
// xrLabel6
@@ -389,6 +348,36 @@ namespace BeWo.AidshilfeDortmund.Alt
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// xrCheckBox1
//
this.xrCheckBox1.LocationFloat = new DevExpress.Utils.PointFloat(95.83334F, 10F);
this.xrCheckBox1.Name = "xrCheckBox1";
this.xrCheckBox1.SizeF = new System.Drawing.SizeF(493.5575F, 21.875F);
this.xrCheckBox1.StylePriority.UseFont = false;
this.xrCheckBox1.Text = " Die Betreuung wurde beendet am";
//
// xrCheckBox2
//
this.xrCheckBox2.LocationFloat = new DevExpress.Utils.PointFloat(95.83334F, 43.33323F);
this.xrCheckBox2.Name = "xrCheckBox2";
this.xrCheckBox2.SizeF = new System.Drawing.SizeF(211.0832F, 21.875F);
this.xrCheckBox2.StylePriority.UseFont = false;
this.xrCheckBox2.Text = " Die Betreuung dauert an.";
//
// xrLabel12
//
this.xrLabel12.BackColor = System.Drawing.Color.Transparent;
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(95.83334F, 77.60416F);
this.xrLabel12.Multiline = true;
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(670.3123F, 91.79169F);
this.xrLabel12.StylePriority.UseBackColor = false;
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.StylePriority.UseTextAlignment = false;
this.xrLabel12.Text = resources.GetString("xrLabel12.Text");
this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopJustify;
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 35F;
@@ -426,7 +415,7 @@ namespace BeWo.AidshilfeDortmund.Alt
this.xrTable1,
this.xrLabel8});
this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F);
this.GroupHeader1.HeightF = 416.7916F;
this.GroupHeader1.HeightF = 399.7916F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.StylePriority.UseFont = false;
//
@@ -448,10 +437,6 @@ namespace BeWo.AidshilfeDortmund.Alt
this.xrPictureBox3.SizeF = new System.Drawing.SizeF(210.67F, 189.8333F);
this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// GroupHeader2
//
this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -753,35 +738,9 @@ namespace BeWo.AidshilfeDortmund.Alt
this.xrTableCell74.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell74.Weight = 0.21685899000901443D;
//
// xrLabel12
// bindingSource1
//
this.xrLabel12.BackColor = System.Drawing.Color.Transparent;
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(95.83334F, 77.60416F);
this.xrLabel12.Multiline = true;
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(670.3123F, 91.79169F);
this.xrLabel12.StylePriority.UseBackColor = false;
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.StylePriority.UseTextAlignment = false;
this.xrLabel12.Text = resources.GetString("xrLabel12.Text");
this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopJustify;
//
// xrCheckBox1
//
this.xrCheckBox1.LocationFloat = new DevExpress.Utils.PointFloat(95.83334F, 10F);
this.xrCheckBox1.Name = "xrCheckBox1";
this.xrCheckBox1.SizeF = new System.Drawing.SizeF(493.5575F, 21.875F);
this.xrCheckBox1.StylePriority.UseFont = false;
this.xrCheckBox1.Text = " Die Betreuung wurde beendet am";
//
// xrCheckBox2
//
this.xrCheckBox2.LocationFloat = new DevExpress.Utils.PointFloat(95.83334F, 43.33323F);
this.xrCheckBox2.Name = "xrCheckBox2";
this.xrCheckBox2.SizeF = new System.Drawing.SizeF(211.0832F, 21.875F);
this.xrCheckBox2.StylePriority.UseFont = false;
this.xrCheckBox2.Text = " Die Betreuung dauert an.";
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// Spitzabrechnung
//
@@ -805,9 +764,9 @@ namespace BeWo.AidshilfeDortmund.Alt
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -830,9 +789,6 @@ namespace BeWo.AidshilfeDortmund.Alt
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRTableRow rowErbrachteLeistung;

View File

@@ -2261,9 +2261,6 @@
YII=
</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>
</metadata>
<data name="xrPictureBox2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAABEQAAABRCAIAAABUs+RPAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -2419,4 +2416,7 @@
ECKUyJgRQgghhBBChBIZM0IIIYQQQogQ8uLF/wDOOP1HFN/KqAAAAABJRU5ErkJggg==
</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>
</metadata>
</root>

View File

@@ -57,9 +57,11 @@ namespace AlphaEv
ed.EmployeeDetail.Custom7 = ed.EmployeeDetail.StundenSollOhneUrlaubKrankheit * 0.25m;
ed.EmployeeDetail.Custom11 = (info.Custom2 ?? 0) + (ed.EmployeeDetail.FlsIst + (ed.EmployeeDetail.FlsIst / 0.75m * 0.25m)) - ed.EmployeeDetail.StundenSollOhneUrlaubKrankheit;
//cellGesamt.Text = String.Format("{0:0.0}%", gesamtProzent);
}
//cellGesamt.Text = String.Format("{0:0.0}%", gesamtProzent);
info.Custom3 = ed.EmployeeDetail.SollProWoche;
info.Custom4 = ed.EmployeeDetail.SollProTag;
info.Custom5 = ed.EmployeeDetail.SollProTag * 0.75m;
}
}

View File

@@ -132,9 +132,9 @@ namespace AlphaEv
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
@@ -151,7 +151,7 @@ namespace AlphaEv
this.fieldKalkAz = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldKalkInd = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldSaldoKalkAz = new DevExpress.XtraReports.UI.CalculatedField();
this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -953,7 +953,7 @@ namespace AlphaEv
// xrLabel10
//
this.xrLabel10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.SollProWoche", "{0:0.00}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.Custom3", "{0:0.00}")});
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(210.2081F, 101.0938F);
this.xrLabel10.Multiline = true;
this.xrLabel10.Name = "xrLabel10";
@@ -963,7 +963,7 @@ namespace AlphaEv
// xrLabel11
//
this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.SollProTag", "{0:0.00}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.Custom4", "{0:0.00}")});
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(210.2081F, 121.0938F);
this.xrLabel11.Multiline = true;
this.xrLabel11.Name = "xrLabel11";
@@ -973,7 +973,7 @@ namespace AlphaEv
// xrLabel12
//
this.xrLabel12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.fieldFlsProTag", "{0:0.00}")});
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.Custom5", "{0:0.00}")});
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(210.2081F, 141.0939F);
this.xrLabel12.Multiline = true;
this.xrLabel12.Name = "xrLabel12";
@@ -1072,6 +1072,15 @@ namespace AlphaEv
this.GroupFooter1.Level = 1;
this.GroupFooter1.Name = "GroupFooter1";
//
// xrLabel20
//
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30F);
this.xrLabel20.Multiline = true;
this.xrLabel20.Name = "xrLabel20";
this.xrLabel20.SizeF = new System.Drawing.SizeF(190F, 194.1667F);
this.xrLabel20.StylePriority.UseFont = false;
this.xrLabel20.Text = resources.GetString("xrLabel20.Text");
//
// xrLabel19
//
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(190F, 30F);
@@ -1091,10 +1100,6 @@ namespace AlphaEv
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.Text = "Legende:";
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoMonateRO);
//
// pageFooterBand1
//
this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1216,14 +1221,9 @@ namespace AlphaEv
this.fieldSaldoKalkAz.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldSaldoKalkAz.Name = "fieldSaldoKalkAz";
//
// xrLabel20
// bindingSource1
//
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30F);
this.xrLabel20.Multiline = true;
this.xrLabel20.Name = "xrLabel20";
this.xrLabel20.SizeF = new System.Drawing.SizeF(190F, 194.1667F);
this.xrLabel20.StylePriority.UseFont = false;
this.xrLabel20.Text = resources.GetString("xrLabel20.Text");
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoMonateRO);
//
// MitarbeiterstundenkontoJahr
//

View File

@@ -19,7 +19,6 @@ namespace AlphaEv.Translation
AddOrReplaceTranslation(dict, "StundenkontoTagesansicht", "Auswertung über das gesamte Jahr");
return dict;
}
}

View File

@@ -34,6 +34,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Mvvm.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="DevExpress.Pdf.v17.1.Core, 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" />

View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using BeWo.Data.Entities;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using BS.Shared.Extensions;
@@ -35,5 +35,136 @@ namespace ApiBerlin
dd.BreakMinutes2 = null;
return dd;
}
public override void CalculateAbsenceTimesForDay(MitarbeiterstundenkontoRO.DayDetail dd, MitarbeiterstundenkontoRO.EmployeeDetail ed)
{
var absenceTimes = ed.Employee.AbsenceTimes;
if (absenceTimes != null)
{
foreach (var absenceTime in absenceTimes)
{
if (IsUrlaubAbsenceTime(absenceTime) || IsKrankheitAbsenceTime(absenceTime))
{
DateTimeSpan span = new DateTimeSpan();
span.StartDate = dd.Date;
if (absenceTime.Start.HasValue && absenceTime.Start.Value > span.StartDate)
{
span.StartDate = absenceTime.Start.Value;
}
if (absenceTime.End.HasValue && absenceTime.End.Value.Date == span.StartDate.Date &&
absenceTime.End.Value.Hour > 0)
{
span.EndDate = absenceTime.End.Value;
}
else
{
span.EndDate = dd.Date.AddDays(1);
if (absenceTime.End.HasValue && absenceTime.End.Value.Date.AddDays(1) < span.EndDate)
{
span.EndDate = absenceTime.End.Value.Date.AddDays(1);
}
}
if (span.EndDate > dd.Date && span.StartDate < dd.Date.AddDays(1))
{
DateTime day = span.StartDate;
var faktor = GetFeiertagsFaktor(day);
if (faktor < 1 && day.DayOfWeek != DayOfWeek.Sunday)
{
var sollDiesenTag = ed.SollProTag;
var c = ed.Employee.GetValidContractForDate(dd.Date);
if (c != null)
{
decimal wth = 0;
int apw = 5;
if (c.WeeklyTotalHours.HasValue)
{
wth = c.WeeklyTotalHours.Value;
}
if (c.WeeklyDays.HasValue && c.WeeklyDays.Value > 0)
{
apw = c.WeeklyDays.Value;
}
sollDiesenTag = wth / apw;
}
if (span.StartDate.Hour > 0 && span.EndDate.Hour > 0)
{
var ts = span.EndDate.Subtract(span.StartDate);
sollDiesenTag -= ts.Hours;
faktor = 1; // Keine halben Feiertag berücksichtigen, wenn die Abwesenheit in Stunden angegeben wurde
}
if (ed.AbsenceTimeDays != null && ed.AbsenceTimeDays.TageProWocheDict != null)
{
if (ed.AbsenceTimeDays.RestStundenProWocheDict == null)
{
ed.AbsenceTimeDays.RestStundenProWocheDict = new Dictionary<DateTimeSpan, decimal>();
}
foreach (var week in ed.AbsenceTimeDays.TageProWocheDict.Keys)
{
if (!ed.AbsenceTimeDays.RestStundenProWocheDict.ContainsKey(week))
{
ed.AbsenceTimeDays.RestStundenProWocheDict.Add(week, ed.SollProWoche);
}
if (day.Date >= week.StartDate && day.Date <= week.EndDate)
{
var rest = ed.AbsenceTimeDays.RestStundenProWocheDict[week];
if (rest < sollDiesenTag)
{
sollDiesenTag = rest;
}
rest -= sollDiesenTag;
if (rest < 0)
{
rest = 0;
}
ed.AbsenceTimeDays.RestStundenProWocheDict[week] = rest;
}
}
}
decimal maxSoll = sollDiesenTag;
if (faktor != 0)
{
sollDiesenTag *= faktor; //halbe Feiertage etc. berücksichtigen
}
if (IsKrankheitAbsenceTime(absenceTime))
{ // Vermutlich diese Methode in CustomMitarbeiterStundenKontoBerechnung überschreiben und hier Prüfung machen, ob absenceReason ohne Fortzahlung ist
//und wenn ja, HoursSick oder Soll oder so für den Tag auf 0 setzen
dd.HoursSick = sollDiesenTag;
}
else if (IsUrlaubAbsenceTime(absenceTime))
{
dd.HoursInVacation = sollDiesenTag;
}
if (dd.AbsenceTimes == null)
{
dd.AbsenceTimes = new List<AbsenceTime>();
}
dd.AbsenceTimes.Add(absenceTime);
dd.MinutesTotal += sollDiesenTag * 60;
}
}
}
//}
}
}
}
}
}

View File

@@ -31,8 +31,6 @@ namespace AsbRheinErftDuerenSBD
{
this.components = new System.ComponentModel.Container();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel();
@@ -108,6 +106,13 @@ namespace AsbRheinErftDuerenSBD
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.lblLehrer2 = new DevExpress.XtraReports.UI.XRLabel();
this.lblLehrer = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel();
this.lblDatum = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel40 = new DevExpress.XtraReports.UI.XRLabel();
this.lblSchule2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel50 = new DevExpress.XtraReports.UI.XRLabel();
this.lblSchule = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel34 = new DevExpress.XtraReports.UI.XRLabel();
@@ -132,15 +137,23 @@ namespace AsbRheinErftDuerenSBD
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.lblHilfeplan = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel38 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel39 = new DevExpress.XtraReports.UI.XRLabel();
this.lblFls = new DevExpress.XtraReports.UI.XRLabel();
this.lblLeistungskategorie = new DevExpress.XtraReports.UI.XRLabel();
this.lblBewilligtVon = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel46 = new DevExpress.XtraReports.UI.XRLabel();
this.lblBewilligtBis = new DevExpress.XtraReports.UI.XRLabel();
this.lblFlsEinheit = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel37 = new DevExpress.XtraReports.UI.XRLabel();
this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader4 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.lblSchule2 = new DevExpress.XtraReports.UI.XRLabel();
this.lblFls = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
@@ -149,6 +162,8 @@ namespace AsbRheinErftDuerenSBD
((System.ComponentModel.ISupportInitialize)(this.xrTable9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
@@ -161,35 +176,12 @@ namespace AsbRheinErftDuerenSBD
this.Detail.StylePriority.UseFont = false;
this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel28
//
this.xrLabel28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Disabilities")});
this.xrLabel28.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 281.5834F);
this.xrLabel28.Multiline = true;
this.xrLabel28.Name = "xrLabel28";
this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel28.SizeF = new System.Drawing.SizeF(537.42F, 24F);
this.xrLabel28.StylePriority.UseFont = false;
this.xrLabel28.Text = "Vorname:";
//
// xrLabel21
//
this.xrLabel21.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 281.5834F);
this.xrLabel21.Name = "xrLabel21";
this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel21.SizeF = new System.Drawing.SizeF(139.58F, 24F);
this.xrLabel21.StylePriority.UseFont = false;
this.xrLabel21.Text = "Behinderungen:";
//
// xrLabel14
//
this.xrLabel14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")});
this.xrLabel14.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 257.5834F);
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(139.5805F, 304.5001F);
this.xrLabel14.Multiline = true;
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -200,7 +192,7 @@ namespace AsbRheinErftDuerenSBD
// xrLabel7
//
this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 257.5834F);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 304.5001F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel7.SizeF = new System.Drawing.SizeF(139.58F, 24F);
@@ -210,7 +202,7 @@ namespace AsbRheinErftDuerenSBD
// xrLabel27
//
this.xrLabel27.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 96.95835F);
this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 119.875F);
this.xrLabel27.Name = "xrLabel27";
this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel27.SizeF = new System.Drawing.SizeF(197.875F, 24F);
@@ -222,7 +214,7 @@ namespace AsbRheinErftDuerenSBD
this.xrLabel26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Street")});
this.xrLabel26.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 72.95831F);
this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 95.87498F);
this.xrLabel26.Name = "xrLabel26";
this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel26.SizeF = new System.Drawing.SizeF(197.875F, 24F);
@@ -234,7 +226,7 @@ namespace AsbRheinErftDuerenSBD
this.xrLabel29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Mobile")});
this.xrLabel29.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 120.9583F);
this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 143.875F);
this.xrLabel29.Name = "xrLabel29";
this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel29.SizeF = new System.Drawing.SizeF(197F, 24F);
@@ -246,7 +238,7 @@ namespace AsbRheinErftDuerenSBD
this.xrLabel32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Mail")});
this.xrLabel32.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 192.9583F);
this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 215.875F);
this.xrLabel32.Name = "xrLabel32";
this.xrLabel32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel32.SizeF = new System.Drawing.SizeF(196.9999F, 24F);
@@ -258,7 +250,7 @@ namespace AsbRheinErftDuerenSBD
this.xrLabel31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Fax")});
this.xrLabel31.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 168.9584F);
this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 191.8751F);
this.xrLabel31.Name = "xrLabel31";
this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel31.SizeF = new System.Drawing.SizeF(197F, 24F);
@@ -270,7 +262,7 @@ namespace AsbRheinErftDuerenSBD
this.xrLabel30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Phone")});
this.xrLabel30.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 144.9584F);
this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(479.125F, 167.8751F);
this.xrLabel30.Name = "xrLabel30";
this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel30.SizeF = new System.Drawing.SizeF(197F, 24F);
@@ -280,7 +272,7 @@ namespace AsbRheinErftDuerenSBD
// xrLabel20
//
this.xrLabel20.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 96.95829F);
this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 119.875F);
this.xrLabel20.Name = "xrLabel20";
this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel20.SizeF = new System.Drawing.SizeF(139.58F, 24F);
@@ -290,7 +282,7 @@ namespace AsbRheinErftDuerenSBD
// xrLabel19
//
this.xrLabel19.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 72.95831F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 95.87498F);
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel19.SizeF = new System.Drawing.SizeF(139.58F, 24F);
@@ -300,7 +292,7 @@ namespace AsbRheinErftDuerenSBD
// xrLabel22
//
this.xrLabel22.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 120.9583F);
this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 143.875F);
this.xrLabel22.Name = "xrLabel22";
this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel22.SizeF = new System.Drawing.SizeF(139.58F, 24F);
@@ -310,7 +302,7 @@ namespace AsbRheinErftDuerenSBD
// xrLabel25
//
this.xrLabel25.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 192.9584F);
this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 215.8751F);
this.xrLabel25.Name = "xrLabel25";
this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel25.SizeF = new System.Drawing.SizeF(139.58F, 24F);
@@ -320,7 +312,7 @@ namespace AsbRheinErftDuerenSBD
// xrLabel24
//
this.xrLabel24.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 168.9584F);
this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 191.8751F);
this.xrLabel24.Name = "xrLabel24";
this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel24.SizeF = new System.Drawing.SizeF(139.58F, 24F);
@@ -330,7 +322,7 @@ namespace AsbRheinErftDuerenSBD
// xrLabel23
//
this.xrLabel23.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 144.9584F);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 167.8751F);
this.xrLabel23.Name = "xrLabel23";
this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel23.SizeF = new System.Drawing.SizeF(139.58F, 24F);
@@ -342,7 +334,7 @@ namespace AsbRheinErftDuerenSBD
this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Occupation")});
this.xrLabel18.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 192.9584F);
this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 215.8751F);
this.xrLabel18.Name = "xrLabel18";
this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel18.SizeF = new System.Drawing.SizeF(179.1633F, 24F);
@@ -354,7 +346,7 @@ namespace AsbRheinErftDuerenSBD
this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FamilyStatus")});
this.xrLabel17.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 168.9584F);
this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 191.8751F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(179.1633F, 24F);
@@ -366,7 +358,7 @@ namespace AsbRheinErftDuerenSBD
this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Sex")});
this.xrLabel16.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 144.9584F);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 167.8751F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel16.SizeF = new System.Drawing.SizeF(179.1633F, 24F);
@@ -378,7 +370,7 @@ namespace AsbRheinErftDuerenSBD
this.xrLabel15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "DateOfBirth")});
this.xrLabel15.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 120.9584F);
this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 143.8751F);
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel15.SizeF = new System.Drawing.SizeF(179.1633F, 24F);
@@ -390,7 +382,7 @@ namespace AsbRheinErftDuerenSBD
this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "LastName")});
this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 96.95835F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 119.875F);
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(179.1633F, 24F);
@@ -402,7 +394,7 @@ namespace AsbRheinErftDuerenSBD
this.xrLabel12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "FirstName")});
this.xrLabel12.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 72.95831F);
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 95.87498F);
this.xrLabel12.Name = "xrLabel12";
this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel12.SizeF = new System.Drawing.SizeF(179.1633F, 24F);
@@ -412,7 +404,7 @@ namespace AsbRheinErftDuerenSBD
// xrLabel11
//
this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192.9584F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 215.8751F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(139.58F, 24F);
@@ -422,7 +414,7 @@ namespace AsbRheinErftDuerenSBD
// xrLabel10
//
this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 168.9584F);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 191.8751F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel10.SizeF = new System.Drawing.SizeF(139.58F, 24F);
@@ -432,7 +424,7 @@ namespace AsbRheinErftDuerenSBD
// xrLabel9
//
this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 144.9584F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 167.8751F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(139.58F, 24F);
@@ -442,7 +434,7 @@ namespace AsbRheinErftDuerenSBD
// xrLabel8
//
this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 120.9584F);
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 143.8751F);
this.xrLabel8.Name = "xrLabel8";
this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel8.SizeF = new System.Drawing.SizeF(139.58F, 24F);
@@ -452,7 +444,7 @@ namespace AsbRheinErftDuerenSBD
// xrLabel6
//
this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 96.95835F);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 119.875F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel6.SizeF = new System.Drawing.SizeF(139.58F, 24F);
@@ -462,7 +454,7 @@ namespace AsbRheinErftDuerenSBD
// xrLabel5
//
this.xrLabel5.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 72.95831F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 95.87498F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel5.SizeF = new System.Drawing.SizeF(139.58F, 24F);
@@ -496,7 +488,7 @@ namespace AsbRheinErftDuerenSBD
this.ReportFooter1});
this.DetailReport2.DataMember = "RelatedEmployees";
this.DetailReport2.DataSource = this.bindingSource1;
this.DetailReport2.Level = 2;
this.DetailReport2.Level = 3;
this.DetailReport2.Name = "DetailReport2";
//
// Detail3
@@ -884,7 +876,7 @@ namespace AsbRheinErftDuerenSBD
this.GroupHeader2});
this.DetailReport4.DataMember = "EnvironmentPersons";
this.DetailReport4.DataSource = this.bindingSource1;
this.DetailReport4.Level = 0;
this.DetailReport4.Level = 1;
this.DetailReport4.Name = "DetailReport4";
//
// Detail5
@@ -1002,6 +994,12 @@ namespace AsbRheinErftDuerenSBD
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblLehrer2,
this.lblLehrer,
this.xrLabel28,
this.lblDatum,
this.xrLabel4,
this.xrLabel40,
this.lblSchule2,
this.xrLabel50,
this.lblSchule,
@@ -1033,16 +1031,90 @@ namespace AsbRheinErftDuerenSBD
this.xrLabel26,
this.xrLabel27,
this.xrLabel7,
this.xrLabel14,
this.xrLabel21,
this.xrLabel28});
this.ReportHeader.HeightF = 305.5834F;
this.xrLabel14});
this.ReportHeader.HeightF = 338.9168F;
this.ReportHeader.Name = "ReportHeader";
//
// lblLehrer2
//
this.lblLehrer2.Font = new System.Drawing.Font("Arial", 10F);
this.lblLehrer2.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 280.5001F);
this.lblLehrer2.Multiline = true;
this.lblLehrer2.Name = "lblLehrer2";
this.lblLehrer2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblLehrer2.SizeF = new System.Drawing.SizeF(336.5799F, 23.99995F);
this.lblLehrer2.StylePriority.UseFont = false;
this.lblLehrer2.StylePriority.UseTextAlignment = false;
//
// lblLehrer
//
this.lblLehrer.Font = new System.Drawing.Font("Arial", 10F);
this.lblLehrer.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 280.5002F);
this.lblLehrer.Multiline = true;
this.lblLehrer.Name = "lblLehrer";
this.lblLehrer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblLehrer.SizeF = new System.Drawing.SizeF(179.1638F, 23.99995F);
this.lblLehrer.StylePriority.UseFont = false;
this.lblLehrer.StylePriority.UseTextAlignment = false;
//
// xrLabel28
//
this.xrLabel28.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(0F, 280.5002F);
this.xrLabel28.Name = "xrLabel28";
this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel28.SizeF = new System.Drawing.SizeF(139.58F, 24F);
this.xrLabel28.StylePriority.UseFont = false;
this.xrLabel28.Text = "Klassenlehrer/in:";
//
// lblDatum
//
this.lblDatum.Font = new System.Drawing.Font("Arial", 10F);
this.lblDatum.LocationFloat = new DevExpress.Utils.PointFloat(251.4585F, 25F);
this.lblDatum.Name = "lblDatum";
this.lblDatum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblDatum.SizeF = new System.Drawing.SizeF(196.9997F, 24F);
this.lblDatum.StylePriority.UseFont = false;
this.lblDatum.Text = "Stand: ";
//
// xrLabel4
//
this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 70.87498F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(139.58F, 25F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.StylePriority.UseTextAlignment = false;
this.xrLabel4.Text = "Betreut seit:";
this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel40
//
this.xrLabel40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Customer.AssistanceBegin", "{0:dd.MM.yyyy}")});
this.xrLabel40.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel40.LocationFloat = new DevExpress.Utils.PointFloat(479.1251F, 71.87494F);
this.xrLabel40.Name = "xrLabel40";
this.xrLabel40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel40.SizeF = new System.Drawing.SizeF(196.9997F, 24F);
this.xrLabel40.StylePriority.UseFont = false;
//
// lblSchule2
//
this.lblSchule2.Font = new System.Drawing.Font("Arial", 10F);
this.lblSchule2.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 256.5002F);
this.lblSchule2.Multiline = true;
this.lblSchule2.Name = "lblSchule2";
this.lblSchule2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblSchule2.SizeF = new System.Drawing.SizeF(336.5799F, 23.99995F);
this.lblSchule2.StylePriority.UseFont = false;
this.lblSchule2.StylePriority.UseTextAlignment = false;
//
// xrLabel50
//
this.xrLabel50.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel50.LocationFloat = new DevExpress.Utils.PointFloat(0F, 233.5835F);
this.xrLabel50.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 256.5002F);
this.xrLabel50.Name = "xrLabel50";
this.xrLabel50.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel50.SizeF = new System.Drawing.SizeF(139.58F, 24F);
@@ -1052,7 +1124,7 @@ namespace AsbRheinErftDuerenSBD
// lblSchule
//
this.lblSchule.Font = new System.Drawing.Font("Arial", 10F);
this.lblSchule.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 233.5835F);
this.lblSchule.LocationFloat = new DevExpress.Utils.PointFloat(139.58F, 256.5002F);
this.lblSchule.Multiline = true;
this.lblSchule.Name = "lblSchule";
this.lblSchule.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -1065,7 +1137,7 @@ namespace AsbRheinErftDuerenSBD
this.xrLabel34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "Customer.DebitorNumber")});
this.xrLabel34.Font = new System.Drawing.Font("Arial", 10F);
this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(139.5805F, 48.9583F);
this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(139.5805F, 71.87497F);
this.xrLabel34.Name = "xrLabel34";
this.xrLabel34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel34.SizeF = new System.Drawing.SizeF(179.1633F, 24F);
@@ -1075,7 +1147,7 @@ namespace AsbRheinErftDuerenSBD
// xrLabel33
//
this.xrLabel33.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(0.0004768372F, 47.95831F);
this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 70.87498F);
this.xrLabel33.Name = "xrLabel33";
this.xrLabel33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel33.SizeF = new System.Drawing.SizeF(139.58F, 25F);
@@ -1092,7 +1164,7 @@ namespace AsbRheinErftDuerenSBD
this.ReportFooter});
this.DetailReport.DataMember = "EnvironmentOrganisations";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 1;
this.DetailReport.Level = 2;
this.DetailReport.Name = "DetailReport";
//
// Detail1
@@ -1277,13 +1349,11 @@ namespace AsbRheinErftDuerenSBD
this.xrLabel3,
this.lblHilfeplan,
this.xrLabel38,
this.xrLabel39,
this.lblLeistungskategorie,
this.lblFls,
this.lblBewilligtVon,
this.xrLabel46,
this.lblBewilligtBis,
this.lblFlsEinheit,
this.xrLabel37});
this.lblBewilligtBis});
this.ReportFooter.HeightF = 94.73981F;
this.ReportFooter.Name = "ReportFooter";
//
@@ -1318,27 +1388,15 @@ namespace AsbRheinErftDuerenSBD
this.xrLabel38.StylePriority.UseFont = false;
this.xrLabel38.Text = "bewilligt von: ";
//
// xrLabel39
// lblLeistungskategorie
//
this.xrLabel39.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel39.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 70.73962F);
this.xrLabel39.Name = "xrLabel39";
this.xrLabel39.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel39.SizeF = new System.Drawing.SizeF(139.58F, 24F);
this.xrLabel39.StylePriority.UseFont = false;
this.xrLabel39.Text = "FLS:";
//
// lblFls
//
this.lblFls.Font = new System.Drawing.Font("Arial", 9F);
this.lblFls.LocationFloat = new DevExpress.Utils.PointFloat(139.5805F, 70.73969F);
this.lblFls.Multiline = true;
this.lblFls.Name = "lblFls";
this.lblFls.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblFls.SizeF = new System.Drawing.SizeF(145.6277F, 23.99997F);
this.lblFls.StylePriority.UseFont = false;
this.lblFls.StylePriority.UseTextAlignment = false;
this.lblFls.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.lblLeistungskategorie.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.lblLeistungskategorie.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 70.73962F);
this.lblLeistungskategorie.Name = "lblLeistungskategorie";
this.lblLeistungskategorie.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblLeistungskategorie.SizeF = new System.Drawing.SizeF(139.58F, 24F);
this.lblLeistungskategorie.StylePriority.UseFont = false;
this.lblLeistungskategorie.Text = "FLS:";
//
// lblBewilligtVon
//
@@ -1372,41 +1430,134 @@ namespace AsbRheinErftDuerenSBD
this.lblBewilligtBis.StylePriority.UseFont = false;
this.lblBewilligtBis.StylePriority.UseTextAlignment = false;
//
// lblFlsEinheit
// DetailReport1
//
this.lblFlsEinheit.Font = new System.Drawing.Font("Arial", 9F);
this.lblFlsEinheit.LocationFloat = new DevExpress.Utils.PointFloat(402.9133F, 70.73975F);
this.lblFlsEinheit.Multiline = true;
this.lblFlsEinheit.Name = "lblFlsEinheit";
this.lblFlsEinheit.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblFlsEinheit.SizeF = new System.Drawing.SizeF(239.0872F, 23.99997F);
this.lblFlsEinheit.StylePriority.UseFont = false;
this.lblFlsEinheit.StylePriority.UseTextAlignment = false;
this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail2,
this.GroupHeader4});
this.DetailReport1.DataMember = "ICD10Diagnosen";
this.DetailReport1.DataSource = this.bindingSource1;
this.DetailReport1.Level = 0;
this.DetailReport1.Name = "DetailReport1";
//
// xrLabel37
// Detail2
//
this.xrLabel37.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel37.LocationFloat = new DevExpress.Utils.PointFloat(285.2083F, 70.73975F);
this.xrLabel37.Name = "xrLabel37";
this.xrLabel37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel37.SizeF = new System.Drawing.SizeF(117.705F, 24F);
this.xrLabel37.StylePriority.UseFont = false;
this.xrLabel37.Text = "pro";
this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable6});
this.Detail2.HeightF = 18F;
this.Detail2.Name = "Detail2";
//
// xrTable6
//
this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0.0005086263F, 0F);
this.xrTable6.Name = "xrTable6";
this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow6});
this.xrTable6.SizeF = new System.Drawing.SizeF(642F, 18F);
this.xrTable6.StylePriority.UseFont = false;
//
// xrTableRow6
//
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell21,
this.xrTableCell22});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Weight = 1.125D;
//
// xrTableCell21
//
this.xrTableCell21.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ICD10Diagnosen.Beschreibung")});
this.xrTableCell21.Font = new System.Drawing.Font("Arial", 9F);
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell21.StylePriority.UseBorders = false;
this.xrTableCell21.StylePriority.UseFont = false;
this.xrTableCell21.StylePriority.UsePadding = false;
this.xrTableCell21.Text = "Betreuer";
this.xrTableCell21.Weight = 0.67854278184171779D;
//
// xrTableCell22
//
this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ICD10Diagnosen.ICD10Code")});
this.xrTableCell22.Font = new System.Drawing.Font("Arial", 9F);
this.xrTableCell22.Name = "xrTableCell22";
this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell22.StylePriority.UseBorders = false;
this.xrTableCell22.StylePriority.UseFont = false;
this.xrTableCell22.StylePriority.UsePadding = false;
this.xrTableCell22.Text = "Rolle";
this.xrTableCell22.Weight = 0.32145721815828221D;
//
// GroupHeader4
//
this.GroupHeader4.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable5});
this.GroupHeader4.HeightF = 18F;
this.GroupHeader4.Name = "GroupHeader4";
//
// xrTable5
//
this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable5.Name = "xrTable5";
this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow5});
this.xrTable5.SizeF = new System.Drawing.SizeF(641.9995F, 18F);
//
// xrTableRow5
//
this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell19,
this.xrTableCell20});
this.xrTableRow5.Name = "xrTableRow5";
this.xrTableRow5.Weight = 1.0588235294117647D;
//
// xrTableCell19
//
this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell19.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell19.StylePriority.UseBorders = false;
this.xrTableCell19.StylePriority.UseFont = false;
this.xrTableCell19.StylePriority.UsePadding = false;
this.xrTableCell19.Text = "Diagnosen";
this.xrTableCell19.Weight = 0.67854278184171768D;
//
// xrTableCell20
//
this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell20.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold);
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell20.StylePriority.UseBorders = false;
this.xrTableCell20.StylePriority.UseFont = false;
this.xrTableCell20.StylePriority.UsePadding = false;
this.xrTableCell20.Text = "ICD10 Code";
this.xrTableCell20.Weight = 0.32145645759558755D;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.CustomerDataRO);
//
// lblSchule2
// lblFls
//
this.lblSchule2.Font = new System.Drawing.Font("Arial", 10F);
this.lblSchule2.LocationFloat = new DevExpress.Utils.PointFloat(339.5449F, 233.5835F);
this.lblSchule2.Multiline = true;
this.lblSchule2.Name = "lblSchule2";
this.lblSchule2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblSchule2.SizeF = new System.Drawing.SizeF(336.5799F, 23.99995F);
this.lblSchule2.StylePriority.UseFont = false;
this.lblSchule2.StylePriority.UseTextAlignment = false;
this.lblFls.Font = new System.Drawing.Font("Arial", 9F);
this.lblFls.LocationFloat = new DevExpress.Utils.PointFloat(139.5805F, 70.73969F);
this.lblFls.Multiline = true;
this.lblFls.Name = "lblFls";
this.lblFls.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblFls.SizeF = new System.Drawing.SizeF(502.419F, 23.99997F);
this.lblFls.StylePriority.UseFont = false;
this.lblFls.StylePriority.UseTextAlignment = false;
this.lblFls.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// Klientenstammblatt
//
@@ -1418,7 +1569,8 @@ namespace AsbRheinErftDuerenSBD
this.topMarginBand1,
this.bottomMarginBand1,
this.ReportHeader,
this.DetailReport});
this.DetailReport,
this.DetailReport1});
this.DataSource = this.bindingSource1;
this.Font = new System.Drawing.Font("Arial", 10F);
this.Margins = new System.Drawing.Printing.Margins(75, 75, 75, 75);
@@ -1434,6 +1586,8 @@ namespace AsbRheinErftDuerenSBD
((System.ComponentModel.ISupportInitialize)(this.xrTable9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
@@ -1474,8 +1628,6 @@ namespace AsbRheinErftDuerenSBD
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel xrLabel28;
private DevExpress.XtraReports.UI.XRLabel xrLabel21;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
private DevExpress.XtraReports.UI.XRLabel xrLabel7;
private DevExpress.XtraReports.UI.XRLabel xrLabel27;
@@ -1528,13 +1680,10 @@ namespace AsbRheinErftDuerenSBD
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel lblHilfeplan;
private DevExpress.XtraReports.UI.XRLabel xrLabel38;
private DevExpress.XtraReports.UI.XRLabel xrLabel39;
private DevExpress.XtraReports.UI.XRLabel lblFls;
private DevExpress.XtraReports.UI.XRLabel lblLeistungskategorie;
private DevExpress.XtraReports.UI.XRLabel lblBewilligtVon;
private DevExpress.XtraReports.UI.XRLabel xrLabel46;
private DevExpress.XtraReports.UI.XRLabel lblBewilligtBis;
private DevExpress.XtraReports.UI.XRLabel lblFlsEinheit;
private DevExpress.XtraReports.UI.XRLabel xrLabel37;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter1;
private DevExpress.XtraReports.UI.XRLabel xrLabel49;
private DevExpress.XtraReports.UI.XRLabel xrLabel50;
@@ -1552,5 +1701,23 @@ namespace AsbRheinErftDuerenSBD
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRLabel lblSchule2;
private DevExpress.XtraReports.UI.XRLabel lblDatum;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel40;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport1;
private DevExpress.XtraReports.UI.DetailBand Detail2;
private DevExpress.XtraReports.UI.XRTable xrTable6;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader4;
private DevExpress.XtraReports.UI.XRTable xrTable5;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRLabel lblLehrer2;
private DevExpress.XtraReports.UI.XRLabel lblLehrer;
private DevExpress.XtraReports.UI.XRLabel xrLabel28;
private DevExpress.XtraReports.UI.XRLabel lblFls;
}
}

View File

@@ -25,6 +25,9 @@ namespace AsbRheinErftDuerenSBD
public void SetReportDataSource(CustomerDataRO pRO)
{
var c = DAOFactory.GenericDAO.LoadByID<Customer>(pRO.CustomerOid);
StringBuilder sbKategorie = new StringBuilder();
StringBuilder sbFLS = new StringBuilder();
StringBuilder sbFLSEinheit = new StringBuilder();
foreach (var sc in c.SupportConcepts)
{
@@ -42,20 +45,30 @@ namespace AsbRheinErftDuerenSBD
{
lblBewilligtVon.Text = String.Format("{0:dd.MM.yyyy}", ap.StartDate);
lblBewilligtBis.Text = String.Format("{0:dd.MM.yyyy}", ap.EndDate);
lblFls.Text = String.Format("{0:0.00}", ap.ApprovedBEPerInterval);
lblFlsEinheit.Text = ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null;
if (ap.ServiceCategory.Name.StartsWith("Fachleistung"))
sbFLS.AppendLine(String.Format("{0:0.00} pro {1} für Fachkraft", ap.ApprovedBEPerInterval, ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null));
else
sbFLS.AppendLine(String.Format("{0:0.00} pro {1} für Hilfskraft", ap.ApprovedBEPerInterval, ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null));
//lblLeistungskategorie.Text += String.Format(" ({0}):", ap.ServiceCategory);
//lblFls.Text = String.Format("{0:0.00}", ap.ApprovedBEPerInterval);
//lblFlsEinheit.Text = ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null;
}
}
}
}
}
}
lblFls.Text = sbFLS.ToString();
StringBuilder sbSchule = new StringBuilder();
StringBuilder sbSchule2 = new StringBuilder();
StringBuilder sbLehrer = new StringBuilder();
if (pRO.EnvironmentOrganisations != null)
{
foreach (var org in pRO.EnvironmentOrganisations)
for (int i = pRO.EnvironmentOrganisations.Count - 1; i >= 0; i--)
{
var org = pRO.EnvironmentOrganisations[i];
if (org.RelationRole != null && org.RelationRole.DisplayName == "Schule")
{
sbSchule.AppendLine(org.Organisation.Name);
@@ -70,14 +83,42 @@ namespace AsbRheinErftDuerenSBD
var o = DAOFactory.GenericDAO.LoadByID<Organisation>(org.Organisation.OrganisationOid);
sbSchule2.Append(o.Notice);
pRO.EnvironmentOrganisations.Remove(org);
}
if (org.RelationRole != null && org.RelationRole.DisplayName == "Kostenträger")
{
pRO.EnvironmentOrganisations.Remove(org);
}
}
}
if (pRO.EnvironmentPersons != null)
{
for (int i = pRO.EnvironmentPersons.Count - 1; i >= 0; i--)
{
var p = pRO.EnvironmentPersons[i];
if (p.RelationRole != null && p.RelationRole.DisplayName.Contains("Klassenlehrer"))
{
var person = DAOFactory.GenericDAO.LoadByID<Person>(p.Person.PersonOid);
String anrede = "";
if (person.Sex.Equals(Sex.Male))
anrede = "Herr ";
else if (person.Sex.Equals(Sex.Female))
anrede = "Frau ";
sbLehrer.AppendLine(anrede + p.Person.TitleFirstNameLastNameToString());
sbLehrer.AppendLine(p.Customer2PersonNotice);
lblLehrer2.Text = p.Person.ContactSummaryInfo;
pRO.EnvironmentPersons.Remove(p);
}
}
}
CreateArbeitszeitenTable(pRO.Customer.Arbeitszeiten);
lblLehrer.Text = sbLehrer.ToString();
lblSchule.Text = sbSchule.ToString();
lblSchule2.Text = sbSchule2.ToString();
lblDatum.Text += DateTime.Now.Date.ToString("dd.MM.yyyy");
this.bindingSource1.DataSource = pRO;
}

View File

@@ -15,11 +15,34 @@ namespace AutismusKoelnBonn
{
public class CustomCustomerService : CustomerService
{
public override CustomerDC LoadCustomer(long pCustomerOid)
{
var dc = base.LoadCustomer(pCustomerOid);
var folder = DAOFactory.SearchDAO.FindBeWoFolders(TableID.Customer, pCustomerOid);
if (folder.Count == 0)
{
ErstelleOrdnerStruktur(pCustomerOid);
}
return dc;
}
public override long InsertNewCustomer(CustomerDC pCustomerDc)
{
var cOid = base.InsertNewCustomer(pCustomerDc);
ErstelleOrdnerStruktur(cOid);
return cOid;
}
private void ErstelleOrdnerStruktur(long cOid)
{
// Ordner 1
var folder_01 = CreateBeWoFolder("LE Stammdaten - moveAUT", cOid, null);
var folder_01_01 = CreateBeWoFolder("Stammdatenbogen", cOid, folder_01.Oid);
@@ -203,9 +226,6 @@ namespace AutismusKoelnBonn
var folder_07_04 = CreateBeWoFolder("Medikamentenplan", cOid, folder_07.Oid);
var folder_07_05 = CreateBeWoFolder("Kommunikation / Schriftverkehr", cOid, folder_07.Oid);
var folder_07_06 = CreateBeWoFolder("Sonstiges", cOid, folder_07.Oid);
return cOid;
}
private BeWoFolder CreateBeWoFolder(string name, long? cOid, long? parentOid)

View File

@@ -13,10 +13,33 @@ namespace AutismusKoelnBonn
{
public class CustomEmployeeService : EmployeeService
{
public override EmployeeDC LoadEmployee(long eOid)
{
var dc = base.LoadEmployee(eOid);
var folder = DAOFactory.SearchDAO.FindBeWoFolders(TableID.Employee, eOid);
if (folder.Count == 0)
{
ErstelleOrdnerStruktur(eOid);
}
return dc;
}
public override long InsertNewEmployee(EmployeeDC pEmployeeDC)
{
var eOid = base.InsertNewEmployee(pEmployeeDC);
ErstelleOrdnerStruktur(eOid);
return eOid;
}
private void ErstelleOrdnerStruktur(long eOid)
{
var folder01 = CreateBeWoFolder("Teil 1: Personalführung", eOid, null);
var folder01_01 = CreateBeWoFolder("Personaldaten", eOid, folder01.Oid);
var folder01_02 = CreateBeWoFolder("Vertragsdaten", eOid, folder01.Oid);
@@ -102,8 +125,6 @@ namespace AutismusKoelnBonn
var folder02_06_01 = CreateBeWoFolder("Bescheinigungen", eOid, folder02_06.Oid);
var folder02_06_02 = CreateBeWoFolder("Schriftverkehr", eOid, folder02_06.Oid);
return eOid;
}
private BeWoFolder CreateBeWoFolder(string name, long? eOid, long? parentOid)

View File

@@ -86,6 +86,7 @@ namespace BeWoSchillingReports
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.lblAbsenceTime = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -496,11 +497,12 @@ namespace BeWoSchillingReports
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel14,
this.xrLabel2,
this.xrLabel12,
this.xrLabel1,
this.xrLabel9});
this.ReportHeader.HeightF = 120F;
this.ReportHeader.HeightF = 145F;
this.ReportHeader.Name = "ReportHeader";
//
// xrLabel2
@@ -709,6 +711,19 @@ namespace BeWoSchillingReports
this.lblAbsenceTime.Text = "Es sind keine stationären Aufenthalte bekannt.";
this.lblAbsenceTime.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
// xrLabel14
//
this.xrLabel14.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108F);
this.xrLabel14.Multiline = true;
this.xrLabel14.Name = "xrLabel14";
this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel14.SizeF = new System.Drawing.SizeF(650F, 25F);
this.xrLabel14.StylePriority.UseFont = false;
this.xrLabel14.StylePriority.UseTextAlignment = false;
this.xrLabel14.Text = "Fallverantwortliche Fachkraft: [MainAttendant]";
this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// Quittierungsbeleg
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -797,5 +812,6 @@ namespace BeWoSchillingReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLabel xrLabel14;
}
}

View File

@@ -32,6 +32,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.Data.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Mvvm.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<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" />

View File

@@ -39,6 +39,7 @@ namespace BeWoWalzPaiva
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.rtAnschrift1 = new DevExpress.XtraReports.UI.XRRichText();
this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
@@ -81,7 +82,6 @@ namespace BeWoWalzPaiva
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.rtAnschrift1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
@@ -165,6 +165,21 @@ namespace BeWoWalzPaiva
this.Page1.Name = "Page1";
this.Page1.StylePriority.UseFont = false;
//
// xrLabel4
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 235F);
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(650F, 20F);
this.xrLabel4.StylePriority.UseBackColor = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "IK-Nummer: 490 5040 21";
this.xrLabel4.WordWrap = false;
//
// xrLabel11
//
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(494.29F, 50F);
@@ -218,7 +233,7 @@ namespace BeWoWalzPaiva
this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 20F);
this.xrLabel3.StylePriority.UseBackColor = false;
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [CustomerSalutation] [CustomerName]";
this.xrLabel3.Text = "Abrechnung Soziotherapieleistungen für [CustomerSalutation] [CustomerName]";
this.xrLabel3.WordWrap = false;
//
// xrLabel2
@@ -688,21 +703,6 @@ namespace BeWoWalzPaiva
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO);
//
// xrLabel4
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 235F);
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(650F, 20F);
this.xrLabel4.StylePriority.UseBackColor = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "IK-Nummer: 490 5040 21";
this.xrLabel4.WordWrap = false;
//
// ServiceInvoiceReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

View File

@@ -60,7 +60,14 @@
<Compile Include="BudgetnachweisAnhang.Designer.cs">
<DependentUpon>BudgetnachweisAnhang.cs</DependentUpon>
</Compile>
<Compile Include="Calculations\CustomDurationCalculator.cs" />
<Compile Include="CustomReportCreator.cs" />
<Compile Include="InvoiceCustomerReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="InvoiceCustomerReport.Designer.cs">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Budgetnachweis2.cs">
<SubType>Component</SubType>
@@ -68,6 +75,18 @@
<Compile Include="Budgetnachweis2.Designer.cs">
<DependentUpon>Budgetnachweis2.cs</DependentUpon>
</Compile>
<Compile Include="Quittierungsbeleg.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Quittierungsbeleg.Designer.cs">
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
</Compile>
<Compile Include="ServiceInvoiceReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="ServiceInvoiceReport.Designer.cs">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
</Compile>
<Compile Include="SettlementReport.cs">
<SubType>Component</SubType>
</Compile>
@@ -108,11 +127,23 @@
<DependentUpon>BudgetnachweisAnhang.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="InvoiceCustomerReport.resx">
<DependentUpon>InvoiceCustomerReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Budgetnachweis2.resx">
<DependentUpon>Budgetnachweis2.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Quittierungsbeleg.resx">
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ServiceInvoiceReport.resx">
<DependentUpon>ServiceInvoiceReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="SettlementReport.resx">
<DependentUpon>SettlementReport.cs</DependentUpon>
<SubType>Designer</SubType>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

View File

@@ -0,0 +1,88 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Plugins;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BS.Shared.Services;
namespace Biotop
{
public class CustomDurationCalculator : ServiceRecordDurationCalculator
{
public override void CalculateRoundedDuration(ServiceRecord sr)
{
if (sr.CostBearer2SupportConcept != null && sr.ServiceDescription.ServiceCategory != null &&
sr.ServiceDescription.ServiceCategory.IsBillable)
{
var durationInMinutes = (decimal)sr.End.Value.Subtract(sr.Start.Value).TotalMinutes;
Calculations calc = Calculations.GetInstance(sr.CostBearer2SupportConcept.CostBearer.ID);
var org = MapperFactory.CompactOrganisationDC_Organisation.MapToNewDC(
sr.CostBearer2SupportConcept.CostBearer.Organisation);
String function = "";
if (org.Function != null)
function = org.Function;
if (function != "Klassische Rundung")
{
int minuteInterval = org.ActualMinuteIntervall;
decimal lRoundedDuration = durationInMinutes;
if (minuteInterval > 0 && durationInMinutes >= 5)
{
lRoundedDuration = durationInMinutes % minuteInterval != 0
? durationInMinutes + (minuteInterval - (durationInMinutes % minuteInterval))
: durationInMinutes;
}
sr.RoundedDuration = (int)Math.Round(lRoundedDuration, 0, MidpointRounding.AwayFromZero);
}
else
base.CalculateRoundedDuration(sr);
}
else
sr.RoundedDuration = (decimal)sr.End.Value.Subtract(sr.Start.Value).TotalMinutes;
}
public override void CalculateRoundedDuration(ServiceRecordDC sr)
{
if (sr.ServiceDescription.Category != null && sr.ServiceDescription.Category.IsBillable && sr.CostBearer != null)
{
var durationInMinutes = (decimal)sr.End.Value.Subtract(sr.Start.Value).TotalMinutes;
Calculations calc = Calculations.GetInstance(sr.CostBearer.CostBearerID);
var orgFunc = DAOFactory.GenericDAO.LoadByID<Organisation>(sr.CostBearer.OrganisationOid);
var org = sr.CostBearer;
String function = "";
if (orgFunc.Function != null)
function = orgFunc.Function.Value;
if (function != "Klassische Rundung")
{
int minuteInterval = org.ActualMinuteIntervall;
decimal lRoundedDuration = durationInMinutes;
if (minuteInterval > 0 && durationInMinutes >= 5)
{
lRoundedDuration = durationInMinutes % minuteInterval != 0
? durationInMinutes + (minuteInterval - (durationInMinutes % minuteInterval))
: durationInMinutes;
}
sr.RoundedDuration = (int)Math.Round(lRoundedDuration, 0, MidpointRounding.AwayFromZero);
}
else
base.CalculateRoundedDuration(sr);
}
else
sr.RoundedDuration = (decimal)sr.End.Value.Subtract(sr.Start.Value).TotalMinutes;
}
}
}

View File

@@ -0,0 +1,845 @@
using BeWo.Report.ReportObjects;
namespace Biotop
{
partial class InvoiceCustomerReport
{
/// <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();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InvoiceCustomerReport));
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
this.lblNotice = new DevExpress.XtraReports.UI.XRLabel();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.lblAddress = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).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;
//
// xrTable1
//
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9});
this.xrTable1.SizeF = new System.Drawing.SizeF(671.4175F, 25F);
this.xrTable1.StylePriority.UseFont = false;
//
// xrTableRow9
//
this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell6,
this.xrTableCell7,
this.xrTableCell9,
this.xrTableCell14,
this.xrTableCell10,
this.xrTableCell12});
this.xrTableRow9.Name = "xrTableRow9";
this.xrTableRow9.Weight = 1D;
//
// xrTableCell6
//
this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AccountingPeriodStart")});
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell6.StylePriority.UseBorders = false;
this.xrTableCell6.StylePriority.UsePadding = false;
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.Text = "xrTableCell6";
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell6.Weight = 1D;
//
// xrTableCell7
//
this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AccountingPeriodEnd")});
this.xrTableCell7.Name = "xrTableCell7";
this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell7.StylePriority.UseBorders = false;
this.xrTableCell7.StylePriority.UsePadding = false;
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "xrTableCell7";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell7.Weight = 1D;
//
// xrTableCell9
//
this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.ItemDescription")});
this.xrTableCell9.Name = "xrTableCell9";
this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell9.StylePriority.UseBorders = false;
this.xrTableCell9.StylePriority.UsePadding = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "xrTableCell9";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell9.Weight = 2.3350077713203072D;
//
// xrTableCell14
//
this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitPrice")});
this.xrTableCell14.Name = "xrTableCell14";
this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell14.StylePriority.UseBorders = false;
this.xrTableCell14.StylePriority.UsePadding = false;
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.Text = "xrTableCell14";
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell14.Weight = 0.81217660612832132D;
//
// xrTableCell10
//
this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitCount", "{0:0.##}")});
this.xrTableCell10.Name = "xrTableCell10";
this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell10.StylePriority.UseBorders = false;
this.xrTableCell10.StylePriority.UsePadding = false;
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "xrTableCell10";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell10.Weight = 0.6539656324947265D;
//
// xrTableCell12
//
this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.AmountSum")});
this.xrTableCell12.Name = "xrTableCell12";
this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
this.xrTableCell12.StylePriority.UseBorders = false;
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.Text = "xrTableCell12";
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell12.Weight = 1.0152204985905673D;
//
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblAddress,
this.xrLabel1,
this.xrLabel11,
this.xrTable2,
this.xrLabel9,
this.xrLabel13,
this.xrTable3,
this.xrLabel6,
this.xrLabel5,
this.xrLabel4,
this.xrLabel3,
this.xrLabel2});
this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportHeader.HeightF = 518.875F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
// xrLabel1
//
this.xrLabel1.BorderColor = System.Drawing.Color.Gray;
this.xrLabel1.Font = new System.Drawing.Font("Arial", 8F);
this.xrLabel1.ForeColor = System.Drawing.Color.Gray;
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.69304F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrLabel1.SizeF = new System.Drawing.SizeF(292F, 20.00001F);
this.xrLabel1.StylePriority.UseBorderColor = false;
this.xrLabel1.StylePriority.UseFont = false;
this.xrLabel1.StylePriority.UseForeColor = false;
this.xrLabel1.Text = "Biotop e.V. - Heedfelder Str. 28a - 58509 Lüdenscheid\r\n";
//
// xrLabel11
//
this.xrLabel11.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(420.2293F, 43.69304F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(256.6039F, 20.00001F);
this.xrLabel11.StylePriority.UseFont = false;
this.xrLabel11.StylePriority.UseTextAlignment = false;
this.xrLabel11.Text = "Biotop e.V.";
this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTable2
//
this.xrTable2.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTable2.Font = new System.Drawing.Font("Arial", 9F);
this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(420.229F, 97.69306F);
this.xrTable2.Name = "xrTable2";
this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2,
this.xrTableRow5,
this.xrTableRow3,
this.xrTableRow1,
this.xrTableRow4,
this.xrTableRow6,
this.xrTableRow7});
this.xrTable2.SizeF = new System.Drawing.SizeF(256.6039F, 131F);
this.xrTable2.StylePriority.UseBorders = false;
this.xrTable2.StylePriority.UseFont = false;
//
// xrTableRow2
//
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell4});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Weight = 0.13245033112582783D;
//
// xrTableCell4
//
this.xrTableCell4.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell4.CanShrink = true;
this.xrTableCell4.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold);
this.xrTableCell4.Name = "xrTableCell4";
this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell4.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell4.StylePriority.UseBorders = false;
this.xrTableCell4.StylePriority.UseFont = false;
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Ansprechpartner/in:";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell4.Weight = 1D;
//
// xrTableRow5
//
this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell13});
this.xrTableRow5.Name = "xrTableRow5";
this.xrTableRow5.Weight = 0.13245033112582783D;
//
// xrTableCell13
//
this.xrTableCell13.CanShrink = true;
this.xrTableCell13.Font = new System.Drawing.Font("Verdana", 9F);
this.xrTableCell13.Name = "xrTableCell13";
this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell13.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell13.StylePriority.UseBorders = false;
this.xrTableCell13.StylePriority.UseFont = false;
this.xrTableCell13.StylePriority.UseTextAlignment = false;
this.xrTableCell13.Text = "Frau Birgit Reinersmann";
this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell13.Weight = 1D;
//
// xrTableRow3
//
this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell8});
this.xrTableRow3.Name = "xrTableRow3";
this.xrTableRow3.Weight = 0.13245033112582783D;
//
// xrTableCell8
//
this.xrTableCell8.CanShrink = true;
this.xrTableCell8.Font = new System.Drawing.Font("Verdana", 9F);
this.xrTableCell8.Name = "xrTableCell8";
this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell8.StylePriority.UseBorders = false;
this.xrTableCell8.StylePriority.UseFont = false;
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "Tel: +49(0) 2351 - 9 26 45 78";
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell8.Weight = 1D;
//
// xrTableRow1
//
this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell1});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 0.13245033112582783D;
//
// xrTableCell1
//
this.xrTableCell1.CanShrink = true;
this.xrTableCell1.Font = new System.Drawing.Font("Verdana", 9F);
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell1.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell1.StylePriority.UseBorders = false;
this.xrTableCell1.StylePriority.UseFont = false;
this.xrTableCell1.StylePriority.UseTextAlignment = false;
this.xrTableCell1.Text = "Fax: +49(0) 2351 - 9 26 53 25";
this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell1.Weight = 1D;
//
// xrTableRow4
//
this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3});
this.xrTableRow4.Name = "xrTableRow4";
this.xrTableRow4.Weight = 0.11258278145695365D;
//
// xrTableCell3
//
this.xrTableCell3.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell3.Name = "xrTableCell3";
this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell3.StylePriority.UseBorders = false;
this.xrTableCell3.StylePriority.UsePadding = false;
this.xrTableCell3.StylePriority.UseTextAlignment = false;
this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell3.Weight = 1D;
//
// xrTableRow6
//
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell2});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Weight = 0.11258278145695365D;
//
// xrTableCell2
//
this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell2.CanShrink = true;
this.xrTableCell2.Font = new System.Drawing.Font("Verdana", 9F);
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell2.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
this.xrTableCell2.StylePriority.UseBorders = false;
this.xrTableCell2.StylePriority.UseFont = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.Text = "E-mail: b.reinersmann@biotop-mk.de";
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell2.Weight = 1D;
//
// xrTableRow7
//
this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell5});
this.xrTableRow7.Name = "xrTableRow7";
this.xrTableRow7.Weight = 0.11258278145695365D;
//
// xrTableCell5
//
this.xrTableCell5.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.xrTableCell5.Font = new System.Drawing.Font("Verdana", 9F);
this.xrTableCell5.Name = "xrTableCell5";
this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell5.StylePriority.UseBorders = false;
this.xrTableCell5.StylePriority.UseFont = false;
this.xrTableCell5.StylePriority.UsePadding = false;
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "Web: www.biotop-mk.de";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
this.xrTableCell5.Weight = 1D;
//
// xrLabel9
//
this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate", "Datum: {0}")});
this.xrLabel9.Font = new System.Drawing.Font("Verdana", 9F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(420.229F, 240.5986F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel9.SizeF = new System.Drawing.SizeF(256.6039F, 20.00001F);
this.xrLabel9.StylePriority.UseFont = false;
this.xrLabel9.StylePriority.UseTextAlignment = false;
this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrLabel13
//
this.xrLabel13.Font = new System.Drawing.Font("Verdana", 9F);
this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(420.229F, 63.69305F);
this.xrLabel13.Name = "xrLabel13";
this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel13.SizeF = new System.Drawing.SizeF(256.6039F, 20.00001F);
this.xrLabel13.StylePriority.UseFont = false;
this.xrLabel13.StylePriority.UseTextAlignment = false;
this.xrLabel13.Text = "Heedfelder Str. 28a, 58509 Lüdenscheid";
this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
// xrTable3
//
this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 493.8749F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow10});
this.xrTable3.SizeF = new System.Drawing.SizeF(671.4175F, 25F);
this.xrTable3.StylePriority.UseFont = false;
//
// xrTableRow10
//
this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell15,
this.xrTableCell16,
this.xrTableCell17,
this.xrTableCell18,
this.xrTableCell19,
this.xrTableCell20});
this.xrTableRow10.Name = "xrTableRow10";
this.xrTableRow10.Weight = 1D;
//
// xrTableCell15
//
this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell15.Name = "xrTableCell15";
this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell15.StylePriority.UseBorders = false;
this.xrTableCell15.StylePriority.UsePadding = false;
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.Text = "Von";
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell15.Weight = 1D;
//
// xrTableCell16
//
this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell16.Name = "xrTableCell16";
this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell16.StylePriority.UseBorders = false;
this.xrTableCell16.StylePriority.UsePadding = false;
this.xrTableCell16.StylePriority.UseTextAlignment = false;
this.xrTableCell16.Text = "Bis";
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell16.Weight = 1D;
//
// xrTableCell17
//
this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell17.Name = "xrTableCell17";
this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell17.StylePriority.UseBorders = false;
this.xrTableCell17.StylePriority.UsePadding = false;
this.xrTableCell17.StylePriority.UseTextAlignment = false;
this.xrTableCell17.Text = "Posten";
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell17.Weight = 2.3350077713203934D;
//
// xrTableCell18
//
this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell18.Name = "xrTableCell18";
this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell18.StylePriority.UseBorders = false;
this.xrTableCell18.StylePriority.UsePadding = false;
this.xrTableCell18.StylePriority.UseTextAlignment = false;
this.xrTableCell18.Text = "Satz";
this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell18.Weight = 0.81217660612829246D;
//
// xrTableCell19
//
this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F);
this.xrTableCell19.StylePriority.UseBorders = false;
this.xrTableCell19.StylePriority.UsePadding = false;
this.xrTableCell19.StylePriority.UseTextAlignment = false;
this.xrTableCell19.Text = "Anzahl";
this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell19.Weight = 0.6539656324946691D;
//
// xrTableCell20
//
this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F);
this.xrTableCell20.StylePriority.UseBorders = false;
this.xrTableCell20.StylePriority.UsePadding = false;
this.xrTableCell20.StylePriority.UseTextAlignment = false;
this.xrTableCell20.Text = "Betrag";
this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell20.Weight = 1.0152204985905673D;
//
// xrLabel6
//
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 446.875F);
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(666.9999F, 23.25F);
this.xrLabel6.StylePriority.UseFont = false;
this.xrLabel6.Text = "für den Betreuungszeitraum [AccountingPeriod] berechnen wir folgende Leistungen:";
//
// xrLabel5
//
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 413.875F);
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(581.4177F, 17.00003F);
this.xrLabel5.StylePriority.UseFont = false;
this.xrLabel5.Text = "[RecipientSalutation]";
//
// xrLabel4
//
this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
this.xrLabel4.CanShrink = true;
this.xrLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 363.875F);
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(650F, 17F);
this.xrLabel4.StylePriority.UseBackColor = false;
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "[CustomerReferenceNumber]";
this.xrLabel4.WordWrap = false;
//
// xrLabel3
//
this.xrLabel3.BackColor = System.Drawing.Color.Transparent;
this.xrLabel3.CanShrink = true;
this.xrLabel3.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 346.875F);
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);
this.xrLabel3.StylePriority.UseBackColor = false;
this.xrLabel3.StylePriority.UseFont = false;
this.xrLabel3.Text = "Abrechnung über Betreuungsleistungen";
this.xrLabel3.WordWrap = false;
//
// xrLabel2
//
this.xrLabel2.BackColor = System.Drawing.Color.Transparent;
this.xrLabel2.CanShrink = true;
this.xrLabel2.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 321.875F);
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);
this.xrLabel2.StylePriority.UseBackColor = false;
this.xrLabel2.StylePriority.UseFont = false;
this.xrLabel2.Text = "Rechnung Nr. [InvoiceNumber]";
this.xrLabel2.WordWrap = false;
//
// ruleRateFactorNull
//
this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
this.ruleRateFactorNull.Name = "ruleRateFactorNull";
//
// ReportFooter
//
this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel8,
this.xrLabel10,
this.xrLabel12,
this.lblNotice,
this.xrTable4});
this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F);
this.ReportFooter.HeightF = 247.5417F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// xrLabel8
//
this.xrLabel8.CanShrink = true;
this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 75F);
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(677F, 18.04168F);
this.xrLabel8.StylePriority.UseFont = false;
this.xrLabel8.Text = "[Notice]";
//
// xrLabel10
//
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 155.5417F);
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);
this.xrLabel10.StylePriority.UseFont = false;
this.xrLabel10.Text = "Mit freundlichen Grüßen";
//
// xrLabel12
//
this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 230.5417F);
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);
this.xrLabel12.StylePriority.UseFont = false;
this.xrLabel12.Text = "[CreatorFirstName] [CreatorLastName]";
//
// lblNotice
//
this.lblNotice.CanShrink = true;
this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic);
this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 46.54166F);
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);
this.lblNotice.StylePriority.UseFont = false;
this.lblNotice.Text = "Abschließende Bemerkungen:";
//
// xrTable4
//
this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(570.5F, 0F);
this.xrTable4.Name = "xrTable4";
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow11});
this.xrTable4.SizeF = new System.Drawing.SizeF(101F, 25F);
//
// xrTableRow11
//
this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell23});
this.xrTableRow11.Name = "xrTableRow11";
this.xrTableRow11.Weight = 1D;
//
// xrTableCell23
//
this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell23.BorderWidth = 2F;
this.xrTableCell23.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold);
this.xrTableCell23.Name = "xrTableCell23";
this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F);
this.xrTableCell23.StylePriority.UseBorders = false;
this.xrTableCell23.StylePriority.UseBorderWidth = false;
this.xrTableCell23.StylePriority.UseFont = false;
this.xrTableCell23.StylePriority.UsePadding = false;
this.xrTableCell23.StylePriority.UseTextAlignment = false;
this.xrTableCell23.Text = "[TotalClaim]";
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell23.Weight = 3.4827586206896557D;
//
// topMarginBand1
//
this.topMarginBand1.HeightF = 117.4167F;
this.topMarginBand1.Name = "topMarginBand1";
//
// bottomMarginBand1
//
this.bottomMarginBand1.HeightF = 100F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail1});
this.DetailReport.DataMember = "InvoiceItems";
this.DetailReport.DataSource = this.bindingSource1;
this.DetailReport.Level = 0;
this.DetailReport.Name = "DetailReport";
//
// Detail1
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
this.Detail1.Font = new System.Drawing.Font("Verdana", 9.75F);
this.Detail1.HeightF = 25F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
//
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
//
// lblAddress
//
this.lblAddress.LocationFloat = new DevExpress.Utils.PointFloat(0F, 63.69305F);
this.lblAddress.Multiline = true;
this.lblAddress.Name = "lblAddress";
this.lblAddress.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.lblAddress.SizeF = new System.Drawing.SizeF(351.375F, 131F);
this.lblAddress.StylePriority.UseFont = false;
this.lblAddress.Text = "[RecipientOrganisation]\r\n[RecipientDivision]\r\n[RecipientFirstName] [RecipientLast" +
"Name]\r\n[RecipientStreet]\r\n[RecipientPostCode] [RecipientTown]";
//
// InvoiceCustomerReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
this.Detail,
this.ReportHeader,
this.ReportFooter,
this.topMarginBand1,
this.bottomMarginBand1,
this.DetailReport});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(75, 75, 117, 100);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
this.Version = "17.1";
this.Watermark.Image = ((System.Drawing.Image)(resources.GetObject("InvoiceCustomerReport.Watermark.Image")));
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).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.ReportHeaderBand ReportHeader;
private DevExpress.XtraReports.UI.XRLabel xrLabel6;
private DevExpress.XtraReports.UI.XRLabel xrLabel5;
private DevExpress.XtraReports.UI.XRLabel xrLabel4;
private DevExpress.XtraReports.UI.XRLabel xrLabel3;
private DevExpress.XtraReports.UI.XRLabel xrLabel2;
private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
private DevExpress.XtraReports.UI.XRLabel lblNotice;
private DevExpress.XtraReports.UI.XRLabel xrLabel12;
private DevExpress.XtraReports.UI.XRLabel xrLabel10;
private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull;
private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.XRTable xrTable1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
private DevExpress.XtraReports.UI.XRTable xrTable3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow10;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRTable xrTable4;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow11;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
private DevExpress.XtraReports.UI.DetailBand Detail1;
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.XRLabel xrLabel11;
private DevExpress.XtraReports.UI.XRTable xrTable2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow7;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
private DevExpress.XtraReports.UI.XRLabel xrLabel9;
private DevExpress.XtraReports.UI.XRLabel xrLabel13;
private DevExpress.XtraReports.UI.XRLabel lblAddress;
}
}

View File

@@ -0,0 +1,54 @@
using System;
using System.Text;
using BeWo.Report;
using BeWo.Report.ReportObjects;
namespace Biotop
{
public partial class InvoiceCustomerReport : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<InvoiceCustomerRO>
{
public InvoiceCustomerReport()
{
InitializeComponent();
}
public void SetReportDataSource(InvoiceCustomerRO pRO)
{
if (String.IsNullOrEmpty(pRO.Notice))
{
lblNotice.Visible = false;
}
StringBuilder sb = new StringBuilder();
if (!String.IsNullOrEmpty(pRO.RecipientOrganisation) && !String.IsNullOrEmpty(pRO.RecipientOrganisation.Trim()))
{
sb.AppendLine(pRO.RecipientOrganisation);
}
if (!String.IsNullOrEmpty(pRO.RecipientDivision) && !String.IsNullOrEmpty(pRO.RecipientDivision.Trim()))
{
sb.AppendLine(pRO.RecipientDivision);
}
if ((!String.IsNullOrEmpty(pRO.RecipientFirstName) && !String.IsNullOrEmpty(pRO.RecipientFirstName.Trim()))
|| (!String.IsNullOrEmpty(pRO.RecipientLastName) && !String.IsNullOrEmpty(pRO.RecipientLastName.Trim())))
{
sb.AppendLine(String.Format("{0} {1}", pRO.RecipientFirstName, pRO.RecipientLastName).Trim());
}
if (!String.IsNullOrEmpty(pRO.RecipientStreet) && !String.IsNullOrEmpty(pRO.RecipientStreet.Trim()))
{
sb.AppendLine(pRO.RecipientStreet);
}
if (!String.IsNullOrEmpty(pRO.RecipientPostCode) && !String.IsNullOrEmpty(pRO.RecipientPostCode.Trim()))
{
sb.Append(pRO.RecipientPostCode);
sb.Append(" ");
}
if (!String.IsNullOrEmpty(pRO.RecipientTown) && !String.IsNullOrEmpty(pRO.RecipientTown.Trim()))
{
sb.Append(pRO.RecipientTown);
}
lblAddress.Text = sb.ToString();
this.bindingSource1.DataSource = pRO;
}
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,188 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Text.RegularExpressions;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using DevExpress.XtraReports.UI;
namespace Biotop
{
public partial class Quittierungsbeleg : XtraReport, IBeWoReport<ServicesOverviewRO>
{
public Quittierungsbeleg()
{
InitializeComponent();
}
public void SetReportDataSource(ServicesOverviewRO pRO)
{
// Get calling method name
//StackTrace stackTrace = new StackTrace();
//Debug.WriteLine(stackTrace.GetFrame(1).GetMethod().Name);
bool hatGruppen = false;
//if (pRO == null)
// return;
if (pRO.Services != null)
{
List<ServicesOverviewRO.ServiceDetail> servicesBillable = new List<ServicesOverviewRO.ServiceDetail>();
foreach (var sd in pRO.Services)
{
if (sd.IsBillable)
{
ServicesOverviewRO.CreateSignatureString(sd);
if (sd.IsGroup)
{
//sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);
hatGruppen = true;
}
servicesBillable.Add(sd);
}
}
pRO.Services = servicesBillable;
}
if (String.IsNullOrWhiteSpace(pRO.AbsenceTimes))
{
lblHatAbwesenheiten.Text = "X";
}
if (!hatGruppen)
{
lblHatGruppen.Text = "X";
}
ErstelleAbwesenheitenTabelle(pRO);
bindingSource1.DataSource = pRO;
}
private void ErstelleAbwesenheitenTabelle(ServicesOverviewRO pRo)
{
if (pRo.Abwesenheiten != null)
{
int newRows = 0;
int index = 1;
foreach (var at in pRo.Abwesenheiten)
{
DevExpress.XtraReports.UI.XRTableRow row = null;
if (index < xrTableAbwesenheiten.Rows.Count)
{
row = xrTableAbwesenheiten.Rows[index];
}
else
{
row = xrTableAbwesenheiten.InsertRowBelow(xrTableAbwesenheiten.Rows[xrTableAbwesenheiten.Rows.Count - 1]);
newRows++;
}
row.Cells[0].Text = String.Format("{0:dd.MM.yyyy}", at.Start);
int? days = null;
if (at.End.HasValue)
{
row.Cells[1].Text = String.Format("{0:dd.MM.yyyy}", at.End);
days = (int)at.End.Value.Subtract(at.Start.Value).TotalDays + 1;
}
else
{
row.Cells[1].Text = "unbekannt";
}
row.Cells[2].Text = String.Format("{0:0}", days);
index++;
}
if (newRows > 0)
{
lblUnterschriftKlient.Top += newRows * 20;
lblUnterschriftMitarbeiter.Top += newRows * 20;
}
}
}
// TODO: Wie anzeigen? Alle?
private void EmployeeSignature_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs e)
{
return;
if(sender is XRPictureBox pictureBox)
{
var base64String = pictureBox.Tag as string;
if(!string.IsNullOrWhiteSpace(base64String))
{
var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
var binaryData = Convert.FromBase64String(base64Data);
var image = ByteArrayToImage(binaryData);
pictureBox.Image = image;
}
else
{
pictureBox.Image = null;
}
}
}
// TODO: Wie anzeigen? Alle?
// TODO: Visibile der Datumstextboxen auf true setzen!
private void CustomerSignature_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs e)
{
return;
if(sender is XRPictureBox pictureBox)
{
var base64String = pictureBox.Tag as string;
if(!string.IsNullOrWhiteSpace(base64String))
{
var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
var binaryData = Convert.FromBase64String(base64Data);
var image = ByteArrayToImage(binaryData);
pictureBox.Image = image;
}
else
{
pictureBox.Image = null;
}
}
}
private void picSignature_BeforePrint(object sender, System.Drawing.Printing.PrintEventArgs e)
{
XRPictureBox xrBox = sender as XRPictureBox;
//var test = this.GetCurrent
string base64String = xrBox.Tag as string;
if (!String.IsNullOrWhiteSpace(base64String))
{
var base64Data = Regex.Match(base64String, @"data:image/(?<type>.+?),(?<data>.+)").Groups["data"].Value;
var binData = Convert.FromBase64String(base64Data);
Image img = ByteArrayToImage(binData);
xrBox.Image = Utils.CropImage(img);
}
else
{
xrBox.Image = null;
}
}
public Image ByteArrayToImage(byte[] byteArrayIn)
{
using(var memoryStream = new MemoryStream(byteArrayIn))
{
return Image.FromStream(memoryStream);
}
}
}
}

View File

@@ -0,0 +1,129 @@
<?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>21, 17</value>
</metadata>
<data name="xrRichText2.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEsAZQBpAG4AZQAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXAB1AGwAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABLAHIAYQBuAGsAZQBuAGgAYQB1AHMAYQB1AGYAZQBuAHQAaABhAGwAdABlAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAYgBlAGsAYQBuAG4AdAAgAG8AZABlAHIAIAB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAGEAYgByAGUAYwBoAG4AdQBuAGcAcwByAGUAbABlAHYAYQBuAHQAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAaQBtACAAQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
</data>
<data name="xrRichText1.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEsAZQBpAG4AZQAgAH0AewBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEcAcgB1AHAAcABlAG4AYQBuAGcAZQBiAG8AdABlAH0AewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAaQBtACAAQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=</value>
</data>
</root>

View File

@@ -1,9 +1,10 @@
using System;
using BeWo.Report.ReportObjects;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using DevExpress.XtraReports.UI;
namespace Kundexyz
namespace Biotop
{
public partial class ServiceInvoiceReport : XtraReport, IBeWoReport<ServiceInvoiceRO>
{
@@ -18,11 +19,11 @@ namespace Kundexyz
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);
lblAbrechnungszeitraum.Text = String.Format("Abrechnungszeitraum {0:MMMM yyyy}", 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);
lblAbrechnungszeitraum.Text = String.Format("Abrechnungszeitraum {0:MMMM yyyy} - {1:MMMM yyyy}", start, end);
}
this.bindingSource1.DataSource = pRO;

File diff suppressed because it is too large Load Diff

View File

@@ -86,10 +86,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\BeWo\BeWo.csproj">
<Project>{3febb560-9275-413a-9767-bb68c44eebc3}</Project>
<Name>BeWo</Name>
</ProjectReference>
<ProjectReference Include="..\..\Data\Data.csproj">
<Project>{B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE}</Project>
<Name>Data</Name>

View File

@@ -67,13 +67,23 @@ namespace DiakonieKKKleve.Invoicing
{
var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc);
bool isTelefon = false;
if (ii.ItemDescription.ToLower().Contains("telefon"))
if (ii.ItemDescription.ToLower().Contains("probe"))
{
ii.UnitDescription = "GPos: 2001607";
}
else if (ii.ItemDescription.ToLower().Contains("telefon"))
{
isTelefon = true;
}
if (!isTelefon)
if (iServiceRecord.RoundedDuration <= 30)
{
ii.UnitDescription = "GPos: 2001618";
}
else if (iServiceRecord.RoundedDuration > 30)
{
ii.UnitDescription = "GPos: 2001617";
}
}
else
{
if (iServiceRecord.RoundedDuration <= 30)
{
@@ -84,20 +94,7 @@ namespace DiakonieKKKleve.Invoicing
ii.UnitDescription = "GPos: 2001610";
}
}
else
{
if (iServiceRecord.RoundedDuration <= 30)
{
ii.UnitDescription = "GPos: 2001618";
}
else if (iServiceRecord.RoundedDuration > 30)
{
ii.UnitDescription = "GPos: 2001617";
}
}
return ii;
}

View File

@@ -65,6 +65,7 @@ namespace BeWo.DiakonieLennepReports.Alt
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAnschrift = new DevExpress.XtraReports.UI.XRLabel();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
@@ -74,7 +75,6 @@ namespace BeWo.DiakonieLennepReports.Alt
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
this.lblEndText = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
@@ -479,15 +479,23 @@ namespace BeWo.DiakonieLennepReports.Alt
this.xrLabel4,
this.xrLabel10,
this.xrLabel11});
this.ReportFooter.HeightF = 141.875F;
this.ReportFooter.HeightF = 121.9583F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// xrPictureBox3
//
this.xrPictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox3.Image")));
this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.22215F);
this.xrPictureBox3.Name = "xrPictureBox3";
this.xrPictureBox3.SizeF = new System.Drawing.SizeF(115.955F, 58.52782F);
this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel5
//
this.xrLabel5.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 117.7083F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100.9166F);
this.xrLabel5.Multiline = true;
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -497,13 +505,13 @@ namespace BeWo.DiakonieLennepReports.Alt
//
// xrLabel4
//
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 78.74998F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 78.75F);
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(244.79F, 38F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(244.79F, 22.16665F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "i.A.\r\nDaniela Wirth";
this.xrLabel4.Text = "i.A. Daniela Wirth";
//
// xrLabel10
//
@@ -516,7 +524,7 @@ namespace BeWo.DiakonieLennepReports.Alt
//
// xrLabel11
//
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(538.2083F, 111.875F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(538.2084F, 100.9166F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(89.91669F, 20F);
@@ -563,14 +571,6 @@ namespace BeWo.DiakonieLennepReports.Alt
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
//
// xrPictureBox3
//
this.xrPictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox3.Image")));
this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.22215F);
this.xrPictureBox3.Name = "xrPictureBox3";
this.xrPictureBox3.SizeF = new System.Drawing.SizeF(115.955F, 58.52782F);
this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

View File

@@ -40,6 +40,7 @@ namespace BeWo.DiakonieLennepReports
this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.lblAnschrift = new DevExpress.XtraReports.UI.XRLabel();
this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
@@ -67,7 +68,6 @@ namespace BeWo.DiakonieLennepReports
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.lblEndText = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -162,15 +162,23 @@ namespace BeWo.DiakonieLennepReports
this.xrLabel4,
this.xrLabel10,
this.xrLabel11});
this.ReportFooter.HeightF = 138.75F;
this.ReportFooter.HeightF = 122.5695F;
this.ReportFooter.KeepTogether = true;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// xrPictureBox3
//
this.xrPictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox3.Image")));
this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00001F);
this.xrPictureBox3.Name = "xrPictureBox3";
this.xrPictureBox3.SizeF = new System.Drawing.SizeF(115.955F, 58.52782F);
this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// xrLabel5
//
this.xrLabel5.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0.001716614F, 117.4862F);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 101.5278F);
this.xrLabel5.Multiline = true;
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -180,13 +188,13 @@ namespace BeWo.DiakonieLennepReports
//
// xrLabel4
//
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.001716614F, 78.52783F);
this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.001627604F, 78.52783F);
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(244.79F, 38F);
this.xrLabel4.SizeF = new System.Drawing.SizeF(244.79F, 22.99998F);
this.xrLabel4.StylePriority.UseFont = false;
this.xrLabel4.Text = "i.A.\r\nDaniela Wirth";
this.xrLabel4.Text = "i.A. Daniela Wirth";
//
// xrLabel10
//
@@ -199,7 +207,7 @@ namespace BeWo.DiakonieLennepReports
//
// xrLabel11
//
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(538.2083F, 117.4862F);
this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(538.2084F, 101.5278F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel11.SizeF = new System.Drawing.SizeF(89.91669F, 20F);
@@ -454,14 +462,6 @@ namespace BeWo.DiakonieLennepReports
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
// xrPictureBox3
//
this.xrPictureBox3.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox3.Image")));
this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00001F);
this.xrPictureBox3.Name = "xrPictureBox3";
this.xrPictureBox3.SizeF = new System.Drawing.SizeF(115.955F, 58.52782F);
this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
//
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

View File

@@ -1,10 +1,13 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BeWo.Service.DCEntityMapper;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using DevExpress.XtraReports.UI;
@@ -12,6 +15,75 @@ namespace DomizielAnsbach
{
public class CustomReportCreator : DefaultReportCreator
{
public override XtraReport CreateQueryReport(long queryOid, string queryReportId)
{
if (queryOid == 100)
{
return CreateEinschaetzungsbogen(queryOid, queryReportId);
}
return base.CreateQueryReport(queryOid, queryReportId);
}
private XtraReport CreateEinschaetzungsbogen(long queryOid, string queryReportId)
{
var query = DAOFactory.GenericDAO.LoadByID<Query>(queryOid);
if (query == null)
return new XtraReport();
var path = Path.Combine(TempPath, queryReportId + ".xml");
var table = Utils.XMLDeserialize<DataTable>(path);
var qro = QueryRO.Create(query, table);
if (qro.Rows.Count > 0)
{
DateTime monat = DateTime.Parse(qro.Rows[0].Field1.ToString());
long? customerOid = null;
if (qro.Rows[0].Field2 != null && qro.Rows[0].Field2.ToString() != "0")
{
customerOid = Int64.Parse(qro.Rows[0].Field2.ToString());
var customer = DAOFactory.GenericDAO.LoadByID<Customer>(customerOid.Value);
}
if (customerOid == null)
{
var customerList = DAOFactory.GenericDAO.GetAllActive<Customer>();
foreach (var customer in customerList)
{
//Hat er Zuverdienst?
}
}
//var ro = new ZahlungslisteUdRO();
//ro.StartDate = monat;
//var report = new ZahlungslisteUd();
//report.SetReportDataSource(ro);
//return report as XtraReport;
}
return new XtraReport();
}
private XtraReport CreateEinschaetzungsbogen(Customer c)
{
//Hole den SupportConcept
return new XtraReport();
}
public override XtraReport CreateServiceInvoiceReport(String dcIds, long? invoiceBaseOid)
{
if (String.IsNullOrEmpty(dcIds) && invoiceBaseOid.HasValue)

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,23 @@
using System;
using System.Drawing;
using System.Collections;
using System.ComponentModel;
using DevExpress.XtraReports.UI;
using BeWo.Report.ReportObjects;
using BeWo.Report;
namespace DomizielAnsbach
{
public partial class Klientenstammblatt : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<CustomerDataRO>
{
public Klientenstammblatt()
{
InitializeComponent();
}
public void SetReportDataSource(CustomerDataRO pRO)
{
this.bindingSource1.DataSource = pRO;
}
}
}

View File

@@ -48,6 +48,12 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="CustomerDataReport.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="CustomerDataReport.Designer.cs">
<DependentUpon>CustomerDataReport.cs</DependentUpon>
</Compile>
<Compile Include="CustomReportCreator.cs" />
<Compile Include="Invoicing\InvoiceHelper.cs" />
<Compile Include="Invoicing\PBInvoiceCreation.cs" />
@@ -138,6 +144,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="CustomerDataReport.resx">
<DependentUpon>CustomerDataReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="QuittierungsbelegAbw.resx">
<DependentUpon>QuittierungsbelegAbw.cs</DependentUpon>
</EmbeddedResource>

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