diff --git a/Report/DefaultReports/QuittierungsbelegMitDatum.Designer.cs b/Report/DefaultReports/QuittierungsbelegMitDatum.Designer.cs index 12b125cc0..61a66bffb 100644 --- a/Report/DefaultReports/QuittierungsbelegMitDatum.Designer.cs +++ b/Report/DefaultReports/QuittierungsbelegMitDatum.Designer.cs @@ -80,6 +80,7 @@ namespace BeWo.Report.DefaultReports this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.lblFehlkontakt = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); @@ -114,12 +115,16 @@ namespace BeWo.Report.DefaultReports this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); - this.lblFehlkontakt = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -751,6 +756,15 @@ namespace BeWo.Report.DefaultReports // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel11, + this.xrLabel9, + this.xrLabel22, + this.xrLabel19, + this.xrLabel20, + this.xrLabel23, + this.xrLabel10, + this.xrLabel1, + this.xrLabel21, this.lblFehlkontakt, this.xrLabel16, this.xrPictureBox1, @@ -765,15 +779,26 @@ namespace BeWo.Report.DefaultReports this.xrRichText1, this.xrLabel15, this.xrLabel13, - this.xrLabel12, - this.xrLabel11, - this.xrLabel10, - this.xrLabel9, - this.xrLabel1}); + this.xrLabel12}); this.GroupFooter1.HeightF = 290.8333F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // + // lblFehlkontakt + // + this.lblFehlkontakt.Font = new System.Drawing.Font("Arial", 10F); + this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99999F); + this.lblFehlkontakt.Name = "lblFehlkontakt"; + this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblFehlkontakt.SizeF = new System.Drawing.SizeF(245F, 20F); + this.lblFehlkontakt.StylePriority.UseBackColor = false; + this.lblFehlkontakt.StylePriority.UseBorders = false; + this.lblFehlkontakt.StylePriority.UseFont = false; + this.lblFehlkontakt.StylePriority.UsePadding = false; + this.lblFehlkontakt.StylePriority.UseTextAlignment = false; + this.lblFehlkontakt.Text = "F = Fehlkontakt"; + this.lblFehlkontakt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // // xrLabel16 // this.xrLabel16.BackColor = System.Drawing.Color.Transparent; @@ -1133,10 +1158,10 @@ namespace BeWo.Report.DefaultReports // xrLabel13 // this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99998F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00001F); this.xrLabel13.Name = "xrLabel13"; this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel13.SizeF = new System.Drawing.SizeF(320F, 20F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(245F, 20F); this.xrLabel13.StylePriority.UseBackColor = false; this.xrLabel13.StylePriority.UseBorders = false; this.xrLabel13.StylePriority.UseFont = false; @@ -1148,10 +1173,10 @@ namespace BeWo.Report.DefaultReports // xrLabel12 // this.xrLabel12.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 19.99999F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel12.SizeF = new System.Drawing.SizeF(320F, 20F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(245F, 20F); this.xrLabel12.StylePriority.UseBackColor = false; this.xrLabel12.StylePriority.UseBorders = false; this.xrLabel12.StylePriority.UseFont = false; @@ -1160,19 +1185,91 @@ namespace BeWo.Report.DefaultReports this.xrLabel12.Text = "E = ear to ear, face to face"; this.xrLabel12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // - // xrLabel11 + // fieldKontaktArt // - this.xrLabel11.Font = new System.Drawing.Font("Arial", 8F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(415F, 19.99999F); - this.xrLabel11.Name = "xrLabel11"; - this.xrLabel11.SizeF = new System.Drawing.SizeF(320F, 20F); - this.xrLabel11.StylePriority.UseBackColor = false; - this.xrLabel11.StylePriority.UseBorders = false; - this.xrLabel11.StylePriority.UseFont = false; - this.xrLabel11.StylePriority.UsePadding = false; - this.xrLabel11.StylePriority.UseTextAlignment = false; - this.xrLabel11.Text = "Ohne Faktor 1,2 (wird erst bei Abrechnung eingerechnet)"; - this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.fieldKontaktArt.DataMember = "Services"; + this.fieldKontaktArt.Expression = "Iif([IsGroup], \'GR\', \'E\')"; + this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; + this.fieldKontaktArt.Name = "fieldKontaktArt"; + // + // xrLabel9 + // + this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(245F, 0F); + this.xrLabel9.Name = "xrLabel9"; + this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel9.SizeF = new System.Drawing.SizeF(85F, 20F); + this.xrLabel9.StylePriority.UseBackColor = false; + this.xrLabel9.StylePriority.UseBorders = false; + this.xrLabel9.StylePriority.UseFont = false; + this.xrLabel9.StylePriority.UsePadding = false; + this.xrLabel9.StylePriority.UseTextAlignment = false; + this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel22 + // + this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrLabel22.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(244.9998F, 20.00001F); + this.xrLabel22.Name = "xrLabel22"; + this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel22.SizeF = new System.Drawing.SizeF(85F, 20F); + this.xrLabel22.StylePriority.UseBackColor = false; + this.xrLabel22.StylePriority.UseBorders = false; + this.xrLabel22.StylePriority.UseFont = false; + this.xrLabel22.StylePriority.UsePadding = false; + this.xrLabel22.StylePriority.UseTextAlignment = false; + this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel19 + // + this.xrLabel19.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrLabel19.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(244.9999F, 40.00003F); + this.xrLabel19.Name = "xrLabel19"; + this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel19.SizeF = new System.Drawing.SizeF(85F, 20F); + this.xrLabel19.StylePriority.UseBackColor = false; + this.xrLabel19.StylePriority.UseBorders = false; + this.xrLabel19.StylePriority.UseFont = false; + this.xrLabel19.StylePriority.UsePadding = false; + this.xrLabel19.StylePriority.UseTextAlignment = false; + this.xrLabel19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel20 + // + this.xrLabel20.BackColor = System.Drawing.Color.Gainsboro; + this.xrLabel20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte", "{0:0.##}")}); + this.xrLabel20.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(329.9999F, 40.00003F); + this.xrLabel20.Name = "xrLabel20"; + this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel20.SizeF = new System.Drawing.SizeF(85F, 20F); + this.xrLabel20.StylePriority.UseBackColor = false; + this.xrLabel20.StylePriority.UseBorders = false; + this.xrLabel20.StylePriority.UseFont = false; + this.xrLabel20.StylePriority.UsePadding = false; + this.xrLabel20.StylePriority.UseTextAlignment = false; + this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrLabel23 + // + this.xrLabel23.BackColor = System.Drawing.Color.Transparent; + this.xrLabel23.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel23.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(329.9998F, 20.00001F); + this.xrLabel23.Name = "xrLabel23"; + this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel23.SizeF = new System.Drawing.SizeF(85F, 20F); + this.xrLabel23.StylePriority.UseBackColor = false; + this.xrLabel23.StylePriority.UseBorders = false; + this.xrLabel23.StylePriority.UseFont = false; + this.xrLabel23.StylePriority.UsePadding = false; + this.xrLabel23.StylePriority.UseTextAlignment = false; + this.xrLabel23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // // xrLabel10 // @@ -1191,27 +1288,12 @@ namespace BeWo.Report.DefaultReports this.xrLabel10.Text = "Fachleistungen in Minuten"; this.xrLabel10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // - // xrLabel9 - // - this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(245F, 0F); - this.xrLabel9.Name = "xrLabel9"; - this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel9.SizeF = new System.Drawing.SizeF(85F, 20F); - this.xrLabel9.StylePriority.UseBackColor = false; - this.xrLabel9.StylePriority.UseBorders = false; - this.xrLabel9.StylePriority.UseFont = false; - this.xrLabel9.StylePriority.UsePadding = false; - this.xrLabel9.StylePriority.UseTextAlignment = false; - this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // // xrLabel1 // this.xrLabel1.BackColor = System.Drawing.Color.Gainsboro; this.xrLabel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMBillable", "{0:0.##}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMoFehlkontakte", "{0:0.##}")}); this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(330F, 0F); this.xrLabel1.Name = "xrLabel1"; @@ -1224,27 +1306,38 @@ namespace BeWo.Report.DefaultReports this.xrLabel1.StylePriority.UseTextAlignment = false; this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // - // fieldKontaktArt + // xrLabel21 // - this.fieldKontaktArt.DataMember = "Services"; - this.fieldKontaktArt.Expression = "Iif([IsGroup], \'GR\', \'E\')"; - this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; - this.fieldKontaktArt.Name = "fieldKontaktArt"; + this.xrLabel21.BackColor = System.Drawing.Color.Gainsboro; + this.xrLabel21.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel21.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(414.9999F, 40.00003F); + this.xrLabel21.Name = "xrLabel21"; + this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel21.SizeF = new System.Drawing.SizeF(320F, 20F); + this.xrLabel21.StylePriority.UseBackColor = false; + this.xrLabel21.StylePriority.UseBorders = false; + this.xrLabel21.StylePriority.UseFont = false; + this.xrLabel21.StylePriority.UsePadding = false; + this.xrLabel21.StylePriority.UseTextAlignment = false; + this.xrLabel21.Text = "Fehlkontakte in Minuten"; + this.xrLabel21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // - // lblFehlkontakt + // xrLabel11 // - this.lblFehlkontakt.Font = new System.Drawing.Font("Arial", 10F); - this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 59.99997F); - this.lblFehlkontakt.Name = "lblFehlkontakt"; - this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.lblFehlkontakt.SizeF = new System.Drawing.SizeF(320F, 20F); - this.lblFehlkontakt.StylePriority.UseBackColor = false; - this.lblFehlkontakt.StylePriority.UseBorders = false; - this.lblFehlkontakt.StylePriority.UseFont = false; - this.lblFehlkontakt.StylePriority.UsePadding = false; - this.lblFehlkontakt.StylePriority.UseTextAlignment = false; - this.lblFehlkontakt.Text = "F = Fehlkontakt"; - this.lblFehlkontakt.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrLabel11.BackColor = System.Drawing.Color.Transparent; + this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel11.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(414.9998F, 20.00001F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.SizeF = new System.Drawing.SizeF(320F, 20F); + this.xrLabel11.StylePriority.UseBackColor = false; + this.xrLabel11.StylePriority.UseBorders = false; + this.xrLabel11.StylePriority.UseFont = false; + this.xrLabel11.StylePriority.UsePadding = false; + this.xrLabel11.StylePriority.UseTextAlignment = false; + this.xrLabel11.Text = "Ohne Faktor 1,2 (wird erst bei Abrechnung eingerechnet)"; + this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; // // Quittierungsbeleg2 // @@ -1329,10 +1422,6 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell50; private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; private DevExpress.XtraReports.UI.CalculatedField fieldKontaktArt; - private DevExpress.XtraReports.UI.XRLabel xrLabel11; - private DevExpress.XtraReports.UI.XRLabel xrLabel10; - private DevExpress.XtraReports.UI.XRLabel xrLabel9; - private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel13; private DevExpress.XtraReports.UI.XRLabel xrLabel12; private DevExpress.XtraReports.UI.XRLabel xrLabel15; @@ -1371,5 +1460,14 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRLabel xrLabel16; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; private DevExpress.XtraReports.UI.XRLabel lblFehlkontakt; + private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel xrLabel22; + private DevExpress.XtraReports.UI.XRLabel xrLabel19; + private DevExpress.XtraReports.UI.XRLabel xrLabel20; + private DevExpress.XtraReports.UI.XRLabel xrLabel23; + private DevExpress.XtraReports.UI.XRLabel xrLabel10; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel xrLabel21; + private DevExpress.XtraReports.UI.XRLabel xrLabel11; } } diff --git a/Report/DefaultReports/SettlementReport2.cs b/Report/DefaultReports/SettlementReport2.cs index aab770566..6e31c349c 100644 --- a/Report/DefaultReports/SettlementReport2.cs +++ b/Report/DefaultReports/SettlementReport2.cs @@ -34,7 +34,10 @@ namespace BeWo.Report.DefaultReports if (pRO.FehlkontakteString != null && ii.RateFactor == 0) { Zwischensumme.Visible = true; - ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); + if (ii.ItemDescription != null) + { + ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); + } ii.ItemDescription = "Fehlkontakte"; } }