From 1e2a9df1f27ac53ad5f8d4361451553e370ff1b2 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Wed, 1 Feb 2023 10:30:28 +0100 Subject: [PATCH] =?UTF-8?q?MH:=20Fehlbesuche=20f=C3=BCr=20PSH=20Bochum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Quittierungsbeleg.Designer.cs | 38 ++++++++++++++----- .../Quittierungsbeleg.cs | 13 ++++++- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/ReportImp/PsychosozialeHilfenBochum/Quittierungsbeleg.Designer.cs b/ReportImp/PsychosozialeHilfenBochum/Quittierungsbeleg.Designer.cs index 721c2098f..3d8d11dcb 100644 --- a/ReportImp/PsychosozialeHilfenBochum/Quittierungsbeleg.Designer.cs +++ b/ReportImp/PsychosozialeHilfenBochum/Quittierungsbeleg.Designer.cs @@ -115,6 +115,7 @@ namespace PsychosozialeHilfenBochum this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -228,7 +229,7 @@ namespace PsychosozialeHilfenBochum // 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; @@ -745,6 +746,7 @@ namespace PsychosozialeHilfenBochum // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel17, this.lblUnterschriftKlient, this.lblUnterschriftMitarbeiter, this.xrTableAbwesenheiten, @@ -759,7 +761,7 @@ namespace PsychosozialeHilfenBochum this.xrLabel10, this.xrLabel9, this.xrLabel1}); - this.GroupFooter1.HeightF = 270F; + this.GroupFooter1.HeightF = 305.4167F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // @@ -767,7 +769,7 @@ namespace PsychosozialeHilfenBochum // 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(96.99564F, 285.4167F); 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); @@ -783,7 +785,7 @@ namespace PsychosozialeHilfenBochum // 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(400.3057F, 285.4167F); 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); @@ -802,7 +804,7 @@ namespace PsychosozialeHilfenBochum | 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(171.9957F, 115.4167F); 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[] { @@ -1013,7 +1015,7 @@ namespace PsychosozialeHilfenBochum | 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(437.1345F, 165.4167F); 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); @@ -1030,7 +1032,7 @@ namespace PsychosozialeHilfenBochum | 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(437.1345F, 115.4167F); 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); @@ -1044,7 +1046,7 @@ namespace PsychosozialeHilfenBochum // 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(476.468F, 165.4167F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 68.05556F); @@ -1053,7 +1055,7 @@ namespace PsychosozialeHilfenBochum // 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(476.468F, 115.4167F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); this.xrRichText1.SizeF = new System.Drawing.SizeF(264.9721F, 50F); @@ -1062,7 +1064,7 @@ namespace PsychosozialeHilfenBochum // 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(1.995659F, 115.4167F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1176,6 +1178,21 @@ namespace PsychosozialeHilfenBochum this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // + // xrLabel17 + // + this.xrLabel17.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 59.99997F); + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(320F, 20F); + this.xrLabel17.StylePriority.UseBackColor = false; + this.xrLabel17.StylePriority.UseBorders = false; + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.StylePriority.UsePadding = false; + this.xrLabel17.StylePriority.UseTextAlignment = false; + this.xrLabel17.Text = "F = Fehlbesuch"; + this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // // Quittierungsbeleg // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1295,5 +1312,6 @@ namespace PsychosozialeHilfenBochum private DevExpress.XtraReports.UI.XRLabel xrLabel14; private DevExpress.XtraReports.UI.XRLabel xrLabel16; private DevExpress.XtraReports.UI.XRPictureBox picSignature; + private DevExpress.XtraReports.UI.XRLabel xrLabel17; } } diff --git a/ReportImp/PsychosozialeHilfenBochum/Quittierungsbeleg.cs b/ReportImp/PsychosozialeHilfenBochum/Quittierungsbeleg.cs index 2ff1fec7b..9ad0afcac 100644 --- a/ReportImp/PsychosozialeHilfenBochum/Quittierungsbeleg.cs +++ b/ReportImp/PsychosozialeHilfenBochum/Quittierungsbeleg.cs @@ -30,9 +30,20 @@ namespace PsychosozialeHilfenBochum foreach (var sd in pRO.Services) { - if (sd.IsBillable || sd.ServiceCategory == "Fehlbesuch") + if (sd.IsBillable || sd.ServiceDescription == "Fehlbesuch" || sd.ServiceDescription == "Service") { ServicesOverviewRO.CreateSignatureString(sd); + + + if (sd.ServiceDescription == "Fehlbesuch") + sd.Notice5 = "F"; + else if (sd.ServiceDescription == "Service") + sd.Notice5 = "S"; + else if (sd.IsGroup) + sd.Notice5 = "GR"; + else if (!sd.IsGroup) + sd.Notice5 = "E"; + if (sd.IsGroup) { //sd.Notice5 = String.Format("{0} Teilnehmer", sd.CustomerCount);