diff --git a/ReportImp/BetreuungsbueroBaak/QuittierungsbelegMitDatum.Designer.cs b/ReportImp/BetreuungsbueroBaak/QuittierungsbelegMitDatum.Designer.cs index 029dfe4a8..5e96c7361 100644 --- a/ReportImp/BetreuungsbueroBaak/QuittierungsbelegMitDatum.Designer.cs +++ b/ReportImp/BetreuungsbueroBaak/QuittierungsbelegMitDatum.Designer.cs @@ -42,6 +42,7 @@ namespace BetreuungsbueroBaak this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell34 = 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(); @@ -52,6 +53,7 @@ namespace BetreuungsbueroBaak this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -60,6 +62,7 @@ namespace BetreuungsbueroBaak this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); @@ -114,9 +117,7 @@ namespace BetreuungsbueroBaak this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -231,7 +232,7 @@ namespace BetreuungsbueroBaak // 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; @@ -266,6 +267,15 @@ namespace BetreuungsbueroBaak this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell12.Weight = 0.10732323052948757D; // + // xrTableCell34 + // + this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeAbbr")}); + this.xrTableCell34.Name = "xrTableCell34"; + this.xrTableCell34.StylePriority.UseTextAlignment = false; + this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell34.Weight = 0.10101009552395673D; + // // xrTableCell44 // this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -405,6 +415,19 @@ namespace BetreuungsbueroBaak this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; this.xrTableCell9.Weight = 0.23743016759776536D; // + // xrTableCell33 + // + this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell33.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.StylePriority.UseBorders = false; + this.xrTableCell33.StylePriority.UseFont = false; + this.xrTableCell33.StylePriority.UseTextAlignment = false; + this.xrTableCell33.Text = "BetreuerIn"; + this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; + this.xrTableCell33.Weight = 0.22346368715083798D; + // // xrTableCell28 // this.xrTableCell28.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) @@ -513,6 +536,16 @@ namespace BetreuungsbueroBaak this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell7.Weight = 0.23743016759776536D; // + // xrTableCell32 + // + this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell32.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.StylePriority.UseBorders = false; + this.xrTableCell32.StylePriority.UseFont = false; + this.xrTableCell32.Weight = 0.22346368715083798D; + // // xrTableCell43 // this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) @@ -766,6 +799,7 @@ namespace BetreuungsbueroBaak // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel2, this.xrTableAbwesenheiten, this.lblHatAbwesenheiten, this.lblHatGruppen, @@ -778,7 +812,7 @@ namespace BetreuungsbueroBaak this.xrLabel10, this.xrLabel9, this.xrLabel1}); - this.GroupFooter1.HeightF = 198.0556F; + this.GroupFooter1.HeightF = 215.7639F; this.GroupFooter1.KeepTogether = true; this.GroupFooter1.Name = "GroupFooter1"; // @@ -789,7 +823,7 @@ namespace BetreuungsbueroBaak | 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, 86.66668F); 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[] { @@ -1000,7 +1034,7 @@ namespace BetreuungsbueroBaak | 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, 136.6667F); 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); @@ -1017,7 +1051,7 @@ namespace BetreuungsbueroBaak | 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, 86.66668F); 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); @@ -1031,7 +1065,7 @@ namespace BetreuungsbueroBaak // 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, 136.6667F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 68.05556F); @@ -1040,7 +1074,7 @@ namespace BetreuungsbueroBaak // 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, 86.66668F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); this.xrRichText1.SizeF = new System.Drawing.SizeF(264.9721F, 50F); @@ -1049,7 +1083,7 @@ namespace BetreuungsbueroBaak // 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, 86.66668F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1163,37 +1197,20 @@ namespace BetreuungsbueroBaak this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // - // xrTableCell32 + // xrLabel2 // - this.xrTableCell32.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell32.Font = new System.Drawing.Font("Arial", 10F); - this.xrTableCell32.Name = "xrTableCell32"; - this.xrTableCell32.StylePriority.UseBorders = false; - this.xrTableCell32.StylePriority.UseFont = false; - this.xrTableCell32.Weight = 0.22346368715083798D; - // - // xrTableCell33 - // - this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell33.Font = new System.Drawing.Font("Arial", 10F); - this.xrTableCell33.Name = "xrTableCell33"; - this.xrTableCell33.StylePriority.UseBorders = false; - this.xrTableCell33.StylePriority.UseFont = false; - this.xrTableCell33.StylePriority.UseTextAlignment = false; - this.xrTableCell33.Text = "BetreuerIn"; - this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter; - this.xrTableCell33.Weight = 0.22346368715083798D; - // - // xrTableCell34 - // - this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeAbbr")}); - this.xrTableCell34.Name = "xrTableCell34"; - this.xrTableCell34.StylePriority.UseTextAlignment = false; - this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell34.Weight = 0.10101009552395673D; + this.xrLabel2.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 59.99997F); + this.xrLabel2.Name = "xrLabel2"; + this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel2.SizeF = new System.Drawing.SizeF(320F, 20F); + this.xrLabel2.StylePriority.UseBackColor = false; + this.xrLabel2.StylePriority.UseBorders = false; + this.xrLabel2.StylePriority.UseFont = false; + this.xrLabel2.StylePriority.UsePadding = false; + this.xrLabel2.StylePriority.UseTextAlignment = false; + this.xrLabel2.Text = "F = Fehlkontakt"; + this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; // // Quittierungsbeleg2 // @@ -1317,5 +1334,6 @@ namespace BetreuungsbueroBaak private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; + private DevExpress.XtraReports.UI.XRLabel xrLabel2; } } diff --git a/ReportImp/BetreuungsbueroBaak/QuittierungsbelegMitDatum.cs b/ReportImp/BetreuungsbueroBaak/QuittierungsbelegMitDatum.cs index 68cf02e7e..b89aeaa8a 100644 --- a/ReportImp/BetreuungsbueroBaak/QuittierungsbelegMitDatum.cs +++ b/ReportImp/BetreuungsbueroBaak/QuittierungsbelegMitDatum.cs @@ -27,8 +27,15 @@ namespace BetreuungsbueroBaak 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) { diff --git a/ReportImp/BetreuungsbueroBaak/SettlementReport.Designer.cs b/ReportImp/BetreuungsbueroBaak/SettlementReport.Designer.cs index 271884b00..d5cf8550d 100644 --- a/ReportImp/BetreuungsbueroBaak/SettlementReport.Designer.cs +++ b/ReportImp/BetreuungsbueroBaak/SettlementReport.Designer.cs @@ -94,6 +94,7 @@ namespace BetreuungsbueroBaak.Alt this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -703,6 +704,7 @@ namespace BetreuungsbueroBaak.Alt // ReportFooter // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel11, this.xrLabel7, this.xrLabel10}); this.ReportFooter.Font = new System.Drawing.Font("Times New Roman", 12F); @@ -713,17 +715,17 @@ namespace BetreuungsbueroBaak.Alt // // xrLabel7 // - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 74.70831F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 80.95831F); this.xrLabel7.Multiline = true; this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel7.SizeF = new System.Drawing.SizeF(227.0833F, 45.74998F); + this.xrLabel7.SizeF = new System.Drawing.SizeF(227.0833F, 39.49998F); this.xrLabel7.StylePriority.UseFont = false; this.xrLabel7.Text = "i.A. Hertrampf\r\nUwe Baak (Dipl. Soz. Arb.)"; // // xrLabel10 // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 23.24994F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.70828F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel10.SizeF = new System.Drawing.SizeF(175F, 17F); @@ -815,6 +817,16 @@ namespace BetreuungsbueroBaak.Alt // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); // + // xrLabel11 + // + this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel11.Name = "xrLabel11"; + this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(650F, 23F); + this.xrLabel11.Text = "xrLabel11"; + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -906,5 +918,6 @@ namespace BetreuungsbueroBaak.Alt private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox2; private DevExpress.XtraReports.UI.XRLabel xrLabel7; private DevExpress.XtraReports.UI.XRLabel xrLabel9; + private DevExpress.XtraReports.UI.XRLabel xrLabel11; } }