From 75b1d82abf500d74358740789ac1442e31f4789e Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 27 Feb 2026 12:04:40 +0100 Subject: [PATCH] =?UTF-8?q?VSDHammReports/ServicesOverviewReport=20-=20Erg?= =?UTF-8?q?=C3=A4nzung=20Spalten=20f=C3=BCr=20Gruppenbuchungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServicesOverviewReport.Designer.cs | 215 +++++++++++++----- .../VSDHammReports/ServicesOverviewReport.cs | 15 +- .../ServicesOverviewReport.resx | 6 +- 3 files changed, 170 insertions(+), 66 deletions(-) diff --git a/ReportImp/VSDHammReports/ServicesOverviewReport.Designer.cs b/ReportImp/VSDHammReports/ServicesOverviewReport.Designer.cs index 5667032c9..0e351e232 100644 --- a/ReportImp/VSDHammReports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/VSDHammReports/ServicesOverviewReport.Designer.cs @@ -29,6 +29,8 @@ namespace VSDHammReports private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Stundenzettel)); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -48,7 +50,6 @@ namespace VSDHammReports this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -95,17 +96,23 @@ namespace VSDHammReports this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblGruppenangebot = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail // this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableServiceRecords1}); - this.Detail.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold); + this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Bold); this.Detail.HeightF = 40F; this.Detail.Name = "Detail"; this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -122,7 +129,7 @@ namespace VSDHammReports this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(725F, 40F); + this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(746.8725F, 40F); this.xrTableServiceRecords1.StylePriority.UseBackColor = false; this.xrTableServiceRecords1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // @@ -133,6 +140,8 @@ namespace VSDHammReports this.xrTableCell4, this.xrTableCell11, this.xrTableCell10, + this.xrTableCell22, + this.xrTableCell21, this.xrTableCell14, this.xrTableCell9}); this.xrTableRow2.Name = "xrTableRow2"; @@ -144,19 +153,21 @@ namespace VSDHammReports // this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell3.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell3.Name = "xrTableCell3"; this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); this.xrTableCell3.StylePriority.UseBorders = false; this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.Text = "Datum"; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell3.Weight = 0.13786604536890385D; + this.xrTableCell3.Weight = 0.11029283588404962D; // // xrTableCell4 // this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrTableCell4.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell4.Multiline = true; this.xrTableCell4.Name = "xrTableCell4"; this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); @@ -164,20 +175,21 @@ namespace VSDHammReports this.xrTableCell4.StylePriority.UseTextAlignment = false; this.xrTableCell4.Text = "Uhrzeit\r\nvon ... bis"; this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell4.Weight = 0.15992460045810764D; + this.xrTableCell4.Weight = 0.13235141200994277D; // // xrTableCell11 // this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell11.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); this.xrTableCell11.StylePriority.UseBorders = false; this.xrTableCell11.StylePriority.UseTextAlignment = false; this.xrTableCell11.Text = "Anzahl Minuten"; this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell11.Weight = 0.10460579889752718D; + this.xrTableCell11.Weight = 0.10459897249182815D; // // xrTableCell10 // @@ -186,9 +198,9 @@ namespace VSDHammReports this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.StylePriority.UseBorders = false; this.xrTableCell10.StylePriority.UseTextAlignment = false; - this.xrTableCell10.Text = "Mitarbeiter/in"; + this.xrTableCell10.Text = "Anz Ma"; this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell10.Weight = 0.16543929224747928D; + this.xrTableCell10.Weight = 0.055148129146549346D; // // xrTableCell14 // @@ -199,20 +211,21 @@ namespace VSDHammReports this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.Text = "Leistungsart"; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell14.Weight = 0.20421413723058499D; + this.xrTableCell14.Weight = 0.17922586354321246D; // // xrTableCell9 // this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell9.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); this.xrTableCell9.StylePriority.UseBorders = false; this.xrTableCell9.StylePriority.UseTextAlignment = false; this.xrTableCell9.Text = "Unterschrift Klient/in (1)"; this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell9.Weight = 0.22747896962336264D; + this.xrTableCell9.Weight = 0.22747899066005198D; // // DetailReport // @@ -229,7 +242,7 @@ namespace VSDHammReports // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable1}); - this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.Detail1.HeightF = 25F; this.Detail1.Name = "Detail1"; this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -242,7 +255,7 @@ namespace VSDHammReports this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(725F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(746.8725F, 25F); // // xrTableRow1 // @@ -250,6 +263,8 @@ namespace VSDHammReports this.xrTableCell2, this.xrTableCell7, this.xrTableCell5, + this.xrTableCell23, + this.xrTableCell24, this.xrTableCell12, this.xrTableCell15, this.xrTableCell6}); @@ -262,53 +277,53 @@ namespace VSDHammReports | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd.MM.yyyy}")}); - this.xrTableCell2.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell2.Name = "xrTableCell2"; this.xrTableCell2.StylePriority.UseBorders = false; 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.38965287996376435D; + this.xrTableCell2.Weight = 0.3117222687554374D; // // xrTableCell7 // this.xrTableCell7.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrTableCell7.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.StylePriority.UseBorders = false; this.xrTableCell7.StylePriority.UseFont = false; this.xrTableCell7.StylePriority.UseTextAlignment = false; this.xrTableCell7.Text = "[TimeRangeString]"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell7.Weight = 0.45199738466069844D; + this.xrTableCell7.Weight = 0.37406695182131711D; // // xrTableCell5 // this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell5.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell5.Name = "xrTableCell5"; this.xrTableCell5.StylePriority.UseBorders = false; this.xrTableCell5.StylePriority.UseFont = false; this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "[Minutes]"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell5.Weight = 0.29564903069143506D; + this.xrTableCell5.Weight = 0.29562952596320768D; // // xrTableCell12 // this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeAbbr")}); - this.xrTableCell12.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell12.Name = "xrTableCell12"; this.xrTableCell12.StylePriority.UseBorders = false; this.xrTableCell12.StylePriority.UseFont = false; this.xrTableCell12.StylePriority.UseTextAlignment = false; this.xrTableCell12.Text = "xrTableCell12"; this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell12.Weight = 0.46758347426899355D; + this.xrTableCell12.Weight = 0.46758323644373262D; // // xrTableCell15 // @@ -319,28 +334,24 @@ namespace VSDHammReports this.xrTableCell15.StylePriority.UseBorders = false; this.xrTableCell15.StylePriority.UseTextAlignment = false; this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell15.Weight = 0.57717358911446581D; + this.xrTableCell15.Weight = 0.50654899964806233D; // // xrTableCell6 // this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell6.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell6.Name = "xrTableCell6"; this.xrTableCell6.StylePriority.UseBorders = false; this.xrTableCell6.StylePriority.UseFont = false; this.xrTableCell6.StylePriority.UseTextAlignment = false; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell6.Weight = 0.6429272199567827D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + this.xrTableCell6.Weight = 0.64292745778204352D; // // xrTableCell16 // this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServicesDouble.CostBearer")}); - this.xrTableCell16.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell16.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrTableCell16.Name = "xrTableCell16"; this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell16.StylePriority.UseFont = false; @@ -352,7 +363,7 @@ namespace VSDHammReports // this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServicesDouble.EmployeeName")}); - this.xrTableCell17.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell17.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrTableCell17.Name = "xrTableCell17"; this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell17.StylePriority.UseFont = false; @@ -389,6 +400,7 @@ namespace VSDHammReports | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblGruppenangebot, this.xrTable2, this.xrLabel14, this.rechnungsDatum, @@ -397,7 +409,7 @@ namespace VSDHammReports this.xrLabel5, this.xrLabel3, this.xrLabel4}); - this.Detail2.HeightF = 168.9583F; + this.Detail2.HeightF = 212.7083F; this.Detail2.KeepTogether = true; this.Detail2.Name = "Detail2"; this.Detail2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -411,7 +423,7 @@ namespace VSDHammReports this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow3, this.xrTableRow4}); - this.xrTable2.SizeF = new System.Drawing.SizeF(724.9999F, 50F); + this.xrTable2.SizeF = new System.Drawing.SizeF(746.8724F, 50F); // // xrTableRow3 // @@ -425,7 +437,7 @@ namespace VSDHammReports // xrTableCell8 // this.xrTableCell8.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrTableCell8.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold); + this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell8.Name = "xrTableCell8"; this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F); this.xrTableCell8.StylePriority.UseBorders = false; @@ -434,7 +446,7 @@ namespace VSDHammReports this.xrTableCell8.StylePriority.UseTextAlignment = false; this.xrTableCell8.Text = "Summe Fachleistungen"; this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell8.Weight = 0.84164981293591612D; + this.xrTableCell8.Weight = 0.68578888148906914D; // // summeMinuten // @@ -444,25 +456,25 @@ namespace VSDHammReports this.summeMinuten.BorderWidth = 2F; this.summeMinuten.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMoFehlkontakte")}); - this.summeMinuten.Font = new System.Drawing.Font("Arial", 9.75F); + this.summeMinuten.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.summeMinuten.Name = "summeMinuten"; this.summeMinuten.StylePriority.UseBorders = false; this.summeMinuten.StylePriority.UseBorderWidth = false; this.summeMinuten.StylePriority.UseFont = false; this.summeMinuten.StylePriority.UseTextAlignment = false; this.summeMinuten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.summeMinuten.Weight = 0.29564908998873107D; + this.summeMinuten.Weight = 0.29562964777286804D; // // xrTableCell13 // this.xrTableCell13.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrTableCell13.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell13.Name = "xrTableCell13"; this.xrTableCell13.StylePriority.UseBorders = false; this.xrTableCell13.StylePriority.UseFont = false; this.xrTableCell13.StylePriority.UseTextAlignment = false; this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell13.Weight = 1.6876843144819413D; + this.xrTableCell13.Weight = 1.9287916338336095D; // // xrTableRow4 // @@ -476,7 +488,8 @@ namespace VSDHammReports // xrTableCell18 // this.xrTableCell18.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrTableCell18.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell18.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell18.Name = "xrTableCell18"; this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 5, 0, 0, 100F); this.xrTableCell18.StylePriority.UseBorders = false; @@ -485,7 +498,7 @@ namespace VSDHammReports this.xrTableCell18.StylePriority.UseTextAlignment = false; this.xrTableCell18.Text = "Summe Fehlkontakte"; this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell18.Weight = 0.84164981293591612D; + this.xrTableCell18.Weight = 0.68578888148906914D; // // xrTableCell19 // @@ -495,7 +508,7 @@ namespace VSDHammReports this.xrTableCell19.BorderWidth = 2F; this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte")}); - this.xrTableCell19.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell19.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell19.Name = "xrTableCell19"; this.xrTableCell19.StylePriority.UseBorders = false; this.xrTableCell19.StylePriority.UseBorderWidth = false; @@ -503,23 +516,23 @@ namespace VSDHammReports this.xrTableCell19.StylePriority.UseTextAlignment = false; this.xrTableCell19.Text = "xrTableCell19"; this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell19.Weight = 0.29564908998873107D; + this.xrTableCell19.Weight = 0.29562964777286804D; // // xrTableCell20 // this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); - this.xrTableCell20.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell20.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.StylePriority.UseBorders = false; this.xrTableCell20.StylePriority.UseFont = false; this.xrTableCell20.StylePriority.UseTextAlignment = false; this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell20.Weight = 1.6876843144819413D; + this.xrTableCell20.Weight = 1.9287916338336095D; // // xrLabel14 // this.xrLabel14.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel14.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 84.83335F); this.xrLabel14.Multiline = true; this.xrLabel14.Name = "xrLabel14"; @@ -534,7 +547,7 @@ namespace VSDHammReports // rechnungsDatum // this.rechnungsDatum.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.rechnungsDatum.Font = new System.Drawing.Font("Arial", 10F); + this.rechnungsDatum.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.rechnungsDatum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 60.83337F); this.rechnungsDatum.Multiline = true; this.rechnungsDatum.Name = "rechnungsDatum"; @@ -548,7 +561,7 @@ namespace VSDHammReports // xrLabel12 // this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel12.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(468.1122F, 84.83335F); this.xrLabel12.Multiline = true; this.xrLabel12.Name = "xrLabel12"; @@ -574,7 +587,7 @@ namespace VSDHammReports // xrLabel5 // this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel5.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(149.7917F, 84.83335F); this.xrLabel5.Multiline = true; this.xrLabel5.Name = "xrLabel5"; @@ -600,11 +613,11 @@ namespace VSDHammReports // xrLabel4 // this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 9F); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 122.2916F); this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(717F, 46.66672F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(746.87F, 20F); this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.StylePriority.UseTextAlignment = false; this.xrLabel4.Text = "(1) Betreuungskontakte können zeitnah einzeln (in der jeweiligen Zeile) oder gesa" + @@ -632,7 +645,7 @@ namespace VSDHammReports this.xrLabel6, this.xrLabel1, this.xrLabel15}); - this.ReportHeader.Font = new System.Drawing.Font("Arial", 11F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.ReportHeader.HeightF = 297.2917F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; @@ -651,7 +664,7 @@ namespace VSDHammReports // // lblYear // - this.lblYear.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.lblYear.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); this.lblYear.LocationFloat = new DevExpress.Utils.PointFloat(260.9044F, 256.4166F); this.lblYear.Multiline = true; this.lblYear.Name = "lblYear"; @@ -676,7 +689,7 @@ namespace VSDHammReports // // xrLabel17 // - this.xrLabel17.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 256.4166F); this.xrLabel17.Multiline = true; this.xrLabel17.Name = "xrLabel17"; @@ -837,7 +850,7 @@ namespace VSDHammReports // // xrLabel1 // - this.xrLabel1.Font = new System.Drawing.Font("Arial", 13F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 13F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; @@ -891,6 +904,79 @@ namespace VSDHammReports this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrTableCell21 + // + this.xrTableCell21.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell21.Multiline = true; + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.StylePriority.UseBorders = false; + this.xrTableCell21.StylePriority.UseTextAlignment = false; + this.xrTableCell21.Text = "Mitarbeiter/in"; + this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell21.Weight = 0.16543925880078528D; + // + // xrTableCell22 + // + this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell22.Multiline = true; + this.xrTableCell22.Name = "xrTableCell22"; + this.xrTableCell22.StylePriority.UseBorders = false; + this.xrTableCell22.StylePriority.UseTextAlignment = false; + this.xrTableCell22.Text = "Anz Tn"; + this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell22.Weight = 0.055148129146549346D; + // + // xrTableCell23 + // + this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice4")}); + this.xrTableCell23.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.xrTableCell23.Multiline = true; + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.StylePriority.UseBorders = false; + this.xrTableCell23.StylePriority.UseFont = false; + this.xrTableCell23.StylePriority.UseTextAlignment = false; + this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell23.Weight = 0.15586627773186562D; + // + // xrTableCell24 + // + this.xrTableCell24.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")}); + this.xrTableCell24.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.xrTableCell24.Multiline = true; + this.xrTableCell24.Name = "xrTableCell24"; + this.xrTableCell24.StylePriority.UseBorders = false; + this.xrTableCell24.StylePriority.UseFont = false; + this.xrTableCell24.StylePriority.UseTextAlignment = false; + this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell24.Weight = 0.15586568316871341D; + // + // lblGruppenangebot + // + this.lblGruppenangebot.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.lblGruppenangebot.Font = new DevExpress.Drawing.DXFont("Arial", 9F); + this.lblGruppenangebot.LocationFloat = new DevExpress.Utils.PointFloat(0.002479553F, 152.7083F); + this.lblGruppenangebot.Multiline = true; + this.lblGruppenangebot.Name = "lblGruppenangebot"; + this.lblGruppenangebot.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblGruppenangebot.SizeF = new System.Drawing.SizeF(746.87F, 60F); + this.lblGruppenangebot.StylePriority.UseFont = false; + this.lblGruppenangebot.StylePriority.UseTextAlignment = false; + this.lblGruppenangebot.Text = resources.GetString("lblGruppenangebot.Text"); + this.lblGruppenangebot.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.lblGruppenangebot.Visible = false; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -906,15 +992,17 @@ namespace VSDHammReports this.formattingRuleServiceDesc, this.formattingRuleCostBearer, this.formattingRuleEmployeeName}); - this.Margins = new System.Drawing.Printing.Margins(50, 50, 75, 30); + this.Margins = new DevExpress.Drawing.DXMargins(45F, 33F, 75F, 30F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "17.1"; + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -987,5 +1075,10 @@ namespace VSDHammReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; + private DevExpress.XtraReports.UI.XRLabel lblGruppenangebot; } } diff --git a/ReportImp/VSDHammReports/ServicesOverviewReport.cs b/ReportImp/VSDHammReports/ServicesOverviewReport.cs index 0f18afbbc..aee1aa2a4 100644 --- a/ReportImp/VSDHammReports/ServicesOverviewReport.cs +++ b/ReportImp/VSDHammReports/ServicesOverviewReport.cs @@ -36,7 +36,7 @@ namespace VSDHammReports if (pRO.StartDate >= new DateTime (2022, 09, 01)) AnzeigeExtraStunden(pRO); - + bool hatGruppe = false; if (pRO.Services != null) { List servicesBillable = new List(); @@ -44,10 +44,21 @@ namespace VSDHammReports foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services) { if (s.IsBillable) + { + if (s.IsGroup) + { + s.Notice5 = s.CustomerCount.ToString(); + s.Notice4 = s.EmployeeCount.ToString(); + hatGruppe = true; + } servicesBillable.Add(s); + } } - pRO.Services = servicesBillable; + if (hatGruppe) + { + lblGruppenangebot.Visible = true; + } } bindingSource1.DataSource = pRO; // rechnungsDatum.Text = DateTime.Now.ToShortDateString(); diff --git a/ReportImp/VSDHammReports/ServicesOverviewReport.resx b/ReportImp/VSDHammReports/ServicesOverviewReport.resx index f6606300d..fce978890 100644 --- a/ReportImp/VSDHammReports/ServicesOverviewReport.resx +++ b/ReportImp/VSDHammReports/ServicesOverviewReport.resx @@ -117,7 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 21, 17 - + + (2) Die zeitliche Erfassung von Gruppenangeboten erfolgt anteilig. Berücksichtigt werden hierbei die Anzahl der teilnehmenden Betreuten sowie des Betreuungspersonals. Zur Erklärung: die Gesamtzeit des Angebotes wird durch die Teilnehmenden dividiert und mit der Anzahl der Bezugsbetreuungen multipliziert. In Ausnahmesituationen behalten wir uns vor einen anderen Berechnungs-schlüssel anzuwenden. Informationen hierzu können Sie bei der Bezugsbetreuung einholen. + \ No newline at end of file