diff --git a/ReportImp/SuchtkrankenhilfeOstfriesland/Calculation/CustomCalculations.cs b/ReportImp/SuchtkrankenhilfeOstfriesland/Calculation/CustomCalculations.cs index 3160478b0..f35b75eaf 100644 --- a/ReportImp/SuchtkrankenhilfeOstfriesland/Calculation/CustomCalculations.cs +++ b/ReportImp/SuchtkrankenhilfeOstfriesland/Calculation/CustomCalculations.cs @@ -30,22 +30,35 @@ namespace SuchtkrankenhilfeOstfriesland.Calculation { var anwesenheiten = serviceRecords.Where(s => s.ServiceDescription.Name.Trim().ToLower().Contains("anwesend ts")).OrderBy(s => s.Start).ToList(); - List anwesenheitstage = new List(); - foreach (var sr in anwesenheiten) + if (anwesenheiten.Count > 0) { - if (!anwesenheitstage.Contains(sr.Start.Value.Date)) - anwesenheitstage.Add(sr.Start.Value.Date); - } + List anwesenheitstage = new List(); + foreach (var sr in anwesenheiten) + { + if (!anwesenheitstage.Contains(sr.Start.Value.Date)) + anwesenheitstage.Add(sr.Start.Value.Date); + } - // Wenn die erste Anwesenheit erst ab dem 15. ist, wird die Pauschale für den Monat halbiert - if (anwesenheitstage[0].Day <= 15) + // Wenn die erste Anwesenheit erst ab dem 15. ist, wird die Pauschale für den Monat halbiert + if (anwesenheitstage[0].Day > 15) + { + data.AmountTotal /= 2; + data.GrossAmountTotal /= 2; + } + } + else { - data.AmountTotal /= 2; - data.GrossAmountTotal /= 2; + data.AmountTotal = 0; + data.GrossAmountTotal = 0; } } - + else + { + data.AmountTotal = 0; + data.GrossAmountTotal = 0; + } } + return billingData; } diff --git a/ReportImp/SuchtkrankenhilfeOstfriesland/Invoicing/CustomTagesstrukturInvoiceCreation.cs b/ReportImp/SuchtkrankenhilfeOstfriesland/Invoicing/CustomTagesstrukturInvoiceCreation.cs index 9413798d1..6daced874 100644 --- a/ReportImp/SuchtkrankenhilfeOstfriesland/Invoicing/CustomTagesstrukturInvoiceCreation.cs +++ b/ReportImp/SuchtkrankenhilfeOstfriesland/Invoicing/CustomTagesstrukturInvoiceCreation.cs @@ -28,7 +28,7 @@ namespace SuchtkrankenhilfeOstfriesland.Invoicing foreach (var billingData in data) { - serviceInvoicePeriod.InvoiceItemList.Add(new InvoiceItem + var invoiceItem = new InvoiceItem { AmountTotal = billingData.AmountTotal, GrossAmountTotal = billingData.GrossAmountTotal, @@ -38,7 +38,14 @@ namespace SuchtkrankenhilfeOstfriesland.Invoicing AmountPerUnit = billingData.AmountPerUnit, UnitCount = billingData.AmountPerUnit != billingData.AmountTotal ? 0.5m : 1m, ItemDescription = billingData.AmountPerUnit != billingData.AmountTotal ? "Anteiliger Pauschalbetrag" : "Pauschalbetrag" - }); + }; + if (invoiceItem.AmountTotal == 0) + { + invoiceItem.UnitCount = 0; + invoiceItem.ItemDescription = "Keine Anwesenheit"; + } + + serviceInvoicePeriod.InvoiceItemList.Add(invoiceItem); } } diff --git a/ReportImp/SuchtkrankenhilfeOstfriesland/QuittierungsbelegTagesstaette.Designer.cs b/ReportImp/SuchtkrankenhilfeOstfriesland/QuittierungsbelegTagesstaette.Designer.cs index 0519661f9..363c304a6 100644 --- a/ReportImp/SuchtkrankenhilfeOstfriesland/QuittierungsbelegTagesstaette.Designer.cs +++ b/ReportImp/SuchtkrankenhilfeOstfriesland/QuittierungsbelegTagesstaette.Designer.cs @@ -38,39 +38,19 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); - this.tcAnfahrtJaNein = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); - this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.tableMitAnfahrt = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.tcAnfahrt1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.tcAnfahrt2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.lblKontaktLeer = new DevExpress.XtraReports.UI.XRRichText(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); @@ -84,7 +64,6 @@ namespace SuchtkrankenhilfeOstfriesland this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.lblFehlkontakt = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); this.lblUnterschriftKlient = new DevExpress.XtraReports.UI.XRLabel(); @@ -115,22 +94,19 @@ namespace SuchtkrankenhilfeOstfriesland this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText(); this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblFLSInMinMitAnfahrt = new DevExpress.XtraReports.UI.XRLabel(); - this.lblSummeMitAnfahrt = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblStrichOhneAnfahrt = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tableMitAnfahrt)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lblKontaktLeer)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -182,14 +158,8 @@ namespace SuchtkrankenhilfeOstfriesland // this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell13, - this.xrTableCell14, - this.xrTableCell10, - this.xrTableCell2, - this.xrTableCell15, - this.tcAnfahrtJaNein, - this.xrTableCell12, this.xrTableCell44, - this.xrTableCell50}); + this.xrTableCell5}); this.xrTableRow6.Name = "xrTableRow6"; this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; @@ -208,89 +178,7 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell13.StylePriority.UseTextAlignment = false; this.xrTableCell13.Text = "xrTableCell13"; this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell13.Weight = 0.11994951833461227D; - // - // xrTableCell14 - // - this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDateMinutes", "{0:HH:mm}")}); - this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.StylePriority.UseBorders = false; - this.xrTableCell14.StylePriority.UseFont = false; - this.xrTableCell14.StylePriority.UsePadding = false; - this.xrTableCell14.StylePriority.UseTextAlignment = false; - this.xrTableCell14.Text = "xrTableCell14"; - this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell14.Weight = 0.075757539512030528D; - // - // xrTableCell10 - // - this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EndDateMinutes", "{0:HH:mm}")}); - this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.StylePriority.UseBorders = false; - this.xrTableCell10.StylePriority.UseFont = false; - this.xrTableCell10.StylePriority.UsePadding = false; - this.xrTableCell10.StylePriority.UseTextAlignment = false; - this.xrTableCell10.Text = "xrTableCell10"; - this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell10.Weight = 0.075757597310472657D; - // - // xrTableCell2 - // - this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")}); - this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.StylePriority.UseFont = false; - this.xrTableCell2.StylePriority.UsePadding = false; - this.xrTableCell2.StylePriority.UseTextAlignment = false; - this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell2.Weight = 0.052348481383048422D; - // - // xrTableCell15 - // - this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.CustomerCount", "{0:0}")}); - this.xrTableCell15.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell15.Name = "xrTableCell15"; - this.xrTableCell15.StylePriority.UseBorders = false; - this.xrTableCell15.StylePriority.UseFont = false; - this.xrTableCell15.StylePriority.UsePadding = false; - this.xrTableCell15.StylePriority.UseTextAlignment = false; - this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell15.Weight = 0.052344271729803285D; - // - // tcAnfahrtJaNein - // - this.tcAnfahrtJaNein.CanShrink = true; - this.tcAnfahrtJaNein.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice4")}); - this.tcAnfahrtJaNein.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.tcAnfahrtJaNein.Name = "tcAnfahrtJaNein"; - this.tcAnfahrtJaNein.StylePriority.UseFont = false; - this.tcAnfahrtJaNein.StylePriority.UseTextAlignment = false; - this.tcAnfahrtJaNein.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.tcAnfahrtJaNein.Weight = 0.077090206704213668D; - // - // xrTableCell12 - // - this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes", "{0:0.##}")}); - this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.StylePriority.UseBorders = false; - this.xrTableCell12.StylePriority.UseFont = false; - this.xrTableCell12.StylePriority.UsePadding = false; - this.xrTableCell12.StylePriority.UseTextAlignment = false; - this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell12.Weight = 0.10835796858272459D; + this.xrTableCell13.Weight = 0.20123103467713877D; // // xrTableCell44 // @@ -302,37 +190,13 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell44.StylePriority.UsePadding = false; this.xrTableCell44.StylePriority.UseTextAlignment = false; this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell44.Weight = 0.12836698310696729D; - // - // xrTableCell50 - // - this.xrTableCell50.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.picSignature}); - this.xrTableCell50.Name = "xrTableCell50"; - this.xrTableCell50.StylePriority.UseBorders = false; - this.xrTableCell50.StylePriority.UseFont = false; - this.xrTableCell50.StylePriority.UsePadding = false; - this.xrTableCell50.StylePriority.UseTextAlignment = false; - this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell50.Weight = 0.253209205976338D; - // - // picSignature - // - this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); - this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(28.54169F, 0F); - this.picSignature.Name = "picSignature"; - this.picSignature.SizeF = new System.Drawing.SizeF(160F, 20F); - this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - this.picSignature.StylePriority.UseBorders = false; - this.picSignature.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.picSignature_BeforePrint); + this.xrTableCell44.Weight = 0.44865316751421258D; // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.tableMitAnfahrt}); - this.GroupHeader1.HeightF = 70F; + this.GroupHeader1.HeightF = 40.83334F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.RepeatEveryPage = true; // @@ -348,7 +212,7 @@ namespace SuchtkrankenhilfeOstfriesland this.tableMitAnfahrt.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2, this.xrTableRow1}); - this.tableMitAnfahrt.SizeF = new System.Drawing.SizeF(747F, 70F); + this.tableMitAnfahrt.SizeF = new System.Drawing.SizeF(747F, 40.83334F); this.tableMitAnfahrt.StylePriority.UseBackColor = false; this.tableMitAnfahrt.StylePriority.UseBorders = false; this.tableMitAnfahrt.StylePriority.UseFont = false; @@ -358,12 +222,8 @@ namespace SuchtkrankenhilfeOstfriesland // this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell3, - this.xrTableCell4, - this.xrTableCell11, - this.tcAnfahrt1, - this.xrTableCell9, this.xrTableCell28, - this.xrTableCell48}); + this.xrTableCell2}); this.xrTableRow2.Name = "xrTableRow2"; this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableRow2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; @@ -383,74 +243,7 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.Text = "Datum"; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell3.Weight = 0.26536312849161997D; - // - // xrTableCell4 - // - this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell4.Multiline = true; - this.xrTableCell4.Name = "xrTableCell4"; - this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 4, 0, 0, 100F); - this.xrTableCell4.StylePriority.UseBorders = false; - this.xrTableCell4.StylePriority.UseFont = false; - this.xrTableCell4.StylePriority.UsePadding = false; - this.xrTableCell4.StylePriority.UseTextAlignment = false; - this.xrTableCell4.Text = "Uhrzeit"; - this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell4.Weight = 0.33519553072625718D; - // - // xrTableCell11 - // - this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(12, 12, 0, 0, 100F); - this.xrTableCell11.StylePriority.UseBorders = false; - this.xrTableCell11.StylePriority.UseFont = false; - this.xrTableCell11.StylePriority.UsePadding = false; - this.xrTableCell11.StylePriority.UseTextAlignment = false; - this.xrTableCell11.Text = "Angebot"; - this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell11.Weight = 0.23161077233000182D; - // - // tcAnfahrt1 - // - this.tcAnfahrt1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.tcAnfahrt1.CanShrink = true; - this.tcAnfahrt1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.tcAnfahrt1.Name = "tcAnfahrt1"; - this.tcAnfahrt1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.tcAnfahrt1.StylePriority.UseBorders = false; - this.tcAnfahrt1.StylePriority.UseFont = false; - this.tcAnfahrt1.StylePriority.UsePadding = false; - this.tcAnfahrt1.StylePriority.UseTextAlignment = false; - this.tcAnfahrt1.Text = "Anfahrt"; - this.tcAnfahrt1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.tcAnfahrt1.Weight = 0.17054603619282469D; - // - // xrTableCell9 - // - this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell9.Multiline = true; - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrTableCell9.StylePriority.UseBorders = false; - this.xrTableCell9.StylePriority.UseFont = false; - this.xrTableCell9.StylePriority.UsePadding = false; - this.xrTableCell9.StylePriority.UseTextAlignment = false; - this.xrTableCell9.Text = "FLS in"; - this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell9.Weight = 0.23971932693566692D; + this.xrTableCell3.Weight = 0.44518156424581012D; // // xrTableCell28 // @@ -464,35 +257,16 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell28.StylePriority.UseTextAlignment = false; this.xrTableCell28.Text = "Betreuerin /"; this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell28.Weight = 0.28398507400597939D; - // - // xrTableCell48 - // - this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell48.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrTableCell48.Multiline = true; - this.xrTableCell48.Name = "xrTableCell48"; - this.xrTableCell48.StylePriority.UseBorders = false; - this.xrTableCell48.StylePriority.UseFont = false; - this.xrTableCell48.StylePriority.UseTextAlignment = false; - this.xrTableCell48.Text = "Unterschrift"; - this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell48.Weight = 0.5601723100886D; + this.xrTableCell28.Weight = 0.99255115359855117D; // // xrTableRow1 // this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell1, - this.xrTableCell8, - this.xrTableCell5, - this.xrTableCell6, - this.tcAnfahrt2, - this.xrTableCell7, this.xrTableCell43, - this.xrTableCell49}); + this.xrTableCell4}); this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 1.223644578313253D; + this.xrTableRow1.Weight = 0.50985192318996742D; // // xrTableCell1 // @@ -500,86 +274,7 @@ namespace SuchtkrankenhilfeOstfriesland | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell1.Name = "xrTableCell1"; this.xrTableCell1.StylePriority.UseBorders = false; - this.xrTableCell1.Weight = 0.26536312849161997D; - // - // xrTableCell8 - // - this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.StylePriority.UseBorders = false; - this.xrTableCell8.StylePriority.UseFont = false; - this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.Text = "von"; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell8.Weight = 0.16759776536312859D; - // - // xrTableCell5 - // - this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.StylePriority.UseBorders = false; - this.xrTableCell5.StylePriority.UseFont = false; - this.xrTableCell5.StylePriority.UseTextAlignment = false; - this.xrTableCell5.Text = "bis"; - this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell5.Weight = 0.16759776536312857D; - // - // xrTableCell6 - // - this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell6.Multiline = true; - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.StylePriority.UseBorders = false; - this.xrTableCell6.StylePriority.UseFont = false; - this.xrTableCell6.StylePriority.UseTextAlignment = false; - this.xrTableCell6.Text = "Art /\r\nAnzahl\r\nKlienten"; - this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell6.Weight = 0.23161077233000182D; - // - // tcAnfahrt2 - // - this.tcAnfahrt2.BackColor = System.Drawing.Color.Gainsboro; - this.tcAnfahrt2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.tcAnfahrt2.CanShrink = true; - this.tcAnfahrt2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.tcAnfahrt2.Name = "tcAnfahrt2"; - this.tcAnfahrt2.StylePriority.UseBackColor = false; - this.tcAnfahrt2.StylePriority.UseBorders = false; - this.tcAnfahrt2.StylePriority.UseFont = false; - this.tcAnfahrt2.StylePriority.UseTextAlignment = false; - this.tcAnfahrt2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.tcAnfahrt2.Weight = 0.17054603619282469D; - // - // xrTableCell7 - // - this.xrTableCell7.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell7.Multiline = true; - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.StylePriority.UseBackColor = false; - this.xrTableCell7.StylePriority.UseBorders = false; - this.xrTableCell7.StylePriority.UseFont = false; - this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.Text = "Minuten\r\n(ohne 1,2)"; - this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell7.Weight = 0.23971932693566692D; + this.xrTableCell1.Weight = 0.44518156424581012D; // // xrTableCell43 // @@ -592,21 +287,11 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell43.StylePriority.UseTextAlignment = false; this.xrTableCell43.Text = "Betreuer"; this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell43.Weight = 0.28398507400597939D; + this.xrTableCell43.Weight = 0.99255115359855117D; // - // xrTableCell49 + // bindingSource1 // - this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell49.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrTableCell49.Multiline = true; - this.xrTableCell49.Name = "xrTableCell49"; - this.xrTableCell49.StylePriority.UseBorders = false; - this.xrTableCell49.StylePriority.UseFont = false; - this.xrTableCell49.StylePriority.UseTextAlignment = false; - this.xrTableCell49.Text = "Klientin / Klient"; - this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell49.Weight = 0.5601723100886D; + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); // // formattingRuleStartDate // @@ -619,8 +304,6 @@ namespace SuchtkrankenhilfeOstfriesland // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.lblKontaktLeer, - this.xrLabel14, - this.xrLabel16, this.xrLabel7, this.xrLabel8, this.xrLabel6, @@ -639,40 +322,6 @@ namespace SuchtkrankenhilfeOstfriesland this.lblKontaktLeer.SerializableRtfString = resources.GetString("lblKontaktLeer.SerializableRtfString"); this.lblKontaktLeer.SizeF = new System.Drawing.SizeF(215.6249F, 168.8333F); // - // xrLabel14 - // - this.xrLabel14.BackColor = System.Drawing.Color.Gainsboro; - this.xrLabel14.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108.1111F); - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(178.7501F, 30.50001F); - this.xrLabel14.StylePriority.UseBackColor = false; - this.xrLabel14.StylePriority.UseBorders = false; - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.StylePriority.UsePadding = false; - this.xrLabel14.StylePriority.UseTextAlignment = false; - this.xrLabel14.Text = "Bewilligte FLS wöchentlich"; - this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel16 - // - this.xrLabel16.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.##}")}); - this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(178.7501F, 108.1111F); - this.xrLabel16.Name = "xrLabel16"; - this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel16.SizeF = new System.Drawing.SizeF(151.2499F, 30.50001F); - this.xrLabel16.StylePriority.UseBackColor = false; - this.xrLabel16.StylePriority.UseBorders = false; - this.xrLabel16.StylePriority.UseFont = false; - this.xrLabel16.StylePriority.UsePadding = false; - this.xrLabel16.StylePriority.UseTextAlignment = false; - this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // // xrLabel7 // this.xrLabel7.BackColor = System.Drawing.Color.Gainsboro; @@ -680,7 +329,7 @@ namespace SuchtkrankenhilfeOstfriesland | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(7.064255E-05F, 138.6111F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 108.1111F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel7.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F); @@ -697,7 +346,7 @@ namespace SuchtkrankenhilfeOstfriesland this.xrLabel8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(120.6391F, 138.6111F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(120.639F, 108.1111F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(209.3609F, 30.50003F); @@ -829,7 +478,6 @@ namespace SuchtkrankenhilfeOstfriesland // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.lblFehlkontakt, this.xrLabel18, this.xrPictureBox2, this.lblUnterschriftKlient, @@ -840,37 +488,17 @@ namespace SuchtkrankenhilfeOstfriesland this.xrRichText2, this.xrRichText1, this.xrLabel15, - this.xrLabel13, - this.xrLabel12, - this.lblFLSInMinMitAnfahrt, - this.lblSummeMitAnfahrt, this.xrPictureBox1, - this.xrLabel17, - this.lblStrichOhneAnfahrt}); + this.xrLabel17}); this.GroupFooter1.HeightF = 270F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // - // lblFehlkontakt - // - this.lblFehlkontakt.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99999F); - this.lblFehlkontakt.Name = "lblFehlkontakt"; - this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblFehlkontakt.SizeF = new System.Drawing.SizeF(245F, 20F); - this.lblFehlkontakt.StylePriority.UseBackColor = false; - this.lblFehlkontakt.StylePriority.UseBorders = false; - this.lblFehlkontakt.StylePriority.UseFont = false; - this.lblFehlkontakt.StylePriority.UsePadding = false; - this.lblFehlkontakt.StylePriority.UseTextAlignment = false; - this.lblFehlkontakt.Text = "F = Fehlkontakt"; - this.lblFehlkontakt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // // xrLabel18 // this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")}); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 214.5F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(49.36116F, 168.6667F); this.xrLabel18.Name = "xrLabel18"; this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel18.SizeF = new System.Drawing.SizeF(137.3333F, 35.50002F); @@ -881,7 +509,7 @@ namespace SuchtkrankenhilfeOstfriesland // this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); - this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(186.6944F, 214.5F); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(186.6945F, 168.6667F); this.xrPictureBox2.Name = "xrPictureBox2"; this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; @@ -890,7 +518,7 @@ namespace SuchtkrankenhilfeOstfriesland // this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 250F); + this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(49.36116F, 204.1667F); this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(336.6944F, 20F); @@ -906,7 +534,7 @@ namespace SuchtkrankenhilfeOstfriesland // this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.lblUnterschriftMitarbeiter.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 250F); + this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(398.3101F, 204.1667F); this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter"; this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(336.6944F, 19.99998F); @@ -926,7 +554,7 @@ namespace SuchtkrankenhilfeOstfriesland | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableAbwesenheiten.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 80.00005F); + this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170.0001F, 34.16672F); this.xrTableAbwesenheiten.Name = "xrTableAbwesenheiten"; this.xrTableAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableAbwesenheiten.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -1152,7 +780,7 @@ namespace SuchtkrankenhilfeOstfriesland | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblHatAbwesenheiten.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 130F); + this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(435.1389F, 84.16666F); this.lblHatAbwesenheiten.Name = "lblHatAbwesenheiten"; this.lblHatAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblHatAbwesenheiten.SizeF = new System.Drawing.SizeF(30F, 30F); @@ -1169,7 +797,7 @@ namespace SuchtkrankenhilfeOstfriesland | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblHatGruppen.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 80.00005F); + this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1389F, 34.16672F); this.lblHatGruppen.Name = "lblHatGruppen"; this.lblHatGruppen.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblHatGruppen.SizeF = new System.Drawing.SizeF(30F, 30F); @@ -1183,7 +811,7 @@ namespace SuchtkrankenhilfeOstfriesland // xrRichText2 // this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4724F, 130F); + this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4725F, 84.16666F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 68.05556F); @@ -1192,7 +820,7 @@ namespace SuchtkrankenhilfeOstfriesland // xrRichText1 // this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4724F, 80.00005F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4725F, 34.16672F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); this.xrRichText1.SizeF = new System.Drawing.SizeF(264.9721F, 50F); @@ -1201,7 +829,7 @@ namespace SuchtkrankenhilfeOstfriesland // xrLabel15 // this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Underline); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 80.00005F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(7.152557E-05F, 34.16672F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1214,76 +842,11 @@ namespace SuchtkrankenhilfeOstfriesland this.xrLabel15.Text = "Krankenhausaufenthalte/\r\nstat. Rehamaßnahmen:"; this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // xrLabel13 - // - this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00004F); - this.xrLabel13.Name = "xrLabel13"; - this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel13.SizeF = new System.Drawing.SizeF(245F, 20F); - this.xrLabel13.StylePriority.UseBackColor = false; - this.xrLabel13.StylePriority.UseBorders = false; - this.xrLabel13.StylePriority.UseFont = false; - this.xrLabel13.StylePriority.UsePadding = false; - this.xrLabel13.StylePriority.UseTextAlignment = false; - this.xrLabel13.Text = "GR = Gruppenangebot"; - this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // xrLabel12 - // - this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(245F, 20F); - this.xrLabel12.StylePriority.UseBackColor = false; - this.xrLabel12.StylePriority.UseBorders = false; - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.StylePriority.UsePadding = false; - this.xrLabel12.StylePriority.UseTextAlignment = false; - this.xrLabel12.Text = "E = ear to ear, face to face"; - this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // lblFLSInMinMitAnfahrt - // - this.lblFLSInMinMitAnfahrt.BackColor = System.Drawing.Color.Gainsboro; - this.lblFLSInMinMitAnfahrt.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblFLSInMinMitAnfahrt.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblFLSInMinMitAnfahrt.LocationFloat = new DevExpress.Utils.PointFloat(444.7917F, 0F); - this.lblFLSInMinMitAnfahrt.Name = "lblFLSInMinMitAnfahrt"; - this.lblFLSInMinMitAnfahrt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblFLSInMinMitAnfahrt.SizeF = new System.Drawing.SizeF(302.2084F, 20F); - this.lblFLSInMinMitAnfahrt.StylePriority.UseBackColor = false; - this.lblFLSInMinMitAnfahrt.StylePriority.UseBorders = false; - this.lblFLSInMinMitAnfahrt.StylePriority.UseFont = false; - this.lblFLSInMinMitAnfahrt.StylePriority.UsePadding = false; - this.lblFLSInMinMitAnfahrt.StylePriority.UseTextAlignment = false; - this.lblFLSInMinMitAnfahrt.Text = "Fachleistungen in Minuten"; - this.lblFLSInMinMitAnfahrt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // lblSummeMitAnfahrt - // - this.lblSummeMitAnfahrt.BackColor = System.Drawing.Color.Gainsboro; - this.lblSummeMitAnfahrt.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblSummeMitAnfahrt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMoFehlkontakte", "{0:0.##}")}); - this.lblSummeMitAnfahrt.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblSummeMitAnfahrt.LocationFloat = new DevExpress.Utils.PointFloat(358.9721F, 0F); - this.lblSummeMitAnfahrt.Name = "lblSummeMitAnfahrt"; - this.lblSummeMitAnfahrt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblSummeMitAnfahrt.SizeF = new System.Drawing.SizeF(85.81952F, 20F); - this.lblSummeMitAnfahrt.StylePriority.UseBackColor = false; - this.lblSummeMitAnfahrt.StylePriority.UseBorders = false; - this.lblSummeMitAnfahrt.StylePriority.UseFont = false; - this.lblSummeMitAnfahrt.StylePriority.UsePadding = false; - this.lblSummeMitAnfahrt.StylePriority.UseTextAlignment = false; - this.lblSummeMitAnfahrt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - // // xrPictureBox1 // this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")}); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 214.5F); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(535.639F, 168.6667F); this.xrPictureBox1.Name = "xrPictureBox1"; this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; this.xrPictureBox1.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); @@ -1294,7 +857,7 @@ namespace SuchtkrankenhilfeOstfriesland this.xrLabel17.BackColor = System.Drawing.Color.Transparent; this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")}); - this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 214.5F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(398.3101F, 168.6667F); this.xrLabel17.Name = "xrLabel17"; this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel17.SizeF = new System.Drawing.SizeF(136.8289F, 35.50002F); @@ -1302,21 +865,6 @@ namespace SuchtkrankenhilfeOstfriesland this.xrLabel17.StylePriority.UseTextAlignment = false; this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; // - // lblStrichOhneAnfahrt - // - this.lblStrichOhneAnfahrt.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.lblStrichOhneAnfahrt.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.lblStrichOhneAnfahrt.LocationFloat = new DevExpress.Utils.PointFloat(279.538F, 0F); - this.lblStrichOhneAnfahrt.Name = "lblStrichOhneAnfahrt"; - this.lblStrichOhneAnfahrt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblStrichOhneAnfahrt.SizeF = new System.Drawing.SizeF(79.43407F, 20F); - this.lblStrichOhneAnfahrt.StylePriority.UseBackColor = false; - this.lblStrichOhneAnfahrt.StylePriority.UseBorders = false; - this.lblStrichOhneAnfahrt.StylePriority.UseFont = false; - this.lblStrichOhneAnfahrt.StylePriority.UsePadding = false; - this.lblStrichOhneAnfahrt.StylePriority.UseTextAlignment = false; - this.lblStrichOhneAnfahrt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // // fieldKontaktArt // this.fieldKontaktArt.DataMember = "Services"; @@ -1324,9 +872,45 @@ namespace SuchtkrankenhilfeOstfriesland this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // - // bindingSource1 + // xrTableCell2 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTableCell2.Multiline = true; + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.StylePriority.UseBorders = false; + this.xrTableCell2.StylePriority.UseFont = false; + this.xrTableCell2.StylePriority.UseTextAlignment = false; + this.xrTableCell2.Text = "Anwesenheitsstatus"; + this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrTableCell2.Weight = 0.99255115359855117D; + // + // xrTableCell4 + // + this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTableCell4.Multiline = true; + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.StylePriority.UseBorders = false; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UseTextAlignment = false; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell4.Weight = 0.99255115359855117D; + // + // xrTableCell5 + // + this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.ServiceDescription")}); + this.xrTableCell5.Multiline = true; + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.StylePriority.UseBorders = false; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell5.Weight = 0.44865316751421258D; // // QuittierungsbelegTagesstaette // @@ -1357,11 +941,11 @@ namespace SuchtkrankenhilfeOstfriesland this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tableMitAnfahrt)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.lblKontaktLeer)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1384,19 +968,10 @@ namespace SuchtkrankenhilfeOstfriesland private DevExpress.XtraReports.UI.XRTable tableMitAnfahrt; private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRTableCell xrTableCell43; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell49; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel7; @@ -1407,18 +982,8 @@ namespace SuchtkrankenhilfeOstfriesland private DevExpress.XtraReports.UI.XRTable xrTable3; private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; private DevExpress.XtraReports.UI.XRTableCell xrTableCell44; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell50; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; private DevExpress.XtraReports.UI.CalculatedField fieldKontaktArt; - private DevExpress.XtraReports.UI.XRLabel lblFLSInMinMitAnfahrt; - private DevExpress.XtraReports.UI.XRLabel lblSummeMitAnfahrt; - private DevExpress.XtraReports.UI.XRLabel xrLabel13; - private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRLabel xrLabel15; private DevExpress.XtraReports.UI.XRRichText xrRichText1; private DevExpress.XtraReports.UI.XRRichText xrRichText2; @@ -1447,18 +1012,13 @@ namespace SuchtkrankenhilfeOstfriesland private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; - private DevExpress.XtraReports.UI.XRLabel xrLabel14; - private DevExpress.XtraReports.UI.XRLabel xrLabel16; - private DevExpress.XtraReports.UI.XRPictureBox picSignature; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRLabel xrLabel17; private DevExpress.XtraReports.UI.XRLabel xrLabel18; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; - private DevExpress.XtraReports.UI.XRLabel lblFehlkontakt; private DevExpress.XtraReports.UI.XRRichText lblKontaktLeer; - private DevExpress.XtraReports.UI.XRTableCell tcAnfahrt1; - private DevExpress.XtraReports.UI.XRTableCell tcAnfahrt2; - private DevExpress.XtraReports.UI.XRTableCell tcAnfahrtJaNein; - private DevExpress.XtraReports.UI.XRLabel lblStrichOhneAnfahrt; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; } } diff --git a/ReportImp/SuchtkrankenhilfeOstfriesland/QuittierungsbelegTagesstaette.cs b/ReportImp/SuchtkrankenhilfeOstfriesland/QuittierungsbelegTagesstaette.cs index 19002629c..f9b73afa9 100644 --- a/ReportImp/SuchtkrankenhilfeOstfriesland/QuittierungsbelegTagesstaette.cs +++ b/ReportImp/SuchtkrankenhilfeOstfriesland/QuittierungsbelegTagesstaette.cs @@ -63,7 +63,7 @@ namespace SuchtkrankenhilfeOstfriesland //else // sd.Notice4 = " "; - if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt")) + if (sd.ServiceDescription.EndsWith("TS")) { ServicesOverviewRO.CreateSignatureString(sd); sd.Notice5 = "E"; diff --git a/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.Designer.cs b/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.Designer.cs index a0a747667..596b1881f 100644 --- a/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.Designer.cs @@ -37,8 +37,13 @@ namespace SuchtkrankenhilfeOstfriesland this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblEmpfangsadresse = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); @@ -64,15 +69,10 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.lblTeamnotiz = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblTeamnotiz = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); @@ -123,7 +123,7 @@ namespace SuchtkrankenhilfeOstfriesland this.xrLabel12, this.xrLabel11, this.xrLabel6, - this.xrLabel7, + this.lblEmpfangsadresse, this.xrLabel3, this.xrLabel2, this.xrLabel5, @@ -134,6 +134,78 @@ namespace SuchtkrankenhilfeOstfriesland this.Page1.HeightF = 957.0509F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; + // + // xrLabel16 + // + this.xrLabel16.BackColor = System.Drawing.Color.Transparent; + this.xrLabel16.CanShrink = true; + this.xrLabel16.Dpi = 254F; + this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(4.037221E-05F, 494.7708F); + this.xrLabel16.Name = "xrLabel16"; + this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); + this.xrLabel16.SizeF = new System.Drawing.SizeF(1359.958F, 50.79996F); + this.xrLabel16.StylePriority.UseBackColor = false; + this.xrLabel16.StylePriority.UseFont = false; + this.xrLabel16.StylePriority.UseTextAlignment = false; + this.xrLabel16.Text = "Kostenabrechnung - Ambulant betreutes Wohnen, IK: [BusinessPartnerId]"; + this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + this.xrLabel16.WordWrap = false; + // + // xrLabel15 + // + this.xrLabel15.BackColor = System.Drawing.Color.Transparent; + this.xrLabel15.CanShrink = true; + this.xrLabel15.Dpi = 254F; + this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Verdana", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(635F, 574.1458F); + this.xrLabel15.Multiline = true; + this.xrLabel15.Name = "xrLabel15"; + this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); + this.xrLabel15.SizeF = new System.Drawing.SizeF(635F, 50.79999F); + this.xrLabel15.StylePriority.UseBackColor = false; + this.xrLabel15.StylePriority.UseFont = false; + this.xrLabel15.StylePriority.UseTextAlignment = false; + this.xrLabel15.Text = "(bitte bei Zahlung mit angeben)"; + this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; + this.xrLabel15.WordWrap = false; + // + // xrLabel13 + // + this.xrLabel13.Dpi = 254F; + this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Verdana", 8F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(1215.342F, 326.7309F); + this.xrLabel13.Multiline = true; + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(615.1584F, 110.1491F); + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.Text = "[SenderContactPersonMail]\r\nwww.suchtkrankenhilfe-ostfriesland.de"; + // + // xrLabel12 + // + this.xrLabel12.Dpi = 254F; + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Verdana", 8F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(4.037221E-05F, 0F); + this.xrLabel12.Multiline = true; + this.xrLabel12.Name = "xrLabel12"; + this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(805.1801F, 75.14165F); + this.xrLabel12.StylePriority.UseFont = false; + this.xrLabel12.Text = "Suchtkrankenhilfe Ostfriesland gGmbH\r\nBahnhofsring 12, 26789 Leer"; + // + // xrLabel11 + // + this.xrLabel11.Dpi = 254F; + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(1215.342F, 25.00001F); + this.xrLabel11.Multiline = true; + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(615.1584F, 301.7309F); + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.Text = "Suchtkrankenhilfe Ostfriesland\r\nBahnhofsring 12\r\n26789 Leer\r\n[SenderContactPerson" + + "Phone]\r\n[SenderContactPersonFax]\r\n\r\nMail/Internet\r\n"; // // xrLabel6 // @@ -154,17 +226,15 @@ namespace SuchtkrankenhilfeOstfriesland this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; this.xrLabel6.WordWrap = false; // - // xrLabel7 + // lblEmpfangsadresse // - this.xrLabel7.Dpi = 254F; - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 85.72498F); - this.xrLabel7.Multiline = true; - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(805.18F, 251.46F); - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "[RecipientOrganisation]\r\n[RecipientContactPerson]\r\n[RecipientDivision]\r\n[Recipien" + - "tStreet]\r\n[RecipientPostCodeAndTown]"; + this.lblEmpfangsadresse.Dpi = 254F; + this.lblEmpfangsadresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 85.72498F); + this.lblEmpfangsadresse.Multiline = true; + this.lblEmpfangsadresse.Name = "lblEmpfangsadresse"; + this.lblEmpfangsadresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); + this.lblEmpfangsadresse.SizeF = new System.Drawing.SizeF(805.18F, 251.46F); + this.lblEmpfangsadresse.StylePriority.UseFont = false; // // xrLabel3 // @@ -527,6 +597,27 @@ namespace SuchtkrankenhilfeOstfriesland this.GroupFooter1.HeightF = 524.7216F; this.GroupFooter1.Name = "GroupFooter1"; // + // lblTeamnotiz + // + this.lblTeamnotiz.Dpi = 254F; + this.lblTeamnotiz.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.lblTeamnotiz.LocationFloat = new DevExpress.Utils.PointFloat(0F, 310.4092F); + this.lblTeamnotiz.Name = "lblTeamnotiz"; + this.lblTeamnotiz.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); + this.lblTeamnotiz.SizeF = new System.Drawing.SizeF(1719.156F, 43.18001F); + this.lblTeamnotiz.StylePriority.UseFont = false; + // + // xrLabel14 + // + this.xrLabel14.Dpi = 254F; + this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 116.4167F); + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(1719.156F, 43.18001F); + this.xrLabel14.StylePriority.UseFont = false; + this.xrLabel14.Text = "Bitte überweisen Sie den Gesamtbetrag von [GrossClaim] auf unser Konto."; + // // xrLabel10 // this.xrLabel10.Dpi = 254F; @@ -554,99 +645,6 @@ namespace SuchtkrankenhilfeOstfriesland this.xrLabel1.Text = "xrLabel1"; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // - // xrLabel11 - // - this.xrLabel11.Dpi = 254F; - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(1215.342F, 25.00001F); - this.xrLabel11.Multiline = true; - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(615.1584F, 301.7309F); - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.Text = "Suchtkrankenhilfe Ostfriesland\r\nBahnhofsring 12\r\n26789 Leer\r\n[SenderContactPerson" + - "Phone]\r\n[SenderContactPersonFax]\r\n\r\nMail/Internet\r\n"; - // - // xrLabel12 - // - this.xrLabel12.Dpi = 254F; - this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Verdana", 8F); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(4.037221E-05F, 0F); - this.xrLabel12.Multiline = true; - this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(805.1801F, 75.14165F); - this.xrLabel12.StylePriority.UseFont = false; - this.xrLabel12.Text = "Suchtkrankenhilfe Ostfriesland gGmbH\r\nBahnhofsring 12, 26789 Leer"; - // - // xrLabel13 - // - this.xrLabel13.Dpi = 254F; - this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Verdana", 8F); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(1215.342F, 326.7309F); - this.xrLabel13.Multiline = true; - this.xrLabel13.Name = "xrLabel13"; - this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); - this.xrLabel13.SizeF = new System.Drawing.SizeF(615.1584F, 110.1491F); - this.xrLabel13.StylePriority.UseFont = false; - this.xrLabel13.Text = "[SenderContactPersonMail]\r\nwww.suchtkrankenhilfe-ostfriesland.de"; - // - // xrLabel14 - // - this.xrLabel14.Dpi = 254F; - this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 116.4167F); - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(1719.156F, 43.18001F); - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.Text = "Bitte überweisen Sie den Gesamtbetrag von [GrossClaim] auf unser Konto."; - // - // lblTeamnotiz - // - this.lblTeamnotiz.Dpi = 254F; - this.lblTeamnotiz.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.lblTeamnotiz.LocationFloat = new DevExpress.Utils.PointFloat(0F, 310.4092F); - this.lblTeamnotiz.Name = "lblTeamnotiz"; - this.lblTeamnotiz.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); - this.lblTeamnotiz.SizeF = new System.Drawing.SizeF(1719.156F, 43.18001F); - this.lblTeamnotiz.StylePriority.UseFont = false; - // - // xrLabel15 - // - this.xrLabel15.BackColor = System.Drawing.Color.Transparent; - this.xrLabel15.CanShrink = true; - this.xrLabel15.Dpi = 254F; - this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Verdana", 8F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(635F, 574.1458F); - this.xrLabel15.Multiline = true; - this.xrLabel15.Name = "xrLabel15"; - this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); - this.xrLabel15.SizeF = new System.Drawing.SizeF(635F, 50.79999F); - this.xrLabel15.StylePriority.UseBackColor = false; - this.xrLabel15.StylePriority.UseFont = false; - this.xrLabel15.StylePriority.UseTextAlignment = false; - this.xrLabel15.Text = "(bitte bei Zahlung mit angeben)"; - this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - this.xrLabel15.WordWrap = false; - // - // xrLabel16 - // - this.xrLabel16.BackColor = System.Drawing.Color.Transparent; - this.xrLabel16.CanShrink = true; - this.xrLabel16.Dpi = 254F; - this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(4.037221E-05F, 494.7708F); - this.xrLabel16.Name = "xrLabel16"; - this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 5, 0, 0, 254F); - this.xrLabel16.SizeF = new System.Drawing.SizeF(1359.958F, 50.79996F); - this.xrLabel16.StylePriority.UseBackColor = false; - this.xrLabel16.StylePriority.UseFont = false; - this.xrLabel16.StylePriority.UseTextAlignment = false; - this.xrLabel16.Text = "Kostenabrechnung - Ambulant betreutes Wohnen, IK: [BusinessPartnerId]"; - this.xrLabel16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft; - this.xrLabel16.WordWrap = false; - // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); @@ -717,7 +715,7 @@ namespace SuchtkrankenhilfeOstfriesland private DevExpress.XtraReports.UI.XRTableCell xrTableCell43; private DevExpress.XtraReports.UI.XRTableCell xrTableCell44; private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; - private DevExpress.XtraReports.UI.XRLabel xrLabel7; + private DevExpress.XtraReports.UI.XRLabel lblEmpfangsadresse; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel6; diff --git a/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.cs b/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.cs index 536a73c7b..f4cbfcfee 100644 --- a/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.cs +++ b/ReportImp/SuchtkrankenhilfeOstfriesland/ServiceInvoiceReport.cs @@ -1,9 +1,11 @@ using System; +using System.Text; using BeWo.Data.Access; using BeWo.Data.Entities; using BeWo.Report; using BeWo.Report.ReportObjects; using BeWo.Service.DCEntityMapper; +using BS.Shared.Extensions; using DevExpress.XtraReports.UI; namespace SuchtkrankenhilfeOstfriesland @@ -17,17 +19,7 @@ namespace SuchtkrankenhilfeOstfriesland public void SetReportDataSource(ServiceInvoiceRO pRO) { - if (pRO.RecipientOrganisation.Contains("ab 01.09.2023") || pRO.RecipientOrganisation.Contains("bis 31.08.2023")) - { - pRO.RecipientOrganisation = pRO.RecipientOrganisation.Replace("ab 01.09.2023", ""); - pRO.RecipientOrganisation = pRO.RecipientOrganisation.Replace("bis 31.08.2023", ""); - } - else if (pRO.RecipientOrganisation.Contains("ab 01.09.") || pRO.RecipientOrganisation.Contains("bis 31.08.")) - { - pRO.RecipientOrganisation = pRO.RecipientOrganisation.Replace("ab 01.09.", ""); - pRO.RecipientOrganisation = pRO.RecipientOrganisation.Replace("bis 31.08.", ""); - } - + SetAdressfeld(pRO); DateTime start = pRO.AccountingPeriodStart; DateTime end = pRO.AccountingPeriodEnd; @@ -51,5 +43,40 @@ namespace SuchtkrankenhilfeOstfriesland this.bindingSource1.DataSource = pRO; } + + private void SetAdressfeld(ServiceInvoiceRO pRO) + { + StringBuilder sb = new StringBuilder(); + + if (pRO.RecipientOrganisation.Contains("ab 01.09.2023") || pRO.RecipientOrganisation.Contains("bis 31.08.2023")) + { + pRO.RecipientOrganisation = pRO.RecipientOrganisation.Replace("ab 01.09.2023", ""); + pRO.RecipientOrganisation = pRO.RecipientOrganisation.Replace("bis 31.08.2023", ""); + } + else if (pRO.RecipientOrganisation.Contains("ab 01.09.") || pRO.RecipientOrganisation.Contains("bis 31.08.")) + { + pRO.RecipientOrganisation = pRO.RecipientOrganisation.Replace("ab 01.09.", ""); + pRO.RecipientOrganisation = pRO.RecipientOrganisation.Replace("bis 31.08.", ""); + } + + if (pRO.RecipientOrganisation.IsNotNullOrEmpty()) + sb.AppendLine(pRO.RecipientOrganisation); + if (pRO.RecipientDivision.IsNotNullOrEmpty()) + sb.AppendLine(pRO.RecipientDivision); + if (pRO.InvoiceBase.RecipientAddressLine1.IsNotNullOrEmpty()) + sb.AppendLine(pRO.RecipientAddressLine1); + else if (pRO.RecipientContactPerson.IsNotNullOrEmpty()) + sb.AppendLine(pRO.RecipientContactPerson); + if (pRO.InvoiceBase.RecipientStreet != pRO.RecipientStreet) + sb.AppendLine(pRO.InvoiceBase.RecipientStreet); + else + sb.AppendLine(pRO.RecipientStreet); + if (pRO.InvoiceBase.RecipientPostCode + " " + pRO.InvoiceBase.RecipientTown != pRO.RecipientPostCodeAndTown) + sb.AppendLine(pRO.InvoiceBase.RecipientPostCode + " " + pRO.InvoiceBase.RecipientTown); + else + sb.AppendLine(pRO.RecipientPostCodeAndTown); + + lblEmpfangsadresse.Text = sb.ToString(); + } } } \ No newline at end of file