From 8946abaff5646207a0184171c706b7dc245116e2 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Mon, 24 Apr 2023 10:42:43 +0200 Subject: [PATCH] MH: MeZ Menzel Fehlkontakte --- .../ServicesOverviewReport.Designer.cs | 36 +++++++++---------- .../ServicesOverviewReport.cs | 33 +++++++++++++++++ 2 files changed, 51 insertions(+), 18 deletions(-) diff --git a/ReportImp/MezMenzelReports/ServicesOverviewReport.Designer.cs b/ReportImp/MezMenzelReports/ServicesOverviewReport.Designer.cs index d4c4274a8..d82d08764 100644 --- a/ReportImp/MezMenzelReports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/MezMenzelReports/ServicesOverviewReport.Designer.cs @@ -37,6 +37,7 @@ namespace BeWo.MezMenzelReports this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); @@ -45,6 +46,7 @@ namespace BeWo.MezMenzelReports this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); @@ -80,8 +82,6 @@ namespace BeWo.MezMenzelReports this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldBillableX20Percent = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.fieldArt = new DevExpress.XtraReports.UI.CalculatedField(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); @@ -152,6 +152,12 @@ namespace BeWo.MezMenzelReports this.xrTableCell1.Text = "bis"; this.xrTableCell1.Weight = 0.25719523941864408D; // + // xrTableCell5 + // + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Text = "Art des Angebots"; + this.xrTableCell5.Weight = 0.36007335826475406D; + // // xrTableCell11 // this.xrTableCell11.Name = "xrTableCell11"; @@ -245,6 +251,16 @@ namespace BeWo.MezMenzelReports this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell2.Weight = 0.12533419682016522D; // + // xrTableCell6 + // + this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")}); + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.Text = "xrTableCell6"; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell6.Weight = 0.17546804525999415D; + // // xrTableCell15 // this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -631,22 +647,6 @@ namespace BeWo.MezMenzelReports this.fieldBillableX20Percent.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldBillableX20Percent.Name = "fieldBillableX20Percent"; // - // xrTableCell5 - // - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Text = "Art des Angebots"; - this.xrTableCell5.Weight = 0.36007335826475406D; - // - // xrTableCell6 - // - this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldArt")}); - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.StylePriority.UseTextAlignment = false; - this.xrTableCell6.Text = "xrTableCell6"; - this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell6.Weight = 0.17546804525999415D; - // // fieldArt // this.fieldArt.DataMember = "Services"; diff --git a/ReportImp/MezMenzelReports/ServicesOverviewReport.cs b/ReportImp/MezMenzelReports/ServicesOverviewReport.cs index f4be48502..45639ccf6 100644 --- a/ReportImp/MezMenzelReports/ServicesOverviewReport.cs +++ b/ReportImp/MezMenzelReports/ServicesOverviewReport.cs @@ -4,6 +4,7 @@ using System.ComponentModel; using DevExpress.XtraReports.UI; using BeWo.Report.ReportObjects; using BeWo.Report; +using System.Collections.Generic; namespace BeWo.MezMenzelReports { @@ -16,6 +17,38 @@ namespace BeWo.MezMenzelReports public void SetReportDataSource(ServicesOverviewRO pRO) { + bool hatGruppen = false; + + //if (pRO == null) + // return; + + if (pRO.Services != null) + { + List servicesBillable = new List(); + + foreach (var sd in pRO.Services) + { + if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt")) + { + ServicesOverviewRO.CreateSignatureString(sd); + sd.Notice5 = "E"; + if (sd.IsGroup) + { + //sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount); + sd.Notice5 = "GR"; + hatGruppen = true; + } + if (sd.ServiceDescription.ToLower().Contains("fehlkontakt")) + { + sd.Notice5 = "F"; + } + servicesBillable.Add(sd); + } + } + + pRO.Services = servicesBillable; + } + this.bindingSource1.DataSource = pRO; } }