diff --git a/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.Designer.cs b/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.Designer.cs index dc001e951..6500f0019 100644 --- a/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.Designer.cs @@ -46,12 +46,20 @@ 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.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.DetailReport1 = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail2 = new DevExpress.XtraReports.UI.DetailBand(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblFehlkontakt = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -60,12 +68,8 @@ namespace BeWo.PsychosozialerTraegervereinReports this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); this.cellSummeHeader = new DevExpress.XtraReports.UI.XRTableCell(); this.summeStunden = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); - this.rechnungsDatum = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); @@ -83,20 +87,17 @@ 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.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblFehlkontakt = 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(); - this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + 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(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -113,7 +114,8 @@ namespace BeWo.PsychosozialerTraegervereinReports this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableServiceRecords1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableServiceRecords1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableServiceRecords1.Name = "xrTableServiceRecords1"; this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -238,7 +240,7 @@ namespace BeWo.PsychosozialerTraegervereinReports | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd.MM.yyyy}")}); - this.xrTableCell2.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell2.Name = "xrTableCell2"; this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.xrTableCell2.StylePriority.UseBorders = false; @@ -252,7 +254,7 @@ namespace BeWo.PsychosozialerTraegervereinReports // xrTableCell7 // this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell7.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 0, 0, 0, 100F); this.xrTableCell7.StylePriority.UseBorders = false; @@ -266,7 +268,7 @@ namespace BeWo.PsychosozialerTraegervereinReports // cellMinutenDetail // this.cellMinutenDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.cellMinutenDetail.Font = new System.Drawing.Font("Arial", 9.75F); + this.cellMinutenDetail.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.cellMinutenDetail.Name = "cellMinutenDetail"; this.cellMinutenDetail.StylePriority.UseBorders = false; this.cellMinutenDetail.StylePriority.UseFont = false; @@ -280,7 +282,7 @@ namespace BeWo.PsychosozialerTraegervereinReports this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")}); - this.xrTableCell6.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.xrTableCell6.Name = "xrTableCell6"; this.xrTableCell6.StylePriority.UseBorders = false; this.xrTableCell6.StylePriority.UseFont = false; @@ -291,15 +293,21 @@ namespace BeWo.PsychosozialerTraegervereinReports // xrTableCell12 // this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell12.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.picSignature}); this.xrTableCell12.Name = "xrTableCell12"; this.xrTableCell12.StylePriority.UseBorders = false; this.xrTableCell12.Weight = 0.93516701325095841D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // xrTableCell16 // this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServicesDouble.CostBearer")}); - this.xrTableCell16.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell16.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrTableCell16.Name = "xrTableCell16"; this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell16.StylePriority.UseFont = false; @@ -311,7 +319,7 @@ namespace BeWo.PsychosozialerTraegervereinReports // this.xrTableCell17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServicesDouble.EmployeeName")}); - this.xrTableCell17.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell17.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrTableCell17.Name = "xrTableCell17"; this.xrTableCell17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTableCell17.StylePriority.UseFont = false; @@ -348,26 +356,120 @@ namespace BeWo.PsychosozialerTraegervereinReports | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel11, + this.xrPictureBox1, + this.xrPictureBox2, + this.xrLabel17, this.xrTable4, this.xrLabel13, this.xrLabel7, this.lblFehlkontakt, this.xrTable3, this.xrTable2, - this.xrLabel14, - this.rechnungsDatum, this.xrLabel12, - this.xrLabel2, this.xrLabel5, - this.xrLabel3, this.xrLabel4}); - this.Detail2.Font = new System.Drawing.Font("Arial", 10F); + this.Detail2.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.Detail2.HeightF = 236.4583F; this.Detail2.Name = "Detail2"; this.Detail2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.Detail2.StylePriority.UseFont = false; this.Detail2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // + // xrTable4 + // + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(196.0416F, 32.00008F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow5}); + this.xrTable4.SizeF = new System.Drawing.SizeF(424.072F, 20F); + // + // xrTableRow5 + // + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell8, + this.xrTableCell11}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 0.8D; + // + // xrTableCell8 + // + this.xrTableCell8.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); + this.xrTableCell8.StylePriority.UseBorders = false; + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UsePadding = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.Text = "Summe Fehlkontakte in Minuten:"; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell8.Weight = 0.96483429307731461D; + // + // xrTableCell11 + // + this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell11.BorderWidth = 2F; + this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte")}); + this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.StylePriority.UseBorders = false; + this.xrTableCell11.StylePriority.UseBorderWidth = false; + this.xrTableCell11.StylePriority.UseFont = false; + this.xrTableCell11.StylePriority.UseTextAlignment = false; + this.xrTableCell11.Text = "summeMinuten"; + this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell11.Weight = 0.6875745547809029D; + // + // xrLabel13 + // + this.xrLabel13.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32.00008F); + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(175.2083F, 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 = "G = Gruppenangebot"; + this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel7 + // + this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 11.83336F); + this.xrLabel7.Name = "xrLabel7"; + this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(175.2083F, 20F); + this.xrLabel7.StylePriority.UseBackColor = false; + this.xrLabel7.StylePriority.UseBorders = false; + this.xrLabel7.StylePriority.UseFont = false; + this.xrLabel7.StylePriority.UsePadding = false; + this.xrLabel7.StylePriority.UseTextAlignment = false; + this.xrLabel7.Text = "E = ear to ear, face to face"; + this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // lblFehlkontakt + // + this.lblFehlkontakt.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.lblFehlkontakt.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 52.83336F); + this.lblFehlkontakt.Name = "lblFehlkontakt"; + this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblFehlkontakt.SizeF = new System.Drawing.SizeF(175.2083F, 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; + // // xrTable3 // this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(196.0416F, 11.83335F); @@ -405,7 +507,7 @@ namespace BeWo.PsychosozialerTraegervereinReports this.summeMinuten.BorderWidth = 2F; this.summeMinuten.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMoFehlkontakte")}); - this.summeMinuten.Font = new System.Drawing.Font("Arial", 9.75F); + this.summeMinuten.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.summeMinuten.Name = "summeMinuten"; this.summeMinuten.StylePriority.UseBorders = false; this.summeMinuten.StylePriority.UseBorderWidth = false; @@ -449,7 +551,7 @@ namespace BeWo.PsychosozialerTraegervereinReports this.summeStunden.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.summeStunden.BorderWidth = 2F; - this.summeStunden.Font = new System.Drawing.Font("Arial", 9.75F); + this.summeStunden.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.summeStunden.Name = "summeStunden"; this.summeStunden.StylePriority.UseBorders = false; this.summeStunden.StylePriority.UseBorderWidth = false; @@ -459,94 +561,45 @@ namespace BeWo.PsychosozialerTraegervereinReports this.summeStunden.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.summeStunden.Weight = 0.6875751059531201D; // - // xrLabel14 - // - this.xrLabel14.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel14.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(0F, 142.3333F); - this.xrLabel14.Multiline = true; - this.xrLabel14.Name = "xrLabel14"; - this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel14.SizeF = new System.Drawing.SizeF(121.1128F, 23.99999F); - this.xrLabel14.StylePriority.UseBorders = false; - this.xrLabel14.StylePriority.UseFont = false; - this.xrLabel14.StylePriority.UseTextAlignment = false; - this.xrLabel14.Text = "Datum"; - this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // - // rechnungsDatum - // - this.rechnungsDatum.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.rechnungsDatum.Font = new System.Drawing.Font("Arial", 10F); - this.rechnungsDatum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 118.3334F); - this.rechnungsDatum.Multiline = true; - this.rechnungsDatum.Name = "rechnungsDatum"; - this.rechnungsDatum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.rechnungsDatum.SizeF = new System.Drawing.SizeF(121.1128F, 24F); - this.rechnungsDatum.StylePriority.UseBorders = false; - this.rechnungsDatum.StylePriority.UseFont = false; - this.rechnungsDatum.StylePriority.UseTextAlignment = false; - this.rechnungsDatum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - // // xrLabel12 // - this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel12.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(443.6552F, 142.3333F); + this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(326.1138F, 142.3333F); this.xrLabel12.Multiline = true; this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(133.9456F, 24F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(293.9999F, 24F); this.xrLabel12.StylePriority.UseBorders = false; this.xrLabel12.StylePriority.UseFont = false; this.xrLabel12.StylePriority.UseTextAlignment = false; - this.xrLabel12.Text = "Unterschrift Klient/in"; + this.xrLabel12.Text = "Datum, Unterschrift Klient/in"; this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // - // xrLabel2 - // - this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(443.6554F, 117.3334F); - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(223.3447F, 24.99999F); - this.xrLabel2.StylePriority.UseBorderDashStyle = false; - this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // // xrLabel5 // - this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel5.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(149.7917F, 142.3333F); + this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 142.3333F); this.xrLabel5.Multiline = true; this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(161.0289F, 24F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(286.4582F, 24F); this.xrLabel5.StylePriority.UseBorders = false; this.xrLabel5.StylePriority.UseFont = false; this.xrLabel5.StylePriority.UseTextAlignment = false; - this.xrLabel5.Text = "Unterschrift Mitarbeiter/in"; + this.xrLabel5.Text = "Datum, Unterschrift Mitarbeiter/in"; this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // - // xrLabel3 - // - this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(149.7917F, 117.3334F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(277.6956F, 25.00002F); - this.xrLabel3.StylePriority.UseBorderDashStyle = false; - this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // // xrLabel4 // this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 179.7916F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(667.0001F, 56.66669F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(620.1135F, 56.66669F); this.xrLabel4.StylePriority.UseFont = false; this.xrLabel4.StylePriority.UseTextAlignment = false; this.xrLabel4.Text = "Betreuungskontakte können zeitnah einzeln (in der jeweiligen Zeile) oder gesammel" + @@ -565,7 +618,7 @@ namespace BeWo.PsychosozialerTraegervereinReports this.xrLabel15, this.xrLabel10, this.xrLabel8}); - this.ReportHeader.Font = new System.Drawing.Font("Arial", 10F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.ReportHeader.HeightF = 243.125F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; @@ -596,7 +649,7 @@ namespace BeWo.PsychosozialerTraegervereinReports // // xrLabel1 // - this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; @@ -718,103 +771,68 @@ namespace BeWo.PsychosozialerTraegervereinReports this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldFLS.Name = "fieldFLS"; // - // xrLabel13 + // xrLabel11 // - this.xrLabel13.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32.00008F); - this.xrLabel13.Name = "xrLabel13"; - this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel13.SizeF = new System.Drawing.SizeF(175.2083F, 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 = "G = Gruppenangebot"; - this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + 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; // - // xrLabel7 + // xrPictureBox1 // - this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 11.83336F); - this.xrLabel7.Name = "xrLabel7"; - this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(175.2083F, 20F); - this.xrLabel7.StylePriority.UseBackColor = false; - this.xrLabel7.StylePriority.UseBorders = false; - this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.StylePriority.UsePadding = false; - this.xrLabel7.StylePriority.UseTextAlignment = false; - this.xrLabel7.Text = "E = ear to ear, face to face"; - this.xrLabel7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + 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; // - // lblFehlkontakt + // xrPictureBox2 // - this.lblFehlkontakt.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.lblFehlkontakt.Font = new System.Drawing.Font("Arial", 10F); - this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 52.83336F); - this.lblFehlkontakt.Name = "lblFehlkontakt"; - this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblFehlkontakt.SizeF = new System.Drawing.SizeF(175.2083F, 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; + 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; // - // xrTable4 + // xrLabel17 // - this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(196.0416F, 32.00008F); - this.xrTable4.Name = "xrTable4"; - this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow5}); - this.xrTable4.SizeF = new System.Drawing.SizeF(424.072F, 20F); + 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; // - // xrTableRow5 + // picSignature // - this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell8, - this.xrTableCell11}); - this.xrTableRow5.Name = "xrTableRow5"; - this.xrTableRow5.Weight = 0.8D; - // - // xrTableCell8 - // - this.xrTableCell8.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 2, 0, 0, 100F); - this.xrTableCell8.StylePriority.UseBorders = false; - this.xrTableCell8.StylePriority.UseFont = false; - this.xrTableCell8.StylePriority.UsePadding = false; - this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.Text = "Summe Fehlkontakte in Minuten:"; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell8.Weight = 0.96483429307731461D; - // - // xrTableCell11 - // - this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell11.BorderWidth = 2F; - this.xrTableCell11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte")}); - this.xrTableCell11.Font = new System.Drawing.Font("Arial", 9.75F); - this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.StylePriority.UseBorders = false; - this.xrTableCell11.StylePriority.UseBorderWidth = false; - this.xrTableCell11.StylePriority.UseFont = false; - this.xrTableCell11.StylePriority.UseTextAlignment = false; - this.xrTableCell11.Text = "summeMinuten"; - this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell11.Weight = 0.6875745547809029D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + 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); // // Stundenzettel // @@ -833,17 +851,17 @@ namespace BeWo.PsychosozialerTraegervereinReports this.formattingRuleServiceDesc, this.formattingRuleCostBearer, this.formattingRuleEmployeeName}); - this.Margins = new System.Drawing.Printing.Margins(75, 75, 75, 30); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 75F, 30F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -860,7 +878,6 @@ namespace BeWo.PsychosozialerTraegervereinReports private DevExpress.XtraReports.UI.DetailBand Detail2; private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRTable xrTableServiceRecords1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; @@ -882,9 +899,6 @@ namespace BeWo.PsychosozialerTraegervereinReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRLabel xrLabel12; - private DevExpress.XtraReports.UI.XRLabel xrLabel2; - private DevExpress.XtraReports.UI.XRLabel xrLabel14; - private DevExpress.XtraReports.UI.XRLabel rechnungsDatum; private DevExpress.XtraReports.UI.XRTable xrTable2; private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; private DevExpress.XtraReports.UI.XRTableCell cellSummeHeader; @@ -912,5 +926,10 @@ namespace BeWo.PsychosozialerTraegervereinReports private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; + private DevExpress.XtraReports.UI.XRLabel xrLabel11; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; + private DevExpress.XtraReports.UI.XRLabel xrLabel17; + private DevExpress.XtraReports.UI.XRPictureBox picSignature; } } diff --git a/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.cs b/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.cs index 87726d97c..6d244c8c5 100644 --- a/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.cs +++ b/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.cs @@ -1,13 +1,13 @@ using System; using System.Collections.Generic; -using System.Linq; -using BeWo.Data.Access; +using System.Drawing; +using System.IO; +using System.Text.RegularExpressions; using BeWo.Report; using BeWo.Report.ReportObjects; -using BeWo.Service.DCEntityMapper; using BS.Shared; +using BS.Shared.Core; using BS.Shared.Extensions; -using DevExpress.Entity.Model.Metadata; using DevExpress.XtraReports.UI; namespace BeWo.PsychosozialerTraegervereinReports @@ -33,6 +33,8 @@ namespace BeWo.PsychosozialerTraegervereinReports { if (s.IsBillable || s.ServiceDescription.ToLower().Contains("fehlkontakt") || s.ServiceCategory.ToLower().Contains("fehlkontakt")) { + ServicesOverviewRO.CreateSignatureString(s); + s.Notice = "E"; if (s.IsGroup) { @@ -81,5 +83,30 @@ namespace BeWo.PsychosozialerTraegervereinReports bindingSource1.DataSource = pRO; } + + private void picSignature_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e) + { + XRPictureBox xrBox = sender as XRPictureBox; + string base64String = xrBox.Tag as string; + if (!String.IsNullOrWhiteSpace(base64String)) + { + var base64Data = Regex.Match(base64String, @"data:image/(?.+?),(?.+)").Groups["data"].Value; + var binData = Convert.FromBase64String(base64Data); + Image img = ByteArrayToImage(binData); + xrBox.Image = Utils.CropImage(img); + } + else + { + xrBox.Image = null; + } + } + + public Image ByteArrayToImage(byte[] byteArrayIn) + { + using (var memoryStream = new MemoryStream(byteArrayIn)) + { + return Image.FromStream(memoryStream); + } + } } } diff --git a/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.resx b/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.resx index f6606300d..c7e0d4bdf 100644 --- a/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.resx +++ b/ReportImp/PsychosozialerTraegervereinReports/ServicesOverviewReport.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 21, 17 - \ No newline at end of file