From 8c8acce7b68c0fa33f39889b3d940aeb2a143d81 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Tue, 25 Apr 2023 13:06:15 +0200 Subject: [PATCH] MH: Sozialp. Praxis FK --- .../Quittierungsbeleg.Designer.cs | 40 ++++++++++++++----- .../Quittierungsbeleg.cs | 6 +++ 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/ReportImp/SozialpaedagogischePraxis/Quittierungsbeleg.Designer.cs b/ReportImp/SozialpaedagogischePraxis/Quittierungsbeleg.Designer.cs index 2be556053..cd9be55a9 100644 --- a/ReportImp/SozialpaedagogischePraxis/Quittierungsbeleg.Designer.cs +++ b/ReportImp/SozialpaedagogischePraxis/Quittierungsbeleg.Designer.cs @@ -116,6 +116,7 @@ namespace SozialpaedagogischePraxis this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -229,7 +230,7 @@ namespace SozialpaedagogischePraxis // 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; @@ -748,6 +749,7 @@ namespace SozialpaedagogischePraxis // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel18, this.lblUnterschriftMitarbeiter, this.xrTableAbwesenheiten, this.lblHatAbwesenheiten, @@ -763,7 +765,7 @@ namespace SozialpaedagogischePraxis this.xrLabel1, this.xrPictureBox1, this.xrLabel17}); - this.GroupFooter1.HeightF = 270F; + this.GroupFooter1.HeightF = 285.625F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // @@ -771,7 +773,7 @@ namespace SozialpaedagogischePraxis // 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, 263.5417F); 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); @@ -790,7 +792,7 @@ namespace SozialpaedagogischePraxis | 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, 93.54166F); 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[] { @@ -1001,7 +1003,7 @@ namespace SozialpaedagogischePraxis | 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, 143.5417F); 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); @@ -1018,7 +1020,7 @@ namespace SozialpaedagogischePraxis | 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, 93.54166F); 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); @@ -1032,7 +1034,7 @@ namespace SozialpaedagogischePraxis // 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, 143.5417F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 68.05556F); @@ -1041,7 +1043,7 @@ namespace SozialpaedagogischePraxis // 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, 93.54166F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); this.xrRichText1.SizeF = new System.Drawing.SizeF(264.9721F, 50F); @@ -1050,7 +1052,7 @@ namespace SozialpaedagogischePraxis // 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, 93.54166F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1161,7 +1163,7 @@ namespace SozialpaedagogischePraxis // 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, 240.5417F); this.xrPictureBox1.Name = "xrPictureBox1"; this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; this.xrPictureBox1.SizeF = new System.Drawing.SizeF(100F, 23F); @@ -1172,7 +1174,7 @@ namespace SozialpaedagogischePraxis // 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, 240.5417F); 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); @@ -1185,6 +1187,21 @@ namespace SozialpaedagogischePraxis this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // + // xrLabel18 + // + this.xrLabel18.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(0F, 59.99997F); + this.xrLabel18.Name = "xrLabel18"; + this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel18.SizeF = new System.Drawing.SizeF(320F, 20F); + this.xrLabel18.StylePriority.UseBackColor = false; + this.xrLabel18.StylePriority.UseBorders = false; + this.xrLabel18.StylePriority.UseFont = false; + this.xrLabel18.StylePriority.UsePadding = false; + this.xrLabel18.StylePriority.UseTextAlignment = false; + this.xrLabel18.Text = "F = Fehlkontakt"; + this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // // Quittierungsbeleg // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1305,5 +1322,6 @@ namespace SozialpaedagogischePraxis private DevExpress.XtraReports.UI.XRPictureBox picSignature; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRLabel xrLabel17; + private DevExpress.XtraReports.UI.XRLabel xrLabel18; } } diff --git a/ReportImp/SozialpaedagogischePraxis/Quittierungsbeleg.cs b/ReportImp/SozialpaedagogischePraxis/Quittierungsbeleg.cs index 27c0d8ba1..5c5a6bc69 100644 --- a/ReportImp/SozialpaedagogischePraxis/Quittierungsbeleg.cs +++ b/ReportImp/SozialpaedagogischePraxis/Quittierungsbeleg.cs @@ -38,11 +38,17 @@ namespace SozialpaedagogischePraxis if (sd.IsBillable) { ServicesOverviewRO.CreateSignatureString(sd); + sd.Notice5 = "E"; if (sd.IsGroup) { //sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount); + sd.Notice5 = "GR"; hatGruppen = true; } + if (sd.ServiceDescription.ToLower().Contains("fehlkontakt")) + { + sd.Notice5 = "F"; + } servicesBillable.Add(sd); } }