From 9f75ecb3e58252139fa665eec7552dc4f7101933 Mon Sep 17 00:00:00 2001 From: Kojo Date: Mon, 24 Jul 2023 16:24:14 +0200 Subject: [PATCH] IntegroReports: Fehlkontakt-Support QB --- .../ServicesOverviewReport.Designer.cs | 77 ++++++++++++++----- .../IntegroReports/ServicesOverviewReport.cs | 19 +++-- 2 files changed, 71 insertions(+), 25 deletions(-) diff --git a/ReportImp/IntegroReports/ServicesOverviewReport.Designer.cs b/ReportImp/IntegroReports/ServicesOverviewReport.Designer.cs index 710643beb..43fc3e3a1 100644 --- a/ReportImp/IntegroReports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/IntegroReports/ServicesOverviewReport.Designer.cs @@ -47,7 +47,6 @@ namespace BeWo.IntegroReports this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = 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.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); @@ -81,6 +80,9 @@ namespace BeWo.IntegroReports this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -273,10 +275,6 @@ namespace BeWo.IntegroReports this.xrTableCell2.Name = "xrTableCell2"; this.xrTableCell2.Weight = 0.18308090025194024D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -304,14 +302,14 @@ namespace BeWo.IntegroReports this.xrLabel12, this.xrLabel1}); this.ReportHeader.Font = new System.Drawing.Font("Arial", 11F); - this.ReportHeader.HeightF = 271.5833F; + this.ReportHeader.HeightF = 264.2916F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // // xrLabel10 // this.xrLabel10.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(2F, 235F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(2F, 227F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel10.SizeF = new System.Drawing.SizeF(62.99998F, 18F); @@ -397,7 +395,7 @@ namespace BeWo.IntegroReports this.xrLabel21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Year")}); this.xrLabel21.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(299F, 235F); + this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(299F, 227F); this.xrLabel21.Name = "xrLabel21"; this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel21.SizeF = new System.Drawing.SizeF(225F, 18F); @@ -409,7 +407,7 @@ namespace BeWo.IntegroReports this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Month")}); this.xrLabel9.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(65F, 235F); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(65F, 227F); this.xrLabel9.Name = "xrLabel9"; this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel9.SizeF = new System.Drawing.SizeF(161.125F, 18F); @@ -419,7 +417,7 @@ namespace BeWo.IntegroReports // xrLabel20 // this.xrLabel20.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); - this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(245.75F, 235F); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(245.75F, 227F); this.xrLabel20.Name = "xrLabel20"; this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel20.SizeF = new System.Drawing.SizeF(53.25014F, 18F); @@ -520,6 +518,8 @@ namespace BeWo.IntegroReports // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel8, + this.xrLabel11, this.xrLabel2, this.xrLabel7, this.xrLabel6, @@ -527,14 +527,14 @@ namespace BeWo.IntegroReports this.xrLabel4, this.xrLabel3}); this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F); - this.ReportFooter.HeightF = 170.8333F; + this.ReportFooter.HeightF = 182.2917F; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // // xrLabel2 // this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(1.999919F, 127.0833F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(2.000046F, 138.5417F); this.xrLabel2.Multiline = true; this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -548,7 +548,7 @@ namespace BeWo.IntegroReports // xrLabel7 // this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(443.3334F, 86.58333F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(443.3336F, 98.04166F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel7.SizeF = new System.Drawing.SizeF(231.6666F, 17.99997F); @@ -559,7 +559,7 @@ namespace BeWo.IntegroReports // xrLabel6 // this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(164.9999F, 86.58333F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(165F, 98.04166F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel6.SizeF = new System.Drawing.SizeF(249.5833F, 17.99997F); @@ -570,7 +570,7 @@ namespace BeWo.IntegroReports // xrLabel5 // this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(1.999919F, 86.58333F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(2.000046F, 98.04166F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(135F, 17.99997F); @@ -594,21 +594,21 @@ namespace BeWo.IntegroReports this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.StylePriority.UsePadding = false; this.xrLabel4.StylePriority.UseTextAlignment = false; - this.xrLabel4.Text = "[TotalFLMBillable]"; + this.xrLabel4.Text = "[TotalFLMoFehlkontakte]"; this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // // xrLabel3 // this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(1.999919F, 0F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel3.Multiline = true; this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(277F, 20F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(279F, 20F); this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.StylePriority.UsePadding = false; this.xrLabel3.StylePriority.UseTextAlignment = false; - this.xrLabel3.Text = "Summe"; + this.xrLabel3.Text = "Summe Fachleistungen"; this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // // fieldAbrechenbareMinuten @@ -630,6 +630,42 @@ namespace BeWo.IntegroReports this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // + // xrLabel8 + // + this.xrLabel8.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00001F); + this.xrLabel8.Multiline = true; + this.xrLabel8.Name = "xrLabel8"; + this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 100F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(279F, 20F); + this.xrLabel8.StylePriority.UseFont = false; + this.xrLabel8.StylePriority.UsePadding = false; + this.xrLabel8.StylePriority.UseTextAlignment = false; + this.xrLabel8.Text = "Summe Fehlkontakte"; + this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + // + // xrLabel11 + // + this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel11.BorderWidth = 1F; + this.xrLabel11.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(279F, 20.00001F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(151F, 20F); + this.xrLabel11.StylePriority.UseBorders = false; + this.xrLabel11.StylePriority.UseBorderWidth = false; + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.StylePriority.UsePadding = false; + this.xrLabel11.StylePriority.UseTextAlignment = false; + this.xrLabel11.Text = "[TotalFLMFehlkontakte]"; + this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -715,6 +751,7 @@ namespace BeWo.IntegroReports private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; - + private DevExpress.XtraReports.UI.XRLabel xrLabel8; + private DevExpress.XtraReports.UI.XRLabel xrLabel11; } } diff --git a/ReportImp/IntegroReports/ServicesOverviewReport.cs b/ReportImp/IntegroReports/ServicesOverviewReport.cs index 67c551c81..e6a66512c 100644 --- a/ReportImp/IntegroReports/ServicesOverviewReport.cs +++ b/ReportImp/IntegroReports/ServicesOverviewReport.cs @@ -23,13 +23,22 @@ namespace BeWo.IntegroReports foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services) { - if (s.IsBillable) + if (s.IsBillable || s.ServiceDescription.ToLower().Contains("fehlkontakt") || s.ServiceCategory.ToLower().Contains("fehlkontakt")) servicesBillable.Add(s); - if (s.IsGroup) - s.Notice = "GA"; - else - s.Notice = "DL"; + if (s.IsGroup) + { + s.Notice = "GA"; + } + else + { + s.Notice = "DL"; + } + + if (s.ServiceDescription.ToLower().Contains("fehlkontakt") || s.ServiceCategory.ToLower().Contains("fehlkontakt")) + { + s.Notice = "FK"; + } } pRO.Services = servicesBillable;