diff --git a/ReportImp/DomizielAnsbach/CustomReportCreator.cs b/ReportImp/DomizielAnsbach/CustomReportCreator.cs index b6a8ad3a2..06134959e 100644 --- a/ReportImp/DomizielAnsbach/CustomReportCreator.cs +++ b/ReportImp/DomizielAnsbach/CustomReportCreator.cs @@ -375,7 +375,7 @@ namespace DomizielAnsbach { foreach (ServicesOverviewRO.ServiceDetail s in ro.Services) { - if (s.ServiceCategory.Contains("Ambulant Betreutes ")) + if (s.ServiceCategory.Contains("Ambulant Betreutes ") || s.ServiceCategory.Contains("Indirekt")) bewoRo.Services.Add(s); else if (s.ServiceCategory.Contains("Zuverdienst - Arbeitszeit")) zvRo.Services.Add(s); diff --git a/ReportImp/DomizielAnsbach/Invoicing/ZVInvoiceCreation.cs b/ReportImp/DomizielAnsbach/Invoicing/ZVInvoiceCreation.cs index 06c682b2a..4b54b0062 100644 --- a/ReportImp/DomizielAnsbach/Invoicing/ZVInvoiceCreation.cs +++ b/ReportImp/DomizielAnsbach/Invoicing/ZVInvoiceCreation.cs @@ -61,17 +61,18 @@ namespace DomizielAnsbach.Invoicing DateTime ende = invoicePeriod.EndDate; var cbOid = scap.CostBearer2SupportConcept.CostBearer.Oid ?? 0; - var pausch = ZuverdienstHelper.GetPauschalen(cbOid, customer, DateTime.Today); + var pausch = ZuverdienstHelper.GetPauschalen(cbOid, customer, ende); var crList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(scap.ServiceCategory.CostRatePeriods); AddCostRatePeriods(crList, pausch, scap); - var mot = crList.GetCostRatePeriodForDate(BS.Shared.CostRatePeriodType.AmountOfMoney, start); + var mot = crList.GetCostRatePeriodForDate(BS.Shared.CostRatePeriodType.AmountOfMoney, start.Date); decimal? stundensatz; decimal? tagessatz; decimal uCount = 0; decimal kCount = 0; + if (scap.ServiceCategory != null && scap.ServiceCategory.Name.Contains("Zuverdienst - Arbeitszeit")) foreach (var at in customer.AbsenceTimes) { if (at.AbsenceReason.BillableMinutes.HasValue && at.AbsenceReason.Description.Contains("ZV")) @@ -199,12 +200,12 @@ namespace DomizielAnsbach.Invoicing if (iServiceRecord.Start > start) start = (DateTime)iServiceRecord.Start; - var pausch = ZuverdienstHelper.GetPauschalen(cbOid, c, start); + var pausch = ZuverdienstHelper.GetPauschalen(cbOid, c, start.Date); var crList = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(scap.ServiceCategory.CostRatePeriods); AddCostRatePeriods(crList, pausch, scap); - var mot = crList.GetCostRatePeriodForDate(BS.Shared.CostRatePeriodType.AmountOfMoney, start); + var mot = crList.GetCostRatePeriodForDate(BS.Shared.CostRatePeriodType.AmountOfMoney, start.Date); if (iServiceRecord.ServiceDescription.Name.Contains("Pause")) { invoiceItem.AmountPerUnit = mot.CostRateValue; diff --git a/ReportImp/DomizielAnsbach/QuittierungsbelegAbw.Designer.cs b/ReportImp/DomizielAnsbach/QuittierungsbelegAbw.Designer.cs index 1e686b3d5..edbf6dc13 100644 --- a/ReportImp/DomizielAnsbach/QuittierungsbelegAbw.Designer.cs +++ b/ReportImp/DomizielAnsbach/QuittierungsbelegAbw.Designer.cs @@ -30,9 +30,9 @@ namespace DomizielAnsbach private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(QuittierungsbelegAbw)); DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(QuittierungsbelegAbw)); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -51,6 +51,14 @@ namespace DomizielAnsbach this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); @@ -71,6 +79,7 @@ namespace DomizielAnsbach this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); @@ -78,20 +87,12 @@ namespace DomizielAnsbach this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -297,6 +298,102 @@ namespace DomizielAnsbach this.GroupHeader1.RepeatEveryPage = true; this.GroupHeader1.StylePriority.UseFont = false; // + // GroupFooter1 + // + this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable1}); + this.GroupFooter1.HeightF = 25F; + this.GroupFooter1.Name = "GroupFooter1"; + // + // xrTable1 + // + this.xrTable1.BorderColor = System.Drawing.Color.Black; + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 0F); + this.xrTable1.Name = "xrTable1"; + this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable1.SizeF = new System.Drawing.SizeF(669.9999F, 25F); + this.xrTable1.StylePriority.UseFont = false; + this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell8, + this.xrTableCell9, + this.xrTableCell10, + this.xrTableCell12, + this.xrTableCell14}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableRow1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableRow1.Weight = 1.25D; + // + // xrTableCell8 + // + this.xrTableCell8.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UsePadding = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.Text = "Summe"; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell8.Weight = 0.11363635923509893D; + // + // xrTableCell9 + // + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesUnqualified")}); + this.xrTableCell9.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:0.##}"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell9.Summary = xrSummary1; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell9.Weight = 0.10732323140481673D; + // + // xrTableCell10 + // + this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesQualified")}); + this.xrTableCell10.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); + this.xrTableCell10.StylePriority.UseFont = false; + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + xrSummary2.FormatString = "{0:0.##}"; + xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell10.Summary = xrSummary2; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell10.Weight = 0.10732322845341978D; + // + // xrTableCell12 + // + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 3, 0, 100F); + this.xrTableCell12.StylePriority.UseFont = false; + this.xrTableCell12.StylePriority.UsePadding = false; + this.xrTableCell12.StylePriority.UseTextAlignment = false; + this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell12.Weight = 0.40404038746507664D; + // + // xrTableCell14 + // + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.StylePriority.UsePadding = false; + this.xrTableCell14.StylePriority.UseTextAlignment = false; + this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell14.Weight = 0.11363619904777417D; + // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -488,20 +585,34 @@ namespace DomizielAnsbach // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPictureBox2, this.xrLabel4, this.xrLabel3, this.xrLabel2, this.xrLabel6, this.xrLabel5}); this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F); - this.ReportFooter.HeightF = 102.5832F; + this.ReportFooter.HeightF = 128.6248F; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; + // + // xrLabel4 + // + this.xrLabel4.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + 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(666.9999F, 51.72221F); + this.xrLabel4.StylePriority.UseBorders = false; + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.Text = "Erläuterung: Eventuelle Gruppenzeiten sind berechnet nach der Formel Gruppendauer" + + " : 3 x Anzahl\r\nder Mitarbeiter/innen"; // // xrLabel3 // this.xrLabel3.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(536.6738F, 84.58323F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(536.6738F, 100.6248F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel3.SizeF = new System.Drawing.SizeF(137F, 17.99997F); @@ -512,7 +623,7 @@ namespace DomizielAnsbach // xrLabel2 // this.xrLabel2.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(175F, 84.58323F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(175F, 100.6248F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel2.SizeF = new System.Drawing.SizeF(281.5348F, 17.99997F); @@ -523,7 +634,7 @@ namespace DomizielAnsbach // xrLabel6 // this.xrLabel6.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 84.58323F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100.6248F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel6.SizeF = new System.Drawing.SizeF(121.7362F, 17.99997F); @@ -534,7 +645,7 @@ namespace DomizielAnsbach // xrLabel5 // this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 74.22221F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 90.26381F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(670.0001F, 10.36106F); @@ -559,119 +670,20 @@ namespace DomizielAnsbach this.fieldAbrechenbareFLS.Expression = "([TotalFLMBillable] / 60) * 1.2"; this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS"; - // - // xrLabel4 - // - this.xrLabel4.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - 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(666.9999F, 51.72221F); - this.xrLabel4.StylePriority.UseBorders = false; - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.Text = "Erläuterung: Eventuelle Gruppenzeiten sind berechnet nach der Formel Gruppendauer" + - " : 3 x Anzahl\r\nder Mitarbeiter/innen"; // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); // - // GroupFooter1 + // xrPictureBox2 // - this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable1}); - this.GroupFooter1.HeightF = 25F; - this.GroupFooter1.Name = "GroupFooter1"; - // - // xrTable1 - // - this.xrTable1.BorderColor = System.Drawing.Color.Black; - this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0.0002034505F, 0F); - this.xrTable1.Name = "xrTable1"; - this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); - this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(669.9999F, 25F); - this.xrTable1.StylePriority.UseFont = false; - this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrTableRow1 - // - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell8, - this.xrTableCell9, - this.xrTableCell10, - this.xrTableCell12, - this.xrTableCell14}); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); - this.xrTableRow1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableRow1.Weight = 1.25D; - // - // xrTableCell8 - // - this.xrTableCell8.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); - this.xrTableCell8.StylePriority.UseFont = false; - this.xrTableCell8.StylePriority.UsePadding = false; - this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.Text = "Summe"; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell8.Weight = 0.11363635923509893D; - // - // xrTableCell9 - // - this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesUnqualified")}); - this.xrTableCell9.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); - this.xrTableCell9.StylePriority.UseFont = false; - this.xrTableCell9.StylePriority.UsePadding = false; - this.xrTableCell9.StylePriority.UseTextAlignment = false; - xrSummary1.FormatString = "{0:0.##}"; - xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell9.Summary = xrSummary1; - this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell9.Weight = 0.10732323140481673D; - // - // xrTableCell10 - // - this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.MinutesQualified")}); - this.xrTableCell10.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 3, 0, 100F); - this.xrTableCell10.StylePriority.UseFont = false; - this.xrTableCell10.StylePriority.UsePadding = false; - this.xrTableCell10.StylePriority.UseTextAlignment = false; - xrSummary2.FormatString = "{0:0.##}"; - xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell10.Summary = xrSummary2; - this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell10.Weight = 0.10732322845341978D; - // - // xrTableCell12 - // - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 3, 0, 100F); - this.xrTableCell12.StylePriority.UseFont = false; - this.xrTableCell12.StylePriority.UsePadding = false; - this.xrTableCell12.StylePriority.UseTextAlignment = false; - this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell12.Weight = 0.40404038746507664D; - // - // xrTableCell14 - // - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.StylePriority.UsePadding = false; - this.xrTableCell14.StylePriority.UseTextAlignment = false; - this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell14.Weight = 0.11363619904777417D; + this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")}); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(175.0002F, 54.76379F); + this.xrPictureBox2.Name = "xrPictureBox2"; + this.xrPictureBox2.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); + this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; // // QuittierungsbelegAbw // @@ -701,8 +713,8 @@ namespace DomizielAnsbach this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -764,5 +776,6 @@ namespace DomizielAnsbach private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; } } diff --git a/ReportImp/DomizielAnsbach/QuittierungsbelegPB.Designer.cs b/ReportImp/DomizielAnsbach/QuittierungsbelegPB.Designer.cs index 94ab1b4b6..8b9addfb7 100644 --- a/ReportImp/DomizielAnsbach/QuittierungsbelegPB.Designer.cs +++ b/ReportImp/DomizielAnsbach/QuittierungsbelegPB.Designer.cs @@ -76,6 +76,7 @@ namespace DomizielAnsbach this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -472,6 +473,7 @@ namespace DomizielAnsbach // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPictureBox2, this.xrLabel3, this.xrLabel2, this.xrLabel6, @@ -543,6 +545,16 @@ namespace DomizielAnsbach this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS"; // + // xrPictureBox2 + // + this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")}); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(178.3263F, 16.22219F); + this.xrPictureBox2.Name = "xrPictureBox2"; + this.xrPictureBox2.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); + this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + // // QuittierungsbelegPB // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -623,5 +635,6 @@ namespace DomizielAnsbach private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1; private DevExpress.XtraReports.UI.XRPictureBox picSignature; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; } }