From c2fd8d5de3da215803af6d66ebb91aefa8f3eafd Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 27 May 2025 11:39:59 +0200 Subject: [PATCH] =?UTF-8?q?AlzeyTeilhabe/StundenzettelWo=20-=20bis=20Juli?= =?UTF-8?q?=20nochmal=20zur=C3=BCck,=20danach=20liegt=20Kopie=20schon=20be?= =?UTF-8?q?i=20mir?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AlzeyTeilhabe/StundenzettelWo.Designer.cs | 237 ++++-------------- ReportImp/AlzeyTeilhabe/StundenzettelWo.cs | 77 +----- 2 files changed, 63 insertions(+), 251 deletions(-) diff --git a/ReportImp/AlzeyTeilhabe/StundenzettelWo.Designer.cs b/ReportImp/AlzeyTeilhabe/StundenzettelWo.Designer.cs index b7d12f82d..ac3251fad 100644 --- a/ReportImp/AlzeyTeilhabe/StundenzettelWo.Designer.cs +++ b/ReportImp/AlzeyTeilhabe/StundenzettelWo.Designer.cs @@ -30,8 +30,6 @@ namespace AlzeyTeilhabe private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); - DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -76,7 +74,7 @@ namespace AlzeyTeilhabe this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblSumFls = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); @@ -93,15 +91,6 @@ namespace AlzeyTeilhabe this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldStunden = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldTotalSum = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.lblSumPauschale = new DevExpress.XtraReports.UI.XRLabel(); - this.lblPauschale = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblSum = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -120,8 +109,8 @@ namespace AlzeyTeilhabe // // xrTableServiceRecords1 // - this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableServiceRecords1.Name = "xrTableServiceRecords1"; @@ -140,7 +129,6 @@ namespace AlzeyTeilhabe this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell3, this.xrTableCell4, - this.xrTableCell7, this.xrTableCell1, this.xrTableCell11}); this.xrTableRow2.Name = "xrTableRow2"; @@ -166,7 +154,7 @@ namespace AlzeyTeilhabe this.xrTableCell4.StylePriority.UseFont = false; this.xrTableCell4.StylePriority.UseTextAlignment = false; this.xrTableCell4.Text = "Erbrachte\r\nFLStd."; - this.xrTableCell4.Weight = 0.21481273405276788D; + this.xrTableCell4.Weight = 0.24385917973591581D; // // xrTableCell1 // @@ -174,7 +162,7 @@ namespace AlzeyTeilhabe this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); this.xrTableCell1.StylePriority.UsePadding = false; this.xrTableCell1.Text = "Inhaltliche Beschreibung der erbrachten Leistung *)"; - this.xrTableCell1.Weight = 0.87720343217205243D; + this.xrTableCell1.Weight = 0.90227897097973231D; // // xrTableCell11 // @@ -184,7 +172,7 @@ namespace AlzeyTeilhabe this.xrTableCell11.StylePriority.UseFont = false; this.xrTableCell11.StylePriority.UseTextAlignment = false; this.xrTableCell11.Text = "Unterschrift\r\nFachkraft"; - this.xrTableCell11.Weight = 0.36381269988521975D; + this.xrTableCell11.Weight = 0.30970116106242762D; // // DetailReport // @@ -210,14 +198,14 @@ namespace AlzeyTeilhabe // xrTable3 // this.xrTable3.BorderColor = System.Drawing.Color.Black; - this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable3.Name = "xrTable3"; 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(697F, 20F); + this.xrTable3.SizeF = new System.Drawing.SizeF(696.9999F, 20F); this.xrTable3.StylePriority.UseFont = false; this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // @@ -226,7 +214,6 @@ namespace AlzeyTeilhabe this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell13, this.xrTableCell14, - this.xrTableCell8, this.xrTableCell2, this.xrTableCell15}); this.xrTableRow6.Name = "xrTableRow6"; @@ -249,13 +236,13 @@ namespace AlzeyTeilhabe // xrTableCell14 // this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.FLSQualified", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldStunden", "{0:0.00}")}); this.xrTableCell14.Name = "xrTableCell14"; this.xrTableCell14.StylePriority.UseFont = false; this.xrTableCell14.StylePriority.UsePadding = false; this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell14.Weight = 0.11122325929996779D; + this.xrTableCell14.Weight = 0.12626260328760389D; // // xrTableCell2 // @@ -268,7 +255,7 @@ namespace AlzeyTeilhabe this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.Text = "xrTableCell2"; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell2.Weight = 0.45418823789637497D; + this.xrTableCell2.Weight = 0.46717162668729034D; // // xrTableCell15 // @@ -280,7 +267,7 @@ namespace AlzeyTeilhabe this.xrTableCell15.StylePriority.UsePadding = false; this.xrTableCell15.StylePriority.UseTextAlignment = false; this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell15.Weight = 0.18837073459697215D; + this.xrTableCell15.Weight = 0.16035339924055428D; // // picSignature // @@ -323,7 +310,7 @@ namespace AlzeyTeilhabe this.xrLabel13, this.xrLabel12, this.xrLabel1}); - this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.ReportHeader.Font = new System.Drawing.Font("Arial", 11F); this.ReportHeader.HeightF = 240F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; @@ -351,7 +338,7 @@ namespace AlzeyTeilhabe this.xrLabel17.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")}); - this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.xrLabel17.Font = new System.Drawing.Font("Arial", 11F); this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(288F, 205F); this.xrLabel17.Name = "xrLabel17"; this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -373,7 +360,7 @@ namespace AlzeyTeilhabe this.xrLabel29.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; this.xrLabel29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerMonthTotal", "{0:0.00}")}); - this.xrLabel29.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.xrLabel29.Font = new System.Drawing.Font("Arial", 11F); this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(288F, 180F); this.xrLabel29.Name = "xrLabel29"; this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -386,7 +373,7 @@ namespace AlzeyTeilhabe this.xrLabel26.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; this.xrLabel26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSTotal", "{0:0.00}")}); - this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.xrLabel26.Font = new System.Drawing.Font("Arial", 11F); this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(288F, 155F); this.xrLabel26.Name = "xrLabel26"; this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -397,7 +384,7 @@ namespace AlzeyTeilhabe // xrLabel25 // this.xrLabel25.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.xrLabel25.Font = new System.Drawing.Font("Arial", 11F); this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(200F, 130F); this.xrLabel25.Name = "xrLabel25"; this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -411,7 +398,7 @@ namespace AlzeyTeilhabe this.xrLabel24.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; this.xrLabel24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerFirstName")}); - this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.xrLabel24.Font = new System.Drawing.Font("Arial", 11F); this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(200F, 105F); this.xrLabel24.Name = "xrLabel24"; this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -424,7 +411,7 @@ namespace AlzeyTeilhabe this.xrLabel23.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; this.xrLabel23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerLastName")}); - this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.xrLabel23.Font = new System.Drawing.Font("Arial", 11F); this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(200F, 79.99998F); this.xrLabel23.Name = "xrLabel23"; this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -479,7 +466,7 @@ namespace AlzeyTeilhabe // // xrLabel1 // - this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); + this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; @@ -513,7 +500,7 @@ namespace AlzeyTeilhabe // // topMarginBand1 // - this.topMarginBand1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F); + this.topMarginBand1.Font = new System.Drawing.Font("Times New Roman", 9.75F); this.topMarginBand1.HeightF = 50F; this.topMarginBand1.Name = "topMarginBand1"; this.topMarginBand1.StylePriority.UseFont = false; @@ -526,17 +513,11 @@ namespace AlzeyTeilhabe // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.lblSum, - this.xrLabel30, - this.lblSumPauschale, - this.lblPauschale, - this.xrLabel27, - this.xrLabel28, this.xrLabel4, this.xrLabel6, this.xrLabel7, this.xrLabel8, - this.lblSumFls, + this.xrLabel9, this.xrLabel11, this.xrLabel10, this.xrLabel20, @@ -545,15 +526,14 @@ namespace AlzeyTeilhabe this.xrTable1, this.xrLabel2, this.xrLabel5}); - this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 11F); - this.ReportFooter.HeightF = 268.125F; + this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F); + this.ReportFooter.HeightF = 247.2917F; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // // xrLabel4 // - this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11.25F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrLabel4.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 92.84382F); this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -573,7 +553,7 @@ namespace AlzeyTeilhabe // xrLabel7 // this.xrLabel7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSQualified", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldBillableFLS", "{0:0.00}")}); this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(194.7918F, 142.4688F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -594,15 +574,17 @@ namespace AlzeyTeilhabe this.xrLabel8.Text = "Zusätzliche Fachkraft:"; this.xrLabel8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; // - // lblSumFls + // xrLabel9 // - this.lblSumFls.LocationFloat = new DevExpress.Utils.PointFloat(392.6666F, 142.4688F); - this.lblSumFls.Name = "lblSumFls"; - this.lblSumFls.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblSumFls.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F); - this.lblSumFls.StylePriority.UseFont = false; - this.lblSumFls.StylePriority.UseTextAlignment = false; - this.lblSumFls.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldTotalSum", "{0:0.00} €")}); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(392.6666F, 142.4688F); + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F); + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.StylePriority.UseTextAlignment = false; + this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; // // xrLabel11 // @@ -612,7 +594,7 @@ namespace AlzeyTeilhabe this.xrLabel11.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F); this.xrLabel11.StylePriority.UseFont = false; this.xrLabel11.StylePriority.UseTextAlignment = false; - this.xrLabel11.Text = "Betrag"; + this.xrLabel11.Text = "Rechnungsbetrag"; this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; // // xrLabel10 @@ -628,7 +610,7 @@ namespace AlzeyTeilhabe // // xrLabel20 // - this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 200.2813F); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 182.5729F); this.xrLabel20.Name = "xrLabel20"; this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel20.SizeF = new System.Drawing.SizeF(392.6667F, 19.79166F); @@ -638,7 +620,7 @@ namespace AlzeyTeilhabe // // lblUebertragFLS // - this.lblUebertragFLS.LocationFloat = new DevExpress.Utils.PointFloat(392.6664F, 200.2811F); + this.lblUebertragFLS.LocationFloat = new DevExpress.Utils.PointFloat(392.6666F, 182.5728F); this.lblUebertragFLS.Name = "lblUebertragFLS"; this.lblUebertragFLS.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.lblUebertragFLS.SizeF = new System.Drawing.SizeF(130.7083F, 19.79172F); @@ -661,14 +643,14 @@ namespace AlzeyTeilhabe // xrTable1 // this.xrTable1.BorderColor = System.Drawing.Color.Black; - this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(251.946F, 40F); + this.xrTable1.SizeF = new System.Drawing.SizeF(200F, 40F); this.xrTable1.StylePriority.UseFont = false; this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // @@ -676,8 +658,7 @@ namespace AlzeyTeilhabe // this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell5, - this.xrTableCell6, - this.xrTableCell9}); + this.xrTableCell6}); this.xrTableRow1.Name = "xrTableRow1"; this.xrTableRow1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableRow1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; @@ -692,26 +673,23 @@ namespace AlzeyTeilhabe this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "Summe\r\nFLStd."; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell5.Weight = 0.11042036583932854D; + this.xrTableCell5.Weight = 0.12626259807949769D; // // xrTableCell6 // this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.FLSQualified")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldBillableFLS", "{0:0.00}")}); this.xrTableCell6.Name = "xrTableCell6"; this.xrTableCell6.StylePriority.UseFont = false; this.xrTableCell6.StylePriority.UsePadding = false; this.xrTableCell6.StylePriority.UseTextAlignment = false; - xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell6.Summary = xrSummary1; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell6.TextFormatString = "{0:0.00}"; - this.xrTableCell6.Weight = 0.097268106718236408D; + this.xrTableCell6.Weight = 0.12626260328760389D; // // xrLabel2 // this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(356.1666F, 247.0001F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(356.1667F, 229.2917F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel2.SizeF = new System.Drawing.SizeF(340.8333F, 17.99997F); @@ -722,7 +700,7 @@ namespace AlzeyTeilhabe // xrLabel5 // this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 247.0001F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 229.2917F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(117.2917F, 17.99997F); @@ -761,110 +739,6 @@ namespace AlzeyTeilhabe this.fieldTotalSum.Expression = "Round([TotalFLMBillable] / 60, 2) * [RateFactor]"; this.fieldTotalSum.Name = "fieldTotalSum"; // - // xrTableCell7 - // - this.xrTableCell7.Multiline = true; - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrTableCell7.StylePriority.UseFont = false; - this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.Text = "Wege-pauschale"; - this.xrTableCell7.Weight = 0.24386962540395146D; - // - // xrTableCell8 - // - this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.FLSUnqualified")}); - this.xrTableCell8.Multiline = true; - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.StylePriority.UseFont = false; - this.xrTableCell8.StylePriority.UsePadding = false; - this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell8.Weight = 0.12626800070973748D; - // - // xrTableCell9 - // - this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.FLSUnqualified")}); - this.xrTableCell9.Multiline = true; - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.StylePriority.UseFont = false; - this.xrTableCell9.StylePriority.UsePadding = false; - this.xrTableCell9.StylePriority.UseTextAlignment = false; - xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrTableCell9.Summary = xrSummary2; - this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell9.TextFormatString = "{0:0.00}"; - this.xrTableCell9.Weight = 0.11042503315100208D; - // - // lblSumPauschale - // - this.lblSumPauschale.LocationFloat = new DevExpress.Utils.PointFloat(392.6666F, 162.2605F); - this.lblSumPauschale.Name = "lblSumPauschale"; - this.lblSumPauschale.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblSumPauschale.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F); - this.lblSumPauschale.StylePriority.UseFont = false; - this.lblSumPauschale.StylePriority.UseTextAlignment = false; - this.lblSumPauschale.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.lblSumPauschale.Visible = false; - // - // lblPauschale - // - this.lblPauschale.LocationFloat = new DevExpress.Utils.PointFloat(267.1669F, 162.2605F); - this.lblPauschale.Name = "lblPauschale"; - this.lblPauschale.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblPauschale.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F); - this.lblPauschale.StylePriority.UseFont = false; - this.lblPauschale.StylePriority.UseTextAlignment = false; - this.lblPauschale.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.lblPauschale.Visible = false; - // - // xrLabel27 - // - this.xrLabel27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSQualified", "{0:0.00}")}); - this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(194.7917F, 162.2605F); - this.xrLabel27.Name = "xrLabel27"; - this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel27.SizeF = new System.Drawing.SizeF(72.37503F, 19.79172F); - this.xrLabel27.StylePriority.UseFont = false; - this.xrLabel27.Text = "Zusätzliche Fachkraft:"; - this.xrLabel27.Visible = false; - // - // xrLabel28 - // - this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(0F, 162.2606F); - this.xrLabel28.Name = "xrLabel28"; - this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel28.SizeF = new System.Drawing.SizeF(194.7917F, 19.79166F); - this.xrLabel28.StylePriority.UseFont = false; - this.xrLabel28.Text = "Anzahl Wegepauschalen"; - this.xrLabel28.Visible = false; - // - // xrLabel30 - // - this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(518.1666F, 122.6772F); - this.xrLabel30.Name = "xrLabel30"; - this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel30.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F); - this.xrLabel30.StylePriority.UseFont = false; - this.xrLabel30.StylePriority.UseTextAlignment = false; - this.xrLabel30.Text = "Rechnungsbetrag"; - this.xrLabel30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrLabel30.Visible = false; - // - // lblSum - // - this.lblSum.LocationFloat = new DevExpress.Utils.PointFloat(518.1666F, 162.2605F); - this.lblSum.Name = "lblSum"; - this.lblSum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblSum.SizeF = new System.Drawing.SizeF(125.5F, 19.79172F); - this.lblSum.StylePriority.UseFont = false; - this.lblSum.StylePriority.UseTextAlignment = false; - this.lblSum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.lblSum.Visible = false; - // // StundenzettelWo // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -881,18 +755,18 @@ namespace AlzeyTeilhabe this.fieldStunden, this.fieldTotalSum}); this.DataSource = this.bindingSource1; - this.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.Font = new System.Drawing.Font("Arial", 11F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.formattingRuleStartDate, this.formattingRuleServiceDesc, this.formattingRuleCostBearer, this.formattingRuleEmployeeName}); - this.Margins = new DevExpress.Drawing.DXMargins(70F, 60F, 50F, 30F); + this.Margins = new System.Drawing.Printing.Margins(70, 60, 50, 30); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.SnapGridSize = 9F; - this.Version = "23.2"; + this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); @@ -957,21 +831,12 @@ namespace AlzeyTeilhabe private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.XRLabel xrLabel8; - private DevExpress.XtraReports.UI.XRLabel lblSumFls; + private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRLabel xrLabel20; private DevExpress.XtraReports.UI.XRLabel lblUebertragFLS; private DevExpress.XtraReports.UI.CalculatedField fieldTotalSum; private DevExpress.XtraReports.UI.XRPictureBox picSignature; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; - private DevExpress.XtraReports.UI.XRLabel lblSum; - private DevExpress.XtraReports.UI.XRLabel xrLabel30; - private DevExpress.XtraReports.UI.XRLabel lblSumPauschale; - private DevExpress.XtraReports.UI.XRLabel lblPauschale; - private DevExpress.XtraReports.UI.XRLabel xrLabel27; - private DevExpress.XtraReports.UI.XRLabel xrLabel28; } } diff --git a/ReportImp/AlzeyTeilhabe/StundenzettelWo.cs b/ReportImp/AlzeyTeilhabe/StundenzettelWo.cs index aaa599337..81a8809cf 100644 --- a/ReportImp/AlzeyTeilhabe/StundenzettelWo.cs +++ b/ReportImp/AlzeyTeilhabe/StundenzettelWo.cs @@ -15,8 +15,6 @@ using BS.Shared.DataContracts; using System.Text.RegularExpressions; using System.IO; using System.Drawing; -using BeWo.Data.Access; -using BeWo.Data.Entities; namespace AlzeyTeilhabe { @@ -29,59 +27,24 @@ namespace AlzeyTeilhabe public void SetReportDataSource(ServicesOverviewRO pRO) { - decimal stundensatz = GetStundensatz(pRO); - decimal pauschale = 0; - pRO.RateFactor = stundensatz; - pRO.TotalFLSQualified = 0; - pRO.TotalFLSUnqualified = 0; - if (pRO.Services != null) { List servicesBillable = new List(); + foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services) { - s.FLSQualified = 0; - s.FLSUnqualified = 0; if (s.IsBillable) { ServicesOverviewRO.CreateSignatureString(s); - if (s.ServiceDescription == "Wegepauschale") - { - s.FLSUnqualified = 1; - pRO.TotalFLSUnqualified += 1; - } - else - { - s.FLSQualified = s.Minutes / 60; - pRO.TotalFLSQualified += s.FLSQualified; - } servicesBillable.Add(s); } } - if (pRO.Services.Count > 0) - { - pauschale = GetWegepauschale(pRO.Services[0].ServiceRecordOid); - } - pRO.Services = servicesBillable; - var sumFLS = Math.Round((decimal)pRO.TotalFLSQualified * stundensatz, 2, MidpointRounding.AwayFromZero); - var sumPausch = Math.Round((decimal)pRO.TotalFLSUnqualified * pauschale, 2, MidpointRounding.AwayFromZero); - lblSumFls.Text = String.Format("{0:0.00} €", sumFLS); - if (pRO.StartDate > new DateTime(2025, 04, 30)) - { - lblPauschale.Text = String.Format("{0:0.00} €", pauschale); - lblSumPauschale.Text = String.Format("{0:0.00} €", sumPausch); - lblSum.Text = String.Format("{0:0.00} €", sumPausch + sumFLS); - lblPauschale.Visible = true; - lblSumPauschale.Visible = true; - lblSum.Visible = true; - xrLabel27.Visible = true; - xrLabel28.Visible = true; - xrLabel30.Visible = true; - } + pRO.Services = servicesBillable; } - + decimal stundensatz = GetStundensatz(pRO); + pRO.RateFactor = stundensatz; decimal uebertragFLS = 0; if (pRO.SupportConceptCostBearer != null) @@ -125,35 +88,20 @@ namespace AlzeyTeilhabe } lblUebertragFLS.Text = string.Format("{0:0.00}", uebertragFLS); } - + this.bindingSource1.DataSource = pRO; } - - private decimal GetWegepauschale(long serviceRecordOid) - { - var sr = DAOFactory.GenericDAO.LoadByID(serviceRecordOid); - var srDC = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDC(sr); - - if (srDC.ServiceDescription.CostRatePeriods != null) - { - var crp = srDC.ServiceDescription.CostRatePeriods.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, sr.Start.Value); - - if (crp != null) - { - return crp.CostRateValue ?? 0; - } - } - return 0; - } - private decimal GetStundensatz(ServicesOverviewRO pRO) { if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0) { var c2s = pRO.CostBearer2SupportConceptList[0]; + var crpList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(c2s.CostBearer.CostRatePeriods); + var cp = crpList.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, pRO.StartDate); + if (cp != null && cp.CostRateValue.HasValue) { return cp.CostRateValue.Value; @@ -162,7 +110,6 @@ namespace AlzeyTeilhabe return 0; } - private void picSignature_BeforePrint(object sender, CancelEventArgs e) { XRPictureBox xrBox = sender as XRPictureBox; @@ -172,7 +119,7 @@ namespace AlzeyTeilhabe { var base64Data = Regex.Match(base64String, @"data:image/(?.+?),(?.+)").Groups["data"].Value; var binData = Convert.FromBase64String(base64Data); - System.Drawing.Image img = ByteArrayToImage(binData); + Image img = ByteArrayToImage(binData); xrBox.Image = Utils.CropImage(img); } else @@ -181,12 +128,12 @@ namespace AlzeyTeilhabe } } - public System.Drawing.Image ByteArrayToImage(byte[] byteArrayIn) + public Image ByteArrayToImage(byte[] byteArrayIn) { using (var memoryStream = new MemoryStream(byteArrayIn)) { - return System.Drawing.Image.FromStream(memoryStream); + return Image.FromStream(memoryStream); } } } -} +} \ No newline at end of file