From 8768b226f04e320f6865fc8470ab2e4832bb42f8 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 12 May 2022 12:08:52 +0200 Subject: [PATCH 1/3] cb --- BeWo/MainControl.xaml.cs | 2 +- BeWo/View/HomeView.xaml.cs | 2 +- Host/Host.csproj.user | 2 +- .../AidshilfeEssen/ServiceInvoiceReport.cs | 2 +- ...CustomMitarbeiterstundenkontoBerechnung.cs | 25 +- .../Abrechnung/CustomInvoiceCreation.cs | 20 + .../Abrechnung/CustomInvoiceFactory.cs | 21 + .../HphBersenbrueckFreizeitUndReisen.csproj | 13 +- .../Rechnung.Designer.cs | 812 ++++++++++++++++++ .../Rechnung.cs | 102 +++ .../Rechnung.resx | 304 +++++++ .../InvoiceCustomerReport.Designer.cs | 167 ++-- .../Mitarbeiterstundenkonto.designer.cs | 87 +- .../MitarbeiterstundenkontoJahr.designer.cs | 82 +- .../SettlementReport.Designer.cs | 14 +- .../SettlementReport.cs | 2 +- .../SettlementReport2.Designer.cs | 56 +- Service/Plugins/PluginLoader.cs | 4 +- Service/SBD/VertretungsManager.cs | 5 +- .../DownloadServiceImp.cs | 12 +- 20 files changed, 1534 insertions(+), 200 deletions(-) create mode 100644 ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceCreation.cs create mode 100644 ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceFactory.cs create mode 100644 ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.Designer.cs create mode 100644 ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.cs create mode 100644 ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.resx diff --git a/BeWo/MainControl.xaml.cs b/BeWo/MainControl.xaml.cs index 67d8dc8ba..78d069914 100644 --- a/BeWo/MainControl.xaml.cs +++ b/BeWo/MainControl.xaml.cs @@ -1191,7 +1191,7 @@ namespace BeWo }; var phoneLabel = new Label { - Content = "PIN für Support-Anruf erhalten", + Content = "PIN für Support erhalten", FontWeight = FontWeights.Bold, Margin = new Thickness(5), HorizontalContentAlignment = HorizontalAlignment.Center, diff --git a/BeWo/View/HomeView.xaml.cs b/BeWo/View/HomeView.xaml.cs index 9e2fedfa0..dc058ccdd 100644 --- a/BeWo/View/HomeView.xaml.cs +++ b/BeWo/View/HomeView.xaml.cs @@ -1738,7 +1738,7 @@ namespace BeWo.View { if (!String.IsNullOrEmpty(rssItem.Link)) { - rssItem.Link += String.Format("&k={0}&s={1}", BeWoApp.Tenant, BeWoApp.ServerName); + //rssItem.Link += String.Format("&k={0}&s={1}", BeWoApp.Tenant, BeWoApp.ServerName); } } } diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user index a441248c4..47b4326c0 100644 --- a/Host/Host.csproj.user +++ b/Host/Host.csproj.user @@ -3,7 +3,7 @@ BeWo2.0 true - Release|Any CPU + Debug|Any CPU false diff --git a/ReportImp/AidshilfeEssen/ServiceInvoiceReport.cs b/ReportImp/AidshilfeEssen/ServiceInvoiceReport.cs index 2af856714..93e8e0784 100644 --- a/ReportImp/AidshilfeEssen/ServiceInvoiceReport.cs +++ b/ReportImp/AidshilfeEssen/ServiceInvoiceReport.cs @@ -80,7 +80,7 @@ namespace AidshilfeEssen lblAbrechnungszeitraum.Text = String.Format( - "Im Zeitraum vom {0:dd.MM.yyyy} bis {1:dd.MM.yyyy} wurden {2:0.00} Fachleistungsstunden des Ambulant Betreuten Wohnens erbracht.", + "Im Zeitraum vom {0:dd.MM.yyyy} bis {1:dd.MM.yyyy} wurden {2:0.00} Dienstleistungsstunden des Ambulant Betreuten Wohnens erbracht.", pRO.AccountingPeriodStart, pRO.AccountingPeriodEnd, hours); this.bindingSource1.DataSource = pRO; } diff --git a/ReportImp/BetreuWoReports/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/BetreuWoReports/CustomMitarbeiterstundenkontoBerechnung.cs index 04f5e086e..9284f1191 100644 --- a/ReportImp/BetreuWoReports/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/BetreuWoReports/CustomMitarbeiterstundenkontoBerechnung.cs @@ -160,8 +160,29 @@ namespace BetreuWoReports return null; } - - protected override void CalculateEmployeeSalary(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, DateTime start, DateTime ende) + + public override decimal BerechneSollProWoche(Contract c, MitarbeiterstundenkontoRO.EmployeeDetail ed) + { + if (c != null) + { + if (c.MonthlyTotalHours.HasValue && c.MonthlyTotalHours.Value > 0) + { + if (ed.ArbeitstageImBerichtszeitraum > 0) + { + if (c.WeeklyTotalHours.HasValue && c.WeeklyTotalHours.Value > 0) + { + //return (c.WeeklyTotalHours.Value / c.WeeklyDays.Value) * 5; + + //var test = ed.Employee.Person.LastNameFirstName; + return c.WeeklyTotalHours.Value; + } + } + } + } + return base.BerechneSollProWoche(c, ed); + } + + protected override void CalculateEmployeeSalary(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, DateTime start, DateTime ende) { base.CalculateEmployeeSalary(empDetail, start, ende); diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceCreation.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceCreation.cs new file mode 100644 index 000000000..9bbb1aa68 --- /dev/null +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceCreation.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using BeWo.Data.Entities; +using BeWo.Service.DCEntityMapper; +using BeWo.Service.Invoicing; +using BeWo.Service.Plugins; +using BS.Shared.Core; +using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Compact; +using BS.Shared.Extensions; +using BS.Shared.Services; + +namespace HphBersenbrueckFreizeitUndReisen.Abrechnung +{ + public class CustomInvoiceCreation : InvoiceCreation + { + + } +} diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceFactory.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceFactory.cs new file mode 100644 index 000000000..106fe7d19 --- /dev/null +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceFactory.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using BeWo.Data.Entities; +using BeWo.Service.Invoicing; +using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Compact; + +namespace HphBersenbrueckFreizeitUndReisen.Abrechnung +{ + public class CustomInvoiceFactory : InvoiceFactory + { + + public override InvoiceCreation CreateInvoiceCreator(string specificId, string tenant, Dictionary> supportConcepts2ServiceRecords) + { + + return new CustomInvoiceCreation(); + + } + + } +} diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/HphBersenbrueckFreizeitUndReisen.csproj b/ReportImp/HphBersenbrueckFreizeitUndReisen/HphBersenbrueckFreizeitUndReisen.csproj index d7e36e934..fc9b5f137 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/HphBersenbrueckFreizeitUndReisen.csproj +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/HphBersenbrueckFreizeitUndReisen.csproj @@ -70,6 +70,8 @@ AbrechnungsbogenFuD.cs + + Component @@ -137,7 +139,13 @@ AbrechnungsbogenReisen.cs - + + Component + + + Rechnung.cs + + Component @@ -209,6 +217,9 @@ AbrechnungsbogenReisen.cs + + Rechnung.cs + ServiceRecordListReport.cs Designer diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.Designer.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.Designer.cs new file mode 100644 index 000000000..4cecfa23b --- /dev/null +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.Designer.cs @@ -0,0 +1,812 @@ +using BeWo.Report.ReportObjects; +namespace HphBersenbrueckFreizeitUndReisen +{ + partial class Rechnung + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Rechnung)); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); + this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.GroupFooter = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblSatz = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblAnzahl = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblBetrag = new DevExpress.XtraReports.UI.XRTableCell(); + this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + this.Detail.HeightF = 0F; + this.Detail.Name = "Detail"; + this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // ReportHeader + // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel17, + this.xrLabel16, + this.xrLabel15, + this.xrLabel14, + this.xrLabel13, + this.xrLabel11, + this.xrLabel8, + this.xrLabel7, + this.xrLabel4, + this.xrPictureBox2, + this.xrTable2, + this.lblAdresse, + this.xrLabel18}); + this.ReportHeader.Font = new System.Drawing.Font("Arial", 9F); + this.ReportHeader.HeightF = 503.3333F; + this.ReportHeader.Name = "ReportHeader"; + this.ReportHeader.StylePriority.UseFont = false; + // + // xrLabel13 + // + this.xrLabel13.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(359.7083F, 262.6666F); + this.xrLabel13.Multiline = true; + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(247.6493F, 36.99997F); + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.StylePriority.UseForeColor = false; + this.xrLabel13.Text = "Sachbearbeiter/in: Herr Robin Timmermann\r\nTelefon: 05439 9449-471"; + // + // xrLabel11 + // + this.xrLabel11.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(359.7083F, 225.6667F); + this.xrLabel11.Multiline = true; + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(247.6493F, 36.99997F); + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.StylePriority.UseForeColor = false; + this.xrLabel11.Text = "IK: 500346007"; + // + // xrLabel8 + // + this.xrLabel8.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(359.7083F, 175.9999F); + this.xrLabel8.Multiline = true; + this.xrLabel8.Name = "xrLabel8"; + this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(247.6493F, 36.99997F); + this.xrLabel8.StylePriority.UseFont = false; + this.xrLabel8.StylePriority.UseForeColor = false; + this.xrLabel8.Text = "Franz-Hecker-Straße 20\r\n49593 Bersenbrück"; + // + // xrLabel7 + // + this.xrLabel7.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(359.7083F, 159F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(247.6493F, 16.99998F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.StylePriority.UseForeColor = false; + this.xrLabel7.StylePriority.UseTextAlignment = false; + this.xrLabel7.Text = "Familienunterstützender Dienst"; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel4 + // + this.xrLabel4.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 88.87492F); + this.xrLabel4.Multiline = true; + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(384.2915F, 25F); + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.StylePriority.UseTextAlignment = false; + this.xrLabel4.Text = "Heilpädagogische Hilfe Bersenbrück gGmbH"; + this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + // + // xrPictureBox2 + // + this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image"))); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(540F, 0F); + this.xrPictureBox2.Name = "xrPictureBox2"; + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(161.9999F, 130.8749F); + this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrTable2 + // + this.xrTable2.Font = new System.Drawing.Font("Arial", 7F); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(359.7083F, 380.8333F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1, + this.xrTableRow2}); + this.xrTable2.SizeF = new System.Drawing.SizeF(340F, 34F); + this.xrTable2.StylePriority.UseFont = false; + this.xrTable2.StylePriority.UseForeColor = false; + this.xrTable2.StylePriority.UseTextAlignment = false; + this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + // + // xrTableRow1 + // + this.xrTableRow1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1, + this.xrTableCell3, + this.xrTableCell8}); + this.xrTableRow1.Font = new System.Drawing.Font("Arial", 7F, System.Drawing.FontStyle.Bold); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.StylePriority.UseBorders = false; + this.xrTableRow1.StylePriority.UseFont = false; + this.xrTableRow1.Weight = 0.67999999999999994D; + // + // xrTableCell1 + // + this.xrTableCell1.BorderColor = System.Drawing.Color.MidnightBlue; + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell1.StylePriority.UseBorderColor = false; + this.xrTableCell1.StylePriority.UseBorders = false; + this.xrTableCell1.StylePriority.UsePadding = false; + this.xrTableCell1.StylePriority.UseTextAlignment = false; + this.xrTableCell1.Text = "Rechnungs-Nr."; + this.xrTableCell1.Weight = 1.165066092200836D; + // + // xrTableCell3 + // + this.xrTableCell3.BorderColor = System.Drawing.Color.MidnightBlue; + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell3.StylePriority.UseBorderColor = false; + this.xrTableCell3.StylePriority.UseBorders = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.Text = "Debitor-Nr."; + this.xrTableCell3.Weight = 0.970888492659078D; + // + // xrTableCell8 + // + this.xrTableCell8.BorderColor = System.Drawing.Color.MidnightBlue; + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell8.StylePriority.UseBorderColor = false; + this.xrTableCell8.StylePriority.UseBorders = false; + this.xrTableCell8.StylePriority.UsePadding = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.Text = "Rechnungsdatum"; + this.xrTableCell8.Weight = 1.165066248991665D; + // + // xrTableRow2 + // + this.xrTableRow2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell2, + this.xrTableCell5, + this.xrTableCell13}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.StylePriority.UseBorders = false; + this.xrTableRow2.Weight = 0.68D; + // + // xrTableCell2 + // + this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceNumber")}); + this.xrTableCell2.ForeColor = System.Drawing.Color.Black; + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); + this.xrTableCell2.StylePriority.UseFont = false; + this.xrTableCell2.StylePriority.UseForeColor = false; + this.xrTableCell2.StylePriority.UsePadding = false; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Weight = 1.165066092200836D; + // + // xrTableCell5 + // + this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "DebitorNumber")}); + this.xrTableCell5.ForeColor = System.Drawing.Color.Black; + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UseForeColor = false; + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Weight = 0.970888492659078D; + // + // xrTableCell13 + // + this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")}); + this.xrTableCell13.ForeColor = System.Drawing.Color.Black; + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F); + this.xrTableCell13.StylePriority.UseFont = false; + this.xrTableCell13.StylePriority.UseForeColor = false; + this.xrTableCell13.StylePriority.UsePadding = false; + this.xrTableCell13.StylePriority.UseTextAlignment = false; + this.xrTableCell13.Text = "xrTableCell11"; + this.xrTableCell13.Weight = 1.1650662489916654D; + // + // lblAdresse + // + this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 147.9167F); + this.lblAdresse.Multiline = true; + this.lblAdresse.Name = "lblAdresse"; + this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAdresse.SizeF = new System.Drawing.SizeF(359.7083F, 144.1665F); + this.lblAdresse.StylePriority.UseFont = false; + // + // xrLabel18 + // + this.xrLabel18.Font = new System.Drawing.Font("Arial", 6.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 113.8749F); + this.xrLabel18.Name = "xrLabel18"; + this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(345.9827F, 16.99999F); + this.xrLabel18.StylePriority.UseFont = false; + this.xrLabel18.StylePriority.UseForeColor = false; + this.xrLabel18.Text = "HpH Bersenbrück • Postfach 1106 • 49587 Bersenbrück"; + // + // ruleRateFactorNull + // + this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?"; + this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False; + this.ruleRateFactorNull.Name = "ruleRateFactorNull"; + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 30F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel3, + this.xrLabel2, + this.xrLabel1}); + this.bottomMarginBand1.HeightF = 129.0417F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // xrLabel1 + // + this.xrLabel1.BorderColor = System.Drawing.Color.MidnightBlue; + this.xrLabel1.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(686.9999F, 2.000002F); + this.xrLabel1.StylePriority.UseBorderColor = false; + this.xrLabel1.StylePriority.UseBorders = false; + this.xrLabel1.StylePriority.UseFont = false; + // + // GroupFooter + // + this.GroupFooter.HeightF = 0F; + this.GroupFooter.Name = "GroupFooter"; + // + // Page1 + // + this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable3, + this.xrTable1}); + this.Page1.Font = new System.Drawing.Font("Arial", 9F); + this.Page1.HeightF = 50F; + this.Page1.Name = "Page1"; + this.Page1.StylePriority.UseFont = false; + // + // xrTable3 + // + this.xrTable3.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 0F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow10}); + this.xrTable3.SizeF = new System.Drawing.SizeF(656.9999F, 25F); + this.xrTable3.StylePriority.UseFont = false; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell15, + this.xrTableCell16, + this.xrTableCell17, + this.xrTableCell18, + this.xrTableCell19, + this.xrTableCell20}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.Weight = 1D; + // + // xrTableCell15 + // + this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell15.StylePriority.UseBorders = false; + this.xrTableCell15.StylePriority.UsePadding = false; + this.xrTableCell15.StylePriority.UseTextAlignment = false; + this.xrTableCell15.Text = "Von"; + this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell15.Weight = 1D; + // + // xrTableCell16 + // + this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell16.StylePriority.UseBorders = false; + this.xrTableCell16.StylePriority.UsePadding = false; + this.xrTableCell16.StylePriority.UseTextAlignment = false; + this.xrTableCell16.Text = "Bis"; + this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell16.Weight = 1D; + // + // xrTableCell17 + // + this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell17.StylePriority.UseBorders = false; + this.xrTableCell17.StylePriority.UsePadding = false; + this.xrTableCell17.StylePriority.UseTextAlignment = false; + this.xrTableCell17.Text = "Posten"; + this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell17.Weight = 2.4035382732502888D; + // + // xrTableCell18 + // + this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell18.StylePriority.UseBorders = false; + this.xrTableCell18.StylePriority.UsePadding = false; + this.xrTableCell18.StylePriority.UseTextAlignment = false; + this.xrTableCell18.Text = "Satz"; + this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell18.Weight = 0.83099597349857446D; + // + // xrTableCell19 + // + this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell19.StylePriority.UseBorders = false; + this.xrTableCell19.StylePriority.UsePadding = false; + this.xrTableCell19.StylePriority.UseTextAlignment = false; + this.xrTableCell19.Text = "Anzahl"; + this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell19.Weight = 0.56661576319449147D; + // + // xrTableCell20 + // + this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell20.StylePriority.UseBorders = false; + this.xrTableCell20.StylePriority.UsePadding = false; + this.xrTableCell20.StylePriority.UseTextAlignment = false; + this.xrTableCell20.Text = "Betrag"; + this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell20.Weight = 0.868849379705082D; + // + // xrTable1 + // + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 25F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow9}); + this.xrTable1.SizeF = new System.Drawing.SizeF(656.9999F, 25F); + this.xrTable1.StylePriority.UseFont = false; + // + // xrTableRow9 + // + this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell6, + this.xrTableCell7, + this.xrTableCell9, + this.lblSatz, + this.lblAnzahl, + this.lblBetrag}); + this.xrTableRow9.Name = "xrTableRow9"; + this.xrTableRow9.Weight = 1D; + // + // xrTableCell6 + // + this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriodStart", "{0:dd.MM.yyyy}")}); + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell6.StylePriority.UseBorders = false; + this.xrTableCell6.StylePriority.UsePadding = false; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "xrTableCell6"; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell6.Weight = 1D; + // + // xrTableCell7 + // + this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriodEnd", "{0:dd.MM.yyyy}")}); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell7.StylePriority.UseBorders = false; + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "xrTableCell7"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell7.Weight = 1D; + // + // xrTableCell9 + // + this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell9.StylePriority.UseBorders = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.Text = "Fachleistungsstunden"; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell9.Weight = 2.4035392027126012D; + // + // lblSatz + // + this.lblSatz.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblSatz.Name = "lblSatz"; + this.lblSatz.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.lblSatz.StylePriority.UseBorders = false; + this.lblSatz.StylePriority.UsePadding = false; + this.lblSatz.StylePriority.UseTextAlignment = false; + this.lblSatz.Text = "lblSatz"; + this.lblSatz.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.lblSatz.Weight = 0.83099566367780386D; + // + // lblAnzahl + // + this.lblAnzahl.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblAnzahl.Name = "lblAnzahl"; + this.lblAnzahl.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.lblAnzahl.StylePriority.UseBorders = false; + this.lblAnzahl.StylePriority.UsePadding = false; + this.lblAnzahl.StylePriority.UseTextAlignment = false; + this.lblAnzahl.Text = "lblAnzahl"; + this.lblAnzahl.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.lblAnzahl.Weight = 0.56661514355294984D; + // + // lblBetrag + // + this.lblBetrag.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblBetrag.Name = "lblBetrag"; + this.lblBetrag.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.lblBetrag.StylePriority.UseBorders = false; + this.lblBetrag.StylePriority.UsePadding = false; + this.lblBetrag.StylePriority.UseTextAlignment = false; + this.lblBetrag.Text = "lblBetrag"; + this.lblBetrag.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.lblBetrag.Weight = 0.868849379705082D; + // + // ReportFooter + // + this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable4}); + this.ReportFooter.Font = new System.Drawing.Font("Arial", 9F); + this.ReportFooter.HeightF = 233.7083F; + this.ReportFooter.Name = "ReportFooter"; + this.ReportFooter.StylePriority.UseFont = false; + // + // xrTable4 + // + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(571F, 0F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow11}); + this.xrTable4.SizeF = new System.Drawing.SizeF(86F, 25F); + // + // xrTableRow11 + // + this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell23}); + this.xrTableRow11.Name = "xrTableRow11"; + this.xrTableRow11.Weight = 1D; + // + // xrTableCell23 + // + this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell23.BorderWidth = 2F; + this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")}); + this.xrTableCell23.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); + this.xrTableCell23.StylePriority.UseBorders = false; + this.xrTableCell23.StylePriority.UseBorderWidth = false; + this.xrTableCell23.StylePriority.UseFont = false; + this.xrTableCell23.StylePriority.UsePadding = false; + this.xrTableCell23.StylePriority.UseTextAlignment = false; + this.xrTableCell23.Text = "[TotalClaim]"; + this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell23.Weight = 3D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // + // xrLabel14 + // + this.xrLabel14.BackColor = System.Drawing.Color.Transparent; + this.xrLabel14.CanShrink = true; + this.xrLabel14.Font = new System.Drawing.Font("Arial", 14.5F, System.Drawing.FontStyle.Bold); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(359.7083F, 334F); + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(280F, 33.66669F); + this.xrLabel14.StylePriority.UseBackColor = false; + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "Rechnung"; + this.xrLabel14.WordWrap = false; + // + // xrLabel15 + // + this.xrLabel15.BackColor = System.Drawing.Color.Transparent; + this.xrLabel15.CanShrink = true; + this.xrLabel15.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(359.7083F, 414.8333F); + this.xrLabel15.Multiline = true; + this.xrLabel15.Name = "xrLabel15"; + this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel15.SizeF = new System.Drawing.SizeF(340F, 32.83337F); + this.xrLabel15.StylePriority.UseBackColor = false; + this.xrLabel15.StylePriority.UseFont = false; + this.xrLabel15.StylePriority.UseTextAlignment = false; + this.xrLabel15.Text = "Debitoren-Nr. bitte bei Zahlungen unbedingt\r\nangeben!"; + this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrLabel15.WordWrap = false; + // + // xrLabel16 + // + this.xrLabel16.BackColor = System.Drawing.Color.Transparent; + this.xrLabel16.CanShrink = true; + this.xrLabel16.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(359.7083F, 458.5833F); + this.xrLabel16.Multiline = true; + this.xrLabel16.Name = "xrLabel16"; + this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel16.SizeF = new System.Drawing.SizeF(340F, 27.00003F); + this.xrLabel16.StylePriority.UseBackColor = false; + this.xrLabel16.StylePriority.UseFont = false; + this.xrLabel16.StylePriority.UseTextAlignment = false; + this.xrLabel16.Text = "Abrechnungszeitraum: [AccountingPeriod]"; + this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrLabel16.WordWrap = false; + // + // xrLabel17 + // + this.xrLabel17.BackColor = System.Drawing.Color.Transparent; + this.xrLabel17.CanShrink = true; + this.xrLabel17.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 397.8333F); + this.xrLabel17.Multiline = true; + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(340F, 87.75F); + this.xrLabel17.StylePriority.UseBackColor = false; + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.StylePriority.UseTextAlignment = false; + this.xrLabel17.Text = "Freizeit & Reisen\r\nFamilienunterstützender Dienst\r\nFranz-Hecker-Straße 20\r\n49593 " + + "Bersenbrück"; + this.xrLabel17.WordWrap = false; + // + // xrLabel2 + // + this.xrLabel2.BackColor = System.Drawing.Color.Transparent; + this.xrLabel2.CanShrink = true; + this.xrLabel2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(165.1666F, 0F); + this.xrLabel2.Multiline = true; + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(340F, 32.83337F); + this.xrLabel2.StylePriority.UseBackColor = false; + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.StylePriority.UseTextAlignment = false; + this.xrLabel2.Text = "Der Rechnungsbetrag ist sofort fällig."; + this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrLabel2.WordWrap = false; + // + // xrLabel3 + // + this.xrLabel3.BackColor = System.Drawing.Color.Transparent; + this.xrLabel3.CanShrink = true; + this.xrLabel3.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 52.83335F); + this.xrLabel3.Multiline = true; + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(340F, 74.91669F); + this.xrLabel3.StylePriority.UseBackColor = false; + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.StylePriority.UseTextAlignment = false; + this.xrLabel3.Text = "OSNABRUECKER VOLKSBANK\r\nIBAN: DE63 2659 0025 0202 0300 00\r\nBIC: GENODEF1OSV"; + this.xrLabel3.WordWrap = false; + // + // Rechnung + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.ReportHeader, + this.topMarginBand1, + this.bottomMarginBand1, + this.GroupFooter, + this.Page1, + this.ReportFooter}); + this.DataSource = this.bindingSource1; + this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; + this.Font = new System.Drawing.Font("Verdana", 10F); + this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { + this.ruleRateFactorNull}); + this.Margins = new System.Drawing.Printing.Margins(75, 50, 30, 129); + this.PageHeight = 1169; + this.PageWidth = 827; + this.PaperKind = System.Drawing.Printing.PaperKind.A4; + this.Version = "17.1"; + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + + private DevExpress.XtraReports.UI.DetailBand Detail; + private System.Windows.Forms.BindingSource bindingSource1; + private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; + private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter; + private DevExpress.XtraReports.UI.GroupHeaderBand Page1; + private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; + private DevExpress.XtraReports.UI.XRTable xrTable3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableCell lblSatz; + private DevExpress.XtraReports.UI.XRTableCell lblAnzahl; + private DevExpress.XtraReports.UI.XRTableCell lblBetrag; + private DevExpress.XtraReports.UI.XRTable xrTable4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow11; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; + private DevExpress.XtraReports.UI.XRLabel lblAdresse; + private DevExpress.XtraReports.UI.XRLabel xrLabel18; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel xrLabel8; + private DevExpress.XtraReports.UI.XRLabel xrLabel11; + private DevExpress.XtraReports.UI.XRLabel xrLabel13; + private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel xrLabel15; + private DevExpress.XtraReports.UI.XRLabel xrLabel17; + private DevExpress.XtraReports.UI.XRLabel xrLabel16; + private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; + } +} diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.cs new file mode 100644 index 000000000..15847304c --- /dev/null +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.cs @@ -0,0 +1,102 @@ +using System; +using System.Text; +using BeWo.Report; +using BeWo.Report.ReportObjects; + +using DevExpress.XtraReports.UI; + +namespace HphBersenbrueckFreizeitUndReisen +{ + public partial class Rechnung : XtraReport, IBeWoReport + { + public Rechnung() + { + this.InitializeComponent(); + } + + public void SetReportDataSource(ServiceInvoiceRO pRO) + { + decimal hourlyRate = 0; + decimal rateFactor = 1; + decimal hours = 0; + + StringBuilder sb = new StringBuilder(); + + if (!String.IsNullOrEmpty(pRO.RecipientOrganisation)) + { + sb.AppendLine(pRO.RecipientOrganisation); + } + if (!String.IsNullOrEmpty(pRO.RecipientContactPerson)) + { + sb.AppendLine(pRO.RecipientContactPerson); + } + if (!String.IsNullOrEmpty(pRO.RecipientDivision)) + { + sb.AppendLine(pRO.RecipientDivision); + } + if (!String.IsNullOrEmpty(pRO.RecipientStreet)) + { + sb.AppendLine(pRO.RecipientStreet); + } + if (!String.IsNullOrEmpty(pRO.RecipientPostCodeAndTown)) + { + sb.AppendLine(pRO.RecipientPostCodeAndTown); + } + lblAdresse.Text = sb.ToString(); + + if (pRO.ServiceInvoicePeriods != null && pRO.ServiceInvoicePeriods.Count > 0) + { + foreach (var p in pRO.ServiceInvoicePeriods) + { + + if (p.ServiceInvoiceItems != null && p.ServiceInvoiceItems.Count > 0) + { + + foreach (var i in p.ServiceInvoiceItems) + { + if (i.HourlyRate.HasValue) + { + hourlyRate = i.HourlyRate.Value; + + if (!String.IsNullOrEmpty(i.RateFactor)) + { + var rfStr = i.RateFactor.Replace("%", "").Replace(",00", "").Trim(); + int rfInt = 0; + Int32.TryParse(rfStr, out rfInt); + + rateFactor = (100m + rfInt) / 100m; + } + } + + if (i.Hours.HasValue) + hours += i.Hours.Value; + + + + } + + } + } + + } + hours *= rateFactor; + + lblSatz.Text = String.Format("{0:c}", hourlyRate); + lblAnzahl.Text = String.Format("{0:0.##}", hours); + lblBetrag.Text = String.Format("{0}", pRO.NetClaim); + + //if (!String.IsNullOrEmpty(pRO.CustomerSalutation)) + //{ + // if (pRO.CustomerSalutation.ToLower() == "frau") + // { + // lblAnrede.Text = String.Format("Sehr geehrte Frau {0}", pRO.CustomerLastName); + // } + // else + // { + // lblAnrede.Text = String.Format("Sehr geehrter Herr {0}", pRO.CustomerLastName); + // } + //} + this.bindingSource1.DataSource = pRO; + } + } +} \ No newline at end of file diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.resx b/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.resx new file mode 100644 index 000000000..cd7c5de4a --- /dev/null +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.resx @@ -0,0 +1,304 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + 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 + YII= + + + + 17, 17 + + \ No newline at end of file diff --git a/ReportImp/InputFamilienhilfe/InvoiceCustomerReport.Designer.cs b/ReportImp/InputFamilienhilfe/InvoiceCustomerReport.Designer.cs index 750415317..2a2c110c1 100644 --- a/ReportImp/InputFamilienhilfe/InvoiceCustomerReport.Designer.cs +++ b/ReportImp/InputFamilienhilfe/InvoiceCustomerReport.Designer.cs @@ -41,6 +41,9 @@ namespace InputFamilienhilfe this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.lblAddress = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -53,10 +56,13 @@ namespace InputFamilienhilfe this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -64,22 +70,15 @@ namespace InputFamilienhilfe this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText(); - this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -211,12 +210,33 @@ namespace InputFamilienhilfe this.xrLabel6, this.xrLabel5, this.xrLabel4, - this.xrLabel3, this.xrLabel2}); this.ReportHeader.HeightF = 582.1598F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // + // xrRichText3 + // + this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 162.5001F); + this.xrRichText3.Name = "xrRichText3"; + this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString"); + this.xrRichText3.SizeF = new System.Drawing.SizeF(469.7848F, 19.72234F); + // + // xrPictureBox1 + // + this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(412.5F, 0F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(214.4996F, 162.5001F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrRichText1 + // + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(522F, 162.5F); + this.xrRichText1.Name = "xrRichText1"; + this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); + this.xrRichText1.SizeF = new System.Drawing.SizeF(185F, 332.8983F); + // // lblAddress // this.lblAddress.LocationFloat = new DevExpress.Utils.PointFloat(0F, 193.16F); @@ -341,7 +361,7 @@ namespace InputFamilienhilfe this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel6.SizeF = new System.Drawing.SizeF(666.9999F, 23.25F); this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.Text = "für den Betreuungszeitraum [AccountingPeriod] berechnen wir folgende Leistungen:"; + this.xrLabel6.Text = "für den Zeitraum [AccountingPeriod] berechnen wir folgende Leistungen:"; // // xrLabel5 // @@ -368,26 +388,12 @@ namespace InputFamilienhilfe this.xrLabel4.Text = "[CustomerReferenceNumber]"; this.xrLabel4.WordWrap = false; // - // xrLabel3 - // - this.xrLabel3.BackColor = System.Drawing.Color.Transparent; - this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 410.1599F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(427.0014F, 16F); - this.xrLabel3.StylePriority.UseBackColor = false; - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Abrechnung über Betreuungsleistungen"; - this.xrLabel3.WordWrap = false; - // // xrLabel2 // this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 393.1599F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0.4162598F, 410.16F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel2.SizeF = new System.Drawing.SizeF(427.0014F, 17F); @@ -415,6 +421,39 @@ namespace InputFamilienhilfe this.ReportFooter.PrintAtBottom = true; this.ReportFooter.StylePriority.UseFont = false; // + // xrLabel10 + // + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(277.0833F, 17F); + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.Text = "Mit freundlichen Grüßen"; + // + // xrPictureBox2 + // + this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image"))); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 37.83334F); + this.xrPictureBox2.Name = "xrPictureBox2"; + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(178.75F, 65.55557F); + this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrRichText2 + // + this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(522.0001F, 0F); + this.xrRichText2.Name = "xrRichText2"; + this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); + this.xrRichText2.SizeF = new System.Drawing.SizeF(185F, 200F); + // + // xrLabel1 + // + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0.4163106F, 103.3889F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(277.0833F, 17F); + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Thomas Droese"; + // // xrTable4 // this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(571.4177F, 0F); @@ -477,65 +516,6 @@ namespace InputFamilienhilfe this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO); - // - // xrRichText3 - // - this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 162.5001F); - this.xrRichText3.Name = "xrRichText3"; - this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString"); - this.xrRichText3.SizeF = new System.Drawing.SizeF(469.7848F, 19.72234F); - // - // xrPictureBox1 - // - this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(412.5F, 0F); - this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(214.4996F, 162.5001F); - this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // - // xrRichText1 - // - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(522F, 162.5F); - this.xrRichText1.Name = "xrRichText1"; - this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); - this.xrRichText1.SizeF = new System.Drawing.SizeF(185F, 332.8983F); - // - // xrLabel10 - // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(277.0833F, 17F); - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.Text = "Mit freundlichen Grüßen"; - // - // xrPictureBox2 - // - this.xrPictureBox2.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox2.Image"))); - this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 37.83334F); - this.xrPictureBox2.Name = "xrPictureBox2"; - this.xrPictureBox2.SizeF = new System.Drawing.SizeF(178.75F, 65.55557F); - this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // - // xrRichText2 - // - this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(522.0001F, 0F); - this.xrRichText2.Name = "xrRichText2"; - this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); - this.xrRichText2.SizeF = new System.Drawing.SizeF(185F, 200F); - // - // xrLabel1 - // - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0.4163106F, 103.3889F); - this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(277.0833F, 17F); - this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.Text = "Thomas Droese"; - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -543,6 +523,10 @@ namespace InputFamilienhilfe this.GroupFooter1.HeightF = 25F; this.GroupFooter1.Name = "GroupFooter1"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO); + // // InvoiceCustomerReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -563,12 +547,12 @@ namespace InputFamilienhilfe this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -581,7 +565,6 @@ namespace InputFamilienhilfe private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel4; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull; diff --git a/ReportImp/PflegedienstWessel/Mitarbeiterstundenkonto.designer.cs b/ReportImp/PflegedienstWessel/Mitarbeiterstundenkonto.designer.cs index 9c03b6841..7ffab3ffc 100644 --- a/ReportImp/PflegedienstWessel/Mitarbeiterstundenkonto.designer.cs +++ b/ReportImp/PflegedienstWessel/Mitarbeiterstundenkonto.designer.cs @@ -78,6 +78,9 @@ namespace PflegedienstWessel this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -110,7 +113,7 @@ namespace PflegedienstWessel this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRowDetail}); - this.xrTableDetail.SizeF = new System.Drawing.SizeF(679.9999F, 25F); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(705F, 25F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UseFont = false; this.xrTableDetail.StylePriority.UsePadding = false; @@ -127,6 +130,7 @@ namespace PflegedienstWessel this.xrTableCell23, this.xrTableCell25, this.xrTableCell24, + this.xrTableCell2, this.xrTableCell26}); this.xrTableRowDetail.Name = "xrTableRowDetail"; this.xrTableRowDetail.Weight = 1D; @@ -142,7 +146,7 @@ namespace PflegedienstWessel this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.Text = "xrTableCell3"; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell3.Weight = 0.15329125338142471D; + this.xrTableCell3.Weight = 0.1307484332316193D; // // xrTableCell19 // @@ -150,7 +154,7 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")}); this.xrTableCell19.Name = "xrTableCell19"; this.xrTableCell19.Text = "xrTableCell19"; - this.xrTableCell19.Weight = 0.081154151689479551D; + this.xrTableCell19.Weight = 0.063119932719080757D; // // xrTableCell16 // @@ -158,7 +162,7 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsSoll", "{0:0.00}")}); this.xrTableCell16.Name = "xrTableCell16"; this.xrTableCell16.Text = "xrTableCell16"; - this.xrTableCell16.Weight = 0.063119927862939587D; + this.xrTableCell16.Weight = 0.063119934742466535D; // // xrTableCell27 // @@ -166,7 +170,7 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst", "{0:0.00}")}); this.xrTableCell27.Name = "xrTableCell27"; this.xrTableCell27.Text = "xrTableCell27"; - this.xrTableCell27.Weight = 0.063119927862939615D; + this.xrTableCell27.Weight = 0.063119934742466563D; // // xrTableCell23 // @@ -174,7 +178,7 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")}); this.xrTableCell23.Name = "xrTableCell23"; this.xrTableCell23.Text = "xrTableCell23"; - this.xrTableCell23.Weight = 0.063119927862939559D; + this.xrTableCell23.Weight = 0.063119934742466507D; // // xrTableCell25 // @@ -182,7 +186,7 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")}); this.xrTableCell25.Name = "xrTableCell25"; this.xrTableCell25.Text = "xrTableCell25"; - this.xrTableCell25.Weight = 0.063119927862939587D; + this.xrTableCell25.Weight = 0.063119934742466535D; // // xrTableCell24 // @@ -190,7 +194,7 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")}); this.xrTableCell24.Name = "xrTableCell24"; this.xrTableCell24.Text = "xrTableCell24"; - this.xrTableCell24.Weight = 0.0631199278629396D; + this.xrTableCell24.Weight = 0.063119934742466549D; // // xrTableCell26 // @@ -198,7 +202,7 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")}); this.xrTableCell26.Name = "xrTableCell26"; this.xrTableCell26.Text = "xrTableCell26"; - this.xrTableCell26.Weight = 0.063119927862939573D; + this.xrTableCell26.Weight = 0.063119941723163236D; // // DetailReport // @@ -230,7 +234,7 @@ namespace PflegedienstWessel this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRowHeader}); - this.xrTableHeader.SizeF = new System.Drawing.SizeF(680F, 70F); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(705F, 70F); this.xrTableHeader.StylePriority.UseBorders = false; this.xrTableHeader.StylePriority.UseFont = false; this.xrTableHeader.StylePriority.UsePadding = false; @@ -247,6 +251,7 @@ namespace PflegedienstWessel this.xrTableCell11, this.xrTableCell13, this.xrTableCell14, + this.xrTableCell1, this.xrTableCell15}); this.xrTableRowHeader.Name = "xrTableRowHeader"; this.xrTableRowHeader.Weight = 2.8D; @@ -259,13 +264,13 @@ namespace PflegedienstWessel this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "Name"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell5.Weight = 0.15329125016467182D; + this.xrTableCell5.Weight = 0.13074841913487043D; // // xrTableCell4 // this.xrTableCell4.Name = "xrTableCell4"; this.xrTableCell4.Text = "Reguläre SOLL Stunden"; - this.xrTableCell4.Weight = 0.081154192324637608D; + this.xrTableCell4.Weight = 0.063119927500796508D; // // xrTableCell8 // @@ -278,7 +283,7 @@ namespace PflegedienstWessel this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.StylePriority.UseBackColor = false; this.xrTableCell10.Text = "FLS IST lfd. Monat"; - this.xrTableCell10.Weight = 0.063119927721024D; + this.xrTableCell10.Weight = 0.063119927721023983D; // // xrTableCell11 // @@ -292,20 +297,20 @@ namespace PflegedienstWessel // this.xrTableCell13.Name = "xrTableCell13"; this.xrTableCell13.Text = "Überstd. neu"; - this.xrTableCell13.Weight = 0.063119928687401447D; + this.xrTableCell13.Weight = 0.063119928687401433D; // // xrTableCell14 // this.xrTableCell14.Name = "xrTableCell14"; this.xrTableCell14.StylePriority.UseBackColor = false; this.xrTableCell14.Text = "Überstd. Vormonat"; - this.xrTableCell14.Weight = 0.063119928275170531D; + this.xrTableCell14.Weight = 0.063119928275170517D; // // xrTableCell15 // this.xrTableCell15.Name = "xrTableCell15"; this.xrTableCell15.Text = "Überstd. Gesamt"; - this.xrTableCell15.Weight = 0.0631199213956443D; + this.xrTableCell15.Weight = 0.063119920699781049D; // // GroupFooter1 // @@ -324,7 +329,7 @@ namespace PflegedienstWessel this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(680F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(705.0001F, 25F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -341,6 +346,7 @@ namespace PflegedienstWessel this.cellGesamtGesamt, this.xrTableCell47, this.xrTableCell48, + this.xrTableCell6, this.xrTableCell51}); this.xrTableRow1.Name = "xrTableRow1"; this.xrTableRow1.Weight = 1D; @@ -354,12 +360,12 @@ namespace PflegedienstWessel this.xrTableCell35.StylePriority.UseTextAlignment = false; this.xrTableCell35.Text = "Gesamt"; this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell35.Weight = 0.15329126714047708D; + this.xrTableCell35.Weight = 0.13074840925444736D; // // xrTableCell37 // this.xrTableCell37.Name = "xrTableCell37"; - this.xrTableCell37.Weight = 0.081154151689479551D; + this.xrTableCell37.Weight = 0.063119921792767889D; // // cellFLSSollGesamt // @@ -367,7 +373,7 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsSollGesamt", "{0:0.00}")}); this.cellFLSSollGesamt.Name = "cellFLSSollGesamt"; this.cellFLSSollGesamt.Text = "cellFLSSollGesamt"; - this.cellFLSSollGesamt.Weight = 0.063119927862939587D; + this.cellFLSSollGesamt.Weight = 0.06311998289914654D; // // cellFLSIstGesamt // @@ -375,7 +381,7 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")}); this.cellFLSIstGesamt.Name = "cellFLSIstGesamt"; this.cellFLSIstGesamt.Text = "cellFLSIstGesamt"; - this.cellFLSIstGesamt.Weight = 0.063119927862939615D; + this.cellFLSIstGesamt.Weight = 0.063119982899146568D; // // cellGesamtGesamt // @@ -383,22 +389,22 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")}); this.cellGesamtGesamt.Name = "cellGesamtGesamt"; this.cellGesamtGesamt.Text = "cellGesamtGesamt"; - this.cellGesamtGesamt.Weight = 0.063119927862939573D; + this.cellGesamtGesamt.Weight = 0.063119900344836111D; // // xrTableCell47 // this.xrTableCell47.Name = "xrTableCell47"; - this.xrTableCell47.Weight = 0.063119927862939587D; + this.xrTableCell47.Weight = 0.063119927862939573D; // // xrTableCell48 // this.xrTableCell48.Name = "xrTableCell48"; - this.xrTableCell48.Weight = 0.063119927862939587D; + this.xrTableCell48.Weight = 0.0631199278629396D; // // xrTableCell51 // this.xrTableCell51.Name = "xrTableCell51"; - this.xrTableCell51.Weight = 0.063119927862939573D; + this.xrTableCell51.Weight = 0.063119947085144151D; // // bindingSource1 // @@ -436,9 +442,9 @@ namespace PflegedienstWessel // this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); this.xrPageInfo2.Format = "Seite {0} von {1}"; - this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(539.9999F, 25F); + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(565F, 25F); this.xrPageInfo2.Name = "xrPageInfo2"; - this.xrPageInfo2.SizeF = new System.Drawing.SizeF(140.0001F, 23F); + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(140F, 23F); this.xrPageInfo2.StyleName = "PageInfo"; this.xrPageInfo2.StylePriority.UseFont = false; this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; @@ -446,10 +452,10 @@ namespace PflegedienstWessel // xrPageInfo1 // this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F); - this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(8.000003F, 25F); + this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(8.000081F, 25F); this.xrPageInfo1.Name = "xrPageInfo1"; this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; - this.xrPageInfo1.SizeF = new System.Drawing.SizeF(251.9999F, 23F); + this.xrPageInfo1.SizeF = new System.Drawing.SizeF(206.9999F, 23F); this.xrPageInfo1.StyleName = "PageInfo"; this.xrPageInfo1.StylePriority.UseFont = false; // @@ -510,6 +516,24 @@ namespace PflegedienstWessel this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrTableCell1 + // + this.xrTableCell1.Multiline = true; + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Text = "MA\r\nStd. Konto"; + this.xrTableCell1.Weight = 0.063119927579307122D; + // + // xrTableCell2 + // + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Text = "xrTableCell2"; + this.xrTableCell2.Weight = 0.063119934843636288D; + // + // xrTableCell6 + // + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Weight = 0.063119926446566554D; + // // Mitarbeiterstundenkonto // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -522,7 +546,7 @@ namespace PflegedienstWessel this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { this.fieldFLS}); this.DataSource = this.bindingSource1; - this.Margins = new System.Drawing.Printing.Margins(70, 75, 50, 30); + this.Margins = new System.Drawing.Printing.Margins(60, 60, 50, 30); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; @@ -590,5 +614,8 @@ namespace PflegedienstWessel private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableCell cellFLSSollGesamt; private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; } } diff --git a/ReportImp/PflegedienstWessel/MitarbeiterstundenkontoJahr.designer.cs b/ReportImp/PflegedienstWessel/MitarbeiterstundenkontoJahr.designer.cs index 0cb7f8632..c1daf5eea 100644 --- a/ReportImp/PflegedienstWessel/MitarbeiterstundenkontoJahr.designer.cs +++ b/ReportImp/PflegedienstWessel/MitarbeiterstundenkontoJahr.designer.cs @@ -82,8 +82,11 @@ namespace PflegedienstWessel this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -107,7 +110,7 @@ namespace PflegedienstWessel this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRowDetail}); - this.xrTableDetail.SizeF = new System.Drawing.SizeF(679.9999F, 25F); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(705F, 25F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UseFont = false; this.xrTableDetail.StylePriority.UsePadding = false; @@ -124,6 +127,7 @@ namespace PflegedienstWessel this.xrTableCell23, this.xrTableCell25, this.xrTableCell24, + this.xrTableCell2, this.xrTableCell26}); this.xrTableRowDetail.Name = "xrTableRowDetail"; this.xrTableRowDetail.Weight = 1D; @@ -138,7 +142,7 @@ namespace PflegedienstWessel this.xrTableCell3.StylePriority.UsePadding = false; this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell3.Weight = 0.15329125338142471D; + this.xrTableCell3.Weight = 0.13074844539219646D; // // xrTableCell19 // @@ -146,7 +150,7 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollMax", "{0:0.00}")}); this.xrTableCell19.Name = "xrTableCell19"; this.xrTableCell19.Text = "xrTableCell19"; - this.xrTableCell19.Weight = 0.081154151689479551D; + this.xrTableCell19.Weight = 0.06311993831982865D; // // xrTableCell16 // @@ -154,7 +158,7 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsSoll", "{0:0.00}")}); this.xrTableCell16.Name = "xrTableCell16"; this.xrTableCell16.Text = "xrTableCell16"; - this.xrTableCell16.Weight = 0.063119927862939587D; + this.xrTableCell16.Weight = 0.063119941621994455D; // // xrTableCell27 // @@ -162,7 +166,7 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst", "{0:0.00}")}); this.xrTableCell27.Name = "xrTableCell27"; this.xrTableCell27.Text = "xrTableCell27"; - this.xrTableCell27.Weight = 0.063119927862939615D; + this.xrTableCell27.Weight = 0.063119748995226238D; // // xrTableCell23 // @@ -170,7 +174,7 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenGesamtIst", "{0:0.00}")}); this.xrTableCell23.Name = "xrTableCell23"; this.xrTableCell23.Text = "xrTableCell23"; - this.xrTableCell23.Weight = 0.063119927862939559D; + this.xrTableCell23.Weight = 0.063120134248762685D; // // xrTableCell25 // @@ -178,7 +182,7 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Ueberstunden", "{0:0.00}")}); this.xrTableCell25.Name = "xrTableCell25"; this.xrTableCell25.Text = "xrTableCell25"; - this.xrTableCell25.Weight = 0.063119927862939587D; + this.xrTableCell25.Weight = 0.063119941621994469D; // // xrTableCell24 // @@ -186,7 +190,7 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.LaufendeGesamtsumme", "{0:0.00}")}); this.xrTableCell24.Name = "xrTableCell24"; this.xrTableCell24.Text = "xrTableCell24"; - this.xrTableCell24.Weight = 0.0631199278629396D; + this.xrTableCell24.Weight = 0.063119941621994483D; // // xrTableCell26 // @@ -207,7 +211,7 @@ namespace PflegedienstWessel this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRowHeader}); - this.xrTableHeader.SizeF = new System.Drawing.SizeF(680F, 70F); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(705F, 70F); this.xrTableHeader.StylePriority.UseBorders = false; this.xrTableHeader.StylePriority.UseFont = false; this.xrTableHeader.StylePriority.UsePadding = false; @@ -224,6 +228,7 @@ namespace PflegedienstWessel this.xrTableCell11, this.xrTableCell13, this.xrTableCell14, + this.xrTableCell1, this.xrTableCell15}); this.xrTableRowHeader.Name = "xrTableRowHeader"; this.xrTableRowHeader.Weight = 2.8D; @@ -236,13 +241,13 @@ namespace PflegedienstWessel this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "Monat"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell5.Weight = 0.15329125016467182D; + this.xrTableCell5.Weight = 0.1307484193177971D; // // xrTableCell4 // this.xrTableCell4.Name = "xrTableCell4"; this.xrTableCell4.Text = "Reguläre SOLL Stunden"; - this.xrTableCell4.Weight = 0.081154192324637608D; + this.xrTableCell4.Weight = 0.06311992764713778D; // // xrTableCell8 // @@ -277,14 +282,14 @@ namespace PflegedienstWessel this.xrTableCell14.Name = "xrTableCell14"; this.xrTableCell14.StylePriority.UseBackColor = false; this.xrTableCell14.Text = "Überstd.\r\ndieses Jahr"; - this.xrTableCell14.Weight = 0.063119928275170531D; + this.xrTableCell14.Weight = 0.063119928275170545D; // // xrTableCell15 // this.xrTableCell15.Multiline = true; this.xrTableCell15.Name = "xrTableCell15"; this.xrTableCell15.Text = "Überstd. Gesamt"; - this.xrTableCell15.Weight = 0.0631199213956443D; + this.xrTableCell15.Weight = 0.063119916235999787D; // // xrTable1 // @@ -294,7 +299,7 @@ namespace PflegedienstWessel this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(680F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(705.0002F, 25F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -311,6 +316,7 @@ namespace PflegedienstWessel this.cellGesamtGesamt, this.xrTableCell47, this.xrTableCell48, + this.xrTableCell6, this.xrTableCell51}); this.xrTableRow1.Name = "xrTableRow1"; this.xrTableRow1.Weight = 1D; @@ -324,12 +330,12 @@ namespace PflegedienstWessel this.xrTableCell35.StylePriority.UseTextAlignment = false; this.xrTableCell35.Text = "Gesamt"; this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell35.Weight = 0.15329126714047708D; + this.xrTableCell35.Weight = 0.13074845043717775D; // // xrTableCell37 // this.xrTableCell37.Name = "xrTableCell37"; - this.xrTableCell37.Weight = 0.081154151689479551D; + this.xrTableCell37.Weight = 0.063119969873909429D; // // cellFLSSollGesamt // @@ -339,7 +345,7 @@ namespace PflegedienstWessel xrSummary1.FormatString = "{0:0.00}"; xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.cellFLSSollGesamt.Summary = xrSummary1; - this.cellFLSSollGesamt.Weight = 0.063119927862939587D; + this.cellFLSSollGesamt.Weight = 0.063119955381043175D; // // cellFLSIstGesamt // @@ -349,7 +355,7 @@ namespace PflegedienstWessel xrSummary2.FormatString = "{0:0.00}"; xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.cellFLSIstGesamt.Summary = xrSummary2; - this.cellFLSIstGesamt.Weight = 0.063119927862939615D; + this.cellFLSIstGesamt.Weight = 0.063119735236214475D; // // cellGesamtGesamt // @@ -369,12 +375,12 @@ namespace PflegedienstWessel // xrTableCell48 // this.xrTableCell48.Name = "xrTableCell48"; - this.xrTableCell48.Weight = 0.063119927862939587D; + this.xrTableCell48.Weight = 0.0631202030439755D; // // xrTableCell51 // this.xrTableCell51.Name = "xrTableCell51"; - this.xrTableCell51.Weight = 0.063119927862939573D; + this.xrTableCell51.Weight = 0.063119941621991374D; // // pageFooterBand1 // @@ -388,9 +394,9 @@ namespace PflegedienstWessel // this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); this.xrPageInfo2.Format = "Seite {0} von {1}"; - this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(539.9999F, 25F); + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(565.0002F, 25F); this.xrPageInfo2.Name = "xrPageInfo2"; - this.xrPageInfo2.SizeF = new System.Drawing.SizeF(139.9999F, 23F); + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(139.9998F, 23F); this.xrPageInfo2.StyleName = "PageInfo"; this.xrPageInfo2.StylePriority.UseFont = false; this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; @@ -401,7 +407,7 @@ namespace PflegedienstWessel this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); this.xrPageInfo1.Name = "xrPageInfo1"; this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; - this.xrPageInfo1.SizeF = new System.Drawing.SizeF(260.0001F, 23F); + this.xrPageInfo1.SizeF = new System.Drawing.SizeF(215F, 23F); this.xrPageInfo1.StyleName = "PageInfo"; this.xrPageInfo1.StylePriority.UseFont = false; // @@ -533,6 +539,10 @@ namespace PflegedienstWessel this.GroupFooter2.HeightF = 25F; this.GroupFooter2.Name = "GroupFooter2"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoMonateRO); + // // fieldRelationGesamt // this.fieldRelationGesamt.DataMember = "EmployeeInfoList.EmployeeDetails"; @@ -540,9 +550,24 @@ namespace PflegedienstWessel this.fieldRelationGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldRelationGesamt.Name = "fieldRelationGesamt"; // - // bindingSource1 + // xrTableCell1 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoMonateRO); + this.xrTableCell1.Multiline = true; + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Text = "MA\r\nStd. Konto"; + this.xrTableCell1.Weight = 0.063119926555288808D; + // + // xrTableCell2 + // + this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenAusbezahlt", "{0:0.00}")}); + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Weight = 0.063119941621994441D; + // + // xrTableCell6 + // + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Weight = 0.063119872826732384D; // // MitarbeiterstundenkontoJahr // @@ -557,7 +582,7 @@ namespace PflegedienstWessel this.fieldRelationGesamt}); this.DataSource = this.bindingSource1; this.DisplayName = "Mitarbeiterstundenkonto"; - this.Margins = new System.Drawing.Printing.Margins(70, 75, 50, 30); + this.Margins = new System.Drawing.Printing.Margins(60, 60, 50, 30); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; @@ -628,5 +653,8 @@ namespace PflegedienstWessel private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2; private DevExpress.XtraReports.UI.CalculatedField fieldRelationGesamt; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; } } diff --git a/ReportImp/SozialeDiensteNiederrhein/SettlementReport.Designer.cs b/ReportImp/SozialeDiensteNiederrhein/SettlementReport.Designer.cs index fb1848645..6ab21a3a4 100644 --- a/ReportImp/SozialeDiensteNiederrhein/SettlementReport.Designer.cs +++ b/ReportImp/SozialeDiensteNiederrhein/SettlementReport.Designer.cs @@ -160,7 +160,7 @@ namespace SozialeDiensteNiederrhein.Alt // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 483.0416F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 459.7083F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow9, @@ -298,7 +298,7 @@ namespace SozialeDiensteNiederrhein.Alt this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 338.1667F); this.lblAnrede.Name = "lblAnrede"; this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F); + this.lblAnrede.SizeF = new System.Drawing.SizeF(548.6666F, 16.99997F); this.lblAnrede.StylePriority.UseFont = false; this.lblAnrede.Text = "Sehr geehrte Damen und Herren,"; // @@ -407,7 +407,7 @@ namespace SozialeDiensteNiederrhein.Alt this.xrLabel12, this.lblNotice}); this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); - this.ReportFooter.HeightF = 283.7083F; + this.ReportFooter.HeightF = 255.3751F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; @@ -415,7 +415,7 @@ namespace SozialeDiensteNiederrhein.Alt // xrLabel14 // this.xrLabel14.Font = new System.Drawing.Font("Calibri", 8F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 266.7083F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 238.375F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17.00002F); @@ -599,7 +599,7 @@ namespace SozialeDiensteNiederrhein.Alt // this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrLabel12.Font = new System.Drawing.Font("Calibri", 11F); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 249.7083F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 221.3749F); this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); @@ -644,14 +644,14 @@ namespace SozialeDiensteNiederrhein.Alt this.xrTable1, this.xrLabel8}); this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 551.0416F; + this.GroupHeader1.HeightF = 527.7083F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // // xrRichText1 // this.xrRichText1.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(6.357829E-05F, 399.9999F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 376.6666F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); this.xrRichText1.SizeF = new System.Drawing.SizeF(520.1251F, 61.79166F); diff --git a/ReportImp/SozialeDiensteNiederrhein/SettlementReport.cs b/ReportImp/SozialeDiensteNiederrhein/SettlementReport.cs index b9e2458e5..fc66a1c32 100644 --- a/ReportImp/SozialeDiensteNiederrhein/SettlementReport.cs +++ b/ReportImp/SozialeDiensteNiederrhein/SettlementReport.cs @@ -89,7 +89,7 @@ namespace SozialeDiensteNiederrhein.Alt } var cb2sc = DAOFactory.GenericDAO.LoadByID(pRO.CostBearer2SupportConceptOid); - if (!String.IsNullOrEmpty(pRO.RecipientContactPerson) && cb2sc.CostBearerContactPerson.Sex.HasValue) + if (cb2sc.CostBearerContactPerson != null && cb2sc.CostBearerContactPerson.Sex.HasValue) { if (cb2sc.CostBearerContactPerson.Sex.Value == Sex.Female) lblAnrede.Text = "Sehr geehrte Frau " + cb2sc.CostBearerContactPerson.LastName.Trim() + ","; diff --git a/ReportImp/SozialeDiensteNiederrhein/SettlementReport2.Designer.cs b/ReportImp/SozialeDiensteNiederrhein/SettlementReport2.Designer.cs index 92b482343..b0009b459 100644 --- a/ReportImp/SozialeDiensteNiederrhein/SettlementReport2.Designer.cs +++ b/ReportImp/SozialeDiensteNiederrhein/SettlementReport2.Designer.cs @@ -70,6 +70,7 @@ namespace SozialeDiensteNiederrhein this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrRichText5 = new DevExpress.XtraReports.UI.XRRichText(); this.fieldApprovedFLSWithFactor = new DevExpress.XtraReports.UI.CalculatedField(); @@ -79,6 +80,7 @@ namespace SozialeDiensteNiederrhein this.xrTableRow33 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -99,15 +101,13 @@ namespace SozialeDiensteNiederrhein this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -154,7 +154,7 @@ namespace SozialeDiensteNiederrhein // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 482F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 443.6667F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.rowErbrachteLeistung}); @@ -195,7 +195,7 @@ namespace SozialeDiensteNiederrhein this.lblAnrede.LocationFloat = new DevExpress.Utils.PointFloat(0F, 331.9167F); this.lblAnrede.Name = "lblAnrede"; this.lblAnrede.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblAnrede.SizeF = new System.Drawing.SizeF(317F, 17F); + this.lblAnrede.SizeF = new System.Drawing.SizeF(569.4999F, 16.99997F); this.lblAnrede.StylePriority.UseFont = false; this.lblAnrede.Text = "Sehr geehrte Damen und Herren,"; // @@ -290,7 +290,7 @@ namespace SozialeDiensteNiederrhein this.xrTable3, this.lblNotice}); this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); - this.ReportFooter.HeightF = 276.7083F; + this.ReportFooter.HeightF = 248.375F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; @@ -368,7 +368,7 @@ namespace SozialeDiensteNiederrhein // this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrLabel4.Font = new System.Drawing.Font("Calibri", 11F); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 238.5417F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 214.375F); this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel4.SizeF = new System.Drawing.SizeF(225F, 17F); @@ -379,7 +379,7 @@ namespace SozialeDiensteNiederrhein // xrLabel14 // this.xrLabel14.Font = new System.Drawing.Font("Calibri", 8F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 255.5417F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 231.375F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel14.SizeF = new System.Drawing.SizeF(225F, 17.00002F); @@ -510,7 +510,7 @@ namespace SozialeDiensteNiederrhein // // bottomMarginBand1 // - this.bottomMarginBand1.HeightF = 100F; + this.bottomMarginBand1.HeightF = 60F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // // GroupHeader1 @@ -529,10 +529,20 @@ namespace SozialeDiensteNiederrhein this.xrTable1, this.xrLabel8}); this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 499F; + this.GroupHeader1.HeightF = 460.6667F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // + // xrRichText1 + // + this.xrRichText1.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 371.375F); + this.xrRichText1.Name = "xrRichText1"; + this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); + this.xrRichText1.SizeF = new System.Drawing.SizeF(509.0417F, 61.79169F); + this.xrRichText1.StylePriority.UseBackColor = false; + this.xrRichText1.StylePriority.UseFont = false; + // // xrLabel7 // this.xrLabel7.BackColor = System.Drawing.Color.Transparent; @@ -633,6 +643,10 @@ namespace SozialeDiensteNiederrhein this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell53.Weight = 0.25702143742487976D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -860,20 +874,6 @@ namespace SozialeDiensteNiederrhein this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell60.Weight = 0.25702143742487982D; // - // xrRichText1 - // - this.xrRichText1.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 409.7083F); - this.xrRichText1.Name = "xrRichText1"; - this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); - this.xrRichText1.SizeF = new System.Drawing.SizeF(509.0417F, 61.79169F); - this.xrRichText1.StylePriority.UseBackColor = false; - this.xrRichText1.StylePriority.UseFont = false; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); - // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -891,7 +891,7 @@ namespace SozialeDiensteNiederrhein this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 74, 100, 100); + this.Margins = new System.Drawing.Printing.Margins(75, 74, 100, 60); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; @@ -900,11 +900,11 @@ namespace SozialeDiensteNiederrhein this.Watermark.PageRange = "1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index b379281fa..26409f897 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -133,7 +133,7 @@ namespace BeWo.Service.Plugins //t = "3227700467"; // Psychosozialer Trägerverein //t = "4378753169"; // Die Wohnhelfer Köln //t = "2214258555"; // Betreuungsbüro Baak - //t = "4525013596"; // Hph Bersenbrück Freizeit und Reisen + t = "4525013596"; // Hph Bersenbrück Freizeit und Reisen //t = "1609455614"; // Hph Bersenbrück Aph //t = "7852961459"; // B&B Betreutes Wohnen //t = "8719930557"; // Lebenshilfe Rhein-Sieg @@ -298,7 +298,7 @@ namespace BeWo.Service.Plugins //t = "3640152169"; // Claudia Charisius //t = "3884496709"; // Wahl e.V. //t = "3536079480"; // Behindertenhilfe Menden - t = "5427523619"; // ChristopherusHausFamilienhilfe + //t = "5427523619"; // ChristopherusHausFamilienhilfe //t = "8251343124"; // Rat Plus Tat //t = "6819347851"; // Awo Kreisverband Plön //t = "2385915144"; // AKGG GmbHd diff --git a/Service/SBD/VertretungsManager.cs b/Service/SBD/VertretungsManager.cs index b82a59eaf..4d8cee6f9 100644 --- a/Service/SBD/VertretungsManager.cs +++ b/Service/SBD/VertretungsManager.cs @@ -171,7 +171,10 @@ namespace BeWo.Service.SBD var schools = MapperFactory.CustomerOrganisationRelationDC_Customer2Organisation.MapToNewDCs(customer.Customer2OrganisationList.Where(customer2Organisation => customer2Organisation.ValueList.Any(b => b.Entry.Type == ValueListEntryType.EnvironmentOrganisationType && b.Entry.Value.Equals("Schule")))); var schoolAssistanceTimes = GetSchoolAssistanceTimes(customer, start, end, absenceTime); var hauptbetreuer = customer.Employee2CustomerList.FirstOrDefault(f => f.IsActive == ActivationTypeId.Active && f.ValueList.Any(b => b.Entry.Type.Equals(ValueListEntryType.StaffRoleType) && b.Entry.Value.ToLower().Equals("hauptbetreuung")))?.Employee; - + if (hauptbetreuer == null) + { + hauptbetreuer = customer.Employee2CustomerList.FirstOrDefault()?.Employee; + } MigriereSubstitutionStatus(customer); var assistingEmployees = new List(); diff --git a/Service/ServiceImplementations/DownloadServiceImp.cs b/Service/ServiceImplementations/DownloadServiceImp.cs index e2f0b7084..07f019461 100644 --- a/Service/ServiceImplementations/DownloadServiceImp.cs +++ b/Service/ServiceImplementations/DownloadServiceImp.cs @@ -825,14 +825,16 @@ namespace BeWo.Service.ServiceImplementations { try { - var urlneu = ConfigurationManager.AppSettings.Get("RssFeedUrl"); + //var urlneu = ConfigurationManager.AppSettings.Get("RssFeedUrl"); + var urlneu = "http://bsnewsmaster.beyondsoft.de/news_rss.php?ClientOID=236180486&CategoryOID=2002858128"; - - if (string.IsNullOrEmpty(urlneu)) + + if (string.IsNullOrEmpty(urlneu)) { - urlneu = "http://bsnewsmaster.beyondsoft.de/news_rss.php?ClientOID=236180486&CategoryOID=2002858128"; + //urlneu = "http://bsnewsmaster.beyondsoft.de/news_rss.php?ClientOID=236180486&CategoryOID=2002858128"; + urlneu = "http://apps.ownsoft.de/news/rss?evplaner[base_cat]=55"; - } + } RssFeed feed = new RssFeed(); RssManager mgr = new RssManager(urlneu); From 37615013c20e3a666c4551c44f827f8045a975e2 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 17 May 2022 13:22:50 +0200 Subject: [PATCH 2/3] cb --- BeWo/View/Detail/OrganisationView.xaml | 2 +- BeWo/View/Report/FLSReport/FLSReportView.xaml | 6 +- .../KilometerauslastungsView.xaml | 9 +- .../PerspektivenEV/PerspektivenEV.csproj | 1 - ...KilometerauswertungsListReport.Designer.cs | 497 ++++++++++++++++++ .../EmployeeKilometerauswertungsListReport.cs | 18 + ...mployeeKilometerauswertungsListReport.resx | 123 +++++ .../EmployeeKilometerauswertungsReport.cs | 20 + ...oyeeKilometerauswertungsReport.designer.cs | 478 +++++++++++++++++ .../EmployeeKilometerauswertungsReport.resx | 123 +++++ ...KilometerauswertungsListReport.Designer.cs | 496 +++++++++++++++++ .../KilometerauswertungsListReport.cs | 18 + .../KilometerauswertungsListReport.resx | 123 +++++ .../KilometerauswertungsReport.cs | 20 + .../KilometerauswertungsReport.designer.cs | 479 +++++++++++++++++ .../KilometerauswertungsReport.resx | 123 +++++ .../Mitarbeiterstundenkonto.designer.cs | 43 +- .../PflegedienstWessel.csproj | 39 ++ ReportImp/SeWo/CustomerDataReport.Designer.cs | 24 +- ...GruppenMitMehrerenMitarbeitern.designer.cs | 22 +- .../OverlappingServiceRecords.designer.cs | 4 +- .../SeWo/Translation/TranslationDictionary.cs | 22 +- Service/Plugins/PluginLoader.cs | 10 +- 23 files changed, 2638 insertions(+), 62 deletions(-) create mode 100644 ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsListReport.Designer.cs create mode 100644 ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsListReport.cs create mode 100644 ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsListReport.resx create mode 100644 ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsReport.cs create mode 100644 ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsReport.designer.cs create mode 100644 ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsReport.resx create mode 100644 ReportImp/PflegedienstWessel/KilometerauswertungsListReport.Designer.cs create mode 100644 ReportImp/PflegedienstWessel/KilometerauswertungsListReport.cs create mode 100644 ReportImp/PflegedienstWessel/KilometerauswertungsListReport.resx create mode 100644 ReportImp/PflegedienstWessel/KilometerauswertungsReport.cs create mode 100644 ReportImp/PflegedienstWessel/KilometerauswertungsReport.designer.cs create mode 100644 ReportImp/PflegedienstWessel/KilometerauswertungsReport.resx diff --git a/BeWo/View/Detail/OrganisationView.xaml b/BeWo/View/Detail/OrganisationView.xaml index d1de7f901..4bccab8c7 100644 --- a/BeWo/View/Detail/OrganisationView.xaml +++ b/BeWo/View/Detail/OrganisationView.xaml @@ -386,7 +386,7 @@ + @@ -49,12 +50,36 @@ + + Component + + + EmployeeKilometerauswertungsListReport.cs + + + Component + + + EmployeeKilometerauswertungsReport.cs + Component Fahrtkosten.cs + + Component + + + KilometerauswertungsListReport.cs + + + Component + + + KilometerauswertungsReport.cs + Component @@ -109,10 +134,24 @@ + + EmployeeKilometerauswertungsListReport.cs + Designer + + + EmployeeKilometerauswertungsReport.cs + Fahrtkosten.cs Designer + + KilometerauswertungsListReport.cs + Designer + + + KilometerauswertungsReport.cs + Mitarbeiterstundenkonto.cs Designer diff --git a/ReportImp/SeWo/CustomerDataReport.Designer.cs b/ReportImp/SeWo/CustomerDataReport.Designer.cs index b313c0751..c51e552a3 100644 --- a/ReportImp/SeWo/CustomerDataReport.Designer.cs +++ b/ReportImp/SeWo/CustomerDataReport.Designer.cs @@ -108,6 +108,7 @@ namespace BeWo.SeWo this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell54 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); @@ -150,7 +151,6 @@ namespace BeWo.SeWo this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel35 = new DevExpress.XtraReports.UI.XRLabel(); - this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -558,7 +558,7 @@ namespace BeWo.SeWo this.xrLabel1.SizeF = new System.Drawing.SizeF(677F, 25F); this.xrLabel1.StylePriority.UseFont = false; this.xrLabel1.StylePriority.UseTextAlignment = false; - this.xrLabel1.Text = "Klientenübersicht [Name]"; + this.xrLabel1.Text = "Übersicht [Name]"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // // PageFooter @@ -996,6 +996,15 @@ namespace BeWo.SeWo this.xrTableCell52.Text = "Notiz"; this.xrTableCell52.Weight = 0.38473520249221183D; // + // GroupHeader2 + // + this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable8, + this.xrLabel4}); + this.GroupHeader2.HeightF = 60.00001F; + this.GroupHeader2.Name = "GroupHeader2"; + this.GroupHeader2.RepeatEveryPage = true; + // // topMarginBand1 // this.topMarginBand1.HeightF = 75F; @@ -1458,15 +1467,6 @@ namespace BeWo.SeWo this.xrLabel35.StylePriority.UseFont = false; this.xrLabel35.Text = "Organisationen des Umfelds:"; // - // GroupHeader2 - // - this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable8, - this.xrLabel4}); - this.GroupHeader2.HeightF = 60.00001F; - this.GroupHeader2.Name = "GroupHeader2"; - this.GroupHeader2.RepeatEveryPage = true; - // // Klientenstammblatt // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1488,7 +1488,7 @@ namespace BeWo.SeWo this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; - this.Version = "13.2"; + this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); diff --git a/ReportImp/SeWo/GruppenMitMehrerenMitarbeitern.designer.cs b/ReportImp/SeWo/GruppenMitMehrerenMitarbeitern.designer.cs index 3fef5d340..da1703541 100644 --- a/ReportImp/SeWo/GruppenMitMehrerenMitarbeitern.designer.cs +++ b/ReportImp/SeWo/GruppenMitMehrerenMitarbeitern.designer.cs @@ -46,6 +46,7 @@ namespace BeWo.SeWo this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); @@ -59,7 +60,6 @@ namespace BeWo.SeWo this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.lblGefunden = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -205,7 +205,7 @@ namespace BeWo.SeWo // xrTableCell1 // this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Text = "KlientIn/Hilfeplan"; + this.xrTableCell1.Text = "Kunde/Hilfeplan"; this.xrTableCell1.Weight = 0.8862629188909048D; // // xrTableCell2 @@ -225,6 +225,10 @@ namespace BeWo.SeWo this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell4.Weight = 0.75332349361858553D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO); + // // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -266,7 +270,7 @@ namespace BeWo.SeWo this.Title.BackColor = System.Drawing.Color.White; this.Title.BorderColor = System.Drawing.SystemColors.ControlText; this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.Title.BorderWidth = 1; + this.Title.BorderWidth = 1F; this.Title.Font = new System.Drawing.Font("Times New Roman", 24F); this.Title.ForeColor = System.Drawing.Color.Black; this.Title.Name = "Title"; @@ -276,7 +280,7 @@ namespace BeWo.SeWo this.FieldCaption.BackColor = System.Drawing.Color.White; this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText; this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.FieldCaption.BorderWidth = 1; + this.FieldCaption.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"; @@ -286,7 +290,7 @@ namespace BeWo.SeWo this.PageInfo.BackColor = System.Drawing.Color.White; this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText; this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.PageInfo.BorderWidth = 1; + this.PageInfo.BorderWidth = 1F; this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F); this.PageInfo.ForeColor = System.Drawing.Color.Black; this.PageInfo.Name = "PageInfo"; @@ -296,7 +300,7 @@ namespace BeWo.SeWo this.DataField.BackColor = System.Drawing.Color.White; this.DataField.BorderColor = System.Drawing.SystemColors.ControlText; this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.DataField.BorderWidth = 1; + this.DataField.BorderWidth = 1F; this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F); this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; this.DataField.Name = "DataField"; @@ -336,10 +340,6 @@ namespace BeWo.SeWo this.lblGefunden.SizeF = new System.Drawing.SizeF(727F, 20.20833F); this.lblGefunden.Text = "Es wurden keine Einträge gefunden."; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.QueryRO); - // // GruppenMitMehrerenMitarbeitern // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -361,7 +361,7 @@ namespace BeWo.SeWo this.FieldCaption, this.PageInfo, this.DataField}); - this.Version = "13.1"; + this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); diff --git a/ReportImp/SeWo/OverlappingServiceRecords.designer.cs b/ReportImp/SeWo/OverlappingServiceRecords.designer.cs index 0afd85ce2..30be89a0f 100644 --- a/ReportImp/SeWo/OverlappingServiceRecords.designer.cs +++ b/ReportImp/SeWo/OverlappingServiceRecords.designer.cs @@ -287,7 +287,7 @@ namespace BeWo.SeWo // cellHeader2 // this.cellHeader2.Name = "cellHeader2"; - this.cellHeader2.Text = "KlientIn/Hilfeplan 1"; + this.cellHeader2.Text = "Kunde/Hilfeplan 1"; this.cellHeader2.Weight = 0.664697187723992D; // // cellHeaderDatum1 @@ -315,7 +315,7 @@ namespace BeWo.SeWo // this.cellHeader3.Name = "cellHeader3"; this.cellHeader3.StylePriority.UseTextAlignment = false; - this.cellHeader3.Text = "KlientIn/Hilfeplan 2"; + this.cellHeader3.Text = "Kunde/Hilfeplan 2"; this.cellHeader3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.cellHeader3.Weight = 0.66469719681567352D; // diff --git a/ReportImp/SeWo/Translation/TranslationDictionary.cs b/ReportImp/SeWo/Translation/TranslationDictionary.cs index 44b2cfc4e..d914517c7 100644 --- a/ReportImp/SeWo/Translation/TranslationDictionary.cs +++ b/ReportImp/SeWo/Translation/TranslationDictionary.cs @@ -20,8 +20,26 @@ namespace SeWo.Translation var dict = base.GetTranslationDictionary(); AddOrReplaceTranslation(dict, "Quittierungsbeleg", "Leistungsnachweis"); AddOrReplaceTranslation(dict, "Quittierungsbelege", "Leistungsnachweise"); - - + + AddOrReplaceTranslation(dict, "Klient", "Kunde"); + AddOrReplaceTranslation(dict, "Klient/in", "Kunde"); + AddOrReplaceTranslation(dict, "Klient(in)", "Kunde"); + AddOrReplaceTranslation(dict, "Klient:", "Kunde:"); + AddOrReplaceTranslation(dict, "Klienten", "Kunden"); + AddOrReplaceTranslation(dict, "Nach Klient gruppieren", "Nach Kunde gruppieren"); + AddOrReplaceTranslation(dict, "Nach Klienten sortieren", "Nach Kunden sortieren"); + AddOrReplaceTranslation(dict, "Nach Klient", "Nach Kunde"); + AddOrReplaceTranslation(dict, "KlientenMenuItem", "Kunden"); + AddOrReplaceTranslation(dict, "Für alle Klienten", "Für alle Kunden"); + AddOrReplaceTranslation(dict, "Für Klienten meiner Teams", "Für Kunden meiner Teams"); + AddOrReplaceTranslation(dict, "Für meine Klienten", "Für meine Kunden"); + AddOrReplaceTranslation(dict, "Klient/in auswählen", "Kunde auswählen"); + AddOrReplaceTranslation(dict, "Sammelrechnung für alle Klienten erstellen", "Sammelrechnung für alle Kunden erstellen"); + + AddOrReplaceTranslation(dict, "Alle Klienten anzeigen", "Alle Kunden anzeigen"); + AddOrReplaceTranslation(dict, "Alle Klienten", "Alle Kunden"); + AddOrReplaceTranslation(dict, "Nur meine Klienten anzeigen", "Nur meine Kunden anzeigen"); + AddOrReplaceTranslation(dict, "Nur Klienten meiner Teams anzeigen", "Nur Kunden meiner Teams anzeigen"); return dict; } } diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 7be71b6b8..8ca0e18bc 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -33,7 +33,7 @@ namespace BeWo.Service.Plugins //t = "1193188501"; // Aids Hilfe Dortmund //t = "7860351957"; // SKF Alsdorf //t = "3311520228"; // Die Düne - //t = "1352143437"; // Sewo + t = "1352143437"; // Sewo //t = "7107514623"; // BeWo Neuss //t = "9098141768"; // Fib e.V. Marburg //t = "1505148718"; // VSD Hamm @@ -133,7 +133,7 @@ namespace BeWo.Service.Plugins //t = "3227700467"; // Psychosozialer Trägerverein //t = "4378753169"; // Die Wohnhelfer Köln //t = "2214258555"; // Betreuungsbüro Baak - t = "4525013596"; // Hph Bersenbrück Freizeit und Reisen + //t = "4525013596"; // Hph Bersenbrück Freizeit und Reisen //t = "1609455614"; // Hph Bersenbrück Aph //t = "7852961459"; // B&B Betreutes Wohnen //t = "8719930557"; // Lebenshilfe Rhein-Sieg @@ -279,7 +279,7 @@ namespace BeWo.Service.Plugins //t = "4823067940"; // Die Kette 2 //t = "8283849714"; // Forum e.V. (proviel GmbH) //t = "3915346496"; // Sprungbrett 2. DB (Haus Theresia) - //t = "2387527289"; // Lebenshilfe Duisburg HPFH + t = "2387527289"; // Lebenshilfe Duisburg HPFH //t = "5595701056"; // Domiziel Ansbach //t = "9430188510"; // Pro INTEGRA //t = "4820371076"; // Zuhause Wohnen Iris Thimm @@ -300,7 +300,7 @@ namespace BeWo.Service.Plugins //t = "3536079480"; // Behindertenhilfe Menden //t = "5427523619"; // ChristopherusHausFamilienhilfe //t = "8251343124"; // Rat Plus Tat - t = "6819347851"; // Awo Kreisverband Plön + //t = "6819347851"; // Awo Kreisverband Plön //t = "2385915144"; // AKGG GmbHd //t = "8002913382"; // AKGG GmbH (MID) //t = "5155880294"; // BHV Bergische Hauspflege @@ -311,7 +311,7 @@ namespace BeWo.Service.Plugins //t = "3625103678"; // Pro Hilfe GbR | MID //t = "6028314513"; // Grundstein e.V. //t = "6178735147"; // Ilka Link ivi. - ambulante Hilfen, Beratung & Therapie - t = "9416221963"; // Ãœbergangshilfe Unna e.V. + //t = "9416221963"; // Ãœbergangshilfe Unna e.V. //t = "1316958991"; // Aidshilfe Essen //t = "3718732195"; // Diakonie Remscheid Lennep (Jobfit) //t = "4858885375"; // BewoTrio From e26c8436f4b8e32d238c541501a3fe7d4ad2592b Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 1 Jun 2022 12:50:12 +0200 Subject: [PATCH 3/3] cb --- .../Report/FLSReport/FLSOverviewGrid.xaml.cs | 58 +- .../Report/FLSReport/FLSReportView.xaml.cs | 6 +- .../FLSReportView.xaml.cs | 6 +- BeWoPlanerMobil/BeWoPlanerMobil.csproj | 4 +- BeWoPlanerMobil/BeWoPlanerMobil.csproj.user | 4 +- BeWoPlanerMobil/Views/Shared/_Layout.cshtml | 30 +- Host/Host.csproj.user | 2 +- ...CustomMitarbeiterstundenkontoBerechnung.cs | 3 +- .../ServiceInvoiceReport.Designer.cs | 10 +- .../Abrechnung/CustomInvoiceCreation.cs | 353 +++++- .../Rechnung.Designer.cs | 595 +++++---- .../Rechnung.cs | 52 +- .../LebenshilfeDuisburgAtz/RechnungIFF.cs | 2 +- .../CustomReportCreator.cs | 6 +- .../Export/DatevExporter.cs | 2 +- ...eiterstundenkontoBerechnungTagesansicht.cs | 39 + ...KilometerauswertungsListReport.Designer.cs | 159 +-- .../EmployeeKilometerauswertungsListReport.cs | 18 + .../EmployeeKilometerauswertungsReport.cs | 15 +- ...oyeeKilometerauswertungsReport.designer.cs | 510 ++++---- ...KilometerauswertungsListReport.Designer.cs | 2 +- .../KilometerauswertungsReport.designer.cs | 2 +- .../Mitarbeiterarbeitszeitkonto.cs | 47 + .../Mitarbeiterarbeitszeitkonto.designer.cs | 1101 +++++++++++++++++ .../Mitarbeiterarbeitszeitkonto.resx | 123 ++ .../PflegedienstWessel.csproj | 12 + .../CustomStundenuebersichtAuswertung.cs | 34 + .../CustomServiceRecordValidator.cs | 20 +- .../SeWo/Translation/TranslationDictionary.cs | 9 + .../Plugins/StundenuebersichtAuswertung.cs | 32 +- .../ServiceRecordFLSOverviewDC.cs | 6 + 31 files changed, 2653 insertions(+), 609 deletions(-) create mode 100644 ReportImp/PflegedienstWessel/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs create mode 100644 ReportImp/PflegedienstWessel/Mitarbeiterarbeitszeitkonto.cs create mode 100644 ReportImp/PflegedienstWessel/Mitarbeiterarbeitszeitkonto.designer.cs create mode 100644 ReportImp/PflegedienstWessel/Mitarbeiterarbeitszeitkonto.resx create mode 100644 ReportImp/PflegedienstWessel/Service/CustomStundenuebersichtAuswertung.cs diff --git a/BeWo/View/Report/FLSReport/FLSOverviewGrid.xaml.cs b/BeWo/View/Report/FLSReport/FLSOverviewGrid.xaml.cs index 5c06321c9..08dbf9e48 100644 --- a/BeWo/View/Report/FLSReport/FLSOverviewGrid.xaml.cs +++ b/BeWo/View/Report/FLSReport/FLSOverviewGrid.xaml.cs @@ -271,7 +271,14 @@ namespace BeWo.View.Report.FLSReport { if (sr.GroupOid != null && sr.GroupRoundedDuration != null && sr.GroupPersonCount != null) { - lbl.Content = sr.Start.Value.ToShortDateString().Substring(0, 6) + " " + sr.Start.Value.ToShortTimeString() + "-" + sr.Start.Value.AddMinutes((double)sr.GroupRoundedDuration).ToShortTimeString() + " (" + (int)sr.RoundedDuration + " min.)"; + //lbl.Content = sr.Start.Value.ToShortDateString().Substring(0, 6) + " " + sr.Start.Value.ToShortTimeString() + "-" + sr.Start.Value.AddMinutes((double)sr.GroupRoundedDuration).ToShortTimeString() + " (" + (int)sr.RoundedDuration + " min.)"; + var contentVorher = sr.Start.Value.ToShortDateString().Substring(0, 6) + " " + sr.Start.Value.ToShortTimeString() + "-" + sr.Start.Value.AddMinutes((double)sr.GroupRoundedDuration).ToShortTimeString() + " (" + (int)sr.RoundedDuration + " min.)"; + //lbl.Content = string.Format("ok TEST DURATIONXXX 1"); + lbl.Content = sr.DateTimeRange; + if (contentVorher != sr.DateTimeRange) + { + int test = 0; + } grid.Children.Add(lbl); lbl = new Label(); @@ -292,14 +299,25 @@ namespace BeWo.View.Report.FLSReport } else { - lbl.Content = sr.Start.Value.ToShortDateString().Substring(0, 6) + " " + sr.Start.Value.ToShortTimeString() + "-" + sr.Start.Value.AddMinutes((double)sr.RoundedDuration).ToShortTimeString() + " (" + (int)sr.RoundedDuration + " min.)"; + var contentVorher = sr.Start.Value.ToShortDateString().Substring(0, 6) + " " + sr.Start.Value.ToShortTimeString() + "-" + sr.Start.Value.AddMinutes((double)sr.RoundedDuration).ToShortTimeString() + " (" + (int)sr.RoundedDuration + " min.)"; + //lbl.Content = string.Format("ok TEST DURATIONXXX 2"); + lbl.Content = sr.DateTimeRange; + if (contentVorher != sr.DateTimeRange) + { + int test = 0; + } } } else { if (sr.GroupOid != null && sr.GroupRoundedDuration != null && sr.GroupPersonCount != null) { - lbl.Content = sr.Start.Value.ToShortDateString().Substring(0, 6) + " " + (int)sr.GroupRoundedDuration.Value + " min."; + var contentVorher = sr.Start.Value.ToShortDateString().Substring(0, 6) + " " + (int)sr.GroupRoundedDuration.Value + " min."; + lbl.Content = sr.DateTimeRange; + if (contentVorher != sr.DateTimeRange) + { + int test = 0; + } grid.Children.Add(lbl); lbl = new Label(); @@ -320,7 +338,13 @@ namespace BeWo.View.Report.FLSReport } else { - lbl.Content = sr.Start.Value.ToShortDateString().Substring(0, 6) + " " + (int)sr.RoundedDuration + " min."; + var contentVorher = sr.Start.Value.ToShortDateString().Substring(0, 6) + " " + (int)sr.RoundedDuration + " min."; + //lbl.Content = string.Format("ok TEST DURATIONXXX 3"); + lbl.Content = sr.DateTimeRange; + if (contentVorher != sr.DateTimeRange) + { + int test = 0; + } } } @@ -534,7 +558,13 @@ namespace BeWo.View.Report.FLSReport { if (item.GroupOid != null && item.GroupRoundedDuration != null && item.GroupPersonCount != null) { - lbl.Content = item.Start.Value.ToShortTimeString() + "-" + item.Start.Value.AddMinutes((double)item.GroupRoundedDuration).ToShortTimeString() + " (" + (int)item.RoundedDuration + " min.)"; + var contentVorher = item.Start.Value.ToShortTimeString() + "-" + item.Start.Value.AddMinutes((double)item.GroupRoundedDuration).ToShortTimeString() + " (" + (int)item.RoundedDuration + " min.)"; + //lbl.Content = string.Format("ok TEST DURATIONXXX 4"); + lbl.Content = item.TimeRange; + if (contentVorher != item.TimeRange) + { + int test = 0; + } grid.Children.Add(lbl); lbl = new Label(); @@ -548,14 +578,20 @@ namespace BeWo.View.Report.FLSReport } else { - lbl.Content = item.Start.Value.ToShortTimeString() + "-" + item.Start.Value.AddMinutes((double)item.RoundedDuration).ToShortTimeString() + " (" + (int)item.RoundedDuration + " min.)"; + var contentVorher = item.Start.Value.ToShortTimeString() + "-" + item.Start.Value.AddMinutes((double)item.RoundedDuration).ToShortTimeString() + " (" + (int)item.RoundedDuration + " min.)"; + lbl.Content = item.TimeRange; + if (contentVorher != item.TimeRange) + { + int test = 0; + } + //lbl.Content = string.Format("OK TEST DURATIONXXX 5"); } } else { if (item.GroupOid != null && item.GroupRoundedDuration != null && item.GroupPersonCount != null) { - lbl.Content = (int)item.GroupRoundedDuration.Value + " min."; + lbl.Content = item.TimeRange; grid.Children.Add(lbl); lbl = new Label(); @@ -569,7 +605,13 @@ namespace BeWo.View.Report.FLSReport } else { - lbl.Content = (int)item.RoundedDuration + " min."; + var contentVorher = (int)item.RoundedDuration + " min."; + lbl.Content = item.TimeRange; + if (contentVorher != item.TimeRange) + { + int test = 0; + } + lbl.Content = string.Format("TEST DURATIONXXX 6"); } } diff --git a/BeWo/View/Report/FLSReport/FLSReportView.xaml.cs b/BeWo/View/Report/FLSReport/FLSReportView.xaml.cs index 4327f03e4..0a2484d6e 100644 --- a/BeWo/View/Report/FLSReport/FLSReportView.xaml.cs +++ b/BeWo/View/Report/FLSReport/FLSReportView.xaml.cs @@ -896,7 +896,8 @@ namespace BeWo.View.Report.FLSReport if (sr.Start != null && sr.Start.Value.Second == 0) { content.Add(sr.Start.Value.ToShortTimeString()); - content.Add(sr.Start.Value.AddMinutes((double)sr.RoundedDuration).ToShortTimeString()); + //content.Add(sr.Start.Value.AddMinutes((double)sr.RoundedDuration).ToShortTimeString()); + content.Add(string.Format("TEST DURATIONXXX 7")); } else { @@ -904,7 +905,8 @@ namespace BeWo.View.Report.FLSReport content.Add(string.Empty); } - content.Add(String.Format("{0}", (int)sr.RoundedDuration)); + //content.Add(String.Format("{0}", (int)sr.RoundedDuration)); + content.Add(string.Format("TEST DURATIONXXX 8")); if (this._FLSOverview.FLSOverviewConfig.ShowOnlyTotalRows) { diff --git a/BeWo/View/Report/MitarbeiterKoelnRing/FLSReportView.xaml.cs b/BeWo/View/Report/MitarbeiterKoelnRing/FLSReportView.xaml.cs index 5f90e4672..a4e7dbd06 100644 --- a/BeWo/View/Report/MitarbeiterKoelnRing/FLSReportView.xaml.cs +++ b/BeWo/View/Report/MitarbeiterKoelnRing/FLSReportView.xaml.cs @@ -551,14 +551,16 @@ namespace BeWo.View.Report.MitarbeiterKoelnRing if (sr.Start != null && sr.Start.Value.Second == 0) { content.Add(sr.Start.Value.ToShortTimeString()); - content.Add(sr.Start.Value.AddMinutes((double)sr.RoundedDuration).ToShortTimeString()); + //content.Add(sr.Start.Value.AddMinutes((double)sr.RoundedDuration).ToShortTimeString()); + content.Add(string.Format("TEST DURATIONXXX 9")); } else { content.Add(""); content.Add(""); } - content.Add(String.Format("{0}", (int)sr.RoundedDuration)); + //content.Add(String.Format("{0}", (int)sr.RoundedDuration)); + content.Add(string.Format("TEST DURATIONXXX 10")); if (_FLSOverview.FLSOverviewConfig.ShowOnlyTotalRows) { diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj index a5e824516..27a337e2c 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj @@ -17,7 +17,7 @@ BeWoPlanerMobil v4.7.2 false - false + true @@ -1573,7 +1573,7 @@ False 8808 / - http://localhost/BeWoPlanerMobil + http://localhost:8808/ False False diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user index 2c93437fb..aed93f702 100644 --- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user +++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user @@ -1,14 +1,14 @@  - false + true false - Debug|Any CPU + Release|Any CPU ShowAllFiles 600 MvcControllerEmptyScaffolder diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml index 51d425d71..697fe7ac7 100644 --- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml +++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml @@ -25,24 +25,24 @@ - + - - - - + + + + - - - - - - - - - - + + + + + + + + + + @Html.DevExpress().GetStyleSheets( new StyleSheet { ExtensionSuite = ExtensionSuite.NavigationAndLayout }, diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user index 47b4326c0..a441248c4 100644 --- a/Host/Host.csproj.user +++ b/Host/Host.csproj.user @@ -3,7 +3,7 @@ BeWo2.0 true - Debug|Any CPU + Release|Any CPU false diff --git a/ReportImp/AutismusLeben/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/AutismusLeben/CustomMitarbeiterstundenkontoBerechnung.cs index 8173caaa4..1bfb14337 100644 --- a/ReportImp/AutismusLeben/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/AutismusLeben/CustomMitarbeiterstundenkontoBerechnung.cs @@ -35,8 +35,7 @@ namespace AutismusLeben return false; } - protected override ServiceRecordSummary BerechneStunden(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, IList groupFilteredRecords, DateTime berichtsAnfang, - DateTime berichtsEnde) + protected override ServiceRecordSummary BerechneStunden(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, IList groupFilteredRecords, DateTime berichtsAnfang, DateTime berichtsEnde) { decimal flsGesamt = 0; decimal arbeitszeit = 0; diff --git a/ReportImp/AwoDortmund/ServiceInvoiceReport.Designer.cs b/ReportImp/AwoDortmund/ServiceInvoiceReport.Designer.cs index b69469ce6..6fee0dfa7 100644 --- a/ReportImp/AwoDortmund/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/AwoDortmund/ServiceInvoiceReport.Designer.cs @@ -109,9 +109,8 @@ namespace AwoDortmund // topMarginBand1 // this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel6, this.xrPictureBox1}); - this.topMarginBand1.HeightF = 250F; + this.topMarginBand1.HeightF = 202.2917F; this.topMarginBand1.Name = "topMarginBand1"; // // xrLabel6 @@ -119,7 +118,7 @@ namespace AwoDortmund this.xrLabel6.BackColor = System.Drawing.Color.Transparent; this.xrLabel6.CanShrink = true; this.xrLabel6.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(450.7085F, 202.2917F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(450.7088F, 0F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -172,6 +171,7 @@ namespace AwoDortmund // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel6, this.xrRichText2, this.xrLabel7, this.xrLabel4, @@ -190,7 +190,7 @@ namespace AwoDortmund this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); - this.xrRichText2.SizeF = new System.Drawing.SizeF(450.71F, 30F); + this.xrRichText2.SizeF = new System.Drawing.SizeF(448.2101F, 30F); this.xrRichText2.StylePriority.UseFont = false; // // xrLabel7 @@ -674,7 +674,7 @@ namespace AwoDortmund this.Font = new System.Drawing.Font("Arial", 11F, 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, 250, 100); + this.Margins = new System.Drawing.Printing.Margins(80, 75, 202, 100); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceCreation.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceCreation.cs index 9bbb1aa68..4e843abae 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceCreation.cs +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Abrechnung/CustomInvoiceCreation.cs @@ -1,10 +1,12 @@ using System; using System.Collections.Generic; using System.Linq; +using BeWo.Data.Access; using BeWo.Data.Entities; using BeWo.Service.DCEntityMapper; using BeWo.Service.Invoicing; using BeWo.Service.Plugins; +using BS.Shared; using BS.Shared.Core; using BS.Shared.DataContracts; using BS.Shared.DataContracts.Compact; @@ -15,6 +17,353 @@ namespace HphBersenbrueckFreizeitUndReisen.Abrechnung { public class CustomInvoiceCreation : InvoiceCreation { - - } + + public override List GenerateServiceInvoices(long costBearerOid, DateTimeSpan invoicePeriod, Dictionary> supportConcepts2ServiceRecords) + { + + var invoiceList = new List(); + + var invoiceCounter = 0; + + + foreach (var sc in supportConcepts2ServiceRecords.Keys) + { + var serviceRecords = supportConcepts2ServiceRecords[sc]; + + var cc = sc.Customer; + var customer = DAOFactory.GenericDAO.LoadByID(sc.Customer.Oid.Value); + + Organisation selbszahler = null; + Organisation pflegekasse = null; + + foreach (var c2o in customer.Customer2OrganisationList) + { + foreach (var v2o in c2o.ValueList) + { + if (v2o.Entry.Type == BS.Shared.ValueListEntryType.EnvironmentOrganisationType) + { + if (v2o.Entry.Value == "Selbstzahler") + { + selbszahler = c2o.Organisation; + + } + else if (v2o.Entry.Value == "Pflegekasse") + { + pflegekasse = c2o.Organisation; + } + } + } + } + ServiceInvoice pflegekassenRechnung = null; + if (pflegekasse != null) + { + pflegekassenRechnung = CreatePflegekassenRechnung(invoiceCounter, pflegekasse, customer, invoicePeriod, sc, serviceRecords); + + if (pflegekassenRechnung != null && pflegekassenRechnung.GetTotalClaim() > 0) + { + invoiceList.Add(pflegekassenRechnung); + invoiceCounter++; + + } + } + if (selbszahler != null) + { + var selbstzahlerRechnung = CreateSelbstzahlerRechnung(invoiceCounter, customer, invoicePeriod, sc, serviceRecords); + + if (selbstzahlerRechnung != null && selbstzahlerRechnung.GetTotalClaim() > 0) + { + SetzeInvoiceItemDescription(selbstzahlerRechnung, pflegekassenRechnung); + + + invoiceList.Add(selbstzahlerRechnung); + invoiceCounter++; + + } + } + + if (invoiceList.Count == 0) + { + return base.GenerateServiceInvoices(costBearerOid, invoicePeriod, supportConcepts2ServiceRecords); + } + //privatRechnungen = CreatePrivatRechnungen(invoiceCounter, costBearer, invoicePeriod, sc, serviceRecords); + + //if (privatRechnungen != null) + //{ + // foreach (var si in privatRechnungen) + // { + // invoiceList.Add(si); + // invoiceCounter++; + // } + //} + + //additionalItemsCreated = false; + //var invoice = CreateSingleInvoice(invoiceCounter, costBearer, invoicePeriod, sc, serviceRecords); + //if (invoice != null) + //{ + // invoiceList.Add(invoice); + // invoiceCounter++; + //} + + + } + + var result = invoiceList.Select(item => MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(item)).ToList(); + + //return result.Count > 1 ? result.OrderBy(i => i.InvoiceBase.CustomerLastName).ToList() : result; + return result; + } + + private void SetzeInvoiceItemDescription(ServiceInvoice selbstzahlerRechnung, ServiceInvoice pflegekassenRechnung) + { + if (pflegekassenRechnung != null) + { + foreach (var ssip in selbstzahlerRechnung.ServiceInvoicePeriodList) + { + foreach (var sii in ssip.InvoiceItemList) + { + if (sii.ItemDescription == "Selbstzahler") + { + foreach (var psip in pflegekassenRechnung.ServiceInvoicePeriodList) + { + foreach (var pii in psip.InvoiceItemList) + { + sii.ItemDescription = pii.ItemDescription; + } + } + } + } + } + } + } + + private ServiceInvoice CreateSelbstzahlerRechnung(int invoiceCounter, Customer customer, DateTimeSpan invoicePeriod, CompactSupportConceptDC sc, List serviceRecords) + { + var costBearer = DAOFactory.GenericDAO.LoadByID(sc.CostBearerList[0].CostBearerOid); + + var invoice = base.CreateSingleInvoice(invoiceCounter, costBearer, invoicePeriod, sc, new List()); + invoice.InvoiceBase.InvoiceId = "RechnungSelbstzahler"; + + + if (customer.Person.InvoiceAddress != null) + { + invoice.InvoiceBase.RecipientAddress = customer.Person.InvoiceAddress.CopyToNew(); + invoice.InvoiceBase.RecipientOrganisation = ""; + + } + else if (customer.Person.Address != null) + { + invoice.InvoiceBase.RecipientAddress = customer.Person.Address.CopyToNew(); + invoice.InvoiceBase.RecipientOrganisation = ""; + + } + invoice.InvoiceBase.RecipientCostBearerOid = sc.CostBearerList[0].CostBearerOid; + invoice.InvoiceBase.RecipientPersonFirstName = customer.Person.FirstName; + invoice.InvoiceBase.RecipientPersonLastName = customer.Person.LastName; + + + Dictionary key2Info = new Dictionary(); + + + foreach (var sr in serviceRecords) + { + if (sr.ServiceDescription.Category.Name == "Selbstzahler") + { + var preis = GetPreisVonServiceDescription(sr.ServiceDescription, sr.Start.Value); + + + + String key = String.Format("{0}_{1:0.00}", sr.ServiceDescription.Category.Name, preis); + if (!key2Info.ContainsKey(key)) + { + key2Info.Add(key, new AbrechnungsInfos()); + } + key2Info[key].Minuten += sr.RoundedDuration; + key2Info[key].Stundensatz = preis; + key2Info[key].Category = sr.ServiceDescription.Category.Name; + } + } + + + invoice.ServiceInvoicePeriodList = new List(); + + var sip = new ServiceInvoicePeriod + { + Start = invoicePeriod.StartDateTime, + End = invoicePeriod.EndDateTime + }; + + sip.Notice = customer.Person.LastNameFirstName; + + foreach (var info in key2Info.Values) + { + if (info.Stundensatz > 0 && info.Minuten > 0) + { + var ii = new InvoiceItem(); + + ii.AmountPerUnit = info.Stundensatz; + ii.UnitCount = Math.Round(info.Minuten / 60, 2, MidpointRounding.AwayFromZero); + ii.AmountTotal = ii.AmountPerUnit * ii.UnitCount; + ii.ItemPeriodStart = invoicePeriod.StartDateTime; + ii.ItemPeriodEnd = invoicePeriod.EndDateTime; + ii.RateFactor = null; + ii.GrossAmountTotal = ii.AmountTotal; + ii.UnitDescription = String.Format("{0}", customer.Oid); + ii.ItemDescription = GetArtikelbezeichnung(info.Category); + ii.Notice = customer.Person.FirstNameLastName; + sip.InvoiceItemList.Add(ii); + } + } + + + invoice.ServiceInvoicePeriodList.Add(sip); + SetServiceInvoicePeriodAmounts(invoice); + + return invoice; + } + + private string GetArtikelbezeichnung(string category) + { + var name = category.Replace(" ", "").ToLower(); + + if (name.Contains("§45")) + { + return "Niedrigschwellige Betreuung"; + } + if (name.Contains("§39")) + { + return "Verhinderungspflege"; + } + if (name.Contains("selbstzahler")) + { + //return "Verhinderungspflege"; + } + return category; + } + + private ServiceInvoice CreatePflegekassenRechnung(int invoiceCounter, Organisation pflegekasse, Customer customer, DateTimeSpan invoicePeriod, CompactSupportConceptDC sc, List serviceRecords) + { + + var invoice = base.CreateSingleInvoice(invoiceCounter, pflegekasse.CostBearer, invoicePeriod, sc, new List()); + invoice.InvoiceBase.InvoiceId = "RechnungPflegekasse"; + invoice.InvoiceBase.RecipientCostBearerOid = sc.CostBearerList[0].CostBearerOid; + //if (customer.Person.InvoiceAddress != null) + //{ + // invoice.InvoiceBase.RecipientAddress = customer.Person.InvoiceAddress.CopyToNew(); + // invoice.InvoiceBase.RecipientOrganisation = ""; + // invoice.InvoiceBase.RecipientCostBearerOid = null; + //} + //else if (customer.Person.Address != null) + //{ + // invoice.InvoiceBase.RecipientAddress = customer.Person.Address.CopyToNew(); + // invoice.InvoiceBase.RecipientOrganisation = ""; + // invoice.InvoiceBase.RecipientCostBearerOid = null; + //} + + Dictionary key2Info = new Dictionary(); + foreach (var sr in serviceRecords) + { + if (sr.ServiceDescription.Category.Name != "Selbstzahler") + { + var preis = GetPreisVonServiceDescription(sr.ServiceDescription, sr.Start.Value); + + String key = String.Format("{0}_{1:0.00}", sr.ServiceDescription.Category.Name, preis); + if (!key2Info.ContainsKey(key)) + { + key2Info.Add(key, new AbrechnungsInfos()); + } + key2Info[key].Minuten += sr.RoundedDuration; + key2Info[key].Stundensatz = preis; + key2Info[key].Category = sr.ServiceDescription.Category.Name; + } + } + + + invoice.ServiceInvoicePeriodList = new List(); + + var sip = new ServiceInvoicePeriod + { + Start = invoicePeriod.StartDateTime, + End = invoicePeriod.EndDateTime + }; + + sip.Notice = customer.Person.LastNameFirstName; + + foreach (var info in key2Info.Values) + { + if (info.Stundensatz > 0 && info.Minuten > 0) + { + var ii = new InvoiceItem(); + + ii.AmountPerUnit = info.Stundensatz; + ii.UnitCount = Math.Round(info.Minuten / 60, 2, MidpointRounding.AwayFromZero); + ii.AmountTotal = ii.AmountPerUnit * ii.UnitCount; + ii.ItemPeriodStart = invoicePeriod.StartDateTime; + ii.ItemPeriodEnd = invoicePeriod.EndDateTime; + ii.RateFactor = null; + ii.GrossAmountTotal = ii.AmountTotal; + ii.UnitDescription = String.Format("{0}", customer.Oid); + ii.ItemDescription = GetArtikelbezeichnung(info.Category); + ii.Notice = customer.Person.FirstNameLastName; + sip.InvoiceItemList.Add(ii); + } + } + + invoice.ServiceInvoicePeriodList.Add(sip); + SetServiceInvoicePeriodAmounts(invoice); + + return invoice; + } + + public override void SetServiceInvoicePeriods(ServiceInvoice invoice, CostBearer2SupportConcept costBearer2SupportConcept, DateTimeSpan invoicePeriod, List serviceRecords) + { + base.SetServiceInvoicePeriods(invoice, costBearer2SupportConcept, invoicePeriod, serviceRecords); + } + + public override void SetInvoiceItems(ServiceInvoice invoice, ServiceInvoicePeriod serviceInvoicePeriod, SupportConceptApprovalPeriodDC supportConceptApprovalPeriod, CostBearer2SupportConcept cb2sc, DateTimeSpan invoicePeriod, List serviceRecords) + { + base.SetInvoiceItems(invoice, serviceInvoicePeriod, supportConceptApprovalPeriod, cb2sc, invoicePeriod, serviceRecords); + } + + private decimal GetPreisVonServiceDescription(ServiceDescriptionDC serviceDescription, DateTime monat) + { + if (serviceDescription != null && serviceDescription.CostRatePeriods != null) + { + + var crp = serviceDescription.CostRatePeriods.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, monat); + + if (crp != null) + { + return crp.CostRateValue ?? 0; + } + } + + return 0; + } + + private decimal? GetPreisVonServiceDescription(ServiceDescription serviceDescription, DateTime monat) + { + if (serviceDescription != null && serviceDescription.CostRatePeriods != null) + { + var crpDcList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(serviceDescription.CostRatePeriods); + + var crp = crpDcList.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, monat); + + if (crp != null) + { + return crp.CostRateValue; + } + } + + return null; + } + } + + public class AbrechnungsInfos + { + public decimal Stundensatz { get; set; } + + public decimal Minuten { get; set; } + + public String Category { get; set; } + } } diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.Designer.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.Designer.cs index 4cecfa23b..68a5c3182 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.Designer.cs +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.Designer.cs @@ -32,6 +32,14 @@ namespace HphBersenbrueckFreizeitUndReisen System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Rechnung)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); @@ -52,6 +60,9 @@ namespace HphBersenbrueckFreizeitUndReisen this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupFooter = new DevExpress.XtraReports.UI.GroupFooterBand(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); @@ -65,27 +76,24 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.lblSatz = new DevExpress.XtraReports.UI.XRTableCell(); this.lblAnzahl = new DevExpress.XtraReports.UI.XRTableCell(); this.lblBetrag = new DevExpress.XtraReports.UI.XRTableCell(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); + this.lblAbschlusssatz = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -99,6 +107,10 @@ namespace HphBersenbrueckFreizeitUndReisen // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel10, + this.xrLabel9, + this.xrLabel6, + this.xrLabel5, this.xrLabel17, this.xrLabel16, this.xrLabel15, @@ -117,6 +129,142 @@ namespace HphBersenbrueckFreizeitUndReisen this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // + // xrLabel10 + // + this.xrLabel10.BackColor = System.Drawing.Color.Transparent; + this.xrLabel10.CanShrink = true; + this.xrLabel10.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(197.0018F, 414.8333F); + this.xrLabel10.Multiline = true; + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(35.83333F, 16.99997F); + this.xrLabel10.StylePriority.UseBackColor = false; + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.StylePriority.UseTextAlignment = false; + this.xrLabel10.Text = "geb.:"; + this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrLabel10.WordWrap = false; + // + // xrLabel9 + // + this.xrLabel9.BackColor = System.Drawing.Color.Transparent; + this.xrLabel9.CanShrink = true; + this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerBirthdate", "{0:dd.MM.yyyy}")}); + this.xrLabel9.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(232.8351F, 414.8333F); + this.xrLabel9.Multiline = true; + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(113.1476F, 17F); + this.xrLabel9.StylePriority.UseBackColor = false; + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.StylePriority.UseTextAlignment = false; + this.xrLabel9.WordWrap = false; + // + // xrLabel6 + // + this.xrLabel6.BackColor = System.Drawing.Color.Transparent; + this.xrLabel6.CanShrink = true; + this.xrLabel6.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 448.8333F); + this.xrLabel6.Multiline = true; + this.xrLabel6.Name = "xrLabel6"; + this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(285.3351F, 16.99997F); + this.xrLabel6.StylePriority.UseBackColor = false; + this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.StylePriority.UseTextAlignment = false; + this.xrLabel6.Text = "[CustomerPostalCode] [CustomerTown]"; + this.xrLabel6.WordWrap = false; + // + // xrLabel5 + // + this.xrLabel5.BackColor = System.Drawing.Color.Transparent; + this.xrLabel5.CanShrink = true; + this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerStreet")}); + this.xrLabel5.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 431.8333F); + this.xrLabel5.Multiline = true; + this.xrLabel5.Name = "xrLabel5"; + this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(285.3351F, 16.99997F); + this.xrLabel5.StylePriority.UseBackColor = false; + this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.StylePriority.UseTextAlignment = false; + this.xrLabel5.Text = "Freizeit & Reisen\r\nFamilienunterstützender Dienst\r\nFranz-Hecker-Straße 20\r\n49593 " + + "Bersenbrück"; + this.xrLabel5.WordWrap = false; + // + // xrLabel17 + // + this.xrLabel17.BackColor = System.Drawing.Color.Transparent; + this.xrLabel17.CanShrink = true; + this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerName")}); + this.xrLabel17.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 414.8333F); + this.xrLabel17.Multiline = true; + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(197.0018F, 17F); + this.xrLabel17.StylePriority.UseBackColor = false; + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.StylePriority.UseTextAlignment = false; + this.xrLabel17.Text = "Freizeit & Reisen\r\nFamilienunterstützender Dienst\r\nFranz-Hecker-Straße 20\r\n49593 " + + "Bersenbrück"; + this.xrLabel17.WordWrap = false; + // + // xrLabel16 + // + this.xrLabel16.BackColor = System.Drawing.Color.Transparent; + this.xrLabel16.CanShrink = true; + this.xrLabel16.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(359.7083F, 458.5833F); + this.xrLabel16.Multiline = true; + this.xrLabel16.Name = "xrLabel16"; + this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel16.SizeF = new System.Drawing.SizeF(340F, 27.00003F); + this.xrLabel16.StylePriority.UseBackColor = false; + this.xrLabel16.StylePriority.UseFont = false; + this.xrLabel16.StylePriority.UseTextAlignment = false; + this.xrLabel16.Text = "Abrechnungszeitraum: [AccountingPeriod]"; + this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrLabel16.WordWrap = false; + // + // xrLabel15 + // + this.xrLabel15.BackColor = System.Drawing.Color.Transparent; + this.xrLabel15.CanShrink = true; + this.xrLabel15.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(359.7083F, 414.8333F); + this.xrLabel15.Multiline = true; + this.xrLabel15.Name = "xrLabel15"; + this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel15.SizeF = new System.Drawing.SizeF(340F, 32.83337F); + this.xrLabel15.StylePriority.UseBackColor = false; + this.xrLabel15.StylePriority.UseFont = false; + this.xrLabel15.StylePriority.UseTextAlignment = false; + this.xrLabel15.Text = "Debitoren-Nr. bitte bei Zahlungen unbedingt\r\nangeben!"; + this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrLabel15.WordWrap = false; + // + // xrLabel14 + // + this.xrLabel14.BackColor = System.Drawing.Color.Transparent; + this.xrLabel14.CanShrink = true; + this.xrLabel14.Font = new System.Drawing.Font("Arial", 14.5F, System.Drawing.FontStyle.Bold); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(359.7083F, 334F); + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(280F, 33.66669F); + this.xrLabel14.StylePriority.UseBackColor = false; + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "Rechnung"; + this.xrLabel14.WordWrap = false; + // // xrLabel13 // this.xrLabel13.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -337,12 +485,56 @@ namespace HphBersenbrueckFreizeitUndReisen // bottomMarginBand1 // this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPageInfo2, this.xrLabel3, this.xrLabel2, this.xrLabel1}); this.bottomMarginBand1.HeightF = 129.0417F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrPageInfo2 + // + this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo2.Format = "Seite {0} von {1}"; + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(455.4859F, 96.04173F); + this.xrPageInfo2.Name = "xrPageInfo2"; + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(244.2223F, 22.99999F); + this.xrPageInfo2.StylePriority.UseFont = false; + this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // xrLabel3 + // + this.xrLabel3.BackColor = System.Drawing.Color.Transparent; + this.xrLabel3.CanShrink = true; + this.xrLabel3.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 52.83335F); + this.xrLabel3.Multiline = true; + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(340F, 74.91669F); + this.xrLabel3.StylePriority.UseBackColor = false; + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.StylePriority.UseTextAlignment = false; + this.xrLabel3.Text = "OSNABRUECKER VOLKSBANK\r\nIBAN: DE63 2659 0025 0202 0300 00\r\nBIC: GENODEF1OSV"; + this.xrLabel3.WordWrap = false; + // + // xrLabel2 + // + this.xrLabel2.BackColor = System.Drawing.Color.Transparent; + this.xrLabel2.CanShrink = true; + this.xrLabel2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(165.1666F, 0F); + this.xrLabel2.Multiline = true; + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(340F, 32.83337F); + this.xrLabel2.StylePriority.UseBackColor = false; + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.StylePriority.UseTextAlignment = false; + this.xrLabel2.Text = "Der Rechnungsbetrag ist sofort fällig."; + this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrLabel2.WordWrap = false; + // // xrLabel1 // this.xrLabel1.BorderColor = System.Drawing.Color.MidnightBlue; @@ -364,21 +556,18 @@ namespace HphBersenbrueckFreizeitUndReisen // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable3, - this.xrTable1}); - this.Page1.Font = new System.Drawing.Font("Arial", 9F); - this.Page1.HeightF = 50F; + this.xrTable3}); + this.Page1.HeightF = 25F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // // xrTable3 // - this.xrTable3.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 0F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow10}); - this.xrTable3.SizeF = new System.Drawing.SizeF(656.9999F, 25F); + this.xrTable3.SizeF = new System.Drawing.SizeF(699.708F, 25F); this.xrTable3.StylePriority.UseFont = false; // // xrTableRow10 @@ -395,101 +584,86 @@ namespace HphBersenbrueckFreizeitUndReisen // // xrTableCell15 // - this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell15.Name = "xrTableCell15"; this.xrTableCell15.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.xrTableCell15.StylePriority.UseBorders = false; this.xrTableCell15.StylePriority.UsePadding = false; this.xrTableCell15.StylePriority.UseTextAlignment = false; - this.xrTableCell15.Text = "Von"; this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell15.Weight = 1D; // // xrTableCell16 // - this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell16.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell16.Name = "xrTableCell16"; this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.xrTableCell16.StylePriority.UseBorders = false; this.xrTableCell16.StylePriority.UsePadding = false; this.xrTableCell16.StylePriority.UseTextAlignment = false; - this.xrTableCell16.Text = "Bis"; this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell16.Weight = 1D; + this.xrTableCell16.Weight = 1.6683537938946034D; // // xrTableCell17 // - this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell17.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell17.Name = "xrTableCell17"; this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.xrTableCell17.StylePriority.UseBorders = false; this.xrTableCell17.StylePriority.UsePadding = false; this.xrTableCell17.StylePriority.UseTextAlignment = false; - this.xrTableCell17.Text = "Posten"; + this.xrTableCell17.Text = "Zeitraum"; this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell17.Weight = 2.4035382732502888D; + this.xrTableCell17.Weight = 1.7351844793556854D; // // xrTableCell18 // - this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell18.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell18.Name = "xrTableCell18"; this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.xrTableCell18.StylePriority.UseBorders = false; this.xrTableCell18.StylePriority.UsePadding = false; this.xrTableCell18.StylePriority.UseTextAlignment = false; - this.xrTableCell18.Text = "Satz"; - this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell18.Weight = 0.83099597349857446D; + this.xrTableCell18.Text = "Preis"; + this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell18.Weight = 0.97481796430077661D; // // xrTableCell19 // - this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell19.Name = "xrTableCell19"; this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.xrTableCell19.StylePriority.UseBorders = false; this.xrTableCell19.StylePriority.UsePadding = false; this.xrTableCell19.StylePriority.UseTextAlignment = false; this.xrTableCell19.Text = "Anzahl"; - this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell19.Weight = 0.56661576319449147D; + this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell19.Weight = 0.787662911934029D; // // xrTableCell20 // - this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.xrTableCell20.StylePriority.UseBorders = false; this.xrTableCell20.StylePriority.UsePadding = false; this.xrTableCell20.StylePriority.UseTextAlignment = false; - this.xrTableCell20.Text = "Betrag"; - this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell20.Weight = 0.868849379705082D; + this.xrTableCell20.Text = "Gesamtpreis"; + this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell20.Weight = 0.9375620562650977D; // // xrTable1 // - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 25F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow9}); - this.xrTable1.SizeF = new System.Drawing.SizeF(656.9999F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(699.7082F, 25F); this.xrTable1.StylePriority.UseFont = false; // // xrTableRow9 // this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell6, this.xrTableCell7, this.xrTableCell9, this.lblSatz, @@ -498,27 +672,11 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableRow9.Name = "xrTableRow9"; this.xrTableRow9.Weight = 1D; // - // xrTableCell6 - // - this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriodStart", "{0:dd.MM.yyyy}")}); - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); - this.xrTableCell6.StylePriority.UseBorders = false; - this.xrTableCell6.StylePriority.UsePadding = false; - this.xrTableCell6.StylePriority.UseTextAlignment = false; - this.xrTableCell6.Text = "xrTableCell6"; - this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell6.Weight = 1D; - // // xrTableCell7 // - this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell7.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriodEnd", "{0:dd.MM.yyyy}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription", "{0:dd.MM.yyyy}")}); this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.xrTableCell7.StylePriority.UseBorders = false; @@ -526,12 +684,13 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell7.StylePriority.UseTextAlignment = false; this.xrTableCell7.Text = "xrTableCell7"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell7.Weight = 1D; + this.xrTableCell7.Weight = 2.6683547233570017D; // // xrTableCell9 // - this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell9.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriod")}); this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.xrTableCell9.StylePriority.UseBorders = false; @@ -539,193 +698,176 @@ namespace HphBersenbrueckFreizeitUndReisen this.xrTableCell9.StylePriority.UseTextAlignment = false; this.xrTableCell9.Text = "Fachleistungsstunden"; this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell9.Weight = 2.4035392027126012D; + this.xrTableCell9.Weight = 1.7351844793555995D; // // lblSatz // - this.lblSatz.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblSatz.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.lblSatz.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.AmountPerUnit", "{0:c}")}); this.lblSatz.Name = "lblSatz"; this.lblSatz.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.lblSatz.StylePriority.UseBorders = false; this.lblSatz.StylePriority.UsePadding = false; this.lblSatz.StylePriority.UseTextAlignment = false; - this.lblSatz.Text = "lblSatz"; - this.lblSatz.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.lblSatz.Weight = 0.83099566367780386D; + this.lblSatz.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.lblSatz.Weight = 0.97482013304640225D; // // lblAnzahl // - this.lblAnzahl.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblAnzahl.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.lblAnzahl.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.UnitCount", "{0:0.00}")}); this.lblAnzahl.Name = "lblAnzahl"; this.lblAnzahl.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.lblAnzahl.StylePriority.UseBorders = false; this.lblAnzahl.StylePriority.UsePadding = false; this.lblAnzahl.StylePriority.UseTextAlignment = false; - this.lblAnzahl.Text = "lblAnzahl"; - this.lblAnzahl.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.lblAnzahl.Weight = 0.56661514355294984D; + this.lblAnzahl.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.lblAnzahl.Weight = 0.7876617501060883D; // // lblBetrag // - this.lblBetrag.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblBetrag.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.lblBetrag.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.GrossAmount")}); this.lblBetrag.Name = "lblBetrag"; this.lblBetrag.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.lblBetrag.StylePriority.UseBorders = false; this.lblBetrag.StylePriority.UsePadding = false; this.lblBetrag.StylePriority.UseTextAlignment = false; this.lblBetrag.Text = "lblBetrag"; - this.lblBetrag.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.lblBetrag.Weight = 0.868849379705082D; + this.lblBetrag.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.lblBetrag.Weight = 0.93756197880989767D; // // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable4}); + this.lblAbschlusssatz, + this.xrLabel20, + this.xrLabel19, + this.xrLabel12}); this.ReportFooter.Font = new System.Drawing.Font("Arial", 9F); - this.ReportFooter.HeightF = 233.7083F; + this.ReportFooter.HeightF = 87.00003F; this.ReportFooter.Name = "ReportFooter"; + this.ReportFooter.StylePriority.UseBorderWidth = false; this.ReportFooter.StylePriority.UseFont = false; // - // xrTable4 + // xrLabel20 // - this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(571F, 0F); - this.xrTable4.Name = "xrTable4"; - this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow11}); - this.xrTable4.SizeF = new System.Drawing.SizeF(86F, 25F); + this.xrLabel20.BackColor = System.Drawing.Color.Transparent; + this.xrLabel20.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; + this.xrLabel20.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel20.BorderWidth = 5F; + this.xrLabel20.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(479.7083F, 35F); + this.xrLabel20.Multiline = true; + this.xrLabel20.Name = "xrLabel20"; + this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel20.SizeF = new System.Drawing.SizeF(220F, 25F); + this.xrLabel20.StylePriority.UseBackColor = false; + this.xrLabel20.StylePriority.UseBorderDashStyle = false; + this.xrLabel20.StylePriority.UseBorders = false; + this.xrLabel20.StylePriority.UseBorderWidth = false; + this.xrLabel20.StylePriority.UseFont = false; + this.xrLabel20.StylePriority.UseTextAlignment = false; + this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrLabel20.WordWrap = false; // - // xrTableRow11 + // xrLabel19 // - this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell23}); - this.xrTableRow11.Name = "xrTableRow11"; - this.xrTableRow11.Weight = 1D; + this.xrLabel19.BackColor = System.Drawing.Color.Transparent; + this.xrLabel19.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel19.BorderWidth = 2F; + this.xrLabel19.CanShrink = true; + this.xrLabel19.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 10F); + this.xrLabel19.Multiline = true; + this.xrLabel19.Name = "xrLabel19"; + this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel19.SizeF = new System.Drawing.SizeF(479.708F, 25F); + this.xrLabel19.StylePriority.UseBackColor = false; + this.xrLabel19.StylePriority.UseBorders = false; + this.xrLabel19.StylePriority.UseBorderWidth = false; + this.xrLabel19.StylePriority.UseFont = false; + this.xrLabel19.StylePriority.UseTextAlignment = false; + this.xrLabel19.Text = "Rechnungsbetrag:"; + this.xrLabel19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrLabel19.WordWrap = false; // - // xrTableCell23 + // xrLabel12 // - this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell23.BorderWidth = 2F; - this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.xrLabel12.BackColor = System.Drawing.Color.Transparent; + this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel12.BorderWidth = 2F; + this.xrLabel12.CanShrink = true; + this.xrLabel12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "GrossClaim")}); - this.xrTableCell23.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell23.Name = "xrTableCell23"; - this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); - this.xrTableCell23.StylePriority.UseBorders = false; - this.xrTableCell23.StylePriority.UseBorderWidth = false; - this.xrTableCell23.StylePriority.UseFont = false; - this.xrTableCell23.StylePriority.UsePadding = false; - this.xrTableCell23.StylePriority.UseTextAlignment = false; - this.xrTableCell23.Text = "[TotalClaim]"; - this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell23.Weight = 3D; + this.xrLabel12.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(479.7083F, 10F); + this.xrLabel12.Multiline = true; + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(220F, 25F); + this.xrLabel12.StylePriority.UseBackColor = false; + this.xrLabel12.StylePriority.UseBorders = false; + this.xrLabel12.StylePriority.UseBorderWidth = false; + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.StylePriority.UseTextAlignment = false; + this.xrLabel12.Text = "Freizeit & Reisen\r\nFamilienunterstützender Dienst\r\nFranz-Hecker-Straße 20\r\n49593 " + + "Bersenbrück"; + this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrLabel12.WordWrap = false; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.DetailReport1}); + this.DetailReport.DataMember = "ServiceInvoicePeriods"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // Detail1 + // + this.Detail1.HeightF = 0F; + this.Detail1.Name = "Detail1"; + // + // DetailReport1 + // + this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail2}); + this.DetailReport1.DataMember = "ServiceInvoicePeriods.ServiceInvoiceItems"; + this.DetailReport1.DataSource = this.bindingSource1; + this.DetailReport1.Level = 0; + this.DetailReport1.Name = "DetailReport1"; + // + // Detail2 + // + this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1}); + this.Detail2.HeightF = 25F; + this.Detail2.Name = "Detail2"; + // + // lblAbschlusssatz + // + this.lblAbschlusssatz.BackColor = System.Drawing.Color.Transparent; + this.lblAbschlusssatz.Font = new System.Drawing.Font("Arial", 8F); + this.lblAbschlusssatz.LocationFloat = new DevExpress.Utils.PointFloat(2.291667F, 60F); + this.lblAbschlusssatz.Multiline = true; + this.lblAbschlusssatz.Name = "lblAbschlusssatz"; + this.lblAbschlusssatz.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAbschlusssatz.SizeF = new System.Drawing.SizeF(699.7083F, 27.00003F); + this.lblAbschlusssatz.StylePriority.UseBackColor = false; + this.lblAbschlusssatz.StylePriority.UseFont = false; + this.lblAbschlusssatz.StylePriority.UseTextAlignment = false; + this.lblAbschlusssatz.WordWrap = false; // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // - // xrLabel14 - // - this.xrLabel14.BackColor = System.Drawing.Color.Transparent; - this.xrLabel14.CanShrink = true; - this.xrLabel14.Font = new System.Drawing.Font("Arial", 14.5F, System.Drawing.FontStyle.Bold); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(359.7083F, 334F); - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(280F, 33.66669F); - this.xrLabel14.StylePriority.UseBackColor = false; - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "Rechnung"; - this.xrLabel14.WordWrap = false; - // - // xrLabel15 - // - this.xrLabel15.BackColor = System.Drawing.Color.Transparent; - this.xrLabel15.CanShrink = true; - this.xrLabel15.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(359.7083F, 414.8333F); - this.xrLabel15.Multiline = true; - this.xrLabel15.Name = "xrLabel15"; - this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel15.SizeF = new System.Drawing.SizeF(340F, 32.83337F); - this.xrLabel15.StylePriority.UseBackColor = false; - this.xrLabel15.StylePriority.UseFont = false; - this.xrLabel15.StylePriority.UseTextAlignment = false; - this.xrLabel15.Text = "Debitoren-Nr. bitte bei Zahlungen unbedingt\r\nangeben!"; - this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrLabel15.WordWrap = false; - // - // xrLabel16 - // - this.xrLabel16.BackColor = System.Drawing.Color.Transparent; - this.xrLabel16.CanShrink = true; - this.xrLabel16.Font = new System.Drawing.Font("Arial", 8F); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(359.7083F, 458.5833F); - this.xrLabel16.Multiline = true; - this.xrLabel16.Name = "xrLabel16"; - this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel16.SizeF = new System.Drawing.SizeF(340F, 27.00003F); - this.xrLabel16.StylePriority.UseBackColor = false; - this.xrLabel16.StylePriority.UseFont = false; - this.xrLabel16.StylePriority.UseTextAlignment = false; - this.xrLabel16.Text = "Abrechnungszeitraum: [AccountingPeriod]"; - this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrLabel16.WordWrap = false; - // - // xrLabel17 - // - this.xrLabel17.BackColor = System.Drawing.Color.Transparent; - this.xrLabel17.CanShrink = true; - this.xrLabel17.Font = new System.Drawing.Font("Arial", 8F); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 397.8333F); - this.xrLabel17.Multiline = true; - this.xrLabel17.Name = "xrLabel17"; - this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel17.SizeF = new System.Drawing.SizeF(340F, 87.75F); - this.xrLabel17.StylePriority.UseBackColor = false; - this.xrLabel17.StylePriority.UseFont = false; - this.xrLabel17.StylePriority.UseTextAlignment = false; - this.xrLabel17.Text = "Freizeit & Reisen\r\nFamilienunterstützender Dienst\r\nFranz-Hecker-Straße 20\r\n49593 " + - "Bersenbrück"; - this.xrLabel17.WordWrap = false; - // - // xrLabel2 - // - this.xrLabel2.BackColor = System.Drawing.Color.Transparent; - this.xrLabel2.CanShrink = true; - this.xrLabel2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(165.1666F, 0F); - this.xrLabel2.Multiline = true; - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(340F, 32.83337F); - this.xrLabel2.StylePriority.UseBackColor = false; - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.StylePriority.UseTextAlignment = false; - this.xrLabel2.Text = "Der Rechnungsbetrag ist sofort fällig."; - this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrLabel2.WordWrap = false; - // - // xrLabel3 - // - this.xrLabel3.BackColor = System.Drawing.Color.Transparent; - this.xrLabel3.CanShrink = true; - this.xrLabel3.Font = new System.Drawing.Font("Arial", 8F); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 52.83335F); - this.xrLabel3.Multiline = true; - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(340F, 74.91669F); - this.xrLabel3.StylePriority.UseBackColor = false; - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.StylePriority.UseTextAlignment = false; - this.xrLabel3.Text = "OSNABRUECKER VOLKSBANK\r\nIBAN: DE63 2659 0025 0202 0300 00\r\nBIC: GENODEF1OSV"; - this.xrLabel3.WordWrap = false; - // // Rechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -735,10 +877,11 @@ namespace HphBersenbrueckFreizeitUndReisen this.bottomMarginBand1, this.GroupFooter, this.Page1, - this.ReportFooter}); + this.ReportFooter, + this.DetailReport}); this.DataSource = this.bindingSource1; this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; - this.Font = new System.Drawing.Font("Verdana", 10F); + this.Font = new System.Drawing.Font("Arial", 8F, 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, 50, 30, 129); @@ -749,7 +892,6 @@ namespace HphBersenbrueckFreizeitUndReisen ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -775,15 +917,11 @@ namespace HphBersenbrueckFreizeitUndReisen private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; private DevExpress.XtraReports.UI.XRTableCell lblSatz; private DevExpress.XtraReports.UI.XRTableCell lblAnzahl; private DevExpress.XtraReports.UI.XRTableCell lblBetrag; - private DevExpress.XtraReports.UI.XRTable xrTable4; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow11; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; private DevExpress.XtraReports.UI.XRLabel lblAdresse; private DevExpress.XtraReports.UI.XRLabel xrLabel18; private DevExpress.XtraReports.UI.XRTable xrTable2; @@ -808,5 +946,18 @@ namespace HphBersenbrueckFreizeitUndReisen private DevExpress.XtraReports.UI.XRLabel xrLabel16; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel xrLabel10; + private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel xrLabel6; + private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRLabel xrLabel19; + private DevExpress.XtraReports.UI.XRLabel xrLabel12; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; + private DevExpress.XtraReports.UI.DetailBand Detail2; + private DevExpress.XtraReports.UI.XRLabel xrLabel20; + private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2; + private DevExpress.XtraReports.UI.XRLabel lblAbschlusssatz; } } diff --git a/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.cs b/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.cs index 15847304c..112867ad1 100644 --- a/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.cs +++ b/ReportImp/HphBersenbrueckFreizeitUndReisen/Rechnung.cs @@ -16,9 +16,9 @@ namespace HphBersenbrueckFreizeitUndReisen public void SetReportDataSource(ServiceInvoiceRO pRO) { - decimal hourlyRate = 0; - decimal rateFactor = 1; - decimal hours = 0; + //decimal hourlyRate = 0; + //decimal rateFactor = 1; + //decimal hours = 0; StringBuilder sb = new StringBuilder(); @@ -44,6 +44,7 @@ namespace HphBersenbrueckFreizeitUndReisen } lblAdresse.Text = sb.ToString(); + String satz = ""; if (pRO.ServiceInvoicePeriods != null && pRO.ServiceInvoicePeriods.Count > 0) { foreach (var p in pRO.ServiceInvoicePeriods) @@ -54,22 +55,30 @@ namespace HphBersenbrueckFreizeitUndReisen foreach (var i in p.ServiceInvoiceItems) { - if (i.HourlyRate.HasValue) - { - hourlyRate = i.HourlyRate.Value; - - if (!String.IsNullOrEmpty(i.RateFactor)) - { - var rfStr = i.RateFactor.Replace("%", "").Replace(",00", "").Trim(); - int rfInt = 0; - Int32.TryParse(rfStr, out rfInt); - - rateFactor = (100m + rfInt) / 100m; - } + if (i.ServiceDescription == "Niedrigschwellige Betreuung") + { + satz = "Es handelt sich hierbei um ein Angebot zur Unterstützung im Alltag nach § 45 B SGB XI."; } + else if (i.ServiceDescription == "Verhinderungspflege") + { + satz = "Es handelt sich hierbei um ein Betreuungsangebot der Verhinderungspflege nach § 39 SGB XI."; + } + //if (i.HourlyRate.HasValue) + //{ + // hourlyRate = i.HourlyRate.Value; - if (i.Hours.HasValue) - hours += i.Hours.Value; + // if (!String.IsNullOrEmpty(i.RateFactor)) + // { + // var rfStr = i.RateFactor.Replace("%", "").Replace(",00", "").Trim(); + // int rfInt = 0; + // Int32.TryParse(rfStr, out rfInt); + + // rateFactor = (100m + rfInt) / 100m; + // } + //} + + //if (i.Hours.HasValue) + // hours += i.Hours.Value; @@ -79,11 +88,12 @@ namespace HphBersenbrueckFreizeitUndReisen } } - hours *= rateFactor; + lblAbschlusssatz.Text = satz; + //hours *= rateFactor; - lblSatz.Text = String.Format("{0:c}", hourlyRate); - lblAnzahl.Text = String.Format("{0:0.##}", hours); - lblBetrag.Text = String.Format("{0}", pRO.NetClaim); + //lblSatz.Text = String.Format("{0:c}", hourlyRate); + //lblAnzahl.Text = String.Format("{0:0.##}", hours); + //lblBetrag.Text = String.Format("{0}", pRO.NetClaim); //if (!String.IsNullOrEmpty(pRO.CustomerSalutation)) //{ diff --git a/ReportImp/LebenshilfeDuisburgAtz/RechnungIFF.cs b/ReportImp/LebenshilfeDuisburgAtz/RechnungIFF.cs index e80181d03..4fe12cb7c 100644 --- a/ReportImp/LebenshilfeDuisburgAtz/RechnungIFF.cs +++ b/ReportImp/LebenshilfeDuisburgAtz/RechnungIFF.cs @@ -22,7 +22,7 @@ namespace LebenshilfeDuisburgAtz { pRO.Notice = ""; - pRO.InvoiceNumber = pRO.InvoiceNumber.Replace("-IFF", "-FF"); + //pRO.InvoiceNumber = pRO.InvoiceNumber.Replace("-IFF", "-FF"); if (pRO.InvoiceDateTime.HasValue) pRO.Notice = String.Format("{0:dd.MM.yyyy}", pRO.InvoiceDateTime.Value.AddDays(30)); diff --git a/ReportImp/LebenshilfeFrankfurtOder/CustomReportCreator.cs b/ReportImp/LebenshilfeFrankfurtOder/CustomReportCreator.cs index 598c51545..3a1d14f80 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/CustomReportCreator.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/CustomReportCreator.cs @@ -141,7 +141,7 @@ namespace LebenshilfeFrankfurtOder { var cat = s.ServiceCategory.ToLower().Replace(" ", ""); - if (cat.Contains("hortangebot") && !s.ServiceDescription.Contains("Ferien")) + if (cat.Contains("alternativeshort") && !s.ServiceDescription.Contains("Ferien")) { s.Notice = ro.CustomerName; hortRo.Services.Add(s); @@ -525,7 +525,7 @@ namespace LebenshilfeFrankfurtOder var invoices2 = CreateAbrechnungEinzelfallhilfe(start, start.AddMonths(1).AddTicks(-1), customerOid, serviceCategoryOid); invoices.AddRange(invoices2); } - if (cat != null && cat.Name.Contains("Hortangebot")) + if (cat != null && cat.Name.Contains("Alternatives Hort")) { var invoices3 = CreateAbrechnungHortbetreuung(start, start.AddMonths(1).AddTicks(-1), customerOid, serviceCategoryOid); invoices.AddRange(invoices3); @@ -1087,7 +1087,7 @@ namespace LebenshilfeFrankfurtOder add = true; } - if (sd.ServiceCategory.Contains("Hortangebot")) + if (sd.ServiceCategory.Contains("Alternatives Hort")) { add = true; } diff --git a/ReportImp/LebenshilfeFrankfurtOder/Export/DatevExporter.cs b/ReportImp/LebenshilfeFrankfurtOder/Export/DatevExporter.cs index d267e9fca..f2d3e5842 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/Export/DatevExporter.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/Export/DatevExporter.cs @@ -796,7 +796,7 @@ Bsp. LK Stade - Mustermann, Max - 11.2019 { if (invoiceId.Contains("RechnungHort")) { - return "Alternatives Hortangebot"; + return "Alternatives Hort u. Ferienangebot"; } return itemDescription; } diff --git a/ReportImp/PflegedienstWessel/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs b/ReportImp/PflegedienstWessel/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs new file mode 100644 index 000000000..58084004f --- /dev/null +++ b/ReportImp/PflegedienstWessel/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using BeWo.Data.Entities; +using BeWo.Report.ReportObjects; + +using BS.Shared.Extensions; + + +namespace PflegedienstWessel +{ + public class CustomMitarbeiterstundenkontoBerechnungTagesansicht : CustomMitarbeiterstundenkontoBerechnung + { + //public override bool AddServiceRecordToDuration(ServiceRecord item) + //{ + // if (item.ServiceDescription != null && item.ServiceDescription.Name == "Pause") + // { + // return false; + // } + + // return true; + // } + + public override bool ShouldCreateDayDetails() + { + return true; + } + + public override MitarbeiterstundenkontoRO.DayDetail CreateDayDetail(DateTime date, MitarbeiterstundenkontoRO.EmployeeDetail ed) + { + var dd = base.CreateDayDetail(date, ed); + dd.MaxHoursUntilBreak = null; + dd.MaxHoursUntilBreak2 = null; + dd.BreakMinutes = null; + dd.BreakMinutes2 = null; + return dd; + } + } +} diff --git a/ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsListReport.Designer.cs b/ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsListReport.Designer.cs index b7ff8d3f5..364db4690 100644 --- a/ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsListReport.Designer.cs +++ b/ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsListReport.Designer.cs @@ -53,13 +53,9 @@ namespace PflegedienstWessel this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - 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(); this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); - this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); @@ -67,6 +63,9 @@ namespace PflegedienstWessel this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + 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.xrTable2)).BeginInit(); @@ -83,14 +82,13 @@ namespace PflegedienstWessel // xrTableCell1 // this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.EmployeeName")}); - this.xrTableCell1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.xrTableCell1.Font = new System.Drawing.Font("Arial", 12F); this.xrTableCell1.Name = "xrTableCell1"; this.xrTableCell1.StylePriority.UseBorderColor = false; this.xrTableCell1.StylePriority.UseBorders = false; this.xrTableCell1.StylePriority.UseFont = false; - this.xrTableCell1.Weight = 4.0816326530612246D; + this.xrTableCell1.Text = "[Employee.FirstName] [Employee.LastName]"; + this.xrTableCell1.Weight = 2.3604621877601404D; // // xrTableRow1 // @@ -103,34 +101,37 @@ namespace PflegedienstWessel // this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(420.3751F, 25F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(600F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(250.8751F, 25F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UsePadding = false; // // Detail1 // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel7, + this.xrLabel3, + this.xrLabel2, this.xrTable1}); this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Detail1.HeightF = 83F; + this.Detail1.HeightF = 70F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; // // xrLabel7 // this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.TotalDistanceInMeters", "Kilometer gesamt: {0:}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.TotalDistanceInMeters", "{0:0}")}); this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(210F, 0F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(280F, 25F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(69.99997F, 25F); this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.StylePriority.UseTextAlignment = false; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // // DetailReport // @@ -168,7 +169,7 @@ namespace PflegedienstWessel this.xrTable4.Name = "xrTable4"; this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow4}); - this.xrTable4.SizeF = new System.Drawing.SizeF(625.8302F, 25F); + this.xrTable4.SizeF = new System.Drawing.SizeF(671.2501F, 25F); this.xrTable4.StylePriority.UseBorders = false; this.xrTable4.StylePriority.UsePadding = false; // @@ -188,9 +189,11 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.Datum", "{0:dd.MM.yyyy}")}); this.xrTableCell3.Font = new System.Drawing.Font("Arial", 9.75F); this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; this.xrTableCell3.StylePriority.UseTextAlignment = false; - this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell3.Weight = 0.6802721055263049D; // // xrTableCell8 @@ -199,11 +202,13 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.TimeRange")}); this.xrTableCell8.Font = new System.Drawing.Font("Arial", 9.75F); this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UsePadding = false; this.xrTableCell8.StylePriority.UseTextAlignment = false; this.xrTableCell8.Text = "xrTableCell8"; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell8.Weight = 0.89285797658466393D; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell8.Weight = 0.74829932656970533D; // // xrTableCell4 // @@ -211,22 +216,26 @@ namespace PflegedienstWessel new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.DistanceInMeters", "{0:0.##}")}); this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F); this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UsePadding = false; this.xrTableCell4.StylePriority.UseTextAlignment = false; - this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell4.Weight = 1.028912291234853D; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell4.Weight = 0.47619048966676014D; // // xrTableCell9 // this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.CustomerName")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Employees2Entries.Entries.Dokumentation")}); this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell9.Multiline = true; this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 3, 3, 100F); this.xrTableCell9.StylePriority.UseFont = false; this.xrTableCell9.StylePriority.UsePadding = false; this.xrTableCell9.StylePriority.UseTextAlignment = false; - this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell9.Weight = 1.6553058235012754D; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell9.Weight = 2.6615653279250493D; // // GroupHeader2 // @@ -246,7 +255,7 @@ namespace PflegedienstWessel this.xrTable2.Name = "xrTable2"; this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTable2.SizeF = new System.Drawing.SizeF(625.83F, 25F); + this.xrTable2.SizeF = new System.Drawing.SizeF(671.25F, 25F); this.xrTable2.StylePriority.UseBorders = false; this.xrTable2.StylePriority.UseFont = false; this.xrTable2.StylePriority.UsePadding = false; @@ -275,15 +284,15 @@ namespace PflegedienstWessel this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.Text = "Uhrzeit"; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell2.Weight = 0.892857131771576D; + this.xrTableCell2.Weight = 0.74829931555620366D; // // xrTableCell6 // this.xrTableCell6.Name = "xrTableCell6"; this.xrTableCell6.StylePriority.UseTextAlignment = false; - this.xrTableCell6.Text = "gefahrene Kilometer"; + this.xrTableCell6.Text = "km"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell6.Weight = 1.0289115603020467D; + this.xrTableCell6.Weight = 0.476190446401453D; // // xrTableCell7 // @@ -291,56 +300,34 @@ namespace PflegedienstWessel this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); this.xrTableCell7.StylePriority.UsePadding = false; this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.Text = "Klient"; - this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell7.Weight = 1.6553060397102077D; + this.xrTableCell7.Text = "Fahrtstrecke"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell7.Weight = 2.6615644306276667D; // // GroupFooter1 // - this.GroupFooter1.HeightF = 0F; + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel1, + this.xrLabel7}); + this.GroupFooter1.HeightF = 38.54167F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand; // - // objectDataSource1 - // - this.objectDataSource1.DataSource = typeof(BeWo.Report.ReportObjects.EmployeeKilometerauswertungsListRO); - 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); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MonthInformation", "{0:MMMM yyyy}")}); + this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel2.SizeF = new System.Drawing.SizeF(280F, 25F); this.xrLabel2.StylePriority.UseFont = 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(600F, 25F); - this.xrLabel1.StyleName = "Title"; - this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.Text = "Auswertung über gefahrene Kilometer"; - // // pageFooterBand1 // this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrPageInfo2, - this.xrPageInfo1}); + this.xrPageInfo2}); this.pageFooterBand1.HeightF = 48F; this.pageFooterBand1.Name = "pageFooterBand1"; // @@ -350,21 +337,11 @@ namespace PflegedienstWessel this.xrPageInfo2.Format = "Seite {0} von {1}"; this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(382.5002F, 25F); this.xrPageInfo2.Name = "xrPageInfo2"; - this.xrPageInfo2.SizeF = new System.Drawing.SizeF(243.3297F, 23F); + this.xrPageInfo2.SizeF = new System.Drawing.SizeF(288.7497F, 23F); this.xrPageInfo2.StyleName = "PageInfo"; this.xrPageInfo2.StylePriority.UseFont = false; this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; // - // xrPageInfo1 - // - this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F); - this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); - this.xrPageInfo1.Name = "xrPageInfo1"; - this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; - this.xrPageInfo1.SizeF = new System.Drawing.SizeF(231.2501F, 23F); - this.xrPageInfo1.StyleName = "PageInfo"; - this.xrPageInfo1.StylePriority.UseFont = false; - // // Title // this.Title.BackColor = System.Drawing.Color.White; @@ -422,12 +399,45 @@ namespace PflegedienstWessel this.bottomMarginBand1.HeightF = 50F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrLabel1 + // + this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(110.0001F, 0F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(100F, 25F); + this.xrLabel1.StyleName = "Title"; + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.StylePriority.UsePadding = false; + this.xrLabel1.StylePriority.UseTextAlignment = false; + this.xrLabel1.Text = "Summe:"; + this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + // + // xrLabel3 + // + this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(301.2501F, 25F); + this.xrLabel3.Multiline = true; + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(119.125F, 25F); + this.xrLabel3.StyleName = "Title"; + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.StylePriority.UsePadding = false; + this.xrLabel3.StylePriority.UseTextAlignment = false; + this.xrLabel3.Text = "Mitarbeiter:in:"; + this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // objectDataSource1 + // + this.objectDataSource1.DataSource = typeof(BeWo.Report.ReportObjects.EmployeeKilometerauswertungsListRO); + this.objectDataSource1.Name = "objectDataSource1"; + // // EmployeeKilometerauswertungsListReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail, this.DetailReport, - this.ReportHeader, this.pageFooterBand1, this.topMarginBand1, this.bottomMarginBand1}); @@ -462,11 +472,8 @@ namespace PflegedienstWessel private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.DetailBand Detail1; private DevExpress.XtraReports.UI.DetailReportBand DetailReport; - private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; - private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1; private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2; - private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1; private DevExpress.XtraReports.UI.XRControlStyle Title; private DevExpress.XtraReports.UI.XRControlStyle FieldCaption; private DevExpress.XtraReports.UI.XRControlStyle PageInfo; @@ -493,5 +500,7 @@ namespace PflegedienstWessel private DevExpress.DataAccess.ObjectBinding.ObjectDataSource objectDataSource1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel3; } } diff --git a/ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsListReport.cs b/ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsListReport.cs index 869c0c28e..51a1aa297 100644 --- a/ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsListReport.cs +++ b/ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsListReport.cs @@ -1,3 +1,4 @@ +using System; using BeWo.Report; using BeWo.Report.ReportObjects; @@ -12,6 +13,23 @@ namespace PflegedienstWessel public void SetReportDataSource(EmployeeKilometerauswertungsListRO pRO) { + foreach (var e2e in pRO.Employees2Entries) + { + //e2e.EmployeeName = String.Format("{0} {1}", e2e.Employee.FirstName, e2e.Employee.LastName); + + foreach (var item in e2e.Entries) + { + if (item.ServiceRecord != null) + { + item.Dokumentation = item.ServiceRecord.Notice3; + } + else + { + item.Dokumentation = ""; + } + + } + } objectDataSource1.DataSource = pRO; } } diff --git a/ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsReport.cs b/ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsReport.cs index 6c8451982..f5947f137 100644 --- a/ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsReport.cs +++ b/ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsReport.cs @@ -13,8 +13,19 @@ namespace PflegedienstWessel public void SetReportDataSource(EmployeeKilometerauswertungsRO pRO) { pRO.CreateDistanceList(); - - objectDataSource1.DataSource = pRO; + foreach (var item in pRO.Entries) + { + + if (item.ServiceRecord != null) + { + item.Dokumentation = item.ServiceRecord.Notice3; + } + else + { + item.Dokumentation = ""; + } + } + objectDataSource1.DataSource = pRO; } } } diff --git a/ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsReport.designer.cs b/ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsReport.designer.cs index 428d589c5..1aae344ff 100644 --- a/ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsReport.designer.cs +++ b/ReportImp/PflegedienstWessel/EmployeeKilometerauswertungsReport.designer.cs @@ -32,31 +32,13 @@ namespace PflegedienstWessel this.components = new System.ComponentModel.Container(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); - this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); - this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell7 = 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(); this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); - this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); @@ -65,8 +47,29 @@ namespace PflegedienstWessel this.fieldGroupFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.objectDataSource1 = new DevExpress.DataAccess.ObjectBinding.ObjectDataSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -81,25 +84,14 @@ namespace PflegedienstWessel // Detail1 // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel13}); + this.xrTable1, + this.xrLabel3, + this.xrLabel4}); this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Detail1.HeightF = 46.16668F; + this.Detail1.HeightF = 70F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; // - // xrLabel13 - // - this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalDistanceInMeters", "Kilometer gesamt: {0:0.##}")}); - this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F); - this.xrLabel13.Name = "xrLabel13"; - this.xrLabel13.SizeF = new System.Drawing.SizeF(677.0001F, 25F); - this.xrLabel13.StylePriority.UseFont = false; - this.xrLabel13.StylePriority.UsePadding = false; - this.xrLabel13.StylePriority.UseTextAlignment = false; - this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -129,80 +121,12 @@ namespace PflegedienstWessel this.Detail2.KeepTogetherWithDetailReports = true; this.Detail2.Name = "Detail2"; // - // xrTable4 - // - this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable4.Name = "xrTable4"; - this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow4}); - this.xrTable4.SizeF = new System.Drawing.SizeF(625.8332F, 25F); - this.xrTable4.StylePriority.UseBorders = false; - this.xrTable4.StylePriority.UsePadding = false; - // - // xrTableRow4 - // - this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell3, - this.xrTableCell2, - this.xrTableCell4, - this.xrTableCell9}); - this.xrTableRow4.Name = "xrTableRow4"; - this.xrTableRow4.Weight = 1D; - // - // xrTableCell3 - // - this.xrTableCell3.CanGrow = false; - this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.Datum", "{0:dd.MM.yyyy}")}); - this.xrTableCell3.Font = new System.Drawing.Font("Arial", 9.75F); - this.xrTableCell3.Name = "xrTableCell3"; - this.xrTableCell3.StylePriority.UseFont = false; - this.xrTableCell3.StylePriority.UseTextAlignment = false; - this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell3.Weight = 0.6802721106538383D; - // - // xrTableCell2 - // - this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.TimeRange")}); - this.xrTableCell2.Font = new System.Drawing.Font("Arial", 9.75F); - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.StylePriority.UseFont = false; - this.xrTableCell2.StylePriority.UseTextAlignment = false; - this.xrTableCell2.Text = "xrTableCell2"; - this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell2.Weight = 0.89285569697781431D; - // - // xrTableCell4 - // - this.xrTableCell4.CanGrow = false; - this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.DistanceInMeters", "{0:0.##}")}); - this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F); - this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.StylePriority.UseFont = false; - this.xrTableCell4.StylePriority.UseTextAlignment = false; - this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell4.Weight = 1.028910120556823D; - // - // xrTableCell9 - // - this.xrTableCell9.CanGrow = false; - this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.CustomerName")}); - 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.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell9.Weight = 1.655330774159318D; - // // GroupFooter1 // - this.GroupFooter1.HeightF = 0F; + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel1, + this.xrLabel7}); + this.GroupFooter1.HeightF = 38.54167F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.PageBreak = DevExpress.XtraReports.UI.PageBreak.AfterBand; // @@ -214,109 +138,10 @@ namespace PflegedienstWessel this.GroupHeader2.Name = "GroupHeader2"; this.GroupHeader2.RepeatEveryPage = true; // - // xrTable2 - // - this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); - 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(625.8333F, 25F); - this.xrTable2.StylePriority.UseBorders = false; - this.xrTable2.StylePriority.UseFont = false; - this.xrTable2.StylePriority.UsePadding = false; - // - // xrTableRow2 - // - this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell5, - this.xrTableCell1, - this.xrTableCell6, - this.xrTableCell7}); - this.xrTableRow2.Name = "xrTableRow2"; - this.xrTableRow2.Weight = 1D; - // - // xrTableCell5 - // - this.xrTableCell5.CanGrow = false; - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.StylePriority.UseTextAlignment = false; - this.xrTableCell5.Text = "Datum"; - this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell5.Weight = 0.68027211517937214D; - // - // xrTableCell1 - // - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.StylePriority.UseTextAlignment = false; - this.xrTableCell1.Text = "Uhrzeit"; - this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell1.Weight = 0.89285652020261552D; - // - // xrTableCell6 - // - this.xrTableCell6.CanGrow = false; - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.StylePriority.UseTextAlignment = false; - this.xrTableCell6.Text = "gefahrene Kilometer"; - this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell6.Weight = 1.0289109483071579D; - // - // xrTableCell7 - // - this.xrTableCell7.CanGrow = false; - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); - this.xrTableCell7.StylePriority.UsePadding = false; - this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.Text = "Klient"; - this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell7.Weight = 1.6553300906804376D; - // - // 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.xrPageInfo2}); this.pageFooterBand1.HeightF = 48F; this.pageFooterBand1.Name = "pageFooterBand1"; // @@ -324,23 +149,13 @@ namespace PflegedienstWessel // this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); this.xrPageInfo2.Format = "Seite {0} von {1}"; - this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(382.4996F, 25F); + this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(427.9165F, 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; @@ -405,12 +220,234 @@ namespace PflegedienstWessel this.bottomMarginBand1.HeightF = 50F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrTable2 + // + this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + 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(671.25F, 25F); + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.StylePriority.UseFont = false; + this.xrTable2.StylePriority.UsePadding = false; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5, + this.xrTableCell1, + this.xrTableCell6, + this.xrTableCell7}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 1D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "Datum"; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell5.Weight = 0.68027211962967382D; + // + // xrTableCell1 + // + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.StylePriority.UseTextAlignment = false; + this.xrTableCell1.Text = "Uhrzeit"; + this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell1.Weight = 0.74829931555620366D; + // + // xrTableCell6 + // + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "km"; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell6.Weight = 0.476190446401453D; + // + // xrTableCell7 + // + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "Fahrtstrecke"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell7.Weight = 2.6615644306276667D; + // + // xrTable4 + // + this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow4}); + this.xrTable4.SizeF = new System.Drawing.SizeF(671.2501F, 25F); + this.xrTable4.StylePriority.UseBorders = false; + this.xrTable4.StylePriority.UsePadding = false; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell8, + this.xrTableCell4, + this.xrTableCell9}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 1D; + // + // xrTableCell3 + // + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.Datum", "{0:dd.MM.yyyy}")}); + this.xrTableCell3.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell3.Weight = 0.6802721055263049D; + // + // xrTableCell8 + // + this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.TimeRange")}); + this.xrTableCell8.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UsePadding = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.Text = "xrTableCell8"; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell8.Weight = 0.74829932656970533D; + // + // xrTableCell4 + // + this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.DistanceInMeters", "{0:0.##}")}); + this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UsePadding = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell4.Weight = 0.47619048966676014D; + // + // xrTableCell9 + // + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Entries.Dokumentation")}); + this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell9.Multiline = true; + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 3, 3, 100F); + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell9.Weight = 2.6615653279250493D; + // + // xrLabel1 + // + this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(110.0002F, 0F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(100F, 25F); + this.xrLabel1.StyleName = "Title"; + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.StylePriority.UsePadding = false; + this.xrLabel1.StylePriority.UseTextAlignment = false; + this.xrLabel1.Text = "Summe:"; + this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + // + // xrLabel7 + // + this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalDistanceInMeters", "{0:0}")}); + this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(210F, 0F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(69.99997F, 25F); + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.StylePriority.UseTextAlignment = false; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrLabel4 + // + this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "MonthInformation", "{0:MMMM yyyy}")}); + this.xrLabel4.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(280F, 25F); + this.xrLabel4.StylePriority.UseFont = false; + // + // xrTable1 + // + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(420.3751F, 25F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(250.875F, 25F); + this.xrTable1.StylePriority.UseBorders = false; + this.xrTable1.StylePriority.UsePadding = false; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell2}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 1D; + // + // xrTableCell2 + // + this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell2.Font = new System.Drawing.Font("Arial", 12F); + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.StylePriority.UseBorderColor = false; + this.xrTableCell2.StylePriority.UseBorders = false; + this.xrTableCell2.StylePriority.UseFont = false; + this.xrTableCell2.Text = "[Employee.FirstName] [Employee.LastName]"; + this.xrTableCell2.Weight = 2.3604621877601404D; + // + // xrLabel3 + // + this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(301.2502F, 25F); + this.xrLabel3.Multiline = true; + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(119.125F, 25F); + this.xrLabel3.StyleName = "Title"; + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.StylePriority.UsePadding = false; + this.xrLabel3.StylePriority.UseTextAlignment = false; + this.xrLabel3.Text = "Mitarbeiter:in:"; + this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // objectDataSource1 + // + this.objectDataSource1.DataSource = typeof(BeWo.Report.ReportObjects.EmployeeKilometerauswertungsRO); + this.objectDataSource1.Name = "objectDataSource1"; + // // EmployeeKilometerauswertungsReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail, this.DetailReport, - this.ReportHeader, this.pageFooterBand1, this.topMarginBand1, this.bottomMarginBand1}); @@ -430,8 +467,9 @@ namespace PflegedienstWessel this.PageInfo, this.DataField}); this.Version = "17.1"; - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.objectDataSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -442,29 +480,14 @@ namespace PflegedienstWessel private DevExpress.XtraReports.UI.DetailBand Detail; private DevExpress.XtraReports.UI.DetailBand Detail1; private DevExpress.XtraReports.UI.DetailReportBand DetailReport; - private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; - private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1; private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2; - private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1; private DevExpress.XtraReports.UI.XRControlStyle Title; private DevExpress.XtraReports.UI.XRControlStyle FieldCaption; private DevExpress.XtraReports.UI.XRControlStyle PageInfo; private DevExpress.XtraReports.UI.XRControlStyle DataField; - private DevExpress.XtraReports.UI.XRTable xrTable2; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; private DevExpress.XtraReports.UI.DetailBand Detail2; - private DevExpress.XtraReports.UI.XRTable xrTable4; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; - private DevExpress.XtraReports.UI.XRLabel xrLabel2; - private DevExpress.XtraReports.UI.XRLabel xrLabel13; private DevExpress.XtraReports.UI.CalculatedField fieldFLS; private DevExpress.XtraReports.UI.CalculatedField fieldGroupFLS; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; @@ -472,7 +495,24 @@ namespace PflegedienstWessel private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; private DevExpress.DataAccess.ObjectBinding.ObjectDataSource objectDataSource1; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTable xrTable4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRLabel xrLabel3; } } diff --git a/ReportImp/PflegedienstWessel/KilometerauswertungsListReport.Designer.cs b/ReportImp/PflegedienstWessel/KilometerauswertungsListReport.Designer.cs index d3ccd8c32..cf04788dd 100644 --- a/ReportImp/PflegedienstWessel/KilometerauswertungsListReport.Designer.cs +++ b/ReportImp/PflegedienstWessel/KilometerauswertungsListReport.Designer.cs @@ -290,7 +290,7 @@ namespace PflegedienstWessel this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.StylePriority.UsePadding = false; this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.Text = "Mitarbeiter"; + this.xrTableCell7.Text = "Mitarbeiter:in"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell7.Weight = 1.6553060397102077D; // diff --git a/ReportImp/PflegedienstWessel/KilometerauswertungsReport.designer.cs b/ReportImp/PflegedienstWessel/KilometerauswertungsReport.designer.cs index 832f08479..7e6f866c8 100644 --- a/ReportImp/PflegedienstWessel/KilometerauswertungsReport.designer.cs +++ b/ReportImp/PflegedienstWessel/KilometerauswertungsReport.designer.cs @@ -272,7 +272,7 @@ namespace PflegedienstWessel this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); this.xrTableCell7.StylePriority.UsePadding = false; this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.Text = "Mitarbeiter"; + this.xrTableCell7.Text = "Mitarbeiter:in"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell7.Weight = 1.6553300906804376D; // diff --git a/ReportImp/PflegedienstWessel/Mitarbeiterarbeitszeitkonto.cs b/ReportImp/PflegedienstWessel/Mitarbeiterarbeitszeitkonto.cs new file mode 100644 index 000000000..3e18a3f1c --- /dev/null +++ b/ReportImp/PflegedienstWessel/Mitarbeiterarbeitszeitkonto.cs @@ -0,0 +1,47 @@ + +using System; +using System.Collections.Generic; +using System.Linq; +using BeWo.Report; +using BeWo.Report.ReportObjects; + +using BS.Shared.Core; +using DevExpress.XtraReports.UI; + +namespace PflegedienstWessel +{ + [IDSpecificClass(Identifier = "Mitarbeiterarbeitszeitkonto")] + public partial class Mitarbeiterarbeitszeitkonto : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + + public Mitarbeiterarbeitszeitkonto() + { + InitializeComponent(); + } + + public void SetReportDataSource(MitarbeiterstundenkontoRO pRO) + { + var msb = new CustomMitarbeiterstundenkontoBerechnungTagesansicht(); + msb.CreateReport(pRO); + + foreach (var ed in pRO.EmployeeDetailList) + { + var c = ed.Employee.GetValidContractForDate(pRO.ReportStartDate); + if (c != null) + { + if (c.MonthlyTotalHours.HasValue) + { + ed.Regelarbeitszeit = String.Format("{0:0.00} Stunden im Monat", c.MonthlyTotalHours); + } + else if (c.WeeklyTotalHours.HasValue) + { + ed.Regelarbeitszeit = String.Format("{0:0.00} Stunden pro Woche", c.WeeklyTotalHours); + } + } + + } + this.bindingSource1.DataSource = pRO; + } + + } +} diff --git a/ReportImp/PflegedienstWessel/Mitarbeiterarbeitszeitkonto.designer.cs b/ReportImp/PflegedienstWessel/Mitarbeiterarbeitszeitkonto.designer.cs new file mode 100644 index 000000000..b7f84c953 --- /dev/null +++ b/ReportImp/PflegedienstWessel/Mitarbeiterarbeitszeitkonto.designer.cs @@ -0,0 +1,1101 @@ +using BeWo.Report.ReportObjects; +namespace PflegedienstWessel +{ + partial class Mitarbeiterarbeitszeitkonto + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary(); + this.Detail = new DevExpress.XtraReports.UI.DetailBand(); + this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell67 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); + this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); + this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); + this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.lblMonat = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellRegelarbeitszeit = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell64 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellSumMinutesTotalDecimal = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellSumHoursSickDecimal = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellSumHoursInVacationDecimal = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellSumMinutesTotalDecimal2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell55 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.sollStundenMonatLabelTableCell = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); + this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); + this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); + this.DataField = new DevExpress.XtraReports.UI.XRControlStyle(); + this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); + this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.fieldSumSpecial = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldSumSonntag = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldSumFeiertag = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldHours = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldSick = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldVacation = new DevExpress.XtraReports.UI.CalculatedField(); + this.calculatedField1 = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldSumHours = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldSumHoliday2 = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField(); + this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); + // + // Detail + // + this.Detail.HeightF = 0F; + this.Detail.Name = "Detail"; + this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // Detail1 + // + this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.HeightF = 0F; + this.Detail1.Name = "Detail1"; + this.Detail1.StylePriority.UseFont = false; + // + // xrTableDetail + // + this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableDetail.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTableDetail.Name = "xrTableDetail"; + this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRowDetail}); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(670F, 22F); + this.xrTableDetail.StylePriority.UseBorders = false; + this.xrTableDetail.StylePriority.UseFont = false; + this.xrTableDetail.StylePriority.UsePadding = false; + this.xrTableDetail.StylePriority.UseTextAlignment = false; + this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRowDetail + // + this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3, + this.xrTableCell20, + this.xrTableCell31, + this.xrTableCell67, + this.xrTableCell27}); + this.xrTableRowDetail.Name = "xrTableRowDetail"; + this.xrTableRowDetail.Weight = 0.88D; + // + // xrTableCell3 + // + this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.Date", "{0:ddd. dd.MM.}")}); + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UseFont = false; + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.StylePriority.UseTextAlignment = false; + this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell3.Weight = 0.090171325518485154D; + this.xrTableCell3.XlsxFormatString = "ddd. dd.MM.yyyy"; + // + // xrTableCell20 + // + this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.ZeitraeumeString", "{0:HH:mm}")}); + this.xrTableCell20.Name = "xrTableCell20"; + this.xrTableCell20.Text = "xrTableCell20"; + this.xrTableCell20.Weight = 0.27051398343498156D; + // + // xrTableCell31 + // + this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldHours", "{0:0.00}")}); + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.StylePriority.UseTextAlignment = false; + this.xrTableCell31.Text = "xrTableCell31"; + this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell31.Weight = 0.08115419554645896D; + // + // xrTableCell67 + // + this.xrTableCell67.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.HoursSick", "{0:0.00}")}); + this.xrTableCell67.Name = "xrTableCell67"; + this.xrTableCell67.StylePriority.UseTextAlignment = false; + this.xrTableCell67.Text = "xrTableCell67"; + this.xrTableCell67.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell67.Weight = 0.081154197266340475D; + // + // xrTableCell27 + // + this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.HoursInVacation", "{0:0.00}")}); + this.xrTableCell27.Name = "xrTableCell27"; + this.xrTableCell27.StylePriority.UseTextAlignment = false; + this.xrTableCell27.Text = "xrTableCell27"; + this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell27.Weight = 0.08115417920758361D; + // + // DetailReport + // + this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail1, + this.DetailReport1}); + this.DetailReport.DataMember = "EmployeeDetailList"; + this.DetailReport.DataSource = this.bindingSource1; + this.DetailReport.Level = 0; + this.DetailReport.Name = "DetailReport"; + // + // DetailReport1 + // + this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail2, + this.GroupHeader2, + this.GroupHeader3, + this.GroupFooter2}); + this.DetailReport1.DataMember = "EmployeeDetailList.Days"; + this.DetailReport1.DataSource = this.bindingSource1; + this.DetailReport1.Level = 0; + this.DetailReport1.Name = "DetailReport1"; + // + // Detail2 + // + this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableDetail}); + this.Detail2.Font = new System.Drawing.Font("Arial", 8F); + this.Detail2.HeightF = 22F; + this.Detail2.Name = "Detail2"; + this.Detail2.StylePriority.UseFont = false; + // + // GroupHeader2 + // + this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTableHeader}); + this.GroupHeader2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.GroupHeader2.HeightF = 30F; + this.GroupHeader2.Name = "GroupHeader2"; + this.GroupHeader2.StylePriority.UseFont = false; + // + // xrTableHeader + // + this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTableHeader.Name = "xrTableHeader"; + this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRowHeader}); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(670F, 30F); + this.xrTableHeader.StylePriority.UseBackColor = false; + this.xrTableHeader.StylePriority.UseBorders = false; + this.xrTableHeader.StylePriority.UseFont = false; + this.xrTableHeader.StylePriority.UsePadding = false; + this.xrTableHeader.StylePriority.UseTextAlignment = false; + this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRowHeader + // + this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5, + this.xrTableCell2, + this.xrTableCell7, + this.xrTableCell8, + this.xrTableCell10}); + this.xrTableRowHeader.Name = "xrTableRowHeader"; + this.xrTableRowHeader.Weight = 0.79999999999999982D; + // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "Datum"; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell5.Weight = 0.090171325629990237D; + // + // xrTableCell2 + // + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "Uhrzeit"; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell2.Weight = 0.27051397637806085D; + // + // xrTableCell7 + // + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "Stunden"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell7.Weight = 0.081154194025935031D; + // + // xrTableCell8 + // + this.xrTableCell8.Multiline = true; + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.Text = "Krank"; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell8.Weight = 0.081154199562331691D; + // + // xrTableCell10 + // + this.xrTableCell10.Multiline = true; + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.StylePriority.UseBackColor = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + this.xrTableCell10.Text = "Urlaub"; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell10.Weight = 0.0811541853775325D; + // + // GroupHeader3 + // + this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblMonat, + this.xrTable2}); + this.GroupHeader3.Font = new System.Drawing.Font("Arial", 10F); + this.GroupHeader3.HeightF = 120F; + this.GroupHeader3.Level = 1; + this.GroupHeader3.Name = "GroupHeader3"; + this.GroupHeader3.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand; + this.GroupHeader3.StylePriority.UseFont = false; + // + // lblMonat + // + this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yy}")}); + this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); + this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.lblMonat.Multiline = true; + this.lblMonat.Name = "lblMonat"; + this.lblMonat.SizeF = new System.Drawing.SizeF(700.0001F, 25F); + this.lblMonat.StyleName = "Title"; + this.lblMonat.StylePriority.UseFont = false; + this.lblMonat.Text = "lblMonat"; + // + // xrTable2 + // + this.xrTable2.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 47.91663F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1, + this.xrTableRow8, + this.xrTableRow10}); + this.xrTable2.SizeF = new System.Drawing.SizeF(552.2002F, 54F); + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.StylePriority.UseFont = false; + this.xrTable2.StylePriority.UsePadding = false; + this.xrTable2.StylePriority.UseTextAlignment = false; + this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1, + this.xrTableCell25}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 0.75540991165010141D; + // + // xrTableCell1 + // + this.xrTableCell1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.StylePriority.UsePadding = false; + this.xrTableCell1.StylePriority.UseTextAlignment = false; + this.xrTableCell1.Text = "Mitarbeiter/in:"; + this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell1.Weight = 0.138246012405208D; + // + // xrTableCell25 + // + this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")}); + this.xrTableCell25.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell25.Multiline = true; + this.xrTableCell25.Name = "xrTableCell25"; + this.xrTableCell25.StylePriority.UseFont = false; + this.xrTableCell25.StylePriority.UseTextAlignment = false; + this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell25.Weight = 0.49791629021026568D; + // + // xrTableRow8 + // + this.xrTableRow8.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell6, + this.cellRegelarbeitszeit}); + this.xrTableRow8.Name = "xrTableRow8"; + this.xrTableRow8.Weight = 0.75540991165010141D; + // + // xrTableCell6 + // + this.xrTableCell6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell6.StylePriority.UseFont = false; + this.xrTableCell6.StylePriority.UsePadding = false; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "Regelarbeitszeit:"; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell6.Weight = 0.138246012405208D; + // + // cellRegelarbeitszeit + // + this.cellRegelarbeitszeit.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Regelarbeitszeit")}); + this.cellRegelarbeitszeit.Name = "cellRegelarbeitszeit"; + this.cellRegelarbeitszeit.StylePriority.UseFont = false; + this.cellRegelarbeitszeit.StylePriority.UseTextAlignment = false; + this.cellRegelarbeitszeit.Text = "cellRegelarbeitszeit"; + this.cellRegelarbeitszeit.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.cellRegelarbeitszeit.Weight = 0.49791629021026573D; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell21, + this.xrTableCell24, + this.xrTableCell28, + this.xrTableCell23}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.Weight = 0.75540991165010141D; + // + // xrTableCell21 + // + this.xrTableCell21.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell21.StylePriority.UseFont = false; + this.xrTableCell21.StylePriority.UsePadding = false; + this.xrTableCell21.StylePriority.UseTextAlignment = false; + this.xrTableCell21.Text = "Soll-Stunden:"; + this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell21.Weight = 0.138246012405208D; + // + // xrTableCell24 + // + this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")}); + this.xrTableCell24.Name = "xrTableCell24"; + this.xrTableCell24.StylePriority.UseTextAlignment = false; + this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell24.Weight = 0.17215478017129932D; + // + // xrTableCell28 + // + this.xrTableCell28.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.StylePriority.UseFont = false; + this.xrTableCell28.StylePriority.UseTextAlignment = false; + this.xrTableCell28.Text = "Arbeitstage diesen Monat:"; + this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell28.Weight = 0.213129273221085D; + // + // xrTableCell23 + // + this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.ArbeitstageImBerichtszeitraum", "{0:0}")}); + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.StylePriority.UseFont = false; + this.xrTableCell23.StylePriority.UseTextAlignment = false; + this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell23.Weight = 0.11263223681788141D; + // + // GroupFooter2 + // + this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable4, + this.xrTable1}); + this.GroupFooter2.Font = new System.Drawing.Font("Arial", 10F); + this.GroupFooter2.HeightF = 85F; + this.GroupFooter2.KeepTogether = true; + this.GroupFooter2.Name = "GroupFooter2"; + this.GroupFooter2.StylePriority.UseFont = false; + // + // xrTable4 + // + this.xrTable4.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(110F, 0F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow9}); + this.xrTable4.SizeF = new System.Drawing.SizeF(560F, 22F); + this.xrTable4.StylePriority.UseBorders = false; + this.xrTable4.StylePriority.UseFont = false; + this.xrTable4.StylePriority.UsePadding = false; + this.xrTable4.StylePriority.UseTextAlignment = false; + this.xrTable4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow9 + // + this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell64, + this.cellSumMinutesTotalDecimal, + this.cellSumHoursSickDecimal, + this.cellSumHoursInVacationDecimal}); + this.xrTableRow9.Name = "xrTableRow9"; + this.xrTableRow9.Weight = 0.87999999999999978D; + // + // xrTableCell64 + // + this.xrTableCell64.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell64.Name = "xrTableCell64"; + this.xrTableCell64.StylePriority.UseFont = false; + this.xrTableCell64.StylePriority.UseTextAlignment = false; + this.xrTableCell64.Text = "Summe:"; + this.xrTableCell64.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell64.Weight = 0.26149405118689462D; + // + // cellSumMinutesTotalDecimal + // + this.cellSumMinutesTotalDecimal.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldHours")}); + this.cellSumMinutesTotalDecimal.Name = "cellSumMinutesTotalDecimal"; + this.cellSumMinutesTotalDecimal.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:0.00}"; + xrSummary1.IgnoreNullValues = true; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.cellSumMinutesTotalDecimal.Summary = xrSummary1; + this.cellSumMinutesTotalDecimal.Text = "cellSumMinutesTotalDecimal"; + this.cellSumMinutesTotalDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellSumMinutesTotalDecimal.Weight = 0.081153321921416444D; + // + // cellSumHoursSickDecimal + // + this.cellSumHoursSickDecimal.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.HoursSick")}); + this.cellSumHoursSickDecimal.Multiline = true; + this.cellSumHoursSickDecimal.Name = "cellSumHoursSickDecimal"; + this.cellSumHoursSickDecimal.StylePriority.UseTextAlignment = false; + xrSummary2.FormatString = "{0:0.00}"; + xrSummary2.IgnoreNullValues = true; + xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.cellSumHoursSickDecimal.Summary = xrSummary2; + this.cellSumHoursSickDecimal.Text = "cellSumHoursSickDecimal"; + this.cellSumHoursSickDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellSumHoursSickDecimal.Weight = 0.081153328404945282D; + // + // cellSumHoursInVacationDecimal + // + this.cellSumHoursInVacationDecimal.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.HoursInVacation")}); + this.cellSumHoursInVacationDecimal.Multiline = true; + this.cellSumHoursInVacationDecimal.Name = "cellSumHoursInVacationDecimal"; + this.cellSumHoursInVacationDecimal.StylePriority.UseBackColor = false; + this.cellSumHoursInVacationDecimal.StylePriority.UseTextAlignment = false; + xrSummary3.FormatString = "{0:0.00}"; + xrSummary3.IgnoreNullValues = true; + xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.cellSumHoursInVacationDecimal.Summary = xrSummary3; + this.cellSumHoursInVacationDecimal.Text = "cellSumHoursInVacationDecimal"; + this.cellSumHoursInVacationDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellSumHoursInVacationDecimal.Weight = 0.081153321723263658D; + // + // xrTable1 + // + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 25F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow4, + this.xrTableRow5, + this.xrTableRow6}); + this.xrTable1.SizeF = new System.Drawing.SizeF(669.9999F, 60F); + this.xrTable1.StylePriority.UseBorders = false; + this.xrTable1.StylePriority.UseFont = false; + this.xrTable1.StylePriority.UsePadding = false; + this.xrTable1.StylePriority.UseTextAlignment = false; + this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell46, + this.cellSumMinutesTotalDecimal2, + this.xrTableCell17, + this.xrTableCell15, + this.xrTableCell41, + this.xrTableCell55}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 0.8D; + // + // xrTableCell46 + // + this.xrTableCell46.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); + this.xrTableCell46.Name = "xrTableCell46"; + this.xrTableCell46.StylePriority.UseBorders = false; + this.xrTableCell46.StylePriority.UseTextAlignment = false; + this.xrTableCell46.Text = "Arbeitszeit:"; + this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell46.Weight = 0.0899362101431268D; + // + // cellSumMinutesTotalDecimal2 + // + this.cellSumMinutesTotalDecimal2.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.cellSumMinutesTotalDecimal2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldHours")}); + this.cellSumMinutesTotalDecimal2.Name = "cellSumMinutesTotalDecimal2"; + this.cellSumMinutesTotalDecimal2.StylePriority.UseBorders = false; + this.cellSumMinutesTotalDecimal2.StylePriority.UseTextAlignment = false; + xrSummary4.FormatString = "{0:0.00}"; + xrSummary4.IgnoreNullValues = true; + xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.cellSumMinutesTotalDecimal2.Summary = xrSummary4; + this.cellSumMinutesTotalDecimal2.Text = "cellSumMinutesTotalDecimal2"; + this.cellSumMinutesTotalDecimal2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.cellSumMinutesTotalDecimal2.Weight = 0.071948964683863317D; + // + // xrTableCell17 + // + this.xrTableCell17.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.StylePriority.UseBorders = false; + this.xrTableCell17.StylePriority.UseTextAlignment = false; + this.xrTableCell17.Text = "Überstunden neu:"; + this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell17.Weight = 0.14389792524594167D; + // + // xrTableCell15 + // + this.xrTableCell15.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")}); + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.StylePriority.UseBorders = false; + this.xrTableCell15.StylePriority.UseTextAlignment = false; + this.xrTableCell15.Text = "xrTableCell15"; + this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell15.Weight = 0.0719489609431911D; + // + // xrTableCell41 + // + this.xrTableCell41.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTableCell41.Name = "xrTableCell41"; + this.xrTableCell41.StylePriority.UseBorders = false; + this.xrTableCell41.StylePriority.UseTextAlignment = false; + this.xrTableCell41.Text = "Überstunden Gesamt:"; + this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell41.Weight = 0.14389779473226938D; + // + // xrTableCell55 + // + this.xrTableCell55.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell55.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.fieldUeberstundenGesamt", "{0:0.00}")}); + this.xrTableCell55.Name = "xrTableCell55"; + this.xrTableCell55.StylePriority.UseBorders = false; + this.xrTableCell55.StylePriority.UseTextAlignment = false; + this.xrTableCell55.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell55.Weight = 0.080942610501736539D; + // + // xrTableRow5 + // + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.sollStundenMonatLabelTableCell, + this.xrTableCell50, + this.xrTableCell51, + this.xrTableCell18, + this.xrTableCell11, + this.xrTableCell13}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 0.8D; + // + // sollStundenMonatLabelTableCell + // + this.sollStundenMonatLabelTableCell.Borders = DevExpress.XtraPrinting.BorderSide.Left; + this.sollStundenMonatLabelTableCell.Name = "sollStundenMonatLabelTableCell"; + this.sollStundenMonatLabelTableCell.StylePriority.UseBorders = false; + this.sollStundenMonatLabelTableCell.StylePriority.UseTextAlignment = false; + this.sollStundenMonatLabelTableCell.Text = "Soll-Stunden:"; + this.sollStundenMonatLabelTableCell.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.sollStundenMonatLabelTableCell.Weight = 0.0899362025013637D; + // + // xrTableCell50 + // + this.xrTableCell50.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")}); + this.xrTableCell50.Name = "xrTableCell50"; + this.xrTableCell50.StylePriority.UseBorders = false; + this.xrTableCell50.StylePriority.UseTextAlignment = false; + this.xrTableCell50.Text = "xrTableCell50"; + this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell50.Weight = 0.071948963831937288D; + // + // xrTableCell51 + // + this.xrTableCell51.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell51.Name = "xrTableCell51"; + this.xrTableCell51.StylePriority.UseBorders = false; + this.xrTableCell51.StylePriority.UseFont = false; + this.xrTableCell51.StylePriority.UseTextAlignment = false; + this.xrTableCell51.Text = "Überstunden Vormonat:"; + this.xrTableCell51.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell51.Weight = 0.14389792921032482D; + // + // xrTableCell18 + // + this.xrTableCell18.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")}); + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.StylePriority.UseBorders = false; + this.xrTableCell18.StylePriority.UseTextAlignment = false; + this.xrTableCell18.Text = "xrTableCell18"; + this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell18.Weight = 0.071948964692321912D; + // + // xrTableCell11 + // + this.xrTableCell11.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.StylePriority.UseBorders = false; + this.xrTableCell11.StylePriority.UseTextAlignment = false; + this.xrTableCell11.Text = "davon ausbezahlt:"; + this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell11.Weight = 0.14389779185300228D; + // + // xrTableCell13 + // + this.xrTableCell13.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenAusbezahlt", "{0:0.00}")}); + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.StylePriority.UseBorders = false; + this.xrTableCell13.StylePriority.UseTextAlignment = false; + this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell13.Weight = 0.0809426141611789D; + // + // xrTableRow6 + // + this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell48, + this.xrTableCell57, + this.xrTableCell58, + this.xrTableCell26, + this.xrTableCell12, + this.xrTableCell14}); + this.xrTableRow6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrTableRow6.Name = "xrTableRow6"; + this.xrTableRow6.StylePriority.UseFont = false; + this.xrTableRow6.Weight = 0.8D; + // + // xrTableCell48 + // + this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell48.Name = "xrTableCell48"; + this.xrTableCell48.StylePriority.UseBorders = false; + this.xrTableCell48.StylePriority.UseFont = false; + this.xrTableCell48.StylePriority.UseTextAlignment = false; + this.xrTableCell48.Text = "Differenz:"; + this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell48.Weight = 0.0899362025013648D; + // + // xrTableCell57 + // + this.xrTableCell57.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell57.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")}); + this.xrTableCell57.Name = "xrTableCell57"; + this.xrTableCell57.StylePriority.UseBorders = false; + this.xrTableCell57.StylePriority.UseFont = false; + this.xrTableCell57.StylePriority.UseTextAlignment = false; + this.xrTableCell57.Text = "xrTableCell57"; + this.xrTableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell57.Weight = 0.071948963831938426D; + // + // xrTableCell58 + // + this.xrTableCell58.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell58.Name = "xrTableCell58"; + this.xrTableCell58.StylePriority.UseBorders = false; + this.xrTableCell58.StylePriority.UseFont = false; + this.xrTableCell58.StylePriority.UseTextAlignment = false; + this.xrTableCell58.Text = "Überstunden Gesamt:"; + this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell58.Weight = 0.14389792921032421D; + // + // xrTableCell26 + // + this.xrTableCell26.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.fieldUeberstundenGesamt", "{0:0.00}")}); + this.xrTableCell26.Name = "xrTableCell26"; + this.xrTableCell26.StylePriority.UseBorders = false; + this.xrTableCell26.StylePriority.UseTextAlignment = false; + this.xrTableCell26.Text = "xrTableCell26"; + this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell26.Weight = 0.071948964692321371D; + // + // xrTableCell12 + // + this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.StylePriority.UseBorders = false; + this.xrTableCell12.StylePriority.UseFont = false; + this.xrTableCell12.StylePriority.UseTextAlignment = false; + this.xrTableCell12.Text = "Übertrag Folgemonat:"; + this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell12.Weight = 0.14389779185300169D; + // + // xrTableCell14 + // + this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")}); + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.StylePriority.UseBorders = false; + this.xrTableCell14.StylePriority.UseTextAlignment = false; + this.xrTableCell14.Text = "xrTableCell14"; + this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell14.Weight = 0.080942614161178317D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + // + // 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"; + // + // topMarginBand1 + // + this.topMarginBand1.HeightF = 50F; + this.topMarginBand1.Name = "topMarginBand1"; + // + // bottomMarginBand1 + // + this.bottomMarginBand1.HeightF = 50F; + this.bottomMarginBand1.Name = "bottomMarginBand1"; + // + // fieldSumSpecial + // + this.fieldSumSpecial.DataMember = "EmployeeDetailList.Days"; + this.fieldSumSpecial.Expression = "Sum([SpecialHours])"; + this.fieldSumSpecial.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldSumSpecial.Name = "fieldSumSpecial"; + // + // fieldSumSonntag + // + this.fieldSumSonntag.DataMember = "EmployeeDetailList.Days"; + this.fieldSumSonntag.Expression = "Sum([HoursSunday])"; + this.fieldSumSonntag.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldSumSonntag.Name = "fieldSumSonntag"; + // + // fieldSumFeiertag + // + this.fieldSumFeiertag.DataMember = "EmployeeDetailList.Days"; + this.fieldSumFeiertag.Expression = "Sum([HoursHoliday])"; + this.fieldSumFeiertag.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldSumFeiertag.Name = "fieldSumFeiertag"; + // + // fieldHours + // + this.fieldHours.DataMember = "EmployeeDetailList.Days"; + this.fieldHours.Expression = "[MinutesTotal]/60"; + this.fieldHours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldHours.Name = "fieldHours"; + // + // fieldSick + // + this.fieldSick.DataMember = "EmployeeDetailList.Days"; + this.fieldSick.Expression = "Iif([HoursSick] > 0, \'x\', \'\')"; + this.fieldSick.FieldType = DevExpress.XtraReports.UI.FieldType.String; + this.fieldSick.Name = "fieldSick"; + // + // fieldVacation + // + this.fieldVacation.DataMember = "EmployeeDetailList.Days"; + this.fieldVacation.Expression = "Iif([HoursInVacation] > 0, \'x\', \'\')"; + this.fieldVacation.FieldType = DevExpress.XtraReports.UI.FieldType.String; + this.fieldVacation.Name = "fieldVacation"; + // + // calculatedField1 + // + this.calculatedField1.DataMember = "EmployeeDetailList.Days"; + this.calculatedField1.DisplayName = "fieldSumSamstag"; + this.calculatedField1.Expression = "Sum([HoursSaturday])"; + this.calculatedField1.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.calculatedField1.Name = "calculatedField1"; + // + // fieldSumHours + // + this.fieldSumHours.DataMember = "EmployeeDetailList.Days"; + this.fieldSumHours.Expression = "Sum([MinutesTotal]/60)"; + this.fieldSumHours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldSumHours.Name = "fieldSumHours"; + // + // fieldSumHoliday2 + // + this.fieldSumHoliday2.DataMember = "EmployeeDetailList.Days"; + this.fieldSumHoliday2.Expression = "Sum([HoursHoliday2])"; + this.fieldSumHoliday2.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldSumHoliday2.Name = "fieldSumHoliday2"; + // + // fieldIstArbeitszeit + // + this.fieldIstArbeitszeit.DataMember = "EmployeeDetailList"; + this.fieldIstArbeitszeit.Expression = "[StundenGesamtIst]+[UeberstundenVormonat]"; + this.fieldIstArbeitszeit.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldIstArbeitszeit.Name = "fieldIstArbeitszeit"; + // + // fieldUeberstundenGesamt + // + this.fieldUeberstundenGesamt.DataMember = "EmployeeDetailList"; + this.fieldUeberstundenGesamt.Expression = "Iif([Ueberstunden] == ?, 0, [Ueberstunden])+Iif([UeberstundenVormonat] == ?, 0," + + " [UeberstundenVormonat])"; + this.fieldUeberstundenGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; + this.fieldUeberstundenGesamt.Name = "fieldUeberstundenGesamt"; + // + // Mitarbeiterarbeitszeitkonto + // + this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { + this.Detail, + this.DetailReport, + this.topMarginBand1, + this.bottomMarginBand1}); + this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { + this.fieldSumSpecial, + this.fieldSumSonntag, + this.fieldSumFeiertag, + this.fieldHours, + this.fieldSick, + this.fieldVacation, + this.calculatedField1, + this.fieldSumHours, + this.fieldSumHoliday2, + this.fieldIstArbeitszeit, + this.fieldUeberstundenGesamt}); + this.DataSource = this.bindingSource1; + this.DisplayName = "Mitarbeiterstundenkonto"; + this.Font = new System.Drawing.Font("Arial", 8F); + this.Margins = new System.Drawing.Printing.Margins(75, 50, 50, 50); + this.PageHeight = 1169; + this.PageWidth = 827; + this.PaperKind = System.Drawing.Printing.PaperKind.A4; + this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] { + this.Title, + this.FieldCaption, + this.PageInfo, + this.DataField}); + this.Version = "17.1"; + ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); + + } + + #endregion + + private DevExpress.XtraReports.UI.DetailBand Detail; + private System.Windows.Forms.BindingSource bindingSource1; + private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport; + private DevExpress.XtraReports.UI.XRControlStyle Title; + private DevExpress.XtraReports.UI.XRControlStyle FieldCaption; + private DevExpress.XtraReports.UI.XRControlStyle PageInfo; + private DevExpress.XtraReports.UI.XRControlStyle DataField; + private DevExpress.XtraReports.UI.XRTable xrTableHeader; + private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTable xrTableDetail; + private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; + private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; + private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell27; + private DevExpress.XtraReports.UI.XRTable xrTable1; + private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; + private DevExpress.XtraReports.UI.DetailBand Detail2; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; + private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader3; + private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell50; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell51; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell57; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell58; + private DevExpress.XtraReports.UI.CalculatedField fieldSumSpecial; + private DevExpress.XtraReports.UI.CalculatedField fieldSumSonntag; + private DevExpress.XtraReports.UI.CalculatedField fieldSumFeiertag; + private DevExpress.XtraReports.UI.CalculatedField fieldHours; + private DevExpress.XtraReports.UI.CalculatedField fieldSick; + private DevExpress.XtraReports.UI.CalculatedField fieldVacation; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell46; + private DevExpress.XtraReports.UI.XRTableCell sollStundenMonatLabelTableCell; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; + private DevExpress.XtraReports.UI.XRTableCell cellSumMinutesTotalDecimal2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell41; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell55; + private DevExpress.XtraReports.UI.CalculatedField calculatedField1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.CalculatedField fieldSumHours; + private DevExpress.XtraReports.UI.CalculatedField fieldSumHoliday2; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell25; + private DevExpress.XtraReports.UI.XRTable xrTable4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow9; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell64; + private DevExpress.XtraReports.UI.XRTableCell cellSumMinutesTotalDecimal; + private DevExpress.XtraReports.UI.XRTableCell cellSumHoursSickDecimal; + private DevExpress.XtraReports.UI.XRTableCell cellSumHoursInVacationDecimal; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell67; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; + private DevExpress.XtraReports.UI.CalculatedField fieldIstArbeitszeit; + private DevExpress.XtraReports.UI.XRLabel lblMonat; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell cellRegelarbeitszeit; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; + private DevExpress.XtraReports.UI.CalculatedField fieldUeberstundenGesamt; + } +} diff --git a/ReportImp/PflegedienstWessel/Mitarbeiterarbeitszeitkonto.resx b/ReportImp/PflegedienstWessel/Mitarbeiterarbeitszeitkonto.resx new file mode 100644 index 000000000..d25f3eba2 --- /dev/null +++ b/ReportImp/PflegedienstWessel/Mitarbeiterarbeitszeitkonto.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/ReportImp/PflegedienstWessel/PflegedienstWessel.csproj b/ReportImp/PflegedienstWessel/PflegedienstWessel.csproj index ad736f8c0..a25e8d917 100644 --- a/ReportImp/PflegedienstWessel/PflegedienstWessel.csproj +++ b/ReportImp/PflegedienstWessel/PflegedienstWessel.csproj @@ -35,6 +35,7 @@ + @@ -80,6 +81,12 @@ KilometerauswertungsReport.cs + + Component + + + Mitarbeiterarbeitszeitkonto.cs + Component @@ -87,6 +94,7 @@ Mitarbeiterstundenkonto.cs + Component @@ -106,6 +114,7 @@ Quittierungsbeleg.cs + Component @@ -152,6 +161,9 @@ KilometerauswertungsReport.cs + + Mitarbeiterarbeitszeitkonto.cs + Mitarbeiterstundenkonto.cs Designer diff --git a/ReportImp/PflegedienstWessel/Service/CustomStundenuebersichtAuswertung.cs b/ReportImp/PflegedienstWessel/Service/CustomStundenuebersichtAuswertung.cs new file mode 100644 index 000000000..0680b9a86 --- /dev/null +++ b/ReportImp/PflegedienstWessel/Service/CustomStundenuebersichtAuswertung.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.Core; +using BeWo.Service.DCEntityMapper; +using BeWo.Service.MessageContracts; +using BeWo.Service.Plugins; +using BS.Shared; +using BS.Shared.Core; +using BS.Shared.DataContracts; +using BS.Shared.Extensions; +using BS.Shared.Services; +using Utils = BS.Shared.Core.Utils; + +namespace PflegedienstWessel.Service +{ + public class CustomStundenuebersichtAuswertung : StundenuebersichtAuswertung + { + //protected override ServiceRecordFLSOverviewDC CreateServiceRecordFLSOverviewDC(ServiceRecord sr, bool useGroupInfo, bool useRoundedDuration, bool showGroupMinutes) + //{ + // var dc = base.CreateServiceRecordFLSOverviewDC(sr, useGroupInfo, useRoundedDuration, showGroupMinutes); + + // if (dc.ServiceDescription.Category.Percentage < 100) + // { + // dc.RoundedDuration *= dc.ServiceDescription.Category.Percentage / 100; + // } + // return dc; + //} + + } +} diff --git a/ReportImp/PflegedienstWessel/Validation/CustomServiceRecordValidator.cs b/ReportImp/PflegedienstWessel/Validation/CustomServiceRecordValidator.cs index ebaedcace..e7ae48f33 100644 --- a/ReportImp/PflegedienstWessel/Validation/CustomServiceRecordValidator.cs +++ b/ReportImp/PflegedienstWessel/Validation/CustomServiceRecordValidator.cs @@ -17,7 +17,25 @@ namespace PflegedienstWessel.Validation { public class CustomServiceRecordValidator : ServiceRecordValidator { - public override ServiceRecordValidationResultDC CheckOverlappingCustomerServiceRecords(ServiceRecordDC newServiceRecord, DateTime start, + public override List ValidateServiceRecord(ServiceRecordDC newServiceRecord, SupportConceptStatisticsDC statistics, + int maxDaysEditServiceRecordsAllowed, IList employeeOids, IList cb2scOids) + { + var list = base.ValidateServiceRecord(newServiceRecord, statistics, maxDaysEditServiceRecordsAllowed, employeeOids, cb2scOids); + + if (newServiceRecord.ServiceDescription.Category.IsBillable && newServiceRecord.RoundedDuration == 0) + { + + list.Add(new ServiceRecordValidationResultDC + { + ResultType = ServiceRecordValidationResult.Custom, + Message = "Die Dauer darf nicht 0 sein." + }); + + } + + return list; + } + public override ServiceRecordValidationResultDC CheckOverlappingCustomerServiceRecords(ServiceRecordDC newServiceRecord, DateTime start, IList allCustomerRecords, bool isGroupRecord, decimal roundedDuration) { diff --git a/ReportImp/SeWo/Translation/TranslationDictionary.cs b/ReportImp/SeWo/Translation/TranslationDictionary.cs index d914517c7..9ebb57363 100644 --- a/ReportImp/SeWo/Translation/TranslationDictionary.cs +++ b/ReportImp/SeWo/Translation/TranslationDictionary.cs @@ -40,6 +40,15 @@ namespace SeWo.Translation AddOrReplaceTranslation(dict, "Alle Klienten", "Alle Kunden"); AddOrReplaceTranslation(dict, "Nur meine Klienten anzeigen", "Nur meine Kunden anzeigen"); AddOrReplaceTranslation(dict, "Nur Klienten meiner Teams anzeigen", "Nur Kunden meiner Teams anzeigen"); + + AddOrReplaceTranslation(dict, "Diesem Klienten zugeordnete Behinderungen", "Diesem Kunden zugeordnete Behinderungen"); + AddOrReplaceTranslation(dict, "Diesem Klienten zugeordnete Betreuer", "Diesem Kunden zugeordnete Betreuer"); + AddOrReplaceTranslation(dict, "Diesem Klienten zugeordnete Teams", "Diesem Kunden zugeordnete Teams"); + AddOrReplaceTranslation(dict, "Diesem Klienten zugeordnete Personen", "Diesem Kunden zugeordnete Personen"); + AddOrReplaceTranslation(dict, "Diesem Klienten zugeordnete Organisationen", "Diesem Kunden zugeordnete Organisationen"); + AddOrReplaceTranslation(dict, "Diesem Klienten zugeordnete Angehörige", "Diesem Kunden zugeordnete Angehörige"); + + return dict; } } diff --git a/Service/Plugins/StundenuebersichtAuswertung.cs b/Service/Plugins/StundenuebersichtAuswertung.cs index f825c9214..261fba3c2 100644 --- a/Service/Plugins/StundenuebersichtAuswertung.cs +++ b/Service/Plugins/StundenuebersichtAuswertung.cs @@ -130,7 +130,7 @@ namespace BeWo.Service.Plugins } if (cont) { - ServiceRecordFLSOverviewDC srDC = CreateServiceRecordFLSOverviewDC(sr, true, true); + ServiceRecordFLSOverviewDC srDC = CreateServiceRecordFLSOverviewDC(sr, true, true, false); if (sr.GroupOid != null) { @@ -277,7 +277,7 @@ namespace BeWo.Service.Plugins } if (cont) { - ServiceRecordFLSOverviewDC srDC = CreateServiceRecordFLSOverviewDC(sr, false, true); + ServiceRecordFLSOverviewDC srDC = CreateServiceRecordFLSOverviewDC(sr, false, true, false); if (sr.GroupOid != null && sr.CostBearer2SupportConceptOid != null) { String key = String.Format("{0}_{1}", sr.GroupOid, sr.CostBearer2SupportConceptOid); @@ -413,7 +413,7 @@ namespace BeWo.Service.Plugins //{ // notarchived += sr.RoundedDuration; //} - ServiceRecordFLSOverviewDC srDC = CreateServiceRecordFLSOverviewDC(sr, false, settings.ShowRoundedDurationInEmployeeAnalysis); + ServiceRecordFLSOverviewDC srDC = CreateServiceRecordFLSOverviewDC(sr, false, settings.ShowRoundedDurationInEmployeeAnalysis, false); if (sr.CostBearer2SupportConceptOid != null) { @@ -549,7 +549,7 @@ namespace BeWo.Service.Plugins } if (cont) { - ServiceRecordFLSOverviewDC srDC = CreateServiceRecordFLSOverviewDC(sr, true, useRoundedDuration); + ServiceRecordFLSOverviewDC srDC = CreateServiceRecordFLSOverviewDC(sr, true, useRoundedDuration, true); if (srDC.GroupRoundedDuration != null && useRoundedDuration) { @@ -666,7 +666,7 @@ namespace BeWo.Service.Plugins return rootDC; } - private ServiceRecordFLSOverviewDC CreateServiceRecordFLSOverviewDC(ServiceRecord sr, bool useGroupInfo, bool useRoundedDuration) + protected virtual ServiceRecordFLSOverviewDC CreateServiceRecordFLSOverviewDC(ServiceRecord sr, bool useGroupInfo, bool useRoundedDuration, bool showGroupMinutes) { ServiceRecordFLSOverviewDC srDC = new ServiceRecordFLSOverviewDC(); @@ -703,6 +703,28 @@ namespace BeWo.Service.Plugins srDC.GroupRoundedDuration = sr.GroupRoundedDuration; srDC.GroupOid = sr.GroupOid; } + + var durationInString = srDC.RoundedDuration; // Das wird hier unterschieden, weil je nach Auswertung entweder die Dauer der Gruppe (bei Auswertung nach Mitarbeiter) oder der Anteil der Gesamtdauer (bei Auswertung nach Klient) angezeigt werden soll + + if (srDC.GroupOid.HasValue && srDC.GroupRoundedDuration.HasValue && showGroupMinutes) + { + durationInString = srDC.GroupRoundedDuration.Value; + } + + + if (srDC.Start != null && srDC.Start.Value.Second == 0) + { + srDC.TimeRange = String.Format("{0:HH:mm}-{1:HH:mm} ({2:0.##} min.)", srDC.Start, srDC.End, durationInString); + + } + else + { + srDC.TimeRange = String.Format("{0:0.##} min.", durationInString); + } + + srDC.DateTimeRange = String.Format("{0:dd.MM.} {1}", srDC.Start, srDC.TimeRange); + //srDC.TimeRange = srDC.Start.Value.ToShortTimeString() + "-" + srDC.Start.Value.AddMinutes((double)srDC.RoundedDuration).ToShortTimeString() + " (" + (int)srDC.RoundedDuration + " min.)"; + return srDC; } diff --git a/Shared/DataContracts/ServiceRecordFLSOverviewDC.cs b/Shared/DataContracts/ServiceRecordFLSOverviewDC.cs index 642f21474..d8903a725 100644 --- a/Shared/DataContracts/ServiceRecordFLSOverviewDC.cs +++ b/Shared/DataContracts/ServiceRecordFLSOverviewDC.cs @@ -68,5 +68,11 @@ namespace BS.Shared.DataContracts [DataMember] public DateTime? InsertedOn { get; set; } + + [DataMember] + public string TimeRange { get; set; } + + [DataMember] + public string DateTimeRange { get; set; } } } \ No newline at end of file