diff --git a/ReportImp/SeverinReports/ServicesOverviewReport.Designer.cs b/ReportImp/SeverinReports/ServicesOverviewReport.Designer.cs index d2e9aca8e..b77f8027d 100644 --- a/ReportImp/SeverinReports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/SeverinReports/ServicesOverviewReport.Designer.cs @@ -59,19 +59,12 @@ namespace BeWo.SeverinReports this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.DetailReport2 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail3 = new DevExpress.XtraReports.UI.DetailBand(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.labelNichtAbrechenbarWert = new DevExpress.XtraReports.UI.XRLabel(); - this.labelAbrechenbarWert = new DevExpress.XtraReports.UI.XRLabel(); - this.labelAbrechenbarText = new DevExpress.XtraReports.UI.XRLabel(); - this.labelNichtAbrechenbarText = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); @@ -91,8 +84,14 @@ namespace BeWo.SeverinReports this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldTeilnehmer = new DevExpress.XtraReports.UI.CalculatedField(); - this.GesamtUebersichtDetail = new DevExpress.XtraReports.UI.DetailReportBand(); - this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.labelAbrechenbarText = new DevExpress.XtraReports.UI.XRLabel(); + this.labelNichtAbrechenbarText = new DevExpress.XtraReports.UI.XRLabel(); + this.labelAbrechenbarWert = new DevExpress.XtraReports.UI.XRLabel(); + this.labelNichtAbrechenbarWert = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.FLMToHours = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -116,7 +115,7 @@ namespace BeWo.SeverinReports this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(675F, 20F); + this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(702F, 20F); this.xrTableServiceRecords1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrTableRow2 @@ -125,6 +124,7 @@ namespace BeWo.SeverinReports this.xrTableCell3, this.xrTableCell1, this.xrTableCell4, + this.xrTableCell7, this.xrTableCell5, this.xrTableCell11, this.xrTableCell9, @@ -143,7 +143,7 @@ namespace BeWo.SeverinReports this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.Text = "Datum"; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell3.Weight = 0.12648460149568258D; + this.xrTableCell3.Weight = 0.08531122343256077D; // // xrTableCell1 // @@ -153,7 +153,7 @@ namespace BeWo.SeverinReports this.xrTableCell1.StylePriority.UseTextAlignment = false; this.xrTableCell1.Text = "Uhrzeit"; this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell1.Weight = 0.18972691318607834D; + this.xrTableCell1.Weight = 0.16280585662364658D; // // xrTableCell4 // @@ -165,7 +165,7 @@ namespace BeWo.SeverinReports this.xrTableCell4.StylePriority.UseTextAlignment = false; this.xrTableCell4.Text = "FLM"; this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell4.Weight = 0.079052877876854125D; + this.xrTableCell4.Weight = 0.10359727130234402D; // // xrTableCell5 // @@ -175,7 +175,7 @@ namespace BeWo.SeverinReports this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "Teilnehmer"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell5.Weight = 0.1343899272391767D; + this.xrTableCell5.Weight = 0.11864260699952019D; // // xrTableCell11 // @@ -185,7 +185,7 @@ namespace BeWo.SeverinReports this.xrTableCell11.StylePriority.UsePadding = false; this.xrTableCell11.Text = "Art"; this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell11.Weight = 0.15810575458907367D; + this.xrTableCell11.Weight = 0.15789048514049359D; // // xrTableCell9 // @@ -195,7 +195,7 @@ namespace BeWo.SeverinReports this.xrTableCell9.StylePriority.UsePadding = false; this.xrTableCell9.Text = "KT"; this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell9.Weight = 0.18972690967642741D; + this.xrTableCell9.Weight = 0.16609971906356885D; // // xrTableCell12 // @@ -206,7 +206,7 @@ namespace BeWo.SeverinReports this.xrTableCell12.StylePriority.UsePadding = false; this.xrTableCell12.Text = "Mitarbeiter/in"; this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell12.Weight = 0.18972687512118647D; + this.xrTableCell12.Weight = 0.16926685946770148D; // // xrTable3 // @@ -218,7 +218,7 @@ namespace BeWo.SeverinReports this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow6}); - this.xrTable3.SizeF = new System.Drawing.SizeF(675.0001F, 20F); + this.xrTable3.SizeF = new System.Drawing.SizeF(701.9984F, 20F); this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // xrTableRow6 @@ -227,6 +227,7 @@ namespace BeWo.SeverinReports this.xrTableCell13, this.xrTableCell2, this.xrTableCell14, + this.xrTableCell8, this.xrTableCell6, this.xrTableCell15, this.xrTableCell16, @@ -248,7 +249,7 @@ namespace BeWo.SeverinReports this.xrTableCell13.StylePriority.UseTextAlignment = false; this.xrTableCell13.Text = "xrTableCell13"; this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell13.Weight = 0.057173590165862584D; + this.xrTableCell13.Weight = 0.038562400422111912D; // // xrTableCell2 // @@ -262,7 +263,7 @@ namespace BeWo.SeverinReports this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.Text = "xrTableCell2"; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell2.Weight = 0.085760416098786457D; + this.xrTableCell2.Weight = 0.073591538299504544D; // // xrTableCell14 // @@ -275,7 +276,7 @@ namespace BeWo.SeverinReports this.xrTableCell14.StylePriority.UsePadding = false; this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell14.Weight = 0.035733498651041737D; + this.xrTableCell14.Weight = 0.046828061238276722D; // // xrTableCell6 // @@ -287,7 +288,7 @@ namespace BeWo.SeverinReports this.xrTableCell6.StylePriority.UseTextAlignment = false; this.xrTableCell6.Text = "xrTableCell6"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell6.Weight = 0.060746929974127548D; + this.xrTableCell6.Weight = 0.053628875100197919D; // // xrTableCell15 // @@ -299,7 +300,7 @@ namespace BeWo.SeverinReports this.xrTableCell15.StylePriority.UseFont = false; this.xrTableCell15.StylePriority.UsePadding = false; this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell15.Weight = 0.071467045692316836D; + this.xrTableCell15.Weight = 0.07136969720001636D; // // xrTableCell16 // @@ -311,7 +312,7 @@ namespace BeWo.SeverinReports this.xrTableCell16.StylePriority.UseFont = false; this.xrTableCell16.StylePriority.UsePadding = false; this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell16.Weight = 0.085760424417611891D; + this.xrTableCell16.Weight = 0.075080435121464367D; // // xrTableCell17 // @@ -323,7 +324,7 @@ namespace BeWo.SeverinReports this.xrTableCell17.StylePriority.UseFont = false; this.xrTableCell17.StylePriority.UsePadding = false; this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell17.Weight = 0.085760401589017779D; + this.xrTableCell17.Weight = 0.076510907029681954D; // // formattingRuleStartDate // @@ -422,40 +423,25 @@ namespace BeWo.SeverinReports // Detail3 // this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel10, this.xrLabel7, this.xrLabel6, this.xrLabel8}); - this.Detail3.HeightF = 42F; + this.Detail3.HeightF = 42.00001F; this.Detail3.Name = "Detail3"; this.Detail3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.Detail3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // xrLabel10 - // - this.xrLabel10.Font = new System.Drawing.Font("Arial", 9.75F); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(392F, 17F); - this.xrLabel10.Name = "xrLabel10"; - this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(100F, 25F); - this.xrLabel10.StylePriority.UseFont = false; - this.xrLabel10.StylePriority.UseTextAlignment = false; - this.xrLabel10.Text = "FLM"; - this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // // xrLabel7 // - this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AllEmployees.TotalFLM", "{0:n}")}); this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(325F, 17F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(348.4F, 17.00001F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(58F, 25F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(220.0002F, 25F); this.xrLabel7.StylePriority.UseFont = false; this.xrLabel7.StylePriority.UseTextAlignment = false; - this.xrLabel7.Text = "xrLabel7"; - this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrLabel7.Text = "[TotalFLM] FLM/ [TotalFLSString] FLS "; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // xrLabel6 // @@ -475,7 +461,7 @@ namespace BeWo.SeverinReports // this.xrLabel8.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; this.xrLabel8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(125F, 12F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(125F, 17.00001F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(200F, 25F); @@ -485,54 +471,15 @@ namespace BeWo.SeverinReports // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.labelAbrechenbarText, + this.labelNichtAbrechenbarText, + this.labelAbrechenbarWert, + this.labelNichtAbrechenbarWert, this.xrLabel12, - this.xrPictureBox1, - this.xrLabel11}); + this.xrPictureBox1}); this.GroupFooter1.HeightF = 248.9583F; this.GroupFooter1.Name = "GroupFooter1"; // - // labelNichtAbrechenbarWert - // - this.labelNichtAbrechenbarWert.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold); - this.labelNichtAbrechenbarWert.LocationFloat = new DevExpress.Utils.PointFloat(325F, 23.00014F); - this.labelNichtAbrechenbarWert.Name = "labelNichtAbrechenbarWert"; - this.labelNichtAbrechenbarWert.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.labelNichtAbrechenbarWert.SizeF = new System.Drawing.SizeF(200F, 22.99993F); - this.labelNichtAbrechenbarWert.StylePriority.UseFont = false; - this.labelNichtAbrechenbarWert.StylePriority.UseTextAlignment = false; - this.labelNichtAbrechenbarWert.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // labelAbrechenbarWert - // - this.labelAbrechenbarWert.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold); - this.labelAbrechenbarWert.LocationFloat = new DevExpress.Utils.PointFloat(325F, 6.357829E-05F); - this.labelAbrechenbarWert.Name = "labelAbrechenbarWert"; - this.labelAbrechenbarWert.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.labelAbrechenbarWert.SizeF = new System.Drawing.SizeF(200F, 22.99993F); - this.labelAbrechenbarWert.StylePriority.UseFont = false; - this.labelAbrechenbarWert.StylePriority.UseTextAlignment = false; - this.labelAbrechenbarWert.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // labelAbrechenbarText - // - this.labelAbrechenbarText.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); - this.labelAbrechenbarText.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.labelAbrechenbarText.Name = "labelAbrechenbarText"; - this.labelAbrechenbarText.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.labelAbrechenbarText.SizeF = new System.Drawing.SizeF(325F, 23F); - this.labelAbrechenbarText.StylePriority.UseFont = false; - this.labelAbrechenbarText.Text = "[CostBearer.Organisation.Name]-direkte abrechenbare Leistung:"; - // - // labelNichtAbrechenbarText - // - this.labelNichtAbrechenbarText.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); - this.labelNichtAbrechenbarText.LocationFloat = new DevExpress.Utils.PointFloat(0F, 22.99995F); - this.labelNichtAbrechenbarText.Name = "labelNichtAbrechenbarText"; - this.labelNichtAbrechenbarText.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.labelNichtAbrechenbarText.SizeF = new System.Drawing.SizeF(325F, 23F); - this.labelNichtAbrechenbarText.StylePriority.UseFont = false; - this.labelNichtAbrechenbarText.Text = "Mittelbare nicht abrechenbare Leistung:"; - // // xrLabel12 // this.xrLabel12.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold); @@ -553,22 +500,6 @@ namespace BeWo.SeverinReports this.xrPictureBox1.SizeF = new System.Drawing.SizeF(217.7083F, 109.375F); this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; // - // xrLabel11 - // - this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSPerCostBearer")}); - this.xrLabel11.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(6.357829E-05F, 114.5833F); - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(671.356F, 25F); - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.Text = "xrLabel11"; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -723,24 +654,82 @@ namespace BeWo.SeverinReports this.fieldTeilnehmer.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldTeilnehmer.Name = "fieldTeilnehmer"; // - // GesamtUebersichtDetail + // bindingSource1 // - this.GesamtUebersichtDetail.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail1}); - this.GesamtUebersichtDetail.DataMember = "CostBearer2SupportConceptList"; - this.GesamtUebersichtDetail.DataSource = this.bindingSource1; - this.GesamtUebersichtDetail.Level = 3; - this.GesamtUebersichtDetail.Name = "GesamtUebersichtDetail"; + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); // - // Detail1 + // labelAbrechenbarText // - this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.labelNichtAbrechenbarWert, - this.labelAbrechenbarWert, - this.labelNichtAbrechenbarText, - this.labelAbrechenbarText}); - this.Detail1.HeightF = 100F; - this.Detail1.Name = "Detail1"; + this.labelAbrechenbarText.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.labelAbrechenbarText.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 28.125F); + this.labelAbrechenbarText.Name = "labelAbrechenbarText"; + this.labelAbrechenbarText.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.labelAbrechenbarText.SizeF = new System.Drawing.SizeF(348.4F, 23F); + this.labelAbrechenbarText.StylePriority.UseFont = false; + this.labelAbrechenbarText.Text = "[Costbearer]-direkte abrechenbare Leistung:"; + // + // labelNichtAbrechenbarText + // + this.labelNichtAbrechenbarText.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.labelNichtAbrechenbarText.LocationFloat = new DevExpress.Utils.PointFloat(1.589457E-05F, 51.12495F); + this.labelNichtAbrechenbarText.Name = "labelNichtAbrechenbarText"; + this.labelNichtAbrechenbarText.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.labelNichtAbrechenbarText.SizeF = new System.Drawing.SizeF(348.4F, 23F); + this.labelNichtAbrechenbarText.StylePriority.UseFont = false; + this.labelNichtAbrechenbarText.Text = "Mittelbare nicht abrechenbare Leistung:"; + // + // labelAbrechenbarWert + // + this.labelAbrechenbarWert.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold); + this.labelAbrechenbarWert.LocationFloat = new DevExpress.Utils.PointFloat(348.4F, 28.125F); + this.labelAbrechenbarWert.Name = "labelAbrechenbarWert"; + this.labelAbrechenbarWert.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.labelAbrechenbarWert.SizeF = new System.Drawing.SizeF(133F, 22.99993F); + this.labelAbrechenbarWert.StylePriority.UseFont = false; + this.labelAbrechenbarWert.StylePriority.UseTextAlignment = false; + this.labelAbrechenbarWert.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // labelNichtAbrechenbarWert + // + this.labelNichtAbrechenbarWert.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold); + this.labelNichtAbrechenbarWert.LocationFloat = new DevExpress.Utils.PointFloat(348.4F, 51.12508F); + this.labelNichtAbrechenbarWert.Name = "labelNichtAbrechenbarWert"; + this.labelNichtAbrechenbarWert.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.labelNichtAbrechenbarWert.SizeF = new System.Drawing.SizeF(133F, 22.99993F); + this.labelNichtAbrechenbarWert.StylePriority.UseFont = false; + this.labelNichtAbrechenbarWert.StylePriority.UseTextAlignment = false; + this.labelNichtAbrechenbarWert.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrTableCell7 + // + this.xrTableCell7.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrTableCell7.StylePriority.UseFont = false; + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.Text = "FLS"; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell7.Weight = 0.10359985778332641D; + // + // FLMToHours + // + this.FLMToHours.DataMember = "Services"; + this.FLMToHours.Expression = "[Minutes] / 60"; + this.FLMToHours.FieldType = DevExpress.XtraReports.UI.FieldType.Double; + this.FLMToHours.Name = "FLMToHours"; + // + // xrTableCell8 + // + this.xrTableCell8.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UsePadding = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.Text = "[FLMToHours!#.00]"; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell8.Weight = 0.0468292461083389D; // // Stundenzettel // @@ -752,14 +741,14 @@ namespace BeWo.SeverinReports this.ReportFooter, this.topMarginBand1, this.bottomMarginBand1, - this.DetailReport3, - this.GesamtUebersichtDetail}); + this.DetailReport3}); this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { this.FLS, this.FLS2, this.TotalFLS, this.fieldFLS, - this.fieldTeilnehmer}); + this.fieldTeilnehmer, + this.FLMToHours}); this.DataSource = this.bindingSource1; this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.formattingRuleStartDate, @@ -811,7 +800,6 @@ namespace BeWo.SeverinReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.XRLabel xrLabel6; - private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; private DevExpress.XtraReports.UI.FormattingRule formattingRuleStartDate; private DevExpress.XtraReports.UI.FormattingRule formattingRuleServiceDesc; @@ -820,7 +808,6 @@ namespace BeWo.SeverinReports private DevExpress.XtraReports.UI.CalculatedField FLS; private DevExpress.XtraReports.UI.CalculatedField FLS2; private DevExpress.XtraReports.UI.CalculatedField TotalFLS; - private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; @@ -840,9 +827,10 @@ namespace BeWo.SeverinReports private DevExpress.XtraReports.UI.XRLabel xrLabel13; private DevExpress.XtraReports.UI.XRLabel labelAbrechenbarText; private DevExpress.XtraReports.UI.XRLabel labelNichtAbrechenbarText; - private DevExpress.XtraReports.UI.XRLabel labelNichtAbrechenbarWert; private DevExpress.XtraReports.UI.XRLabel labelAbrechenbarWert; - private DevExpress.XtraReports.UI.DetailReportBand GesamtUebersichtDetail; - private DevExpress.XtraReports.UI.DetailBand Detail1; + private DevExpress.XtraReports.UI.XRLabel labelNichtAbrechenbarWert; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.CalculatedField FLMToHours; } } diff --git a/ReportImp/SeverinReports/ServicesOverviewReport.cs b/ReportImp/SeverinReports/ServicesOverviewReport.cs index 2d90cb0e4..e3cac9626 100644 --- a/ReportImp/SeverinReports/ServicesOverviewReport.cs +++ b/ReportImp/SeverinReports/ServicesOverviewReport.cs @@ -18,27 +18,18 @@ namespace BeWo.SeverinReports { double billable = 0; double notBillable = 0; - - foreach (var cb in pRO.CostBearer2SupportConceptList) - { - foreach (var s in pRO.Services) - { - if (s.CostBearer.Equals(cb.CostBearer.Organisation.Name)) - { - if (s.IsBillable) - billable += s.FLSQualified; - else - notBillable += s.FLSQualified; - } - } - //labelAbrechenbarText.Text = cb.CostBearer.Organisation.Name + "-direkte abrechenbare Leistung:"; - labelAbrechenbarWert.Text = billable * 60 + " FLM / " + billable + " FLS"; - //labelNichtAbrechenbarText.Text = "Mittelbare nicht abrechenbare Leistung:"; - labelNichtAbrechenbarWert.Text = notBillable * 60 + " FLM / " + notBillable + " FLS"; - billable = 0; - notBillable = 0; + + foreach (var s in pRO.Services) + { + if (s.IsBillable) + 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"; this.bindingSource1.DataSource = pRO; } diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 116451b99..071ac48eb 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -217,7 +217,7 @@ namespace BeWo.Service.Plugins //t = "4160851689"; // BeWo Dreilich&Pastor (Dreilich) //t = "9970072066"; // Bussmannshof //t = "2993745954"; // Kollegium für freie Jugendarbeit und Berufsbildung e.V. - t = "5495240031"; // Christian Luft + //t = "5495240031"; // Christian Luft //t = "6922762575"; // BHS Solingen //t = "3472573348"; // ASB Mönchengladbach //t = "8831599797"; // SeHT Münster