diff --git a/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.Designer.cs b/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.Designer.cs index 6500f0019..fde7bf04b 100644 --- a/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.Designer.cs @@ -46,6 +46,7 @@ namespace BeWo.PsychosozialerTraegervereinReports this.cellMinutenDetail = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -53,6 +54,10 @@ namespace BeWo.PsychosozialerTraegervereinReports this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -87,11 +92,8 @@ namespace BeWo.PsychosozialerTraegervereinReports this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); - this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); + this.lblBusinessPartnerId = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -299,6 +301,18 @@ namespace BeWo.PsychosozialerTraegervereinReports this.xrTableCell12.StylePriority.UseBorders = false; this.xrTableCell12.Weight = 0.93516701325095841D; // + // 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(33.13547F, 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); + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); @@ -376,6 +390,57 @@ namespace BeWo.PsychosozialerTraegervereinReports this.Detail2.StylePriority.UseFont = false; this.Detail2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // + // xrLabel11 + // + this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")}); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(326.1138F, 118.2916F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(117.5416F, 24.04169F); + this.xrLabel11.StylePriority.UseBorders = false; + this.xrLabel11.StylePriority.UseTextAlignment = false; + this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + // + // xrPictureBox1 + // + this.xrPictureBox1.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")}); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(110F, 106.8332F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(176.4583F, 35.50002F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.xrPictureBox1.StylePriority.UseBorders = false; + // + // xrPictureBox2 + // + this.xrPictureBox2.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(443.6554F, 106.8332F); + this.xrPictureBox2.Name = "xrPictureBox2"; + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(176.4583F, 35.5F); + this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.xrPictureBox2.StylePriority.UseBorders = false; + // + // xrLabel17 + // + this.xrLabel17.BackColor = System.Drawing.Color.Transparent; + this.xrLabel17.Borders = DevExpress.XtraPrinting.BorderSide.None; + 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(0.8366902F, 118.2916F); + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(109.1633F, 24.04169F); + this.xrLabel17.StylePriority.UseBackColor = false; + this.xrLabel17.StylePriority.UseBorders = false; + this.xrLabel17.StylePriority.UseTextAlignment = false; + this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + // // xrTable4 // this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(196.0416F, 32.00008F); @@ -609,6 +674,8 @@ namespace BeWo.PsychosozialerTraegervereinReports // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel24, + this.lblBusinessPartnerId, this.xrLabel9, this.xrLabel6, this.xrLabel1, @@ -619,7 +686,7 @@ namespace BeWo.PsychosozialerTraegervereinReports this.xrLabel10, this.xrLabel8}); this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.ReportHeader.HeightF = 243.125F; + this.ReportHeader.HeightF = 228.5417F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // @@ -637,7 +704,7 @@ namespace BeWo.PsychosozialerTraegervereinReports // // xrLabel6 // - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(229.6544F, 100.125F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(230.4911F, 88.04163F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -654,7 +721,7 @@ namespace BeWo.PsychosozialerTraegervereinReports this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(667.0001F, 100.125F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(667.0001F, 76.04163F); this.xrLabel1.StylePriority.UseFont = false; this.xrLabel1.StylePriority.UseTextAlignment = false; this.xrLabel1.Text = "Psychosozialer Trägerverein e.V.\r\n\r\nQuittierungsbeleg über direkte Betreuungsleis" + @@ -677,7 +744,7 @@ namespace BeWo.PsychosozialerTraegervereinReports // this.aktenzeichenLV.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReferenceNumber")}); - this.aktenzeichenLV.LocationFloat = new DevExpress.Utils.PointFloat(229.6544F, 148.2917F); + this.aktenzeichenLV.LocationFloat = new DevExpress.Utils.PointFloat(230.4911F, 136.2084F); this.aktenzeichenLV.Multiline = true; this.aktenzeichenLV.Name = "aktenzeichenLV"; this.aktenzeichenLV.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -688,7 +755,7 @@ namespace BeWo.PsychosozialerTraegervereinReports // // xrLabel16 // - this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(229.6544F, 124.2084F); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(230.4911F, 112.125F); this.xrLabel16.Multiline = true; this.xrLabel16.Name = "xrLabel16"; this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -700,7 +767,7 @@ namespace BeWo.PsychosozialerTraegervereinReports // // xrLabel15 // - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 148.2917F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0.8366902F, 136.2084F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -712,7 +779,7 @@ namespace BeWo.PsychosozialerTraegervereinReports // // xrLabel10 // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 124.2084F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0.8366902F, 112.125F); this.xrLabel10.Multiline = true; this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -724,7 +791,7 @@ namespace BeWo.PsychosozialerTraegervereinReports // // xrLabel8 // - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100.125F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0.8366902F, 88.04163F); this.xrLabel8.Multiline = true; this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -771,68 +838,33 @@ namespace BeWo.PsychosozialerTraegervereinReports this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldFLS.Name = "fieldFLS"; // - // xrLabel11 + // lblBusinessPartnerId // - this.xrLabel11.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")}); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(326.1138F, 118.2916F); - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(117.5416F, 24.04169F); - this.xrLabel11.StylePriority.UseBorders = false; - this.xrLabel11.StylePriority.UseTextAlignment = false; - this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.lblBusinessPartnerId.LocationFloat = new DevExpress.Utils.PointFloat(0.8366902F, 160.2917F); + this.lblBusinessPartnerId.Multiline = true; + this.lblBusinessPartnerId.Name = "lblBusinessPartnerId"; + this.lblBusinessPartnerId.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblBusinessPartnerId.SizeF = new System.Drawing.SizeF(229.6544F, 24.08336F); + this.lblBusinessPartnerId.StylePriority.UseFont = false; + this.lblBusinessPartnerId.StylePriority.UseTextAlignment = false; + this.lblBusinessPartnerId.Text = "ZAD-Nummer:"; + this.lblBusinessPartnerId.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // xrPictureBox1 + // xrLabel24 // - this.xrPictureBox1.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")}); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(110F, 106.8332F); - this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(176.4583F, 35.50002F); - this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - this.xrPictureBox1.StylePriority.UseBorders = false; - // - // xrPictureBox2 - // - this.xrPictureBox2.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); - this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(443.6554F, 106.8332F); - this.xrPictureBox2.Name = "xrPictureBox2"; - this.xrPictureBox2.SizeF = new System.Drawing.SizeF(176.4583F, 35.5F); - this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - this.xrPictureBox2.StylePriority.UseBorders = false; - // - // xrLabel17 - // - this.xrLabel17.BackColor = System.Drawing.Color.Transparent; - this.xrLabel17.Borders = DevExpress.XtraPrinting.BorderSide.None; - 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(0.8366902F, 118.2916F); - this.xrLabel17.Name = "xrLabel17"; - this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel17.SizeF = new System.Drawing.SizeF(109.1633F, 24.04169F); - this.xrLabel17.StylePriority.UseBackColor = false; - this.xrLabel17.StylePriority.UseBorders = false; - this.xrLabel17.StylePriority.UseTextAlignment = false; - this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - // - // 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(33.13547F, 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.xrLabel24.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CostBearer2SupportConceptList.CostBearer.Organisation.BusinessPartnerId")}); + this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(230.6544F, 160.2917F); + this.xrLabel24.Name = "xrLabel24"; + this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel24.SizeF = new System.Drawing.SizeF(210.5415F, 22.625F); + this.xrLabel24.StylePriority.UseBorders = false; + this.xrLabel24.StylePriority.UseFont = false; + this.xrLabel24.StylePriority.UseTextAlignment = false; + this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrLabel24.TextFormatString = "{0}"; // // Stundenzettel // @@ -931,5 +963,7 @@ namespace BeWo.PsychosozialerTraegervereinReports private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; private DevExpress.XtraReports.UI.XRLabel xrLabel17; private DevExpress.XtraReports.UI.XRPictureBox picSignature; + private DevExpress.XtraReports.UI.XRLabel lblBusinessPartnerId; + private DevExpress.XtraReports.UI.XRLabel xrLabel24; } } diff --git a/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.cs b/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.cs index 6d244c8c5..b189653ee 100644 --- a/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.cs +++ b/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.cs @@ -81,6 +81,19 @@ namespace BeWo.PsychosozialerTraegervereinReports summeStunden.Text = String.Format("{0:0.00}", abrechenbareStunden); } + lblBusinessPartnerId.Text = ""; + if (pRO.Costbearer != null) + { + if (pRO.Costbearer.ToLower().Contains("lvr")) + { + lblBusinessPartnerId.Text = "GP-Nummer:"; + } + else if (pRO.Costbearer.ToLower().Contains("lwl")) + { + lblBusinessPartnerId.Text = "ZAD-Nummer:"; + } + } + bindingSource1.DataSource = pRO; }