From 8921820302f9639d91181e27d513e7f189b170f6 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 10 May 2023 13:30:08 +0200 Subject: [PATCH 1/6] =?UTF-8?q?diverse=20Bugfixing=20f=C3=BCr=20Version=20?= =?UTF-8?q?3.14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/BeWo.csproj | 6 +- BeWo/BeWoApp.xaml.cs | 4 +- BeWo/ServiceProxy/ServiceFacade.cs | 4 + BeWo/View/Detail/TextbausteinView.xaml | 16 +- BeWo/View/Detail/TextbausteinView.xaml.cs | 12 + BeWoPlanerMobil/BeWoPlanerMobil.csproj | 2 +- BeWoPlanerMobil/BeWoPlanerMobil.csproj.user | 2 +- Host/Host.csproj.user | 3 +- ...KilometerauswertungsListReport.Designer.cs | 428 ++++++------ ...oyeeKilometerauswertungsReport.designer.cs | 466 +++++++------- .../BasisRechnung.Designer.cs | 3 +- ReportImp/AutismusKoelnBonn/BasisRechnung.cs | 8 +- .../InvoiceCustomerReport.Designer.cs | 3 +- .../Quittierungsbeleg.Designer.cs | 254 ++++---- ReportImp/AutismusKoelnBonn/RechnungFaktor.cs | 9 +- .../SettlementReport.Designer.cs | 609 ++++++++++-------- .../SettlementReport.cs | 194 +++++- .../SettlementReport2.designer.cs | 2 - .../SozialwirkstattSchmitz.csproj | 4 + .../Service/CustomTimeSheetService.cs | 60 +- ReportImp/VkmAachenSbd/VkmAachenSbd.csproj | 3 + Service/Plugins/PluginLoader.cs | 4 +- Service/Plugins/TimeSheetService.cs | 35 +- .../StreamingServiceImp.cs | 1 - 24 files changed, 1221 insertions(+), 911 deletions(-) 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/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj index 50ba28921..5055f563f 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj @@ -25829,7 +25829,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 47b4326c0..769cd8b25 100644 --- a/Host/Host.csproj.user +++ b/Host/Host.csproj.user @@ -3,13 +3,14 @@ BeWo2.0 true - Debug|Any CPU + Release|Any CPU false + ShowAllFiles 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/AutismusKoelnBonn/BasisRechnung.Designer.cs b/ReportImp/AutismusKoelnBonn/BasisRechnung.Designer.cs index 2f954f9ed..a874ddaa4 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/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..61d6ab154 100644 --- a/ReportImp/SozialwirkstattSchmitz/SettlementReport2.designer.cs +++ b/ReportImp/SozialwirkstattSchmitz/SettlementReport2.designer.cs @@ -186,7 +186,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 +223,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); diff --git a/ReportImp/SozialwirkstattSchmitz/SozialwirkstattSchmitz.csproj b/ReportImp/SozialwirkstattSchmitz/SozialwirkstattSchmitz.csproj index c93026033..e23f888e0 100644 --- a/ReportImp/SozialwirkstattSchmitz/SozialwirkstattSchmitz.csproj +++ b/ReportImp/SozialwirkstattSchmitz/SozialwirkstattSchmitz.csproj @@ -142,6 +142,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/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index c1ce96cc5..65f8b14f0 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -160,7 +160,7 @@ namespace BeWo.Service.Plugins //t = "1873138856"; // BUG e.V. //t = "6463422907"; // Caritas Leverkusen //t = "6149463003"; // Diakonisches Werk Bad Windsheim Neustadt a. d. Aisch - //t = "6548202677"; // VKM Aachen SBD + t = "6548202677"; // VKM Aachen SBD //t = "7803602698"; // Taubblindendienst //t = "5518600303"; // Wetterleuchten e.V. //t = "4096649015"; // AWO Dortmund @@ -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 }; From a05cb17b1d0518bd95000dbdf0430c4ec8d74120 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 16 May 2023 14:56:56 +0200 Subject: [PATCH 2/6] diverse reports --- BeWo/View/ExceptionMessageBox.xaml | 6 +- BeWo/View/ExceptionMessageBox.xaml.cs | 5 + BeWo/View/Master/AdministrationView.xaml | 2 +- Host/Host.csproj.user | 2 +- Report/ReportObjects/AuslastungBerechnung.cs | 9 +- ReportImp/AsbRuhr/Export/FibuNetExporter.cs | 2 +- .../DiakonieMuelheim/CustomReportCreator.cs | 72 ++- .../DiePerspektive/Export/FibuNetExporter.cs | 2 +- .../HausDuelken/CustomAuslastungBerechnung.cs | 25 + ReportImp/HausDuelken/HausDuelken.csproj | 19 + .../HausDuelken/Mitarbeiterauslastung.cs | 28 + .../Mitarbeiterauslastung.designer.cs | 546 ++++++++++++++++ .../HausDuelken/Mitarbeiterauslastung.resx | 123 ++++ ReportImp/HausDuelken/Teamauslastung.cs | 28 + .../HausDuelken/Teamauslastung.designer.cs | 531 ++++++++++++++++ ReportImp/HausDuelken/Teamauslastung.resx | 123 ++++ .../Kette2/AuswertungSozialpsychiatrie.cs | 271 +++++--- ReportImp/Kette2/QueryListReport.cs | 262 +++++--- .../SettlementReport2.designer.cs | 601 ++++++++++-------- .../SozialwirkstattSchmitz.csproj | 3 + Service/Plugins/PluginLoader.cs | 4 +- Shared/Core/EnumTranslations.cs | 4 +- 22 files changed, 2186 insertions(+), 482 deletions(-) create mode 100644 ReportImp/HausDuelken/CustomAuslastungBerechnung.cs create mode 100644 ReportImp/HausDuelken/Mitarbeiterauslastung.cs create mode 100644 ReportImp/HausDuelken/Mitarbeiterauslastung.designer.cs create mode 100644 ReportImp/HausDuelken/Mitarbeiterauslastung.resx create mode 100644 ReportImp/HausDuelken/Teamauslastung.cs create mode 100644 ReportImp/HausDuelken/Teamauslastung.designer.cs create mode 100644 ReportImp/HausDuelken/Teamauslastung.resx 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 @@ -