From 0abedec08bb06242f32eabe205bdb52bb4804ca8 Mon Sep 17 00:00:00 2001 From: HirschleM Date: Wed, 16 Oct 2024 08:30:50 +0200 Subject: [PATCH] MH: Kette Zeiterfassung Druck --- .../ServiceRecordListReport.Designer.cs | 46 ++++++++++++++++--- .../KetteReports/ServiceRecordListReport.resx | 3 -- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/ReportImp/KetteReports/ServiceRecordListReport.Designer.cs b/ReportImp/KetteReports/ServiceRecordListReport.Designer.cs index a56f11d95..c34dcb30e 100644 --- a/ReportImp/KetteReports/ServiceRecordListReport.Designer.cs +++ b/ReportImp/KetteReports/ServiceRecordListReport.Designer.cs @@ -73,6 +73,9 @@ namespace KetteReports this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -114,6 +117,7 @@ namespace KetteReports this.xrTableCell1, this.xrTableCell2, this.xrTableCell3, + this.xrTableCell14, this.xrTableCell4}); this.xrTableRow1.FormattingRules.Add(this.formattingRuleGoalsInvisible); this.xrTableRow1.Name = "xrTableRow1"; @@ -162,7 +166,7 @@ namespace KetteReports this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1, this.xrTableRow3}); - this.xrTable1.SizeF = new System.Drawing.SizeF(1017F, 50F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1019F, 50F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UsePadding = false; // @@ -172,6 +176,7 @@ namespace KetteReports this.xrTableCell9, this.xrTableCell10, this.xrTableCell11, + this.xrTableCell15, this.cellGoalCaption, this.xrTableCell12}); this.xrTableRow3.Name = "xrTableRow3"; @@ -231,7 +236,8 @@ namespace KetteReports // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable1}); - this.Detail1.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.Detail1.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.Detail1.HeightF = 50F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; @@ -265,7 +271,7 @@ namespace KetteReports this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTable2.SizeF = new System.Drawing.SizeF(1017F, 25F); + this.xrTable2.SizeF = new System.Drawing.SizeF(1019F, 25F); this.xrTable2.StylePriority.UseBorders = false; this.xrTable2.StylePriority.UseFont = false; this.xrTable2.StylePriority.UsePadding = false; @@ -276,6 +282,7 @@ namespace KetteReports this.xrTableCell5, this.xrTableCell6, this.xrTableCell7, + this.xrTableCell13, this.xrTableCell8}); this.xrTableRow2.Name = "xrTableRow2"; this.xrTableRow2.Weight = 1D; @@ -348,13 +355,13 @@ namespace KetteReports // xrPageInfo2 // this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - this.xrPageInfo2.Format = "Seite {0} von {1}"; this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(390.4999F, 6.00001F); this.xrPageInfo2.Name = "xrPageInfo2"; this.xrPageInfo2.SizeF = new System.Drawing.SizeF(626.4999F, 23F); this.xrPageInfo2.StyleName = "PageInfo"; this.xrPageInfo2.StylePriority.UseFont = false; this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; // // xrPageInfo1 // @@ -489,6 +496,30 @@ namespace KetteReports this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.Text = "xrLabel3"; // + // xrTableCell13 + // + this.xrTableCell13.Multiline = true; + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Text = "Leistung"; + this.xrTableCell13.Weight = 0.81972789115646261D; + // + // xrTableCell14 + // + this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceRecordDetailList.ServiceDescription")}); + this.xrTableCell14.Multiline = true; + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.StylePriority.UseBorders = false; + this.xrTableCell14.StylePriority.UseTextAlignment = false; + this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell14.Weight = 0.81972789115646261D; + // + // xrTableCell15 + // + this.xrTableCell15.Multiline = true; + this.xrTableCell15.Name = "xrTableCell15"; + this.xrTableCell15.Weight = 0.81972789115646261D; + // // Leistungen // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -505,7 +536,7 @@ namespace KetteReports this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.formattingRuleGoalsInvisible}); this.Landscape = true; - this.Margins = new DevExpress.Drawing.DXMargins(75, 75, 50, 50); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 50F); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -514,7 +545,7 @@ namespace KetteReports this.FieldCaption, this.PageInfo, this.DataField}); - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); @@ -567,5 +598,8 @@ namespace KetteReports private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; } } diff --git a/ReportImp/KetteReports/ServiceRecordListReport.resx b/ReportImp/KetteReports/ServiceRecordListReport.resx index d25f3eba2..d58980a38 100644 --- a/ReportImp/KetteReports/ServiceRecordListReport.resx +++ b/ReportImp/KetteReports/ServiceRecordListReport.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - \ No newline at end of file