From a6e2bdc4a2ee1cace49f14f7356f664f476317e5 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Mon, 12 Aug 2024 11:24:20 +0200 Subject: [PATCH] MH: ASB Berg Gladbach --- .../Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 82 ++++++++++--------- .../ServicesOverviewReport.cs | 4 +- .../ServicesOverviewReport.resx | 3 - 4 files changed, 46 insertions(+), 44 deletions(-) diff --git a/ReportImp/ASBBergischGladbachReports/Properties/licenses.licx b/ReportImp/ASBBergischGladbachReports/Properties/licenses.licx index e69de29bb..d59547a61 100644 --- a/ReportImp/ASBBergischGladbachReports/Properties/licenses.licx +++ b/ReportImp/ASBBergischGladbachReports/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.Designer.cs b/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.Designer.cs index b253cfe9c..e82763d7d 100644 --- a/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.Designer.cs @@ -30,6 +30,7 @@ namespace BeWo.ASBBergischGladbachReports private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -45,7 +46,6 @@ namespace BeWo.ASBBergischGladbachReports this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); @@ -88,6 +88,7 @@ namespace BeWo.ASBBergischGladbachReports this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -97,7 +98,7 @@ namespace BeWo.ASBBergischGladbachReports // this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableServiceRecords1}); - this.Detail.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); this.Detail.HeightF = 20F; this.Detail.Name = "Detail"; this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -165,7 +166,7 @@ namespace BeWo.ASBBergischGladbachReports this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); this.xrTableCell11.StylePriority.UseFont = false; this.xrTableCell11.StylePriority.UseTextAlignment = false; - this.xrTableCell11.Text = "Minuten"; + this.xrTableCell11.Text = "Stunden"; this.xrTableCell11.Weight = 0.59078228166487934D; // // DetailReport @@ -183,7 +184,7 @@ namespace BeWo.ASBBergischGladbachReports // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable3}); - this.Detail1.Font = new System.Drawing.Font("Arial", 12F); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 12F); this.Detail1.HeightF = 20F; this.Detail1.Name = "Detail1"; this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -267,10 +268,6 @@ namespace BeWo.ASBBergischGladbachReports this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell15.Weight = 0.30588845636111778D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -298,14 +295,14 @@ namespace BeWo.ASBBergischGladbachReports this.xrLabel12, this.xrLabel2, this.xrLabel1}); - this.ReportHeader.Font = new System.Drawing.Font("Arial", 11F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.ReportHeader.HeightF = 232F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // // xrLabel10 // - this.xrLabel10.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 189F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -318,7 +315,7 @@ namespace BeWo.ASBBergischGladbachReports this.xrLabel29.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; this.xrLabel29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")}); - this.xrLabel29.Font = new System.Drawing.Font("Arial", 11F); + this.xrLabel29.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(319.0002F, 153F); this.xrLabel29.Name = "xrLabel29"; this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -331,7 +328,7 @@ namespace BeWo.ASBBergischGladbachReports this.xrLabel26.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; this.xrLabel26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.##}")}); - this.xrLabel26.Font = new System.Drawing.Font("Arial", 11F); + this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(319.0002F, 117F); this.xrLabel26.Name = "xrLabel26"; this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -345,7 +342,7 @@ namespace BeWo.ASBBergischGladbachReports this.xrLabel25.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReferenceNumber")}); - this.xrLabel25.Font = new System.Drawing.Font("Arial", 11F); + this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(319.0002F, 99.00001F); this.xrLabel25.Name = "xrLabel25"; this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -358,7 +355,7 @@ namespace BeWo.ASBBergischGladbachReports this.xrLabel24.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; this.xrLabel24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerFirstName")}); - this.xrLabel24.Font = new System.Drawing.Font("Arial", 11F); + this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(319.0002F, 81.00001F); this.xrLabel24.Name = "xrLabel24"; this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -371,7 +368,7 @@ namespace BeWo.ASBBergischGladbachReports this.xrLabel23.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; this.xrLabel23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerLastName")}); - this.xrLabel23.Font = new System.Drawing.Font("Arial", 11F); + this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(319.0002F, 63.00001F); this.xrLabel23.Name = "xrLabel23"; this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -382,7 +379,7 @@ namespace BeWo.ASBBergischGladbachReports // xrLabel22 // this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel22.Font = new System.Drawing.Font("Arial", 11F); + this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(155.4586F, 36F); this.xrLabel22.Multiline = true; this.xrLabel22.Name = "xrLabel22"; @@ -396,7 +393,7 @@ namespace BeWo.ASBBergischGladbachReports // this.xrLabel21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Year")}); - this.xrLabel21.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(266.9169F, 189F); this.xrLabel21.Name = "xrLabel21"; this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -408,7 +405,7 @@ namespace BeWo.ASBBergischGladbachReports // this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Month")}); - this.xrLabel9.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(62.99998F, 189F); this.xrLabel9.Name = "xrLabel9"; this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -418,7 +415,7 @@ namespace BeWo.ASBBergischGladbachReports // // xrLabel20 // - this.xrLabel20.Font = new System.Drawing.Font("Arial", 11F, System.Drawing.FontStyle.Bold); + this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Arial", 11F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(194.9168F, 189F); this.xrLabel20.Name = "xrLabel20"; this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -473,7 +470,7 @@ namespace BeWo.ASBBergischGladbachReports // // xrLabel2 // - this.xrLabel2.Font = new System.Drawing.Font("Arial", 11F); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(45F, 36F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -485,7 +482,7 @@ namespace BeWo.ASBBergischGladbachReports // // xrLabel1 // - this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; @@ -519,7 +516,7 @@ namespace BeWo.ASBBergischGladbachReports // // topMarginBand1 // - this.topMarginBand1.Font = new System.Drawing.Font("Times New Roman", 9.75F); + this.topMarginBand1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F); this.topMarginBand1.HeightF = 90F; this.topMarginBand1.Name = "topMarginBand1"; this.topMarginBand1.StylePriority.UseFont = false; @@ -546,7 +543,7 @@ namespace BeWo.ASBBergischGladbachReports this.xrLabel6, this.xrLabel4, this.xrLabel3}); - this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F); + this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.ReportFooter.HeightF = 149.6795F; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; @@ -555,7 +552,7 @@ namespace BeWo.ASBBergischGladbachReports // this.xrLabel28.BackColor = System.Drawing.Color.Transparent; this.xrLabel28.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrLabel28.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel28.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(360.9582F, 21.9792F); this.xrLabel28.Name = "xrLabel28"; this.xrLabel28.SizeF = new System.Drawing.SizeF(320.0001F, 18.02081F); @@ -569,7 +566,7 @@ namespace BeWo.ASBBergischGladbachReports // // xrLabel19 // - this.xrLabel19.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel19.Name = "xrLabel19"; this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -584,7 +581,7 @@ namespace BeWo.ASBBergischGladbachReports // // xrLabel27 // - this.xrLabel27.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel27.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00001F); this.xrLabel27.Name = "xrLabel27"; this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -599,7 +596,7 @@ namespace BeWo.ASBBergischGladbachReports // // lblFehlkontakt // - this.lblFehlkontakt.Font = new System.Drawing.Font("Arial", 10F); + this.lblFehlkontakt.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40.00001F); this.lblFehlkontakt.Name = "lblFehlkontakt"; this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -615,7 +612,7 @@ namespace BeWo.ASBBergischGladbachReports // xrPictureBox2 // this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Image", null, "CustomerSignature")}); + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(479.9581F, 95.1794F); this.xrPictureBox2.Name = "xrPictureBox2"; this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); @@ -635,7 +632,7 @@ namespace BeWo.ASBBergischGladbachReports // xrPictureBox1 // this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")}); + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")}); this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(119.9999F, 95.17927F); this.xrPictureBox1.Name = "xrPictureBox1"; this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; @@ -662,8 +659,8 @@ namespace BeWo.ASBBergischGladbachReports | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel11.BorderWidth = 1F; this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte")}); - this.xrLabel11.Font = new System.Drawing.Font("Arial", 11F); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSFehlkontakte")}); + this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(438.6945F, 39.99996F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); @@ -677,14 +674,14 @@ namespace BeWo.ASBBergischGladbachReports // // xrLabel8 // - this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(266.9168F, 40.00001F); this.xrLabel8.Multiline = true; this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(171.1388F, 19.99998F); this.xrLabel8.StylePriority.UseFont = false; - this.xrLabel8.Text = "Fehlkontakte in Minuten"; + this.xrLabel8.Text = "Fehlkontakte in Stunden"; // // xrLabel7 // @@ -715,8 +712,8 @@ namespace BeWo.ASBBergischGladbachReports | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel4.BorderWidth = 2F; this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMoFehlkontakte")}); - this.xrLabel4.Font = new System.Drawing.Font("Arial", 11F); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSoFehlkontakte")}); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 11F); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(438.0557F, 0F); this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F); @@ -727,17 +724,18 @@ namespace BeWo.ASBBergischGladbachReports this.xrLabel4.StylePriority.UsePadding = false; this.xrLabel4.StylePriority.UseTextAlignment = false; this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrLabel4.TextFormatString = "{0:0.00}"; // // xrLabel3 // - this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(266.9168F, 0F); this.xrLabel3.Multiline = true; this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel3.SizeF = new System.Drawing.SizeF(171.1388F, 21.9792F); this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Fachleistungen in Minuten"; + this.xrLabel3.Text = "Fachleistungen in Stunden"; // // fieldAbrechenbareMinuten // @@ -758,6 +756,10 @@ namespace BeWo.ASBBergischGladbachReports this.fieldAbrechenbareFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldAbrechenbareFLS.Name = "fieldAbrechenbareFLS"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -777,12 +779,14 @@ namespace BeWo.ASBBergischGladbachReports this.formattingRuleServiceDesc, this.formattingRuleCostBearer, this.formattingRuleEmployeeName}); - this.Margins = new System.Drawing.Printing.Margins(75, 64, 90, 47); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 64F, 90F, 47F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.SnapGridSize = 9F; - this.Version = "17.1"; + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); diff --git a/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.cs b/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.cs index 83ee8b75a..0fe5a82f3 100644 --- a/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.cs +++ b/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.cs @@ -22,12 +22,12 @@ namespace BeWo.ASBBergischGladbachReports { if (s.IsBillable || s.ServiceDescription.ToLower().Contains("fehlkontakt") || s.ServiceCategory.ToLower().Contains("fehlkontakt")) { - s.Notice = String.Format("{0:0.##}", s.Minutes); + s.Notice = String.Format("{0:0.00}", s.Minutes / 60); s.Notice5 = "E"; if (s.IsGroup) { s.TimeRangeString += " Gruppe"; - s.Notice = String.Format("{0} Teiln. = {1:0.##} Minuten", s.CustomerCount, s.Minutes); + s.Notice = String.Format("{0} Teiln. = {1:0.00} Minuten", s.CustomerCount, s.Minutes); s.Notice5 = "GR"; } if (s.ServiceDescription.ToLower().Contains("fehlkontakt") || s.ServiceCategory.ToLower().Contains("fehlkontakt")) diff --git a/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.resx b/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.resx index f6606300d..c7e0d4bdf 100644 --- a/ReportImp/ASBBergischGladbachReports/ServicesOverviewReport.resx +++ b/ReportImp/ASBBergischGladbachReports/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