diff --git a/ReportImp/SPZLeverkusen/ServicesOverviewReportJa.Designer.cs b/ReportImp/SPZLeverkusen/ServicesOverviewReportJa.Designer.cs
index c3f5b29f0..2aaa538ef 100644
--- a/ReportImp/SPZLeverkusen/ServicesOverviewReportJa.Designer.cs
+++ b/ReportImp/SPZLeverkusen/ServicesOverviewReportJa.Designer.cs
@@ -30,6 +30,7 @@ namespace SPZLeverkusen
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
+ DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableServiceRecords1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -43,7 +44,6 @@ namespace SPZLeverkusen
this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleServiceDesc = new DevExpress.XtraReports.UI.FormattingRule();
this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
@@ -77,6 +77,9 @@ namespace SPZLeverkusen
this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField();
+ this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -86,7 +89,7 @@ namespace SPZLeverkusen
//
this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableServiceRecords1});
- this.Detail.Font = new System.Drawing.Font("Verdana", 10F);
+ this.Detail.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.Detail.HeightF = 40F;
this.Detail.Name = "Detail";
this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -98,13 +101,13 @@ namespace SPZLeverkusen
this.xrTableServiceRecords1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableServiceRecords1.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
- this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(40F, 0F);
+ this.xrTableServiceRecords1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+ this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow2});
- this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(492F, 40F);
+ this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(666F, 40F);
this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
this.xrTableServiceRecords1.StylePriority.UseBorders = false;
this.xrTableServiceRecords1.StylePriority.UseFont = false;
@@ -116,7 +119,8 @@ namespace SPZLeverkusen
this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell3,
this.xrTableCell4,
- this.xrTableCell11});
+ this.xrTableCell11,
+ this.xrTableCell1});
this.xrTableRow2.Name = "xrTableRow2";
this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow2.StylePriority.UseTextAlignment = false;
@@ -166,7 +170,7 @@ namespace SPZLeverkusen
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable3});
- this.Detail1.Font = new System.Drawing.Font("Verdana", 10F);
+ this.Detail1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.Detail1.HeightF = 20F;
this.Detail1.Name = "Detail1";
this.Detail1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -178,12 +182,12 @@ namespace SPZLeverkusen
this.xrTable3.BorderColor = System.Drawing.Color.Black;
this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(40F, 0F);
+ this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable3.Name = "xrTable3";
this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow6});
- this.xrTable3.SizeF = new System.Drawing.SizeF(492F, 20F);
+ this.xrTable3.SizeF = new System.Drawing.SizeF(666.0001F, 20F);
this.xrTable3.StylePriority.UseFont = false;
this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
//
@@ -192,7 +196,8 @@ namespace SPZLeverkusen
this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell13,
this.xrTableCell14,
- this.xrTableCell15});
+ this.xrTableCell15,
+ this.xrTableCell2});
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
this.xrTableRow6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
@@ -237,10 +242,6 @@ namespace SPZLeverkusen
this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
this.xrTableCell15.Weight = 0.17676765142834316D;
//
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
- //
// formattingRuleStartDate
//
this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]";
@@ -271,7 +272,7 @@ namespace SPZLeverkusen
//
// topMarginBand1
//
- this.topMarginBand1.Font = new System.Drawing.Font("Times New Roman", 9.75F);
+ this.topMarginBand1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
this.topMarginBand1.HeightF = 50F;
this.topMarginBand1.Name = "topMarginBand1";
this.topMarginBand1.StylePriority.UseFont = false;
@@ -291,14 +292,14 @@ namespace SPZLeverkusen
this.xrLabel5,
this.xrLabel4,
this.xrLabel3});
- this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F);
+ this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportFooter.HeightF = 140.6249F;
this.ReportFooter.Name = "ReportFooter";
this.ReportFooter.StylePriority.UseFont = false;
//
// xrLabel19
//
- this.xrLabel19.Font = new System.Drawing.Font("Verdana", 9F);
+ this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Verdana", 9F);
this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 39.99998F);
this.xrLabel19.Name = "xrLabel19";
this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -310,7 +311,7 @@ namespace SPZLeverkusen
//
// xrLabel16
//
- this.xrLabel16.Font = new System.Drawing.Font("Verdana", 7F);
+ this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Verdana", 7F);
this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(39.9999F, 39.99998F);
this.xrLabel16.Name = "xrLabel16";
this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -321,7 +322,7 @@ namespace SPZLeverkusen
// xrLabel7
//
this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.Top;
- this.xrLabel7.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold);
+ this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Verdana", 9F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(413.0694F, 122.6249F);
this.xrLabel7.Name = "xrLabel7";
this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -333,7 +334,7 @@ namespace SPZLeverkusen
// xrLabel6
//
this.xrLabel6.Borders = DevExpress.XtraPrinting.BorderSide.Top;
- this.xrLabel6.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold);
+ this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Verdana", 9F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(116.9998F, 122.6249F);
this.xrLabel6.Name = "xrLabel6";
this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -345,7 +346,7 @@ namespace SPZLeverkusen
// xrLabel5
//
this.xrLabel5.Borders = DevExpress.XtraPrinting.BorderSide.Top;
- this.xrLabel5.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Bold);
+ this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Verdana", 9F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 122.6249F);
this.xrLabel5.Name = "xrLabel5";
this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -357,11 +358,11 @@ namespace SPZLeverkusen
// xrLabel4
//
this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrLabel4.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
- this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(392F, 0F);
+ this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+ this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(352F, 0F);
this.xrLabel4.Name = "xrLabel4";
this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
- this.xrLabel4.SizeF = new System.Drawing.SizeF(140F, 40F);
+ this.xrLabel4.SizeF = new System.Drawing.SizeF(136.1075F, 40F);
this.xrLabel4.StylePriority.UseBorders = false;
this.xrLabel4.StylePriority.UseBorderWidth = false;
this.xrLabel4.StylePriority.UseFont = false;
@@ -375,8 +376,8 @@ namespace SPZLeverkusen
this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrLabel3.CanGrow = false;
- this.xrLabel3.Font = new System.Drawing.Font("Verdana", 8F, System.Drawing.FontStyle.Bold);
- this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(39.9999F, 0F);
+ this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Verdana", 8F, DevExpress.Drawing.DXFontStyle.Bold);
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel3.Multiline = true;
this.xrLabel3.Name = "xrLabel3";
this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
@@ -412,7 +413,7 @@ namespace SPZLeverkusen
this.xrLabel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrLabel1.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
+ this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
@@ -472,7 +473,7 @@ namespace SPZLeverkusen
// xrLabel22
//
this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.None;
- this.xrLabel22.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
+ this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0F, 36F);
this.xrLabel22.Name = "xrLabel22";
this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -486,7 +487,7 @@ namespace SPZLeverkusen
// xrLabel23
//
this.xrLabel23.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
- this.xrLabel23.Font = new System.Drawing.Font("Verdana", 10F);
+ this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(250F, 63.00001F);
this.xrLabel23.Name = "xrLabel23";
this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -500,7 +501,7 @@ namespace SPZLeverkusen
this.xrLabel25.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReferenceNumber")});
- this.xrLabel25.Font = new System.Drawing.Font("Verdana", 10F);
+ this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(317.8334F, 99.00001F);
this.xrLabel25.Name = "xrLabel25";
this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -513,7 +514,7 @@ namespace SPZLeverkusen
this.xrLabel26.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerMonth", "{0:0.##}")});
- this.xrLabel26.Font = new System.Drawing.Font("Verdana", 10F);
+ this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(317.8334F, 117F);
this.xrLabel26.Name = "xrLabel26";
this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -527,7 +528,7 @@ namespace SPZLeverkusen
this.xrLabel29.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrLabel29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant")});
- this.xrLabel29.Font = new System.Drawing.Font("Verdana", 10F);
+ this.xrLabel29.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(317.8335F, 135F);
this.xrLabel29.Name = "xrLabel29";
this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -537,7 +538,7 @@ namespace SPZLeverkusen
//
// xrLabel10
//
- this.xrLabel10.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
+ this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(40F, 171F);
this.xrLabel10.Name = "xrLabel10";
this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -562,7 +563,7 @@ namespace SPZLeverkusen
this.xrLabel13,
this.xrLabel12,
this.xrLabel1});
- this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F);
+ this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.ReportHeader.HeightF = 200F;
this.ReportHeader.Name = "ReportHeader";
this.ReportHeader.StylePriority.UseFont = false;
@@ -570,7 +571,7 @@ namespace SPZLeverkusen
// xrLabel9
//
this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
- this.xrLabel9.Font = new System.Drawing.Font("Verdana", 10F);
+ this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Verdana", 10F);
this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(250F, 81.00001F);
this.xrLabel9.Name = "xrLabel9";
this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -581,7 +582,7 @@ namespace SPZLeverkusen
//
// xrLabel2
//
- this.xrLabel2.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold);
+ this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Verdana", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(249F, 171F);
this.xrLabel2.Name = "xrLabel2";
this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -596,6 +597,33 @@ namespace SPZLeverkusen
this.fieldGruppe.FieldType = DevExpress.XtraReports.UI.FieldType.String;
this.fieldGruppe.Name = "fieldGruppe";
//
+ // xrTableCell1
+ //
+ this.xrTableCell1.Multiline = true;
+ this.xrTableCell1.Name = "xrTableCell1";
+ this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+ this.xrTableCell1.StylePriority.UseFont = false;
+ this.xrTableCell1.StylePriority.UseTextAlignment = false;
+ this.xrTableCell1.Text = "Kurzbeschreibung des Termins";
+ this.xrTableCell1.Weight = 0.4372662794410605D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice")});
+ this.xrTableCell2.Multiline = true;
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 5, 0, 0, 100F);
+ this.xrTableCell2.StylePriority.UseFont = false;
+ this.xrTableCell2.StylePriority.UsePadding = false;
+ this.xrTableCell2.StylePriority.UseTextAlignment = false;
+ this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell2.Weight = 0.22640282525060521D;
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
+ //
// StundenzettelJugendamt
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -616,12 +644,14 @@ namespace SPZLeverkusen
this.formattingRuleServiceDesc,
this.formattingRuleCostBearer,
this.formattingRuleEmployeeName});
- this.Margins = new System.Drawing.Printing.Margins(80, 80, 50, 30);
+ this.Margins = new DevExpress.Drawing.DXMargins(81F, 80F, 50F, 30F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
this.SnapGridSize = 9F;
- this.Version = "17.1";
+ this.Version = "23.2";
+ xrWatermark1.Id = "Watermark1";
+ this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
@@ -678,6 +708,7 @@ namespace SPZLeverkusen
private DevExpress.XtraReports.UI.XRLabel xrLabel19;
private DevExpress.XtraReports.UI.XRLabel xrLabel16;
private DevExpress.XtraReports.UI.CalculatedField fieldGruppe;
-
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
}
}
diff --git a/ReportImp/SPZLeverkusen/ServicesOverviewReportJa.cs b/ReportImp/SPZLeverkusen/ServicesOverviewReportJa.cs
index d21751801..5cce20542 100644
--- a/ReportImp/SPZLeverkusen/ServicesOverviewReportJa.cs
+++ b/ReportImp/SPZLeverkusen/ServicesOverviewReportJa.cs
@@ -32,6 +32,12 @@ namespace SPZLeverkusen
{
if (s.IsBillable)
servicesBillable.Add(s);
+
+ if (s.Notice.Contains("\n"))
+ {
+ var startindex = s.Notice.IndexOf("\n");
+ s.Notice = s.Notice.Substring(0, startindex);
+ }
}
pRO.Services = servicesBillable;
diff --git a/ReportImp/SPZLeverkusen/ServicesOverviewReportJa.resx b/ReportImp/SPZLeverkusen/ServicesOverviewReportJa.resx
index 19e908bd3..d58980a38 100644
--- a/ReportImp/SPZLeverkusen/ServicesOverviewReportJa.resx
+++ b/ReportImp/SPZLeverkusen/ServicesOverviewReportJa.resx
@@ -117,7 +117,4 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 21, 17
-
\ No newline at end of file