From 161fdbd653bee0da3cbafed7defa12a474639109 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Tue, 28 Mar 2023 08:52:32 +0200 Subject: [PATCH] MH: HausTheresia Fehlkontakte --- .../HausTheresia/ServicesOverviewReport.cs | 2 ++ .../HausTheresia/SettlementReport.Designer.cs | 27 ++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/ReportImp/HausTheresia/ServicesOverviewReport.cs b/ReportImp/HausTheresia/ServicesOverviewReport.cs index 554893ad1..984e13625 100644 --- a/ReportImp/HausTheresia/ServicesOverviewReport.cs +++ b/ReportImp/HausTheresia/ServicesOverviewReport.cs @@ -23,6 +23,8 @@ namespace BeWo.HausTheresia foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services) { + if (s.ServiceDescription.ToLower().Contains("fehlkontakt")) + s.TimeRangeString += " (Fehlkontakt)"; if (s.IsBillable) servicesBillable.Add(s); } diff --git a/ReportImp/HausTheresia/SettlementReport.Designer.cs b/ReportImp/HausTheresia/SettlementReport.Designer.cs index 848a7cb55..43b9371f3 100644 --- a/ReportImp/HausTheresia/SettlementReport.Designer.cs +++ b/ReportImp/HausTheresia/SettlementReport.Designer.cs @@ -58,12 +58,14 @@ namespace HausTheresia this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail // this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel13, this.xrPanel1, this.xrLabel4, this.xrLine1, @@ -72,7 +74,7 @@ namespace HausTheresia this.xrCheckBox2, this.xrCheckBox1}); this.Detail.Font = new System.Drawing.Font("Arial", 11F); - this.Detail.HeightF = 579.4375F; + this.Detail.HeightF = 608.6042F; this.Detail.Name = "Detail"; this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.Detail.StylePriority.UseFont = false; @@ -202,7 +204,7 @@ namespace HausTheresia // xrLabel4 // this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 403.875F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.002686183F, 433.0417F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -213,7 +215,7 @@ namespace HausTheresia // // xrLine1 // - this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 544.3542F); + this.xrLine1.LocationFloat = new DevExpress.Utils.PointFloat(0.002686183F, 573.5209F); this.xrLine1.Name = "xrLine1"; this.xrLine1.SizeF = new System.Drawing.SizeF(678.3188F, 10.79163F); // @@ -222,7 +224,7 @@ namespace HausTheresia this.xrLabel35.BackColor = System.Drawing.Color.Transparent; this.xrLabel35.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrLabel35.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(2.997335F, 555.1459F); + this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(3.000021F, 584.3126F); this.xrLabel35.Multiline = true; this.xrLabel35.Name = "xrLabel35"; this.xrLabel35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -236,7 +238,7 @@ namespace HausTheresia // xrLabel12 // this.xrLabel12.BackColor = System.Drawing.Color.Transparent; - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.0832F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0.002686183F, 296.25F); this.xrLabel12.Multiline = true; this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -247,7 +249,7 @@ namespace HausTheresia // // xrCheckBox2 // - this.xrCheckBox2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 226.0367F); + this.xrCheckBox2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 263.5368F); this.xrCheckBox2.Name = "xrCheckBox2"; this.xrCheckBox2.SizeF = new System.Drawing.SizeF(211.0832F, 21.875F); this.xrCheckBox2.StylePriority.UseFont = false; @@ -255,7 +257,7 @@ namespace HausTheresia // // xrCheckBox1 // - this.xrCheckBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192.7034F); + this.xrCheckBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 230.2034F); this.xrCheckBox1.Name = "xrCheckBox1"; this.xrCheckBox1.SizeF = new System.Drawing.SizeF(493.5575F, 21.875F); this.xrCheckBox1.StylePriority.UseFont = false; @@ -409,6 +411,16 @@ namespace HausTheresia // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); // + // xrLabel13 + // + this.xrLabel13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0.002686183F, 189.5784F); + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(673.3162F, 23F); + this.xrLabel13.Text = "xrLabel13"; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -460,5 +472,6 @@ namespace HausTheresia private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRLabel xrLabel8; private DevExpress.XtraReports.UI.XRLabel xrLabel11; + private DevExpress.XtraReports.UI.XRLabel xrLabel13; } }