From dd207e16c529151f5b1533e783084e7cc7bae7a2 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Wed, 13 Dec 2023 14:39:05 +0100 Subject: [PATCH] MH: KommMit Unterschriftsdaten --- .../ServicesOverviewReport.Designer.cs | 62 +++++++++++-------- .../KomMitBewo/ServicesOverviewReport.cs | 4 +- 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/ReportImp/KomMitBewo/ServicesOverviewReport.Designer.cs b/ReportImp/KomMitBewo/ServicesOverviewReport.Designer.cs index daaf0b3a3..3b4997d9d 100644 --- a/ReportImp/KomMitBewo/ServicesOverviewReport.Designer.cs +++ b/ReportImp/KomMitBewo/ServicesOverviewReport.Designer.cs @@ -91,11 +91,12 @@ namespace KommMit this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldAbrechenbareMinuten = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -509,6 +510,8 @@ namespace KommMit // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel4, + this.xrLabel3, this.xrPictureBox2, this.xrPictureBox1, this.xrLabel20, @@ -517,8 +520,7 @@ namespace KommMit this.xrLabel1, this.xrTable2, this.xrLabel7, - this.xrLabel6, - this.xrLabel5}); + this.xrLabel6}); this.ReportFooter.Font = new System.Drawing.Font("Arial", 11F); this.ReportFooter.HeightF = 231.75F; this.ReportFooter.Name = "ReportFooter"; @@ -528,18 +530,18 @@ namespace KommMit // this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")}); - this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(159.3848F, 160.75F); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(89.99999F, 160.75F); this.xrPictureBox2.Name = "xrPictureBox2"; - this.xrPictureBox2.SizeF = new System.Drawing.SizeF(216.875F, 42.99997F); + this.xrPictureBox2.SizeF = new System.Drawing.SizeF(179.9999F, 42.99997F); this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; // // xrPictureBox1 // this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Image", null, "CustomerSignature")}); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(433.9999F, 160.75F); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(467.3332F, 160.75F); this.xrPictureBox1.Name = "xrPictureBox1"; - this.xrPictureBox1.SizeF = new System.Drawing.SizeF(216F, 42.99997F); + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(181.6248F, 42.99997F); this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; // // xrLabel20 @@ -701,35 +703,24 @@ namespace KommMit // xrLabel7 // this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(433.9999F, 203.75F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(379.8332F, 203.75F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(216F, 17.99997F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(269.1248F, 17.99997F); this.xrLabel7.StylePriority.UseBorders = false; this.xrLabel7.StylePriority.UseFont = false; - this.xrLabel7.Text = "Klient/in"; + this.xrLabel7.Text = "Datum, Klient/in"; // // xrLabel6 // this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(159.3847F, 203.75F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(6.357829E-05F, 203.75F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel6.SizeF = new System.Drawing.SizeF(216.8751F, 17.99997F); + this.xrLabel6.SizeF = new System.Drawing.SizeF(269.9999F, 17.99997F); this.xrLabel6.StylePriority.UseBorders = false; this.xrLabel6.StylePriority.UseFont = false; - this.xrLabel6.Text = "Mitarbeiter/in"; - // - // xrLabel5 - // - this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 203.75F); - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(117F, 17.99997F); - this.xrLabel5.StylePriority.UseBorders = false; - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.Text = "Datum"; + this.xrLabel6.Text = "Datum, Mitarbeiter/in"; // // fieldAbrechenbareMinuten // @@ -757,6 +748,26 @@ namespace KommMit this.fieldGruppe.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldGruppe.Name = "fieldGruppe"; // + // xrLabel3 + // + this.xrLabel3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")}); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(379.8332F, 180.75F); + this.xrLabel3.Name = "xrLabel3"; + this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(87.5F, 23F); + this.xrLabel3.Text = "xrLabel3"; + // + // xrLabel4 + // + this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")}); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.0001271566F, 180.75F); + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(89.99989F, 23F); + this.xrLabel4.Text = "xrLabel4"; + // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -816,7 +827,6 @@ namespace KommMit private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareMinuten; private DevExpress.XtraReports.UI.XRLabel xrLabel6; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.CalculatedField fieldBillableFLS; private DevExpress.XtraReports.UI.CalculatedField fieldAbrechenbareFLS; @@ -860,5 +870,7 @@ namespace KommMit private DevExpress.XtraReports.UI.XRLabel xrLabel21; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; } } diff --git a/ReportImp/KomMitBewo/ServicesOverviewReport.cs b/ReportImp/KomMitBewo/ServicesOverviewReport.cs index 4ab11abd5..3bd520d8f 100644 --- a/ReportImp/KomMitBewo/ServicesOverviewReport.cs +++ b/ReportImp/KomMitBewo/ServicesOverviewReport.cs @@ -21,7 +21,9 @@ namespace KommMit TimeSpan tspan; double d; - pRO.Costbearer = String.Format("({0} - {1}) {2}", pRO.ApprovedStartDate, pRO.ApprovedEndDate, pRO.Costbearer); + lblDatum.Text = string.Format("{0:dd.MM.yyyy}", DateTime.Now); + + pRO.Costbearer = String.Format("({0} - {1}) {2}", pRO.ApprovedStartDate, pRO.ApprovedEndDate, pRO.Costbearer); if (pRO.Services != null) {