From 94e6791083f34be078020d47eb046fd8ce47a852 Mon Sep 17 00:00:00 2001 From: HirschleM Date: Mon, 11 Aug 2025 12:18:21 +0200 Subject: [PATCH 1/4] MH: ChristopherushausFUD QB --- .../ChristopherusHausFamilienhilfe/Einsatzzeiten.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ReportImp/ChristopherusHausFamilienhilfe/Einsatzzeiten.cs b/ReportImp/ChristopherusHausFamilienhilfe/Einsatzzeiten.cs index 8bd5938da..97b614857 100644 --- a/ReportImp/ChristopherusHausFamilienhilfe/Einsatzzeiten.cs +++ b/ReportImp/ChristopherusHausFamilienhilfe/Einsatzzeiten.cs @@ -95,8 +95,12 @@ namespace ChristopherusHausFamilienhilfe int row = start.Day +1; string secEmp = null; - while (start <= end) - { + //while (start <= end) + //{ + if (start.Day == 29) + { + + } bool cont = true; if (cont) SetTableText(table, start, sd.ServiceCategory, sd.ServiceDescription); @@ -134,7 +138,7 @@ namespace ChristopherusHausFamilienhilfe start = start.AddDays(1); - } + //} } private void SetTableText(XRTable table, DateTime dt, String categorie, String serviceDescription) From a78b565e07182619fc9bd5af55d371fa967402b9 Mon Sep 17 00:00:00 2001 From: HirschleM Date: Mon, 11 Aug 2025 13:53:13 +0200 Subject: [PATCH 2/4] =?UTF-8?q?MH:=20LZ=20K=C3=B6nigborn=20QB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Fachleistungsstundennachweis.designer.cs | 96 ++++++++----------- 1 file changed, 40 insertions(+), 56 deletions(-) diff --git a/ReportImp/LebenszentrumKönigsborn/Fachleistungsstundennachweis.designer.cs b/ReportImp/LebenszentrumKönigsborn/Fachleistungsstundennachweis.designer.cs index 53e6135f2..6b899977e 100644 --- a/ReportImp/LebenszentrumKönigsborn/Fachleistungsstundennachweis.designer.cs +++ b/ReportImp/LebenszentrumKönigsborn/Fachleistungsstundennachweis.designer.cs @@ -42,7 +42,6 @@ namespace LebenszentrumKoenigsborn this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); - this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -85,6 +84,9 @@ namespace LebenszentrumKoenigsborn this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); @@ -93,9 +95,6 @@ namespace LebenszentrumKoenigsborn this.lblUnterschriftMitarbeiter = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); this.Hours = new DevExpress.XtraReports.UI.CalculatedField(); - this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); - this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); @@ -222,8 +221,6 @@ namespace LebenszentrumKoenigsborn // // xrTableCell50 // - this.xrTableCell50.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.picSignature}); this.xrTableCell50.Name = "xrTableCell50"; this.xrTableCell50.StylePriority.UseBorders = false; this.xrTableCell50.StylePriority.UseFont = false; @@ -232,18 +229,6 @@ namespace LebenszentrumKoenigsborn this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell50.Weight = 0.16766258323313957D; // - // picSignature - // - this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); - this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(6.371155F, 0F); - this.picSignature.Name = "picSignature"; - this.picSignature.SizeF = new System.Drawing.SizeF(145.5569F, 21.99999F); - this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - this.picSignature.StylePriority.UseBorders = false; - this.picSignature.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.picSignature_BeforePrint); - // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -450,7 +435,7 @@ namespace LebenszentrumKoenigsborn this.xrTableCell12.StylePriority.UseFont = false; this.xrTableCell12.StylePriority.UsePadding = false; this.xrTableCell12.StylePriority.UseTextAlignment = false; - this.xrTableCell12.Text = "Klient/-in"; + this.xrTableCell12.Text = "Mitarbeiter/-in"; this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell12.Weight = 0.12438260807783755D; // @@ -915,6 +900,42 @@ namespace LebenszentrumKoenigsborn this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // + // lblUnterschriftKlient + // + this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 146.6667F); + this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; + this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(336.6944F, 36.29156F); + 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.MiddleCenter; + // + // xrPictureBox2 + // + this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(186.6944F, 111.1667F); + this.xrPictureBox2.Name = "xrPictureBox2"; + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); + this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrLabel18 + // + this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")}); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 111.1667F); + this.xrLabel18.Name = "xrLabel18"; + this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(137.3333F, 35.50002F); + this.xrLabel18.StylePriority.UseTextAlignment = false; + this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + // // xrLabel15 // this.xrLabel15.Borders = DevExpress.XtraPrinting.BorderSide.None; @@ -1018,42 +1039,6 @@ namespace LebenszentrumKoenigsborn this.Hours.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.Hours.Name = "Hours"; // - // lblUnterschriftKlient - // - this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 146.6667F); - this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; - this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(336.6944F, 36.29156F); - 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.MiddleCenter; - // - // xrPictureBox2 - // - this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); - this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(186.6944F, 111.1667F); - this.xrPictureBox2.Name = "xrPictureBox2"; - this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); - this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - // - // xrLabel18 - // - this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")}); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 111.1667F); - this.xrLabel18.Name = "xrLabel18"; - this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel18.SizeF = new System.Drawing.SizeF(137.3333F, 35.50002F); - this.xrLabel18.StylePriority.UseTextAlignment = false; - this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); @@ -1118,7 +1103,6 @@ namespace LebenszentrumKoenigsborn private DevExpress.XtraReports.UI.XRTableCell xrTableCell50; private DevExpress.XtraReports.UI.CalculatedField fieldKontaktArt; private DevExpress.XtraReports.UI.XRLabel lblUnterschriftMitarbeiter; - private DevExpress.XtraReports.UI.XRPictureBox picSignature; private DevExpress.XtraReports.UI.XRLabel xrLabel24; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3; private DevExpress.XtraReports.UI.XRLabel xrLabel8; From 68f40bccb7d102eaaa013fdfeacba74d39864c54 Mon Sep 17 00:00:00 2001 From: HirschleM Date: Mon, 11 Aug 2025 14:29:31 +0200 Subject: [PATCH 3/4] MH: Suchtkrankenhilfe Ostfriesland Calculations --- .../Calculation/CustomCalculations.cs | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/ReportImp/SuchtkrankenhilfeOstfriesland/Calculation/CustomCalculations.cs b/ReportImp/SuchtkrankenhilfeOstfriesland/Calculation/CustomCalculations.cs index 0d85497e0..3160478b0 100644 --- a/ReportImp/SuchtkrankenhilfeOstfriesland/Calculation/CustomCalculations.cs +++ b/ReportImp/SuchtkrankenhilfeOstfriesland/Calculation/CustomCalculations.cs @@ -26,18 +26,25 @@ namespace SuchtkrankenhilfeOstfriesland.Calculation // Jetzt müssen die Zeiterfassungseinträge für den abgerechneten Zeitraum geholt werden. Die dienen denen als Anwesenheitsliste. // Ist die Person weniger als die Hälfte der abgerechneten Tage anwesend gewesen, wird der Betrag halbiert. var serviceRecords = DAOFactory.SearchDAO.FindServiceRecordsDetailsForLastDaysWithStartEndDate(CustomTagesstrukturInvoiceCreation.CostBearer2SupportConcept.Oid.Value, start.Value, end.Value); - List anwesenheitstage = new List(); - foreach (var sr in serviceRecords) + if (serviceRecords != null && serviceRecords.Count > 0) { - if (!anwesenheitstage.Contains(sr.Start.Value.Date)) - anwesenheitstage.Add(sr.Start.Value.Date); - } + var anwesenheiten = serviceRecords.Where(s => s.ServiceDescription.Name.Trim().ToLower().Contains("anwesend ts")).OrderBy(s => s.Start).ToList(); - if ((end.Value - start.Value).TotalDays / 2 > anwesenheitstage.Count) - { - data.AmountTotal /= 2; - data.GrossAmountTotal /= 2; + List anwesenheitstage = new List(); + foreach (var sr in anwesenheiten) + { + if (!anwesenheitstage.Contains(sr.Start.Value.Date)) + anwesenheitstage.Add(sr.Start.Value.Date); + } + + // Wenn die erste Anwesenheit erst ab dem 15. ist, wird die Pauschale für den Monat halbiert + if (anwesenheitstage[0].Day <= 15) + { + data.AmountTotal /= 2; + data.GrossAmountTotal /= 2; + } } + } return billingData; From a0c37cdceb8edf9f722711c1f26f0262f6f40312 Mon Sep 17 00:00:00 2001 From: HirschleM Date: Mon, 11 Aug 2025 14:29:49 +0200 Subject: [PATCH 4/4] MH: Alzey QB Deadline --- ReportImp/AlzeyTeilhabe/CustomReportCreator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReportImp/AlzeyTeilhabe/CustomReportCreator.cs b/ReportImp/AlzeyTeilhabe/CustomReportCreator.cs index 2d2f9230a..3341bef17 100644 --- a/ReportImp/AlzeyTeilhabe/CustomReportCreator.cs +++ b/ReportImp/AlzeyTeilhabe/CustomReportCreator.cs @@ -108,7 +108,7 @@ namespace AlzeyTeilhabe } } - if (kt == "Kreisverwaltung Mainz-Bingen" && ro.StartDate.Date <= new DateTime(2025, 07, 31)) + if (kt == "Kreisverwaltung Mainz-Bingen" && ro.StartDate.Date <= new DateTime(2025, 06, 30)) report = new AlzeyTeilhabe.StundenzettelBi2(); if (report == null && function == "Kostenträger Soziotherapie")