From bf3810b380dc8dfe8e98e17a09acd99556845554 Mon Sep 17 00:00:00 2001 From: HirschleM Date: Tue, 1 Apr 2025 09:19:54 +0200 Subject: [PATCH] MH: AsbRheinErftDuerenSBD CustomerDataReport --- .../CustomerDataReport.Designer.cs | 36 +++++++++---------- .../CustomerDataReport.cs | 17 +++------ 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/ReportImp/AsbRheinErftDuerenSBD/CustomerDataReport.Designer.cs b/ReportImp/AsbRheinErftDuerenSBD/CustomerDataReport.Designer.cs index a9b43c5bb..dd6d60486 100644 --- a/ReportImp/AsbRheinErftDuerenSBD/CustomerDataReport.Designer.cs +++ b/ReportImp/AsbRheinErftDuerenSBD/CustomerDataReport.Designer.cs @@ -87,7 +87,7 @@ namespace AsbRheinErftDuerenSBD this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel49 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblStundenplan = new DevExpress.XtraReports.UI.XRLabel(); this.ReportHeader1 = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.lblBewilligtBis = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel46 = new DevExpress.XtraReports.UI.XRLabel(); @@ -97,6 +97,7 @@ namespace AsbRheinErftDuerenSBD this.xrLabel38 = new DevExpress.XtraReports.UI.XRLabel(); this.lblHilfeplan = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.xrTable8 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -141,16 +142,15 @@ namespace AsbRheinErftDuerenSBD this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); this.zusatzDiagnoseLabel = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tableBetreuungszeiten)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -627,7 +627,7 @@ namespace AsbRheinErftDuerenSBD this.ReportFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable4, this.tableBetreuungszeiten, - this.xrLabel49}); + this.lblStundenplan}); this.ReportFooter1.HeightF = 79.49991F; this.ReportFooter1.Name = "ReportFooter1"; // @@ -773,15 +773,15 @@ namespace AsbRheinErftDuerenSBD this.xrTableCell14.StylePriority.UsePadding = false; this.xrTableCell14.Weight = 0.32145648136317173D; // - // xrLabel49 + // lblStundenplan // - this.xrLabel49.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel49.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.49991F); - this.xrLabel49.Name = "xrLabel49"; - this.xrLabel49.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel49.SizeF = new System.Drawing.SizeF(642F, 24F); - this.xrLabel49.StylePriority.UseFont = false; - this.xrLabel49.Text = "Stundenpläne:"; + this.lblStundenplan.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.lblStundenplan.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.49991F); + this.lblStundenplan.Name = "lblStundenplan"; + this.lblStundenplan.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblStundenplan.SizeF = new System.Drawing.SizeF(642F, 24F); + this.lblStundenplan.StylePriority.UseFont = false; + this.lblStundenplan.Text = "Stundenplan von - bis"; // // ReportHeader1 // @@ -882,6 +882,10 @@ namespace AsbRheinErftDuerenSBD this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.Text = "Hilfeplan:"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.CustomerDataRO); + // // xrTable8 // this.xrTable8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 41.66667F); @@ -1384,10 +1388,6 @@ namespace AsbRheinErftDuerenSBD this.zusatzDiagnoseLabel.StylePriority.UseFont = false; this.zusatzDiagnoseLabel.StylePriority.UseTextAlignment = false; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.CustomerDataRO); - // // Klientenstammblatt // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1412,11 +1412,11 @@ namespace AsbRheinErftDuerenSBD ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tableBetreuungszeiten)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1489,7 +1489,7 @@ namespace AsbRheinErftDuerenSBD private DevExpress.XtraReports.UI.XRLabel xrLabel34; private DevExpress.XtraReports.UI.XRLabel xrLabel33; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter1; - private DevExpress.XtraReports.UI.XRLabel xrLabel49; + private DevExpress.XtraReports.UI.XRLabel lblStundenplan; private DevExpress.XtraReports.UI.XRLabel xrLabel50; private DevExpress.XtraReports.UI.XRLabel lblSchule; private DevExpress.XtraReports.UI.XRTable tableBetreuungszeiten; diff --git a/ReportImp/AsbRheinErftDuerenSBD/CustomerDataReport.cs b/ReportImp/AsbRheinErftDuerenSBD/CustomerDataReport.cs index 384d0d0dd..7d8d1d53d 100644 --- a/ReportImp/AsbRheinErftDuerenSBD/CustomerDataReport.cs +++ b/ReportImp/AsbRheinErftDuerenSBD/CustomerDataReport.cs @@ -147,9 +147,11 @@ namespace AsbRheinErftDuerenSBD { foreach (var az in zeiten) { - if ((az.GueltigVon.HasValue || az.GueltigBis.HasValue) && az.Eintraege != null) + if ((!az.GueltigVon.HasValue || az.GueltigVon <= DateTime.Now) && + (!az.GueltigBis.HasValue || az.GueltigBis >= DateTime.Now) && az.Eintraege != null) { - AddArbeitszeitTrenner(az); + lblStundenplan.Text = az.GueltigVon.HasValue ? lblStundenplan.Text.Replace("von", string.Format("{0: dd.MM.yyyy}", az.GueltigVon.Value)) : ""; + lblStundenplan.Text = az.GueltigBis.HasValue ? lblStundenplan.Text.Replace("bis", string.Format("{0: dd.MM.yyyy}", az.GueltigBis.Value)) : ""; foreach (var e in az.Eintraege) { AddArbeitszeit(e); @@ -159,17 +161,6 @@ namespace AsbRheinErftDuerenSBD } } } - - private void AddArbeitszeitTrenner(ArbeitszeitDC az) - { - XRTableRow newRow = null; - if (tableBetreuungszeiten.Rows[0].Cells[0].Text == null || tableBetreuungszeiten.Rows[0].Cells[0].Text == "") - newRow = tableBetreuungszeiten.Rows[0]; - else - newRow = tableBetreuungszeiten.InsertRowBelow(tableBetreuungszeiten.Rows[tableBetreuungszeiten.Rows.Count - 1]); - newRow.Font = new System.Drawing.Font("Arial", 9F, FontStyle.Bold); - newRow.Cells[0].Text = String.Format("{0:dd.MM.yyyy} - {1:dd.MM.yyyy}", az.GueltigVon, az.GueltigBis); - } private void AddArbeitszeit(ArbeitszeitEintragDC ae) { XRTableRow newRow = null;