diff --git a/ReportImp/SeverinReports/ServicesOverviewReport.Designer.cs b/ReportImp/SeverinReports/ServicesOverviewReport.Designer.cs index c83742a59..1a780aa2d 100644 --- a/ReportImp/SeverinReports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/SeverinReports/ServicesOverviewReport.Designer.cs @@ -94,6 +94,8 @@ namespace BeWo.SeverinReports this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldTeilnehmer = new DevExpress.XtraReports.UI.CalculatedField(); this.FLMToHours = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.labelFehlkontakteWert = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -497,6 +499,8 @@ namespace BeWo.SeverinReports // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel11, + this.labelFehlkontakteWert, this.xrLabel10, this.lblAbwesenheiten, this.labelAbrechenbarText, @@ -512,7 +516,7 @@ namespace BeWo.SeverinReports // this.xrLabel10.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrLabel10.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 101.2083F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(2.041753F, 125.1666F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel10.SizeF = new System.Drawing.SizeF(122.9583F, 17.99997F); @@ -526,7 +530,7 @@ namespace BeWo.SeverinReports this.lblAbwesenheiten.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); this.lblAbwesenheiten.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(325F, 101.2083F); + this.lblAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(325F, 139.7083F); this.lblAbwesenheiten.Name = "lblAbwesenheiten"; this.lblAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblAbwesenheiten.SizeF = new System.Drawing.SizeF(300F, 97.79166F); @@ -591,7 +595,7 @@ namespace BeWo.SeverinReports // xrPictureBox1 // this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(453.6476F, 227.5F); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(453.6476F, 237.5F); this.xrPictureBox1.Name = "xrPictureBox1"; this.xrPictureBox1.SizeF = new System.Drawing.SizeF(217.7083F, 109.375F); this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; @@ -761,6 +765,27 @@ namespace BeWo.SeverinReports this.FLMToHours.FieldType = DevExpress.XtraReports.UI.FieldType.Double; this.FLMToHours.Name = "FLMToHours"; // + // xrLabel11 + // + this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 101.2083F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(325F, 23F); + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.Text = "[Costbearer]-Fehlkontakte:"; + // + // labelFehlkontakteWert + // + this.labelFehlkontakteWert.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold); + this.labelFehlkontakteWert.LocationFloat = new DevExpress.Utils.PointFloat(325F, 101.2084F); + this.labelFehlkontakteWert.Name = "labelFehlkontakteWert"; + this.labelFehlkontakteWert.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.labelFehlkontakteWert.SizeF = new System.Drawing.SizeF(156.4F, 22.99993F); + this.labelFehlkontakteWert.StylePriority.UseFont = false; + this.labelFehlkontakteWert.StylePriority.UseTextAlignment = false; + this.labelFehlkontakteWert.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -864,5 +889,7 @@ namespace BeWo.SeverinReports private DevExpress.XtraReports.UI.CalculatedField FLMToHours; private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRLabel lblAbwesenheiten; + private DevExpress.XtraReports.UI.XRLabel xrLabel11; + private DevExpress.XtraReports.UI.XRLabel labelFehlkontakteWert; } } diff --git a/ReportImp/SeverinReports/ServicesOverviewReport.cs b/ReportImp/SeverinReports/ServicesOverviewReport.cs index e3cac9626..9bd26ba8c 100644 --- a/ReportImp/SeverinReports/ServicesOverviewReport.cs +++ b/ReportImp/SeverinReports/ServicesOverviewReport.cs @@ -18,18 +18,29 @@ namespace BeWo.SeverinReports { double billable = 0; double notBillable = 0; + double fehlkontakt = 0; foreach (var s in pRO.Services) - { + { if (s.IsBillable) - billable += s.FLSQualified; + { + if (s.ServiceDescription.ToLower().Contains("fehlkontakt")) + { + s.ServiceCategoryAbbr = "Fehlkontakt"; + fehlkontakt += s.FLSQualified; + } + else + { + billable += s.FLSQualified; + } + } else notBillable += s.FLSQualified; } - //labelAbrechenbarText.Text = cb.CostBearer.Organisation.Name + "-direkte abrechenbare Leistung:"; + labelAbrechenbarWert.Text = billable * 60 + " FLM / " + string.Format("{0:0.00}", billable) + " FLS"; - //labelNichtAbrechenbarText.Text = "Mittelbare nicht abrechenbare Leistung:"; labelNichtAbrechenbarWert.Text = notBillable * 60 + " FLM / " + string.Format("{0:0.00}", notBillable) + " FLS"; + labelFehlkontakteWert.Text = fehlkontakt * 60 + " FLM / " + string.Format("{0:0.00}", fehlkontakt) + " FLS"; this.bindingSource1.DataSource = pRO; }