From a136efd2a5b7e96ca6a417b371e952d2067818cf Mon Sep 17 00:00:00 2001 From: Kojo Date: Mon, 24 Nov 2025 10:47:29 +0100 Subject: [PATCH] =?UTF-8?q?DiakonieLandshut:=20Auf=20QB=20Abwesenheiten=20?= =?UTF-8?q?nur=20noch=20vom=20ausgew=C3=A4hlten=20Monat,=20urspr=C3=BCngli?= =?UTF-8?q?che=20Zeile=20f=C3=BCr=20Abwesenheiten=20und=20Anmerkungen=20en?= =?UTF-8?q?tfernt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServicesOverviewReport.Designer.cs | 286 ++++++++---------- .../ServicesOverviewReport.cs | 8 +- 2 files changed, 129 insertions(+), 165 deletions(-) diff --git a/ReportImp/DiakonieLandshut/ServicesOverviewReport.Designer.cs b/ReportImp/DiakonieLandshut/ServicesOverviewReport.Designer.cs index 0d7de5beb..6957c75fe 100644 --- a/ReportImp/DiakonieLandshut/ServicesOverviewReport.Designer.cs +++ b/ReportImp/DiakonieLandshut/ServicesOverviewReport.Designer.cs @@ -91,8 +91,6 @@ namespace DiakonieLandshut this.picMasterFuchs = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblAbsenceTimes = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -109,26 +107,26 @@ namespace DiakonieLandshut this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTableAbwesenheiten = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.PageHeader = new DevExpress.XtraReports.UI.PageHeaderBand(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -728,32 +726,6 @@ namespace DiakonieLandshut this.bottomMarginBand1.HeightF = 36F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // xrLabel2 - // - this.xrLabel2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(685F, 25F); - this.xrLabel2.StylePriority.UseBorders = false; - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.Text = "Anmerkungen/Krankenhausaufenthalte/Krisen:"; - // - // lblAbsenceTimes - // - this.lblAbsenceTimes.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblAbsenceTimes.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); - this.lblAbsenceTimes.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F); - this.lblAbsenceTimes.Name = "lblAbsenceTimes"; - this.lblAbsenceTimes.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblAbsenceTimes.SizeF = new System.Drawing.SizeF(685F, 25F); - this.lblAbsenceTimes.StylePriority.UseBorders = false; - this.lblAbsenceTimes.StylePriority.UseFont = false; - // // xrTable1 // this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) @@ -842,7 +814,7 @@ namespace DiakonieLandshut // xrLabel7 // this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(387.58F, 200.1945F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(387.58F, 157.4861F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel7.SizeF = new System.Drawing.SizeF(297.545F, 17.99997F); @@ -911,87 +883,54 @@ namespace DiakonieLandshut this.xrTableAbwesenheiten, this.xrLabel17, this.xrPictureBox2, - this.xrLabel2, - this.lblAbsenceTimes, this.xrLabel7, this.xrTable1}); - this.GroupFooter1.HeightF = 223.6112F; + this.GroupFooter1.HeightF = 187.1944F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // - // xrLabel17 + // xrLabel18 // - this.xrLabel17.BackColor = System.Drawing.Color.Transparent; - this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")}); - this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Calibri", 11F); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(387.5801F, 164.6945F); - this.xrLabel17.Name = "xrLabel17"; - this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel17.SizeF = new System.Drawing.SizeF(116.4992F, 35.50002F); - this.xrLabel17.StylePriority.UseBackColor = false; - this.xrLabel17.StylePriority.UseFont = false; - this.xrLabel17.StylePriority.UseTextAlignment = false; - this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")}); + this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Calibri", 11F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(387.58F, 51.48621F); + this.xrLabel18.Name = "xrLabel18"; + this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(116.4993F, 35.50002F); + this.xrLabel18.StylePriority.UseFont = false; + this.xrLabel18.StylePriority.UseTextAlignment = false; + this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; // - // xrPictureBox2 + // xrPictureBox3 // - this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")}); - this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(504.0793F, 164.6946F); - this.xrPictureBox2.Name = "xrPictureBox2"; - this.xrPictureBox2.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; - this.xrPictureBox2.SizeF = new System.Drawing.SizeF(181.0458F, 35.50002F); - this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.xrPictureBox3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); + this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(504.0793F, 51.48621F); + this.xrPictureBox3.Name = "xrPictureBox3"; + this.xrPictureBox3.SizeF = new System.Drawing.SizeF(181.0459F, 35.50002F); + this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; // - // PageHeader + // lblUnterschriftKlient // - this.PageHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel4, - this.xrLabel3, - this.lblHauptbetreuer2, - this.lblHauptbetreuer1, - this.xrLabel13, - this.xrLabel28, - this.xrLabel29, - this.xrLabel30, - this.xrLabel31, - this.xrLabel9, - this.xrLabel10, - this.xrLabel11, - this.xrLabel22, - this.xrLabel23, - this.xrLabel12}); - this.PageHeader.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Bold); - this.PageHeader.HeightF = 235F; - this.PageHeader.Name = "PageHeader"; - this.PageHeader.StylePriority.UseFont = false; - // - // xrLabel4 - // - this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Costbearer", "{0:0.##}")}); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(297F, 120F); - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(369.9997F, 25F); - this.xrLabel4.StylePriority.UseBorders = false; - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.Text = "xrLabel26"; - // - // xrLabel3 - // - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 120F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(288F, 24.99998F); - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Kostenträger:"; + this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Calibri", 11F); + this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(387.58F, 86.98616F); + this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; + this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(297.545F, 20F); + this.lblUnterschriftKlient.StylePriority.UseBackColor = false; + this.lblUnterschriftKlient.StylePriority.UseBorders = false; + this.lblUnterschriftKlient.StylePriority.UseFont = false; + this.lblUnterschriftKlient.StylePriority.UsePadding = false; + this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false; + this.lblUnterschriftKlient.Text = "Datum, Unterschrift Klient/in"; + this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // // xrLabel15 // this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Underline); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 109.0001F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 66.29175F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1011,7 +950,7 @@ namespace DiakonieLandshut | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableAbwesenheiten.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); - this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(0F, 129.6946F); + this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(0F, 86.98629F); this.xrTableAbwesenheiten.Name = "xrTableAbwesenheiten"; this.xrTableAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableAbwesenheiten.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -1070,6 +1009,19 @@ namespace DiakonieLandshut this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell19.Weight = 0.088113748848989093D; // + // xrTableCell32 + // + this.xrTableCell32.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); + this.xrTableCell32.Multiline = true; + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.StylePriority.UseBorders = false; + this.xrTableCell32.StylePriority.UseFont = false; + this.xrTableCell32.StylePriority.UsePadding = false; + this.xrTableCell32.StylePriority.UseTextAlignment = false; + this.xrTableCell32.Text = "Erläuterung"; + this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell32.Weight = 0.14489819448679056D; + // // xrTableRow4 // this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { @@ -1107,57 +1059,6 @@ namespace DiakonieLandshut this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell22.Weight = 0.088113748848989093D; // - // xrLabel18 - // - this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")}); - this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Calibri", 11F); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(387.58F, 94.19455F); - this.xrLabel18.Name = "xrLabel18"; - this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel18.SizeF = new System.Drawing.SizeF(116.4993F, 35.50002F); - this.xrLabel18.StylePriority.UseFont = false; - this.xrLabel18.StylePriority.UseTextAlignment = false; - this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - // - // xrPictureBox3 - // - this.xrPictureBox3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); - this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(504.0793F, 94.19455F); - this.xrPictureBox3.Name = "xrPictureBox3"; - this.xrPictureBox3.SizeF = new System.Drawing.SizeF(181.0459F, 35.50002F); - this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // - // lblUnterschriftKlient - // - this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Calibri", 11F); - this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(387.5801F, 129.6945F); - this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; - this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(297.545F, 20F); - this.lblUnterschriftKlient.StylePriority.UseBackColor = false; - this.lblUnterschriftKlient.StylePriority.UseBorders = false; - this.lblUnterschriftKlient.StylePriority.UseFont = false; - this.lblUnterschriftKlient.StylePriority.UsePadding = false; - this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false; - this.lblUnterschriftKlient.Text = "Datum, Unterschrift Klient/in"; - this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // - // xrTableCell32 - // - this.xrTableCell32.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); - this.xrTableCell32.Multiline = true; - this.xrTableCell32.Name = "xrTableCell32"; - this.xrTableCell32.StylePriority.UseBorders = false; - this.xrTableCell32.StylePriority.UseFont = false; - this.xrTableCell32.StylePriority.UsePadding = false; - this.xrTableCell32.StylePriority.UseTextAlignment = false; - this.xrTableCell32.Text = "Erläuterung"; - this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell32.Weight = 0.14489819448679056D; - // // xrTableCell33 // this.xrTableCell33.Font = new DevExpress.Drawing.DXFont("Calibri", 10F); @@ -1168,6 +1069,75 @@ namespace DiakonieLandshut this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell33.Weight = 0.14489819448679056D; // + // xrLabel17 + // + this.xrLabel17.BackColor = System.Drawing.Color.Transparent; + this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")}); + this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Calibri", 11F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(387.58F, 121.9861F); + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(116.4992F, 35.50002F); + this.xrLabel17.StylePriority.UseBackColor = false; + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.StylePriority.UseTextAlignment = false; + this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + // + // xrPictureBox2 + // + this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")}); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(504.0793F, 121.9863F); + this.xrPictureBox2.Name = "xrPictureBox2"; + this.xrPictureBox2.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(181.0458F, 35.50002F); + this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // PageHeader + // + this.PageHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel4, + this.xrLabel3, + this.lblHauptbetreuer2, + this.lblHauptbetreuer1, + this.xrLabel13, + this.xrLabel28, + this.xrLabel29, + this.xrLabel30, + this.xrLabel31, + this.xrLabel9, + this.xrLabel10, + this.xrLabel11, + this.xrLabel22, + this.xrLabel23, + this.xrLabel12}); + this.PageHeader.Font = new DevExpress.Drawing.DXFont("Calibri", 12F, DevExpress.Drawing.DXFontStyle.Bold); + this.PageHeader.HeightF = 235F; + this.PageHeader.Name = "PageHeader"; + this.PageHeader.StylePriority.UseFont = false; + // + // xrLabel4 + // + this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Costbearer", "{0:0.##}")}); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(297F, 120F); + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(369.9997F, 25F); + this.xrLabel4.StylePriority.UseBorders = false; + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.Text = "xrLabel26"; + // + // xrLabel3 + // + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 120F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(288F, 24.99998F); + this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.Text = "Kostenträger:"; + // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1268,8 +1238,6 @@ namespace DiakonieLandshut private DevExpress.XtraReports.UI.XRTableCell cellHours; private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRLabel xrLabel2; - private DevExpress.XtraReports.UI.XRLabel lblAbsenceTimes; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; diff --git a/ReportImp/DiakonieLandshut/ServicesOverviewReport.cs b/ReportImp/DiakonieLandshut/ServicesOverviewReport.cs index 5bc7c46d0..67e4f2301 100644 --- a/ReportImp/DiakonieLandshut/ServicesOverviewReport.cs +++ b/ReportImp/DiakonieLandshut/ServicesOverviewReport.cs @@ -73,12 +73,11 @@ namespace DiakonieLandshut if (customer != null && customer.AbsenceTimes != null) { - DateTime neujahr = new DateTime(DateTime.Now.Year, 1, 1); int index = 1; foreach (var at in customer.AbsenceTimes) { - // nur Abwesenheiten aus dem aktuellen Jahr - if ((at.Start.HasValue && at.Start >= neujahr) || (at.End.HasValue && at.End >= neujahr)) + // nur Abwesenheiten aus dem aktuellen Monat + if ((at.Start.HasValue && at.Start <= pRo.EndDate) && (!at.End.HasValue || at.End.Value >= pRo.StartDate)) { DevExpress.XtraReports.UI.XRTableRow row = null; if (index < xrTableAbwesenheiten.Rows.Count) @@ -87,12 +86,9 @@ namespace DiakonieLandshut row = xrTableAbwesenheiten.InsertRowBelow(xrTableAbwesenheiten.Rows[xrTableAbwesenheiten.Rows.Count - 1]); row.Cells[0].Text = String.Format("{0:dd.MM.yy}", at.Start); - if (at.End.HasValue) row.Cells[1].Text = String.Format("{0:dd.MM.yy}", at.End); - row.Cells[2].Text = at.AbsenceReason.Description; - row.Cells[3].Text = at.Notice; index++;