From b012d2b48f28501724699cccbfc385272bc78997 Mon Sep 17 00:00:00 2001 From: HirschleM Date: Thu, 2 Oct 2025 12:27:45 +0200 Subject: [PATCH] MH: Mittelpunkt Stundenkonto Update --- .../Mitarbeiterarbeitszeitkonto.designer.cs | 50 ++- .../MitarbeiterarbeitszeitkontoSeite2.cs | 9 +- ...arbeiterarbeitszeitkontoSeite2.designer.cs | 347 ++++++++++-------- .../Mitarbeiterstundenkonto.designer.cs | 89 +++-- .../MitarbeiterstundenkontoJahr.designer.cs | 95 +++-- 5 files changed, 377 insertions(+), 213 deletions(-) diff --git a/ReportImp/Mittelpunkt/Mitarbeiterarbeitszeitkonto.designer.cs b/ReportImp/Mittelpunkt/Mitarbeiterarbeitszeitkonto.designer.cs index 06dacaf7e..c8901b4cd 100644 --- a/ReportImp/Mittelpunkt/Mitarbeiterarbeitszeitkonto.designer.cs +++ b/ReportImp/Mittelpunkt/Mitarbeiterarbeitszeitkonto.designer.cs @@ -120,6 +120,7 @@ namespace Mittelpunkt this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell39 = 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(); @@ -138,7 +139,9 @@ namespace Mittelpunkt this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldTatsSoll = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); @@ -431,8 +434,9 @@ namespace Mittelpunkt 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.xrTableRow10, + this.xrTableRow13}); + this.xrTable2.SizeF = new System.Drawing.SizeF(552.2002F, 72F); this.xrTable2.StylePriority.UseBorders = false; this.xrTable2.StylePriority.UseFont = false; this.xrTable2.StylePriority.UsePadding = false; @@ -1135,6 +1139,10 @@ namespace Mittelpunkt this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell39.Weight = 0.332763851553351D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + // // Title // this.Title.BackColor = System.Drawing.Color.White; @@ -1271,9 +1279,38 @@ namespace Mittelpunkt this.fieldTatsSoll.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldTatsSoll.Name = "fieldTatsSoll"; // - // bindingSource1 + // xrTableRow13 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell40, + this.xrTableCell43}); + this.xrTableRow13.Name = "xrTableRow13"; + this.xrTableRow13.Weight = 0.75540991165010141D; + // + // xrTableCell40 + // + this.xrTableCell40.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell40.Multiline = true; + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell40.StylePriority.UseFont = false; + this.xrTableCell40.StylePriority.UsePadding = false; + this.xrTableCell40.StylePriority.UseTextAlignment = false; + this.xrTableCell40.Text = "Resturlaub:"; + this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell40.Weight = 0.13824601411997561D; + // + // xrTableCell43 + // + this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Resturlaub")}); + this.xrTableCell43.Multiline = true; + this.xrTableCell43.Name = "xrTableCell43"; + this.xrTableCell43.StylePriority.UseFont = false; + this.xrTableCell43.StylePriority.UseTextAlignment = false; + this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell43.TextFormatString = "{0:0.00}"; + this.xrTableCell43.Weight = 0.49791628849549813D; // // Mitarbeiterarbeitszeitkonto // @@ -1426,5 +1463,8 @@ namespace Mittelpunkt private DevExpress.XtraReports.UI.XRTableCell xrTableCell38; private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow13; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell43; } } diff --git a/ReportImp/Mittelpunkt/MitarbeiterarbeitszeitkontoSeite2.cs b/ReportImp/Mittelpunkt/MitarbeiterarbeitszeitkontoSeite2.cs index 221278b14..1568b59e5 100644 --- a/ReportImp/Mittelpunkt/MitarbeiterarbeitszeitkontoSeite2.cs +++ b/ReportImp/Mittelpunkt/MitarbeiterarbeitszeitkontoSeite2.cs @@ -38,7 +38,9 @@ namespace Mittelpunkt { if (day.ServiceRecords != null && day.ServiceRecords.Count > 0) { - day.Custom2 = string.Join("; ", day.ServiceRecords.Select(s => s.Notice)); + day.Custom2 = string.Join("; ", day.ServiceRecords + .Where(s => s.ServiceDescription.ServiceCategory.Name.Trim().EndsWith("AZ")) + .Select(s => s.Notice)); } if (day.AbsenceTimes != null && day.AbsenceTimes.Count > 0) { @@ -81,5 +83,10 @@ namespace Mittelpunkt c.BackColor = backColor; } } + + private void GroupFooter2_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e) + { + + } } } diff --git a/ReportImp/Mittelpunkt/MitarbeiterarbeitszeitkontoSeite2.designer.cs b/ReportImp/Mittelpunkt/MitarbeiterarbeitszeitkontoSeite2.designer.cs index 100ffd473..a35b01689 100644 --- a/ReportImp/Mittelpunkt/MitarbeiterarbeitszeitkontoSeite2.designer.cs +++ b/ReportImp/Mittelpunkt/MitarbeiterarbeitszeitkontoSeite2.designer.cs @@ -106,14 +106,6 @@ namespace Mittelpunkt this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); this.summeGesamtDauer = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); @@ -132,8 +124,20 @@ namespace Mittelpunkt this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldTatsSoll = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.MinutesTotalAlsStunden = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTableRow11 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.dienstTable)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); @@ -141,7 +145,6 @@ namespace Mittelpunkt ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -525,11 +528,12 @@ namespace Mittelpunkt // GroupHeader3 // this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel1, this.xrPictureBox1, this.xrTable2, this.xrPageInfo1}); this.GroupHeader3.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.GroupHeader3.HeightF = 151.4584F; + this.GroupHeader3.HeightF = 208.7501F; this.GroupHeader3.Level = 1; this.GroupHeader3.Name = "GroupHeader3"; this.GroupHeader3.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand; @@ -556,8 +560,10 @@ namespace Mittelpunkt this.xrTableRow1, this.xrTableRow4, this.xrTableRow8, - this.xrTableRow9}); - this.xrTable2.SizeF = new System.Drawing.SizeF(507.4167F, 72F); + this.xrTableRow9, + this.xrTableRow10, + this.xrTableRow11}); + this.xrTable2.SizeF = new System.Drawing.SizeF(507.4167F, 108F); this.xrTable2.StylePriority.UseBorders = false; this.xrTable2.StylePriority.UseFont = false; this.xrTable2.StylePriority.UsePadding = false; @@ -583,7 +589,7 @@ namespace Mittelpunkt this.xrTableCell1.StylePriority.UseTextAlignment = false; this.xrTableCell1.Text = "Mitarbeiter/in:"; this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell1.Weight = 0.23427849338992338D; + this.xrTableCell1.Weight = 0.25779868206484946D; // // xrTableCell25 // @@ -594,7 +600,7 @@ namespace Mittelpunkt this.xrTableCell25.StylePriority.UseTextAlignment = false; this.xrTableCell25.Text = "[EmployeeDetailList.Employee.Person.FirstNameLastName]"; this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell25.Weight = 0.64703977995324313D; + this.xrTableCell25.Weight = 0.623519591278317D; // // xrTableRow4 // @@ -614,7 +620,7 @@ namespace Mittelpunkt this.xrTableCell6.StylePriority.UseTextAlignment = false; this.xrTableCell6.Text = "Monat:"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell6.Weight = 0.23427849338992338D; + this.xrTableCell6.Weight = 0.25779868206484946D; // // xrTableCell16 // @@ -627,7 +633,7 @@ namespace Mittelpunkt this.xrTableCell16.Text = "[Monat]"; this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell16.TextFormatString = "{0:MMMM}"; - this.xrTableCell16.Weight = 0.64703977995324313D; + this.xrTableCell16.Weight = 0.623519591278317D; // // xrTableRow8 // @@ -647,7 +653,7 @@ namespace Mittelpunkt this.xrTableCell17.StylePriority.UseTextAlignment = false; this.xrTableCell17.Text = "Jahr:"; this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell17.Weight = 0.23427849338992338D; + this.xrTableCell17.Weight = 0.25779868206484946D; // // xrTableCell18 // @@ -660,7 +666,7 @@ namespace Mittelpunkt this.xrTableCell18.Text = "[Jahr]"; this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell18.TextFormatString = "{0:yyyy}"; - this.xrTableCell18.Weight = 0.64703977995324313D; + this.xrTableCell18.Weight = 0.623519591278317D; // // xrTableRow9 // @@ -681,7 +687,7 @@ namespace Mittelpunkt this.xrTableCell30.StylePriority.UseTextAlignment = false; this.xrTableCell30.Text = "Soll pro Tag:"; this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell30.Weight = 0.23427849338992338D; + this.xrTableCell30.Weight = 0.25779868206484946D; // // lblSollProTag // @@ -694,7 +700,7 @@ namespace Mittelpunkt this.lblSollProTag.StylePriority.UseTextAlignment = false; this.lblSollProTag.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.lblSollProTag.TextFormatString = "{0:0.00}"; - this.lblSollProTag.Weight = 0.64703977995324313D; + this.lblSollProTag.Weight = 0.623519591278317D; // // xrPageInfo1 // @@ -710,16 +716,17 @@ namespace Mittelpunkt // GroupFooter2 // this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.lblUnterschriftMitarbeiter, + this.xrTable5, this.xrTable1, this.xrTable3, - this.xrTable4, - this.xrTable5, - this.xrTable6}); + this.xrTable4}); this.GroupFooter2.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.GroupFooter2.HeightF = 108.1249F; + this.GroupFooter2.HeightF = 167.375F; this.GroupFooter2.KeepTogether = true; this.GroupFooter2.Name = "GroupFooter2"; this.GroupFooter2.StylePriority.UseFont = false; + this.GroupFooter2.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.GroupFooter2_BeforePrint); // // xrTable1 // @@ -1035,114 +1042,6 @@ namespace Mittelpunkt this.summeGesamtDauer.TextFormatString = "{0:0.00}"; this.summeGesamtDauer.Weight = 0.13800666541800583D; // - // xrTable5 - // - this.xrTable5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable5.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.99999F); - this.xrTable5.Name = "xrTable5"; - this.xrTable5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow3}); - this.xrTable5.SizeF = new System.Drawing.SizeF(223.4167F, 22F); - this.xrTable5.StylePriority.UseBorders = false; - this.xrTable5.StylePriority.UseFont = false; - this.xrTable5.StylePriority.UsePadding = false; - this.xrTable5.StylePriority.UseTextAlignment = false; - this.xrTable5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // - // xrTableRow3 - // - this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell37, - this.xrTableCell38}); - this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.88D; - // - // xrTableCell37 - // - this.xrTableCell37.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell37.Multiline = true; - this.xrTableCell37.Name = "xrTableCell37"; - this.xrTableCell37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell37.StylePriority.UseBorders = false; - this.xrTableCell37.StylePriority.UsePadding = false; - this.xrTableCell37.StylePriority.UseTextAlignment = false; - this.xrTableCell37.Text = "Summe Urlaub"; - this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell37.Weight = 0.15001555829065255D; - // - // xrTableCell38 - // - this.xrTableCell38.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom1")}); - this.xrTableCell38.Name = "xrTableCell38"; - this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrTableCell38.StylePriority.UseBorders = false; - this.xrTableCell38.StylePriority.UsePadding = false; - this.xrTableCell38.StylePriority.UseTextAlignment = false; - this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell38.TextFormatString = "{0:0.00}"; - this.xrTableCell38.Weight = 0.13800666541800583D; - // - // xrTable6 - // - this.xrTable6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable6.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 65.99998F); - this.xrTable6.Name = "xrTable6"; - this.xrTable6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow11}); - this.xrTable6.SizeF = new System.Drawing.SizeF(223.4167F, 22F); - this.xrTable6.StylePriority.UseBorders = false; - this.xrTable6.StylePriority.UseFont = false; - this.xrTable6.StylePriority.UsePadding = false; - this.xrTable6.StylePriority.UseTextAlignment = false; - this.xrTable6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // - // xrTableRow11 - // - this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell39, - this.xrTableCell4}); - this.xrTableRow11.Name = "xrTableRow11"; - this.xrTableRow11.Weight = 0.88D; - // - // xrTableCell39 - // - this.xrTableCell39.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell39.Multiline = true; - this.xrTableCell39.Name = "xrTableCell39"; - this.xrTableCell39.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell39.StylePriority.UseBorders = false; - this.xrTableCell39.StylePriority.UsePadding = false; - this.xrTableCell39.StylePriority.UseTextAlignment = false; - this.xrTableCell39.Text = "Summe Krank"; - this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell39.Weight = 0.15001555829065255D; - // - // xrTableCell4 - // - this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom2")}); - this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrTableCell4.StylePriority.UseBorders = false; - this.xrTableCell4.StylePriority.UsePadding = false; - this.xrTableCell4.StylePriority.UseTextAlignment = false; - this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell4.TextFormatString = "{0:0.00}"; - this.xrTableCell4.Weight = 0.13800666541800583D; - // // Title // this.Title.BackColor = System.Drawing.Color.White; @@ -1279,10 +1178,6 @@ namespace Mittelpunkt this.fieldTatsSoll.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldTatsSoll.Name = "fieldTatsSoll"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); - // // MinutesTotalAlsStunden // this.MinutesTotalAlsStunden.DataMember = "EmployeeDetailList.Days"; @@ -1290,6 +1185,163 @@ namespace Mittelpunkt this.MinutesTotalAlsStunden.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.MinutesTotalAlsStunden.Name = "MinutesTotalAlsStunden"; // + // xrTable5 + // + this.xrTable5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable5.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.99999F); + this.xrTable5.Name = "xrTable5"; + this.xrTable5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow3}); + this.xrTable5.SizeF = new System.Drawing.SizeF(223.4167F, 22F); + this.xrTable5.StylePriority.UseBorders = false; + this.xrTable5.StylePriority.UseFont = false; + this.xrTable5.StylePriority.UsePadding = false; + this.xrTable5.StylePriority.UseTextAlignment = false; + this.xrTable5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell4, + this.xrTableCell19}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 0.88D; + // + // xrTableCell4 + // + this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell4.Multiline = true; + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell4.StylePriority.UseBorders = false; + this.xrTableCell4.StylePriority.UsePadding = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.Text = "Soll Monat"; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell4.Weight = 0.15001555829065255D; + // + // xrTableCell19 + // + this.xrTableCell19.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit")}); + this.xrTableCell19.Name = "xrTableCell19"; + this.xrTableCell19.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell19.StylePriority.UseBorders = false; + this.xrTableCell19.StylePriority.UsePadding = false; + this.xrTableCell19.StylePriority.UseTextAlignment = false; + this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell19.TextFormatString = "{0:0.00}"; + this.xrTableCell19.Weight = 0.13800666541800583D; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell21, + this.xrTableCell23}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.Weight = 0.75540991165010141D; + // + // xrTableCell21 + // + this.xrTableCell21.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell21.Multiline = true; + 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 diesen Monat:"; + this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell21.Weight = 0.25779868206484946D; + // + // xrTableCell23 + // + this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit")}); + this.xrTableCell23.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell23.Multiline = true; + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.StylePriority.UseFont = false; + this.xrTableCell23.StylePriority.UseTextAlignment = false; + this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell23.TextFormatString = "{0:0.00}"; + this.xrTableCell23.Weight = 0.623519591278317D; + // + // lblUnterschriftMitarbeiter + // + this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.lblUnterschriftMitarbeiter.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(0F, 147.375F); + this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter"; + this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(336.0833F, 19.99998F); + this.lblUnterschriftMitarbeiter.StylePriority.UseBackColor = false; + this.lblUnterschriftMitarbeiter.StylePriority.UseBorders = false; + this.lblUnterschriftMitarbeiter.StylePriority.UseFont = false; + this.lblUnterschriftMitarbeiter.StylePriority.UsePadding = false; + this.lblUnterschriftMitarbeiter.StylePriority.UseTextAlignment = false; + this.lblUnterschriftMitarbeiter.Text = "Datum, Unterschrift Mitarbeiter/in"; + this.lblUnterschriftMitarbeiter.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrTableRow11 + // + this.xrTableRow11.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell24, + this.xrTableCell28}); + this.xrTableRow11.Name = "xrTableRow11"; + this.xrTableRow11.Weight = 0.75540991165010141D; + // + // xrTableCell24 + // + this.xrTableCell24.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell24.Multiline = true; + this.xrTableCell24.Name = "xrTableCell24"; + this.xrTableCell24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell24.StylePriority.UseFont = false; + this.xrTableCell24.StylePriority.UsePadding = false; + this.xrTableCell24.StylePriority.UseTextAlignment = false; + this.xrTableCell24.Text = "Resturlaub:"; + this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell24.Weight = 0.25779868206484946D; + // + // xrTableCell28 + // + this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Resturlaub")}); + this.xrTableCell28.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell28.Multiline = true; + this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.StylePriority.UseFont = false; + this.xrTableCell28.StylePriority.UseTextAlignment = false; + this.xrTableCell28.Text = "xrTableCell28"; + this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell28.TextFormatString = "{0:0.00}"; + this.xrTableCell28.Weight = 0.623519591278317D; + // + // xrLabel1 + // + this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.AbsenceString")}); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 163.3334F); + this.xrLabel1.Multiline = true; + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.SizeF = new System.Drawing.SizeF(774F, 25F); + this.xrLabel1.StyleName = "Title"; + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.StylePriority.UseForeColor = false; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + // // MitarbeiterarbeitszeitkontoSeite2 // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1335,7 +1387,6 @@ namespace Mittelpunkt ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -1401,14 +1452,6 @@ namespace Mittelpunkt private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; private DevExpress.XtraReports.UI.XRTableCell summeGesamtDauer; - private DevExpress.XtraReports.UI.XRTable xrTable5; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell38; - private DevExpress.XtraReports.UI.XRTable xrTable6; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow11; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; private DevExpress.XtraReports.UI.XRTable xrTable3; private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; @@ -1445,5 +1488,17 @@ namespace Mittelpunkt private DevExpress.XtraReports.UI.XRTableCell xrTableCell57; private DevExpress.XtraReports.UI.XRTableCell xrTableCell58; private DevExpress.XtraReports.UI.CalculatedField MinutesTotalAlsStunden; + private DevExpress.XtraReports.UI.XRTable xrTable5; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; + private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiter; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow11; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; } } diff --git a/ReportImp/Mittelpunkt/Mitarbeiterstundenkonto.designer.cs b/ReportImp/Mittelpunkt/Mitarbeiterstundenkonto.designer.cs index d53c7e2f5..c6ac47782 100644 --- a/ReportImp/Mittelpunkt/Mitarbeiterstundenkonto.designer.cs +++ b/ReportImp/Mittelpunkt/Mitarbeiterstundenkonto.designer.cs @@ -48,6 +48,7 @@ namespace Mittelpunkt this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = 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(); @@ -64,6 +65,7 @@ namespace Mittelpunkt this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = 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.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -79,6 +81,7 @@ namespace Mittelpunkt this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -96,9 +99,9 @@ namespace Mittelpunkt this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -133,7 +136,7 @@ namespace Mittelpunkt 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(1019F, 25F); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(1073F, 25F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UseFont = false; this.xrTableDetail.StylePriority.UsePadding = false; @@ -155,7 +158,8 @@ namespace Mittelpunkt this.xrTableCell23, this.xrTableCell25, this.xrTableCell24, - this.xrTableCell26}); + this.xrTableCell26, + this.xrTableCell29}); this.xrTableRowDetail.Name = "xrTableRowDetail"; this.xrTableRowDetail.Weight = 1D; // @@ -232,6 +236,15 @@ namespace Mittelpunkt this.xrTableCell17.TextFormatString = "{0:0.00}"; this.xrTableCell17.Weight = 0.0721370604147881D; // + // xrTableCell21 + // + this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst")}); + this.xrTableCell21.Multiline = true; + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.TextFormatString = "{0:0.00}"; + this.xrTableCell21.Weight = 0.0721370604147881D; + // // xrTableCell23 // this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -294,7 +307,7 @@ namespace Mittelpunkt 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(1019F, 70F); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(1073F, 70F); this.xrTableHeader.StylePriority.UseBorders = false; this.xrTableHeader.StylePriority.UseFont = false; this.xrTableHeader.StylePriority.UsePadding = false; @@ -316,7 +329,8 @@ namespace Mittelpunkt this.xrTableCell11, this.xrTableCell13, this.xrTableCell14, - this.xrTableCell15}); + this.xrTableCell15, + this.xrTableCell27}); this.xrTableRowHeader.Name = "xrTableRowHeader"; this.xrTableRowHeader.Weight = 2.8D; // @@ -377,6 +391,13 @@ namespace Mittelpunkt this.xrTableCell8.Text = "Nachtarbeit"; this.xrTableCell8.Weight = 0.072137063712635591D; // + // xrTableCell18 + // + this.xrTableCell18.Multiline = true; + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.Text = "Gesamt geleistete FLS lfd. Monat"; + this.xrTableCell18.Weight = 0.072137063712635591D; + // // xrTableCell11 // this.xrTableCell11.Multiline = true; @@ -422,7 +443,7 @@ namespace Mittelpunkt 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(1019F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1073F, 25F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -444,7 +465,8 @@ namespace Mittelpunkt this.cellRelationGesamt, this.xrTableCell47, this.xrTableCell48, - this.xrTableCell51}); + this.xrTableCell51, + this.xrTableCell30}); this.xrTableRow1.Name = "xrTableRow1"; this.xrTableRow1.Weight = 1D; // @@ -518,6 +540,15 @@ namespace Mittelpunkt this.cellGesamtGesamt.Summary = xrSummary4; this.cellGesamtGesamt.Weight = 0.070342329625507211D; // + // xrTableCell22 + // + this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt")}); + this.xrTableCell22.Multiline = true; + this.xrTableCell22.Name = "xrTableCell22"; + this.xrTableCell22.TextFormatString = "{0:0.00}"; + this.xrTableCell22.Weight = 0.070342329625507211D; + // // cellRelationGesamt // this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -652,30 +683,27 @@ namespace Mittelpunkt this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // xrTableCell18 + // xrTableCell27 // - this.xrTableCell18.Multiline = true; - this.xrTableCell18.Name = "xrTableCell18"; - this.xrTableCell18.Text = "Gesamt geleistete FLS lfd. Monat"; - this.xrTableCell18.Weight = 0.072137063712635591D; + this.xrTableCell27.Multiline = true; + this.xrTableCell27.Name = "xrTableCell27"; + this.xrTableCell27.Text = "Resturlaub"; + this.xrTableCell27.Weight = 0.073256958830901317D; // - // xrTableCell21 + // xrTableCell29 // - this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst")}); - this.xrTableCell21.Multiline = true; - this.xrTableCell21.Name = "xrTableCell21"; - this.xrTableCell21.TextFormatString = "{0:0.00}"; - this.xrTableCell21.Weight = 0.0721370604147881D; + this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Resturlaub")}); + this.xrTableCell29.Multiline = true; + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.TextFormatString = "{0:0.00}"; + this.xrTableCell29.Weight = 0.073257027084520018D; // - // xrTableCell22 + // xrTableCell30 // - this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt")}); - this.xrTableCell22.Multiline = true; - this.xrTableCell22.Name = "xrTableCell22"; - this.xrTableCell22.TextFormatString = "{0:0.00}"; - this.xrTableCell22.Weight = 0.070342329625507211D; + this.xrTableCell30.Multiline = true; + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.Weight = 0.0714343496952828D; // // Mitarbeiterstundenkonto // @@ -690,7 +718,7 @@ namespace Mittelpunkt this.fieldFLS}); this.DataSource = this.bindingSource1; this.Landscape = true; - this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 30F); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 21F, 50F, 30F); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -775,5 +803,8 @@ namespace Mittelpunkt private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell27; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; } } diff --git a/ReportImp/Mittelpunkt/MitarbeiterstundenkontoJahr.designer.cs b/ReportImp/Mittelpunkt/MitarbeiterstundenkontoJahr.designer.cs index 7c607023b..05dd9f7a6 100644 --- a/ReportImp/Mittelpunkt/MitarbeiterstundenkontoJahr.designer.cs +++ b/ReportImp/Mittelpunkt/MitarbeiterstundenkontoJahr.designer.cs @@ -35,8 +35,8 @@ namespace Mittelpunkt DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary(); - DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); @@ -49,6 +49,7 @@ namespace Mittelpunkt this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = 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(); @@ -63,6 +64,7 @@ namespace Mittelpunkt this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell1 = 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(); @@ -77,6 +79,7 @@ namespace Mittelpunkt this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -101,9 +104,9 @@ namespace Mittelpunkt this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -128,7 +131,7 @@ namespace Mittelpunkt 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(1019F, 25F); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(1085.353F, 25F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UseFont = false; this.xrTableDetail.StylePriority.UsePadding = false; @@ -150,7 +153,8 @@ namespace Mittelpunkt this.xrTableCell23, this.xrTableCell25, this.xrTableCell24, - this.xrTableCell26}); + this.xrTableCell26, + this.xrTableCell29}); this.xrTableRowDetail.Name = "xrTableRowDetail"; this.xrTableRowDetail.Weight = 1D; // @@ -223,6 +227,15 @@ namespace Mittelpunkt this.xrTableCell6.TextFormatString = "{0:0.00}"; this.xrTableCell6.Weight = 0.063119927862939587D; // + // xrTableCell17 + // + this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst")}); + this.xrTableCell17.Multiline = true; + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.TextFormatString = "{0:0.00}"; + this.xrTableCell17.Weight = 0.063119927862939587D; + // // xrTableCell23 // this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -266,7 +279,7 @@ namespace Mittelpunkt 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(1019F, 70F); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(1085.353F, 70F); this.xrTableHeader.StylePriority.UseBorders = false; this.xrTableHeader.StylePriority.UseFont = false; this.xrTableHeader.StylePriority.UsePadding = false; @@ -288,7 +301,8 @@ namespace Mittelpunkt this.xrTableCell11, this.xrTableCell13, this.xrTableCell14, - this.xrTableCell15}); + this.xrTableCell15, + this.xrTableCell21}); this.xrTableRowHeader.Name = "xrTableRowHeader"; this.xrTableRowHeader.Weight = 2.8D; // @@ -347,6 +361,13 @@ namespace Mittelpunkt this.xrTableCell1.Text = "Nacht-\r\narbeit"; this.xrTableCell1.Weight = 0.06311992757910842D; // + // xrTableCell12 + // + this.xrTableCell12.Multiline = true; + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Text = "Gesamt geleistete FLS lfd. Monat"; + this.xrTableCell12.Weight = 0.06311992757910842D; + // // xrTableCell11 // this.xrTableCell11.Multiline = true; @@ -385,7 +406,7 @@ namespace Mittelpunkt 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(1019F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1085.353F, 25F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -407,7 +428,8 @@ namespace Mittelpunkt this.cellRelationGesamt, this.xrTableCell47, this.xrTableCell48, - this.xrTableCell51}); + this.xrTableCell51, + this.xrTableCell30}); this.xrTableRow1.Name = "xrTableRow1"; this.xrTableRow1.Weight = 1D; // @@ -482,6 +504,17 @@ namespace Mittelpunkt this.cellGesamtGesamt.Summary = xrSummary5; this.cellGesamtGesamt.Weight = 0.063119927862939573D; // + // xrTableCell18 + // + this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst")}); + this.xrTableCell18.Multiline = true; + this.xrTableCell18.Name = "xrTableCell18"; + xrSummary6.FormatString = "{0:0.00}"; + xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell18.Summary = xrSummary6; + this.xrTableCell18.Weight = 0.063119927862939573D; + // // cellRelationGesamt // this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -675,32 +708,27 @@ namespace Mittelpunkt this.fieldRelationGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldRelationGesamt.Name = "fieldRelationGesamt"; // - // xrTableCell12 + // xrTableCell21 // - this.xrTableCell12.Multiline = true; - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Text = "Gesamt geleistete FLS lfd. Monat"; - this.xrTableCell12.Weight = 0.06311992757910842D; + this.xrTableCell21.Multiline = true; + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.Text = "Resturlaub"; + this.xrTableCell21.Weight = 0.0631199213956443D; // - // xrTableCell17 + // xrTableCell29 // - this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst")}); - this.xrTableCell17.Multiline = true; - this.xrTableCell17.Name = "xrTableCell17"; - this.xrTableCell17.TextFormatString = "{0:0.00}"; - this.xrTableCell17.Weight = 0.063119927862939587D; + this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Resturlaub")}); + this.xrTableCell29.Multiline = true; + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.TextFormatString = "{0:0.00}"; + this.xrTableCell29.Weight = 0.063119927862939573D; // - // xrTableCell18 + // xrTableCell30 // - this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst")}); - this.xrTableCell18.Multiline = true; - this.xrTableCell18.Name = "xrTableCell18"; - xrSummary6.FormatString = "{0:0.00}"; - xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell18.Summary = xrSummary6; - this.xrTableCell18.Weight = 0.063119927862939573D; + this.xrTableCell30.Multiline = true; + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.Weight = 0.063119927862939573D; // // MitarbeiterstundenkontoJahr // @@ -716,7 +744,7 @@ namespace Mittelpunkt this.DataSource = this.bindingSource1; this.DisplayName = "Mitarbeiterstundenkonto"; this.Landscape = true; - this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 30F); + this.Margins = new DevExpress.Drawing.DXMargins(58F, 20F, 50F, 30F); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -804,5 +832,8 @@ namespace Mittelpunkt private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; } }