diff --git a/ReportImp/AbwDziallasMuhrin/Quittierungsbeleg.Designer.cs b/ReportImp/AbwDziallasMuhrin/Quittierungsbeleg.Designer.cs index a40c13170..6792d680c 100644 --- a/ReportImp/AbwDziallasMuhrin/Quittierungsbeleg.Designer.cs +++ b/ReportImp/AbwDziallasMuhrin/Quittierungsbeleg.Designer.cs @@ -44,6 +44,7 @@ namespace AbwDziallasMuhrin this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); + this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -114,7 +115,7 @@ namespace AbwDziallasMuhrin this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); - this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); + 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 AbwDziallasMuhrin // 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; @@ -287,6 +288,18 @@ namespace AbwDziallasMuhrin this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell50.Weight = 0.20202019042968572D; // + // picSignature + // + this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); + this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.picSignature.Name = "picSignature"; + this.picSignature.SizeF = new System.Drawing.SizeF(160.0001F, 20.00001F); + this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.picSignature.StylePriority.UseBorders = false; + this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint); + // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -736,6 +749,7 @@ namespace AbwDziallasMuhrin // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel17, this.lblUnterschriftKlient, this.lblUnterschriftMitarbeiter, this.xrTableAbwesenheiten, @@ -750,7 +764,7 @@ namespace AbwDziallasMuhrin this.xrLabel10, this.xrLabel9, this.xrLabel1}); - this.GroupFooter1.HeightF = 270F; + this.GroupFooter1.HeightF = 290.2084F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // @@ -758,7 +772,7 @@ namespace AbwDziallasMuhrin // 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.99572F, 270.2084F); 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); @@ -774,7 +788,7 @@ namespace AbwDziallasMuhrin // 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.3057F, 270.2084F); 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); @@ -793,7 +807,7 @@ namespace AbwDziallasMuhrin | 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, 100.2083F); 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[] { @@ -1004,7 +1018,7 @@ namespace AbwDziallasMuhrin | 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.1346F, 150.2083F); 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); @@ -1021,7 +1035,7 @@ namespace AbwDziallasMuhrin | 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.1346F, 100.2083F); 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); @@ -1035,7 +1049,7 @@ namespace AbwDziallasMuhrin // 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.4681F, 150.2083F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 68.05556F); @@ -1044,7 +1058,7 @@ namespace AbwDziallasMuhrin // 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.4681F, 100.2083F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); this.xrRichText1.SizeF = new System.Drawing.SizeF(264.9721F, 50F); @@ -1053,7 +1067,7 @@ namespace AbwDziallasMuhrin // 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, 100.2083F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1167,17 +1181,20 @@ namespace AbwDziallasMuhrin this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // - // picSignature + // xrLabel17 // - this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); - this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.picSignature.Name = "picSignature"; - this.picSignature.SizeF = new System.Drawing.SizeF(160.0001F, 20.00001F); - this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - this.picSignature.StylePriority.UseBorders = false; - this.picSignature.BeforePrint += new System.Drawing.Printing.PrintEventHandler(this.picSignature_BeforePrint); + 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 = Fehlkontakt"; + this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // Quittierungsbeleg // @@ -1298,5 +1315,6 @@ namespace AbwDziallasMuhrin 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/AbwDziallasMuhrin/Quittierungsbeleg.cs b/ReportImp/AbwDziallasMuhrin/Quittierungsbeleg.cs index f985da616..de68c44e5 100644 --- a/ReportImp/AbwDziallasMuhrin/Quittierungsbeleg.cs +++ b/ReportImp/AbwDziallasMuhrin/Quittierungsbeleg.cs @@ -27,8 +27,15 @@ namespace AbwDziallasMuhrin 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"; + ServicesOverviewRO.CreateSignatureString(sd); if (sd.IsGroup) {