From e8ae64480c9a88d69068e836b582cd6cd0676e3a Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 15 Jul 2025 14:04:07 +0200 Subject: [PATCH] =?UTF-8?q?DiakonieLennepReports/ServicesOverviewReport=20?= =?UTF-8?q?-=20Entfernen=20der=20zweiten=20Seite=20mit=20Betr=C3=A4gen=20-?= =?UTF-8?q?=20ist=20in=20Berichten=20gel=C3=B6st?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServicesOverviewReport.Designer.cs | 652 +----------------- .../ServicesOverviewReport.cs | 31 +- 2 files changed, 7 insertions(+), 676 deletions(-) diff --git a/ReportImp/DiakonieLennepReports/ServicesOverviewReport.Designer.cs b/ReportImp/DiakonieLennepReports/ServicesOverviewReport.Designer.cs index ceb7d4296..0940128b7 100644 --- a/ReportImp/DiakonieLennepReports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/DiakonieLennepReports/ServicesOverviewReport.Designer.cs @@ -32,7 +32,6 @@ namespace BeWo.DiakonieLennepReports this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Stundenzettel)); DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); - DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); @@ -107,6 +106,7 @@ namespace BeWo.DiakonieLennepReports this.xrPictureBox5 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule(); @@ -119,57 +119,11 @@ namespace BeWo.DiakonieLennepReports this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldBillableFLMWithFactor = new DevExpress.XtraReports.UI.CalculatedField(); - this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); - this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); - this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); - this.picSignature2 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.lblPartner2 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblMonat2 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel32 = new DevExpress.XtraReports.UI.XRLabel(); - this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.lblStundensatz = new DevExpress.XtraReports.UI.XRLabel(); - this.lblBetrag = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel34 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel35 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel36 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel37 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel39 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel40 = new DevExpress.XtraReports.UI.XRLabel(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // @@ -1070,6 +1024,10 @@ namespace BeWo.DiakonieLennepReports this.xrLabel6.Text = "Datum, Unterschrift Fachkraft:"; this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -1154,566 +1112,13 @@ namespace BeWo.DiakonieLennepReports this.fieldBillableFLMWithFactor.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldBillableFLMWithFactor.Name = "fieldBillableFLMWithFactor"; // - // DetailReport1 - // - this.DetailReport1.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { - this.Detail2, - this.GroupHeader1, - this.GroupFooter2}); - this.DetailReport1.DataMember = "Services"; - this.DetailReport1.DataSource = this.bindingSource1; - this.DetailReport1.Level = 1; - this.DetailReport1.Name = "DetailReport1"; - // - // Detail2 - // - this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable2}); - this.Detail2.HeightF = 20F; - this.Detail2.Name = "Detail2"; - // - // xrTable2 - // - this.xrTable2.BorderColor = System.Drawing.Color.Black; - this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable2.Name = "xrTable2"; - this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow3}); - this.xrTable2.SizeF = new System.Drawing.SizeF(745F, 20F); - this.xrTable2.StylePriority.UseFont = false; - this.xrTable2.StylePriority.UsePadding = false; - this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrTableRow3 - // - this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell10, - this.xrTableCell12, - this.xrTableCell14, - this.xrTableCell16, - this.xrTableCell23, - this.xrTableCell24, - this.xrTableCell41}); - this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); - this.xrTableRow3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableRow3.Weight = 1D; - // - // xrTableCell10 - // - this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd.MM.yyyy}")}); - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrTableCell10.StylePriority.UseFont = false; - this.xrTableCell10.StylePriority.UsePadding = false; - this.xrTableCell10.StylePriority.UseTextAlignment = false; - this.xrTableCell10.Text = "xrTableCell13"; - this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell10.Weight = 0.14874331778882272D; - // - // xrTableCell12 - // - this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.TimeRangeString")}); - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.StylePriority.UseTextAlignment = false; - this.xrTableCell12.Text = "xrTableCell18"; - this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell12.Weight = 0.17303578808406084D; - // - // xrTableCell14 - // - this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes")}); - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.StylePriority.UseTextAlignment = false; - this.xrTableCell14.Text = "xrTableCell6"; - this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell14.TextFormatString = "{0:#.##}"; - this.xrTableCell14.Weight = 0.17876616753481706D; - // - // xrTableCell16 - // - this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceDescription")}); - this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); - this.xrTableCell16.StylePriority.UsePadding = false; - this.xrTableCell16.StylePriority.UseTextAlignment = false; - this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell16.Weight = 0.32451461926750447D; - // - // xrTableCell23 - // - this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeAbbr")}); - this.xrTableCell23.Name = "xrTableCell23"; - this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); - this.xrTableCell23.StylePriority.UsePadding = false; - this.xrTableCell23.StylePriority.UseTextAlignment = false; - this.xrTableCell23.Text = "xrTableCell20"; - this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell23.Weight = 0.17975218620803463D; - // - // xrTableCell24 - // - this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesQualified")}); - this.xrTableCell24.Name = "xrTableCell24"; - this.xrTableCell24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); - this.xrTableCell24.StylePriority.UseFont = false; - this.xrTableCell24.StylePriority.UsePadding = false; - this.xrTableCell24.StylePriority.UseTextAlignment = false; - this.xrTableCell24.Text = "xrTableCell15"; - this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell24.TextFormatString = "{0:#.##}"; - this.xrTableCell24.Weight = 0.18606435900294277D; - // - // xrTableCell41 - // - this.xrTableCell41.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.picSignature2}); - this.xrTableCell41.Name = "xrTableCell41"; - this.xrTableCell41.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F); - this.xrTableCell41.StylePriority.UsePadding = false; - this.xrTableCell41.StylePriority.UseTextAlignment = false; - this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell41.Weight = 0.1942959010522525D; - // - // picSignature2 - // - this.picSignature2.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.picSignature2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature"), - new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "Services.SignatureImage")}); - this.picSignature2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.picSignature2.Name = "picSignature2"; - this.picSignature2.SizeF = new System.Drawing.SizeF(104.4999F, 20F); - this.picSignature2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - this.picSignature2.StylePriority.UseBorders = false; - // - // GroupHeader1 - // - this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.lblPartner2, - this.xrTable1, - this.xrLabel30, - this.xrLabel28, - this.xrLabel27, - this.xrLabel26, - this.xrLabel24, - this.xrLabel22, - this.xrLabel31, - this.xrLabel21, - this.lblMonat2, - this.xrLabel20, - this.xrLabel32}); - this.GroupHeader1.HeightF = 213.2709F; - this.GroupHeader1.Name = "GroupHeader1"; - this.GroupHeader1.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBand; - // - // lblPartner2 - // - this.lblPartner2.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.lblPartner2.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblPartner2.LocationFloat = new DevExpress.Utils.PointFloat(436.2773F, 137.2916F); - this.lblPartner2.Name = "lblPartner2"; - this.lblPartner2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblPartner2.SizeF = new System.Drawing.SizeF(303.1672F, 25F); - this.lblPartner2.StylePriority.UseBorders = false; - this.lblPartner2.StylePriority.UseFont = false; - this.lblPartner2.StylePriority.UseTextAlignment = false; - this.lblPartner2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // - // xrTable1 - // - this.xrTable1.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.999952F, 178.8674F); - this.xrTable1.Name = "xrTable1"; - this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(55, 3, 0, 0, 100F); - this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(744.0001F, 34.40344F); - this.xrTable1.StylePriority.UseBackColor = false; - this.xrTable1.StylePriority.UseBorders = false; - this.xrTable1.StylePriority.UseFont = false; - this.xrTable1.StylePriority.UsePadding = false; - this.xrTable1.StylePriority.UseTextAlignment = false; - this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - // - // xrTableRow1 - // - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell5, - this.xrTableCell7, - this.xrTableCell8, - this.xrTableCell9, - this.xrTableCell21, - this.xrTableCell22, - this.xrTableCell40}); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrTableRow1.StylePriority.UsePadding = false; - this.xrTableRow1.StylePriority.UseTextAlignment = false; - this.xrTableRow1.Weight = 1.71875D; - // - // xrTableCell5 - // - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrTableCell5.StylePriority.UseFont = false; - this.xrTableCell5.StylePriority.UseTextAlignment = false; - this.xrTableCell5.Text = "Datum"; - this.xrTableCell5.Weight = 0.28369939394252969D; - // - // xrTableCell7 - // - this.xrTableCell7.Multiline = true; - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Text = "Uhrzeit\r\nvon ... bis"; - this.xrTableCell7.Weight = 0.33420990331527223D; - // - // xrTableCell8 - // - this.xrTableCell8.Multiline = true; - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Text = "Zeitaufwand \r\nin Minuten"; - this.xrTableCell8.Weight = 0.34743670128519255D; - // - // xrTableCell9 - // - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Text = "Art der Leistung"; - this.xrTableCell9.Weight = 0.62462488146041706D; - // - // xrTableCell21 - // - this.xrTableCell21.Name = "xrTableCell21"; - this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrTableCell21.StylePriority.UsePadding = false; - this.xrTableCell21.Text = "Mitarbeiter/in"; - this.xrTableCell21.Weight = 0.34718228341788615D; - // - // xrTableCell22 - // - this.xrTableCell22.Multiline = true; - this.xrTableCell22.Name = "xrTableCell22"; - this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrTableCell22.StylePriority.UseFont = false; - this.xrTableCell22.StylePriority.UseTextAlignment = false; - this.xrTableCell22.Text = "anrechenbare Minuten"; - this.xrTableCell22.Weight = 0.35937428058282433D; - // - // xrTableCell40 - // - this.xrTableCell40.Name = "xrTableCell40"; - this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrTableCell40.StylePriority.UsePadding = false; - this.xrTableCell40.Text = "Unterschrift"; - this.xrTableCell40.Weight = 0.37527331496021665D; - // - // xrLabel30 - // - this.xrLabel30.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerBirthday", "{0:dd.MM.yyyy}")}); - this.xrLabel30.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(500.4298F, 64.17713F); - this.xrLabel30.Name = "xrLabel30"; - this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel30.SizeF = new System.Drawing.SizeF(84.99985F, 24.99999F); - this.xrLabel30.StylePriority.UseBorders = false; - this.xrLabel30.StylePriority.UseFont = false; - this.xrLabel30.StylePriority.UseTextAlignment = false; - this.xrLabel30.Text = "xrLabel16"; - this.xrLabel30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel28 - // - this.xrLabel28.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(394.9275F, 64.17713F); - this.xrLabel28.Name = "xrLabel28"; - this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel28.SizeF = new System.Drawing.SizeF(105.5022F, 24.99999F); - this.xrLabel28.StylePriority.UseFont = false; - this.xrLabel28.StylePriority.UseTextAlignment = false; - this.xrLabel28.Text = "Geburtsdatum:"; - this.xrLabel28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // - // xrLabel27 - // - this.xrLabel27.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")}); - this.xrLabel27.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(210.7084F, 105.2188F); - this.xrLabel27.Name = "xrLabel27"; - this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel27.SizeF = new System.Drawing.SizeF(227.2916F, 25F); - this.xrLabel27.StylePriority.UseBorders = false; - this.xrLabel27.StylePriority.UseFont = false; - this.xrLabel27.StylePriority.UseTextAlignment = false; - this.xrLabel27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel26 - // - this.xrLabel26.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReferenceNumber")}); - this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(500.4298F, 105.22F); - this.xrLabel26.Name = "xrLabel26"; - this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel26.SizeF = new System.Drawing.SizeF(239.0147F, 25F); - this.xrLabel26.StylePriority.UseBorders = false; - this.xrLabel26.StylePriority.UseFont = false; - this.xrLabel26.StylePriority.UseTextAlignment = false; - this.xrLabel26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel24 - // - this.xrLabel24.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerName")}); - this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(221.7984F, 64.17999F); - this.xrLabel24.Name = "xrLabel24"; - this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel24.SizeF = new System.Drawing.SizeF(165.4107F, 25F); - this.xrLabel24.StylePriority.UseBorders = false; - this.xrLabel24.StylePriority.UseFont = false; - this.xrLabel24.StylePriority.UseTextAlignment = false; - this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel22 - // - this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0F, 105.22F); - this.xrLabel22.Name = "xrLabel22"; - this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel22.SizeF = new System.Drawing.SizeF(210.7084F, 25F); - this.xrLabel22.StylePriority.UseFont = false; - this.xrLabel22.StylePriority.UseTextAlignment = false; - this.xrLabel22.Text = "Namen der Fachkräfte:"; - this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel31 - // - this.xrLabel31.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(589.1691F, 64.17713F); - this.xrLabel31.Name = "xrLabel31"; - this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel31.SizeF = new System.Drawing.SizeF(51.04218F, 25F); - this.xrLabel31.StylePriority.UseFont = false; - this.xrLabel31.StylePriority.UseTextAlignment = false; - this.xrLabel31.Text = "Monat:"; - this.xrLabel31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel21 - // - this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(455.0106F, 105.2188F); - this.xrLabel21.Name = "xrLabel21"; - this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel21.SizeF = new System.Drawing.SizeF(44.91681F, 25F); - this.xrLabel21.StylePriority.UseFont = false; - this.xrLabel21.StylePriority.UseTextAlignment = false; - this.xrLabel21.Text = "AZ:"; - this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // - // lblMonat2 - // - this.lblMonat2.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.lblMonat2.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblMonat2.LocationFloat = new DevExpress.Utils.PointFloat(640.5001F, 64.17713F); - this.lblMonat2.Name = "lblMonat2"; - this.lblMonat2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblMonat2.SizeF = new System.Drawing.SizeF(98.94421F, 25F); - this.lblMonat2.StylePriority.UseBorders = false; - this.lblMonat2.StylePriority.UseFont = false; - this.lblMonat2.StylePriority.UseTextAlignment = false; - this.lblMonat2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel20 - // - this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 64.17999F); - this.xrLabel20.Name = "xrLabel20"; - this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel20.SizeF = new System.Drawing.SizeF(210.7084F, 24.99999F); - this.xrLabel20.StylePriority.UseFont = false; - this.xrLabel20.StylePriority.UseTextAlignment = false; - this.xrLabel20.Text = "Leistungsberechtigte Person:"; - this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel32 - // - this.xrLabel32.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(0.9999911F, 0.1354218F); - this.xrLabel32.Multiline = true; - this.xrLabel32.Name = "xrLabel32"; - this.xrLabel32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel32.SizeF = new System.Drawing.SizeF(701.4167F, 36.00003F); - this.xrLabel32.StylePriority.UseFont = false; - this.xrLabel32.StylePriority.UseTextAlignment = false; - this.xrLabel32.Text = " Leistungsnachweis im Rahmen der Assistenz in eigener Häuslichkeit (BeWo)"; - this.xrLabel32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - // - // GroupFooter2 - // - this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.lblStundensatz, - this.lblBetrag, - this.xrLabel34, - this.xrLabel35, - this.xrLabel36, - this.xrLabel37, - this.xrLabel39, - this.xrLabel40}); - this.GroupFooter2.HeightF = 157.8931F; - this.GroupFooter2.Name = "GroupFooter2"; - // - // lblStundensatz - // - this.lblStundensatz.Font = new DevExpress.Drawing.DXFont("Arial", 9F); - this.lblStundensatz.LocationFloat = new DevExpress.Utils.PointFloat(477.9203F, 93.42448F); - this.lblStundensatz.Name = "lblStundensatz"; - this.lblStundensatz.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblStundensatz.SizeF = new System.Drawing.SizeF(150.0797F, 24.12097F); - this.lblStundensatz.StylePriority.UseBorders = false; - this.lblStundensatz.StylePriority.UseFont = false; - this.lblStundensatz.StylePriority.UseTextAlignment = false; - this.lblStundensatz.Text = "FLSTD. in Euro (x57,90)"; - this.lblStundensatz.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // lblBetrag - // - this.lblBetrag.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.lblBetrag.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblBetrag.LocationFloat = new DevExpress.Utils.PointFloat(628F, 93.42448F); - this.lblBetrag.Name = "lblBetrag"; - this.lblBetrag.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblBetrag.SizeF = new System.Drawing.SizeF(74.41675F, 24.121F); - this.lblBetrag.StylePriority.UseBorders = false; - this.lblBetrag.StylePriority.UseFont = false; - this.lblBetrag.StylePriority.UseTextAlignment = false; - this.lblBetrag.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel34 - // - this.xrLabel34.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesQualified")}); - this.xrLabel34.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(540.4274F, 0F); - this.xrLabel34.Name = "xrLabel34"; - this.xrLabel34.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); - this.xrLabel34.SizeF = new System.Drawing.SizeF(99.07263F, 25F); - this.xrLabel34.StylePriority.UseBorders = false; - this.xrLabel34.StylePriority.UseBorderWidth = false; - this.xrLabel34.StylePriority.UseFont = false; - this.xrLabel34.StylePriority.UsePadding = false; - this.xrLabel34.StylePriority.UseTextAlignment = false; - xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Report; - this.xrLabel34.Summary = xrSummary2; - this.xrLabel34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrLabel34.TextFormatString = "{0:#,##}"; - // - // xrLabel35 - // - this.xrLabel35.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel35.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillable")}); - this.xrLabel35.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(172.0654F, 0F); - this.xrLabel35.Name = "xrLabel35"; - this.xrLabel35.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); - this.xrLabel35.SizeF = new System.Drawing.SizeF(97.14745F, 25F); - this.xrLabel35.StylePriority.UseBorders = false; - this.xrLabel35.StylePriority.UseBorderWidth = false; - this.xrLabel35.StylePriority.UseFont = false; - this.xrLabel35.StylePriority.UsePadding = false; - this.xrLabel35.StylePriority.UseTextAlignment = false; - this.xrLabel35.Text = "xrLabel5"; - this.xrLabel35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrLabel35.TextFormatString = "{0:#,##}"; - // - // xrLabel36 - // - this.xrLabel36.BorderWidth = 2F; - this.xrLabel36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSQualified", "{0:0.##}")}); - this.xrLabel36.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel36.LocationFloat = new DevExpress.Utils.PointFloat(628F, 45.42618F); - this.xrLabel36.Name = "xrLabel36"; - this.xrLabel36.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); - this.xrLabel36.SizeF = new System.Drawing.SizeF(88.99994F, 25F); - this.xrLabel36.StylePriority.UseBorders = false; - this.xrLabel36.StylePriority.UseBorderWidth = false; - this.xrLabel36.StylePriority.UseFont = false; - this.xrLabel36.StylePriority.UsePadding = false; - this.xrLabel36.StylePriority.UseTextAlignment = false; - this.xrLabel36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel37 - // - this.xrLabel37.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - this.xrLabel37.LocationFloat = new DevExpress.Utils.PointFloat(380F, 45.4245F); - this.xrLabel37.Multiline = true; - this.xrLabel37.Name = "xrLabel37"; - this.xrLabel37.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 5, 0, 100F); - this.xrLabel37.SizeF = new System.Drawing.SizeF(248F, 48F); - this.xrLabel37.StylePriority.UseFont = false; - this.xrLabel37.StylePriority.UsePadding = false; - this.xrLabel37.Text = "Fachleistungsstunden (mit Faktor 1,2) insgesamt:"; - // - // xrLabel39 - // - this.xrLabel39.BorderWidth = 2F; - this.xrLabel39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "fieldBillableFLS", "{0:0.##}")}); - this.xrLabel39.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel39.LocationFloat = new DevExpress.Utils.PointFloat(261.1044F, 45.42449F); - this.xrLabel39.Name = "xrLabel39"; - this.xrLabel39.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); - this.xrLabel39.SizeF = new System.Drawing.SizeF(98F, 25F); - this.xrLabel39.StylePriority.UseBorders = false; - this.xrLabel39.StylePriority.UseBorderWidth = false; - this.xrLabel39.StylePriority.UseFont = false; - this.xrLabel39.StylePriority.UsePadding = false; - this.xrLabel39.StylePriority.UseTextAlignment = false; - this.xrLabel39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel40 - // - this.xrLabel40.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - this.xrLabel40.LocationFloat = new DevExpress.Utils.PointFloat(1.521057F, 45.42613F); - this.xrLabel40.Multiline = true; - this.xrLabel40.Name = "xrLabel40"; - this.xrLabel40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 5, 0, 100F); - this.xrLabel40.SizeF = new System.Drawing.SizeF(259.5833F, 48F); - this.xrLabel40.StylePriority.UseFont = false; - this.xrLabel40.StylePriority.UsePadding = false; - this.xrLabel40.Text = "Fachleistungsstunden (ohne Faktor 1,2) insgesamt:"; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail, this.DetailReport, this.topMarginBand1, - this.bottomMarginBand1, - this.DetailReport1}); + this.bottomMarginBand1}); this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { this.fieldAbrechenbareMinuten, this.fieldBillableFLS, @@ -1741,8 +1146,6 @@ namespace BeWo.DiakonieLennepReports ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -1791,49 +1194,9 @@ namespace BeWo.DiakonieLennepReports private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLMWithFactor; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; - private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; - private DevExpress.XtraReports.UI.DetailBand Detail2; - private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; - private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2; - private DevExpress.XtraReports.UI.XRLabel xrLabel30; - private DevExpress.XtraReports.UI.XRLabel xrLabel28; - private DevExpress.XtraReports.UI.XRLabel xrLabel27; - private DevExpress.XtraReports.UI.XRLabel xrLabel26; - private DevExpress.XtraReports.UI.XRLabel xrLabel24; - private DevExpress.XtraReports.UI.XRLabel xrLabel22; - private DevExpress.XtraReports.UI.XRLabel xrLabel31; - private DevExpress.XtraReports.UI.XRLabel xrLabel21; - private DevExpress.XtraReports.UI.XRLabel lblMonat2; - private DevExpress.XtraReports.UI.XRLabel xrLabel20; - private DevExpress.XtraReports.UI.XRLabel xrLabel32; - private DevExpress.XtraReports.UI.XRLabel xrLabel34; - private DevExpress.XtraReports.UI.XRLabel xrLabel35; - private DevExpress.XtraReports.UI.XRLabel xrLabel36; - private DevExpress.XtraReports.UI.XRLabel xrLabel37; - private DevExpress.XtraReports.UI.XRLabel xrLabel39; - private DevExpress.XtraReports.UI.XRLabel xrLabel40; - private DevExpress.XtraReports.UI.XRLabel lblStundensatz; - private DevExpress.XtraReports.UI.XRLabel lblBetrag; private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; - private DevExpress.XtraReports.UI.XRTable xrTable2; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; - private DevExpress.XtraReports.UI.XRTable xrTable1; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; private DevExpress.XtraReports.UI.XRLabel lblPartner1; - private DevExpress.XtraReports.UI.XRLabel lblPartner2; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter3; @@ -1863,9 +1226,6 @@ namespace BeWo.DiakonieLennepReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; private DevExpress.XtraReports.UI.XRTableCell xrTableCell38; private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell41; - private DevExpress.XtraReports.UI.XRPictureBox picSignature2; private DevExpress.XtraReports.UI.XRTable xrTable4; private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; diff --git a/ReportImp/DiakonieLennepReports/ServicesOverviewReport.cs b/ReportImp/DiakonieLennepReports/ServicesOverviewReport.cs index 8bfc2da90..e0ef67eb1 100644 --- a/ReportImp/DiakonieLennepReports/ServicesOverviewReport.cs +++ b/ReportImp/DiakonieLennepReports/ServicesOverviewReport.cs @@ -30,7 +30,6 @@ namespace BeWo.DiakonieLennepReports decimal stundensatz = GetStundensatz(pRO); lblMonat1.Text = String.Format("{0} {1}", pRO.Month, pRO.Year); - lblMonat2.Text = lblMonat1.Text; pRO.TotalFLMFehlkontakte = 0; pRO.TotalFLMoFehlkontakte = 0; @@ -64,18 +63,11 @@ namespace BeWo.DiakonieLennepReports pRO.TotalFLMQualified = pRO.TotalFLMFehlkontakte + pRO.TotalFLMoFehlkontakte; pRO.TotalFLSQualified = Math.Round(pRO.TotalFLMQualified / 60, 2); - lblStundensatz.Text = String.Format("FLS in Euro ({0:c})", stundensatz); - var stunden = (decimal)(pRO.TotalFLMFehlkontakte * 0.8 + pRO.TotalFLMoFehlkontakte) / 60; - var flsSumme = stunden * stundensatz; - - - lblBetrag.Text = String.Format("{0:c}", flsSumme); pRO.Services = servicesBillable; } lblPartner1.Text = ""; - lblPartner2.Text = ""; if (pRO.CustomerOid > 0) { @@ -83,7 +75,6 @@ namespace BeWo.DiakonieLennepReports if (!String.IsNullOrEmpty(c.DebitorNumber)) { lblPartner1.Text = String.Format("Partnernummer: {0}", c.DebitorNumber); - lblPartner2.Text = String.Format("Partnernummer: {0}", c.DebitorNumber); } } @@ -136,8 +127,7 @@ namespace BeWo.DiakonieLennepReports row.Cells[2].Text = String.Format("{0:0}", days); index++; - } - + } } } @@ -146,9 +136,7 @@ namespace BeWo.DiakonieLennepReports if (pRo.CostBearer2SupportConceptList != null && pRo.CostBearer2SupportConceptList.Count > 0) { var cb2sc = pRo.CostBearer2SupportConceptList[0]; - var crpDcs = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(cb2sc.CostBearer.CostRatePeriods); - var crp = crpDcs.GetCostRatePeriodForDate(CostRatePeriodType.HourlyRate, pRo.StartDate); if (crp != null) @@ -158,22 +146,5 @@ namespace BeWo.DiakonieLennepReports } return 0; } - - //private void picSignature_BeforePrint(object sender, CancelEventArgs e) - //{ - - //} - //private void picSignature2_BeforePrint(object sender, CancelEventArgs e) - //{ - - //} - - //public System.Drawing.Image ByteArrayToImage(byte[] byteArrayIn) - //{ - // using (var memoryStream = new MemoryStream(byteArrayIn)) - // { - // return System.Drawing.Image.FromStream(memoryStream); - // } - //} } }