From 56a702e83cec5950243b010c119e2226556c6a6f Mon Sep 17 00:00:00 2001 From: HirschleM Date: Fri, 17 Apr 2026 13:15:00 +0200 Subject: [PATCH] MH: MuellestumpeReports QB Fix --- .../CustomReportCreator.cs | 3 +- .../QuittierungsbelegAifKo.cs | 7 ++ .../QuittierungsbelegAifKo.designer.cs | 74 +++++++++---------- 3 files changed, 46 insertions(+), 38 deletions(-) diff --git a/ReportImp/MuellestumpeReports/CustomReportCreator.cs b/ReportImp/MuellestumpeReports/CustomReportCreator.cs index 1567d3ac2..8bcf5b8b9 100644 --- a/ReportImp/MuellestumpeReports/CustomReportCreator.cs +++ b/ReportImp/MuellestumpeReports/CustomReportCreator.cs @@ -100,7 +100,8 @@ namespace BeWo.MuellestumpeReports } else { - defaultRo.Services.Add(s); + if (s.IsBillable) + defaultRo.Services.Add(s); } } } diff --git a/ReportImp/MuellestumpeReports/QuittierungsbelegAifKo.cs b/ReportImp/MuellestumpeReports/QuittierungsbelegAifKo.cs index 4cdc7d81f..ef4d42eac 100644 --- a/ReportImp/MuellestumpeReports/QuittierungsbelegAifKo.cs +++ b/ReportImp/MuellestumpeReports/QuittierungsbelegAifKo.cs @@ -23,6 +23,13 @@ namespace BeWo.MuellestumpeReports pRO.ApprovedEndDate = pRO.RequestedEndDate; } + if (pRO.SupportConceptCostBearer.CostBearer != null && pRO.SupportConceptCostBearer.CostBearer.Name.ToLower().Contains("sozialamt rhein-sieg-kreis")) + { + lblCustomerDate.Visible = false; + lblCustomerSignature.Visible = false; + lblSignatureLine.Visible = false; + } + foreach (var ap in pRO.SupportConceptCostBearer.ApprovalPeriodList) { if (ap.StartDate.HasValue && ap.EndDate.HasValue && pRO.StartDate >= ap.StartDate.Value && pRO.StartDate <= ap.EndDate) diff --git a/ReportImp/MuellestumpeReports/QuittierungsbelegAifKo.designer.cs b/ReportImp/MuellestumpeReports/QuittierungsbelegAifKo.designer.cs index 8dd1eba2a..6d1ebef26 100644 --- a/ReportImp/MuellestumpeReports/QuittierungsbelegAifKo.designer.cs +++ b/ReportImp/MuellestumpeReports/QuittierungsbelegAifKo.designer.cs @@ -49,6 +49,7 @@ namespace BeWo.MuellestumpeReports this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); @@ -79,20 +80,19 @@ namespace BeWo.MuellestumpeReports this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblCustomerDate = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.lblCustomerSignature = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.lblAbsencetimes = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblSignatureLine = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldTotalFLSBillable = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldTotalFLSBillableXRateFactor = new DevExpress.XtraReports.UI.CalculatedField(); this.customerCountField = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -284,6 +284,10 @@ namespace BeWo.MuellestumpeReports this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell2.Weight = 0.22455244243040143D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -607,13 +611,13 @@ namespace BeWo.MuellestumpeReports // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel18, + this.lblCustomerDate, this.xrPictureBox2, - this.xrPictureBox3, + this.lblCustomerSignature, this.xrLabel17, this.xrLabel13, this.lblAbsencetimes, - this.xrLabel7, + this.lblSignatureLine, this.xrLabel6, this.xrLabel3}); this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 8F); @@ -621,16 +625,16 @@ namespace BeWo.MuellestumpeReports this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // - // xrLabel18 + // lblCustomerDate // - this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.lblCustomerDate.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(429.0415F, 83.95831F); - this.xrLabel18.Name = "xrLabel18"; - this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel18.SizeF = new System.Drawing.SizeF(85F, 35.5F); - this.xrLabel18.StylePriority.UseTextAlignment = false; - this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.lblCustomerDate.LocationFloat = new DevExpress.Utils.PointFloat(429.0415F, 83.95831F); + this.lblCustomerDate.Name = "lblCustomerDate"; + this.lblCustomerDate.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblCustomerDate.SizeF = new System.Drawing.SizeF(85F, 35.5F); + this.lblCustomerDate.StylePriority.UseTextAlignment = false; + this.lblCustomerDate.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; // // xrPictureBox2 // @@ -642,14 +646,14 @@ namespace BeWo.MuellestumpeReports this.xrPictureBox2.SizeF = new System.Drawing.SizeF(150.8751F, 35.50002F); this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; // - // xrPictureBox3 + // lblCustomerSignature // - this.xrPictureBox3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.lblCustomerSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); - this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(514.0415F, 83.95831F); - this.xrPictureBox3.Name = "xrPictureBox3"; - this.xrPictureBox3.SizeF = new System.Drawing.SizeF(161.9996F, 35.50002F); - this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.lblCustomerSignature.LocationFloat = new DevExpress.Utils.PointFloat(514.0415F, 83.95831F); + this.lblCustomerSignature.Name = "lblCustomerSignature"; + this.lblCustomerSignature.SizeF = new System.Drawing.SizeF(161.9996F, 35.50002F); + this.lblCustomerSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; // // xrLabel17 // @@ -692,16 +696,16 @@ namespace BeWo.MuellestumpeReports this.lblAbsencetimes.SizeF = new System.Drawing.SizeF(674.9995F, 23.00001F); this.lblAbsencetimes.Text = "lblAbsencetimes"; // - // xrLabel7 + // lblSignatureLine // - this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(429.0417F, 119.4583F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(246.9995F, 17.99997F); - this.xrLabel7.StylePriority.UseBorders = false; - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "Datum, Unterschrift Klient/in oder Stellvertretung"; + this.lblSignatureLine.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.lblSignatureLine.LocationFloat = new DevExpress.Utils.PointFloat(429.0417F, 119.4583F); + this.lblSignatureLine.Name = "lblSignatureLine"; + this.lblSignatureLine.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblSignatureLine.SizeF = new System.Drawing.SizeF(246.9995F, 17.99997F); + this.lblSignatureLine.StylePriority.UseBorders = false; + this.lblSignatureLine.StylePriority.UseFont = false; + this.lblSignatureLine.Text = "Datum, Unterschrift Klient/in oder Stellvertretung"; // // xrLabel6 // @@ -756,10 +760,6 @@ namespace BeWo.MuellestumpeReports this.customerCountField.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.customerCountField.Name = "customerCountField"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // QuittierungsbelegAifKo // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -836,7 +836,7 @@ namespace BeWo.MuellestumpeReports private DevExpress.XtraReports.UI.XRLabel xrLabel22; private DevExpress.XtraReports.UI.XRLabel xrLabel23; private DevExpress.XtraReports.UI.XRLabel xrLabel11; - private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel lblSignatureLine; private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; @@ -846,9 +846,9 @@ namespace BeWo.MuellestumpeReports private DevExpress.XtraReports.UI.XRLabel xrLabel13; private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRLabel xrLabel18; + private DevExpress.XtraReports.UI.XRLabel lblCustomerDate; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; - private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3; + private DevExpress.XtraReports.UI.XRPictureBox lblCustomerSignature; private DevExpress.XtraReports.UI.XRLabel xrLabel17; private DevExpress.XtraReports.UI.XRLabel xrLabel14; private DevExpress.XtraReports.UI.XRLabel xrLabel10;