From 4ba8f394163f64f04641e8c48f0fb95fac51554c Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Mon, 30 Jan 2023 13:04:40 +0100 Subject: [PATCH] MH: Fehlkontakt QB + Hessische Feiertage aha EV --- .../KollegiumEv/Quittierungsbeleg.Designer.cs | 38 ++++++++++++++----- ReportImp/KollegiumEv/Quittierungsbeleg.cs | 10 ++++- ReportImp/ahaEV/CustomVacationService.cs | 14 +++++++ ReportImp/ahaEV/ahaEV.csproj | 1 + 4 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 ReportImp/ahaEV/CustomVacationService.cs diff --git a/ReportImp/KollegiumEv/Quittierungsbeleg.Designer.cs b/ReportImp/KollegiumEv/Quittierungsbeleg.Designer.cs index f5b1e5584..c47c8be1b 100644 --- a/ReportImp/KollegiumEv/Quittierungsbeleg.Designer.cs +++ b/ReportImp/KollegiumEv/Quittierungsbeleg.Designer.cs @@ -115,6 +115,7 @@ namespace KollegiumEv this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.cellMinutes = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel1 = 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 KollegiumEv // 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 KollegiumEv // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel1, this.lblUnterschriftKlient, this.lblUnterschriftMitarbeiter, this.xrTableAbwesenheiten, @@ -759,7 +761,7 @@ namespace KollegiumEv this.lblFachleistungInMinuten, this.xrLabel9, this.cellMinutes}); - this.GroupFooter1.HeightF = 270F; + this.GroupFooter1.HeightF = 298.125F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // @@ -767,7 +769,7 @@ namespace KollegiumEv // 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(95.00002F, 277.0833F); 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 KollegiumEv // 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, 277.0833F); 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 KollegiumEv | 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, 107.0833F); 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 KollegiumEv | 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, 157.0833F); 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 KollegiumEv | 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, 107.0833F); 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 KollegiumEv // 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, 157.0833F); 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 KollegiumEv // 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, 107.0833F); 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 KollegiumEv // 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(3.178914E-05F, 107.0833F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1174,6 +1176,21 @@ namespace KollegiumEv this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // + // xrLabel1 + // + this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 59.99997F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(320F, 20F); + this.xrLabel1.StylePriority.UseBackColor = false; + this.xrLabel1.StylePriority.UseBorders = false; + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.StylePriority.UsePadding = false; + this.xrLabel1.StylePriority.UseTextAlignment = false; + this.xrLabel1.Text = "F = Fehlkontakt"; + this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // // Quittierungsbeleg // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1293,5 +1310,6 @@ namespace KollegiumEv private DevExpress.XtraReports.UI.XRLabel lblBewilligteFLSWoche; private DevExpress.XtraReports.UI.XRLabel xrLabel16; private DevExpress.XtraReports.UI.XRPictureBox picSignature; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; } } diff --git a/ReportImp/KollegiumEv/Quittierungsbeleg.cs b/ReportImp/KollegiumEv/Quittierungsbeleg.cs index 3f59342f3..29b104b44 100644 --- a/ReportImp/KollegiumEv/Quittierungsbeleg.cs +++ b/ReportImp/KollegiumEv/Quittierungsbeleg.cs @@ -30,9 +30,17 @@ namespace KollegiumEv foreach (var sd in pRO.Services) { - if (sd.IsBillable || sd.ServiceCategory.Contains("Assistenz")) + if (sd.IsBillable || sd.ServiceCategory.Contains("Assistenz") || sd.ServiceDescription.Contains("Fehlkontakt")) { ServicesOverviewRO.CreateSignatureString(sd); + + if (sd.ServiceDescription.Contains("Fehlkontakt")) + sd.Notice5 = "F"; + 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); diff --git a/ReportImp/ahaEV/CustomVacationService.cs b/ReportImp/ahaEV/CustomVacationService.cs new file mode 100644 index 000000000..661babf7e --- /dev/null +++ b/ReportImp/ahaEV/CustomVacationService.cs @@ -0,0 +1,14 @@ +using BeWo.Service.Plugins; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ahaEV +{ + class CustomVacationService : VacationService + { + public override string Bundesland { get => "Hessen"; } + } +} diff --git a/ReportImp/ahaEV/ahaEV.csproj b/ReportImp/ahaEV/ahaEV.csproj index 17c8e926c..087af700e 100644 --- a/ReportImp/ahaEV/ahaEV.csproj +++ b/ReportImp/ahaEV/ahaEV.csproj @@ -50,6 +50,7 @@ + Component