diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 0fb39222f..8e5bddff6 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -16,7 +16,7 @@
true
Internet
true
- true
+ false
8CA4066C36C87B745E4016FDA715A6DB16FCFFA9
@@ -43,12 +43,12 @@
de-DE
BeWoPlaner
beyondSoft GmbH
- 2.0.1.220
+ 2.0.1.221
true
publish.htm
false
true
- 221
+ 222
2.0.1.%2a
false
true
diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index ebd0c6214..72d000bba 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -49,8 +49,8 @@ namespace BeWo
public static LoginControl LoginControl;
public static MainControl MainControl;
- public static string ShortVersion = "3.13";
- public static string Version = "Version 3.13";
+ public static string ShortVersion = "3.14";
+ public static string Version = "Version 3.14";
public static int RenderTier = 0;
diff --git a/BeWo/ServiceProxy/ServiceFacade.cs b/BeWo/ServiceProxy/ServiceFacade.cs
index 26c15d9a2..45b2a849a 100644
--- a/BeWo/ServiceProxy/ServiceFacade.cs
+++ b/BeWo/ServiceProxy/ServiceFacade.cs
@@ -885,6 +885,10 @@ namespace BeWo.ServiceProxy
{
BeWoApp.ShowError(rowUpdated, e, false);
}
+ else if (!String.IsNullOrEmpty(lBeWoFault.Message) && lBeWoFault.Message.IndexOf("überschreitet") >= 0 && lBeWoFault.Message.IndexOf("erlaubte Größe") >= 0)
+ {
+ BeWoApp.ShowError(lBeWoFault.Message, e, false);
+ }
else
{
if (!String.IsNullOrEmpty(lBeWoFault.Message))
diff --git a/BeWo/View/Detail/TextbausteinView.xaml b/BeWo/View/Detail/TextbausteinView.xaml
index 1e2d22fbe..476fc77dd 100644
--- a/BeWo/View/Detail/TextbausteinView.xaml
+++ b/BeWo/View/Detail/TextbausteinView.xaml
@@ -112,18 +112,12 @@
-
-
-
-
-
-
-
+
+
-
-
+ IsEnabled="{Binding Path=DataContext.RowData.Row, Converter={StaticResource IsOnlyForEmployeeRightsConverter}, RelativeSource={RelativeSource TemplatedParent}}" AcceptsReturn="True" AcceptsTab="True" TextTrimming="WordEllipsis" TextWrapping="Wrap" SelectAllOnGotFocus="False" SelectAllOnMouseUp="False" />
+
+
diff --git a/BeWo/View/Detail/TextbausteinView.xaml.cs b/BeWo/View/Detail/TextbausteinView.xaml.cs
index 764718755..68f8f1e94 100644
--- a/BeWo/View/Detail/TextbausteinView.xaml.cs
+++ b/BeWo/View/Detail/TextbausteinView.xaml.cs
@@ -317,6 +317,18 @@ namespace BeWo.View.Detail
ViewModel.AddNewVMToList(false);
Save();
}
+
+ // private void PART_Editor_GotFocus(object sender, RoutedEventArgs e)
+ // {
+ // var te = sender as TextEdit;
+ // if (te != null)
+ // {
+ // if (te.SelectionLength > 0)
+ // {
+
+ // }
+ // }
+ // }
}
public class IsOnlyForEmployeeRightsConverter : IValueConverter
diff --git a/BeWo/View/ExceptionMessageBox.xaml b/BeWo/View/ExceptionMessageBox.xaml
index d4a785e01..c603e00c9 100644
--- a/BeWo/View/ExceptionMessageBox.xaml
+++ b/BeWo/View/ExceptionMessageBox.xaml
@@ -26,7 +26,11 @@
-
+
+
+
+
+
diff --git a/BeWo/View/ExceptionMessageBox.xaml.cs b/BeWo/View/ExceptionMessageBox.xaml.cs
index 38e9611f4..dc8959a54 100644
--- a/BeWo/View/ExceptionMessageBox.xaml.cs
+++ b/BeWo/View/ExceptionMessageBox.xaml.cs
@@ -39,6 +39,11 @@ namespace BeWo.View
contentError.Visibility = Visibility.Visible;
}
}
+
+ private void Button_SendToSupport_Click(object sender, RoutedEventArgs e)
+ {
+
+ }
private void Button_Click(object sender, RoutedEventArgs e)
{
diff --git a/BeWo/View/Master/AdministrationView.xaml b/BeWo/View/Master/AdministrationView.xaml
index 0c31e1573..2c16d0bf3 100644
--- a/BeWo/View/Master/AdministrationView.xaml
+++ b/BeWo/View/Master/AdministrationView.xaml
@@ -59,7 +59,7 @@
-
+
diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln
index 618689bbb..0eba8c763 100644
--- a/BeWoAllReports.sln
+++ b/BeWoAllReports.sln
@@ -778,6 +778,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChristineHoelzmann", "Repor
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SKFMMonheim", "ReportImp\SKFMMonheim\SKFMMonheim.csproj", "{45389304-8557-440E-8B9B-102F34958E8A}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZanderBeWo", "ReportImp\ZanderBeWo\ZanderBeWo.csproj", "{8725A58B-AB80-4906-9B13-2D4144FF09EA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET
@@ -9497,6 +9499,30 @@ Global
{45389304-8557-440E-8B9B-102F34958E8A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{45389304-8557-440E-8B9B-102F34958E8A}.Release|x86.ActiveCfg = Release|Any CPU
{45389304-8557-440E-8B9B-102F34958E8A}.Release|x86.Build.0 = Release|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Debug|.NET.ActiveCfg = Debug|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Debug|.NET.Build.0 = Debug|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Debug|x86.Build.0 = Debug|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.DebugRemote|.NET.Build.0 = Debug|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.DebugRemote|x86.ActiveCfg = Debug|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.DebugRemote|x86.Build.0 = Debug|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Release|.NET.ActiveCfg = Release|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Release|.NET.Build.0 = Release|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Release|x86.ActiveCfg = Release|Any CPU
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -9884,6 +9910,7 @@ Global
{0D1F2C60-CE9E-44DC-968D-6A9C59BF38C8} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{A2EFCD9D-F8BC-44FB-8FA0-708F4785808B} = {D8A691C5-146D-4613-86CC-438F02FE9106}
{45389304-8557-440E-8B9B-102F34958E8A} = {D8A691C5-146D-4613-86CC-438F02FE9106}
+ {8725A58B-AB80-4906-9B13-2D4144FF09EA} = {D8A691C5-146D-4613-86CC-438F02FE9106}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9}
diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
index acf182316..cb3036a75 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
@@ -5054,7 +5054,7 @@
- True
+ False
False
8808
/
diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
index bcc1a01ff..e5ba8f012 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
@@ -8,7 +8,7 @@
- Debug|Any CPU
+ Release|Any CPU
ShowAllFiles
600
MvcControllerEmptyScaffolder
diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user
index a441248c4..a0002e9f5 100644
--- a/Host/Host.csproj.user
+++ b/Host/Host.csproj.user
@@ -3,13 +3,14 @@
BeWo2.0
true
- Release|Any CPU
+ Debug|Any CPU
false
+ ShowAllFiles
diff --git a/Report/ReportObjects/AuslastungBerechnung.cs b/Report/ReportObjects/AuslastungBerechnung.cs
index d4b03e4a8..ad60afb2a 100644
--- a/Report/ReportObjects/AuslastungBerechnung.cs
+++ b/Report/ReportObjects/AuslastungBerechnung.cs
@@ -187,11 +187,12 @@ namespace BeWo.Report.ReportObjects
GetOrCreateSupportConceptDetail(null, sc.Customer, scap, c2s,
ro.ReportStartDate, ro.ReportEndDate, null, false);
- if (scDc != null &&
- (scDc.ApprovedHoursPerWeek > 0 ||
- scDc.ApprovedHoursPerWeekWithRateFactor > 0))
+ if (scDc != null)
{
- empDetail.SupportConceptDetailList.Add(scDc);
+ if (!CheckIfApprovedGreaterZero() || scDc.ApprovedHoursPerWeek > 0 || scDc.ApprovedHoursPerWeekWithRateFactor > 0)
+ {
+ empDetail.SupportConceptDetailList.Add(scDc);
+ }
}
}
}
diff --git a/ReportImp/AkggMid/EmployeeKilometerauswertungsListReport.Designer.cs b/ReportImp/AkggMid/EmployeeKilometerauswertungsListReport.Designer.cs
index d0fef195c..669dc50e3 100644
--- a/ReportImp/AkggMid/EmployeeKilometerauswertungsListReport.Designer.cs
+++ b/ReportImp/AkggMid/EmployeeKilometerauswertungsListReport.Designer.cs
@@ -46,10 +46,31 @@ namespace AkggMid
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.objectDataSource1 = new DevExpress.DataAccess.ObjectBinding.ObjectDataSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
+ this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
@@ -57,33 +78,12 @@ namespace AkggMid
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
- this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.KilometerVerguetung = new DevExpress.XtraReports.UI.CalculatedField();
- this.objectDataSource1 = new DevExpress.DataAccess.ObjectBinding.ObjectDataSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
@@ -225,7 +225,7 @@ namespace AkggMid
this.xrTableCell9.StylePriority.UseFont = false;
this.xrTableCell9.StylePriority.UsePadding = false;
this.xrTableCell9.StylePriority.UseTextAlignment = false;
- this.xrTableCell9.Text = "[CustomerName] ([Dokumentation])";
+ this.xrTableCell9.Text = "[CustomerName] [Dokumentation]";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell9.Weight = 1.6198739714748316D;
//
@@ -249,98 +249,6 @@ namespace AkggMid
this.GroupHeader2.Name = "GroupHeader2";
this.GroupHeader2.RepeatEveryPage = true;
//
- // GroupFooter1
- //
- this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrTable5,
- this.xrTable2});
- this.GroupFooter1.HeightF = 50F;
- this.GroupFooter1.Name = "GroupFooter1";
- this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
- //
- // ReportHeader
- //
- this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrLabel1});
- this.ReportHeader.HeightF = 50F;
- this.ReportHeader.Name = "ReportHeader";
- //
- // xrLabel1
- //
- this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Underline);
- this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrLabel1.Multiline = true;
- this.xrLabel1.Name = "xrLabel1";
- this.xrLabel1.SizeF = new System.Drawing.SizeF(600F, 25F);
- this.xrLabel1.StyleName = "Title";
- this.xrLabel1.StylePriority.UseFont = false;
- this.xrLabel1.Text = "Fahrtkostenabrechnung";
- //
- // pageFooterBand1
- //
- this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrLabel3,
- this.xrLabel2});
- this.pageFooterBand1.HeightF = 83.41669F;
- this.pageFooterBand1.Name = "pageFooterBand1";
- //
- // Title
- //
- this.Title.BackColor = System.Drawing.Color.White;
- this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
- this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.Title.BorderWidth = 1F;
- this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
- this.Title.ForeColor = System.Drawing.Color.Black;
- this.Title.Name = "Title";
- //
- // FieldCaption
- //
- this.FieldCaption.BackColor = System.Drawing.Color.White;
- this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
- this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.FieldCaption.BorderWidth = 1F;
- this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
- this.FieldCaption.ForeColor = System.Drawing.Color.Black;
- this.FieldCaption.Name = "FieldCaption";
- //
- // PageInfo
- //
- this.PageInfo.BackColor = System.Drawing.Color.White;
- this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
- this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.PageInfo.BorderWidth = 1F;
- this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
- this.PageInfo.ForeColor = System.Drawing.Color.Black;
- this.PageInfo.Name = "PageInfo";
- //
- // DataField
- //
- this.DataField.BackColor = System.Drawing.Color.White;
- this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
- this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.DataField.BorderWidth = 1F;
- this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
- this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
- this.DataField.Name = "DataField";
- //
- // fieldFLS
- //
- this.fieldFLS.DataMember = "FLSReportGroups";
- this.fieldFLS.Expression = "[TotalFLM] / 60";
- this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
- this.fieldFLS.Name = "fieldFLS";
- //
- // topMarginBand1
- //
- this.topMarginBand1.HeightF = 50F;
- this.topMarginBand1.Name = "topMarginBand1";
- //
- // bottomMarginBand1
- //
- this.bottomMarginBand1.HeightF = 50F;
- this.bottomMarginBand1.Name = "bottomMarginBand1";
- //
// xrTable3
//
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
@@ -401,100 +309,14 @@ namespace AkggMid
this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell16.Weight = 0.98726795044700921D;
//
- // xrLabel2
+ // GroupFooter1
//
- this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
- this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 38.62502F);
- this.xrLabel2.Multiline = true;
- this.xrLabel2.Name = "xrLabel2";
- this.xrLabel2.SizeF = new System.Drawing.SizeF(293.75F, 16.66667F);
- this.xrLabel2.StyleName = "Title";
- this.xrLabel2.StylePriority.UseBorders = false;
- this.xrLabel2.StylePriority.UseFont = false;
- this.xrLabel2.Text = "Geprüft am: ";
- //
- // xrLabel3
- //
- this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
- this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 66.75002F);
- this.xrLabel3.Multiline = true;
- this.xrLabel3.Name = "xrLabel3";
- this.xrLabel3.SizeF = new System.Drawing.SizeF(293.75F, 16.66667F);
- this.xrLabel3.StyleName = "Title";
- this.xrLabel3.StylePriority.UseBorders = false;
- this.xrLabel3.StylePriority.UseFont = false;
- this.xrLabel3.Text = "Unterschrift:";
- //
- // xrTable2
- //
- this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- 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(677F, 25F);
- this.xrTable2.StylePriority.UseBorders = false;
- this.xrTable2.StylePriority.UsePadding = false;
- //
- // xrTableRow2
- //
- this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell2,
- this.xrTableCell4,
- this.xrTableCell5,
- this.xrTableCell6});
- this.xrTableRow2.Name = "xrTableRow2";
- this.xrTableRow2.Weight = 1D;
- //
- // xrTableCell2
- //
- this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell2.Font = new System.Drawing.Font("Arial", 9.75F);
- this.xrTableCell2.Name = "xrTableCell2";
- this.xrTableCell2.StylePriority.UseBorders = false;
- this.xrTableCell2.StylePriority.UseFont = false;
- this.xrTableCell2.StylePriority.UseTextAlignment = false;
- this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell2.Weight = 0.6802721055263049D;
- //
- // xrTableCell4
- //
- this.xrTableCell4.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
- this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F);
- this.xrTableCell4.Name = "xrTableCell4";
- this.xrTableCell4.StylePriority.UseBorders = false;
- this.xrTableCell4.StylePriority.UseFont = false;
- this.xrTableCell4.StylePriority.UseTextAlignment = false;
- this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell4.Weight = 1.3180271922314462D;
- //
- // xrTableCell5
- //
- this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell5.Font = new System.Drawing.Font("Arial", 9.75F);
- this.xrTableCell5.Name = "xrTableCell5";
- this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 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 = "Summe aller gefahrener Kilometer";
- this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell5.Weight = 1.6198739714748316D;
- //
- // xrTableCell6
- //
- this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.TotalDistanceInMeters", "{0:0.00}")});
- this.xrTableCell6.Font = new System.Drawing.Font("Arial", 9.75F);
- this.xrTableCell6.Name = "xrTableCell6";
- this.xrTableCell6.StylePriority.UseFont = false;
- this.xrTableCell6.StylePriority.UseTextAlignment = false;
- this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell6.Weight = 0.98726869060612354D;
+ this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable5,
+ this.xrTable2});
+ this.GroupFooter1.HeightF = 50F;
+ this.GroupFooter1.Name = "GroupFooter1";
+ this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
//
// xrTable5
//
@@ -565,6 +387,189 @@ namespace AkggMid
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell17.Weight = 0.98726869060612354D;
//
+ // xrTable2
+ //
+ this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ 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(677F, 25F);
+ this.xrTable2.StylePriority.UseBorders = false;
+ this.xrTable2.StylePriority.UsePadding = false;
+ //
+ // xrTableRow2
+ //
+ this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell2,
+ this.xrTableCell4,
+ this.xrTableCell5,
+ this.xrTableCell6});
+ this.xrTableRow2.Name = "xrTableRow2";
+ this.xrTableRow2.Weight = 1D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell2.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.StylePriority.UseBorders = false;
+ this.xrTableCell2.StylePriority.UseFont = false;
+ this.xrTableCell2.StylePriority.UseTextAlignment = false;
+ this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell2.Weight = 0.6802721055263049D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.StylePriority.UseBorders = false;
+ this.xrTableCell4.StylePriority.UseFont = false;
+ this.xrTableCell4.StylePriority.UseTextAlignment = false;
+ this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell4.Weight = 1.3180271922314462D;
+ //
+ // xrTableCell5
+ //
+ this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell5.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell5.Name = "xrTableCell5";
+ this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 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 = "Summe aller gefahrener Kilometer";
+ this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell5.Weight = 1.6198739714748316D;
+ //
+ // xrTableCell6
+ //
+ this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.TotalDistanceInMeters", "{0:0.00}")});
+ this.xrTableCell6.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell6.Name = "xrTableCell6";
+ this.xrTableCell6.StylePriority.UseFont = false;
+ this.xrTableCell6.StylePriority.UseTextAlignment = false;
+ this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell6.Weight = 0.98726869060612354D;
+ //
+ // objectDataSource1
+ //
+ this.objectDataSource1.DataSource = typeof(BeWo.Report.ReportObjects.EmployeeKilometerauswertungsListRO);
+ this.objectDataSource1.Name = "objectDataSource1";
+ //
+ // ReportHeader
+ //
+ this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel1});
+ this.ReportHeader.HeightF = 50F;
+ this.ReportHeader.Name = "ReportHeader";
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Underline);
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel1.Multiline = true;
+ this.xrLabel1.Name = "xrLabel1";
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(600F, 25F);
+ this.xrLabel1.StyleName = "Title";
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "Fahrtkostenabrechnung";
+ //
+ // pageFooterBand1
+ //
+ this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel3,
+ this.xrLabel2});
+ this.pageFooterBand1.HeightF = 83.41669F;
+ this.pageFooterBand1.Name = "pageFooterBand1";
+ //
+ // xrLabel3
+ //
+ this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 66.75002F);
+ this.xrLabel3.Multiline = true;
+ this.xrLabel3.Name = "xrLabel3";
+ this.xrLabel3.SizeF = new System.Drawing.SizeF(293.75F, 16.66667F);
+ this.xrLabel3.StyleName = "Title";
+ this.xrLabel3.StylePriority.UseBorders = false;
+ this.xrLabel3.StylePriority.UseFont = false;
+ this.xrLabel3.Text = "Unterschrift:";
+ //
+ // xrLabel2
+ //
+ this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+ this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 38.62502F);
+ this.xrLabel2.Multiline = true;
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(293.75F, 16.66667F);
+ this.xrLabel2.StyleName = "Title";
+ this.xrLabel2.StylePriority.UseBorders = false;
+ this.xrLabel2.StylePriority.UseFont = false;
+ this.xrLabel2.Text = "Geprüft am: ";
+ //
+ // Title
+ //
+ this.Title.BackColor = System.Drawing.Color.White;
+ this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.Title.BorderWidth = 1F;
+ this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+ this.Title.ForeColor = System.Drawing.Color.Black;
+ this.Title.Name = "Title";
+ //
+ // FieldCaption
+ //
+ this.FieldCaption.BackColor = System.Drawing.Color.White;
+ this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.FieldCaption.BorderWidth = 1F;
+ this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+ this.FieldCaption.ForeColor = System.Drawing.Color.Black;
+ this.FieldCaption.Name = "FieldCaption";
+ //
+ // PageInfo
+ //
+ this.PageInfo.BackColor = System.Drawing.Color.White;
+ this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.PageInfo.BorderWidth = 1F;
+ this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.PageInfo.ForeColor = System.Drawing.Color.Black;
+ this.PageInfo.Name = "PageInfo";
+ //
+ // DataField
+ //
+ this.DataField.BackColor = System.Drawing.Color.White;
+ this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.DataField.BorderWidth = 1F;
+ this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Name = "DataField";
+ //
+ // fieldFLS
+ //
+ this.fieldFLS.DataMember = "FLSReportGroups";
+ this.fieldFLS.Expression = "[TotalFLM] / 60";
+ this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldFLS.Name = "fieldFLS";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 50F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 50F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
// KilometerVerguetung
//
this.KilometerVerguetung.DataMember = "Employees2Entries";
@@ -572,11 +577,6 @@ namespace AkggMid
this.KilometerVerguetung.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.KilometerVerguetung.Name = "KilometerVerguetung";
//
- // objectDataSource1
- //
- this.objectDataSource1.DataSource = typeof(BeWo.Report.ReportObjects.EmployeeKilometerauswertungsListRO);
- this.objectDataSource1.Name = "objectDataSource1";
- //
// EmployeeKilometerauswertungsListReport
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -605,8 +605,8 @@ namespace AkggMid
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
diff --git a/ReportImp/AkggMid/EmployeeKilometerauswertungsReport.designer.cs b/ReportImp/AkggMid/EmployeeKilometerauswertungsReport.designer.cs
index ef4d33821..d525787fc 100644
--- a/ReportImp/AkggMid/EmployeeKilometerauswertungsReport.designer.cs
+++ b/ReportImp/AkggMid/EmployeeKilometerauswertungsReport.designer.cs
@@ -40,9 +40,29 @@ namespace AkggMid
this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.objectDataSource1 = new DevExpress.DataAccess.ObjectBinding.ObjectDataSource(this.components);
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
@@ -57,32 +77,12 @@ namespace AkggMid
this.fieldGroupFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
- this.objectDataSource1 = new DevExpress.DataAccess.ObjectBinding.ObjectDataSource(this.components);
- this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.KilometerVerguetung = new DevExpress.XtraReports.UI.CalculatedField();
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -190,6 +190,18 @@ namespace AkggMid
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell2.Weight = 1.3180270190219841D;
//
+ // xrTableCell9
+ //
+ this.xrTableCell9.CanGrow = false;
+ this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.xrTableCell9.Name = "xrTableCell9";
+ this.xrTableCell9.StylePriority.UseFont = false;
+ this.xrTableCell9.StylePriority.UsePadding = false;
+ this.xrTableCell9.StylePriority.UseTextAlignment = false;
+ this.xrTableCell9.Text = "[CustomerName] [Dokumentation]";
+ this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell9.Weight = 1.6198745404481112D;
+ //
// xrTableCell8
//
this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -211,215 +223,6 @@ namespace AkggMid
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand;
//
- // GroupHeader2
- //
- this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrTable3});
- this.GroupHeader2.HeightF = 44.79167F;
- this.GroupHeader2.Name = "GroupHeader2";
- this.GroupHeader2.RepeatEveryPage = true;
- //
- // ReportHeader
- //
- this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrLabel2,
- this.xrLabel1});
- this.ReportHeader.HeightF = 50F;
- this.ReportHeader.Name = "ReportHeader";
- //
- // xrLabel2
- //
- this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "MonthInformation", "Zeitraum: {0:MMMM yyyy}")});
- this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F);
- this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 24.99999F);
- this.xrLabel2.Name = "xrLabel2";
- this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
- this.xrLabel2.SizeF = new System.Drawing.SizeF(677.0001F, 25F);
- this.xrLabel2.StylePriority.UseFont = false;
- this.xrLabel2.StylePriority.UsePadding = false;
- //
- // xrLabel1
- //
- this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F);
- this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrLabel1.Multiline = true;
- this.xrLabel1.Name = "xrLabel1";
- this.xrLabel1.SizeF = new System.Drawing.SizeF(677.0001F, 25F);
- this.xrLabel1.StyleName = "Title";
- this.xrLabel1.StylePriority.UseFont = false;
- this.xrLabel1.Text = "Auswertung über gefahrene Kilometer für [EmployeeName]";
- //
- // pageFooterBand1
- //
- this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrPageInfo2,
- this.xrPageInfo1});
- this.pageFooterBand1.HeightF = 48F;
- this.pageFooterBand1.Name = "pageFooterBand1";
- //
- // xrPageInfo2
- //
- this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
- this.xrPageInfo2.Format = "Seite {0} von {1}";
- this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(433.6664F, 25F);
- this.xrPageInfo2.Name = "xrPageInfo2";
- this.xrPageInfo2.SizeF = new System.Drawing.SizeF(243.3336F, 23F);
- this.xrPageInfo2.StyleName = "PageInfo";
- this.xrPageInfo2.StylePriority.UseFont = false;
- this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- //
- // xrPageInfo1
- //
- this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
- this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(7.999929F, 25F);
- this.xrPageInfo1.Name = "xrPageInfo1";
- this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
- this.xrPageInfo1.SizeF = new System.Drawing.SizeF(223.25F, 23F);
- this.xrPageInfo1.StyleName = "PageInfo";
- this.xrPageInfo1.StylePriority.UseFont = false;
- //
- // Title
- //
- this.Title.BackColor = System.Drawing.Color.White;
- this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
- this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.Title.BorderWidth = 1F;
- this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
- this.Title.ForeColor = System.Drawing.Color.Black;
- this.Title.Name = "Title";
- //
- // FieldCaption
- //
- this.FieldCaption.BackColor = System.Drawing.Color.White;
- this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
- this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.FieldCaption.BorderWidth = 1F;
- this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
- this.FieldCaption.ForeColor = System.Drawing.Color.Black;
- this.FieldCaption.Name = "FieldCaption";
- //
- // PageInfo
- //
- this.PageInfo.BackColor = System.Drawing.Color.White;
- this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
- this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.PageInfo.BorderWidth = 1F;
- this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
- this.PageInfo.ForeColor = System.Drawing.Color.Black;
- this.PageInfo.Name = "PageInfo";
- //
- // DataField
- //
- this.DataField.BackColor = System.Drawing.Color.White;
- this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
- this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.DataField.BorderWidth = 1F;
- this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
- this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
- this.DataField.Name = "DataField";
- //
- // fieldFLS
- //
- this.fieldFLS.DataMember = "FLSReportGroups.FLSReportDetails";
- this.fieldFLS.Expression = "[TotalFLM] / 60\r\n";
- this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
- this.fieldFLS.Name = "fieldFLS";
- //
- // fieldGroupFLS
- //
- this.fieldGroupFLS.DataMember = "FLSReportGroups";
- this.fieldGroupFLS.Expression = "[TotalFLM]/60";
- this.fieldGroupFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
- this.fieldGroupFLS.Name = "fieldGroupFLS";
- //
- // topMarginBand1
- //
- this.topMarginBand1.HeightF = 50F;
- this.topMarginBand1.Name = "topMarginBand1";
- //
- // bottomMarginBand1
- //
- this.bottomMarginBand1.HeightF = 50F;
- this.bottomMarginBand1.Name = "bottomMarginBand1";
- //
- // objectDataSource1
- //
- this.objectDataSource1.DataSource = typeof(BeWo.Report.ReportObjects.EmployeeKilometerauswertungsRO);
- this.objectDataSource1.Name = "objectDataSource1";
- //
- // xrTable3
- //
- this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTable3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
- this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrTable3.Name = "xrTable3";
- this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
- this.xrTableRow3});
- this.xrTable3.SizeF = new System.Drawing.SizeF(677F, 44.79167F);
- this.xrTable3.StylePriority.UseBorders = false;
- this.xrTable3.StylePriority.UseFont = false;
- this.xrTable3.StylePriority.UsePadding = false;
- //
- // xrTableRow3
- //
- this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell12,
- this.xrTableCell13,
- this.xrTableCell15,
- this.xrTableCell16});
- this.xrTableRow3.Name = "xrTableRow3";
- this.xrTableRow3.Weight = 1D;
- //
- // xrTableCell12
- //
- this.xrTableCell12.Name = "xrTableCell12";
- this.xrTableCell12.StylePriority.UseTextAlignment = false;
- this.xrTableCell12.Text = "Datum";
- this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell12.Weight = 0.68027211962967382D;
- //
- // xrTableCell13
- //
- this.xrTableCell13.Name = "xrTableCell13";
- this.xrTableCell13.StylePriority.UseTextAlignment = false;
- this.xrTableCell13.Text = "Fahrstrecke";
- this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell13.Weight = 1.3180272392822277D;
- //
- // xrTableCell15
- //
- this.xrTableCell15.Multiline = true;
- this.xrTableCell15.Name = "xrTableCell15";
- this.xrTableCell15.StylePriority.UsePadding = false;
- this.xrTableCell15.StylePriority.UseTextAlignment = false;
- this.xrTableCell15.Text = "Name des Kunden\r\nund Zweck der Fahrt";
- this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell15.Weight = 1.6198751872043524D;
- //
- // xrTableCell16
- //
- this.xrTableCell16.Multiline = true;
- this.xrTableCell16.Name = "xrTableCell16";
- this.xrTableCell16.StylePriority.UseTextAlignment = false;
- this.xrTableCell16.Text = "Km /\r\nSchulassistenz";
- this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell16.Weight = 0.98726795044700921D;
- //
- // xrTableCell9
- //
- this.xrTableCell9.CanGrow = false;
- this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9.75F);
- this.xrTableCell9.Name = "xrTableCell9";
- this.xrTableCell9.StylePriority.UseFont = false;
- this.xrTableCell9.StylePriority.UsePadding = false;
- this.xrTableCell9.StylePriority.UseTextAlignment = false;
- this.xrTableCell9.Text = "[CustomerName] [Dokumentation]";
- this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell9.Weight = 1.6198745404481112D;
- //
// xrTable2
//
this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
@@ -558,6 +361,203 @@ namespace AkggMid
this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell17.Weight = 0.98726869060612354D;
//
+ // GroupHeader2
+ //
+ this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable3});
+ this.GroupHeader2.HeightF = 44.79167F;
+ this.GroupHeader2.Name = "GroupHeader2";
+ this.GroupHeader2.RepeatEveryPage = true;
+ //
+ // xrTable3
+ //
+ this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTable3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable3.Name = "xrTable3";
+ this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow3});
+ this.xrTable3.SizeF = new System.Drawing.SizeF(677F, 44.79167F);
+ this.xrTable3.StylePriority.UseBorders = false;
+ this.xrTable3.StylePriority.UseFont = false;
+ this.xrTable3.StylePriority.UsePadding = false;
+ //
+ // xrTableRow3
+ //
+ this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell12,
+ this.xrTableCell13,
+ this.xrTableCell15,
+ this.xrTableCell16});
+ this.xrTableRow3.Name = "xrTableRow3";
+ this.xrTableRow3.Weight = 1D;
+ //
+ // xrTableCell12
+ //
+ this.xrTableCell12.Name = "xrTableCell12";
+ this.xrTableCell12.StylePriority.UseTextAlignment = false;
+ this.xrTableCell12.Text = "Datum";
+ this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell12.Weight = 0.68027211962967382D;
+ //
+ // xrTableCell13
+ //
+ this.xrTableCell13.Name = "xrTableCell13";
+ this.xrTableCell13.StylePriority.UseTextAlignment = false;
+ this.xrTableCell13.Text = "Fahrstrecke";
+ this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell13.Weight = 1.3180272392822277D;
+ //
+ // xrTableCell15
+ //
+ this.xrTableCell15.Multiline = true;
+ this.xrTableCell15.Name = "xrTableCell15";
+ this.xrTableCell15.StylePriority.UsePadding = false;
+ this.xrTableCell15.StylePriority.UseTextAlignment = false;
+ this.xrTableCell15.Text = "Name des Kunden\r\nund Zweck der Fahrt";
+ this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell15.Weight = 1.6198751872043524D;
+ //
+ // xrTableCell16
+ //
+ this.xrTableCell16.Multiline = true;
+ this.xrTableCell16.Name = "xrTableCell16";
+ this.xrTableCell16.StylePriority.UseTextAlignment = false;
+ this.xrTableCell16.Text = "Km /\r\nSchulassistenz";
+ this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell16.Weight = 0.98726795044700921D;
+ //
+ // objectDataSource1
+ //
+ this.objectDataSource1.DataSource = typeof(BeWo.Report.ReportObjects.EmployeeKilometerauswertungsRO);
+ this.objectDataSource1.Name = "objectDataSource1";
+ //
+ // ReportHeader
+ //
+ this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel2,
+ this.xrLabel1});
+ this.ReportHeader.HeightF = 50F;
+ this.ReportHeader.Name = "ReportHeader";
+ //
+ // xrLabel2
+ //
+ this.xrLabel2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "MonthInformation", "Zeitraum: {0:MMMM yyyy}")});
+ this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 24.99999F);
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(677.0001F, 25F);
+ this.xrLabel2.StylePriority.UseFont = false;
+ this.xrLabel2.StylePriority.UsePadding = false;
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F);
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel1.Multiline = true;
+ this.xrLabel1.Name = "xrLabel1";
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(677.0001F, 25F);
+ this.xrLabel1.StyleName = "Title";
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "Auswertung über gefahrene Kilometer für [EmployeeName]";
+ //
+ // pageFooterBand1
+ //
+ this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrPageInfo2,
+ this.xrPageInfo1});
+ this.pageFooterBand1.HeightF = 48F;
+ this.pageFooterBand1.Name = "pageFooterBand1";
+ //
+ // xrPageInfo2
+ //
+ this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrPageInfo2.Format = "Seite {0} von {1}";
+ this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(433.6664F, 25F);
+ this.xrPageInfo2.Name = "xrPageInfo2";
+ this.xrPageInfo2.SizeF = new System.Drawing.SizeF(243.3336F, 23F);
+ this.xrPageInfo2.StyleName = "PageInfo";
+ this.xrPageInfo2.StylePriority.UseFont = false;
+ this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // xrPageInfo1
+ //
+ this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(7.999929F, 25F);
+ this.xrPageInfo1.Name = "xrPageInfo1";
+ this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
+ this.xrPageInfo1.SizeF = new System.Drawing.SizeF(223.25F, 23F);
+ this.xrPageInfo1.StyleName = "PageInfo";
+ this.xrPageInfo1.StylePriority.UseFont = false;
+ //
+ // Title
+ //
+ this.Title.BackColor = System.Drawing.Color.White;
+ this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.Title.BorderWidth = 1F;
+ this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+ this.Title.ForeColor = System.Drawing.Color.Black;
+ this.Title.Name = "Title";
+ //
+ // FieldCaption
+ //
+ this.FieldCaption.BackColor = System.Drawing.Color.White;
+ this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.FieldCaption.BorderWidth = 1F;
+ this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+ this.FieldCaption.ForeColor = System.Drawing.Color.Black;
+ this.FieldCaption.Name = "FieldCaption";
+ //
+ // PageInfo
+ //
+ this.PageInfo.BackColor = System.Drawing.Color.White;
+ this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.PageInfo.BorderWidth = 1F;
+ this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.PageInfo.ForeColor = System.Drawing.Color.Black;
+ this.PageInfo.Name = "PageInfo";
+ //
+ // DataField
+ //
+ this.DataField.BackColor = System.Drawing.Color.White;
+ this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.DataField.BorderWidth = 1F;
+ this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Name = "DataField";
+ //
+ // fieldFLS
+ //
+ this.fieldFLS.DataMember = "FLSReportGroups.FLSReportDetails";
+ this.fieldFLS.Expression = "[TotalFLM] / 60\r\n";
+ this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldFLS.Name = "fieldFLS";
+ //
+ // fieldGroupFLS
+ //
+ this.fieldGroupFLS.DataMember = "FLSReportGroups";
+ this.fieldGroupFLS.Expression = "[TotalFLM]/60";
+ this.fieldGroupFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldGroupFLS.Name = "fieldGroupFLS";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 50F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 50F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
// KilometerVerguetung
//
this.KilometerVerguetung.Expression = "[TotalDistanceInMeters] * 0.35";
@@ -590,10 +590,10 @@ namespace AkggMid
this.DataField});
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
diff --git a/ReportImp/AsbRuhr/Export/FibuNetExporter.cs b/ReportImp/AsbRuhr/Export/FibuNetExporter.cs
index 614e811c3..1828f48b5 100644
--- a/ReportImp/AsbRuhr/Export/FibuNetExporter.cs
+++ b/ReportImp/AsbRuhr/Export/FibuNetExporter.cs
@@ -361,7 +361,7 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
sb.Append("( ):1110;");
sb.Append(String.Format("{0:0};;;", ds.Betrag)); // Betrag
sb.Append("1;"); // Satzart
- sb.Append(ds.Erloeskonto);
+ sb.Append(ds.Debitor);
sb.Append(";");
sb.Append(ds.Erloeskonto); // HabenKonto
sb.Append(";1;M;"); //
diff --git a/ReportImp/AutismusKoelnBonn/BasisRechnung.Designer.cs b/ReportImp/AutismusKoelnBonn/BasisRechnung.Designer.cs
index f26366883..844c38eb0 100644
--- a/ReportImp/AutismusKoelnBonn/BasisRechnung.Designer.cs
+++ b/ReportImp/AutismusKoelnBonn/BasisRechnung.Designer.cs
@@ -741,7 +741,7 @@ namespace AutismusKoelnBonn
this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:0.##} €")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.HourlyRate", "{0:c}")});
this.xrTableCell44.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell44.Name = "xrTableCell44";
this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
@@ -750,7 +750,6 @@ namespace AutismusKoelnBonn
this.xrTableCell44.StylePriority.UseFont = false;
this.xrTableCell44.StylePriority.UsePadding = false;
this.xrTableCell44.StylePriority.UseTextAlignment = false;
- this.xrTableCell44.Text = "xrTableCell44";
this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell44.Weight = 0.33087089372723455D;
//
diff --git a/ReportImp/AutismusKoelnBonn/BasisRechnung.cs b/ReportImp/AutismusKoelnBonn/BasisRechnung.cs
index 477226b2b..777a1e4c4 100644
--- a/ReportImp/AutismusKoelnBonn/BasisRechnung.cs
+++ b/ReportImp/AutismusKoelnBonn/BasisRechnung.cs
@@ -50,10 +50,10 @@ namespace AutismusKoelnBonn
{
sb.AppendLine(pRO.RecipientAddressLine1);
}
- if (!String.IsNullOrEmpty(pRO.RecipientContactPerson) && !String.IsNullOrEmpty(pRO.RecipientContactPerson.Trim()))
- {
- sb.AppendLine(pRO.RecipientContactPerson);
- }
+ //if (!String.IsNullOrEmpty(pRO.RecipientContactPerson) && !String.IsNullOrEmpty(pRO.RecipientContactPerson.Trim()))
+ //{
+ // sb.AppendLine(pRO.RecipientContactPerson);
+ //}
if (pRO.RecipientOrganisation.ToLower() != "selbstzahler" && !String.IsNullOrEmpty(poBox))
{
sb.AppendLine(poBox);
diff --git a/ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.Designer.cs b/ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.Designer.cs
index 6ae24869d..bfb4020fc 100644
--- a/ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.Designer.cs
+++ b/ReportImp/AutismusKoelnBonn/InvoiceCustomerReport.Designer.cs
@@ -875,7 +875,7 @@ namespace AutismusKoelnBonn
this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitPrice", "{0:0.##}")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitPrice", "{0:c}")});
this.xrTableCell44.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell44.Name = "xrTableCell44";
this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
@@ -884,7 +884,6 @@ namespace AutismusKoelnBonn
this.xrTableCell44.StylePriority.UseFont = false;
this.xrTableCell44.StylePriority.UsePadding = false;
this.xrTableCell44.StylePriority.UseTextAlignment = false;
- this.xrTableCell44.Text = "xrTableCell44";
this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell44.Weight = 0.47082580572628968D;
//
diff --git a/ReportImp/AutismusKoelnBonn/Quittierungsbeleg.Designer.cs b/ReportImp/AutismusKoelnBonn/Quittierungsbeleg.Designer.cs
index 3c2e283d4..5b593e448 100644
--- a/ReportImp/AutismusKoelnBonn/Quittierungsbeleg.Designer.cs
+++ b/ReportImp/AutismusKoelnBonn/Quittierungsbeleg.Designer.cs
@@ -43,6 +43,7 @@ namespace AutismusKoelnBonn
this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell();
this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox();
@@ -53,6 +54,7 @@ namespace AutismusKoelnBonn
this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -61,6 +63,7 @@ namespace AutismusKoelnBonn
this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
@@ -87,6 +90,10 @@ namespace AutismusKoelnBonn
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel();
@@ -123,13 +130,6 @@ namespace AutismusKoelnBonn
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
- this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -279,6 +279,18 @@ namespace AutismusKoelnBonn
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell12.Weight = 0.094696890990117438D;
//
+ // xrTableCell34
+ //
+ this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesQualified")});
+ this.xrTableCell34.Font = new System.Drawing.Font("Calibri", 9.75F);
+ this.xrTableCell34.Name = "xrTableCell34";
+ this.xrTableCell34.StylePriority.UseFont = false;
+ this.xrTableCell34.StylePriority.UseTextAlignment = false;
+ this.xrTableCell34.Text = "xrTableCell34";
+ this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell34.Weight = 0.094697045119295081D;
+ //
// xrTableCell44
//
this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -418,6 +430,21 @@ namespace AutismusKoelnBonn
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
this.xrTableCell9.Weight = 0.20949720670391064D;
//
+ // xrTableCell32
+ //
+ this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell32.Font = new System.Drawing.Font("Calibri", 9.75F, System.Drawing.FontStyle.Bold);
+ this.xrTableCell32.Name = "xrTableCell32";
+ this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.xrTableCell32.StylePriority.UseBorders = false;
+ this.xrTableCell32.StylePriority.UseFont = false;
+ this.xrTableCell32.StylePriority.UsePadding = false;
+ this.xrTableCell32.StylePriority.UseTextAlignment = false;
+ this.xrTableCell32.Text = "FLS in";
+ this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+ this.xrTableCell32.Weight = 0.20949720670391064D;
+ //
// xrTableCell28
//
this.xrTableCell28.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
@@ -526,6 +553,22 @@ namespace AutismusKoelnBonn
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
this.xrTableCell7.Weight = 0.20949720670391064D;
//
+ // xrTableCell33
+ //
+ this.xrTableCell33.BackColor = System.Drawing.Color.Gainsboro;
+ this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell33.Font = new System.Drawing.Font("Calibri", 9.75F, System.Drawing.FontStyle.Bold);
+ this.xrTableCell33.Multiline = true;
+ this.xrTableCell33.Name = "xrTableCell33";
+ this.xrTableCell33.StylePriority.UseBackColor = false;
+ this.xrTableCell33.StylePriority.UseBorders = false;
+ this.xrTableCell33.StylePriority.UseFont = false;
+ this.xrTableCell33.StylePriority.UseTextAlignment = false;
+ this.xrTableCell33.Text = "Minuten\r\nRechnung\r\n(ohne 1,2)";
+ this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+ this.xrTableCell33.Weight = 0.20949720670391064D;
+ //
// xrTableCell43
//
this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
@@ -877,6 +920,83 @@ namespace AutismusKoelnBonn
this.GroupFooter1.KeepTogether = true;
this.GroupFooter1.Name = "GroupFooter1";
//
+ // xrLabel23
+ //
+ this.xrLabel23.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel23.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel23.BorderWidth = 2F;
+ this.xrLabel23.Font = new System.Drawing.Font("Calibri", 9.75F, System.Drawing.FontStyle.Bold);
+ this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(342.2778F, 20.00001F);
+ this.xrLabel23.Name = "xrLabel23";
+ this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.xrLabel23.SizeF = new System.Drawing.SizeF(74.99994F, 20F);
+ this.xrLabel23.StylePriority.UseBackColor = false;
+ this.xrLabel23.StylePriority.UseBorders = false;
+ this.xrLabel23.StylePriority.UseBorderWidth = false;
+ this.xrLabel23.StylePriority.UseFont = false;
+ this.xrLabel23.StylePriority.UsePadding = false;
+ this.xrLabel23.StylePriority.UseTextAlignment = false;
+ this.xrLabel23.Text = "Kontingent";
+ this.xrLabel23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel24
+ //
+ this.xrLabel24.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel24.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel24.BorderWidth = 2F;
+ this.xrLabel24.Font = new System.Drawing.Font("Calibri", 9.75F, System.Drawing.FontStyle.Bold);
+ this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(417.2778F, 20.00001F);
+ this.xrLabel24.Name = "xrLabel24";
+ this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.xrLabel24.SizeF = new System.Drawing.SizeF(75F, 20F);
+ this.xrLabel24.StylePriority.UseBackColor = false;
+ this.xrLabel24.StylePriority.UseBorders = false;
+ this.xrLabel24.StylePriority.UseBorderWidth = false;
+ this.xrLabel24.StylePriority.UseFont = false;
+ this.xrLabel24.StylePriority.UsePadding = false;
+ this.xrLabel24.StylePriority.UseTextAlignment = false;
+ this.xrLabel24.Text = "Rechnung";
+ this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrLabel22
+ //
+ this.xrLabel22.Font = new System.Drawing.Font("Calibri", 9.75F);
+ this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(492.2778F, 20.00001F);
+ this.xrLabel22.Name = "xrLabel22";
+ this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
+ this.xrLabel22.SizeF = new System.Drawing.SizeF(290.0001F, 20.00001F);
+ this.xrLabel22.StylePriority.UseBackColor = false;
+ this.xrLabel22.StylePriority.UseBorders = false;
+ this.xrLabel22.StylePriority.UseFont = false;
+ this.xrLabel22.StylePriority.UsePadding = false;
+ this.xrLabel22.StylePriority.UseTextAlignment = false;
+ this.xrLabel22.Text = "(wird erst bei Abrechnung eingerechnet)";
+ this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // xrLabel20
+ //
+ this.xrLabel20.BackColor = System.Drawing.Color.Transparent;
+ this.xrLabel20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrLabel20.BorderWidth = 2F;
+ this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesQualified")});
+ this.xrLabel20.Font = new System.Drawing.Font("Calibri", 9.75F, System.Drawing.FontStyle.Bold);
+ this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(417.2777F, 0F);
+ this.xrLabel20.Name = "xrLabel20";
+ this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.xrLabel20.SizeF = new System.Drawing.SizeF(75F, 20F);
+ this.xrLabel20.StylePriority.UseBackColor = false;
+ this.xrLabel20.StylePriority.UseBorders = false;
+ this.xrLabel20.StylePriority.UseBorderWidth = false;
+ this.xrLabel20.StylePriority.UseFont = false;
+ this.xrLabel20.StylePriority.UsePadding = false;
+ this.xrLabel20.StylePriority.UseTextAlignment = false;
+ xrSummary1.FormatString = "{0:0}";
+ xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+ this.xrLabel20.Summary = xrSummary1;
+ this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
// xrLabel18
//
this.xrLabel18.Font = new System.Drawing.Font("Calibri", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -1303,126 +1423,6 @@ namespace AutismusKoelnBonn
this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldKontaktArt.Name = "fieldKontaktArt";
//
- // xrTableCell32
- //
- this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)));
- this.xrTableCell32.Font = new System.Drawing.Font("Calibri", 9.75F, System.Drawing.FontStyle.Bold);
- this.xrTableCell32.Name = "xrTableCell32";
- this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
- this.xrTableCell32.StylePriority.UseBorders = false;
- this.xrTableCell32.StylePriority.UseFont = false;
- this.xrTableCell32.StylePriority.UsePadding = false;
- this.xrTableCell32.StylePriority.UseTextAlignment = false;
- this.xrTableCell32.Text = "FLS in";
- this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
- this.xrTableCell32.Weight = 0.20949720670391064D;
- //
- // xrTableCell33
- //
- this.xrTableCell33.BackColor = System.Drawing.Color.Gainsboro;
- this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell33.Font = new System.Drawing.Font("Calibri", 9.75F, System.Drawing.FontStyle.Bold);
- this.xrTableCell33.Multiline = true;
- this.xrTableCell33.Name = "xrTableCell33";
- this.xrTableCell33.StylePriority.UseBackColor = false;
- this.xrTableCell33.StylePriority.UseBorders = false;
- this.xrTableCell33.StylePriority.UseFont = false;
- this.xrTableCell33.StylePriority.UseTextAlignment = false;
- this.xrTableCell33.Text = "Minuten\r\nRechnung\r\n(ohne 1,2)";
- this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
- this.xrTableCell33.Weight = 0.20949720670391064D;
- //
- // xrTableCell34
- //
- this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesQualified")});
- this.xrTableCell34.Font = new System.Drawing.Font("Calibri", 9.75F);
- this.xrTableCell34.Name = "xrTableCell34";
- this.xrTableCell34.StylePriority.UseFont = false;
- this.xrTableCell34.StylePriority.UseTextAlignment = false;
- this.xrTableCell34.Text = "xrTableCell34";
- this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell34.Weight = 0.094697045119295081D;
- //
- // xrLabel20
- //
- this.xrLabel20.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrLabel20.BorderWidth = 2F;
- this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesQualified")});
- this.xrLabel20.Font = new System.Drawing.Font("Calibri", 9.75F, System.Drawing.FontStyle.Bold);
- this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(417.2777F, 0F);
- this.xrLabel20.Name = "xrLabel20";
- this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
- this.xrLabel20.SizeF = new System.Drawing.SizeF(75F, 20F);
- this.xrLabel20.StylePriority.UseBackColor = false;
- this.xrLabel20.StylePriority.UseBorders = false;
- this.xrLabel20.StylePriority.UseBorderWidth = false;
- this.xrLabel20.StylePriority.UseFont = false;
- this.xrLabel20.StylePriority.UsePadding = false;
- this.xrLabel20.StylePriority.UseTextAlignment = false;
- xrSummary1.FormatString = "{0:0}";
- xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
- this.xrLabel20.Summary = xrSummary1;
- this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel22
- //
- this.xrLabel22.Font = new System.Drawing.Font("Calibri", 9.75F);
- this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(492.2778F, 20.00001F);
- this.xrLabel22.Name = "xrLabel22";
- this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
- this.xrLabel22.SizeF = new System.Drawing.SizeF(290.0001F, 20.00001F);
- this.xrLabel22.StylePriority.UseBackColor = false;
- this.xrLabel22.StylePriority.UseBorders = false;
- this.xrLabel22.StylePriority.UseFont = false;
- this.xrLabel22.StylePriority.UsePadding = false;
- this.xrLabel22.StylePriority.UseTextAlignment = false;
- this.xrLabel22.Text = "(wird erst bei Abrechnung eingerechnet)";
- this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
- //
- // xrLabel23
- //
- this.xrLabel23.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel23.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrLabel23.BorderWidth = 2F;
- this.xrLabel23.Font = new System.Drawing.Font("Calibri", 9.75F, System.Drawing.FontStyle.Bold);
- this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(342.2778F, 20.00001F);
- this.xrLabel23.Name = "xrLabel23";
- this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
- this.xrLabel23.SizeF = new System.Drawing.SizeF(74.99994F, 20F);
- this.xrLabel23.StylePriority.UseBackColor = false;
- this.xrLabel23.StylePriority.UseBorders = false;
- this.xrLabel23.StylePriority.UseBorderWidth = false;
- this.xrLabel23.StylePriority.UseFont = false;
- this.xrLabel23.StylePriority.UsePadding = false;
- this.xrLabel23.StylePriority.UseTextAlignment = false;
- this.xrLabel23.Text = "Kontingent";
- this.xrLabel23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrLabel24
- //
- this.xrLabel24.BackColor = System.Drawing.Color.Transparent;
- this.xrLabel24.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrLabel24.BorderWidth = 2F;
- this.xrLabel24.Font = new System.Drawing.Font("Calibri", 9.75F, System.Drawing.FontStyle.Bold);
- this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(417.2778F, 20.00001F);
- this.xrLabel24.Name = "xrLabel24";
- this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
- this.xrLabel24.SizeF = new System.Drawing.SizeF(75F, 20F);
- this.xrLabel24.StylePriority.UseBackColor = false;
- this.xrLabel24.StylePriority.UseBorders = false;
- this.xrLabel24.StylePriority.UseBorderWidth = false;
- this.xrLabel24.StylePriority.UseFont = false;
- this.xrLabel24.StylePriority.UsePadding = false;
- this.xrLabel24.StylePriority.UseTextAlignment = false;
- this.xrLabel24.Text = "Budget";
- this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
// Quittierungsbeleg
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
diff --git a/ReportImp/AutismusKoelnBonn/RechnungFaktor.cs b/ReportImp/AutismusKoelnBonn/RechnungFaktor.cs
index da3c6fbd2..d338292ca 100644
--- a/ReportImp/AutismusKoelnBonn/RechnungFaktor.cs
+++ b/ReportImp/AutismusKoelnBonn/RechnungFaktor.cs
@@ -118,9 +118,12 @@ namespace AutismusKoelnBonn
ii.ServiceDescription = "Fachleistungsstunden";
if (ii.Hours != null && ii.Hours != 0)
{
-
- ii.Notice = String.Format("{0:0.00}", hours * 0.2);
- ii.UnitCountString = String.Format("{0:0.00}", hours * 1.2);
+ var hoursMitFaktor = ii.Hours.Value;
+
+ ii.Hours = ii.Hours / 1.2m;
+
+ ii.Notice = String.Format("{0:0.00}", hoursMitFaktor - ii.Hours);
+ ii.UnitCountString = String.Format("{0:0.00}", hoursMitFaktor);
}
}
else
diff --git a/ReportImp/DiakonieMuelheim/CustomReportCreator.cs b/ReportImp/DiakonieMuelheim/CustomReportCreator.cs
index 00151d863..393a2783a 100644
--- a/ReportImp/DiakonieMuelheim/CustomReportCreator.cs
+++ b/ReportImp/DiakonieMuelheim/CustomReportCreator.cs
@@ -121,7 +121,7 @@ namespace DiakonieMuelheim
reports.Add(BerechneVarfieldReport(alleKlienten, 50));
//reports.Add(BerechneVarfieldReport(alleKlienten, 60));
//reports.Add(BerechneVarfieldReport(alleKlienten, 70));
- reports.Add(BerechneVarfieldReport(alleKlienten, 100));
+ reports.Add(BerechneVarfieldReport(alleKlienten, 100));
reports.Add(BerechneVarfieldReport(alleKlienten, 110));
reports.Add(BerechneVarfieldReport(alleKlienten, 120));
reports.Add(BerechneVarfieldReport(alleKlienten, 140));
@@ -532,19 +532,25 @@ namespace DiakonieMuelheim
foreach (var info in alleKlienten)
{
-
- if (!String.IsNullOrEmpty(info.Customer.TerminationReason) && info.Customer.TerminationDate.HasValue && info.Customer.TerminationDate >= start && info.Customer.TerminationDate <= end)
+ //String grund = "Ãœbernahme in das Folgejahr";
+
+ String grund = "Ohne Angabe";
+ if (!String.IsNullOrEmpty(info.Customer.TerminationReason))
+ {
+ grund = info.Customer.TerminationReason;
+ }
+ if (info.Customer.TerminationDate.HasValue && info.Customer.TerminationDate >= start && info.Customer.TerminationDate < end)
{
AnnualReportDataDC data = null;
- if (dataPerGrund.ContainsKey(info.Customer.TerminationReason))
+ if (dataPerGrund.ContainsKey(grund))
{
- data = dataPerGrund[info.Customer.TerminationReason];
+ data = dataPerGrund[grund];
}
else
{
data = new AnnualReportDataDC();
- data.Name = info.Customer.TerminationReason;
- dataPerGrund.Add(info.Customer.TerminationReason, data);
+ data.Name = grund;
+ dataPerGrund.Add(grund, data);
report.Data.Add(data);
}
@@ -568,7 +574,18 @@ namespace DiakonieMuelheim
{
JahrestatisticCustomerInfo info = null;
- foreach (var sc in customer.SupportConcepts)
+ info = new JahrestatisticCustomerInfo();
+
+ info.Customer = MapperFactory.CompactCustomerDC_Customer.MapToNewDC(customer);
+ info.IstWiederholungsKlient = HatAltenHilfeplan(customer, start);
+
+ info.Geschlecht = customer.Person.Sex;
+
+ info.VarFieldValueList = customer.VarFieldValueList;
+
+ return info;
+
+ foreach (var sc in customer.SupportConcepts)
{
foreach (var c2s in sc.CostBearer2SupportConceptList)
{
@@ -579,7 +596,7 @@ namespace DiakonieMuelheim
//{
// startdate = customer.AssistanceBegin;
//}
- if (scap.StartDate.HasValue && scap.EndDate.HasValue && scap.StartDate <= ende && scap.EndDate >= start)
+ if (scap.StartDate.HasValue && scap.EndDate.HasValue && scap.StartDate < ende && scap.EndDate >= start)
{
info = new JahrestatisticCustomerInfo();
@@ -588,7 +605,7 @@ namespace DiakonieMuelheim
info.Geschlecht = customer.Person.Sex;
- var records = c2s.ServiceRecords.Where(r => r.Start >= start && r.Start < ende.AddDays(1)).ToList();
+ var records = c2s.ServiceRecords.Where(r => r.Start >= start && r.Start < ende).ToList();
info.ServiceRecords = records;
info.VarFieldValueList = customer.VarFieldValueList;
@@ -600,33 +617,47 @@ namespace DiakonieMuelheim
return info;
}
+ private bool HatAltenHilfeplan(Customer customer, DateTime start)
+ {
+ if (customer.AssistanceBegin.HasValue && customer.AssistanceBegin.Value.Year < start.Year)
+ {
+ return true;
+ }
+ return false;
+ }
- private bool HatAltenHilfeplan(CostBearer2SupportConcept basisC2S, SupportConceptApprovalPeriod basisScap, Customer customer, DateTime start)
+ private bool HatAltenHilfeplan(CostBearer2SupportConcept basisC2S, SupportConceptApprovalPeriod basisScap, Customer customer, DateTime start)
{
- foreach (var sc in customer.SupportConcepts)
- {
- foreach (var c2s in sc.CostBearer2SupportConceptList)
- {
- if (c2s.CostBearer.Oid == basisC2S.CostBearer.Oid)
- {
- foreach (var scap in c2s.ApprovalPeriodList)
- {
- if (scap.EndDate.HasValue && scap.EndDate.Value < start)
- {
- if ((basisScap.ServiceCategory == null && scap.ServiceCategory == null) ||
- (basisScap.ServiceCategory != null && scap.ServiceCategory != null &&
- basisScap.ServiceCategory.Oid == scap.ServiceCategory.Oid))
- {
- return true;
- }
- }
+ if (customer.AssistanceBegin.HasValue && customer.AssistanceBegin.Value.Year < start.Year)
+ {
+ return true;
+ }
+ return false;
- }
- }
- }
- }
+ //foreach (var sc in customer.SupportConcepts)
+ //{
+ // foreach (var c2s in sc.CostBearer2SupportConceptList)
+ // {
+ // if (c2s.CostBearer.Oid == basisC2S.CostBearer.Oid)
+ // {
+ // foreach (var scap in c2s.ApprovalPeriodList)
+ // {
+ // if (scap.EndDate.HasValue && scap.EndDate.Value < start)
+ // {
+ // if ((basisScap.ServiceCategory == null && scap.ServiceCategory == null) ||
+ // (basisScap.ServiceCategory != null && scap.ServiceCategory != null &&
+ // basisScap.ServiceCategory.Oid == scap.ServiceCategory.Oid))
+ // {
+ // return true;
+ // }
+ // }
- return false;
+ // }
+ // }
+ // }
+ //}
+
+ //return false;
}
}
diff --git a/ReportImp/DiePerspektive/Export/FibuNetExporter.cs b/ReportImp/DiePerspektive/Export/FibuNetExporter.cs
index ce68e94d4..58ed611fe 100644
--- a/ReportImp/DiePerspektive/Export/FibuNetExporter.cs
+++ b/ReportImp/DiePerspektive/Export/FibuNetExporter.cs
@@ -361,7 +361,7 @@ Alternativ wäre der 1120er Satz mit einzubauen (ab Seite 61)
sb.Append("( ):1110;");
sb.Append(String.Format("{0:0};;;", ds.Betrag)); // Betrag
sb.Append("1;"); // Satzart
- sb.Append(ds.Erloeskonto);
+ sb.Append(ds.Debitor);
sb.Append(";");
sb.Append(ds.Erloeskonto); // HabenKonto
sb.Append(";1;M;"); //
diff --git a/ReportImp/ForumEV/SettlementReport.cs b/ReportImp/ForumEV/SettlementReport.cs
index 11c72937e..177da13e2 100644
--- a/ReportImp/ForumEV/SettlementReport.cs
+++ b/ReportImp/ForumEV/SettlementReport.cs
@@ -19,7 +19,7 @@ namespace ForumEV.Alt
{
if (pRO.TerminationDate.HasValue)
{
- pRO.AccountingEndDateString = string.Format("{dd.MM.yyyy}", pRO.TerminationDate.Value);
+ pRO.AccountingEndDateString = string.Format("{0:dd.MM.yyyy}", pRO.TerminationDate.Value);
pRO.AccountingEndDate = pRO.TerminationDate.Value;
}
diff --git a/ReportImp/HausDuelken/CustomAuslastungBerechnung.cs b/ReportImp/HausDuelken/CustomAuslastungBerechnung.cs
new file mode 100644
index 000000000..73502140e
--- /dev/null
+++ b/ReportImp/HausDuelken/CustomAuslastungBerechnung.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using BeWo.Report;
+using BeWo.Data.Entities;
+using BeWo.Data.Access;
+using BeWo.Service.DCEntityMapper;
+using BeWo.Service.Plugins;
+using BeWo.Service.ServiceImplementations;
+using BS.Shared.Core;
+using BS.Shared;
+using BS.Shared.Extensions;
+using BS.Shared.Services;
+using BeWo.Report.ReportObjects;
+
+namespace HausDuelken
+{
+ public class CustomAuslastungBerechnung : AuslastungBerechnung
+ {
+ protected override bool CheckIfApprovedGreaterZero()
+ {
+ return false;
+ }
+ }
+}
diff --git a/ReportImp/HausDuelken/HausDuelken.csproj b/ReportImp/HausDuelken/HausDuelken.csproj
index c97d9602b..d7ecbbfe8 100644
--- a/ReportImp/HausDuelken/HausDuelken.csproj
+++ b/ReportImp/HausDuelken/HausDuelken.csproj
@@ -48,6 +48,7 @@
+
Component
@@ -71,6 +72,12 @@
Mitarbeiterarbeitszeitkonto.cs
+
+ Component
+
+
+ Mitarbeiterauslastung.cs
+
Component
@@ -114,6 +121,12 @@
SettlementReport2.cs
+
+ Component
+
+
+ Teamauslastung.cs
+
Component
@@ -151,6 +164,9 @@
Mitarbeiterarbeitszeitkonto.cs
+
+ Mitarbeiterauslastung.cs
+
Mitarbeiterstundenkonto.cs
@@ -174,6 +190,9 @@
SettlementReport2.cs
+
+ Teamauslastung.cs
+
Teamstundenkonto.cs
diff --git a/ReportImp/HausDuelken/Mitarbeiterauslastung.cs b/ReportImp/HausDuelken/Mitarbeiterauslastung.cs
new file mode 100644
index 000000000..c29bdae12
--- /dev/null
+++ b/ReportImp/HausDuelken/Mitarbeiterauslastung.cs
@@ -0,0 +1,28 @@
+using System;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BS.Shared.Core;
+
+
+namespace HausDuelken
+{
+ [IDSpecificClass(Identifier = "Mitarbeiterauslastung")]
+ public partial class Mitarbeiterauslastung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport
+ {
+
+
+ public Mitarbeiterauslastung()
+ {
+ InitializeComponent();
+ }
+
+ public void SetReportDataSource(MitarbeiterauslastungRO pRO)
+ {
+ var b = new CustomAuslastungBerechnung();
+ b.CreateReport(pRO);
+
+ this.bindingSource1.DataSource = pRO;
+ }
+
+ }
+}
diff --git a/ReportImp/HausDuelken/Mitarbeiterauslastung.designer.cs b/ReportImp/HausDuelken/Mitarbeiterauslastung.designer.cs
new file mode 100644
index 000000000..988c42c3c
--- /dev/null
+++ b/ReportImp/HausDuelken/Mitarbeiterauslastung.designer.cs
@@ -0,0 +1,546 @@
+using BeWo.Report.ReportObjects;
+namespace HausDuelken
+{
+ partial class Mitarbeiterauslastung
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+ this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
+ this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+ this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+ this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
+ this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
+ this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
+ this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
+ this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
+ this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+ this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+ this.fieldTotalSC = new DevExpress.XtraReports.UI.CalculatedField();
+ this.fieldTotalEmp = new DevExpress.XtraReports.UI.CalculatedField();
+ 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();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+ //
+ // Detail
+ //
+ this.Detail.Expanded = false;
+ this.Detail.HeightF = 0F;
+ this.Detail.Name = "Detail";
+ this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // Detail1
+ //
+ this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel2,
+ this.xrLabel1});
+ this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.Detail1.HeightF = 50F;
+ this.Detail1.KeepTogether = true;
+ this.Detail1.KeepTogetherWithDetailReports = true;
+ this.Detail1.Name = "Detail1";
+ this.Detail1.StylePriority.UseFont = false;
+ //
+ // xrLabel2
+ //
+ this.xrLabel2.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+ this.xrLabel2.Multiline = true;
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(676.9999F, 25F);
+ this.xrLabel2.StyleName = "Title";
+ this.xrLabel2.StylePriority.UseFont = false;
+ this.xrLabel2.Text = "Wochenstunden: [WeeklyTotalHoursByContract!0.00], FLS/Woche: [FLSTotalHoursByCont" +
+ "ract!0.00]";
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")});
+ this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel1.Multiline = true;
+ this.xrLabel1.Name = "xrLabel1";
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(676.9999F, 25F);
+ this.xrLabel1.StyleName = "Title";
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "xrLabel1";
+ //
+ // xrTableDetail
+ //
+ this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTableDetail.Name = "xrTableDetail";
+ this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRowDetail});
+ this.xrTableDetail.SizeF = new System.Drawing.SizeF(640F, 25F);
+ this.xrTableDetail.StylePriority.UseBorders = false;
+ this.xrTableDetail.StylePriority.UseFont = false;
+ this.xrTableDetail.StylePriority.UsePadding = false;
+ this.xrTableDetail.StylePriority.UseTextAlignment = false;
+ this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrTableRowDetail
+ //
+ this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell3,
+ this.xrTableCell19,
+ this.xrTableCell2,
+ this.xrTableCell28});
+ this.xrTableRowDetail.Name = "xrTableRowDetail";
+ this.xrTableRowDetail.Weight = 1D;
+ //
+ // xrTableCell3
+ //
+ this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.CustomerFullName")});
+ this.xrTableCell3.Name = "xrTableCell3";
+ this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+ this.xrTableCell3.StylePriority.UseFont = false;
+ this.xrTableCell3.StylePriority.UsePadding = false;
+ this.xrTableCell3.StylePriority.UseTextAlignment = false;
+ this.xrTableCell3.Text = "xrTableCell3";
+ this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell3.Weight = 0.18034265103697025D;
+ //
+ // xrTableCell19
+ //
+ this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.TimeRangeString", "{0:0.00}")});
+ this.xrTableCell19.Name = "xrTableCell19";
+ this.xrTableCell19.Text = "xrTableCell19";
+ this.xrTableCell19.Weight = 0.15329125338142471D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.OrganisationName")});
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.Text = "xrTableCell2";
+ this.xrTableCell2.Weight = 0.15329125338142469D;
+ //
+ // xrTableCell28
+ //
+ this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.SupportConceptDetailList.ApprovedHoursPerWeek", "{0:0.00}")});
+ this.xrTableCell28.Name = "xrTableCell28";
+ this.xrTableCell28.Text = "xrTableCell28";
+ this.xrTableCell28.Weight = 0.090171325518485085D;
+ //
+ // DetailReport
+ //
+ this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail1,
+ this.DetailReport1});
+ this.DetailReport.DataMember = "EmployeeDetailList";
+ this.DetailReport.DataSource = this.bindingSource1;
+ this.DetailReport.Level = 0;
+ this.DetailReport.Name = "DetailReport";
+ //
+ // DetailReport1
+ //
+ this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail2,
+ this.GroupHeader2,
+ this.GroupFooter1});
+ this.DetailReport1.DataMember = "EmployeeDetailList.SupportConceptDetailList";
+ this.DetailReport1.DataSource = this.bindingSource1;
+ this.DetailReport1.Level = 0;
+ this.DetailReport1.Name = "DetailReport1";
+ //
+ // Detail2
+ //
+ this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTableDetail});
+ this.Detail2.HeightF = 25F;
+ this.Detail2.Name = "Detail2";
+ //
+ // GroupHeader2
+ //
+ this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTableHeader});
+ this.GroupHeader2.HeightF = 40F;
+ this.GroupHeader2.Name = "GroupHeader2";
+ this.GroupHeader2.RepeatEveryPage = true;
+ //
+ // xrTableHeader
+ //
+ this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
+ this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTableHeader.Name = "xrTableHeader";
+ this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRowHeader});
+ this.xrTableHeader.SizeF = new System.Drawing.SizeF(640F, 40F);
+ this.xrTableHeader.StylePriority.UseBorders = false;
+ this.xrTableHeader.StylePriority.UseFont = false;
+ this.xrTableHeader.StylePriority.UsePadding = false;
+ this.xrTableHeader.StylePriority.UseTextAlignment = false;
+ this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrTableRowHeader
+ //
+ this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell5,
+ this.xrTableCell4,
+ this.xrTableCell1,
+ this.xrTableCell9});
+ this.xrTableRowHeader.Name = "xrTableRowHeader";
+ this.xrTableRowHeader.Weight = 1.5999999999999996D;
+ //
+ // xrTableCell5
+ //
+ this.xrTableCell5.Name = "xrTableCell5";
+ this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+ this.xrTableCell5.StylePriority.UsePadding = false;
+ this.xrTableCell5.StylePriority.UseTextAlignment = false;
+ this.xrTableCell5.Text = "Klient/in";
+ this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell5.Weight = 0.18034264782021736D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.Text = "Zeitraum";
+ this.xrTableCell4.Weight = 0.15329125478030675D;
+ //
+ // xrTableCell1
+ //
+ this.xrTableCell1.Name = "xrTableCell1";
+ this.xrTableCell1.Text = "Kostenträger";
+ this.xrTableCell1.Weight = 0.15329125478030678D;
+ //
+ // xrTableCell9
+ //
+ this.xrTableCell9.Multiline = true;
+ this.xrTableCell9.Name = "xrTableCell9";
+ this.xrTableCell9.Text = "Bewilligt/Woche";
+ this.xrTableCell9.Weight = 0.090171325937473845D;
+ //
+ // GroupFooter1
+ //
+ this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable1});
+ this.GroupFooter1.HeightF = 60F;
+ this.GroupFooter1.Level = 1;
+ this.GroupFooter1.Name = "GroupFooter1";
+ //
+ // xrTable1
+ //
+ this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable1.Name = "xrTable1";
+ this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow1});
+ this.xrTable1.SizeF = new System.Drawing.SizeF(639.9999F, 25F);
+ this.xrTable1.StylePriority.UseBorders = false;
+ this.xrTable1.StylePriority.UseFont = false;
+ this.xrTable1.StylePriority.UsePadding = false;
+ this.xrTable1.StylePriority.UseTextAlignment = false;
+ this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrTableRow1
+ //
+ this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell35,
+ this.xrTableCell38,
+ this.xrTableCell6,
+ this.cellSollGesamt});
+ this.xrTableRow1.Name = "xrTableRow1";
+ this.xrTableRow1.Weight = 1D;
+ //
+ // xrTableCell35
+ //
+ this.xrTableCell35.Name = "xrTableCell35";
+ this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+ this.xrTableCell35.StylePriority.UseFont = false;
+ this.xrTableCell35.StylePriority.UsePadding = false;
+ this.xrTableCell35.StylePriority.UseTextAlignment = false;
+ this.xrTableCell35.Text = "Gesamt";
+ this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell35.Weight = 0.18034254096455143D;
+ //
+ // xrTableCell38
+ //
+ this.xrTableCell38.Name = "xrTableCell38";
+ this.xrTableCell38.Weight = 0.15329111579090118D;
+ //
+ // xrTableCell6
+ //
+ this.xrTableCell6.Name = "xrTableCell6";
+ this.xrTableCell6.Weight = 0.15329140580312939D;
+ //
+ // cellSollGesamt
+ //
+ this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.ApprovedHoursPerWeek", "{0:0.00}")});
+ this.cellSollGesamt.Name = "cellSollGesamt";
+ this.cellSollGesamt.Text = "cellSollGesamt";
+ this.cellSollGesamt.Weight = 0.090171342851318267D;
+ //
+ // ReportHeader
+ //
+ this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.lblMonat});
+ this.ReportHeader.HeightF = 60F;
+ this.ReportHeader.Name = "ReportHeader";
+ //
+ // lblMonat
+ //
+ this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Auslastung {0:MMMM yy}")});
+ this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
+ this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.lblMonat.Multiline = true;
+ this.lblMonat.Name = "lblMonat";
+ this.lblMonat.SizeF = new System.Drawing.SizeF(676.9999F, 25F);
+ this.lblMonat.StyleName = "Title";
+ this.lblMonat.StylePriority.UseFont = false;
+ this.lblMonat.Text = "lblMonat";
+ //
+ // pageFooterBand1
+ //
+ this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrPageInfo2,
+ this.xrPageInfo1});
+ this.pageFooterBand1.HeightF = 48F;
+ this.pageFooterBand1.Name = "pageFooterBand1";
+ //
+ // xrPageInfo2
+ //
+ this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrPageInfo2.Format = "Seite {0} von {1}";
+ this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(342.4169F, 25F);
+ this.xrPageInfo2.Name = "xrPageInfo2";
+ this.xrPageInfo2.SizeF = new System.Drawing.SizeF(297.5831F, 23F);
+ this.xrPageInfo2.StyleName = "PageInfo";
+ this.xrPageInfo2.StylePriority.UseFont = false;
+ this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // xrPageInfo1
+ //
+ this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+ this.xrPageInfo1.Name = "xrPageInfo1";
+ this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
+ this.xrPageInfo1.SizeF = new System.Drawing.SizeF(287F, 23F);
+ this.xrPageInfo1.StyleName = "PageInfo";
+ this.xrPageInfo1.StylePriority.UseFont = false;
+ //
+ // Title
+ //
+ this.Title.BackColor = System.Drawing.Color.White;
+ this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.Title.BorderWidth = 1;
+ this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+ this.Title.ForeColor = System.Drawing.Color.Black;
+ this.Title.Name = "Title";
+ //
+ // FieldCaption
+ //
+ this.FieldCaption.BackColor = System.Drawing.Color.White;
+ this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.FieldCaption.BorderWidth = 1;
+ this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+ this.FieldCaption.ForeColor = System.Drawing.Color.Black;
+ this.FieldCaption.Name = "FieldCaption";
+ //
+ // PageInfo
+ //
+ this.PageInfo.BackColor = System.Drawing.Color.White;
+ this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.PageInfo.BorderWidth = 1;
+ this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.PageInfo.ForeColor = System.Drawing.Color.Black;
+ this.PageInfo.Name = "PageInfo";
+ //
+ // DataField
+ //
+ this.DataField.BackColor = System.Drawing.Color.White;
+ this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.DataField.BorderWidth = 1;
+ this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Name = "DataField";
+ //
+ // fieldFLS
+ //
+ this.fieldFLS.DataMember = "FLSReportGroups";
+ this.fieldFLS.Expression = "[TotalFLM] / 60";
+ this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldFLS.Name = "fieldFLS";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 50F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 30F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
+ // fieldTotalSC
+ //
+ this.fieldTotalSC.DataMember = "EmployeeDetailList.SupportConceptDetailList";
+ this.fieldTotalSC.Expression = "[DirectIst]+[MittelbarIst]";
+ this.fieldTotalSC.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldTotalSC.Name = "fieldTotalSC";
+ //
+ // fieldTotalEmp
+ //
+ this.fieldTotalEmp.DataMember = "EmployeeDetailList";
+ this.fieldTotalEmp.Expression = "[DirectIst]+[MittelbarIst]";
+ this.fieldTotalEmp.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldTotalEmp.Name = "fieldTotalEmp";
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterauslastungRO);
+ //
+ // Mitarbeiterauslastung
+ //
+ this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail,
+ this.DetailReport,
+ this.ReportHeader,
+ this.pageFooterBand1,
+ this.topMarginBand1,
+ this.bottomMarginBand1});
+ this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+ this.fieldFLS,
+ this.fieldTotalSC,
+ this.fieldTotalEmp});
+ this.DataSource = this.bindingSource1;
+ this.Margins = new System.Drawing.Printing.Margins(100, 30, 50, 30);
+ this.PageHeight = 1169;
+ this.PageWidth = 827;
+ this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+ this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
+ this.Title,
+ this.FieldCaption,
+ this.PageInfo,
+ this.DataField});
+ this.Version = "13.1";
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraReports.UI.DetailBand Detail;
+ private System.Windows.Forms.BindingSource bindingSource1;
+ private DevExpress.XtraReports.UI.DetailBand Detail1;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+ private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+ private DevExpress.XtraReports.UI.XRLabel lblMonat;
+ private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
+ private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
+ private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
+ private DevExpress.XtraReports.UI.XRControlStyle Title;
+ private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
+ private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
+ private DevExpress.XtraReports.UI.XRControlStyle DataField;
+ private DevExpress.XtraReports.UI.XRTable xrTableHeader;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+ private DevExpress.XtraReports.UI.XRTable xrTableDetail;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+ private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
+ private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+ private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
+ private DevExpress.XtraReports.UI.XRTable xrTable1;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
+ private DevExpress.XtraReports.UI.XRTableCell cellSollGesamt;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport1;
+ private DevExpress.XtraReports.UI.DetailBand Detail2;
+ private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+ private DevExpress.XtraReports.UI.CalculatedField fieldTotalSC;
+ private DevExpress.XtraReports.UI.CalculatedField fieldTotalEmp;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+ }
+}
diff --git a/ReportImp/HausDuelken/Mitarbeiterauslastung.resx b/ReportImp/HausDuelken/Mitarbeiterauslastung.resx
new file mode 100644
index 000000000..d25f3eba2
--- /dev/null
+++ b/ReportImp/HausDuelken/Mitarbeiterauslastung.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/ReportImp/HausDuelken/Teamauslastung.cs b/ReportImp/HausDuelken/Teamauslastung.cs
new file mode 100644
index 000000000..abdee4937
--- /dev/null
+++ b/ReportImp/HausDuelken/Teamauslastung.cs
@@ -0,0 +1,28 @@
+using System;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+using BS.Shared.Core;
+
+
+namespace HausDuelken
+{
+ [IDSpecificClass(Identifier = "Teamauslastung")]
+ public partial class Teamauslastung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport
+ {
+
+
+ public Teamauslastung()
+ {
+ InitializeComponent();
+ }
+
+ public void SetReportDataSource(MitarbeiterauslastungRO pRO)
+ {
+ AuslastungBerechnung b = new AuslastungBerechnung();
+ b.CreateReport(pRO);
+
+ this.bindingSource1.DataSource = pRO;
+ }
+
+ }
+}
diff --git a/ReportImp/HausDuelken/Teamauslastung.designer.cs b/ReportImp/HausDuelken/Teamauslastung.designer.cs
new file mode 100644
index 000000000..0e3aa9ff2
--- /dev/null
+++ b/ReportImp/HausDuelken/Teamauslastung.designer.cs
@@ -0,0 +1,531 @@
+using BeWo.Report.ReportObjects;
+namespace HausDuelken
+{
+ partial class Teamauslastung
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+ this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.Detail2 = new DevExpress.XtraReports.UI.DetailBand();
+ this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+ this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
+ this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
+ this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
+ this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
+ this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
+ this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
+ this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+ this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+ this.fieldTotalSC = new DevExpress.XtraReports.UI.CalculatedField();
+ this.fieldTotalEmp = new DevExpress.XtraReports.UI.CalculatedField();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+ //
+ // Detail
+ //
+ this.Detail.Expanded = false;
+ this.Detail.HeightF = 0F;
+ this.Detail.Name = "Detail";
+ this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+ this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+ //
+ // Detail1
+ //
+ this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel1});
+ this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.Detail1.HeightF = 50F;
+ this.Detail1.KeepTogether = true;
+ this.Detail1.KeepTogetherWithDetailReports = true;
+ this.Detail1.Name = "Detail1";
+ this.Detail1.StylePriority.UseFont = false;
+ //
+ // xrLabel1
+ //
+ this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.TeamName")});
+ this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel1.Multiline = true;
+ this.xrLabel1.Name = "xrLabel1";
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(676.9999F, 25F);
+ this.xrLabel1.StyleName = "Title";
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "xrLabel1";
+ //
+ // xrTableDetail
+ //
+ this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTableDetail.Name = "xrTableDetail";
+ this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRowDetail});
+ this.xrTableDetail.SizeF = new System.Drawing.SizeF(750F, 25F);
+ this.xrTableDetail.StylePriority.UseBorders = false;
+ this.xrTableDetail.StylePriority.UseFont = false;
+ this.xrTableDetail.StylePriority.UsePadding = false;
+ this.xrTableDetail.StylePriority.UseTextAlignment = false;
+ this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrTableRowDetail
+ //
+ this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell3,
+ this.xrTableCell19,
+ this.xrTableCell2,
+ this.xrTableCell28});
+ this.xrTableRowDetail.Name = "xrTableRowDetail";
+ this.xrTableRowDetail.Weight = 1D;
+ //
+ // xrTableCell3
+ //
+ this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.SupportConceptDetailList.CustomerFullName")});
+ this.xrTableCell3.Name = "xrTableCell3";
+ this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+ this.xrTableCell3.StylePriority.UseFont = false;
+ this.xrTableCell3.StylePriority.UsePadding = false;
+ this.xrTableCell3.StylePriority.UseTextAlignment = false;
+ this.xrTableCell3.Text = "xrTableCell3";
+ this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell3.Weight = 0.18034265103697025D;
+ //
+ // xrTableCell19
+ //
+ this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.SupportConceptDetailList.TimeRangeString", "{0:0.00}")});
+ this.xrTableCell19.Name = "xrTableCell19";
+ this.xrTableCell19.Text = "xrTableCell19";
+ this.xrTableCell19.Weight = 0.1352569882777277D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.SupportConceptDetailList.OrganisationName")});
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.Text = "xrTableCell2";
+ this.xrTableCell2.Weight = 0.18034265103697023D;
+ //
+ // xrTableCell28
+ //
+ this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.SupportConceptDetailList.ApprovedHoursPerWeek", "{0:0.00}")});
+ this.xrTableCell28.Name = "xrTableCell28";
+ this.xrTableCell28.Text = "xrTableCell28";
+ this.xrTableCell28.Weight = 0.18034265103697023D;
+ //
+ // DetailReport
+ //
+ this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail1,
+ this.DetailReport1});
+ this.DetailReport.DataMember = "TeamDetailList";
+ this.DetailReport.DataSource = this.bindingSource1;
+ this.DetailReport.Level = 0;
+ this.DetailReport.Name = "DetailReport";
+ //
+ // DetailReport1
+ //
+ this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail2,
+ this.GroupHeader2,
+ this.GroupFooter1});
+ this.DetailReport1.DataMember = "TeamDetailList.SupportConceptDetailList";
+ this.DetailReport1.DataSource = this.bindingSource1;
+ this.DetailReport1.Level = 0;
+ this.DetailReport1.Name = "DetailReport1";
+ //
+ // Detail2
+ //
+ this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTableDetail});
+ this.Detail2.HeightF = 25F;
+ this.Detail2.Name = "Detail2";
+ //
+ // GroupHeader2
+ //
+ this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTableHeader});
+ this.GroupHeader2.HeightF = 40F;
+ this.GroupHeader2.Name = "GroupHeader2";
+ this.GroupHeader2.RepeatEveryPage = true;
+ //
+ // xrTableHeader
+ //
+ this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
+ this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTableHeader.Name = "xrTableHeader";
+ this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRowHeader});
+ this.xrTableHeader.SizeF = new System.Drawing.SizeF(750F, 40F);
+ this.xrTableHeader.StylePriority.UseBorders = false;
+ this.xrTableHeader.StylePriority.UseFont = false;
+ this.xrTableHeader.StylePriority.UsePadding = false;
+ this.xrTableHeader.StylePriority.UseTextAlignment = false;
+ this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrTableRowHeader
+ //
+ this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell5,
+ this.xrTableCell4,
+ this.xrTableCell1,
+ this.xrTableCell9});
+ this.xrTableRowHeader.Name = "xrTableRowHeader";
+ this.xrTableRowHeader.Weight = 1.5999999999999996D;
+ //
+ // xrTableCell5
+ //
+ this.xrTableCell5.Name = "xrTableCell5";
+ this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+ this.xrTableCell5.StylePriority.UsePadding = false;
+ this.xrTableCell5.StylePriority.UseTextAlignment = false;
+ this.xrTableCell5.Text = "Klient/in";
+ this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell5.Weight = 0.18034264782021736D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.Text = "Zeitraum";
+ this.xrTableCell4.Weight = 0.1352569910754918D;
+ //
+ // xrTableCell1
+ //
+ this.xrTableCell1.Name = "xrTableCell1";
+ this.xrTableCell1.Text = "Kostenträger";
+ this.xrTableCell1.Weight = 0.18034265124646462D;
+ //
+ // xrTableCell9
+ //
+ this.xrTableCell9.Multiline = true;
+ this.xrTableCell9.Name = "xrTableCell9";
+ this.xrTableCell9.Text = "Bewilligt/Woche";
+ this.xrTableCell9.Weight = 0.18034265124646462D;
+ //
+ // GroupFooter1
+ //
+ this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable1});
+ this.GroupFooter1.HeightF = 60F;
+ this.GroupFooter1.Level = 1;
+ this.GroupFooter1.Name = "GroupFooter1";
+ //
+ // xrTable1
+ //
+ this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 0F);
+ this.xrTable1.Name = "xrTable1";
+ this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow1});
+ this.xrTable1.SizeF = new System.Drawing.SizeF(750F, 25F);
+ this.xrTable1.StylePriority.UseBorders = false;
+ this.xrTable1.StylePriority.UseFont = false;
+ this.xrTable1.StylePriority.UsePadding = false;
+ this.xrTable1.StylePriority.UseTextAlignment = false;
+ this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrTableRow1
+ //
+ this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell35,
+ this.xrTableCell38,
+ this.xrTableCell6,
+ this.cellSollGesamt});
+ this.xrTableRow1.Name = "xrTableRow1";
+ this.xrTableRow1.Weight = 1D;
+ //
+ // xrTableCell35
+ //
+ this.xrTableCell35.Name = "xrTableCell35";
+ this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+ this.xrTableCell35.StylePriority.UseFont = false;
+ this.xrTableCell35.StylePriority.UsePadding = false;
+ this.xrTableCell35.StylePriority.UseTextAlignment = false;
+ this.xrTableCell35.Text = "Gesamt";
+ this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell35.Weight = 0.18034265103697028D;
+ //
+ // xrTableCell38
+ //
+ this.xrTableCell38.Name = "xrTableCell38";
+ this.xrTableCell38.Weight = 0.1352569882777277D;
+ //
+ // xrTableCell6
+ //
+ this.xrTableCell6.Name = "xrTableCell6";
+ this.xrTableCell6.Weight = 0.18034265103697075D;
+ //
+ // cellSollGesamt
+ //
+ this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.ApprovedHoursPerWeek", "{0:0.00}")});
+ this.cellSollGesamt.Name = "cellSollGesamt";
+ this.cellSollGesamt.Text = "cellSollGesamt";
+ this.cellSollGesamt.Weight = 0.18034265103697075D;
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterauslastungRO);
+ //
+ // ReportHeader
+ //
+ this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.lblMonat});
+ this.ReportHeader.HeightF = 60F;
+ this.ReportHeader.Name = "ReportHeader";
+ //
+ // lblMonat
+ //
+ this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Auslastung {0:MMMM yy}")});
+ this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
+ this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.lblMonat.Multiline = true;
+ this.lblMonat.Name = "lblMonat";
+ this.lblMonat.SizeF = new System.Drawing.SizeF(676.9999F, 25F);
+ this.lblMonat.StyleName = "Title";
+ this.lblMonat.StylePriority.UseFont = false;
+ this.lblMonat.Text = "lblMonat";
+ //
+ // pageFooterBand1
+ //
+ this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrPageInfo2,
+ this.xrPageInfo1});
+ this.pageFooterBand1.HeightF = 48F;
+ this.pageFooterBand1.Name = "pageFooterBand1";
+ //
+ // xrPageInfo2
+ //
+ this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrPageInfo2.Format = "Seite {0} von {1}";
+ this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(452.417F, 25F);
+ this.xrPageInfo2.Name = "xrPageInfo2";
+ this.xrPageInfo2.SizeF = new System.Drawing.SizeF(297.5831F, 23F);
+ this.xrPageInfo2.StyleName = "PageInfo";
+ this.xrPageInfo2.StylePriority.UseFont = false;
+ this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ //
+ // xrPageInfo1
+ //
+ this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+ this.xrPageInfo1.Name = "xrPageInfo1";
+ this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
+ this.xrPageInfo1.SizeF = new System.Drawing.SizeF(287F, 23F);
+ this.xrPageInfo1.StyleName = "PageInfo";
+ this.xrPageInfo1.StylePriority.UseFont = false;
+ //
+ // Title
+ //
+ this.Title.BackColor = System.Drawing.Color.White;
+ this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.Title.BorderWidth = 1;
+ this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+ this.Title.ForeColor = System.Drawing.Color.Black;
+ this.Title.Name = "Title";
+ //
+ // FieldCaption
+ //
+ this.FieldCaption.BackColor = System.Drawing.Color.White;
+ this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.FieldCaption.BorderWidth = 1;
+ this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+ this.FieldCaption.ForeColor = System.Drawing.Color.Black;
+ this.FieldCaption.Name = "FieldCaption";
+ //
+ // PageInfo
+ //
+ this.PageInfo.BackColor = System.Drawing.Color.White;
+ this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.PageInfo.BorderWidth = 1;
+ this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.PageInfo.ForeColor = System.Drawing.Color.Black;
+ this.PageInfo.Name = "PageInfo";
+ //
+ // DataField
+ //
+ this.DataField.BackColor = System.Drawing.Color.White;
+ this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
+ this.DataField.BorderWidth = 1;
+ this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+ this.DataField.Name = "DataField";
+ //
+ // fieldFLS
+ //
+ this.fieldFLS.DataMember = "FLSReportGroups";
+ this.fieldFLS.Expression = "[TotalFLM] / 60";
+ this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldFLS.Name = "fieldFLS";
+ //
+ // topMarginBand1
+ //
+ this.topMarginBand1.HeightF = 50F;
+ this.topMarginBand1.Name = "topMarginBand1";
+ //
+ // bottomMarginBand1
+ //
+ this.bottomMarginBand1.HeightF = 30F;
+ this.bottomMarginBand1.Name = "bottomMarginBand1";
+ //
+ // fieldTotalSC
+ //
+ this.fieldTotalSC.DataMember = "TeamDetailList.SupportConceptDetailList";
+ this.fieldTotalSC.Expression = "[DirectIst]+[MittelbarIst]";
+ this.fieldTotalSC.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldTotalSC.Name = "fieldTotalSC";
+ //
+ // fieldTotalEmp
+ //
+ this.fieldTotalEmp.DataMember = "TeamDetailList";
+ this.fieldTotalEmp.Expression = "[DirectIst]+[MittelbarIst]";
+ this.fieldTotalEmp.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+ this.fieldTotalEmp.Name = "fieldTotalEmp";
+ //
+ // Teamauslastung
+ //
+ this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail,
+ this.DetailReport,
+ this.ReportHeader,
+ this.pageFooterBand1,
+ this.topMarginBand1,
+ this.bottomMarginBand1});
+ this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+ this.fieldFLS,
+ this.fieldTotalSC,
+ this.fieldTotalEmp});
+ this.DataSource = this.bindingSource1;
+ this.Margins = new System.Drawing.Printing.Margins(50, 20, 50, 30);
+ this.PageHeight = 1169;
+ this.PageWidth = 827;
+ this.PaperKind = System.Drawing.Printing.PaperKind.A4;
+ this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
+ this.Title,
+ this.FieldCaption,
+ this.PageInfo,
+ this.DataField});
+ this.Version = "13.1";
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraReports.UI.DetailBand Detail;
+ private System.Windows.Forms.BindingSource bindingSource1;
+ private DevExpress.XtraReports.UI.DetailBand Detail1;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+ private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+ private DevExpress.XtraReports.UI.XRLabel lblMonat;
+ private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
+ private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
+ private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
+ private DevExpress.XtraReports.UI.XRControlStyle Title;
+ private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
+ private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
+ private DevExpress.XtraReports.UI.XRControlStyle DataField;
+ private DevExpress.XtraReports.UI.XRTable xrTableHeader;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
+ private DevExpress.XtraReports.UI.XRTable xrTableDetail;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+ private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
+ private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+ private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
+ private DevExpress.XtraReports.UI.XRTable xrTable1;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
+ private DevExpress.XtraReports.UI.XRTableCell cellSollGesamt;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport1;
+ private DevExpress.XtraReports.UI.DetailBand Detail2;
+ private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+ private DevExpress.XtraReports.UI.CalculatedField fieldTotalSC;
+ private DevExpress.XtraReports.UI.CalculatedField fieldTotalEmp;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+ }
+}
diff --git a/ReportImp/HausDuelken/Teamauslastung.resx b/ReportImp/HausDuelken/Teamauslastung.resx
new file mode 100644
index 000000000..d25f3eba2
--- /dev/null
+++ b/ReportImp/HausDuelken/Teamauslastung.resx
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/ReportImp/Kette2/AuswertungSozialpsychiatrie.cs b/ReportImp/Kette2/AuswertungSozialpsychiatrie.cs
index 7a5b62c9c..403cb7b7c 100644
--- a/ReportImp/Kette2/AuswertungSozialpsychiatrie.cs
+++ b/ReportImp/Kette2/AuswertungSozialpsychiatrie.cs
@@ -58,7 +58,7 @@ namespace KetteReports
int idx = 1;
foreach (var row in queryRo.Rows)
{
- result.NummerCount++;
+
SozPsychErfassungBeratungDetailRO ro = new SozPsychErfassungBeratungDetailRO();
if (servicecategoryOid == 0)
@@ -66,15 +66,19 @@ namespace KetteReports
servicecategoryOid = Int64.Parse(row.Field17.ToString());
}
long oid = Int64.Parse(row.Field1.ToString());
- bool add = true;
+
+ bool customerDoppeltVorhanden = false;
if (!custOidDict.ContainsKey(oid))
{
- //custOidDict.Add(oid, true);
+ custOidDict.Add(oid, true);
}
else
{
- add = false;
+ customerDoppeltVorhanden = true;
}
+ if (!customerDoppeltVorhanden)
+ result.NummerCount++;
+
Customer c = DAOFactory.GenericDAO.LoadByID(oid);
ro.Nummer = idx++;
@@ -91,7 +95,8 @@ namespace KetteReports
ro.Strasse = wp.Strasse;
ro.Hausnr = wp.HausNummer;
- result.WohnplatzCount++;
+ if (!customerDoppeltVorhanden)
+ result.WohnplatzCount++;
}
bool containsNewAngebot = c.VarFieldValueList.Exists(vv => vv.VarFieldDefOid >= 18 && vv.VarFieldDefOid <= 22);
@@ -101,18 +106,18 @@ namespace KetteReports
{
var varFieldValue = Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName));
- SetzeNationalitaet(result, ro, vv, varFieldValue);
+ SetzeNationalitaet(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
if (vv.VarFieldDefOid != 2 || !containsNewAngebot)
{
- SetzeAngebot(result, ro, vv, varFieldValue);
+ SetzeAngebot(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
}
- SetzeFahrdienst(result, ro, vv, varFieldValue);
- SetzeLebensumfeld(result, ro, vv, varFieldValue);
- SetzeErkrankung(result, ro, vv, varFieldValue);
- SetzeZugang(result, ro, vv, varFieldValue);
- SetzeOhneWohnplatz(result, ro, vv, varFieldValue);
+ SetzeFahrdienst(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
+ SetzeLebensumfeld(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
+ SetzeErkrankung(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
+ SetzeZugang(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
+ SetzeOhneWohnplatz(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
}
int sex = 0;
@@ -122,12 +127,14 @@ namespace KetteReports
if ( sex == 1)
{
ro.Weiblich = "x";
- result.WeiblichCount++;
+ if (!customerDoppeltVorhanden)
+ result.WeiblichCount++;
}
else if (sex == 0)
{
ro.Maennlich = "x";
- result.MaennlichCount++;
+ if (!customerDoppeltVorhanden)
+ result.MaennlichCount++;
}
}
DateTime birthday = DateTime.MinValue;
@@ -171,22 +178,26 @@ namespace KetteReports
if (alter < 60)
{
ro.AlterBis18 = "x";
- result.AlterBis18Count++;
+ if (!customerDoppeltVorhanden)
+ result.AlterBis18Count++;
}
else if (alter >= 60 && alter <= 70)
{
ro.Alter18_25 = "x";
- result.Alter18_25Count++;
+ if (!customerDoppeltVorhanden)
+ result.Alter18_25Count++;
}
else if (alter >= 71 && alter <= 80)
{
ro.Alter26_65 = "x";
- result.Alter26_65Count++;
+ if (!customerDoppeltVorhanden)
+ result.Alter26_65Count++;
}
else if (alter >= 81)
{
ro.AlterAb65 = "x";
- result.AlterAb65Count++;
+ if (!customerDoppeltVorhanden)
+ result.AlterAb65Count++;
}
}
else
@@ -194,22 +205,26 @@ namespace KetteReports
if (alter < 18)
{
ro.AlterBis18 = "x";
- result.AlterBis18Count++;
+ if (!customerDoppeltVorhanden)
+ result.AlterBis18Count++;
}
else if (alter >= 18 && alter <= 25)
{
ro.Alter18_25 = "x";
- result.Alter18_25Count++;
+ if (!customerDoppeltVorhanden)
+ result.Alter18_25Count++;
}
else if (alter >= 26 && alter <= 65)
{
ro.Alter26_65 = "x";
- result.Alter26_65Count++;
+ if (!customerDoppeltVorhanden)
+ result.Alter26_65Count++;
}
else if (alter >= 66)
{
ro.AlterAb65 = "x";
- result.AlterAb65Count++;
+ if (!customerDoppeltVorhanden)
+ result.AlterAb65Count++;
}
}
}
@@ -218,8 +233,8 @@ namespace KetteReports
//ro.PrimaerErkrankung = c.Diagnosis2CustomerList.Select(s => s.ICD10DiagnosisCode).ToSeparatedString(", ");
- SetzeVermittlung(result, ro, c);
- SetzeBeendigungsgrund(result, ro, c);
+ SetzeVermittlung(result, ro, c, customerDoppeltVorhanden);
+ SetzeBeendigungsgrund(result, ro, c, customerDoppeltVorhanden);
DateTime beantragtAb = DateTime.MinValue;
DateTime beantragtBis = DateTime.MinValue;
@@ -275,13 +290,14 @@ namespace KetteReports
if (String.IsNullOrEmpty(ro.FahrdienstJa))
{
ro.FahrdienstNein = "x";
- result.FahrdienstNeinCount++;
+ if (!customerDoppeltVorhanden)
+ result.FahrdienstNeinCount++;
}
- if (add)
- {
+ //if (add)
+ //{
result.DetailList.Add(ro);
- }
+ //}
}
return result;
}
@@ -468,7 +484,7 @@ namespace KetteReports
return monate;
}
- private void SetzeBeendigungsgrund(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, Customer customer)
+ private void SetzeBeendigungsgrund(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, Customer customer, bool customerDoppeltVorhanden)
{
if (customer.TerminationReason != null)
@@ -476,54 +492,63 @@ namespace KetteReports
if (customer.TerminationReason.Value == "stabilisiert")
{
ro.BeendigungsgrundZeileErreicht = "x";
- reportRo.BeendigungsgrundZeileErreichtCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.BeendigungsgrundZeileErreichtCount++;
}
else if (customer.TerminationReason.Value == "stationär vermittelt")
{
ro.BeendigungsgrundKkhReha = "x";
- reportRo.BeendigungsgrundKkhRehaCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.BeendigungsgrundKkhRehaCount++;
}
else if (customer.TerminationReason.Value == "von sich aus beendet")
{
ro.BeendigungsgrundAbbruch = "x";
- reportRo.BeendigungsgrundAbbruchCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.BeendigungsgrundAbbruchCount++;
}
else if (customer.TerminationReason.Value == "verstorben")
{
ro.BeendigungsgrundVerstorben = "x";
- reportRo.BeendigungsgrundVerstorbenCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.BeendigungsgrundVerstorbenCount++;
}
else if (customer.TerminationReason.Value.Contains("Reha"))
{
ro.BeendigungsgrundKkhReha = "x";
- reportRo.BeendigungsgrundKkhRehaCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.BeendigungsgrundKkhRehaCount++;
}
if (customer.TerminationReason.Value == "Ziele erreicht")
{
ro.BeendigungsgrundZeileErreicht = "x";
- reportRo.BeendigungsgrundZeileErreichtCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.BeendigungsgrundZeileErreichtCount++;
}
else if (customer.TerminationReason.Value == "KKH/Reha")
{
ro.BeendigungsgrundKkhReha = "x";
- reportRo.BeendigungsgrundKkhRehaCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.BeendigungsgrundKkhRehaCount++;
}
else if (customer.TerminationReason.Value == "Abbruch")
{
ro.BeendigungsgrundAbbruch = "x";
- reportRo.BeendigungsgrundAbbruchCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.BeendigungsgrundAbbruchCount++;
}
else if (customer.TerminationReason.Value == "Verstorben")
{
ro.BeendigungsgrundVerstorben = "x";
- reportRo.BeendigungsgrundVerstorbenCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.BeendigungsgrundVerstorbenCount++;
}
}
}
- private void SetzeVermittlung(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, Customer customer)
+ private void SetzeVermittlung(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, Customer customer, bool customerDoppeltVorhanden)
{
@@ -534,69 +559,81 @@ namespace KetteReports
if (placement.Objective.Value == "langfristige Betreuung")
{
ro.VermittlungLangfristigeBegleitung = "x";
- reportRo.VermittlungLangfristigeBegleitungCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungLangfristigeBegleitungCount++;
}
else if (placement.Objective.Value == "Behandlung / Therapie")
{
ro.VermittlungBehandlungTherapie = "x";
- reportRo.VermittlungBehandlungTherapieCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungBehandlungTherapieCount++;
}
else if (placement.Objective.Value == "Wohnheime / REHA")
{
ro.VermittlungWohnheimReha = "x";
- reportRo.VermittlungWohnheimRehaCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungWohnheimRehaCount++;
}
else if (placement.Objective.Value == "BEWO")
{
ro.VermittlungBeWo = "x";
- reportRo.VermittlungBeWoCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungBeWoCount++;
}
else if (placement.Objective.Value == "Tagesstätte")
{
ro.VermittlungTagestaette = "x";
- reportRo.VermittlungTagestaetteCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungTagestaetteCount++;
}
else if (placement.Objective.Value == "Kontaktstelle")
{
ro.VermittlungKontaktstelle = "x";
- reportRo.VermittlungKontaktstelleCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungKontaktstelleCount++;
}
else if (placement.Objective.Value == "SPFH" || placement.Objective.Value == "Jugendamt")
{
ro.VermittlungJugendamtSpfh = "x";
- reportRo.VermittlungJugendamtSpfhCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungJugendamtSpfhCount++;
}
else if (placement.Objective.Value == "Schuldnerberatung")
{
ro.VermittlungSchuldnerberatung = "x";
- reportRo.VermittlungSchuldnerberatungCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungSchuldnerberatungCount++;
}
else if (placement.Objective.Value == "SpDi")
{
ro.VermittlungSpdi = "x";
- reportRo.VermittlungSpdiCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungSpdiCount++;
}
else if (placement.Objective.Value == "sonstige Dienste")
{
ro.VermittlungSonstigeDienste = "x";
- reportRo.VermittlungSonstigeDiensteCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungSonstigeDiensteCount++;
}
else if (placement.Objective.Value == "Selbsthilfe")
{
ro.VermittlungSelbsthilfe = "x";
- reportRo.VermittlungSelbsthilfeCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungSelbsthilfeCount++;
}
else if (placement.Objective.Value == "keine weiteren Hilfen bekannt")
{
ro.VermittlungUnbekannt = "x";
- reportRo.VermittlungUnbekanntCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungUnbekanntCount++;
}
}
}
}
- private void SetzeOhneWohnplatz(SozPsychErfassungBeratungRO result, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
+ private void SetzeOhneWohnplatz(SozPsychErfassungBeratungRO result, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue, bool customerDoppeltVorhanden)
{
if (vv.VarFieldDefOid == 17)
{
@@ -605,16 +642,18 @@ namespace KetteReports
String vvStr = varFieldValue as String;
if (!String.IsNullOrWhiteSpace(vvStr))
{
- result.OhneFestenWohnsitzCount++;
-
ro.OhneFestenWohnsitz = vvStr;
+
+ if (!customerDoppeltVorhanden)
+ result.OhneFestenWohnsitzCount++;
+
}
}
}
}
- private void SetzeZugang(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
+ private void SetzeZugang(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue, bool customerDoppeltVorhanden)
{
if (vv.VarFieldDefOid == 16)
{
@@ -623,57 +662,67 @@ namespace KetteReports
if (angebot == "selbst/Familie/soz. Umfeld")
{
ro.ZugangUeberSelbst = "x";
- reportRo.ZugangUeberSelbstCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberSelbstCount++;
}
else if (angebot == "(Fach-)Arzt")
{
ro.ZugangUeberArzt = "x";
- reportRo.ZugangUeberArztCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberArztCount++;
}
else if (angebot == "KKH/Reha")
{
ro.ZugangUeberKkhReha = "x";
- reportRo.ZugangUeberKkhRehaCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberKkhRehaCount++;
}
else if (angebot == "SpDi")
{
ro.ZugangUeberSpDi = "x";
- reportRo.ZugangUeberSpDiCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberSpDiCount++;
}
else if (angebot == "Job Center")
{
ro.ZugangUeberJobCenter = "x";
- reportRo.ZugangUeberJobCenterCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberJobCenterCount++;
}
else if (angebot == "Selbsthilfe")
{
ro.ZugangUeberSelbsthilfe = "x";
- reportRo.ZugangUeberSelbsthilfeCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberSelbsthilfeCount++;
}
else if (angebot == "Seniorenberatung")
{
ro.ZugangUeberSeniorenberatung = "x";
- reportRo.ZugangUeberSeniorenberatungCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberSeniorenberatungCount++;
}
else if (angebot == "Pflegedienst")
{
ro.ZugangUeberPflegedienst = "x";
- reportRo.ZugangUeberPflegedienstCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberPflegedienstCount++;
}
else if (angebot == "Kontaktstelle")
{
ro.ZugangUeberKontaktstelle = "x";
- reportRo.ZugangUeberKontaktstelleCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberKontaktstelleCount++;
}
else if (angebot == "Andere")
{
ro.ZugangUeberAndere = "x";
- reportRo.ZugangUeberAndereCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberAndereCount++;
}
}
}
- private void SetzeErkrankung(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
+ private void SetzeErkrankung(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue, bool customerDoppeltVorhanden)
{
if (vv.VarFieldDefOid == 15)
{
@@ -682,88 +731,103 @@ namespace KetteReports
if (angebot == "Ja")
{
ro.PsychOderSuchterkrankungJa = "x";
- reportRo.PsychOderSuchterkrankungJaCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.PsychOderSuchterkrankungJaCount++;
}
else if (angebot == "Nein")
{
ro.PsychOderSuchterkrankungNein = "x";
- reportRo.PsychOderSuchterkrankungNeinCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.PsychOderSuchterkrankungNeinCount++;
}
else if (angebot == "Unbekannt")
{
ro.PsychOderSuchterkrankungUnbekannt = "x";
- reportRo.PsychOderSuchterkrankungUnbekanntCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.PsychOderSuchterkrankungUnbekanntCount++;
}
}
}
- private void SetzeLebensumfeld(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
+ private void SetzeLebensumfeld(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue, bool customerDoppeltVorhanden)
{
if (vv.VarFieldDefOid == 5 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldAlleinLebend = "x";
- reportRo.LebensumfeldAlleinLebendCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldAlleinLebendCount++;
}
else if (vv.VarFieldDefOid == 6 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldMitPartnerLebend = "x";
- reportRo.LebensumfeldMitPartnerLebendCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldMitPartnerLebendCount++;
}
else if (vv.VarFieldDefOid == 7 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldKinderImHaushalt = "x";
- reportRo.LebensumfeldKinderImHaushaltCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldKinderImHaushaltCount++;
}
else if (vv.VarFieldDefOid == 8 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldKinderInAnderemHaushalt = "x";
- reportRo.LebensumfeldKinderInAnderemHaushaltCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldKinderInAnderemHaushaltCount++;
}
else if (vv.VarFieldDefOid == 9 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldWohnhaftInHerkunftsfamilie = "x";
- reportRo.LebensumfeldWohnhaftInHerkunftsfamilieCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldWohnhaftInHerkunftsfamilieCount++;
}
else if (vv.VarFieldDefOid == 10 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldInArbeit = "x";
- reportRo.LebensumfeldInArbeitCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldInArbeitCount++;
}
else if (vv.VarFieldDefOid == 11 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldBeziehtAlg = "x";
- reportRo.LebensumfeldBeziehtAlgCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldBeziehtAlgCount++;
}
else if (vv.VarFieldDefOid == 12 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldBeziehtAlg2 = "x";
- reportRo.LebensumfeldBeziehtAlg2Count++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldBeziehtAlg2Count++;
}
else if (vv.VarFieldDefOid == 13 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldBeziehtGrundsicherung = "x";
- reportRo.LebensumfeldBeziehtGrundsicherungCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldBeziehtGrundsicherungCount++;
}
else if (vv.VarFieldDefOid == 14 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldBeziehtRente = "x";
- reportRo.LebensumfeldBeziehtRenteCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldBeziehtRenteCount++;
}
}
- private void SetzeFahrdienst(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
+ private void SetzeFahrdienst(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue, bool customerDoppeltVorhanden)
{
if (vv.VarFieldDefOid == 3)
{
if (varFieldValue.ToString() == "True")
{
ro.FahrdienstJa = "x";
- reportRo.FahrdienstJaCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.FahrdienstJaCount++;
}
else
{
//ro.FahrdienstNein = "x";
+ //if (!customerDoppeltVorhanden)
//reportRo.FahrdienstNeinCount++;
}
}
@@ -772,12 +836,13 @@ namespace KetteReports
if (varFieldValue.ToString() == "True")
{
ro.FahrdienstErfolgt = "x";
- reportRo.FahrdienstErfolgtCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.FahrdienstErfolgtCount++;
}
}
}
- private void SetzeAngebot(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
+ private void SetzeAngebot(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue, bool customerDoppeltVorhanden)
{
if (vv.VarFieldDefOid == 2)
{
@@ -786,27 +851,32 @@ namespace KetteReports
if (angebot == "Beratung")
{
ro.AngebotBeratung = "x";
- reportRo.AngebotBeratungCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotBeratungCount++;
}
else if (angebot == "Begleitung")
{
ro.AngebotBegleitung = "x";
- reportRo.AngebotBegleitungCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotBegleitungCount++;
}
else if (angebot == "Krisenintervention")
{
ro.AngebotKrisenIntervention = "x";
- reportRo.AngebotKrisenInterventionCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotKrisenInterventionCount++;
}
else if (angebot == "Beratung Angehöriger")
{
ro.AngebotBeratungAngehoeriger = "x";
- reportRo.AngebotBeratungAngehoerigerCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotBeratungAngehoerigerCount++;
}
else if (angebot == "Hausbesuch")
{
ro.AngebotHausbesuch = "x";
- reportRo.AngebotHausbesuchCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotHausbesuchCount++;
}
}
@@ -815,7 +885,8 @@ namespace KetteReports
if (varFieldValue.ToString() == "True")
{
ro.AngebotBeratung = "x";
- reportRo.AngebotBeratungCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotBeratungCount++;
}
}
else if (vv.VarFieldDefOid == 19)
@@ -823,7 +894,8 @@ namespace KetteReports
if (varFieldValue.ToString() == "True")
{
ro.AngebotBegleitung = "x";
- reportRo.AngebotBegleitungCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotBegleitungCount++;
}
}
else if (vv.VarFieldDefOid == 20)
@@ -831,7 +903,8 @@ namespace KetteReports
if (varFieldValue.ToString() == "True")
{
ro.AngebotKrisenIntervention = "x";
- reportRo.AngebotKrisenInterventionCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotKrisenInterventionCount++;
}
}
else if (vv.VarFieldDefOid == 21)
@@ -839,7 +912,8 @@ namespace KetteReports
if (varFieldValue.ToString() == "True")
{
ro.AngebotBeratungAngehoeriger = "x";
- reportRo.AngebotBeratungAngehoerigerCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotBeratungAngehoerigerCount++;
}
}
else if (vv.VarFieldDefOid == 22)
@@ -847,12 +921,13 @@ namespace KetteReports
if (varFieldValue.ToString() == "True")
{
ro.AngebotHausbesuch = "x";
- reportRo.AngebotHausbesuchCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotHausbesuchCount++;
}
}
}
- private void SetzeNationalitaet(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
+ private void SetzeNationalitaet(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue, bool customerDoppeltVorhanden)
{
if (vv.VarFieldDefOid == 1)
{
@@ -863,12 +938,14 @@ namespace KetteReports
if (staatsang.ToLower().Contains("deutsch"))
{
ro.Deutsch = "x";
- reportRo.DeutschCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.DeutschCount++;
}
else
{
ro.Nationalitaet = staatsang;
- reportRo.NationalitaetCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.NationalitaetCount++;
}
}
}
diff --git a/ReportImp/Kette2/QueryListReport.cs b/ReportImp/Kette2/QueryListReport.cs
index 6f96a111f..525f01eb8 100644
--- a/ReportImp/Kette2/QueryListReport.cs
+++ b/ReportImp/Kette2/QueryListReport.cs
@@ -57,7 +57,7 @@ namespace KetteReports
int idx = 1;
foreach (var row in queryRo.Rows)
{
- result.NummerCount++;
+
SozPsychErfassungBeratungDetailRO ro = new SozPsychErfassungBeratungDetailRO();
if (servicecategoryOid == 0)
@@ -65,15 +65,19 @@ namespace KetteReports
servicecategoryOid = Int64.Parse(row.Field17.ToString());
}
long oid = Int64.Parse(row.Field1.ToString());
- bool add = true;
+ bool customerDoppeltVorhanden = false;
if (!custOidDict.ContainsKey(oid))
{
- //custOidDict.Add(oid, true);
+ custOidDict.Add(oid, true);
+
}
else
{
- add = false;
+ customerDoppeltVorhanden = true;
}
+ if (!customerDoppeltVorhanden)
+ result.NummerCount++;
+
Customer c = DAOFactory.GenericDAO.LoadByID(oid);
ro.Nummer = idx++;
@@ -90,7 +94,10 @@ namespace KetteReports
ro.Strasse = wp.Strasse;
ro.Hausnr = wp.HausNummer;
- result.WohnplatzCount++;
+ if (!customerDoppeltVorhanden)
+ {
+ result.WohnplatzCount++;
+ }
}
bool containsNewAngebot = c.VarFieldValueList.Exists(vv => vv.VarFieldDefOid >= 18 && vv.VarFieldDefOid <= 22);
@@ -100,18 +107,18 @@ namespace KetteReports
{
var varFieldValue = Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName));
- SetzeNationalitaet(result, ro, vv, varFieldValue);
+ SetzeNationalitaet(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
if (vv.VarFieldDefOid != 2 || !containsNewAngebot)
{
- SetzeAngebot(result, ro, vv, varFieldValue);
+ SetzeAngebot(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
}
- SetzeFahrdienst(result, ro, vv, varFieldValue);
- SetzeLebensumfeld(result, ro, vv, varFieldValue);
- SetzeErkrankung(result, ro, vv, varFieldValue);
- SetzeZugang(result, ro, vv, varFieldValue);
- SetzeOhneWohnplatz(result, ro, vv, varFieldValue);
+ SetzeFahrdienst(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
+ SetzeLebensumfeld(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
+ SetzeErkrankung(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
+ SetzeZugang(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
+ SetzeOhneWohnplatz(result, ro, vv, varFieldValue, customerDoppeltVorhanden);
}
int sex = 0;
@@ -121,12 +128,14 @@ namespace KetteReports
if ( sex == 1)
{
ro.Weiblich = "x";
- result.WeiblichCount++;
+ if (!customerDoppeltVorhanden)
+ result.WeiblichCount++;
}
else if (sex == 0)
{
ro.Maennlich = "x";
- result.MaennlichCount++;
+ if (!customerDoppeltVorhanden)
+ result.MaennlichCount++;
}
}
DateTime birthday = DateTime.MinValue;
@@ -170,22 +179,26 @@ namespace KetteReports
if (alter < 60)
{
ro.AlterBis18 = "x";
- result.AlterBis18Count++;
+ if (!customerDoppeltVorhanden)
+ result.AlterBis18Count++;
}
else if (alter >= 60 && alter <= 70)
{
ro.Alter18_25 = "x";
- result.Alter18_25Count++;
+ if (!customerDoppeltVorhanden)
+ result.Alter18_25Count++;
}
else if (alter >= 71 && alter <= 80)
{
ro.Alter26_65 = "x";
- result.Alter26_65Count++;
+ if (!customerDoppeltVorhanden)
+ result.Alter26_65Count++;
}
else if (alter >= 81)
{
ro.AlterAb65 = "x";
- result.AlterAb65Count++;
+ if (!customerDoppeltVorhanden)
+ result.AlterAb65Count++;
}
}
else
@@ -193,22 +206,26 @@ namespace KetteReports
if (alter < 18)
{
ro.AlterBis18 = "x";
- result.AlterBis18Count++;
+ if (!customerDoppeltVorhanden)
+ result.AlterBis18Count++;
}
else if (alter >= 18 && alter <= 25)
{
ro.Alter18_25 = "x";
- result.Alter18_25Count++;
+ if (!customerDoppeltVorhanden)
+ result.Alter18_25Count++;
}
else if (alter >= 26 && alter <= 65)
{
ro.Alter26_65 = "x";
- result.Alter26_65Count++;
+ if (!customerDoppeltVorhanden)
+ result.Alter26_65Count++;
}
else if (alter >= 66)
{
ro.AlterAb65 = "x";
- result.AlterAb65Count++;
+ if (!customerDoppeltVorhanden)
+ result.AlterAb65Count++;
}
}
}
@@ -217,8 +234,8 @@ namespace KetteReports
//ro.PrimaerErkrankung = c.Diagnosis2CustomerList.Select(s => s.ICD10DiagnosisCode).ToSeparatedString(", ");
ro.PrimaerErkrankung = CreateDiagnosisString(c.Diagnosis2CustomerList);
- SetzeVermittlung(result, ro, c);
- SetzeBeendigungsgrund(result, ro, c);
+ SetzeVermittlung(result, ro, c, customerDoppeltVorhanden);
+ SetzeBeendigungsgrund(result, ro, c, customerDoppeltVorhanden);
DateTime beantragtAb = DateTime.MinValue;
DateTime beantragtBis = DateTime.MinValue;
@@ -274,13 +291,14 @@ namespace KetteReports
if (String.IsNullOrEmpty(ro.FahrdienstJa))
{
ro.FahrdienstNein = "x";
- result.FahrdienstNeinCount++;
+ if (!customerDoppeltVorhanden)
+ result.FahrdienstNeinCount++;
}
- if (add)
- {
+ //if (add)
+ //{
result.DetailList.Add(ro);
- }
+ //}
}
return result;
}
@@ -466,7 +484,7 @@ namespace KetteReports
return monate;
}
- private void SetzeBeendigungsgrund(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, Customer customer)
+ private void SetzeBeendigungsgrund(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, Customer customer, bool customerDoppeltVorhanden)
{
if (customer.TerminationReason != null)
@@ -474,33 +492,38 @@ namespace KetteReports
if (customer.TerminationReason.Value == "stabilisiert")
{
ro.BeendigungsgrundZeileErreicht = "x";
- reportRo.BeendigungsgrundZeileErreichtCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.BeendigungsgrundZeileErreichtCount++;
}
else if (customer.TerminationReason.Value == "stationär vermittelt")
{
ro.BeendigungsgrundStationaer = "x";
- reportRo.BeendigungsgrundStationaerCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.BeendigungsgrundStationaerCount++;
}
else if (customer.TerminationReason.Value == "von sich aus beendet")
{
ro.BeendigungsgrundAbbruch = "x";
- reportRo.BeendigungsgrundAbbruchCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.BeendigungsgrundAbbruchCount++;
}
else if (customer.TerminationReason.Value == "verstorben")
{
ro.BeendigungsgrundVerstorben = "x";
- reportRo.BeendigungsgrundVerstorbenCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.BeendigungsgrundVerstorbenCount++;
}
else if (customer.TerminationReason.Value.Contains("Reha"))
{
ro.BeendigungsgrundKkhReha = "x";
- reportRo.BeendigungsgrundKkhRehaCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.BeendigungsgrundKkhRehaCount++;
}
}
}
- private void SetzeVermittlung(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, Customer customer)
+ private void SetzeVermittlung(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, Customer customer, bool customerDoppeltVorhanden)
{
@@ -511,69 +534,81 @@ namespace KetteReports
if (placement.Objective.Value == "langfristige Betreuung")
{
ro.VermittlungLangfristigeBegleitung = "x";
- reportRo.VermittlungLangfristigeBegleitungCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungLangfristigeBegleitungCount++;
}
else if (placement.Objective.Value == "Behandlung / Therapie")
{
ro.VermittlungBehandlungTherapie = "x";
- reportRo.VermittlungBehandlungTherapieCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungBehandlungTherapieCount++;
}
else if (placement.Objective.Value == "Wohnheime / REHA")
{
ro.VermittlungWohnheimReha = "x";
- reportRo.VermittlungWohnheimRehaCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungWohnheimRehaCount++;
}
else if (placement.Objective.Value == "BEWO")
{
ro.VermittlungBeWo = "x";
- reportRo.VermittlungBeWoCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungBeWoCount++;
}
else if (placement.Objective.Value == "Tagesstätte")
{
ro.VermittlungTagestaette = "x";
- reportRo.VermittlungTagestaetteCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungTagestaetteCount++;
}
else if (placement.Objective.Value == "Kontaktstelle")
{
ro.VermittlungKontaktstelle = "x";
- reportRo.VermittlungKontaktstelleCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungKontaktstelleCount++;
}
else if (placement.Objective.Value == "SPFH" || placement.Objective.Value == "Jugendamt")
{
ro.VermittlungJugendamtSpfh = "x";
- reportRo.VermittlungJugendamtSpfhCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungJugendamtSpfhCount++;
}
else if (placement.Objective.Value == "Schuldnerberatung")
{
ro.VermittlungSchuldnerberatung = "x";
- reportRo.VermittlungSchuldnerberatungCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungSchuldnerberatungCount++;
}
else if (placement.Objective.Value == "SpDi")
{
ro.VermittlungSpdi = "x";
- reportRo.VermittlungSpdiCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungSpdiCount++;
}
else if (placement.Objective.Value == "sonstige Dienste")
{
ro.VermittlungSonstigeDienste = "x";
- reportRo.VermittlungSonstigeDiensteCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungSonstigeDiensteCount++;
}
else if (placement.Objective.Value == "Selbsthilfe")
{
ro.VermittlungSelbsthilfe = "x";
- reportRo.VermittlungSelbsthilfeCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungSelbsthilfeCount++;
}
else if (placement.Objective.Value == "keine weiteren Hilfen bekannt")
{
ro.VermittlungUnbekannt = "x";
- reportRo.VermittlungUnbekanntCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.VermittlungUnbekanntCount++;
}
}
}
}
- private void SetzeOhneWohnplatz(SozPsychErfassungBeratungRO result, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
+ private void SetzeOhneWohnplatz(SozPsychErfassungBeratungRO result, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue, bool customerDoppeltVorhanden)
{
if (vv.VarFieldDefOid == 17)
{
@@ -582,16 +617,16 @@ namespace KetteReports
String vvStr = varFieldValue as String;
if (!String.IsNullOrWhiteSpace(vvStr))
{
- result.OhneFestenWohnsitzCount++;
-
ro.OhneFestenWohnsitz = vvStr;
+ if (!customerDoppeltVorhanden)
+ result.OhneFestenWohnsitzCount++;
}
}
}
}
- private void SetzeZugang(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
+ private void SetzeZugang(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue, bool customerDoppeltVorhanden)
{
if (vv.VarFieldDefOid == 16)
{
@@ -600,57 +635,68 @@ namespace KetteReports
if (angebot == "selbst/Familie/soz. Umfeld")
{
ro.ZugangUeberSelbst = "x";
- reportRo.ZugangUeberSelbstCount++;
+
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberSelbstCount++;
}
else if (angebot == "(Fach-)Arzt")
{
ro.ZugangUeberArzt = "x";
- reportRo.ZugangUeberArztCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberArztCount++;
}
else if (angebot == "KKH/Reha")
{
ro.ZugangUeberKkhReha = "x";
- reportRo.ZugangUeberKkhRehaCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberKkhRehaCount++;
}
else if (angebot == "SpDi")
{
ro.ZugangUeberSpDi = "x";
- reportRo.ZugangUeberSpDiCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberSpDiCount++;
}
else if (angebot == "Job Center")
{
ro.ZugangUeberJobCenter = "x";
- reportRo.ZugangUeberJobCenterCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberJobCenterCount++;
}
else if (angebot == "Selbsthilfe")
{
ro.ZugangUeberSelbsthilfe = "x";
- reportRo.ZugangUeberSelbsthilfeCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberSelbsthilfeCount++;
}
else if (angebot == "Seniorenberatung")
{
ro.ZugangUeberSeniorenberatung = "x";
- reportRo.ZugangUeberSeniorenberatungCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberSeniorenberatungCount++;
}
else if (angebot == "Pflegedienst")
{
ro.ZugangUeberPflegedienst = "x";
- reportRo.ZugangUeberPflegedienstCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberPflegedienstCount++;
}
else if (angebot == "Kontaktstelle")
{
ro.ZugangUeberKontaktstelle = "x";
- reportRo.ZugangUeberKontaktstelleCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberKontaktstelleCount++;
}
else if (angebot == "Andere")
{
ro.ZugangUeberAndere = "x";
- reportRo.ZugangUeberAndereCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.ZugangUeberAndereCount++;
}
}
}
- private void SetzeErkrankung(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
+ private void SetzeErkrankung(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue, bool customerDoppeltVorhanden)
{
if (vv.VarFieldDefOid == 15)
{
@@ -659,89 +705,104 @@ namespace KetteReports
if (angebot == "Ja")
{
ro.PsychOderSuchterkrankungJa = "x";
- reportRo.PsychOderSuchterkrankungJaCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.PsychOderSuchterkrankungJaCount++;
}
else if (angebot == "Nein")
{
ro.PsychOderSuchterkrankungNein = "x";
- reportRo.PsychOderSuchterkrankungNeinCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.PsychOderSuchterkrankungNeinCount++;
}
else if (angebot == "Unbekannt")
{
ro.PsychOderSuchterkrankungUnbekannt = "x";
- reportRo.PsychOderSuchterkrankungUnbekanntCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.PsychOderSuchterkrankungUnbekanntCount++;
}
}
}
- private void SetzeLebensumfeld(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
+ private void SetzeLebensumfeld(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue, bool customerDoppeltVorhanden)
{
if (vv.VarFieldDefOid == 5 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldAlleinLebend = "x";
- reportRo.LebensumfeldAlleinLebendCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldAlleinLebendCount++;
}
else if (vv.VarFieldDefOid == 6 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldMitPartnerLebend = "x";
- reportRo.LebensumfeldMitPartnerLebendCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldMitPartnerLebendCount++;
}
else if (vv.VarFieldDefOid == 7 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldKinderImHaushalt = "x";
- reportRo.LebensumfeldKinderImHaushaltCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldKinderImHaushaltCount++;
}
else if (vv.VarFieldDefOid == 8 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldKinderInAnderemHaushalt = "x";
- reportRo.LebensumfeldKinderInAnderemHaushaltCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldKinderInAnderemHaushaltCount++;
}
else if (vv.VarFieldDefOid == 9 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldWohnhaftInHerkunftsfamilie = "x";
- reportRo.LebensumfeldWohnhaftInHerkunftsfamilieCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldWohnhaftInHerkunftsfamilieCount++;
}
else if (vv.VarFieldDefOid == 10 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldInArbeit = "x";
- reportRo.LebensumfeldInArbeitCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldInArbeitCount++;
}
else if (vv.VarFieldDefOid == 11 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldBeziehtAlg = "x";
- reportRo.LebensumfeldBeziehtAlgCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldBeziehtAlgCount++;
}
else if (vv.VarFieldDefOid == 12 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldBeziehtAlg2 = "x";
- reportRo.LebensumfeldBeziehtAlg2Count++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldBeziehtAlg2Count++;
}
else if (vv.VarFieldDefOid == 13 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldBeziehtGrundsicherung = "x";
- reportRo.LebensumfeldBeziehtGrundsicherungCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldBeziehtGrundsicherungCount++;
}
else if (vv.VarFieldDefOid == 14 && varFieldValue.ToString() == "True")
{
ro.LebensumfeldBeziehtRente = "x";
- reportRo.LebensumfeldBeziehtRenteCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.LebensumfeldBeziehtRenteCount++;
}
}
- private void SetzeFahrdienst(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
+ private void SetzeFahrdienst(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue, bool customerDoppeltVorhanden)
{
if (vv.VarFieldDefOid == 3)
{
if (varFieldValue.ToString() == "True")
{
ro.FahrdienstJa = "x";
- reportRo.FahrdienstJaCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.FahrdienstJaCount++;
}
else
{
//ro.FahrdienstNein = "x";
- //reportRo.FahrdienstNeinCount++;
+ //if (!customerDoppeltVorhanden)
+ //reportRo.FahrdienstNeinCount++;
}
}
else if (vv.VarFieldDefOid == 4)
@@ -749,12 +810,13 @@ namespace KetteReports
if (varFieldValue.ToString() == "True")
{
ro.FahrdienstErfolgt = "x";
- reportRo.FahrdienstErfolgtCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.FahrdienstErfolgtCount++;
}
}
}
- private void SetzeAngebot(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
+ private void SetzeAngebot(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue, bool customerDoppeltVorhanden)
{
if (vv.VarFieldDefOid == 2)
{
@@ -763,27 +825,32 @@ namespace KetteReports
if (angebot == "Beratung")
{
ro.AngebotBeratung = "x";
- reportRo.AngebotBeratungCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotBeratungCount++;
}
else if (angebot == "Begleitung")
{
ro.AngebotBegleitung = "x";
- reportRo.AngebotBegleitungCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotBegleitungCount++;
}
else if (angebot == "Krisenintervention")
{
ro.AngebotKrisenIntervention = "x";
- reportRo.AngebotKrisenInterventionCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotKrisenInterventionCount++;
}
else if (angebot == "Beratung Angehöriger")
{
ro.AngebotBeratungAngehoeriger = "x";
- reportRo.AngebotBeratungAngehoerigerCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotBeratungAngehoerigerCount++;
}
else if (angebot == "Hausbesuch")
{
ro.AngebotHausbesuch = "x";
- reportRo.AngebotHausbesuchCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotHausbesuchCount++;
}
}
@@ -792,7 +859,8 @@ namespace KetteReports
if (varFieldValue.ToString() == "True")
{
ro.AngebotBeratung = "x";
- reportRo.AngebotBeratungCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotBeratungCount++;
}
}
else if (vv.VarFieldDefOid == 19)
@@ -800,7 +868,8 @@ namespace KetteReports
if (varFieldValue.ToString() == "True")
{
ro.AngebotBegleitung = "x";
- reportRo.AngebotBegleitungCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotBegleitungCount++;
}
}
else if (vv.VarFieldDefOid == 20)
@@ -808,7 +877,8 @@ namespace KetteReports
if (varFieldValue.ToString() == "True")
{
ro.AngebotKrisenIntervention = "x";
- reportRo.AngebotKrisenInterventionCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotKrisenInterventionCount++;
}
}
else if (vv.VarFieldDefOid == 21)
@@ -816,7 +886,8 @@ namespace KetteReports
if (varFieldValue.ToString() == "True")
{
ro.AngebotBeratungAngehoeriger = "x";
- reportRo.AngebotBeratungAngehoerigerCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotBeratungAngehoerigerCount++;
}
}
else if (vv.VarFieldDefOid == 22)
@@ -824,12 +895,13 @@ namespace KetteReports
if (varFieldValue.ToString() == "True")
{
ro.AngebotHausbesuch = "x";
- reportRo.AngebotHausbesuchCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.AngebotHausbesuchCount++;
}
}
}
- private void SetzeNationalitaet(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue)
+ private void SetzeNationalitaet(SozPsychErfassungBeratungRO reportRo, SozPsychErfassungBeratungDetailRO ro, VarFieldValue vv, object varFieldValue, bool customerDoppeltVorhanden)
{
if (vv.VarFieldDefOid == 1)
{
@@ -840,12 +912,14 @@ namespace KetteReports
if (staatsang.ToLower().Contains("deutsch"))
{
ro.Deutsch = "x";
- reportRo.DeutschCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.DeutschCount++;
}
else
{
ro.Nationalitaet = staatsang;
- reportRo.NationalitaetCount++;
+ if (!customerDoppeltVorhanden)
+ reportRo.NationalitaetCount++;
}
}
}
diff --git a/ReportImp/Monvita/ServicesOverviewReport.Designer.cs b/ReportImp/Monvita/ServicesOverviewReport.Designer.cs
index b7b2a2284..e59348c13 100644
--- a/ReportImp/Monvita/ServicesOverviewReport.Designer.cs
+++ b/ReportImp/Monvita/ServicesOverviewReport.Designer.cs
@@ -53,10 +53,12 @@ namespace Monvita
this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
@@ -67,8 +69,6 @@ namespace Monvita
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField();
- this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -330,13 +330,41 @@ namespace Monvita
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel3,
this.xrLabel5,
this.xrLabel6,
this.xrLabel4,
this.xrLabel2});
- this.GroupFooter1.HeightF = 111.875F;
+ this.GroupFooter1.HeightF = 177.2917F;
this.GroupFooter1.Name = "GroupFooter1";
//
+ // xrLabel5
+ //
+ this.xrLabel5.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(9.999974F, 25F);
+ 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(170F, 25F);
+ this.xrLabel5.StylePriority.UseFont = false;
+ this.xrLabel5.StylePriority.UseTextAlignment = false;
+ this.xrLabel5.Text = "Summe Fehlkontakte (FK):";
+ this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ //
+ // xrLabel6
+ //
+ this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte", "{0:0.##}")});
+ this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(180F, 25F);
+ 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(60.00002F, 25F);
+ this.xrLabel6.StylePriority.UseFont = false;
+ this.xrLabel6.StylePriority.UseTextAlignment = false;
+ this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
// xrLabel4
//
this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F);
@@ -364,11 +392,15 @@ namespace Monvita
this.xrLabel2.StylePriority.UseTextAlignment = false;
this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
//
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+ //
// xrLabel3
//
this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 152.2917F);
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel3.SizeF = new System.Drawing.SizeF(333F, 25F);
@@ -378,10 +410,6 @@ namespace Monvita
this.xrLabel3.Text = "Ort, Datum\tUnterschrift Bezugsbetreuer/in";
this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
//
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
- //
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -451,9 +479,7 @@ namespace Monvita
//
// bottomMarginBand1
//
- this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
- this.xrLabel3});
- this.bottomMarginBand1.HeightF = 50F;
+ this.bottomMarginBand1.HeightF = 69.91666F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
// fieldGruppe
@@ -463,33 +489,6 @@ namespace Monvita
this.fieldGruppe.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldGruppe.Name = "fieldGruppe";
//
- // xrLabel5
- //
- this.xrLabel5.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(9.999974F, 25F);
- 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(170F, 25F);
- this.xrLabel5.StylePriority.UseFont = false;
- this.xrLabel5.StylePriority.UseTextAlignment = false;
- this.xrLabel5.Text = "Summe Fehlkontakte (FK):";
- this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- //
- // xrLabel6
- //
- this.xrLabel6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte", "{0:0.##}")});
- this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(180F, 25F);
- 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(60.00002F, 25F);
- this.xrLabel6.StylePriority.UseFont = false;
- this.xrLabel6.StylePriority.UseTextAlignment = false;
- this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
// Stundenzettel
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -506,7 +505,7 @@ namespace Monvita
this.formattingRuleServiceDesc,
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName});
- this.Margins = new System.Drawing.Printing.Margins(70, 60, 70, 50);
+ this.Margins = new System.Drawing.Printing.Margins(70, 60, 70, 70);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = System.Drawing.Printing.PaperKind.A4;
diff --git a/ReportImp/SeWo/MitarbeiterstundenkontoBerechnung.cs b/ReportImp/SeWo/MitarbeiterstundenkontoBerechnung.cs
index 173218499..a68a2b728 100644
--- a/ReportImp/SeWo/MitarbeiterstundenkontoBerechnung.cs
+++ b/ReportImp/SeWo/MitarbeiterstundenkontoBerechnung.cs
@@ -101,20 +101,20 @@ namespace BeWo.SeWo
return false;
}
}
- if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
- {
- var p = item.ServiceDescription.ServiceCategory.ProzentStundenkonto ?? item.ServiceDescription.ServiceCategory.ProzentAbrechnung;
- if (item.ServiceDescription.ProzentStundenkonto.HasValue)
- {
- p = item.ServiceDescription.ProzentStundenkonto.Value;
- }
+ //if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null)
+ //{
+ // var p = item.ServiceDescription.ServiceCategory.ProzentStundenkonto ?? item.ServiceDescription.ServiceCategory.ProzentAbrechnung;
+ // if (item.ServiceDescription.ProzentStundenkonto.HasValue)
+ // {
+ // p = item.ServiceDescription.ProzentStundenkonto.Value;
+ // }
- if (p != 100 && p > 0)
- {
- item.RoundedDuration *= (p / 100);
- item.GroupRoundedDuration *= (p / 100);
- }
- }
+ // if (p != 100 && p > 0)
+ // {
+ // item.RoundedDuration *= (p / 100);
+ // item.GroupRoundedDuration *= (p / 100);
+ // }
+ //}
return true;
}
diff --git a/ReportImp/SozialwirkstattSchmitz/SettlementReport.Designer.cs b/ReportImp/SozialwirkstattSchmitz/SettlementReport.Designer.cs
index d7c024ff2..2e90f41e0 100644
--- a/ReportImp/SozialwirkstattSchmitz/SettlementReport.Designer.cs
+++ b/ReportImp/SozialwirkstattSchmitz/SettlementReport.Designer.cs
@@ -48,24 +48,6 @@ namespace BeWo.SozialwirkstattSchmitz
this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow18 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow19 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow16 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow17 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell17 = 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();
@@ -98,11 +80,39 @@ namespace BeWo.SozialwirkstattSchmitz
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+ this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow25 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow26 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow27 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow28 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow29 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -130,7 +140,7 @@ namespace BeWo.SozialwirkstattSchmitz
this.xrLabel_RecipientContactPerson,
this.xrLabel1});
this.ReportHeader.Font = new System.Drawing.Font("Arial", 10F);
- this.ReportHeader.HeightF = 668.75F;
+ this.ReportHeader.HeightF = 536.75F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
@@ -163,15 +173,8 @@ namespace BeWo.SozialwirkstattSchmitz
this.xrTableRow9,
this.xrTableRow10,
this.xrTableRow11,
- this.xrTableRow14,
- this.xrTableRow13,
- this.xrTableRow12,
- this.xrTableRow18,
- this.xrTableRow15,
- this.xrTableRow19,
- this.xrTableRow16,
- this.xrTableRow17});
- this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 200F);
+ this.xrTableRow14});
+ this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 68F);
//
// xrTableRow9
//
@@ -186,7 +189,6 @@ namespace BeWo.SozialwirkstattSchmitz
this.xrTableCell19.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
- this.xrTableCell19.Font = new System.Drawing.Font("Verdana", 10F);
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell19.StylePriority.UseBorderColor = false;
@@ -224,7 +226,6 @@ namespace BeWo.SozialwirkstattSchmitz
this.xrTableCell20.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell20.Font = new System.Drawing.Font("Verdana", 10F);
this.xrTableCell20.FormattingRules.Add(this.ruleRateFactorNull);
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -312,210 +313,6 @@ namespace BeWo.SozialwirkstattSchmitz
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell14.Weight = 0.33384615384615385D;
//
- // xrTableRow13
- //
- this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell23});
- this.xrTableRow13.Name = "xrTableRow13";
- this.xrTableRow13.Weight = 0.085D;
- //
- // xrTableCell23
- //
- this.xrTableCell23.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
- this.xrTableCell23.Name = "xrTableCell23";
- this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell23.StylePriority.UseBorderColor = false;
- this.xrTableCell23.StylePriority.UseBorders = false;
- this.xrTableCell23.Weight = 1D;
- //
- // xrTableRow12
- //
- this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell24,
- this.xrTableCell10});
- this.xrTableRow12.Name = "xrTableRow12";
- this.xrTableRow12.Weight = 0.085D;
- //
- // xrTableCell24
- //
- this.xrTableCell24.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell24.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell24.Name = "xrTableCell24";
- this.xrTableCell24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell24.StylePriority.UseBorderColor = false;
- this.xrTableCell24.StylePriority.UseBorders = false;
- this.xrTableCell24.StylePriority.UseFont = false;
- this.xrTableCell24.Text = "Summe der bereits gezahlten Leistungsvergütungen";
- this.xrTableCell24.Weight = 0.66615384615384621D;
- //
- // xrTableCell10
- //
- this.xrTableCell10.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell10.Name = "xrTableCell10";
- this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell10.StylePriority.UseBorderColor = false;
- this.xrTableCell10.StylePriority.UseBorders = false;
- this.xrTableCell10.StylePriority.UseFont = false;
- this.xrTableCell10.StylePriority.UseTextAlignment = false;
- this.xrTableCell10.Text = "[AmountAdvancedPayments]";
- this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.xrTableCell10.Weight = 0.33384615384615385D;
- //
- // xrTableRow18
- //
- this.xrTableRow18.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell25});
- this.xrTableRow18.Name = "xrTableRow18";
- this.xrTableRow18.Weight = 0.085D;
- //
- // xrTableCell25
- //
- this.xrTableCell25.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell25.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
- this.xrTableCell25.Name = "xrTableCell25";
- this.xrTableCell25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell25.StylePriority.UseBorderColor = false;
- this.xrTableCell25.StylePriority.UseBorders = false;
- this.xrTableCell25.Weight = 1D;
- //
- // xrTableRow15
- //
- this.xrTableRow15.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell26,
- this.xrTableCell15});
- this.xrTableRow15.Name = "xrTableRow15";
- this.xrTableRow15.Weight = 0.085D;
- //
- // xrTableCell26
- //
- this.xrTableCell26.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell26.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)));
- this.xrTableCell26.Name = "xrTableCell26";
- this.xrTableCell26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell26.StylePriority.UseBorderColor = false;
- this.xrTableCell26.StylePriority.UseBorders = false;
- this.xrTableCell26.StylePriority.UseFont = false;
- this.xrTableCell26.Text = "Summe der Vergütung für abrechenbare Leistungen";
- this.xrTableCell26.Weight = 0.66615384615384621D;
- //
- // xrTableCell15
- //
- this.xrTableCell15.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
- this.xrTableCell15.Name = "xrTableCell15";
- this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell15.StylePriority.UseBorderColor = false;
- this.xrTableCell15.StylePriority.UseBorders = false;
- this.xrTableCell15.StylePriority.UseFont = false;
- this.xrTableCell15.StylePriority.UseTextAlignment = false;
- this.xrTableCell15.Text = "[AmountRecordedFLSString]";
- this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.xrTableCell15.Weight = 0.33384615384615385D;
- //
- // xrTableRow19
- //
- this.xrTableRow19.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell9,
- this.xrTableCell12});
- this.xrTableRow19.Name = "xrTableRow19";
- this.xrTableRow19.Weight = 0.085D;
- //
- // xrTableCell9
- //
- this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight;
- 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, "RateFactorText")});
- this.xrTableCell9.Name = "xrTableCell9";
- this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell9.StylePriority.UseBorderColor = false;
- this.xrTableCell9.StylePriority.UseBorders = false;
- this.xrTableCell9.StylePriority.UseFont = false;
- this.xrTableCell9.StylePriority.UsePadding = false;
- this.xrTableCell9.Text = "xrTableCell9";
- this.xrTableCell9.Weight = 0.66615384615384621D;
- //
- // xrTableCell12
- //
- this.xrTableCell12.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "RateFactorAmount")});
- this.xrTableCell12.Name = "xrTableCell12";
- this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell12.StylePriority.UseBorderColor = false;
- this.xrTableCell12.StylePriority.UseBorders = false;
- this.xrTableCell12.StylePriority.UseFont = false;
- this.xrTableCell12.StylePriority.UsePadding = false;
- this.xrTableCell12.StylePriority.UseTextAlignment = false;
- this.xrTableCell12.Text = "xrTableCell12";
- this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.xrTableCell12.Weight = 0.33384615384615385D;
- //
- // xrTableRow16
- //
- this.xrTableRow16.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell27});
- this.xrTableRow16.Name = "xrTableRow16";
- this.xrTableRow16.Weight = 0.085D;
- //
- // xrTableCell27
- //
- this.xrTableCell27.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell27.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
- this.xrTableCell27.Name = "xrTableCell27";
- this.xrTableCell27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell27.StylePriority.UseBorderColor = false;
- this.xrTableCell27.StylePriority.UseBorders = false;
- this.xrTableCell27.Weight = 1D;
- //
- // xrTableRow17
- //
- this.xrTableRow17.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell28,
- this.xrTableCell17});
- this.xrTableRow17.Name = "xrTableRow17";
- this.xrTableRow17.Weight = 0.15D;
- //
- // xrTableCell28
- //
- this.xrTableCell28.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell28.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell28.Name = "xrTableCell28";
- this.xrTableCell28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell28.StylePriority.UseBorderColor = false;
- this.xrTableCell28.StylePriority.UseBorders = false;
- this.xrTableCell28.StylePriority.UseFont = false;
- this.xrTableCell28.Text = "Restforderung:";
- this.xrTableCell28.Weight = 0.66615384615384621D;
- //
- // xrTableCell17
- //
- this.xrTableCell17.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell17.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
- this.xrTableCell17.Name = "xrTableCell17";
- this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell17.StylePriority.UseBorderColor = false;
- this.xrTableCell17.StylePriority.UseBorders = false;
- this.xrTableCell17.StylePriority.UseFont = false;
- this.xrTableCell17.StylePriority.UseTextAlignment = false;
- this.xrTableCell17.Text = "[Claim]";
- this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.xrTableCell17.Weight = 0.33384615384615385D;
- //
// xrLabel6
//
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 393.75F);
@@ -814,6 +611,299 @@ namespace BeWo.SozialwirkstattSchmitz
this.bottomMarginBand1.HeightF = 50.70839F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
+ // GroupFooter1
+ //
+ this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable4});
+ this.GroupFooter1.HeightF = 132F;
+ this.GroupFooter1.Name = "GroupFooter1";
+ //
+ // xrTable4
+ //
+ this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 0F);
+ this.xrTable4.Name = "xrTable4";
+ this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow5,
+ this.xrTableRow6,
+ this.xrTableRow8,
+ this.xrTableRow25,
+ this.xrTableRow26,
+ this.xrTableRow27,
+ this.xrTableRow28});
+ this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 132F);
+ //
+ // xrTableRow5
+ //
+ this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell32});
+ this.xrTableRow5.Name = "xrTableRow5";
+ this.xrTableRow5.Weight = 0.085D;
+ //
+ // xrTableCell32
+ //
+ this.xrTableCell32.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell32.Name = "xrTableCell32";
+ this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell32.StylePriority.UseBorderColor = false;
+ this.xrTableCell32.StylePriority.UseBorders = false;
+ this.xrTableCell32.Weight = 1D;
+ //
+ // xrTableRow6
+ //
+ this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell33,
+ this.xrTableCell34});
+ this.xrTableRow6.Name = "xrTableRow6";
+ this.xrTableRow6.Weight = 0.085D;
+ //
+ // xrTableCell33
+ //
+ this.xrTableCell33.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell33.Name = "xrTableCell33";
+ this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell33.StylePriority.UseBorderColor = false;
+ this.xrTableCell33.StylePriority.UseBorders = false;
+ this.xrTableCell33.StylePriority.UseFont = false;
+ this.xrTableCell33.Text = "Summe der bereits gezahlten Leistungsvergütungen";
+ this.xrTableCell33.Weight = 0.66615384615384621D;
+ //
+ // xrTableCell34
+ //
+ this.xrTableCell34.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell34.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell34.Name = "xrTableCell34";
+ this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell34.StylePriority.UseBorderColor = false;
+ this.xrTableCell34.StylePriority.UseBorders = false;
+ this.xrTableCell34.StylePriority.UseFont = false;
+ this.xrTableCell34.StylePriority.UseTextAlignment = false;
+ this.xrTableCell34.Text = "[AmountAdvancedPayments]";
+ this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell34.Weight = 0.33384615384615385D;
+ //
+ // xrTableRow8
+ //
+ this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell35});
+ this.xrTableRow8.Name = "xrTableRow8";
+ this.xrTableRow8.Weight = 0.085D;
+ //
+ // xrTableCell35
+ //
+ this.xrTableCell35.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell35.Name = "xrTableCell35";
+ this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell35.StylePriority.UseBorderColor = false;
+ this.xrTableCell35.StylePriority.UseBorders = false;
+ this.xrTableCell35.Weight = 1D;
+ //
+ // xrTableRow25
+ //
+ this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell36,
+ this.xrTableCell37});
+ this.xrTableRow25.Name = "xrTableRow25";
+ this.xrTableRow25.Weight = 0.085D;
+ //
+ // xrTableCell36
+ //
+ this.xrTableCell36.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell36.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell36.Name = "xrTableCell36";
+ this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell36.StylePriority.UseBorderColor = false;
+ this.xrTableCell36.StylePriority.UseBorders = false;
+ this.xrTableCell36.StylePriority.UseFont = false;
+ this.xrTableCell36.Text = "Summe der Vergütung für abrechenbare Leistungen";
+ this.xrTableCell36.Weight = 0.66615384615384621D;
+ //
+ // xrTableCell37
+ //
+ this.xrTableCell37.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell37.Name = "xrTableCell37";
+ this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell37.StylePriority.UseBorderColor = false;
+ this.xrTableCell37.StylePriority.UseBorders = false;
+ this.xrTableCell37.StylePriority.UseFont = false;
+ this.xrTableCell37.StylePriority.UseTextAlignment = false;
+ this.xrTableCell37.Text = "[AmountRecordedFLSString]";
+ this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell37.Weight = 0.33384615384615385D;
+ //
+ // xrTableRow26
+ //
+ this.xrTableRow26.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell38,
+ this.xrTableCell39});
+ this.xrTableRow26.Name = "xrTableRow26";
+ this.xrTableRow26.Weight = 0.085D;
+ //
+ // xrTableCell38
+ //
+ this.xrTableCell38.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell38.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "RateFactorText")});
+ this.xrTableCell38.Name = "xrTableCell38";
+ this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell38.StylePriority.UseBorderColor = false;
+ this.xrTableCell38.StylePriority.UseBorders = false;
+ this.xrTableCell38.StylePriority.UseFont = false;
+ this.xrTableCell38.StylePriority.UsePadding = false;
+ this.xrTableCell38.Text = "xrTableCell9";
+ this.xrTableCell38.Weight = 0.66615384615384621D;
+ //
+ // xrTableCell39
+ //
+ this.xrTableCell39.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell39.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "RateFactorAmount")});
+ this.xrTableCell39.Name = "xrTableCell39";
+ this.xrTableCell39.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell39.StylePriority.UseBorderColor = false;
+ this.xrTableCell39.StylePriority.UseBorders = false;
+ this.xrTableCell39.StylePriority.UseFont = false;
+ this.xrTableCell39.StylePriority.UsePadding = false;
+ this.xrTableCell39.StylePriority.UseTextAlignment = false;
+ this.xrTableCell39.Text = "xrTableCell12";
+ this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell39.Weight = 0.33384615384615385D;
+ //
+ // xrTableRow27
+ //
+ this.xrTableRow27.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell40});
+ this.xrTableRow27.Name = "xrTableRow27";
+ this.xrTableRow27.Weight = 0.085D;
+ //
+ // xrTableCell40
+ //
+ this.xrTableCell40.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell40.Name = "xrTableCell40";
+ this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell40.StylePriority.UseBorderColor = false;
+ this.xrTableCell40.StylePriority.UseBorders = false;
+ this.xrTableCell40.Weight = 1D;
+ //
+ // xrTableRow28
+ //
+ this.xrTableRow28.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell41,
+ this.xrTableCell42});
+ this.xrTableRow28.Name = "xrTableRow28";
+ this.xrTableRow28.Weight = 0.15D;
+ //
+ // xrTableCell41
+ //
+ this.xrTableCell41.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell41.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell41.Name = "xrTableCell41";
+ this.xrTableCell41.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell41.StylePriority.UseBorderColor = false;
+ this.xrTableCell41.StylePriority.UseBorders = false;
+ this.xrTableCell41.StylePriority.UseFont = false;
+ this.xrTableCell41.Text = "Restforderung:";
+ this.xrTableCell41.Weight = 0.66615384615384621D;
+ //
+ // xrTableCell42
+ //
+ this.xrTableCell42.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell42.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTableCell42.Name = "xrTableCell42";
+ this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell42.StylePriority.UseBorderColor = false;
+ this.xrTableCell42.StylePriority.UseBorders = false;
+ this.xrTableCell42.StylePriority.UseFont = false;
+ this.xrTableCell42.StylePriority.UseTextAlignment = false;
+ this.xrTableCell42.Text = "[Claim]";
+ this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell42.Weight = 0.33384615384615385D;
+ //
+ // xrTable5
+ //
+ this.xrTable5.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable5.Name = "xrTable5";
+ this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow29});
+ this.xrTable5.SizeF = new System.Drawing.SizeF(650F, 17F);
+ this.xrTable5.StylePriority.UseBorderColor = false;
+ //
+ // xrTableRow29
+ //
+ this.xrTableRow29.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell43,
+ this.xrTableCell44});
+ this.xrTableRow29.Name = "xrTableRow29";
+ this.xrTableRow29.Weight = 0.085D;
+ //
+ // xrTableCell43
+ //
+ this.xrTableCell43.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell43.CanShrink = true;
+ this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.ItemDescription")});
+ this.xrTableCell43.Name = "xrTableCell43";
+ this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell43.StylePriority.UseBorderColor = false;
+ this.xrTableCell43.StylePriority.UseBorders = false;
+ this.xrTableCell43.StylePriority.UseFont = false;
+ this.xrTableCell43.StylePriority.UsePadding = false;
+ this.xrTableCell43.Weight = 0.66615365835336526D;
+ //
+ // xrTableCell44
+ //
+ this.xrTableCell44.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell44.CanShrink = true;
+ this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal", "{0:c}")});
+ this.xrTableCell44.Name = "xrTableCell44";
+ this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell44.StylePriority.UseBorderColor = false;
+ this.xrTableCell44.StylePriority.UseBorders = false;
+ this.xrTableCell44.StylePriority.UseFont = false;
+ this.xrTableCell44.StylePriority.UsePadding = false;
+ this.xrTableCell44.StylePriority.UseTextAlignment = false;
+ this.xrTableCell44.Text = "xrTableCell23";
+ this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell44.Weight = 0.33384634164663463D;
+ //
+ // 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.xrTable5});
+ this.Detail1.HeightF = 17F;
+ this.Detail1.Name = "Detail1";
+ //
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -821,9 +911,12 @@ namespace BeWo.SozialwirkstattSchmitz
this.ReportHeader,
this.ReportFooter,
this.topMarginBand1,
- this.bottomMarginBand1});
+ this.bottomMarginBand1,
+ this.GroupFooter1,
+ this.DetailReport});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
+ 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.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(75, 75, 100, 51);
@@ -836,6 +929,8 @@ namespace BeWo.SozialwirkstattSchmitz
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -873,25 +968,7 @@ namespace BeWo.SozialwirkstattSchmitz
private DevExpress.XtraReports.UI.XRTableRow xrTableRow14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow13;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow12;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow18;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow15;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow16;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow17;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow19;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
private DevExpress.XtraReports.UI.XRTable xrTable3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
@@ -909,5 +986,31 @@ namespace BeWo.SozialwirkstattSchmitz
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRRichText xrRichText1;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+ private DevExpress.XtraReports.UI.XRTable xrTable4;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow25;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow26;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow27;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell40;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow28;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell41;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell42;
+ private DevExpress.XtraReports.UI.XRTable xrTable5;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow29;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+ private DevExpress.XtraReports.UI.DetailBand Detail1;
}
}
diff --git a/ReportImp/SozialwirkstattSchmitz/SettlementReport.cs b/ReportImp/SozialwirkstattSchmitz/SettlementReport.cs
index ccbf2b428..7f2c0f05b 100644
--- a/ReportImp/SozialwirkstattSchmitz/SettlementReport.cs
+++ b/ReportImp/SozialwirkstattSchmitz/SettlementReport.cs
@@ -5,6 +5,8 @@ using System.ComponentModel;
using DevExpress.XtraReports.UI;
using BeWo.Report.ReportObjects;
using BeWo.Report;
+using System.Collections.Generic;
+using BS.Shared.DataContracts;
namespace BeWo.SozialwirkstattSchmitz
{
@@ -15,13 +17,189 @@ namespace BeWo.SozialwirkstattSchmitz
InitializeComponent();
}
- public void SetReportDataSource(SettlementRO pRO)
- {
- if (pRO.ClaimWithEigenbeteiligung > 0)
- pRO.FinalSentence = "Bitte überweisen Sie unsere Restforderung nach Prüfung der Schlussabrechnung auf das Konto POSTBANK (Hannover), BLZ 250 100 30, Kto-Nr. 258 078 306.\n(IBAN: DE 48 2501 0030 0258 0783 06, BIC: PBNKDEFF)";
-
+ public void SetReportDataSource(SettlementRO pRO)
+ {
+ bool isDefaultSpitzabrechnung = false;
- this.bindingSource1.DataSource = pRO;
- }
- }
+ //if (String.IsNullOrEmpty(pRO.Notice))
+ //{
+ // lblNotice.Visible = false;
+ //}
+
+ if (pRO.ClaimWithEigenbeteiligung > 0)
+ pRO.FinalSentence = "Bitte überweisen Sie unsere Restforderung nach Prüfung der Schlussabrechnung auf das Konto POSTBANK (Hannover), BLZ 250 100 30, Kto-Nr. 258 078 306.\n(IBAN: DE 48 2501 0030 0258 0783 06, BIC: PBNKDEFF)";
+
+
+ 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
+ {
+
+ 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 IList CreateDefaultSpitzabrechnungInvoiceItems(SettlementRO pRO)
+ {
+ IList itemList = new List();
+ 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);
+ }
+ }
+ }
}
diff --git a/ReportImp/SozialwirkstattSchmitz/SettlementReport2.designer.cs b/ReportImp/SozialwirkstattSchmitz/SettlementReport2.designer.cs
index 4049eea49..6debf3f8b 100644
--- a/ReportImp/SozialwirkstattSchmitz/SettlementReport2.designer.cs
+++ b/ReportImp/SozialwirkstattSchmitz/SettlementReport2.designer.cs
@@ -48,24 +48,6 @@ namespace BeWo.SozialwirkstattSchmitz.Neu
this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow18 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow19 = new DevExpress.XtraReports.UI.XRTableRow();
- this.cellRateFactorText = new DevExpress.XtraReports.UI.XRTableCell();
- this.cellRateFactorAmount = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow16 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRow17 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell17 = 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();
@@ -98,11 +80,39 @@ namespace BeWo.SozialwirkstattSchmitz.Neu
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+ this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+ this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+ this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow25 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow26 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.cellRateFactorText = new DevExpress.XtraReports.UI.XRTableCell();
+ this.cellRateFactorAmount = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow27 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow28 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRow29 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -130,7 +140,7 @@ namespace BeWo.SozialwirkstattSchmitz.Neu
this.xrLabel_RecipientContactPerson,
this.xrLabel1});
this.ReportHeader.Font = new System.Drawing.Font("Arial", 10F);
- this.ReportHeader.HeightF = 668.75F;
+ this.ReportHeader.HeightF = 536.75F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
//
@@ -163,15 +173,8 @@ namespace BeWo.SozialwirkstattSchmitz.Neu
this.xrTableRow9,
this.xrTableRow10,
this.xrTableRow11,
- this.xrTableRow14,
- this.xrTableRow13,
- this.xrTableRow12,
- this.xrTableRow18,
- this.xrTableRow15,
- this.xrTableRow19,
- this.xrTableRow16,
- this.xrTableRow17});
- this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 200F);
+ this.xrTableRow14});
+ this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 68F);
//
// xrTableRow9
//
@@ -186,7 +189,6 @@ namespace BeWo.SozialwirkstattSchmitz.Neu
this.xrTableCell19.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)));
- this.xrTableCell19.Font = new System.Drawing.Font("Verdana", 10F);
this.xrTableCell19.Name = "xrTableCell19";
this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell19.StylePriority.UseBorderColor = false;
@@ -224,7 +226,6 @@ namespace BeWo.SozialwirkstattSchmitz.Neu
this.xrTableCell20.BorderColor = System.Drawing.SystemColors.ControlLight;
this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell20.Font = new System.Drawing.Font("Verdana", 10F);
this.xrTableCell20.FormattingRules.Add(this.ruleRateFactorNull);
this.xrTableCell20.Name = "xrTableCell20";
this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -313,207 +314,6 @@ namespace BeWo.SozialwirkstattSchmitz.Neu
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell14.Weight = 0.33384615384615385D;
//
- // xrTableRow13
- //
- this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell23});
- this.xrTableRow13.Name = "xrTableRow13";
- this.xrTableRow13.Weight = 0.085D;
- //
- // xrTableCell23
- //
- this.xrTableCell23.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
- this.xrTableCell23.Name = "xrTableCell23";
- this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell23.StylePriority.UseBorderColor = false;
- this.xrTableCell23.StylePriority.UseBorders = false;
- this.xrTableCell23.Weight = 1D;
- //
- // xrTableRow12
- //
- this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell24,
- this.xrTableCell10});
- this.xrTableRow12.Name = "xrTableRow12";
- this.xrTableRow12.Weight = 0.085D;
- //
- // xrTableCell24
- //
- this.xrTableCell24.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell24.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell24.Name = "xrTableCell24";
- this.xrTableCell24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell24.StylePriority.UseBorderColor = false;
- this.xrTableCell24.StylePriority.UseBorders = false;
- this.xrTableCell24.StylePriority.UseFont = false;
- this.xrTableCell24.Text = "Summe der bereits gezahlten Leistungsvergütungen";
- this.xrTableCell24.Weight = 0.66615384615384621D;
- //
- // xrTableCell10
- //
- this.xrTableCell10.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountAdvancedPayments", "{0:c}")});
- this.xrTableCell10.Name = "xrTableCell10";
- this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell10.StylePriority.UseBorderColor = false;
- this.xrTableCell10.StylePriority.UseBorders = false;
- this.xrTableCell10.StylePriority.UseFont = false;
- this.xrTableCell10.StylePriority.UseTextAlignment = false;
- this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.xrTableCell10.Weight = 0.33384615384615385D;
- //
- // xrTableRow18
- //
- this.xrTableRow18.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell25});
- this.xrTableRow18.Name = "xrTableRow18";
- this.xrTableRow18.Weight = 0.085D;
- //
- // xrTableCell25
- //
- this.xrTableCell25.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell25.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
- this.xrTableCell25.Name = "xrTableCell25";
- this.xrTableCell25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell25.StylePriority.UseBorderColor = false;
- this.xrTableCell25.StylePriority.UseBorders = false;
- this.xrTableCell25.Weight = 1D;
- //
- // xrTableRow15
- //
- this.xrTableRow15.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell26,
- this.xrTableCell15});
- this.xrTableRow15.Name = "xrTableRow15";
- this.xrTableRow15.Weight = 0.085D;
- //
- // xrTableCell26
- //
- this.xrTableCell26.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell26.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)));
- this.xrTableCell26.Name = "xrTableCell26";
- this.xrTableCell26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell26.StylePriority.UseBorderColor = false;
- this.xrTableCell26.StylePriority.UseBorders = false;
- this.xrTableCell26.StylePriority.UseFont = false;
- this.xrTableCell26.Text = "Summe der Vergütung für abrechenbare Leistungen";
- this.xrTableCell26.Weight = 0.66615384615384621D;
- //
- // xrTableCell15
- //
- this.xrTableCell15.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
- this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountBillableTotal", "{0:c}")});
- this.xrTableCell15.Name = "xrTableCell15";
- this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell15.StylePriority.UseBorderColor = false;
- this.xrTableCell15.StylePriority.UseBorders = false;
- this.xrTableCell15.StylePriority.UseFont = false;
- this.xrTableCell15.StylePriority.UseTextAlignment = false;
- this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.xrTableCell15.Weight = 0.33384615384615385D;
- //
- // xrTableRow19
- //
- this.xrTableRow19.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.cellRateFactorText,
- this.cellRateFactorAmount});
- this.xrTableRow19.Name = "xrTableRow19";
- this.xrTableRow19.Weight = 0.085D;
- //
- // cellRateFactorText
- //
- this.cellRateFactorText.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.cellRateFactorText.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.cellRateFactorText.Name = "cellRateFactorText";
- this.cellRateFactorText.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.cellRateFactorText.StylePriority.UseBorderColor = false;
- this.cellRateFactorText.StylePriority.UseBorders = false;
- this.cellRateFactorText.StylePriority.UseFont = false;
- this.cellRateFactorText.StylePriority.UsePadding = false;
- this.cellRateFactorText.Weight = 0.66615384615384621D;
- //
- // cellRateFactorAmount
- //
- this.cellRateFactorAmount.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.cellRateFactorAmount.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.cellRateFactorAmount.Name = "cellRateFactorAmount";
- this.cellRateFactorAmount.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.cellRateFactorAmount.StylePriority.UseBorderColor = false;
- this.cellRateFactorAmount.StylePriority.UseBorders = false;
- this.cellRateFactorAmount.StylePriority.UseFont = false;
- this.cellRateFactorAmount.StylePriority.UsePadding = false;
- this.cellRateFactorAmount.StylePriority.UseTextAlignment = false;
- this.cellRateFactorAmount.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.cellRateFactorAmount.Weight = 0.33384615384615385D;
- //
- // xrTableRow16
- //
- this.xrTableRow16.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell27});
- this.xrTableRow16.Name = "xrTableRow16";
- this.xrTableRow16.Weight = 0.085D;
- //
- // xrTableCell27
- //
- this.xrTableCell27.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell27.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
- this.xrTableCell27.Name = "xrTableCell27";
- this.xrTableCell27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell27.StylePriority.UseBorderColor = false;
- this.xrTableCell27.StylePriority.UseBorders = false;
- this.xrTableCell27.Weight = 1D;
- //
- // xrTableRow17
- //
- this.xrTableRow17.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell28,
- this.xrTableCell17});
- this.xrTableRow17.Name = "xrTableRow17";
- this.xrTableRow17.Weight = 0.15D;
- //
- // xrTableCell28
- //
- this.xrTableCell28.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell28.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell28.Name = "xrTableCell28";
- this.xrTableCell28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell28.StylePriority.UseBorderColor = false;
- this.xrTableCell28.StylePriority.UseBorders = false;
- this.xrTableCell28.StylePriority.UseFont = false;
- this.xrTableCell28.Text = "Restforderung:";
- this.xrTableCell28.Weight = 0.66615384615384621D;
- //
- // xrTableCell17
- //
- this.xrTableCell17.BorderColor = System.Drawing.SystemColors.ControlLight;
- this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")});
- this.xrTableCell17.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
- this.xrTableCell17.Name = "xrTableCell17";
- this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell17.StylePriority.UseBorderColor = false;
- this.xrTableCell17.StylePriority.UseBorders = false;
- this.xrTableCell17.StylePriority.UseFont = false;
- this.xrTableCell17.StylePriority.UseTextAlignment = false;
- this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
- this.xrTableCell17.Weight = 0.33384615384615385D;
- //
// xrLabel6
//
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 393.75F);
@@ -813,6 +613,297 @@ namespace BeWo.SozialwirkstattSchmitz.Neu
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
//
+ // DetailReport
+ //
+ this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+ this.Detail1,
+ this.GroupFooter1});
+ 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.xrTable5});
+ this.Detail1.HeightF = 17F;
+ this.Detail1.Name = "Detail1";
+ //
+ // GroupFooter1
+ //
+ this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrTable4});
+ this.GroupFooter1.HeightF = 132F;
+ this.GroupFooter1.Name = "GroupFooter1";
+ //
+ // xrTable4
+ //
+ this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 0F);
+ this.xrTable4.Name = "xrTable4";
+ this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow5,
+ this.xrTableRow6,
+ this.xrTableRow8,
+ this.xrTableRow25,
+ this.xrTableRow26,
+ this.xrTableRow27,
+ this.xrTableRow28});
+ this.xrTable4.SizeF = new System.Drawing.SizeF(650F, 132F);
+ //
+ // xrTableRow5
+ //
+ this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell12});
+ this.xrTableRow5.Name = "xrTableRow5";
+ this.xrTableRow5.Weight = 0.085D;
+ //
+ // xrTableCell12
+ //
+ this.xrTableCell12.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell12.Name = "xrTableCell12";
+ this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell12.StylePriority.UseBorderColor = false;
+ this.xrTableCell12.StylePriority.UseBorders = false;
+ this.xrTableCell12.Weight = 1D;
+ //
+ // xrTableRow6
+ //
+ this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell13,
+ this.xrTableCell32});
+ this.xrTableRow6.Name = "xrTableRow6";
+ this.xrTableRow6.Weight = 0.085D;
+ //
+ // xrTableCell13
+ //
+ this.xrTableCell13.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell13.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell13.Name = "xrTableCell13";
+ this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell13.StylePriority.UseBorderColor = false;
+ this.xrTableCell13.StylePriority.UseBorders = false;
+ this.xrTableCell13.StylePriority.UseFont = false;
+ this.xrTableCell13.Text = "Summe der bereits gezahlten Leistungsvergütungen";
+ this.xrTableCell13.Weight = 0.66615384615384621D;
+ //
+ // xrTableCell32
+ //
+ this.xrTableCell32.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountAdvancedPayments", "{0:c}")});
+ this.xrTableCell32.Name = "xrTableCell32";
+ this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell32.StylePriority.UseBorderColor = false;
+ this.xrTableCell32.StylePriority.UseBorders = false;
+ this.xrTableCell32.StylePriority.UseFont = false;
+ this.xrTableCell32.StylePriority.UseTextAlignment = false;
+ this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell32.Weight = 0.33384615384615385D;
+ //
+ // xrTableRow8
+ //
+ this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell33});
+ this.xrTableRow8.Name = "xrTableRow8";
+ this.xrTableRow8.Weight = 0.085D;
+ //
+ // xrTableCell33
+ //
+ this.xrTableCell33.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell33.Name = "xrTableCell33";
+ this.xrTableCell33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell33.StylePriority.UseBorderColor = false;
+ this.xrTableCell33.StylePriority.UseBorders = false;
+ this.xrTableCell33.Weight = 1D;
+ //
+ // xrTableRow25
+ //
+ this.xrTableRow25.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell34,
+ this.xrTableCell35});
+ this.xrTableRow25.Name = "xrTableRow25";
+ this.xrTableRow25.Weight = 0.085D;
+ //
+ // xrTableCell34
+ //
+ this.xrTableCell34.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell34.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell34.Name = "xrTableCell34";
+ this.xrTableCell34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell34.StylePriority.UseBorderColor = false;
+ this.xrTableCell34.StylePriority.UseBorders = false;
+ this.xrTableCell34.StylePriority.UseFont = false;
+ this.xrTableCell34.Text = "Summe der Vergütung für abrechenbare Leistungen";
+ this.xrTableCell34.Weight = 0.66615384615384621D;
+ //
+ // xrTableCell35
+ //
+ this.xrTableCell35.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell35.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell35.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountBillableTotal", "{0:c}")});
+ this.xrTableCell35.Name = "xrTableCell35";
+ this.xrTableCell35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell35.StylePriority.UseBorderColor = false;
+ this.xrTableCell35.StylePriority.UseBorders = false;
+ this.xrTableCell35.StylePriority.UseFont = false;
+ this.xrTableCell35.StylePriority.UseTextAlignment = false;
+ this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell35.Weight = 0.33384615384615385D;
+ //
+ // xrTableRow26
+ //
+ this.xrTableRow26.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.cellRateFactorText,
+ this.cellRateFactorAmount});
+ this.xrTableRow26.Name = "xrTableRow26";
+ this.xrTableRow26.Weight = 0.085D;
+ //
+ // cellRateFactorText
+ //
+ this.cellRateFactorText.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.cellRateFactorText.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.cellRateFactorText.Name = "cellRateFactorText";
+ this.cellRateFactorText.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.cellRateFactorText.StylePriority.UseBorderColor = false;
+ this.cellRateFactorText.StylePriority.UseBorders = false;
+ this.cellRateFactorText.StylePriority.UseFont = false;
+ this.cellRateFactorText.StylePriority.UsePadding = false;
+ this.cellRateFactorText.Weight = 0.66615384615384621D;
+ //
+ // cellRateFactorAmount
+ //
+ this.cellRateFactorAmount.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.cellRateFactorAmount.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.cellRateFactorAmount.Name = "cellRateFactorAmount";
+ this.cellRateFactorAmount.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.cellRateFactorAmount.StylePriority.UseBorderColor = false;
+ this.cellRateFactorAmount.StylePriority.UseBorders = false;
+ this.cellRateFactorAmount.StylePriority.UseFont = false;
+ this.cellRateFactorAmount.StylePriority.UsePadding = false;
+ this.cellRateFactorAmount.StylePriority.UseTextAlignment = false;
+ this.cellRateFactorAmount.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.cellRateFactorAmount.Weight = 0.33384615384615385D;
+ //
+ // xrTableRow27
+ //
+ this.xrTableRow27.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell38});
+ this.xrTableRow27.Name = "xrTableRow27";
+ this.xrTableRow27.Weight = 0.085D;
+ //
+ // xrTableCell38
+ //
+ this.xrTableCell38.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell38.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell38.Name = "xrTableCell38";
+ this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell38.StylePriority.UseBorderColor = false;
+ this.xrTableCell38.StylePriority.UseBorders = false;
+ this.xrTableCell38.Weight = 1D;
+ //
+ // xrTableRow28
+ //
+ this.xrTableRow28.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell39,
+ this.xrTableCell40});
+ this.xrTableRow28.Name = "xrTableRow28";
+ this.xrTableRow28.Weight = 0.15D;
+ //
+ // xrTableCell39
+ //
+ this.xrTableCell39.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell39.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell39.Name = "xrTableCell39";
+ this.xrTableCell39.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell39.StylePriority.UseBorderColor = false;
+ this.xrTableCell39.StylePriority.UseBorders = false;
+ this.xrTableCell39.StylePriority.UseFont = false;
+ this.xrTableCell39.Text = "Restforderung:";
+ this.xrTableCell39.Weight = 0.66615384615384621D;
+ //
+ // xrTableCell40
+ //
+ this.xrTableCell40.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Claim", "{0:c}")});
+ this.xrTableCell40.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTableCell40.Name = "xrTableCell40";
+ this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell40.StylePriority.UseBorderColor = false;
+ this.xrTableCell40.StylePriority.UseBorders = false;
+ this.xrTableCell40.StylePriority.UseFont = false;
+ this.xrTableCell40.StylePriority.UseTextAlignment = false;
+ this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell40.Weight = 0.33384615384615385D;
+ //
+ // xrTable5
+ //
+ this.xrTable5.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrTable5.Name = "xrTable5";
+ this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+ this.xrTableRow29});
+ this.xrTable5.SizeF = new System.Drawing.SizeF(650F, 17F);
+ this.xrTable5.StylePriority.UseBorderColor = false;
+ //
+ // xrTableRow29
+ //
+ this.xrTableRow29.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell43,
+ this.xrTableCell44});
+ this.xrTableRow29.Name = "xrTableRow29";
+ this.xrTableRow29.Weight = 0.085D;
+ //
+ // xrTableCell43
+ //
+ this.xrTableCell43.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell43.CanShrink = true;
+ this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.ItemDescription")});
+ this.xrTableCell43.Name = "xrTableCell43";
+ this.xrTableCell43.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell43.StylePriority.UseBorderColor = false;
+ this.xrTableCell43.StylePriority.UseBorders = false;
+ this.xrTableCell43.StylePriority.UseFont = false;
+ this.xrTableCell43.StylePriority.UsePadding = false;
+ this.xrTableCell43.Weight = 0.66615365835336526D;
+ //
+ // xrTableCell44
+ //
+ this.xrTableCell44.BorderColor = System.Drawing.SystemColors.ControlLight;
+ this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell44.CanShrink = true;
+ this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal", "{0:c}")});
+ this.xrTableCell44.Name = "xrTableCell44";
+ this.xrTableCell44.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell44.StylePriority.UseBorderColor = false;
+ this.xrTableCell44.StylePriority.UseBorders = false;
+ this.xrTableCell44.StylePriority.UseFont = false;
+ this.xrTableCell44.StylePriority.UsePadding = false;
+ this.xrTableCell44.StylePriority.UseTextAlignment = false;
+ this.xrTableCell44.Text = "xrTableCell23";
+ this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrTableCell44.Weight = 0.33384634164663463D;
+ //
// Spitzabrechnung
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -820,9 +911,11 @@ namespace BeWo.SozialwirkstattSchmitz.Neu
this.ReportHeader,
this.ReportFooter,
this.topMarginBand1,
- this.bottomMarginBand1});
+ this.bottomMarginBand1,
+ this.DetailReport});
this.DataSource = this.bindingSource1;
this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
+ this.Font = new System.Drawing.Font("Arial", 10F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleRateFactorNull});
this.Margins = new System.Drawing.Printing.Margins(75, 75, 100, 51);
@@ -835,6 +928,8 @@ namespace BeWo.SozialwirkstattSchmitz.Neu
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -872,25 +967,7 @@ namespace BeWo.SozialwirkstattSchmitz.Neu
private DevExpress.XtraReports.UI.XRTableRow xrTableRow14;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow13;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow12;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow18;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow15;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow16;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow17;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
- private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
- private DevExpress.XtraReports.UI.XRTableRow xrTableRow19;
- private DevExpress.XtraReports.UI.XRTableCell cellRateFactorText;
- private DevExpress.XtraReports.UI.XRTableCell cellRateFactorAmount;
private DevExpress.XtraReports.UI.XRTable xrTable3;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow20;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
@@ -908,5 +985,31 @@ namespace BeWo.SozialwirkstattSchmitz.Neu
private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
private DevExpress.XtraReports.UI.XRLabel xrLabel8;
private DevExpress.XtraReports.UI.XRRichText xrRichText1;
+ private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+ private DevExpress.XtraReports.UI.DetailBand Detail1;
+ private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+ private DevExpress.XtraReports.UI.XRTable xrTable4;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow5;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow6;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow8;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow25;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow26;
+ private DevExpress.XtraReports.UI.XRTableCell cellRateFactorText;
+ private DevExpress.XtraReports.UI.XRTableCell cellRateFactorAmount;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow27;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow28;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell40;
+ private DevExpress.XtraReports.UI.XRTable xrTable5;
+ private DevExpress.XtraReports.UI.XRTableRow xrTableRow29;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
}
}
diff --git a/ReportImp/SozialwirkstattSchmitz/SozialwirkstattSchmitz.csproj b/ReportImp/SozialwirkstattSchmitz/SozialwirkstattSchmitz.csproj
index c93026033..e0596204d 100644
--- a/ReportImp/SozialwirkstattSchmitz/SozialwirkstattSchmitz.csproj
+++ b/ReportImp/SozialwirkstattSchmitz/SozialwirkstattSchmitz.csproj
@@ -71,6 +71,9 @@
false
+
+ False
+
@@ -142,6 +145,10 @@
{40D8B312-EA64-49E3-A31A-5E57ED4D5654}
Report
+
+ {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}
+ Shared
+
diff --git a/ReportImp/VkmAachenSbd/Service/CustomTimeSheetService.cs b/ReportImp/VkmAachenSbd/Service/CustomTimeSheetService.cs
index 705a29551..0e58d3709 100644
--- a/ReportImp/VkmAachenSbd/Service/CustomTimeSheetService.cs
+++ b/ReportImp/VkmAachenSbd/Service/CustomTimeSheetService.cs
@@ -42,33 +42,33 @@ namespace VkmAachenSbd.Service
public override string GetReplyAddress(TimeSheetStatusItemDC item)
{
-#if DEBUG
- return base.GetReplyAddress(item);
-#endif
+//#if DEBUG
+// return base.GetReplyAddress(item);
+//#endif
- ApplicationUser loggedInUser = null;
+ //ApplicationUser loggedInUser = null;
- if (LoggedInUserOperationContextExt.Current != null &&
- LoggedInUserOperationContextExt.Current.User != null)
- {
- loggedInUser = LoggedInUserOperationContextExt.Current.User;
- }
- else
- {
- loggedInUser = SessionFacade.LoggedInUser;
- }
+ //if (LoggedInUserOperationContextExt.Current != null &&
+ // LoggedInUserOperationContextExt.Current.User != null)
+ //{
+ // loggedInUser = LoggedInUserOperationContextExt.Current.User;
+ //}
+ //else
+ //{
+ // loggedInUser = SessionFacade.LoggedInUser;
+ //}
- if (loggedInUser != null && loggedInUser.Employee != null)
- {
- var contact =
- loggedInUser.Employee.Person.Contacts.FirstOrDefault(c => c.Type == ContactType.business_Mail);
- if (contact != null)
- {
- return contact.Value;
- }
- }
+ //if (loggedInUser != null && loggedInUser.Employee != null)
+ //{
+ // var contact =
+ // loggedInUser.Employee.Person.Contacts.FirstOrDefault(c => c.Type == ContactType.business_Mail);
+ // if (contact != null)
+ // {
+ // return contact.Value;
+ // }
+ //}
- return "sbd-service@vkm-aachen.de";
+ return "bewoplaner@vkm-aachen.de";
}
public override string GetMailMessageTemplate()
@@ -104,13 +104,17 @@ Fax: +49 241 / 912 888 48
public override SmtpClient CreateSmtpClient()
{
-#if DEBUG
- return base.CreateSmtpClient();
-#endif
+ //#if DEBUG
+ // return base.CreateSmtpClient();
+ //#endif
//return base.CreateSmtpClient();
- var mailClient = new SmtpClient("mail2.vkm-aachen.de", 587) { Credentials = new NetworkCredential("sbd-service@vkm-aachen.de", "E_YmipGqdkC_YCcDcSpx") };
- mailClient.EnableSsl = true;
+ //DebugDetails += "\nUse SMTP Server mail.outlook.dehosted.net, user bewoplaner@vkm-aachen.de";
+ var mailClient = new SmtpClient("mail.outlook.dehosted.net", 587) { Credentials = new NetworkCredential("bewoplaner@vkm-aachen.de", "Xn1HD9i~") };
+ //var mailClient = new SmtpClient("mail.outlook.dehosted.net", 587) { Credentials = new NetworkCredential("bewoplaner@vkmedv.de", "Eux#33vT") };
+
+ mailClient.EnableSsl = true;
+
return mailClient;
}
}
diff --git a/ReportImp/VkmAachenSbd/VkmAachenSbd.csproj b/ReportImp/VkmAachenSbd/VkmAachenSbd.csproj
index c34ceb811..1910e2403 100644
--- a/ReportImp/VkmAachenSbd/VkmAachenSbd.csproj
+++ b/ReportImp/VkmAachenSbd/VkmAachenSbd.csproj
@@ -34,6 +34,9 @@
+
+ False
+
diff --git a/ReportImp/ZanderBeWo/Quittierungsbeleg.Designer.cs b/ReportImp/ZanderBeWo/Quittierungsbeleg.Designer.cs
index 57b9a8a04..d6f573278 100644
--- a/ReportImp/ZanderBeWo/Quittierungsbeleg.Designer.cs
+++ b/ReportImp/ZanderBeWo/Quittierungsbeleg.Designer.cs
@@ -62,7 +62,6 @@ namespace ZanderBeWo
this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
@@ -80,9 +79,6 @@ namespace ZanderBeWo
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
- this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
- this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
- this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel();
this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel();
this.xrTableAbwesenheiten = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -119,12 +115,17 @@ namespace ZanderBeWo
this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
+ this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+ this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -167,7 +168,7 @@ namespace ZanderBeWo
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow6});
- this.xrTable3.SizeF = new System.Drawing.SizeF(735F, 20F);
+ this.xrTable3.SizeF = new System.Drawing.SizeF(747F, 20F);
this.xrTable3.StylePriority.UseFont = false;
this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
@@ -181,7 +182,8 @@ namespace ZanderBeWo
this.xrTableCell15,
this.xrTableCell12,
this.xrTableCell44,
- this.xrTableCell50});
+ this.xrTableCell50,
+ this.xrTableCell34});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -213,7 +215,7 @@ namespace ZanderBeWo
this.xrTableCell14.StylePriority.UseTextAlignment = false;
this.xrTableCell14.Text = "xrTableCell14";
this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell14.Weight = 0.094696981389528381D;
+ this.xrTableCell14.Weight = 0.075757539512030528D;
//
// xrTableCell10
//
@@ -227,19 +229,19 @@ namespace ZanderBeWo
this.xrTableCell10.StylePriority.UseTextAlignment = false;
this.xrTableCell10.Text = "xrTableCell10";
this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell10.Weight = 0.094696933224158855D;
+ this.xrTableCell10.Weight = 0.075757597310472657D;
//
// xrTableCell2
//
this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldKontaktArt")});
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")});
this.xrTableCell2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell2.Name = "xrTableCell2";
this.xrTableCell2.StylePriority.UseFont = false;
this.xrTableCell2.StylePriority.UsePadding = false;
this.xrTableCell2.StylePriority.UseTextAlignment = false;
this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell2.Weight = 0.05366162346946534D;
+ this.xrTableCell2.Weight = 0.0568181794550797D;
//
// xrTableCell15
//
@@ -252,7 +254,7 @@ namespace ZanderBeWo
this.xrTableCell15.StylePriority.UsePadding = false;
this.xrTableCell15.StylePriority.UseTextAlignment = false;
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell15.Weight = 0.05366162346946534D;
+ this.xrTableCell15.Weight = 0.056818179455079706D;
//
// xrTableCell12
//
@@ -265,7 +267,7 @@ namespace ZanderBeWo
this.xrTableCell12.StylePriority.UsePadding = false;
this.xrTableCell12.StylePriority.UseTextAlignment = false;
this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell12.Weight = 0.10732323052948757D;
+ this.xrTableCell12.Weight = 0.093890255923474525D;
//
// xrTableCell44
//
@@ -277,7 +279,7 @@ namespace ZanderBeWo
this.xrTableCell44.StylePriority.UsePadding = false;
this.xrTableCell44.StylePriority.UseTextAlignment = false;
this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell44.Weight = 0.20202019104791347D;
+ this.xrTableCell44.Weight = 0.10830530472683075D;
//
// xrTableCell50
//
@@ -289,7 +291,7 @@ namespace ZanderBeWo
this.xrTableCell50.StylePriority.UsePadding = false;
this.xrTableCell50.StylePriority.UseTextAlignment = false;
this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell50.Weight = 0.20202019042968572D;
+ this.xrTableCell50.Weight = 0.18159017487967902D;
//
// picSignature
//
@@ -298,7 +300,7 @@ namespace ZanderBeWo
new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.picSignature.Name = "picSignature";
- this.picSignature.SizeF = new System.Drawing.SizeF(160F, 20F);
+ this.picSignature.SizeF = new System.Drawing.SizeF(133.8195F, 20F);
this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
this.picSignature.StylePriority.UseBorders = false;
this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint);
@@ -322,7 +324,7 @@ namespace ZanderBeWo
this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2,
this.xrTableRow1});
- this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(735F, 70F);
+ this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(747F, 70F);
this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
this.xrTableServiceRecords1.StylePriority.UseBorders = false;
this.xrTableServiceRecords1.StylePriority.UseFont = false;
@@ -336,7 +338,8 @@ namespace ZanderBeWo
this.xrTableCell11,
this.xrTableCell9,
this.xrTableCell28,
- this.xrTableCell48});
+ this.xrTableCell48,
+ this.xrTableCell32});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -371,7 +374,7 @@ namespace ZanderBeWo
this.xrTableCell4.StylePriority.UseTextAlignment = false;
this.xrTableCell4.Text = "Uhrzeit";
this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
- this.xrTableCell4.Weight = 0.41899441340782145D;
+ this.xrTableCell4.Weight = 0.33519553072625718D;
//
// xrTableCell11
//
@@ -386,7 +389,7 @@ namespace ZanderBeWo
this.xrTableCell11.StylePriority.UseTextAlignment = false;
this.xrTableCell11.Text = "Angebot";
this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
- this.xrTableCell11.Weight = 0.23743016759776542D;
+ this.xrTableCell11.Weight = 0.25139664804469286D;
//
// xrTableCell9
//
@@ -402,7 +405,7 @@ namespace ZanderBeWo
this.xrTableCell9.StylePriority.UseTextAlignment = false;
this.xrTableCell9.Text = "FLS in";
this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
- this.xrTableCell9.Weight = 0.23743016759776536D;
+ this.xrTableCell9.Weight = 0.20771252509601951D;
//
// xrTableCell28
//
@@ -413,9 +416,9 @@ namespace ZanderBeWo
this.xrTableCell28.StylePriority.UseBorders = false;
this.xrTableCell28.StylePriority.UseFont = false;
this.xrTableCell28.StylePriority.UseTextAlignment = false;
- this.xrTableCell28.Text = "Betreuerin / Betreuer";
+ this.xrTableCell28.Text = "Betreuerin /";
this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
- this.xrTableCell28.Weight = 0.44692737430167595D;
+ this.xrTableCell28.Weight = 0.239602797524223D;
//
// xrTableCell48
//
@@ -429,7 +432,7 @@ namespace ZanderBeWo
this.xrTableCell48.StylePriority.UseTextAlignment = false;
this.xrTableCell48.Text = "Unterschrift";
this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
- this.xrTableCell48.Weight = 0.44692737430167606D;
+ this.xrTableCell48.Weight = 0.4017302443861297D;
//
// xrTableRow1
//
@@ -440,7 +443,8 @@ namespace ZanderBeWo
this.xrTableCell6,
this.xrTableCell7,
this.xrTableCell43,
- this.xrTableCell49});
+ this.xrTableCell49,
+ this.xrTableCell33});
this.xrTableRow1.Name = "xrTableRow1";
this.xrTableRow1.Weight = 1.223644578313253D;
//
@@ -464,7 +468,7 @@ namespace ZanderBeWo
this.xrTableCell8.StylePriority.UseTextAlignment = false;
this.xrTableCell8.Text = "von";
this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell8.Weight = 0.20949720670391073D;
+ this.xrTableCell8.Weight = 0.16759776536312859D;
//
// xrTableCell5
//
@@ -478,7 +482,7 @@ namespace ZanderBeWo
this.xrTableCell5.StylePriority.UseTextAlignment = false;
this.xrTableCell5.Text = "bis";
this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell5.Weight = 0.2094972067039107D;
+ this.xrTableCell5.Weight = 0.16759776536312857D;
//
// xrTableCell6
//
@@ -493,7 +497,7 @@ namespace ZanderBeWo
this.xrTableCell6.StylePriority.UseTextAlignment = false;
this.xrTableCell6.Text = "Art /\r\nAnzahl\r\nKlienten";
this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- this.xrTableCell6.Weight = 0.23743016759776545D;
+ this.xrTableCell6.Weight = 0.25139664804469286D;
//
// xrTableCell7
//
@@ -509,7 +513,7 @@ namespace ZanderBeWo
this.xrTableCell7.StylePriority.UseTextAlignment = false;
this.xrTableCell7.Text = "Minuten\r\n(ohne 1,2)";
this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
- this.xrTableCell7.Weight = 0.23743016759776536D;
+ this.xrTableCell7.Weight = 0.20771252509601951D;
//
// xrTableCell43
//
@@ -519,7 +523,10 @@ namespace ZanderBeWo
this.xrTableCell43.Name = "xrTableCell43";
this.xrTableCell43.StylePriority.UseBorders = false;
this.xrTableCell43.StylePriority.UseFont = false;
- this.xrTableCell43.Weight = 0.44692737430167595D;
+ this.xrTableCell43.StylePriority.UseTextAlignment = false;
+ this.xrTableCell43.Text = " Betreuer";
+ this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+ this.xrTableCell43.Weight = 0.23960279752422312D;
//
// xrTableCell49
//
@@ -533,11 +540,7 @@ namespace ZanderBeWo
this.xrTableCell49.StylePriority.UseTextAlignment = false;
this.xrTableCell49.Text = "Klientin / Klient";
this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
- this.xrTableCell49.Weight = 0.44692737430167606D;
- //
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+ this.xrTableCell49.Weight = 0.40173024438612964D;
//
// formattingRuleStartDate
//
@@ -752,8 +755,6 @@ namespace ZanderBeWo
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrLabel18,
- this.xrPictureBox2,
- this.lblUnterschriftKlient,
this.lblUnterschriftMitarbeiter,
this.xrTableAbwesenheiten,
this.lblHatAbwesenheiten,
@@ -769,51 +770,15 @@ namespace ZanderBeWo
this.xrLabel1,
this.xrPictureBox1,
this.xrLabel17});
- this.GroupFooter1.HeightF = 270F;
+ this.GroupFooter1.HeightF = 288.75F;
this.GroupFooter1.KeepTogether = true;
this.GroupFooter1.Name = "GroupFooter1";
//
- // xrLabel18
- //
- this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy,}")});
- this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(129.4998F, 227F);
- this.xrLabel18.Name = "xrLabel18";
- this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrLabel18.SizeF = new System.Drawing.SizeF(100F, 23F);
- this.xrLabel18.Visible = false;
- //
- // xrPictureBox2
- //
- this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Tag", null, "CustomerSignature")});
- this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(230F, 227F);
- this.xrPictureBox2.Name = "xrPictureBox2";
- this.xrPictureBox2.SizeF = new System.Drawing.SizeF(100F, 23F);
- this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
- this.xrPictureBox2.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.CustomerSignature_BeforePrint);
- //
- // lblUnterschriftKlient
- //
- this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top;
- this.lblUnterschriftKlient.Font = new System.Drawing.Font("Arial", 10F);
- this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(94.99999F, 250F);
- this.lblUnterschriftKlient.Name = "lblUnterschriftKlient";
- this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
- this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(271.8472F, 20F);
- this.lblUnterschriftKlient.StylePriority.UseBackColor = false;
- this.lblUnterschriftKlient.StylePriority.UseBorders = false;
- this.lblUnterschriftKlient.StylePriority.UseFont = false;
- this.lblUnterschriftKlient.StylePriority.UsePadding = false;
- this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false;
- this.lblUnterschriftKlient.Text = "Datum, Unterschrift Klient/in";
- this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
// lblUnterschriftMitarbeiter
//
this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top;
this.lblUnterschriftMitarbeiter.Font = new System.Drawing.Font("Arial", 10F);
- this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 250F);
+ this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 267.7083F);
this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter";
this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(336.6944F, 19.99998F);
@@ -832,7 +797,7 @@ namespace ZanderBeWo
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 79.99997F);
+ this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 97.70832F);
this.xrTableAbwesenheiten.Name = "xrTableAbwesenheiten";
this.xrTableAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableAbwesenheiten.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -1043,7 +1008,7 @@ namespace ZanderBeWo
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblHatAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F);
- this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 130F);
+ this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 147.7083F);
this.lblHatAbwesenheiten.Name = "lblHatAbwesenheiten";
this.lblHatAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.lblHatAbwesenheiten.SizeF = new System.Drawing.SizeF(30F, 30F);
@@ -1060,7 +1025,7 @@ namespace ZanderBeWo
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.lblHatGruppen.Font = new System.Drawing.Font("Arial", 10F);
- this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 79.99997F);
+ this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 97.70832F);
this.lblHatGruppen.Name = "lblHatGruppen";
this.lblHatGruppen.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
this.lblHatGruppen.SizeF = new System.Drawing.SizeF(30F, 30F);
@@ -1074,7 +1039,7 @@ namespace ZanderBeWo
// xrRichText2
//
this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F);
- this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 130F);
+ this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 147.7083F);
this.xrRichText2.Name = "xrRichText2";
this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 68.05556F);
@@ -1083,7 +1048,7 @@ namespace ZanderBeWo
// xrRichText1
//
this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F);
- this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 79.99997F);
+ this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 97.70832F);
this.xrRichText1.Name = "xrRichText1";
this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
this.xrRichText1.SizeF = new System.Drawing.SizeF(264.9721F, 50F);
@@ -1092,7 +1057,7 @@ namespace ZanderBeWo
// xrLabel15
//
this.xrLabel15.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Underline);
- this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 79.99997F);
+ this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 97.70832F);
this.xrLabel15.Multiline = true;
this.xrLabel15.Name = "xrLabel15";
this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -1138,7 +1103,7 @@ namespace ZanderBeWo
// xrLabel11
//
this.xrLabel11.Font = new System.Drawing.Font("Arial", 8F);
- this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(415F, 19.99999F);
+ this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(379.3611F, 20.00001F);
this.xrLabel11.Name = "xrLabel11";
this.xrLabel11.SizeF = new System.Drawing.SizeF(320F, 20F);
this.xrLabel11.StylePriority.UseBackColor = false;
@@ -1154,10 +1119,10 @@ namespace ZanderBeWo
this.xrLabel10.BackColor = System.Drawing.Color.Gainsboro;
this.xrLabel10.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(415F, 0F);
+ this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(379.3611F, 0F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
- this.xrLabel10.SizeF = new System.Drawing.SizeF(320F, 20F);
+ this.xrLabel10.SizeF = new System.Drawing.SizeF(355.6389F, 20F);
this.xrLabel10.StylePriority.UseBackColor = false;
this.xrLabel10.StylePriority.UseBorders = false;
this.xrLabel10.StylePriority.UseFont = false;
@@ -1173,7 +1138,7 @@ namespace ZanderBeWo
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(245F, 0F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
- this.xrLabel9.SizeF = new System.Drawing.SizeF(85F, 20F);
+ this.xrLabel9.SizeF = new System.Drawing.SizeF(59.99998F, 20F);
this.xrLabel9.StylePriority.UseBackColor = false;
this.xrLabel9.StylePriority.UseBorders = false;
this.xrLabel9.StylePriority.UseFont = false;
@@ -1188,10 +1153,10 @@ namespace ZanderBeWo
this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillable", "{0:0.##}")});
this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F);
- this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(330F, 0F);
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(305F, 0F);
this.xrLabel1.Name = "xrLabel1";
this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
- this.xrLabel1.SizeF = new System.Drawing.SizeF(85F, 20F);
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(74.36108F, 20F);
this.xrLabel1.StylePriority.UseBackColor = false;
this.xrLabel1.StylePriority.UseBorders = false;
this.xrLabel1.StylePriority.UseFont = false;
@@ -1203,7 +1168,7 @@ namespace ZanderBeWo
//
this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Tag", null, "EmployeeSignature")});
- this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 227F);
+ this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 244.7083F);
this.xrPictureBox1.Name = "xrPictureBox1";
this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint";
this.xrPictureBox1.SizeF = new System.Drawing.SizeF(100F, 23F);
@@ -1214,7 +1179,7 @@ namespace ZanderBeWo
//
this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy,}")});
- this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 227F);
+ this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 244.7083F);
this.xrLabel17.Name = "xrLabel17";
this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrLabel17.SizeF = new System.Drawing.SizeF(100F, 23F);
@@ -1227,6 +1192,60 @@ namespace ZanderBeWo
this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldKontaktArt.Name = "fieldKontaktArt";
//
+ // xrLabel18
+ //
+ this.xrLabel18.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 59.99997F);
+ this.xrLabel18.Name = "xrLabel18";
+ this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+ this.xrLabel18.SizeF = new System.Drawing.SizeF(320F, 20F);
+ this.xrLabel18.StylePriority.UseBackColor = false;
+ this.xrLabel18.StylePriority.UseBorders = false;
+ this.xrLabel18.StylePriority.UseFont = false;
+ this.xrLabel18.StylePriority.UsePadding = false;
+ this.xrLabel18.StylePriority.UseTextAlignment = false;
+ this.xrLabel18.Text = "F = Fehlkontakt";
+ this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+ //
+ // xrTableCell32
+ //
+ this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)));
+ this.xrTableCell32.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell32.Name = "xrTableCell32";
+ this.xrTableCell32.StylePriority.UseBorders = false;
+ this.xrTableCell32.StylePriority.UseFont = false;
+ this.xrTableCell32.StylePriority.UseTextAlignment = false;
+ this.xrTableCell32.Text = "Unterschrift";
+ this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
+ this.xrTableCell32.Weight = 0.38559138909237095D;
+ //
+ // xrTableCell33
+ //
+ this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableCell33.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell33.Name = "xrTableCell33";
+ this.xrTableCell33.StylePriority.UseBorders = false;
+ this.xrTableCell33.StylePriority.UseFont = false;
+ this.xrTableCell33.StylePriority.UseTextAlignment = false;
+ this.xrTableCell33.Text = "Datum";
+ this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+ this.xrTableCell33.Weight = 0.3855913890923709D;
+ //
+ // xrTableCell34
+ //
+ this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.SignatureDate", "{0:dd.MM.yyyy}")});
+ this.xrTableCell34.Name = "xrTableCell34";
+ this.xrTableCell34.StylePriority.UseTextAlignment = false;
+ this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell34.Weight = 0.17429508640731098D;
+ //
// Quittierungsbeleg
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -1252,10 +1271,10 @@ namespace ZanderBeWo
this.Version = "17.1";
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -1325,7 +1344,6 @@ namespace ZanderBeWo
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell18;
- private DevExpress.XtraReports.UI.XRLabel lblUnterschriftKlient;
private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiter;
private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
@@ -1349,6 +1367,8 @@ namespace ZanderBeWo
private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1;
private DevExpress.XtraReports.UI.XRLabel xrLabel17;
private DevExpress.XtraReports.UI.XRLabel xrLabel18;
- private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell33;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell34;
}
}
diff --git a/ReportImp/ZanderBeWo/Quittierungsbeleg.cs b/ReportImp/ZanderBeWo/Quittierungsbeleg.cs
index f5a10075b..6f87d3d02 100644
--- a/ReportImp/ZanderBeWo/Quittierungsbeleg.cs
+++ b/ReportImp/ZanderBeWo/Quittierungsbeleg.cs
@@ -35,14 +35,20 @@ namespace ZanderBeWo
foreach (var sd in pRO.Services)
{
- if (sd.IsBillable)
+ if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
{
ServicesOverviewRO.CreateSignatureString(sd);
+ sd.Notice5 = "E";
if (sd.IsGroup)
{
//sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);
+ sd.Notice5 = "GR";
hatGruppen = true;
}
+ if (sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
+ {
+ sd.Notice5 = "F";
+ }
servicesBillable.Add(sd);
}
}
@@ -89,6 +95,8 @@ namespace ZanderBeWo
if (at.End.HasValue)
{
+ if (at.End > pRo.EndDate)
+ at.End = pRo.EndDate;
row.Cells[1].Text = String.Format("{0:dd.MM.yyyy}", at.End);
days = (int)at.End.Value.Subtract(at.Start.Value).TotalDays + 1;
}
@@ -104,7 +112,6 @@ namespace ZanderBeWo
if (newRows > 0)
{
- lblUnterschriftKlient.Top += newRows * 20;
lblUnterschriftMitarbeiter.Top += newRows * 20;
}
}
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index 86b18d365..019aabe5f 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -193,7 +193,7 @@ namespace BeWo.Service.Plugins
//t = "3884496709"; // Wahl e.V.
//t = "9883255779"; // VKM Menden (mobil GmbH)
//t = "9556218062"; // Diakonie Landshut
- //t = "2279593936"; // Diakonie Mülheim
+ t = "2279593936"; // Diakonie Mülheim
//t = "3623837005"; // Betreuwo Wesel
//t = "8407321888"; // AWO Wesel
//t = "8454426692"; // Mit-Menschen Wuppertal
@@ -344,7 +344,7 @@ namespace BeWo.Service.Plugins
//t = "6971328056"; // SKM Krefeld
//t = "4199238586"; // MeZ Menden;
//t = "3226307161"; // Roman Roger Puth
-
+ // = "5592509446"; // Kontakt Verein für psychosoziale Hilfen e.V.
return t;
#else
diff --git a/Service/Plugins/TimeSheetService.cs b/Service/Plugins/TimeSheetService.cs
index d44f5a526..45932b3b6 100644
--- a/Service/Plugins/TimeSheetService.cs
+++ b/Service/Plugins/TimeSheetService.cs
@@ -24,7 +24,9 @@ namespace BeWo.Service.Plugins
{
public class TimeSheetService : AbstractIDSpecificDefaultClass
{
- public virtual List GetTimesheetStatusList(DateTime monat)
+ public String DebugDetails { get; set; }
+
+ public virtual List GetTimesheetStatusList(DateTime monat)
{
var tsService = PluginLoader.FindClass();
@@ -333,14 +335,14 @@ Telefon Durchwahl: {BenutzerTelefon}
{
try
{
+ DebugDetails = String.Format("Send Mail from: {0} to {1}", fromAddress, receiverAddress);
+ //#if DEBUG
+ // messageBody = receiverAddress + "\n\n" + messageBody;
-#if DEBUG
- messageBody = receiverAddress + "\n\n" + messageBody;
-
- receiverAddress = "cb@ownsoft.de";
-#endif
+ // receiverAddress = "cb@ownsoft.de";
+ //#endif
- MailAddress fromMailAddress = new MailAddress(fromAddress);
+ MailAddress fromMailAddress = new MailAddress(fromAddress);
MailAddress toMailAddress = new MailAddress(receiverAddress);
var message = new MailMessage(fromMailAddress, toMailAddress);
@@ -377,19 +379,26 @@ Telefon Durchwahl: {BenutzerTelefon}
SmtpClient mailClient = CreateSmtpClient();
+ //details = String.Format("{0}", mailClient.Credentials.)
mailClient.Send(message);
-
-
- //Thread.Sleep(2000);
-
- }
+
+ //var msg = new ErrorMessage();
+ //msg.Modul = "BeWo.Service.Plugins.TimeSheetService";
+ //msg.Message = "Debug Info: Erfolgreicher Mailversand";
+ //msg.MessageDetails = DebugDetails;
+
+ //DAOFactory.GenericDAO.Insert(msg);
+ //Thread.Sleep(2000);
+
+ }
catch (Exception e)
{
+
var msg = new ErrorMessage();
msg.Modul = "BeWo.Service.Plugins.TimeSheetService";
msg.Message = e.Message;
- msg.MessageDetails = e.StackTrace;
+ msg.MessageDetails = String.Format("{0} - Stacktrace: {1}", DebugDetails, e.StackTrace);
if (e.InnerException != null)
{
msg.MessageDetails += String.Format("\n\nInner Exception: {0}\n{1}", e.InnerException.Message, e.InnerException.StackTrace);
diff --git a/Service/ServiceImplementations/StreamingServiceImp.cs b/Service/ServiceImplementations/StreamingServiceImp.cs
index 2f69cba71..466aa3c46 100644
--- a/Service/ServiceImplementations/StreamingServiceImp.cs
+++ b/Service/ServiceImplementations/StreamingServiceImp.cs
@@ -87,7 +87,6 @@ namespace BeWo.Service.ServiceImplementations
ObjectTid = (TableID)pUpload.TableID,
ObjectOid = pUpload.ObjectOid,
BeWoFolderOid = pUpload.BeWoFolderOid,
- Data = entityData,
Type = (FileAttachmentType)pUpload.FileAttachmentTypeId
};
diff --git a/Shared/Core/EnumTranslations.cs b/Shared/Core/EnumTranslations.cs
index 4c4009878..65bbd6bd5 100644
--- a/Shared/Core/EnumTranslations.cs
+++ b/Shared/Core/EnumTranslations.cs
@@ -907,7 +907,7 @@ namespace BS.Shared.Core
ValueListEntryType.StaffActivityFocusType, "Arbeitsschwerpunkte"
},
{
- ValueListEntryType.StaffQualificationsType, Translator.Translate("Mitarbeiterabschlüsse")
+ ValueListEntryType.StaffQualificationsType, Translator.Translate("Qualifikationen")
},
{
ValueListEntryType.StaffRoleType, "Rollen"
@@ -992,7 +992,7 @@ namespace BS.Shared.Core
ValueListEntryType.StaffActivityFocusType, "Arbeitsschwerpunkte des Personals"
},
{
- ValueListEntryType.StaffQualificationsType, Translator.Translate("Mitarbeiterabschlüsse")
+ ValueListEntryType.StaffQualificationsType, Translator.Translate("Qualifikationen")
},
{
ValueListEntryType.StaffRoleType, Translator.Translate("Rollen der Mitarbeiter")