diff --git a/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.Designer.cs b/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.Designer.cs index e82763d7d..486dea93e 100644 --- a/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.Designer.cs @@ -71,7 +71,6 @@ namespace BeWo.ASBBergischGladbachReports this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); - this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); this.lblFehlkontakt = new DevExpress.XtraReports.UI.XRLabel(); @@ -79,15 +78,17 @@ namespace BeWo.ASBBergischGladbachReports this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblOhneFK = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblOhneFKMitFaktor = new DevExpress.XtraReports.UI.XRLabel(); + this.lblFehlkontakte = new DevExpress.XtraReports.UI.XRLabel(); + this.lblFehlkontakteInfo = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); @@ -166,7 +167,7 @@ namespace BeWo.ASBBergischGladbachReports this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); this.xrTableCell11.StylePriority.UseFont = false; this.xrTableCell11.StylePriority.UseTextAlignment = false; - this.xrTableCell11.Text = "Stunden"; + this.xrTableCell11.Text = "Minuten"; this.xrTableCell11.Weight = 0.59078228166487934D; // // DetailReport @@ -529,7 +530,10 @@ namespace BeWo.ASBBergischGladbachReports // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel28, + this.lblFehlkontakte, + this.lblFehlkontakteInfo, + this.xrLabel4, + this.lblOhneFKMitFaktor, this.xrLabel19, this.xrLabel27, this.lblFehlkontakt, @@ -537,33 +541,15 @@ namespace BeWo.ASBBergischGladbachReports this.xrLabel5, this.xrPictureBox1, this.xrLabel17, - this.xrLabel11, - this.xrLabel8, this.xrLabel7, this.xrLabel6, - this.xrLabel4, + this.lblOhneFK, this.xrLabel3}); this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 11F); - this.ReportFooter.HeightF = 149.6795F; + this.ReportFooter.HeightF = 215.8046F; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // - // xrLabel28 - // - this.xrLabel28.BackColor = System.Drawing.Color.Transparent; - this.xrLabel28.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel28.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(360.9582F, 21.9792F); - this.xrLabel28.Name = "xrLabel28"; - this.xrLabel28.SizeF = new System.Drawing.SizeF(320.0001F, 18.02081F); - this.xrLabel28.StylePriority.UseBackColor = false; - this.xrLabel28.StylePriority.UseBorders = false; - this.xrLabel28.StylePriority.UseFont = false; - this.xrLabel28.StylePriority.UsePadding = false; - this.xrLabel28.StylePriority.UseTextAlignment = false; - this.xrLabel28.Text = "ohne Faktor 1,2 (wird erst bei Abrechnung eingerechnet)"; - this.xrLabel28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - // // xrLabel19 // this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 10F); @@ -613,7 +599,7 @@ namespace BeWo.ASBBergischGladbachReports // this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); - this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(479.9581F, 95.1794F); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(479.9581F, 161.3045F); this.xrPictureBox2.Name = "xrPictureBox2"; this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; @@ -622,7 +608,7 @@ namespace BeWo.ASBBergischGladbachReports // this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")}); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(359.9583F, 95.1794F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(359.9583F, 161.3045F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(120F, 35.5F); @@ -633,7 +619,7 @@ namespace BeWo.ASBBergischGladbachReports // this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")}); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(119.9999F, 95.17927F); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(119.9999F, 161.3044F); this.xrPictureBox1.Name = "xrPictureBox1"; this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; this.xrPictureBox1.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); @@ -644,7 +630,7 @@ namespace BeWo.ASBBergischGladbachReports this.xrLabel17.BackColor = System.Drawing.Color.Transparent; this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")}); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 95.1794F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 161.3045F); this.xrLabel17.Name = "xrLabel17"; this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel17.SizeF = new System.Drawing.SizeF(120F, 35.5F); @@ -652,41 +638,10 @@ namespace BeWo.ASBBergischGladbachReports this.xrLabel17.StylePriority.UseTextAlignment = false; this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; // - // xrLabel11 - // - this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel11.BorderWidth = 1F; - this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSFehlkontakte")}); - this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 11F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(438.6945F, 39.99996F); - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(242.2637F, 20.00002F); - 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.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // - // xrLabel8 - // - this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(266.9168F, 40.00001F); - this.xrLabel8.Multiline = true; - this.xrLabel8.Name = "xrLabel8"; - this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(171.1388F, 19.99998F); - this.xrLabel8.StylePriority.UseFont = false; - this.xrLabel8.Text = "Fehlkontakte in Stunden"; - // // xrLabel7 // this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(359.9583F, 131.6795F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(359.9583F, 197.8046F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel7.SizeF = new System.Drawing.SizeF(319.3611F, 17.99997F); @@ -697,7 +652,7 @@ namespace BeWo.ASBBergischGladbachReports // xrLabel6 // this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 131.6794F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 197.8045F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel6.SizeF = new System.Drawing.SizeF(319.3611F, 17.99997F); @@ -705,37 +660,35 @@ namespace BeWo.ASBBergischGladbachReports this.xrLabel6.StylePriority.UseFont = false; this.xrLabel6.Text = "Datum, Unterschrift Mitarbeiter/in"; // - // xrLabel4 + // lblOhneFK // - this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + this.lblOhneFK.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel4.BorderWidth = 2F; - this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSoFehlkontakte")}); - this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11F); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(438.0557F, 0F); - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(242.2637F, 21.9792F); - this.xrLabel4.StylePriority.UseBorders = false; - this.xrLabel4.StylePriority.UseBorderWidth = false; - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.StylePriority.UsePadding = false; - this.xrLabel4.StylePriority.UseTextAlignment = false; - this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrLabel4.TextFormatString = "{0:0.00}"; + this.lblOhneFK.BorderWidth = 2F; + this.lblOhneFK.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.lblOhneFK.LocationFloat = new DevExpress.Utils.PointFloat(438.0555F, 0F); + this.lblOhneFK.Name = "lblOhneFK"; + this.lblOhneFK.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); + this.lblOhneFK.SizeF = new System.Drawing.SizeF(242.2638F, 50F); + this.lblOhneFK.StylePriority.UseBorders = false; + this.lblOhneFK.StylePriority.UseBorderWidth = false; + this.lblOhneFK.StylePriority.UseFont = false; + this.lblOhneFK.StylePriority.UsePadding = false; + this.lblOhneFK.StylePriority.UseTextAlignment = false; + this.lblOhneFK.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // // xrLabel3 // this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(266.9168F, 0F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(194.9168F, 0F); this.xrLabel3.Multiline = true; this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(171.1388F, 21.9792F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(243.1387F, 50F); this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Fachleistungen in Stunden"; + this.xrLabel3.Text = "1. Summe der unmittelbaren Betreuungsleistungen (\"face-to-face\" beziehungsweise \"" + + "ear-to-ear\"):"; // // fieldAbrechenbareMinuten // @@ -756,6 +709,65 @@ namespace BeWo.ASBBergischGladbachReports this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS"; // + // xrLabel4 + // + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(194.9168F, 49.99998F); + this.xrLabel4.Multiline = true; + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(243.1388F, 50F); + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.Text = "2. Summe der mit dem Landschaftsverband Rheinland abzu-rechnenden Leistungen (=1 " + + "x 1,2)"; + // + // lblOhneFKMitFaktor + // + this.lblOhneFKMitFaktor.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblOhneFKMitFaktor.BorderWidth = 2F; + this.lblOhneFKMitFaktor.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.lblOhneFKMitFaktor.LocationFloat = new DevExpress.Utils.PointFloat(438.6945F, 49.99998F); + this.lblOhneFKMitFaktor.Name = "lblOhneFKMitFaktor"; + this.lblOhneFKMitFaktor.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); + this.lblOhneFKMitFaktor.SizeF = new System.Drawing.SizeF(242.2638F, 50F); + this.lblOhneFKMitFaktor.StylePriority.UseBorders = false; + this.lblOhneFKMitFaktor.StylePriority.UseBorderWidth = false; + this.lblOhneFKMitFaktor.StylePriority.UseFont = false; + this.lblOhneFKMitFaktor.StylePriority.UsePadding = false; + this.lblOhneFKMitFaktor.StylePriority.UseTextAlignment = false; + this.lblOhneFKMitFaktor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // lblFehlkontakte + // + this.lblFehlkontakte.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblFehlkontakte.BorderWidth = 2F; + this.lblFehlkontakte.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.lblFehlkontakte.LocationFloat = new DevExpress.Utils.PointFloat(438.0555F, 99.99995F); + this.lblFehlkontakte.Name = "lblFehlkontakte"; + this.lblFehlkontakte.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); + this.lblFehlkontakte.SizeF = new System.Drawing.SizeF(242.2638F, 49.99998F); + this.lblFehlkontakte.StylePriority.UseBorders = false; + this.lblFehlkontakte.StylePriority.UseBorderWidth = false; + this.lblFehlkontakte.StylePriority.UseFont = false; + this.lblFehlkontakte.StylePriority.UsePadding = false; + this.lblFehlkontakte.StylePriority.UseTextAlignment = false; + this.lblFehlkontakte.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // lblFehlkontakteInfo + // + this.lblFehlkontakteInfo.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblFehlkontakteInfo.LocationFloat = new DevExpress.Utils.PointFloat(194.9167F, 99.99995F); + this.lblFehlkontakteInfo.Multiline = true; + this.lblFehlkontakteInfo.Name = "lblFehlkontakteInfo"; + this.lblFehlkontakteInfo.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblFehlkontakteInfo.SizeF = new System.Drawing.SizeF(243.1388F, 50F); + this.lblFehlkontakteInfo.StylePriority.UseFont = false; + this.lblFehlkontakteInfo.Text = "3. Summe der Fehlkontakte"; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); @@ -835,13 +847,11 @@ namespace BeWo.ASBBergischGladbachReports private DevExpress.XtraReports.UI.XRLabel xrLabel22; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareMinuten; - private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRLabel lblOhneFK; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.XRLabel xrLabel10; - private DevExpress.XtraReports.UI.XRLabel xrLabel8; - private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLS; private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; @@ -853,6 +863,9 @@ namespace BeWo.ASBBergischGladbachReports private DevExpress.XtraReports.UI.XRLabel lblFehlkontakt; private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; - private DevExpress.XtraReports.UI.XRLabel xrLabel28; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRLabel lblOhneFKMitFaktor; + private DevExpress.XtraReports.UI.XRLabel lblFehlkontakte; + private DevExpress.XtraReports.UI.XRLabel lblFehlkontakteInfo; } } diff --git a/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.cs b/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.cs index 0fe5a82f3..461b8a80d 100644 --- a/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.cs +++ b/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.cs @@ -22,12 +22,12 @@ namespace BeWo.ASBBergischGladbachReports { if (s.IsBillable || s.ServiceDescription.ToLower().Contains("fehlkontakt") || s.ServiceCategory.ToLower().Contains("fehlkontakt")) { - s.Notice = String.Format("{0:0.00}", s.Minutes / 60); + s.Notice = String.Format("{0:0.##}", s.Minutes); s.Notice5 = "E"; if (s.IsGroup) { s.TimeRangeString += " Gruppe"; - s.Notice = String.Format("{0} Teiln. = {1:0.00} Minuten", s.CustomerCount, s.Minutes); + s.Notice = String.Format("{0} Teiln. = {1:0.##} Minuten", s.CustomerCount, s.Minutes); s.Notice5 = "GR"; } if (s.ServiceDescription.ToLower().Contains("fehlkontakt") || s.ServiceCategory.ToLower().Contains("fehlkontakt")) @@ -39,6 +39,16 @@ namespace BeWo.ASBBergischGladbachReports } pRO.Services = servicesBillable; + + lblOhneFK.Text = string.Format("{0} = {1:0.00} Stunden", pRO.TotalFLMoFehlkontakte, pRO.TotalFLSoFehlkontakte); + lblOhneFKMitFaktor.Text = string.Format("{0:0.00} h x 1,2 = {1:0.00} h", pRO.TotalFLSoFehlkontakte, pRO.TotalFLSoFehlkontakte * 1.2); + if (pRO.TotalFLMFehlkontakte != 0 && pRO.TotalFLSFehlkontakte != 0) + lblFehlkontakte.Text = string.Format("{0} = {1:0.00} Stunden", pRO.TotalFLMFehlkontakte, pRO.TotalFLSFehlkontakte); + else + { + lblFehlkontakteInfo.Visible = false; + lblFehlkontakte.Visible = false; + } } bindingSource1.DataSource = pRO;