From ff89851fd307a7d30efef9df18622de8661ec594 Mon Sep 17 00:00:00 2001 From: Kojo Date: Tue, 28 Jul 2026 20:15:03 +0200 Subject: [PATCH] =?UTF-8?q?SKFAlsdorf:=20Auf=20QB=20beide=20Unterschriftsa?= =?UTF-8?q?rten=20verkn=C3=BCpft=20(Spalte=20f=C3=BCr=20Einzelunterschrift?= =?UTF-8?q?=20hinzugef=C3=BCgt)=20SupportOID=3D168923?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServicesOverviewReportNeu.Designer.cs | 324 +++++++++++------- .../SKFAlsdorf/ServicesOverviewReportNeu.cs | 49 ++- 2 files changed, 240 insertions(+), 133 deletions(-) diff --git a/ReportImp/SKFAlsdorf/ServicesOverviewReportNeu.Designer.cs b/ReportImp/SKFAlsdorf/ServicesOverviewReportNeu.Designer.cs index 403b0075a..97754441b 100644 --- a/ReportImp/SKFAlsdorf/ServicesOverviewReportNeu.Designer.cs +++ b/ReportImp/SKFAlsdorf/ServicesOverviewReportNeu.Designer.cs @@ -56,6 +56,7 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); this.ruleRowVisible = new DevExpress.XtraReports.UI.FormattingRule(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + 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(); @@ -80,10 +81,11 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.lblSummeMinuten = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule(); this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule(); @@ -111,17 +113,21 @@ namespace BeWo.SKFAlsdorf.Neu this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldGroup = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldEinzel = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrLabel18 = 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.xrTableAbwesenheiten)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -144,7 +150,7 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2, this.xrTableRow6}); - this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(630F, 65F); + this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(652.8333F, 50F); this.xrTableServiceRecords1.StylePriority.UseBackColor = false; this.xrTableServiceRecords1.StylePriority.UseFont = false; this.xrTableServiceRecords1.StylePriority.UsePadding = false; @@ -157,7 +163,8 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell3, this.xrTableCell4, this.xrTableCell18, - this.xrTableCell12}); + this.xrTableCell12, + this.xrTableCell39}); this.xrTableRow2.Name = "xrTableRow2"; this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 0, 2, 0, 100F); this.xrTableRow2.StylePriority.UsePadding = false; @@ -175,7 +182,7 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell3.StylePriority.UsePadding = false; this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.Text = "Datum"; - this.xrTableCell3.Weight = 0.22058567382346644D; + this.xrTableCell3.Weight = 0.19278021948428534D; // // xrTableCell4 // @@ -188,7 +195,7 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell4.StylePriority.UsePadding = false; this.xrTableCell4.StylePriority.UseTextAlignment = false; this.xrTableCell4.Text = "Uhrzeit"; - this.xrTableCell4.Weight = 0.2205856771023039D; + this.xrTableCell4.Weight = 0.248391131441485D; // // xrTableCell18 // @@ -197,7 +204,7 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell18.Name = "xrTableCell18"; this.xrTableCell18.StylePriority.UseBorders = false; this.xrTableCell18.Text = "Angebot"; - this.xrTableCell18.Weight = 0.20679907362853203D; + this.xrTableCell18.Weight = 0.2311288477663595D; // // xrTableCell12 // @@ -208,7 +215,7 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell12.StylePriority.UseTextAlignment = false; this.xrTableCell12.Text = "FLS in Minuten"; this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell12.Weight = 0.22058567421860553D; + this.xrTableCell12.Weight = 0.19625590008077803D; // // xrTableRow6 // @@ -218,9 +225,12 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell27, this.xrTableCell22, this.xrTableCell30, - this.xrTableCell31}); + this.xrTableCell31, + this.xrTableCell40}); this.xrTableRow6.Name = "xrTableRow6"; - this.xrTableRow6.Weight = 2D; + this.xrTableRow6.StylePriority.UseTextAlignment = false; + this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableRow6.Weight = 1.2500001027034D; // // xrTableCell26 // @@ -228,7 +238,9 @@ namespace BeWo.SKFAlsdorf.Neu | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell26.Name = "xrTableCell26"; this.xrTableCell26.StylePriority.UseBorders = false; - this.xrTableCell26.Weight = 0.22058567382346644D; + this.xrTableCell26.StylePriority.UseTextAlignment = false; + this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell26.Weight = 0.19278021948428534D; // // xrTableCell11 // @@ -239,8 +251,8 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell11.StylePriority.UsePadding = false; this.xrTableCell11.StylePriority.UseTextAlignment = false; this.xrTableCell11.Text = "Von"; - this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell11.Weight = 0.11029283855115195D; + this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell11.Weight = 0.12405706215709479D; // // xrTableCell27 // @@ -251,8 +263,8 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell27.StylePriority.UsePadding = false; this.xrTableCell27.StylePriority.UseTextAlignment = false; this.xrTableCell27.Text = "Bis"; - this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell27.Weight = 0.11029283855115195D; + this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell27.Weight = 0.12433406928439024D; // // xrTableCell22 // @@ -263,8 +275,8 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell22.StylePriority.UsePadding = false; this.xrTableCell22.StylePriority.UseTextAlignment = false; this.xrTableCell22.Text = "Art"; - this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell22.Weight = 0.10339953681426602D; + this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell22.Weight = 0.092694222611873267D; // // xrTableCell30 // @@ -275,9 +287,9 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell30.StylePriority.UseBorders = false; this.xrTableCell30.StylePriority.UsePadding = false; this.xrTableCell30.StylePriority.UseTextAlignment = false; - this.xrTableCell30.Text = "Anzahl\r\nKlienten"; - this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell30.Weight = 0.10339953681426602D; + this.xrTableCell30.Text = "# Klienten"; + this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell30.Weight = 0.13843462515448626D; // // xrTableCell31 // @@ -285,7 +297,9 @@ namespace BeWo.SKFAlsdorf.Neu | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell31.Name = "xrTableCell31"; this.xrTableCell31.StylePriority.UseBorders = false; - this.xrTableCell31.Weight = 0.22058567421860553D; + this.xrTableCell31.StylePriority.UseTextAlignment = false; + this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell31.Weight = 0.19625590008077803D; // // DetailReport // @@ -316,7 +330,7 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(630F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(652.8333F, 25F); this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UseTextAlignment = false; this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; @@ -329,7 +343,8 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell5, this.xrTableCell23, this.xrTableCell19, - this.xrTableCell20}); + this.xrTableCell20, + this.xrTableCell42}); this.xrTableRow1.FormattingRules.Add(this.ruleRowVisible); this.xrTableRow1.Name = "xrTableRow1"; this.xrTableRow1.Weight = 1D; @@ -346,7 +361,7 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.Text = "xrTableCell2"; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell2.Weight = 0.62344515720167393D; + this.xrTableCell2.Weight = 0.521556132160305D; // // xrTableCell7 // @@ -359,7 +374,7 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell7.StylePriority.UseFont = false; this.xrTableCell7.StylePriority.UseTextAlignment = false; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell7.Weight = 0.31172153823476278D; + this.xrTableCell7.Weight = 0.33562900378227767D; // // xrTableCell5 // @@ -372,7 +387,7 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell5.StylePriority.UseFont = false; this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell5.Weight = 0.31172272210129737D; + this.xrTableCell5.Weight = 0.33637961498624086D; // // xrTableCell23 // @@ -383,7 +398,7 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell23.Name = "xrTableCell23"; this.xrTableCell23.StylePriority.UseBorders = false; this.xrTableCell23.Text = "xrTableCell23"; - this.xrTableCell23.Weight = 0.29223971329665582D; + this.xrTableCell23.Weight = 0.25077905686224389D; // // xrTableCell19 // @@ -394,7 +409,7 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell19.Name = "xrTableCell19"; this.xrTableCell19.StylePriority.UseBorders = false; this.xrTableCell19.Text = "xrTableCell19"; - this.xrTableCell19.Weight = 0.29223971329665582D; + this.xrTableCell19.Weight = 0.37452661455690323D; // // xrTableCell20 // @@ -404,7 +419,7 @@ namespace BeWo.SKFAlsdorf.Neu new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes")}); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.StylePriority.UseBorders = false; - this.xrTableCell20.Weight = 0.62344476647763147D; + this.xrTableCell20.Weight = 0.53095958583211955D; // // ruleRowVisible // @@ -417,10 +432,14 @@ namespace BeWo.SKFAlsdorf.Neu // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableServiceRecords1}); - this.GroupHeader1.HeightF = 65F; + this.GroupHeader1.HeightF = 50F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.RepeatEveryPage = true; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // xrTableCell16 // this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -484,11 +503,11 @@ namespace BeWo.SKFAlsdorf.Neu // xrTable4 // this.xrTable4.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(212.7084F, 50F); + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(189.9128F, 50F); this.xrTable4.Name = "xrTable4"; this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow12}); - this.xrTable4.SizeF = new System.Drawing.SizeF(417.2916F, 25F); + this.xrTable4.SizeF = new System.Drawing.SizeF(330.7011F, 25F); this.xrTable4.StylePriority.UseBorders = false; // // xrTableRow12 @@ -502,7 +521,7 @@ namespace BeWo.SKFAlsdorf.Neu // xrTableCell13 // this.xrTableCell13.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrTableCell13.Multiline = true; this.xrTableCell13.Name = "xrTableCell13"; this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 0, 0, 100F); @@ -512,7 +531,7 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell13.StylePriority.UseTextAlignment = false; this.xrTableCell13.Text = "Fehlkontakte in Minuten gesamt:"; this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell13.Weight = 1.0025443160498144D; + this.xrTableCell13.Weight = 0.83021428960984511D; // // cellStunden // @@ -529,7 +548,7 @@ namespace BeWo.SKFAlsdorf.Neu this.cellStunden.StylePriority.UseTextAlignment = false; this.cellStunden.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.cellStunden.TextFormatString = "{0:0.##}"; - this.cellStunden.Weight = 0.62344452971220909D; + this.cellStunden.Weight = 0.45837219809172919D; // // xrTableAbwesenheiten // @@ -642,16 +661,17 @@ namespace BeWo.SKFAlsdorf.Neu // lblKrankenhaus // this.lblKrankenhaus.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.lblKrankenhaus.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50.00003F); + this.lblKrankenhaus.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.lblKrankenhaus.LocationFloat = new DevExpress.Utils.PointFloat(0F, 50F); this.lblKrankenhaus.Multiline = true; this.lblKrankenhaus.Name = "lblKrankenhaus"; this.lblKrankenhaus.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblKrankenhaus.SizeF = new System.Drawing.SizeF(212.7083F, 40F); + this.lblKrankenhaus.SizeF = new System.Drawing.SizeF(189.9127F, 40F); this.lblKrankenhaus.StylePriority.UseBorders = false; this.lblKrankenhaus.StylePriority.UseFont = false; this.lblKrankenhaus.StylePriority.UseTextAlignment = false; this.lblKrankenhaus.Text = "Krankenhausaufenthalte oder\r\nstationäre Reha-Maßnahmen\r\n"; - this.lblKrankenhaus.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.lblKrankenhaus.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // xrTable2 // @@ -661,7 +681,7 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow3, this.xrTableRow13}); - this.xrTable2.SizeF = new System.Drawing.SizeF(630.0002F, 50F); + this.xrTable2.SizeF = new System.Drawing.SizeF(520.6139F, 50F); this.xrTable2.StylePriority.UseBorders = false; // // xrTableRow3 @@ -675,7 +695,7 @@ namespace BeWo.SKFAlsdorf.Neu // xrTableCell8 // this.xrTableCell8.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableCell8.Multiline = true; this.xrTableCell8.Name = "xrTableCell8"; this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 3, 0, 100F); @@ -685,7 +705,7 @@ namespace BeWo.SKFAlsdorf.Neu this.xrTableCell8.StylePriority.UseTextAlignment = false; this.xrTableCell8.Text = "Fachleistungsstunden in Minuten gesamt:"; this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell8.Weight = 1.8313692487880422D; + this.xrTableCell8.Weight = 1.5702144268126097D; // // lblSummeMinuten // @@ -694,7 +714,7 @@ namespace BeWo.SKFAlsdorf.Neu this.lblSummeMinuten.BorderWidth = 1F; this.lblSummeMinuten.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMoFehlkontakte")}); - this.lblSummeMinuten.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); + this.lblSummeMinuten.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.lblSummeMinuten.Name = "lblSummeMinuten"; this.lblSummeMinuten.StylePriority.UseBorders = false; this.lblSummeMinuten.StylePriority.UseBorderWidth = false; @@ -702,27 +722,59 @@ namespace BeWo.SKFAlsdorf.Neu this.lblSummeMinuten.StylePriority.UseTextAlignment = false; this.lblSummeMinuten.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.lblSummeMinuten.TextFormatString = "{0:0.##}"; - this.lblSummeMinuten.Weight = 0.623444529712209D; + this.lblSummeMinuten.Weight = 0.45837253022990809D; // - // xrLabel2 + // xrTableRow13 // - this.xrLabel2.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(352.2919F, 38.02083F); - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(277.7079F, 25F); - this.xrLabel2.StylePriority.UseBorderDashStyle = false; - this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell28, + this.xrTableCell29}); + this.xrTableRow13.Name = "xrTableRow13"; + this.xrTableRow13.Weight = 1D; + // + // xrTableCell28 + // + this.xrTableCell28.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrTableCell28.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell28.Multiline = true; + this.xrTableCell28.Name = "xrTableCell28"; + this.xrTableCell28.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 3, 0, 100F); + this.xrTableCell28.StylePriority.UseBorders = false; + this.xrTableCell28.StylePriority.UseFont = false; + this.xrTableCell28.StylePriority.UsePadding = false; + this.xrTableCell28.StylePriority.UseTextAlignment = false; + this.xrTableCell28.Text = "In Stunden:"; + this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell28.Weight = 1.5702144268126097D; + // + // xrTableCell29 + // + this.xrTableCell29.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell29.BorderWidth = 1F; + this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSoFehlkontakte")}); + this.xrTableCell29.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell29.Multiline = true; + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.StylePriority.UseBorders = false; + this.xrTableCell29.StylePriority.UseBorderWidth = false; + this.xrTableCell29.StylePriority.UseFont = false; + this.xrTableCell29.StylePriority.UseTextAlignment = false; + this.xrTableCell29.Text = "xrTableCell29"; + this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell29.TextFormatString = "{0:0.00}"; + this.xrTableCell29.Weight = 0.45837253022990809D; // // xrLabel12 // - this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(352.2919F, 63.02083F); 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(277.7079F, 24F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(300.5414F, 24F); this.xrLabel12.StylePriority.UseBorders = false; this.xrLabel12.StylePriority.UseFont = false; this.xrLabel12.StylePriority.UseTextAlignment = false; @@ -731,29 +783,19 @@ namespace BeWo.SKFAlsdorf.Neu // // xrLabel5 // - this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 63.02083F); 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(270.0002F, 24F); + this.xrLabel5.SizeF = new System.Drawing.SizeF(295.0005F, 24F); this.xrLabel5.StylePriority.UseBorders = false; this.xrLabel5.StylePriority.UseFont = false; this.xrLabel5.StylePriority.UseTextAlignment = false; this.xrLabel5.Text = "Datum, Unterschrift Klientin/Klient"; this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // xrLabel3 - // - this.xrLabel3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 38.02083F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(270F, 25F); - this.xrLabel3.StylePriority.UseBorderDashStyle = false; - this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // // formattingRuleServiceDesc // this.formattingRuleServiceDesc.Condition = "[StartDate2] < [StartDate]"; @@ -788,10 +830,12 @@ namespace BeWo.SKFAlsdorf.Neu // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel2, + this.xrPictureBox1, + this.xrLabel17, + this.xrPictureBox2, + this.xrLabel18, this.xrLabel12, - this.xrLabel5, - this.xrLabel3}); + this.xrLabel5}); this.GroupFooter1.HeightF = 87.02083F; this.GroupFooter1.Name = "GroupFooter1"; // @@ -1027,51 +1071,95 @@ namespace BeWo.SKFAlsdorf.Neu this.fieldEinzel.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldEinzel.Name = "fieldEinzel"; // - // xrTableRow13 + // xrTableCell39 // - this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell28, - this.xrTableCell29}); - this.xrTableRow13.Name = "xrTableRow13"; - this.xrTableRow13.Weight = 1D; + this.xrTableCell39.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell39.Multiline = true; + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.StylePriority.UseBorders = false; + this.xrTableCell39.StylePriority.UseTextAlignment = false; + this.xrTableCell39.Text = "Unterschrift"; + this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell39.Weight = 0.22058567421860553D; // - // xrTableCell28 + // xrTableCell40 // - this.xrTableCell28.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrTableCell28.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell28.Multiline = true; - this.xrTableCell28.Name = "xrTableCell28"; - this.xrTableCell28.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 3, 3, 0, 100F); - this.xrTableCell28.StylePriority.UseBorders = false; - this.xrTableCell28.StylePriority.UseFont = false; - this.xrTableCell28.StylePriority.UsePadding = false; - this.xrTableCell28.StylePriority.UseTextAlignment = false; - this.xrTableCell28.Text = "In Stunden:"; - this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell28.Weight = 1.8313692487880422D; - // - // xrTableCell29 - // - this.xrTableCell29.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell29.BorderWidth = 1F; - this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSoFehlkontakte")}); - this.xrTableCell29.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); - this.xrTableCell29.Multiline = true; - this.xrTableCell29.Name = "xrTableCell29"; - this.xrTableCell29.StylePriority.UseBorders = false; - this.xrTableCell29.StylePriority.UseBorderWidth = false; - this.xrTableCell29.StylePriority.UseFont = false; - this.xrTableCell29.StylePriority.UseTextAlignment = false; - this.xrTableCell29.Text = "xrTableCell29"; - this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell29.TextFormatString = "{0:0.00}"; - this.xrTableCell29.Weight = 0.623444529712209D; + this.xrTableCell40.Multiline = true; + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.StylePriority.UseBorders = false; + this.xrTableCell40.StylePriority.UseTextAlignment = false; + this.xrTableCell40.Text = "Klientin/Klient"; + this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell40.Weight = 0.22058567421860553D; // - // bindingSource1 + // xrTableCell42 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell42.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.picSignature}); + this.xrTableCell42.Multiline = true; + this.xrTableCell42.Name = "xrTableCell42"; + this.xrTableCell42.StylePriority.UseBorders = false; + this.xrTableCell42.Weight = 0.59678232986563529D; + // + // 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(462.2918F, 27.31246F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(190.5415F, 35.50002F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // xrLabel17 + // + 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(352.2919F, 34.81248F); + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(110F, 28F); + this.xrLabel17.StylePriority.UseBackColor = false; + this.xrLabel17.StylePriority.UseTextAlignment = false; + this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + // + // xrPictureBox2 + // + this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(110.0002F, 27.31246F); + this.xrPictureBox2.Name = "xrPictureBox2"; + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(185.0003F, 35.70835F); + this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // + // 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(0F, 34.81248F); + this.xrLabel18.Name = "xrLabel18"; + this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(110F, 28F); + this.xrLabel18.StylePriority.UseTextAlignment = false; + this.xrLabel18.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(0F, 1F); + this.picSignature.Name = "picSignature"; + this.picSignature.SizeF = new System.Drawing.SizeF(132.2194F, 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 // @@ -1104,11 +1192,11 @@ namespace BeWo.SKFAlsdorf.Neu this.Watermarks.Add(xrWatermark1); ((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.xrTableAbwesenheiten)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1123,7 +1211,6 @@ namespace BeWo.SKFAlsdorf.Neu private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; private DevExpress.XtraReports.UI.DetailReportBand DetailReport1; private DevExpress.XtraReports.UI.DetailBand Detail2; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRTable xrTableServiceRecords1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; @@ -1142,7 +1229,6 @@ namespace BeWo.SKFAlsdorf.Neu private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRLabel xrLabel12; - private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRTable xrTable2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRTableCell lblSummeMinuten; @@ -1200,5 +1286,13 @@ namespace BeWo.SKFAlsdorf.Neu private DevExpress.XtraReports.UI.XRTableRow xrTableRow13; private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRLabel xrLabel17; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; + private DevExpress.XtraReports.UI.XRLabel xrLabel18; + private DevExpress.XtraReports.UI.XRPictureBox picSignature; } } diff --git a/ReportImp/SKFAlsdorf/ServicesOverviewReportNeu.cs b/ReportImp/SKFAlsdorf/ServicesOverviewReportNeu.cs index 955898614..00ffa0649 100644 --- a/ReportImp/SKFAlsdorf/ServicesOverviewReportNeu.cs +++ b/ReportImp/SKFAlsdorf/ServicesOverviewReportNeu.cs @@ -1,7 +1,11 @@ using System; using System.Collections.Generic; +using System.Drawing; +using System.IO; +using System.Text.RegularExpressions; using BeWo.Report; using BeWo.Report.ReportObjects; +using BS.Shared.Core; using DevExpress.XtraReports.UI; namespace BeWo.SKFAlsdorf.Neu @@ -43,24 +47,6 @@ namespace BeWo.SKFAlsdorf.Neu pRO.Services = servicesBillable; } - //if (String.IsNullOrWhiteSpace(pRO.AbsenceTimes)) - //{ - // lblKrankenhaus.Text = "Krankenhausaufenthalt: Nein"; - //} - //else - //{ - // lblKrankenhaus.Text = "Krankenhausaufenthalt:"; - //} - - //if (!hatGruppen) - //{ - // lblGruppe.Text = "E = ear to ear, face to face \r\nGR = Gruppenangebot Nein"; - //} - //else - //{ - // lblGruppe.Text = "E = ear to ear, face to face \r\nGR = Gruppenangebot Ja"; - //} - ErstelleAbwesenheitenTabelle(pRO); bindingSource1.DataSource = pRO; @@ -107,5 +93,32 @@ namespace BeWo.SKFAlsdorf.Neu } } + + private void picSignature_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e) + { + XRPictureBox xrBox = sender as XRPictureBox; + //var test = this.GetCurrent + 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); + } + } + } }