diff --git a/ReportImp/MobileEV/Sammelrechnung.Designer.cs b/ReportImp/MobileEV/Sammelrechnung.Designer.cs index b7d6dee70..e870314a6 100644 --- a/ReportImp/MobileEV/Sammelrechnung.Designer.cs +++ b/ReportImp/MobileEV/Sammelrechnung.Designer.cs @@ -126,7 +126,7 @@ namespace MobileEV this.lblKategorie4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblSumBAufwand = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); this.lblSummeGelFLS4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -942,7 +942,7 @@ namespace MobileEV // this.lblKategorie1.BorderColor = System.Drawing.Color.DarkGray; this.lblKategorie1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblKategorie1.Font = new System.Drawing.Font("Arial", 10F); + this.lblKategorie1.Font = new System.Drawing.Font("Calibri", 10.5F); this.lblKategorie1.Name = "lblKategorie1"; this.lblKategorie1.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); this.lblKategorie1.StylePriority.UseBorderColor = false; @@ -989,7 +989,7 @@ namespace MobileEV // this.xrTableCellwf.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCellwf.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCellwf.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCellwf.Font = new System.Drawing.Font("Calibri", 10.5F); this.xrTableCellwf.Name = "xrTableCellwf"; this.xrTableCellwf.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); this.xrTableCellwf.StylePriority.UseBorderColor = false; @@ -1019,7 +1019,7 @@ namespace MobileEV // this.lblSummeGelFLS1.BorderColor = System.Drawing.Color.DarkGray; this.lblSummeGelFLS1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblSummeGelFLS1.Font = new System.Drawing.Font("Arial", 10F); + this.lblSummeGelFLS1.Font = new System.Drawing.Font("Calibri", 10.5F); this.lblSummeGelFLS1.Name = "lblSummeGelFLS1"; this.lblSummeGelFLS1.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); this.lblSummeGelFLS1.StylePriority.UseBorderColor = false; @@ -1034,7 +1034,7 @@ namespace MobileEV // this.xrTableCell41.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell41.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell41.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell41.Font = new System.Drawing.Font("Calibri", 10.5F); this.xrTableCell41.Name = "xrTableCell41"; this.xrTableCell41.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); this.xrTableCell41.StylePriority.UseBorderColor = false; @@ -1050,7 +1050,7 @@ namespace MobileEV this.lblSumme1.BorderColor = System.Drawing.Color.DarkGray; this.lblSumme1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblSumme1.Font = new System.Drawing.Font("Arial", 10F); + this.lblSumme1.Font = new System.Drawing.Font("Calibri", 10.5F); this.lblSumme1.Name = "lblSumme1"; this.lblSumme1.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); this.lblSumme1.StylePriority.UseBorderColor = false; @@ -1079,7 +1079,7 @@ namespace MobileEV // this.lblKategorie2.BorderColor = System.Drawing.Color.DarkGray; this.lblKategorie2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblKategorie2.Font = new System.Drawing.Font("Arial", 10F); + this.lblKategorie2.Font = new System.Drawing.Font("Calibri", 10.5F); this.lblKategorie2.Name = "lblKategorie2"; this.lblKategorie2.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); this.lblKategorie2.StylePriority.UseBorderColor = false; @@ -1124,7 +1124,7 @@ namespace MobileEV // this.xrTableCellwfr.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCellwfr.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCellwfr.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCellwfr.Font = new System.Drawing.Font("Calibri", 10.5F); this.xrTableCellwfr.Name = "xrTableCellwfr"; this.xrTableCellwfr.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); this.xrTableCellwfr.StylePriority.UseBorderColor = false; @@ -1154,7 +1154,7 @@ namespace MobileEV // this.lblSummeGelFLS2.BorderColor = System.Drawing.Color.DarkGray; this.lblSummeGelFLS2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblSummeGelFLS2.Font = new System.Drawing.Font("Arial", 10F); + this.lblSummeGelFLS2.Font = new System.Drawing.Font("Calibri", 10.5F); this.lblSummeGelFLS2.Name = "lblSummeGelFLS2"; this.lblSummeGelFLS2.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); this.lblSummeGelFLS2.StylePriority.UseBorderColor = false; @@ -1169,7 +1169,7 @@ namespace MobileEV // this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell42.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell42.Font = new System.Drawing.Font("Calibri", 10.5F); this.xrTableCell42.Name = "xrTableCell42"; this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); this.xrTableCell42.StylePriority.UseBorderColor = false; @@ -1185,7 +1185,7 @@ namespace MobileEV this.lblSumme2.BorderColor = System.Drawing.Color.DarkGray; this.lblSumme2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblSumme2.Font = new System.Drawing.Font("Arial", 10F); + this.lblSumme2.Font = new System.Drawing.Font("Calibri", 10.5F); this.lblSumme2.Name = "lblSumme2"; this.lblSumme2.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); this.lblSumme2.StylePriority.UseBorderColor = false; @@ -1289,7 +1289,7 @@ namespace MobileEV // this.lblSummeGelFLS3.BorderColor = System.Drawing.Color.DarkGray; this.lblSummeGelFLS3.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblSummeGelFLS3.Font = new System.Drawing.Font("Arial", 10F); + this.lblSummeGelFLS3.Font = new System.Drawing.Font("Calibri", 10.5F); this.lblSummeGelFLS3.Name = "lblSummeGelFLS3"; this.lblSummeGelFLS3.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); this.lblSummeGelFLS3.StylePriority.UseBorderColor = false; @@ -1320,7 +1320,7 @@ namespace MobileEV this.lblSumme3.BorderColor = System.Drawing.Color.DarkGray; this.lblSumme3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblSumme3.Font = new System.Drawing.Font("Arial", 10F); + this.lblSumme3.Font = new System.Drawing.Font("Calibri", 10.5F); this.lblSumme3.Name = "lblSumme3"; this.lblSumme3.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); this.lblSumme3.StylePriority.UseBorderColor = false; @@ -1337,7 +1337,7 @@ namespace MobileEV this.lblKategorie4, this.xrTableCell28, this.xrTableCell29, - this.xrTableCell30, + this.lblSumBAufwand, this.xrTableCell39, this.lblSummeGelFLS4, this.xrTableCell48, @@ -1349,7 +1349,7 @@ namespace MobileEV // this.lblKategorie4.BorderColor = System.Drawing.Color.DarkGray; this.lblKategorie4.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblKategorie4.Font = new System.Drawing.Font("Arial", 10F); + this.lblKategorie4.Font = new System.Drawing.Font("Calibri", 10.5F); this.lblKategorie4.Name = "lblKategorie4"; this.lblKategorie4.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); this.lblKategorie4.StylePriority.UseBorderColor = false; @@ -1391,20 +1391,20 @@ namespace MobileEV this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell29.Weight = 0.076656504057011743D; // - // xrTableCell30 + // lblSumBAufwand // - this.xrTableCell30.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell30.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell30.Font = new System.Drawing.Font("Arial", 10F); - this.xrTableCell30.Name = "xrTableCell30"; - this.xrTableCell30.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); - this.xrTableCell30.StylePriority.UseBorderColor = false; - this.xrTableCell30.StylePriority.UseBorders = false; - this.xrTableCell30.StylePriority.UseFont = false; - this.xrTableCell30.StylePriority.UsePadding = false; - this.xrTableCell30.StylePriority.UseTextAlignment = false; - this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell30.Weight = 0.076656498710081483D; + this.lblSumBAufwand.BorderColor = System.Drawing.Color.DarkGray; + this.lblSumBAufwand.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.lblSumBAufwand.Font = new System.Drawing.Font("Calibri", 10.5F); + this.lblSumBAufwand.Name = "lblSumBAufwand"; + this.lblSumBAufwand.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); + this.lblSumBAufwand.StylePriority.UseBorderColor = false; + this.lblSumBAufwand.StylePriority.UseBorders = false; + this.lblSumBAufwand.StylePriority.UseFont = false; + this.lblSumBAufwand.StylePriority.UsePadding = false; + this.lblSumBAufwand.StylePriority.UseTextAlignment = false; + this.lblSumBAufwand.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.lblSumBAufwand.Weight = 0.076656498710081483D; // // xrTableCell39 // @@ -1425,7 +1425,7 @@ namespace MobileEV // this.lblSummeGelFLS4.BorderColor = System.Drawing.Color.DarkGray; this.lblSummeGelFLS4.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblSummeGelFLS4.Font = new System.Drawing.Font("Arial", 10F); + this.lblSummeGelFLS4.Font = new System.Drawing.Font("Calibri", 10.5F); this.lblSummeGelFLS4.Name = "lblSummeGelFLS4"; this.lblSummeGelFLS4.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); this.lblSummeGelFLS4.StylePriority.UseBorderColor = false; @@ -1440,7 +1440,7 @@ namespace MobileEV // this.xrTableCell48.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell48.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell48.Font = new System.Drawing.Font("Calibri", 10.5F); this.xrTableCell48.Name = "xrTableCell48"; this.xrTableCell48.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); this.xrTableCell48.StylePriority.UseBorderColor = false; @@ -1456,7 +1456,7 @@ namespace MobileEV this.lblSumme4.BorderColor = System.Drawing.Color.DarkGray; this.lblSumme4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblSumme4.Font = new System.Drawing.Font("Arial", 10F); + this.lblSumme4.Font = new System.Drawing.Font("Calibri", 10.5F); this.lblSumme4.Name = "lblSumme4"; this.lblSumme4.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 0, 2, 0, 100F); this.lblSumme4.StylePriority.UseBorderColor = false; @@ -1614,7 +1614,7 @@ namespace MobileEV private DevExpress.XtraReports.UI.XRTableCell lblKategorie4; private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; + private DevExpress.XtraReports.UI.XRTableCell lblSumBAufwand; private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; private DevExpress.XtraReports.UI.XRTableCell lblSummeGelFLS4; private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; diff --git a/ReportImp/MobileEV/Sammelrechnung.cs b/ReportImp/MobileEV/Sammelrechnung.cs index a657c086d..faf4727a4 100644 --- a/ReportImp/MobileEV/Sammelrechnung.cs +++ b/ReportImp/MobileEV/Sammelrechnung.cs @@ -5,6 +5,7 @@ using DevExpress.XtraReports.UI; using BS.Shared.Core; using System.Collections.Generic; using System.Linq; +using BS.Shared.Extensions; namespace MobileEV { @@ -33,6 +34,8 @@ namespace MobileEV Dictionary kategorieZuKosten = new Dictionary(); var stundenGesamt = 0.0m; var betragGeamt = 0.0m; + decimal betrag = 0; + decimal bAufwand = 0; foreach (var ip in pRO.ServiceInvoicePeriods) { @@ -46,15 +49,25 @@ namespace MobileEV kategorieZuKosten.Add(item.ServiceRecord.ServiceDescription.CategoryName, 0m); kategorieZuStunden[item.ServiceRecord.ServiceDescription.CategoryName] += item.Hours.Value; - kategorieZuKosten[item.ServiceRecord.ServiceDescription.CategoryName] += item.AmountPerUnit.Value * item.UnitCount.Value; - + betrag = GetGrossAmount(item); + if (betrag != 0) + { + kategorieZuKosten[item.ServiceRecord.ServiceDescription.CategoryName] += betrag; + betragGeamt += betrag; + } + else + { + kategorieZuKosten[item.ServiceRecord.ServiceDescription.CategoryName] += Math.Round(item.AmountPerUnit.Value * item.UnitCount.Value, 2, MidpointRounding.AwayFromZero); + betrag += Math.Round(item.AmountPerUnit.Value * item.UnitCount.Value, 2, MidpointRounding.AwayFromZero); + } stundenGesamt += item.Hours.Value; - betragGeamt += item.AmountPerUnit.Value * item.UnitCount.Value; + bAufwand += GetBetreuungsaufwand(item); } } lblSumme4.Text = string.Format("{0:c}", betragGeamt); lblSummeGelFLS4.Text = string.Format("{0:0.00}", stundenGesamt); + lblSumBAufwand.Text = string.Format("{0:c}", bAufwand); if (kategorieZuStunden.Count >= 1) { lblKategorie1.Text = kategorieZuStunden.ElementAt(0).Key; @@ -77,5 +90,39 @@ namespace MobileEV this.bindingSource1.DataSource = pRO; } + + private decimal GetGrossAmount(ServiceInvoiceItemRO ii) + { + decimal amount = 0; + + if (Decimal.TryParse(ii.GrossAmount.Replace("€", ""), out amount)) + { + return amount; + } + + return 0; + } + + private decimal GetBetreuungsaufwand(ServiceInvoiceItemRO ii) + { + decimal amount = 0; + if (ii.ServiceRecord != null && !ii.ServiceRecord.Notice3.IsNullOrEmpty()) + { + ii.ServiceRecord.Notice3 = ii.ServiceRecord.Notice3.Trim(); + if (ii.ServiceRecord.Notice3.Contains("€")) + { + if (Decimal.TryParse(ii.ServiceRecord.Notice3.Replace("€", ""), out amount)) + { + return amount; + } + } + else if (Decimal.TryParse(ii.ServiceRecord.Notice3, out amount)) + { + return amount; + } + } + + return 0; + } } } \ No newline at end of file diff --git a/ReportImp/MobileEV/SettlementReport2.cs b/ReportImp/MobileEV/SettlementReport2.cs index 78cd4a988..629b982e2 100644 --- a/ReportImp/MobileEV/SettlementReport2.cs +++ b/ReportImp/MobileEV/SettlementReport2.cs @@ -1,51 +1,51 @@ -using System; -using System.Drawing; -using System.Collections; -using System.ComponentModel; -using DevExpress.XtraReports.UI; -using BeWo.Report.ReportObjects; -using BeWo.Report; +using System; +using System.Drawing; +using System.Collections; +using System.ComponentModel; +using DevExpress.XtraReports.UI; +using BeWo.Report.ReportObjects; +using BeWo.Report; using BS.Shared.Extensions; using System.Text.RegularExpressions; -namespace MobileEV.Alt -{ - public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport - { - public Spitzabrechnung() - { - InitializeComponent(); - } - - public void SetReportDataSource(Settlement2RO pRO) - { - if (String.IsNullOrEmpty(pRO.Notice)) - { - lblNotice.Visible = false; - } - - decimal rateFactor = 1; - - foreach (var ii in pRO.InvoiceItems) - { - if (ii.RateFactor.HasValue) - { - rateFactor = (100 + ii.RateFactor.Value) / 100; - } - +namespace MobileEV.Alt +{ + public partial class Spitzabrechnung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport + { + public Spitzabrechnung() + { + InitializeComponent(); + } + + public void SetReportDataSource(Settlement2RO pRO) + { + if (String.IsNullOrEmpty(pRO.Notice)) + { + lblNotice.Visible = false; + } + + decimal rateFactor = 1; + + foreach (var ii in pRO.InvoiceItems) + { + if (ii.RateFactor.HasValue) + { + rateFactor = (100 + ii.RateFactor.Value) / 100; + } + if (!pRO.FehlkontakteString.IsNullOrEmpty() && ii.RateFactor == 0) { - Zwischensumme.Visible = true; - if (!ii.ItemDescription.IsNullOrEmpty()) - { - ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); - } - ii.ItemDescription = "Fehlkontakte"; - } - } - pRO.RateFactor = (double)rateFactor; - - this.bindingSource1.DataSource = pRO; - } - } -} + Zwischensumme.Visible = true; + if (!ii.ItemDescription.IsNullOrEmpty()) + { + ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); + } + ii.ItemDescription = "Fehlkontakte"; + } + } + pRO.RateFactor = (double)rateFactor; + + this.bindingSource1.DataSource = pRO; + } + } +} diff --git a/ReportImp/MobileEV/Taetigkeitsnachweis.Designer.cs b/ReportImp/MobileEV/Taetigkeitsnachweis.Designer.cs index 78eea167e..e8464e97d 100644 --- a/ReportImp/MobileEV/Taetigkeitsnachweis.Designer.cs +++ b/ReportImp/MobileEV/Taetigkeitsnachweis.Designer.cs @@ -41,8 +41,8 @@ namespace MobileEV this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); + this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -241,6 +241,18 @@ namespace MobileEV this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell15.Weight = 0.2382376505443205D; // + // 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(37.22203F, 3.178914E-05F); + this.picSignature.Name = "picSignature"; + this.picSignature.SizeF = new System.Drawing.SizeF(407.0374F, 36.66667F); + this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.picSignature.StylePriority.UseBorders = false; + this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint); + // // xrTableCell39 // this.xrTableCell39.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); @@ -254,18 +266,6 @@ namespace MobileEV this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell39.Weight = 0.2382376505443205D; // - // 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(37.22203F, 3.178914E-05F); - this.picSignature.Name = "picSignature"; - this.picSignature.SizeF = new System.Drawing.SizeF(183.079F, 36.66667F); - this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - this.picSignature.StylePriority.UseBorders = false; - this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint); - // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -698,9 +698,10 @@ namespace MobileEV // this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")}); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 85.00183F); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(9.536743E-05F, 85.00182F); this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(271.8472F, 37.2544F); + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(271.8471F, 37.25439F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; // // xrTable3 //