diff --git a/ReportImp/AlzeyTeilhabe/Leistungsbestaetigung.Designer.cs b/ReportImp/AlzeyTeilhabe/Leistungsbestaetigung.Designer.cs index 6517fab82..76e72ed36 100644 --- a/ReportImp/AlzeyTeilhabe/Leistungsbestaetigung.Designer.cs +++ b/ReportImp/AlzeyTeilhabe/Leistungsbestaetigung.Designer.cs @@ -45,6 +45,7 @@ namespace AlzeyTeilhabe this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.Seite1 = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); @@ -139,15 +140,14 @@ namespace AlzeyTeilhabe this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.CustomerCountPool = new DevExpress.XtraReports.UI.CalculatedField(); this.CustomerCountGruppe = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -319,6 +319,10 @@ namespace AlzeyTeilhabe this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell11.Weight = 0.17338917401506007D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -749,8 +753,6 @@ namespace AlzeyTeilhabe this.lblGesamtleistung.BackColor = System.Drawing.Color.Transparent; this.lblGesamtleistung.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblGesamtleistung.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSoFehlkontakte")}); this.lblGesamtleistung.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.lblGesamtleistung.ForeColor = System.Drawing.Color.SteelBlue; this.lblGesamtleistung.Multiline = true; @@ -1605,10 +1607,6 @@ namespace AlzeyTeilhabe this.CustomerCountGruppe.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.CustomerCountGruppe.Name = "CustomerCountGruppe"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // Leistungsbestaetigung1 // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1637,20 +1635,20 @@ namespace AlzeyTeilhabe this.formattingRuleEmployeeName}); this.Margins = new DevExpress.Drawing.DXMargins(61F, 16F, 50F, 30F); this.PageHeight = 1169; - this.PageWidth = 826; + this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.SnapGridSize = 9F; this.Version = "23.2"; xrWatermark1.Id = "Watermark1"; this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } diff --git a/ReportImp/AlzeyTeilhabe/Leistungsbestaetigung.cs b/ReportImp/AlzeyTeilhabe/Leistungsbestaetigung.cs index b9af05146..21bc4cfcd 100644 --- a/ReportImp/AlzeyTeilhabe/Leistungsbestaetigung.cs +++ b/ReportImp/AlzeyTeilhabe/Leistungsbestaetigung.cs @@ -39,6 +39,7 @@ namespace AlzeyTeilhabe double summeEinzelleistung = 0; double summePoolleistung = 0; double summeGruppenleistung = 0; + double summeGesamt = 0; List servicesBillable = new List(); @@ -75,12 +76,16 @@ namespace AlzeyTeilhabe } } - lblEinzelleistung1.Text = string.Format("{0:0.00}", summeEinzelleistung / 60); + lblEinzelleistung1.Text = string.Format("{0:0.00}", Math.Round(summeEinzelleistung / 60, 2, MidpointRounding.AwayFromZero)); tcSummeFLS.Text = lblEinzelleistung1.Text; - lblPoolleistung1.Text = string.Format("{0:0.00}", summePoolleistung / 60); + lblPoolleistung1.Text = string.Format("{0:0.00}", Math.Round(summePoolleistung / 60, 2, MidpointRounding.AwayFromZero)); tcSummePool.Text = lblPoolleistung1.Text; - lblGruppenleistung1.Text = string.Format("{0:0.00}", summeGruppenleistung / 60); + lblGruppenleistung1.Text = string.Format("{0:0.00}", Math.Round(summeGruppenleistung / 60, 2, MidpointRounding.AwayFromZero)); tcSummeGruppe.Text = lblGruppenleistung1.Text; + summeGesamt = Math.Round(summeEinzelleistung / 60, 2, MidpointRounding.AwayFromZero) + + Math.Round(summePoolleistung / 60, 2, MidpointRounding.AwayFromZero) + + Math.Round(summeGruppenleistung / 60, 2, MidpointRounding.AwayFromZero); + lblGesamtleistung.Text = string.Format("{0:0.00}", summeGesamt); pRO.Services = servicesBillable; }