From 66a4545a7b0520fe77700f6adc1b95b2785fb477 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Wed, 22 Mar 2023 14:19:51 +0100 Subject: [PATCH] =?UTF-8?q?H:=20Haus=20D=C3=BClken=20FK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HausDuelken/Quittierungsbeleg.Designer.cs | 46 +++++++++++++------ ReportImp/HausDuelken/Quittierungsbeleg.cs | 9 +++- 2 files changed, 40 insertions(+), 15 deletions(-) diff --git a/ReportImp/HausDuelken/Quittierungsbeleg.Designer.cs b/ReportImp/HausDuelken/Quittierungsbeleg.Designer.cs index 49556d3a7..0f44ea4fa 100644 --- a/ReportImp/HausDuelken/Quittierungsbeleg.Designer.cs +++ b/ReportImp/HausDuelken/Quittierungsbeleg.Designer.cs @@ -119,6 +119,7 @@ namespace HausDuelken this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -232,7 +233,7 @@ namespace HausDuelken // xrTableCell2 // this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldKontaktArt")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")}); this.xrTableCell2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell2.Name = "xrTableCell2"; this.xrTableCell2.StylePriority.UseFont = false; @@ -751,6 +752,7 @@ namespace HausDuelken // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel10, this.xrLabel18, this.xrPictureBox2, this.lblUnterschriftKlient, @@ -769,7 +771,7 @@ namespace HausDuelken this.xrLabel1, this.xrPictureBox1, this.xrLabel17}); - this.GroupFooter1.HeightF = 270F; + this.GroupFooter1.HeightF = 303.3333F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // @@ -777,7 +779,7 @@ namespace HausDuelken // 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(129.4998F, 227F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(129.4998F, 260.3333F); this.xrLabel18.Name = "xrLabel18"; this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel18.SizeF = new System.Drawing.SizeF(100F, 23F); @@ -787,7 +789,7 @@ namespace HausDuelken // this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Tag", null, "CustomerSignature")}); - this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(230F, 227F); + this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(230F, 260.3333F); this.xrPictureBox2.Name = "xrPictureBox2"; this.xrPictureBox2.SizeF = new System.Drawing.SizeF(100F, 23F); this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; @@ -797,7 +799,7 @@ namespace HausDuelken // this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.lblUnterschriftKlient.Font = new System.Drawing.Font("Arial", 10F); - this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(94.99999F, 250F); + this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(94.99998F, 283.3333F); this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblUnterschriftKlient.SizeF = new System.Drawing.SizeF(271.8472F, 20F); @@ -813,7 +815,7 @@ namespace HausDuelken // this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.lblUnterschriftMitarbeiter.Font = new System.Drawing.Font("Arial", 10F); - this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 250F); + this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 283.3333F); this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter"; this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(336.6944F, 19.99998F); @@ -832,7 +834,7 @@ namespace HausDuelken | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 79.99997F); + this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 113.3333F); this.xrTableAbwesenheiten.Name = "xrTableAbwesenheiten"; this.xrTableAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableAbwesenheiten.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { @@ -1043,7 +1045,7 @@ namespace HausDuelken | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblHatAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F); - this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 130F); + this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 163.3333F); this.lblHatAbwesenheiten.Name = "lblHatAbwesenheiten"; this.lblHatAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblHatAbwesenheiten.SizeF = new System.Drawing.SizeF(30F, 30F); @@ -1060,7 +1062,7 @@ namespace HausDuelken | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.lblHatGruppen.Font = new System.Drawing.Font("Arial", 10F); - this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 79.99997F); + this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 113.3333F); this.lblHatGruppen.Name = "lblHatGruppen"; this.lblHatGruppen.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.lblHatGruppen.SizeF = new System.Drawing.SizeF(30F, 30F); @@ -1074,7 +1076,7 @@ namespace HausDuelken // xrRichText2 // this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F); - this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 130F); + this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 163.3333F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 68.05556F); @@ -1083,7 +1085,7 @@ namespace HausDuelken // xrRichText1 // this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F); - this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 79.99997F); + this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4723F, 113.3333F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); this.xrRichText1.SizeF = new System.Drawing.SizeF(264.9721F, 50F); @@ -1092,7 +1094,7 @@ namespace HausDuelken // xrLabel15 // this.xrLabel15.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Underline); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 79.99997F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 113.3333F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1203,7 +1205,7 @@ namespace HausDuelken // this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Tag", null, "EmployeeSignature")}); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 227F); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 260.3333F); this.xrPictureBox1.Name = "xrPictureBox1"; this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; this.xrPictureBox1.SizeF = new System.Drawing.SizeF(100F, 23F); @@ -1214,7 +1216,7 @@ namespace HausDuelken // 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(435.1388F, 227F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 260.3333F); this.xrLabel17.Name = "xrLabel17"; this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel17.SizeF = new System.Drawing.SizeF(100F, 23F); @@ -1227,6 +1229,21 @@ namespace HausDuelken this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // + // xrLabel10 + // + this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 59.99997F); + this.xrLabel10.Name = "xrLabel10"; + this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(320F, 20F); + this.xrLabel10.StylePriority.UseBackColor = false; + this.xrLabel10.StylePriority.UseBorders = false; + this.xrLabel10.StylePriority.UseFont = false; + this.xrLabel10.StylePriority.UsePadding = false; + this.xrLabel10.StylePriority.UseTextAlignment = false; + this.xrLabel10.Text = "F = Gruppenangebot"; + this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // // Quittierungsbeleg // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1350,5 +1367,6 @@ namespace HausDuelken private DevExpress.XtraReports.UI.XRLabel xrLabel17; private DevExpress.XtraReports.UI.XRLabel xrLabel18; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; + private DevExpress.XtraReports.UI.XRLabel xrLabel10; } } diff --git a/ReportImp/HausDuelken/Quittierungsbeleg.cs b/ReportImp/HausDuelken/Quittierungsbeleg.cs index ff7c35f88..73b6dae2e 100644 --- a/ReportImp/HausDuelken/Quittierungsbeleg.cs +++ b/ReportImp/HausDuelken/Quittierungsbeleg.cs @@ -39,8 +39,15 @@ namespace HausDuelken foreach (var sd in pRO.Services) { - if (sd.IsBillable) + if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt")) { + if (sd.ServiceDescription.ToLower().Contains("fehlkontakt")) + sd.Notice5 = "F"; + else if (sd.IsGroup) + sd.Notice5 = "GR"; + else if (!sd.IsGroup) + sd.Notice5 = "E"; + if (!cats.ContainsKey(sd.ServiceCategory)) { cats.Add(sd.ServiceCategory, sd.ServiceCategory);