From d7e558ff65de1ba26d63365719dcdbfcc7b43cc1 Mon Sep 17 00:00:00 2001 From: Kojo Date: Tue, 6 Jan 2026 15:39:03 +0100 Subject: [PATCH 1/2] =?UTF-8?q?AdditionalServiceBookingRO:=20F=C3=BCr=20Ab?= =?UTF-8?q?wesenheiten=20aus=20dem=20Vorjahr=20keine=20Abwesenheitsinfos?= =?UTF-8?q?=20setzen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Report/ReportObjects/AdditionalServiceBookingRO.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Report/ReportObjects/AdditionalServiceBookingRO.cs b/Report/ReportObjects/AdditionalServiceBookingRO.cs index 569e87f62..bad2b82ab 100644 --- a/Report/ReportObjects/AdditionalServiceBookingRO.cs +++ b/Report/ReportObjects/AdditionalServiceBookingRO.cs @@ -296,7 +296,7 @@ namespace BeWo.Report.ReportObjects yearCount++; } - if (dt.Month == result.MonthInt) + if (dt.Month == result.MonthInt && dt.Year == result.Year) { monthCount++; From abf862449e2cd1b87568b5f86009b8dcaa6c7ac5 Mon Sep 17 00:00:00 2001 From: Kojo Date: Tue, 6 Jan 2026 18:46:52 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Club74:=20In=20Mitarbeiterstundenkonto=20Mo?= =?UTF-8?q?natsansicht=20zwei=20=C3=9Cberstunden-Spalten=20herausgenommen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Mitarbeiterstundenkonto.designer.cs | 202 +++++++----------- ReportImp/Club74/Mitarbeiterstundenkonto.resx | 3 - 2 files changed, 74 insertions(+), 131 deletions(-) diff --git a/ReportImp/Club74/Mitarbeiterstundenkonto.designer.cs b/ReportImp/Club74/Mitarbeiterstundenkonto.designer.cs index 1ddbea680..c3ba69e11 100644 --- a/ReportImp/Club74/Mitarbeiterstundenkonto.designer.cs +++ b/ReportImp/Club74/Mitarbeiterstundenkonto.designer.cs @@ -30,10 +30,10 @@ namespace BeWo.Club74 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(); - DevExpress.XtraReports.UI.XRSummary xrSummary1 = 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(); @@ -43,13 +43,12 @@ namespace BeWo.Club74 this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); @@ -59,13 +58,12 @@ namespace BeWo.Club74 this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -74,13 +72,12 @@ namespace BeWo.Club74 this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.lblMonat = new DevExpress.XtraReports.UI.XRLabel(); @@ -96,9 +93,6 @@ namespace BeWo.Club74 this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.fieldDiff = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldRelation = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -116,7 +110,8 @@ namespace BeWo.Club74 // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableDetail}); - this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((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 = 25F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; @@ -125,7 +120,8 @@ namespace BeWo.Club74 // this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((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); @@ -151,9 +147,7 @@ namespace BeWo.Club74 this.xrTableCell22, this.xrTableCell21, this.xrTableCell23, - this.xrTableCell25, - this.xrTableCell24, - this.xrTableCell26}); + this.xrTableCell25}); this.xrTableRowDetail.Name = "xrTableRowDetail"; this.xrTableRowDetail.Weight = 1D; // @@ -202,6 +196,13 @@ namespace BeWo.Club74 this.xrTableCell16.Text = "xrTableCell16"; this.xrTableCell16.Weight = 0.063119927862939587D; // + // xrTableCell6 + // + this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom3", "{0:0.00}")}); + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Weight = 0.063119927862939587D; + // // xrTableCell27 // this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -218,14 +219,6 @@ namespace BeWo.Club74 this.xrTableCell22.Text = "xrTableCell22"; this.xrTableCell22.Weight = 0.063119927862939587D; // - // xrTableCell23 - // - this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - 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; - // // xrTableCell21 // this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -234,6 +227,14 @@ namespace BeWo.Club74 this.xrTableCell21.Text = "xrTableCell21"; this.xrTableCell21.Weight = 0.063119927862939615D; // + // xrTableCell23 + // + this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + 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; + // // xrTableCell25 // this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -242,22 +243,6 @@ namespace BeWo.Club74 this.xrTableCell25.Text = "xrTableCell25"; this.xrTableCell25.Weight = 0.063119927862939587D; // - // xrTableCell24 - // - this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - 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; - // - // xrTableCell26 - // - this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - 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; - // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -282,7 +267,7 @@ namespace BeWo.Club74 this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrTableHeader.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableHeader.Name = "xrTableHeader"; this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -308,9 +293,7 @@ namespace BeWo.Club74 this.xrTableCell7, this.xrTableCell12, this.xrTableCell11, - this.xrTableCell13, - this.xrTableCell14, - this.xrTableCell15}); + this.xrTableCell13}); this.xrTableRowHeader.Name = "xrTableRowHeader"; this.xrTableRowHeader.Weight = 2.8D; // @@ -349,6 +332,12 @@ namespace BeWo.Club74 this.xrTableCell8.Text = "FLS Stunden SOLL"; this.xrTableCell8.Weight = 0.063119927721024038D; // + // xrTableCell1 + // + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Text = "Arbeitszeit"; + this.xrTableCell1.Weight = 0.063119927721024D; + // // xrTableCell10 // this.xrTableCell10.Multiline = true; @@ -363,6 +352,13 @@ namespace BeWo.Club74 this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat"; this.xrTableCell7.Weight = 0.06311992757910842D; // + // xrTableCell12 + // + this.xrTableCell12.Multiline = true; + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Text = "Mittelbare\r\nLeistungen"; + this.xrTableCell12.Weight = 0.063119929511863376D; + // // xrTableCell11 // this.xrTableCell11.Multiline = true; @@ -371,44 +367,25 @@ namespace BeWo.Club74 this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat"; this.xrTableCell11.Weight = 0.063119927721024011D; // - // xrTableCell12 - // - this.xrTableCell12.Multiline = true; - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Text = "Mittelbare\r\nLeistungen"; - this.xrTableCell12.Weight = 0.063119929511863376D; - // // xrTableCell13 // this.xrTableCell13.Name = "xrTableCell13"; this.xrTableCell13.Text = "Überstd. neu"; this.xrTableCell13.Weight = 0.063119928687401447D; // - // xrTableCell14 - // - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.StylePriority.UseBackColor = false; - this.xrTableCell14.Text = "Überstd. Vormonat"; - this.xrTableCell14.Weight = 0.063119928275170531D; - // - // xrTableCell15 - // - this.xrTableCell15.Name = "xrTableCell15"; - this.xrTableCell15.Text = "Überstd. Gesamt"; - this.xrTableCell15.Weight = 0.0631199213956443D; - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable1}); - this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.GroupFooter1.HeightF = 48.95833F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // // xrTable1 // - this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -434,9 +411,7 @@ namespace BeWo.Club74 this.cellFLSPlusMinusGesamt, this.cellRelationGesamt, this.cellGesamtGesamt, - this.xrTableCell47, - this.xrTableCell48, - this.xrTableCell51}); + this.xrTableCell47}); this.xrTableRow1.Name = "xrTableRow1"; this.xrTableRow1.Weight = 1D; // @@ -477,6 +452,16 @@ namespace BeWo.Club74 this.cellFLSSollGesamt.Text = "cellFLSSollGesamt"; this.cellFLSSollGesamt.Weight = 0.063119927862939587D; // + // xrTableCell17 + // + this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom3")}); + this.xrTableCell17.Name = "xrTableCell17"; + xrSummary1.FormatString = "{0:0.00}"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; + this.xrTableCell17.Summary = xrSummary1; + this.xrTableCell17.Weight = 0.063119927862939587D; + // // cellFLSIstGesamt // this.cellFLSIstGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -498,14 +483,6 @@ namespace BeWo.Club74 this.cellFLSPlusMinusGesamt.Summary = xrSummary3; this.cellFLSPlusMinusGesamt.Weight = 0.063119927862939587D; // - // cellGesamtGesamt - // - this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")}); - this.cellGesamtGesamt.Name = "cellGesamtGesamt"; - this.cellGesamtGesamt.Text = "cellGesamtGesamt"; - this.cellGesamtGesamt.Weight = 0.063119927862939573D; - // // cellRelationGesamt // this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -516,21 +493,19 @@ namespace BeWo.Club74 this.cellRelationGesamt.Summary = xrSummary4; this.cellRelationGesamt.Weight = 0.0631199278629396D; // + // cellGesamtGesamt + // + this.cellGesamtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")}); + this.cellGesamtGesamt.Name = "cellGesamtGesamt"; + this.cellGesamtGesamt.Text = "cellGesamtGesamt"; + this.cellGesamtGesamt.Weight = 0.063119927862939573D; + // // xrTableCell47 // this.xrTableCell47.Name = "xrTableCell47"; this.xrTableCell47.Weight = 0.063119927862939587D; // - // xrTableCell48 - // - this.xrTableCell48.Name = "xrTableCell48"; - this.xrTableCell48.Weight = 0.063119927862939587D; - // - // xrTableCell51 - // - this.xrTableCell51.Name = "xrTableCell51"; - this.xrTableCell51.Weight = 0.063119927862939573D; - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); @@ -546,7 +521,7 @@ namespace BeWo.Club74 // 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.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold); this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.lblMonat.Multiline = true; this.lblMonat.Name = "lblMonat"; @@ -565,18 +540,18 @@ namespace BeWo.Club74 // // xrPageInfo2 // - this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F); - this.xrPageInfo2.Format = "Seite {0} von {1}"; + this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(935F, 25F); this.xrPageInfo2.Name = "xrPageInfo2"; 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; + this.xrPageInfo2.TextFormatString = "Seite {0} von {1}"; // // xrPageInfo1 // - this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F); + this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); this.xrPageInfo1.Name = "xrPageInfo1"; this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; @@ -590,7 +565,7 @@ namespace BeWo.Club74 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.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F); this.Title.ForeColor = System.Drawing.Color.Black; this.Title.Name = "Title"; // @@ -600,7 +575,7 @@ namespace BeWo.Club74 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.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.FieldCaption.ForeColor = System.Drawing.Color.Black; this.FieldCaption.Name = "FieldCaption"; // @@ -610,7 +585,7 @@ namespace BeWo.Club74 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.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.PageInfo.ForeColor = System.Drawing.Color.Black; this.PageInfo.Name = "PageInfo"; // @@ -620,7 +595,7 @@ namespace BeWo.Club74 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.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F); this.DataField.ForeColor = System.Drawing.SystemColors.ControlText; this.DataField.Name = "DataField"; // @@ -653,29 +628,6 @@ namespace BeWo.Club74 this.fieldRelation.DataMember = "EmployeeDetailList"; this.fieldRelation.Name = "fieldRelation"; // - // xrTableCell1 - // - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Text = "Arbeitszeit"; - this.xrTableCell1.Weight = 0.063119927721024D; - // - // xrTableCell6 - // - this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom3", "{0:0.00}")}); - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.Weight = 0.063119927862939587D; - // - // xrTableCell17 - // - this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom3")}); - this.xrTableCell17.Name = "xrTableCell17"; - xrSummary1.FormatString = "{0:0.00}"; - xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell17.Summary = xrSummary1; - this.xrTableCell17.Weight = 0.063119927862939587D; - // // Mitarbeiterstundenkonto // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -691,7 +643,7 @@ namespace BeWo.Club74 this.fieldRelation}); this.DataSource = this.bindingSource1; this.Landscape = true; - this.Margins = new System.Drawing.Printing.Margins(50, 40, 50, 30); + this.Margins = new DevExpress.Drawing.DXMargins(50F, 40F, 50F, 30F); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -700,7 +652,7 @@ namespace BeWo.Club74 this.FieldCaption, this.PageInfo, this.DataField}); - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); @@ -751,11 +703,7 @@ namespace BeWo.Club74 private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; private DevExpress.XtraReports.UI.XRTableCell xrTableCell25; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; @@ -769,8 +717,6 @@ namespace BeWo.Club74 private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt; private DevExpress.XtraReports.UI.XRTableCell cellRelationGesamt; private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell51; private DevExpress.XtraReports.UI.CalculatedField fieldDiff; private DevExpress.XtraReports.UI.CalculatedField fieldRelation; private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; diff --git a/ReportImp/Club74/Mitarbeiterstundenkonto.resx b/ReportImp/Club74/Mitarbeiterstundenkonto.resx index 0f60e7858..c7e0d4bdf 100644 --- a/ReportImp/Club74/Mitarbeiterstundenkonto.resx +++ b/ReportImp/Club74/Mitarbeiterstundenkonto.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