diff --git a/ReportImp/SKMAachen/Mitarbeiterarbeitszeitkonto.designer.cs b/ReportImp/SKMAachen/Mitarbeiterarbeitszeitkonto.designer.cs
index ca3c13f16..38074af49 100644
--- a/ReportImp/SKMAachen/Mitarbeiterarbeitszeitkonto.designer.cs
+++ b/ReportImp/SKMAachen/Mitarbeiterarbeitszeitkonto.designer.cs
@@ -31,9 +31,11 @@ namespace SKMAachen
{
this.components = new System.ComponentModel.Container();
DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
- DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
+ DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
@@ -97,7 +99,6 @@ namespace SKMAachen
this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
- this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
@@ -115,6 +116,10 @@ namespace SKMAachen
this.fieldSumHoliday2 = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField();
+ this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
@@ -132,7 +137,8 @@ namespace SKMAachen
//
// Detail1
//
- this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+ new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.Detail1.HeightF = 0F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
@@ -141,13 +147,14 @@ namespace SKMAachen
//
this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableDetail.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+ new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableDetail.Name = "xrTableDetail";
this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowDetail});
- this.xrTableDetail.SizeF = new System.Drawing.SizeF(670F, 22F);
+ this.xrTableDetail.SizeF = new System.Drawing.SizeF(702F, 22F);
this.xrTableDetail.StylePriority.UseBorders = false;
this.xrTableDetail.StylePriority.UseFont = false;
this.xrTableDetail.StylePriority.UsePadding = false;
@@ -160,6 +167,7 @@ namespace SKMAachen
this.xrTableCell3,
this.xrTableCell20,
this.xrTableCell31,
+ this.xrTableCell12,
this.xrTableCell67,
this.xrTableCell27});
this.xrTableRowDetail.FormattingRules.Add(this.ruleIstFeiertagOderWE);
@@ -250,7 +258,7 @@ namespace SKMAachen
//
this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableDetail});
- this.Detail2.Font = new System.Drawing.Font("Arial", 8F);
+ this.Detail2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.Detail2.HeightF = 22F;
this.Detail2.Name = "Detail2";
this.Detail2.StylePriority.UseFont = false;
@@ -259,7 +267,7 @@ namespace SKMAachen
//
this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableHeader});
- this.GroupHeader2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.GroupHeader2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.GroupHeader2.HeightF = 30F;
this.GroupHeader2.Name = "GroupHeader2";
this.GroupHeader2.StylePriority.UseFont = false;
@@ -274,7 +282,7 @@ namespace SKMAachen
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableHeader.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRowHeader});
- this.xrTableHeader.SizeF = new System.Drawing.SizeF(670F, 30F);
+ this.xrTableHeader.SizeF = new System.Drawing.SizeF(702F, 30F);
this.xrTableHeader.StylePriority.UseBackColor = false;
this.xrTableHeader.StylePriority.UseBorders = false;
this.xrTableHeader.StylePriority.UseFont = false;
@@ -288,6 +296,7 @@ namespace SKMAachen
this.xrTableCell5,
this.xrTableCell2,
this.xrTableCell7,
+ this.xrTableCell11,
this.xrTableCell8,
this.xrTableCell10});
this.xrTableRowHeader.Name = "xrTableRowHeader";
@@ -343,7 +352,7 @@ namespace SKMAachen
this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.lblMonat,
this.xrTable2});
- this.GroupHeader3.Font = new System.Drawing.Font("Arial", 10F);
+ this.GroupHeader3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.GroupHeader3.HeightF = 120F;
this.GroupHeader3.Level = 1;
this.GroupHeader3.Name = "GroupHeader3";
@@ -354,7 +363,7 @@ namespace SKMAachen
//
this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yy}")});
- this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
+ this.lblMonat.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold);
this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.lblMonat.Multiline = true;
this.lblMonat.Name = "lblMonat";
@@ -390,7 +399,7 @@ namespace SKMAachen
//
// xrTableCell1
//
- this.xrTableCell1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell1.Name = "xrTableCell1";
this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell1.StylePriority.UseFont = false;
@@ -404,7 +413,7 @@ namespace SKMAachen
//
this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")});
- this.xrTableCell25.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTableCell25.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell25.Multiline = true;
this.xrTableCell25.Name = "xrTableCell25";
this.xrTableCell25.StylePriority.UseFont = false;
@@ -422,7 +431,7 @@ namespace SKMAachen
//
// xrTableCell6
//
- this.xrTableCell6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell6.Name = "xrTableCell6";
this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell6.StylePriority.UseFont = false;
@@ -455,7 +464,7 @@ namespace SKMAachen
//
// xrTableCell21
//
- this.xrTableCell21.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTableCell21.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell21.Name = "xrTableCell21";
this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTableCell21.StylePriority.UseFont = false;
@@ -476,7 +485,7 @@ namespace SKMAachen
//
// xrTableCell28
//
- this.xrTableCell28.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTableCell28.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableCell28.Name = "xrTableCell28";
this.xrTableCell28.StylePriority.UseFont = false;
this.xrTableCell28.StylePriority.UseTextAlignment = false;
@@ -499,7 +508,7 @@ namespace SKMAachen
this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable4,
this.xrTable1});
- this.GroupFooter2.Font = new System.Drawing.Font("Arial", 10F);
+ this.GroupFooter2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.GroupFooter2.HeightF = 116.6667F;
this.GroupFooter2.KeepTogether = true;
this.GroupFooter2.Name = "GroupFooter2";
@@ -513,7 +522,7 @@ namespace SKMAachen
this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
this.xrTableRow9});
- this.xrTable4.SizeF = new System.Drawing.SizeF(560F, 22F);
+ this.xrTable4.SizeF = new System.Drawing.SizeF(592F, 22F);
this.xrTable4.StylePriority.UseBorders = false;
this.xrTable4.StylePriority.UseFont = false;
this.xrTable4.StylePriority.UsePadding = false;
@@ -525,6 +534,7 @@ namespace SKMAachen
this.xrTableRow9.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
this.xrTableCell64,
this.cellSumMinutesTotalDecimal,
+ this.xrTableCell13,
this.cellSumHoursSickDecimal,
this.cellSumHoursInVacationDecimal});
this.xrTableRow9.Name = "xrTableRow9";
@@ -532,13 +542,14 @@ namespace SKMAachen
//
// xrTableCell64
//
- this.xrTableCell64.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableCell64.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+ new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTableCell64.Name = "xrTableCell64";
this.xrTableCell64.StylePriority.UseFont = false;
this.xrTableCell64.StylePriority.UseTextAlignment = false;
this.xrTableCell64.Text = "Summe:";
this.xrTableCell64.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.xrTableCell64.Weight = 0.26149405118689462D;
+ this.xrTableCell64.Weight = 0.23396837064015227D;
//
// cellSumMinutesTotalDecimal
//
@@ -552,7 +563,7 @@ namespace SKMAachen
this.cellSumMinutesTotalDecimal.Summary = xrSummary1;
this.cellSumMinutesTotalDecimal.Text = "cellSumMinutesTotalDecimal";
this.cellSumMinutesTotalDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.cellSumMinutesTotalDecimal.Weight = 0.081153321921416444D;
+ this.cellSumMinutesTotalDecimal.Weight = 0.074960080947443525D;
//
// cellSumHoursSickDecimal
//
@@ -561,13 +572,13 @@ namespace SKMAachen
this.cellSumHoursSickDecimal.Multiline = true;
this.cellSumHoursSickDecimal.Name = "cellSumHoursSickDecimal";
this.cellSumHoursSickDecimal.StylePriority.UseTextAlignment = false;
- xrSummary2.FormatString = "{0:0.00}";
- xrSummary2.IgnoreNullValues = true;
- xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
- this.cellSumHoursSickDecimal.Summary = xrSummary2;
+ xrSummary3.FormatString = "{0:0.00}";
+ xrSummary3.IgnoreNullValues = true;
+ xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.cellSumHoursSickDecimal.Summary = xrSummary3;
this.cellSumHoursSickDecimal.Text = "cellSumHoursSickDecimal";
this.cellSumHoursSickDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.cellSumHoursSickDecimal.Weight = 0.081153328404945282D;
+ this.cellSumHoursSickDecimal.Weight = 0.074960087430972364D;
//
// cellSumHoursInVacationDecimal
//
@@ -577,20 +588,20 @@ namespace SKMAachen
this.cellSumHoursInVacationDecimal.Name = "cellSumHoursInVacationDecimal";
this.cellSumHoursInVacationDecimal.StylePriority.UseBackColor = false;
this.cellSumHoursInVacationDecimal.StylePriority.UseTextAlignment = false;
- xrSummary3.FormatString = "{0:0.00}";
- xrSummary3.IgnoreNullValues = true;
- xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
- this.cellSumHoursInVacationDecimal.Summary = xrSummary3;
+ xrSummary4.FormatString = "{0:0.00}";
+ xrSummary4.IgnoreNullValues = true;
+ xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.cellSumHoursInVacationDecimal.Summary = xrSummary4;
this.cellSumHoursInVacationDecimal.Text = "cellSumHoursInVacationDecimal";
this.cellSumHoursInVacationDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
- this.cellSumHoursInVacationDecimal.Weight = 0.081153321723263658D;
+ this.cellSumHoursInVacationDecimal.Weight = 0.074959998195859384D;
//
// xrTable1
//
this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 36.66667F);
+ this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 36.66668F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -598,7 +609,7 @@ namespace SKMAachen
this.xrTableRow2,
this.xrTableRow5,
this.xrTableRow6});
- this.xrTable1.SizeF = new System.Drawing.SizeF(669.9999F, 80F);
+ this.xrTable1.SizeF = new System.Drawing.SizeF(700.0001F, 80F);
this.xrTable1.StylePriority.UseBorders = false;
this.xrTable1.StylePriority.UseFont = false;
this.xrTable1.StylePriority.UsePadding = false;
@@ -784,7 +795,7 @@ namespace SKMAachen
this.xrTableCell57,
this.xrTableCell58,
this.xrTableCell26});
- this.xrTableRow6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.xrTableRow6.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableRow6.Name = "xrTableRow6";
this.xrTableRow6.StylePriority.UseFont = false;
this.xrTableRow6.Weight = 0.8D;
@@ -792,7 +803,7 @@ namespace SKMAachen
// xrTableCell48
//
this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableCell48.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell48.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell48.Name = "xrTableCell48";
this.xrTableCell48.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F);
this.xrTableCell48.StylePriority.UseBorders = false;
@@ -808,14 +819,14 @@ namespace SKMAachen
this.xrTableCell57.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
this.xrTableCell57.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldHours")});
- this.xrTableCell57.Font = new System.Drawing.Font("Arial", 10F);
+ this.xrTableCell57.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
this.xrTableCell57.Name = "xrTableCell57";
this.xrTableCell57.StylePriority.UseBorders = false;
this.xrTableCell57.StylePriority.UseFont = false;
this.xrTableCell57.StylePriority.UseTextAlignment = false;
- xrSummary4.FormatString = "{0:0.00}";
- xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
- this.xrTableCell57.Summary = xrSummary4;
+ xrSummary5.FormatString = "{0:0.00}";
+ xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell57.Summary = xrSummary5;
this.xrTableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell57.Weight = 0.089936204907626063D;
//
@@ -844,17 +855,13 @@ namespace SKMAachen
this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
this.xrTableCell26.Weight = 0.11143081848591821D;
//
- // bindingSource1
- //
- this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
- //
// Title
//
this.Title.BackColor = System.Drawing.Color.White;
this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.Title.BorderWidth = 1F;
- this.Title.Font = new System.Drawing.Font("Times New Roman", 24F);
+ this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F);
this.Title.ForeColor = System.Drawing.Color.Black;
this.Title.Name = "Title";
//
@@ -864,7 +871,7 @@ namespace SKMAachen
this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.FieldCaption.BorderWidth = 1F;
- this.FieldCaption.Font = new System.Drawing.Font("Times New Roman", 10F, System.Drawing.FontStyle.Bold);
+ this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.FieldCaption.ForeColor = System.Drawing.Color.Black;
this.FieldCaption.Name = "FieldCaption";
//
@@ -874,7 +881,7 @@ namespace SKMAachen
this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.PageInfo.BorderWidth = 1F;
- this.PageInfo.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.PageInfo.ForeColor = System.Drawing.Color.Black;
this.PageInfo.Name = "PageInfo";
//
@@ -884,7 +891,7 @@ namespace SKMAachen
this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
this.DataField.BorderWidth = 1F;
- this.DataField.Font = new System.Drawing.Font("Times New Roman", 8F);
+ this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
this.DataField.Name = "DataField";
//
@@ -977,6 +984,42 @@ namespace SKMAachen
this.fieldUeberstundenGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldUeberstundenGesamt.Name = "fieldUeberstundenGesamt";
//
+ // xrTableCell11
+ //
+ this.xrTableCell11.Multiline = true;
+ this.xrTableCell11.Name = "xrTableCell11";
+ this.xrTableCell11.StylePriority.UseTextAlignment = false;
+ this.xrTableCell11.Text = "Pause (Min)";
+ this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ this.xrTableCell11.Weight = 0.081154194025935031D;
+ //
+ // xrTableCell12
+ //
+ this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.PauseInMinuten")});
+ this.xrTableCell12.Multiline = true;
+ this.xrTableCell12.Name = "xrTableCell12";
+ this.xrTableCell12.StylePriority.UseTextAlignment = false;
+ this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell12.Weight = 0.08115419554645896D;
+ //
+ // xrTableCell13
+ //
+ this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.PauseInMinuten")});
+ this.xrTableCell13.Multiline = true;
+ this.xrTableCell13.Name = "xrTableCell13";
+ this.xrTableCell13.StylePriority.UseTextAlignment = false;
+ xrSummary2.FormatString = "{0:0}";
+ xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+ this.xrTableCell13.Summary = xrSummary2;
+ this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+ this.xrTableCell13.Weight = 0.074960080947443525D;
+ //
+ // bindingSource1
+ //
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
+ //
// Mitarbeiterarbeitszeitkonto
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -998,10 +1041,10 @@ namespace SKMAachen
this.fieldUeberstundenGesamt});
this.DataSource = this.bindingSource1;
this.DisplayName = "Mitarbeiterstundenkonto";
- this.Font = new System.Drawing.Font("Arial", 8F);
+ this.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
this.ruleIstFeiertagOderWE});
- this.Margins = new System.Drawing.Printing.Margins(75, 50, 50, 50);
+ this.Margins = new DevExpress.Drawing.DXMargins(75F, 50F, 50F, 50F);
this.PageHeight = 1169;
this.PageWidth = 827;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -1010,7 +1053,9 @@ namespace SKMAachen
this.FieldCaption,
this.PageInfo,
this.DataField});
- this.Version = "17.1";
+ this.Version = "23.2";
+ xrWatermark1.Id = "Watermark1";
+ this.Watermarks.Add(xrWatermark1);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
@@ -1104,5 +1149,8 @@ namespace SKMAachen
private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell19;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+ private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
}
}
diff --git a/ReportImp/SKMAachen/Mitarbeiterarbeitszeitkonto.resx b/ReportImp/SKMAachen/Mitarbeiterarbeitszeitkonto.resx
index d25f3eba2..d58980a38 100644
--- a/ReportImp/SKMAachen/Mitarbeiterarbeitszeitkonto.resx
+++ b/ReportImp/SKMAachen/Mitarbeiterarbeitszeitkonto.resx
@@ -117,7 +117,4 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 17, 17
-
\ No newline at end of file