diff --git a/ReportImp/AssistenzaReports/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/AssistenzaReports/CustomMitarbeiterstundenkontoBerechnung.cs
index 9c1d15c5c..3eda475de 100644
--- a/ReportImp/AssistenzaReports/CustomMitarbeiterstundenkontoBerechnung.cs
+++ b/ReportImp/AssistenzaReports/CustomMitarbeiterstundenkontoBerechnung.cs
@@ -18,17 +18,23 @@ namespace AssistenzaReports
foreach (var emp in ro.EmployeeDetailList)
{
var konto = vs.BerechneUrlaubskontoZurDarstellung(MapperFactory.EmployeeDC_Employee.MapToNewDC(emp.Employee), ro.ReportStartDate.Year);
-
- for (int i = 0; i < konto.Count; i++)
+ if (konto != null && konto.Count > 0)
{
- var entry = konto[i];
+ emp.Custom1 = Convert.ToDecimal(konto[0].AnzahlTage);
- if (konto != null && entry.DatumZurSortierung != null)
+ for (int i = 0; i < konto.Count; i++)
{
- if (i + 1 < konto.Count)
+ var entry = konto[i];
+
+ if (entry.DatumZurSortierung != null)
{
- if (konto[i + 1].DatumZurSortierung > ro.ReportEndDate)
- emp.Custom1 = Convert.ToDecimal(entry.AnzahlTage);
+ //if (i + 1 < konto.Count)
+ //{
+ if (konto[i].DatumZurSortierung > ro.ReportEndDate.AddTicks(-1))
+ break;
+ //}
+
+ emp.Custom1 += Convert.ToDecimal(entry.AnzahlTage); // += weil Tage immer negativ sind
}
}
}
diff --git a/ReportImp/AssistenzaReports/CustomMitarbeiterstundenkontoBerechnungMonate.cs b/ReportImp/AssistenzaReports/CustomMitarbeiterstundenkontoBerechnungMonate.cs
index adca8a257..4300f00a7 100644
--- a/ReportImp/AssistenzaReports/CustomMitarbeiterstundenkontoBerechnungMonate.cs
+++ b/ReportImp/AssistenzaReports/CustomMitarbeiterstundenkontoBerechnungMonate.cs
@@ -11,6 +11,6 @@ namespace AssistenzaReports
{
public class CustomMitarbeiterstundenkontoBerechnungMonate : MitarbeiterstundenkontoBerechnungMonate
{
-
+
}
}
diff --git a/ReportImp/AssistenzaReports/Mitarbeiterarbeitszeitkonto.cs b/ReportImp/AssistenzaReports/Mitarbeiterarbeitszeitkonto.cs
index 9656795fa..62f08e6d1 100644
--- a/ReportImp/AssistenzaReports/Mitarbeiterarbeitszeitkonto.cs
+++ b/ReportImp/AssistenzaReports/Mitarbeiterarbeitszeitkonto.cs
@@ -40,18 +40,20 @@ namespace AssistenzaReports
}
ed.UrlaubUndKrankheit = 0;
- foreach (var day in ed.Days)
+ if (ed.Days != null)
{
- if (day.HoursOtherAbsenceTimes > 0)
- {
- //CB: In der Standard Berechnungsklasse wurden die anderen Abwesenheiten auch auf die MinutesTotal addiert, daher hier wieder abziehen
- //Ich traue mich nicht, das in der Berechnungsklasse zu ändern, weil es dann bestimmt wieder zu Fehlern in angepassten Konten führt.
- day.MinutesTotal -= day.HoursOtherAbsenceTimes * 60;
+ foreach (var day in ed.Days)
+ {
+ if (day.HoursOtherAbsenceTimes > 0)
+ {
+ //CB: In der Standard Berechnungsklasse wurden die anderen Abwesenheiten auch auf die MinutesTotal addiert, daher hier wieder abziehen
+ //Ich traue mich nicht, das in der Berechnungsklasse zu ändern, weil es dann bestimmt wieder zu Fehlern in angepassten Konten führt.
+ day.MinutesTotal -= day.HoursOtherAbsenceTimes * 60;
+ }
+
+ ed.UrlaubUndKrankheit += (day.HoursSick + day.HoursInVacation + day.HoursOtherAbsenceTimes);
}
-
- ed.UrlaubUndKrankheit += (day.HoursSick + day.HoursInVacation + day.HoursOtherAbsenceTimes);
}
-
}
this.bindingSource1.DataSource = pRO;
}
diff --git a/ReportImp/AssistenzaReports/Mitarbeiterarbeitszeitkonto.designer.cs b/ReportImp/AssistenzaReports/Mitarbeiterarbeitszeitkonto.designer.cs
index e1d8aacdc..074c571f4 100644
--- a/ReportImp/AssistenzaReports/Mitarbeiterarbeitszeitkonto.designer.cs
+++ b/ReportImp/AssistenzaReports/Mitarbeiterarbeitszeitkonto.designer.cs
@@ -73,6 +73,9 @@ namespace AssistenzaReports
this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -102,7 +105,6 @@ namespace AssistenzaReports
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();
@@ -121,9 +123,7 @@ namespace AssistenzaReports
this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField();
this.fieldTatsSoll = new DevExpress.XtraReports.UI.CalculatedField();
- this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell22 = 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();
@@ -529,6 +529,36 @@ namespace AssistenzaReports
this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell23.Weight = 0.11263223681788141D;
//
+ // xrTableRow3
+ //
+ this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell14,
+ this.xrTableCell22});
+ this.xrTableRow3.Name = "xrTableRow3";
+ this.xrTableRow3.Weight = 0.75540991165010141D;
+ //
+ // xrTableCell14
+ //
+ this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+ this.xrTableCell14.Multiline = true;
+ this.xrTableCell14.Name = "xrTableCell14";
+ this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrTableCell14.StylePriority.UseFont = false;
+ this.xrTableCell14.StylePriority.UsePadding = false;
+ this.xrTableCell14.StylePriority.UseTextAlignment = false;
+ this.xrTableCell14.Text = "Resturlaub:";
+ this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell14.Weight = 0.138246012405208D;
+ //
+ // xrTableCell22
+ //
+ this.xrTableCell22.Multiline = true;
+ this.xrTableCell22.Name = "xrTableCell22";
+ this.xrTableCell22.StylePriority.UseTextAlignment = false;
+ this.xrTableCell22.Text = "[EmployeeDetailList.Custom1!0.0] Tage";
+ this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell22.Weight = 0.49791629021026573D;
+ //
// GroupFooter2
//
this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -895,10 +925,6 @@ namespace AssistenzaReports
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;
@@ -1035,33 +1061,9 @@ namespace AssistenzaReports
this.fieldTatsSoll.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldTatsSoll.Name = "fieldTatsSoll";
//
- // xrTableRow3
+ // bindingSource1
//
- this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell14,
- this.xrTableCell22});
- this.xrTableRow3.Name = "xrTableRow3";
- this.xrTableRow3.Weight = 0.75540991165010141D;
- //
- // xrTableCell14
- //
- this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
- this.xrTableCell14.Multiline = true;
- this.xrTableCell14.Name = "xrTableCell14";
- this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
- this.xrTableCell14.StylePriority.UseFont = false;
- this.xrTableCell14.StylePriority.UsePadding = false;
- this.xrTableCell14.StylePriority.UseTextAlignment = false;
- this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell14.Weight = 0.138246012405208D;
- //
- // xrTableCell22
- //
- this.xrTableCell22.Multiline = true;
- this.xrTableCell22.Name = "xrTableCell22";
- this.xrTableCell22.StylePriority.UseTextAlignment = false;
- this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell22.Weight = 0.49791629021026573D;
+ this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
// Mitarbeiterarbeitszeitkonto
//
diff --git a/ReportImp/AssistenzaReports/Mitarbeiterstundenkonto.designer.cs b/ReportImp/AssistenzaReports/Mitarbeiterstundenkonto.designer.cs
index b13662ea1..21165b35c 100644
--- a/ReportImp/AssistenzaReports/Mitarbeiterstundenkonto.designer.cs
+++ b/ReportImp/AssistenzaReports/Mitarbeiterstundenkonto.designer.cs
@@ -30,20 +30,54 @@ namespace AssistenzaReports
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.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+ this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+ this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
+ this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
+ this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell();
this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
+ this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
this.lblMonat = new DevExpress.XtraReports.UI.XRLabel();
this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
@@ -56,44 +90,13 @@ namespace AssistenzaReports
this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+ this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
- this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable();
- this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
- this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
- this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
//
// Detail
@@ -107,11 +110,149 @@ namespace AssistenzaReports
//
this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableDetail});
- 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 = 25F;
this.Detail1.Name = "Detail1";
this.Detail1.StylePriority.UseFont = false;
//
+ // xrTableDetail
+ //
+ this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 8F, 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(1005F, 25F);
+ this.xrTableDetail.StylePriority.UseBorders = false;
+ this.xrTableDetail.StylePriority.UseFont = false;
+ this.xrTableDetail.StylePriority.UsePadding = false;
+ this.xrTableDetail.StylePriority.UseTextAlignment = false;
+ this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrTableRowDetail
+ //
+ this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell3,
+ this.xrTableCell19,
+ this.xrTableCell20,
+ this.xrTableCell28,
+ this.xrTableCell16,
+ this.xrTableCell27,
+ this.xrTableCell22,
+ this.xrTableCell23,
+ this.xrTableCell21,
+ this.xrTableCell25,
+ this.xrTableCell24,
+ this.xrTableCell26});
+ this.xrTableRowDetail.Name = "xrTableRowDetail";
+ this.xrTableRowDetail.Weight = 1D;
+ //
+ // xrTableCell3
+ //
+ this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")});
+ this.xrTableCell3.Name = "xrTableCell3";
+ this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+ this.xrTableCell3.StylePriority.UseFont = false;
+ this.xrTableCell3.StylePriority.UsePadding = false;
+ this.xrTableCell3.StylePriority.UseTextAlignment = false;
+ this.xrTableCell3.Text = "xrTableCell3";
+ this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell3.Weight = 0.15329125338142471D;
+ //
+ // xrTableCell19
+ //
+ this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")});
+ this.xrTableCell19.Name = "xrTableCell19";
+ this.xrTableCell19.Text = "xrTableCell19";
+ this.xrTableCell19.Weight = 0.081154151689479551D;
+ //
+ // xrTableCell20
+ //
+ this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")});
+ this.xrTableCell20.Name = "xrTableCell20";
+ this.xrTableCell20.Text = "xrTableCell20";
+ this.xrTableCell20.Weight = 0.094679933071566441D;
+ //
+ // xrTableCell28
+ //
+ this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
+ this.xrTableCell28.Name = "xrTableCell28";
+ this.xrTableCell28.Text = "xrTableCell28";
+ this.xrTableCell28.Weight = 0.0721370604147881D;
+ //
+ // xrTableCell16
+ //
+ this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsSoll", "{0:0.00}")});
+ this.xrTableCell16.Name = "xrTableCell16";
+ this.xrTableCell16.Text = "xrTableCell16";
+ this.xrTableCell16.Weight = 0.063119927862939587D;
+ //
+ // xrTableCell27
+ //
+ this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst", "{0:0.00}")});
+ this.xrTableCell27.Name = "xrTableCell27";
+ this.xrTableCell27.Text = "xrTableCell27";
+ this.xrTableCell27.Weight = 0.063119927862939615D;
+ //
+ // xrTableCell22
+ //
+ this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsDiff", "{0:0.00}")});
+ this.xrTableCell22.Name = "xrTableCell22";
+ this.xrTableCell22.Text = "xrTableCell22";
+ this.xrTableCell22.Weight = 0.063119927862939587D;
+ //
+ // xrTableCell23
+ //
+ this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")});
+ this.xrTableCell23.Name = "xrTableCell23";
+ this.xrTableCell23.Text = "xrTableCell23";
+ this.xrTableCell23.Weight = 0.063119927862939559D;
+ //
+ // xrTableCell21
+ //
+ this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.RelationFlsZuMittelbar", "{0:0.00}")});
+ this.xrTableCell21.Name = "xrTableCell21";
+ this.xrTableCell21.Text = "xrTableCell21";
+ this.xrTableCell21.Weight = 0.063119927862939615D;
+ //
+ // xrTableCell25
+ //
+ this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
+ this.xrTableCell25.Name = "xrTableCell25";
+ this.xrTableCell25.Text = "xrTableCell25";
+ this.xrTableCell25.Weight = 0.063119927862939587D;
+ //
+ // xrTableCell24
+ //
+ this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
+ this.xrTableCell24.Name = "xrTableCell24";
+ this.xrTableCell24.Text = "xrTableCell24";
+ this.xrTableCell24.Weight = 0.0631199278629396D;
+ //
+ // xrTableCell26
+ //
+ this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+ new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
+ this.xrTableCell26.Name = "xrTableCell26";
+ this.xrTableCell26.Text = "xrTableCell26";
+ this.xrTableCell26.Weight = 0.063119927862939573D;
+ //
// DetailReport
//
this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -126,23 +267,143 @@ namespace AssistenzaReports
// GroupHeader1
//
this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel2,
+ this.xrLabel1,
this.xrTableHeader});
- this.GroupHeader1.HeightF = 70F;
+ this.GroupHeader1.HeightF = 90.20834F;
this.GroupHeader1.Name = "GroupHeader1";
this.GroupHeader1.RepeatEveryPage = true;
//
+ // xrTableHeader
+ //
+ this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
+ | DevExpress.XtraPrinting.BorderSide.Right)
+ | DevExpress.XtraPrinting.BorderSide.Bottom)));
+ this.xrTableHeader.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold);
+ this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 34.79166F);
+ this.xrTableHeader.Name = "xrTableHeader";
+ 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(1005F, 55.41668F);
+ this.xrTableHeader.StylePriority.UseBorders = false;
+ this.xrTableHeader.StylePriority.UseFont = false;
+ this.xrTableHeader.StylePriority.UsePadding = false;
+ this.xrTableHeader.StylePriority.UseTextAlignment = false;
+ this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+ //
+ // xrTableRowHeader
+ //
+ this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+ this.xrTableCell5,
+ this.xrTableCell4,
+ this.xrTableCell2,
+ this.xrTableCell9,
+ this.xrTableCell8,
+ this.xrTableCell10,
+ this.xrTableCell7,
+ this.xrTableCell11,
+ this.xrTableCell12,
+ this.xrTableCell13,
+ this.xrTableCell14,
+ this.xrTableCell15});
+ this.xrTableRowHeader.Name = "xrTableRowHeader";
+ this.xrTableRowHeader.Weight = 2.8D;
+ //
+ // xrTableCell5
+ //
+ this.xrTableCell5.Name = "xrTableCell5";
+ this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
+ this.xrTableCell5.StylePriority.UsePadding = false;
+ this.xrTableCell5.StylePriority.UseTextAlignment = false;
+ this.xrTableCell5.Text = "Name";
+ this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+ this.xrTableCell5.Weight = 0.15329125016467182D;
+ //
+ // xrTableCell4
+ //
+ this.xrTableCell4.Name = "xrTableCell4";
+ this.xrTableCell4.Text = "Reguläre SOLL Stunden";
+ this.xrTableCell4.Weight = 0.081154192324637608D;
+ //
+ // xrTableCell2
+ //
+ this.xrTableCell2.Name = "xrTableCell2";
+ this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)";
+ this.xrTableCell2.Weight = 0.094679896646570338D;
+ //
+ // xrTableCell9
+ //
+ this.xrTableCell9.Multiline = true;
+ this.xrTableCell9.Name = "xrTableCell9";
+ this.xrTableCell9.Text = "Tatsächliche SOLL Stunden";
+ this.xrTableCell9.Weight = 0.072137063712635591D;
+ //
+ // xrTableCell8
+ //
+ this.xrTableCell8.Name = "xrTableCell8";
+ this.xrTableCell8.Text = "FLS Stunden SOLL";
+ this.xrTableCell8.Weight = 0.063119927721024038D;
+ //
+ // xrTableCell10
+ //
+ this.xrTableCell10.Name = "xrTableCell10";
+ this.xrTableCell10.StylePriority.UseBackColor = false;
+ this.xrTableCell10.Text = "FLS IST lfd. Monat";
+ this.xrTableCell10.Weight = 0.063119927721024D;
+ //
+ // xrTableCell7
+ //
+ this.xrTableCell7.Name = "xrTableCell7";
+ this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat";
+ this.xrTableCell7.Weight = 0.06311992757910842D;
+ //
+ // xrTableCell11
+ //
+ this.xrTableCell11.Multiline = true;
+ this.xrTableCell11.Name = "xrTableCell11";
+ this.xrTableCell11.StylePriority.UseBackColor = false;
+ this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat";
+ this.xrTableCell11.Weight = 0.063119927721024011D;
+ //
+ // xrTableCell12
+ //
+ this.xrTableCell12.Name = "xrTableCell12";
+ this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)";
+ this.xrTableCell12.Weight = 0.063119929511863376D;
+ //
+ // xrTableCell13
+ //
+ this.xrTableCell13.Name = "xrTableCell13";
+ this.xrTableCell13.Text = "Überstd. neu";
+ this.xrTableCell13.Weight = 0.063119928687401447D;
+ //
+ // xrTableCell14
+ //
+ this.xrTableCell14.Name = "xrTableCell14";
+ this.xrTableCell14.StylePriority.UseBackColor = false;
+ this.xrTableCell14.Text = "Überstd. Vormonat";
+ this.xrTableCell14.Weight = 0.063119928275170531D;
+ //
+ // xrTableCell15
+ //
+ this.xrTableCell15.Name = "xrTableCell15";
+ this.xrTableCell15.Text = "Überstd. Gesamt";
+ this.xrTableCell15.Weight = 0.0631199213956443D;
+ //
// GroupFooter1
//
this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTable1});
- this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold);
+ this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
this.GroupFooter1.HeightF = 48.95833F;
this.GroupFooter1.Name = "GroupFooter1";
this.GroupFooter1.StylePriority.UseFont = false;
//
// xrTable1
//
- this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+ new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -184,6 +445,16 @@ namespace AssistenzaReports
this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
this.xrTableCell35.Weight = 0.15329126714047708D;
//
+ // xrTableCell37
+ //
+ this.xrTableCell37.Name = "xrTableCell37";
+ this.xrTableCell37.Weight = 0.081154151689479551D;
+ //
+ // xrTableCell39
+ //
+ this.xrTableCell39.Name = "xrTableCell39";
+ this.xrTableCell39.Weight = 0.094679919312514085D;
+ //
// cellSollGesamt
//
this.cellSollGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
@@ -232,6 +503,21 @@ namespace AssistenzaReports
this.cellRelationGesamt.Text = "cellRelationGesamt";
this.cellRelationGesamt.Weight = 0.0631199278629396D;
//
+ // xrTableCell47
+ //
+ this.xrTableCell47.Name = "xrTableCell47";
+ this.xrTableCell47.Weight = 0.063119927862939587D;
+ //
+ // xrTableCell48
+ //
+ this.xrTableCell48.Name = "xrTableCell48";
+ this.xrTableCell48.Weight = 0.063119927862939587D;
+ //
+ // xrTableCell51
+ //
+ this.xrTableCell51.Name = "xrTableCell51";
+ this.xrTableCell51.Weight = 0.063119927862939573D;
+ //
// ReportHeader
//
this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -243,7 +529,7 @@ namespace AssistenzaReports
//
this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yyyy}")});
- 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";
@@ -261,18 +547,18 @@ namespace AssistenzaReports
//
// xrPageInfo2
//
- this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
- this.xrPageInfo2.Format = "Seite {0} von {1}";
+ this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(864.9999F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(139.9999F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
//
// xrPageInfo1
//
- this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
this.xrPageInfo1.Name = "xrPageInfo1";
this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
@@ -286,7 +572,7 @@ namespace AssistenzaReports
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";
//
@@ -296,7 +582,7 @@ namespace AssistenzaReports
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";
//
@@ -306,7 +592,7 @@ namespace AssistenzaReports
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";
//
@@ -316,7 +602,7 @@ namespace AssistenzaReports
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";
//
@@ -337,288 +623,33 @@ namespace AssistenzaReports
this.bottomMarginBand1.HeightF = 30F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
+ // xrLabel1
+ //
+ this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+ this.xrLabel1.Multiline = true;
+ this.xrLabel1.Name = "xrLabel1";
+ this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel1.SizeF = new System.Drawing.SizeF(82.29166F, 23F);
+ this.xrLabel1.StylePriority.UseFont = false;
+ this.xrLabel1.Text = "Resturlaub:";
+ //
+ // xrLabel2
+ //
+ this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(82.29166F, 0F);
+ this.xrLabel2.Multiline = true;
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(105.2083F, 23F);
+ this.xrLabel2.StylePriority.UseFont = false;
+ this.xrLabel2.Text = "[Custom1!0.0] Tage";
+ this.xrLabel2.TextFormatString = "{0:0.0}";
+ //
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO);
//
- // xrTableCell37
- //
- this.xrTableCell37.Name = "xrTableCell37";
- this.xrTableCell37.Weight = 0.081154151689479551D;
- //
- // xrTableCell39
- //
- this.xrTableCell39.Name = "xrTableCell39";
- this.xrTableCell39.Weight = 0.094679919312514085D;
- //
- // xrTableCell48
- //
- this.xrTableCell48.Name = "xrTableCell48";
- this.xrTableCell48.Weight = 0.063119927862939587D;
- //
- // xrTableCell51
- //
- this.xrTableCell51.Name = "xrTableCell51";
- this.xrTableCell51.Weight = 0.063119927862939573D;
- //
- // xrTableCell47
- //
- this.xrTableCell47.Name = "xrTableCell47";
- this.xrTableCell47.Weight = 0.063119927862939587D;
- //
- // xrTableCell15
- //
- this.xrTableCell15.Name = "xrTableCell15";
- this.xrTableCell15.Text = "Überstd. Gesamt";
- this.xrTableCell15.Weight = 0.0631199213956443D;
- //
- // xrTableCell14
- //
- this.xrTableCell14.Name = "xrTableCell14";
- this.xrTableCell14.StylePriority.UseBackColor = false;
- this.xrTableCell14.Text = "Überstd. Vormonat";
- this.xrTableCell14.Weight = 0.063119928275170531D;
- //
- // xrTableCell13
- //
- this.xrTableCell13.Name = "xrTableCell13";
- this.xrTableCell13.Text = "Überstd. neu";
- this.xrTableCell13.Weight = 0.063119928687401447D;
- //
- // xrTableCell12
- //
- this.xrTableCell12.Name = "xrTableCell12";
- this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)";
- this.xrTableCell12.Weight = 0.063119929511863376D;
- //
- // xrTableCell11
- //
- this.xrTableCell11.Multiline = true;
- this.xrTableCell11.Name = "xrTableCell11";
- this.xrTableCell11.StylePriority.UseBackColor = false;
- this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat";
- this.xrTableCell11.Weight = 0.063119927721024011D;
- //
- // xrTableCell7
- //
- this.xrTableCell7.Name = "xrTableCell7";
- this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat";
- this.xrTableCell7.Weight = 0.06311992757910842D;
- //
- // xrTableCell10
- //
- this.xrTableCell10.Name = "xrTableCell10";
- this.xrTableCell10.StylePriority.UseBackColor = false;
- this.xrTableCell10.Text = "FLS IST lfd. Monat";
- this.xrTableCell10.Weight = 0.063119927721024D;
- //
- // xrTableCell8
- //
- this.xrTableCell8.Name = "xrTableCell8";
- this.xrTableCell8.Text = "FLS Stunden SOLL";
- this.xrTableCell8.Weight = 0.063119927721024038D;
- //
- // xrTableCell9
- //
- this.xrTableCell9.Multiline = true;
- this.xrTableCell9.Name = "xrTableCell9";
- this.xrTableCell9.Text = "Tatsächliche SOLL Stunden";
- this.xrTableCell9.Weight = 0.072137063712635591D;
- //
- // xrTableCell2
- //
- this.xrTableCell2.Name = "xrTableCell2";
- this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)";
- this.xrTableCell2.Weight = 0.094679896646570338D;
- //
- // xrTableCell4
- //
- this.xrTableCell4.Name = "xrTableCell4";
- this.xrTableCell4.Text = "Reguläre SOLL Stunden";
- this.xrTableCell4.Weight = 0.081154192324637608D;
- //
- // xrTableCell5
- //
- this.xrTableCell5.Name = "xrTableCell5";
- this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
- this.xrTableCell5.StylePriority.UsePadding = false;
- this.xrTableCell5.StylePriority.UseTextAlignment = false;
- this.xrTableCell5.Text = "Name";
- this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell5.Weight = 0.15329125016467182D;
- //
- // xrTableRowHeader
- //
- this.xrTableRowHeader.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell5,
- this.xrTableCell4,
- this.xrTableCell2,
- this.xrTableCell9,
- this.xrTableCell8,
- this.xrTableCell10,
- this.xrTableCell7,
- this.xrTableCell11,
- this.xrTableCell12,
- this.xrTableCell13,
- this.xrTableCell14,
- this.xrTableCell15});
- this.xrTableRowHeader.Name = "xrTableRowHeader";
- this.xrTableRowHeader.Weight = 2.8D;
- //
- // xrTableHeader
- //
- this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
- | DevExpress.XtraPrinting.BorderSide.Right)
- | DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
- this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
- this.xrTableHeader.Name = "xrTableHeader";
- 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(1005F, 70F);
- this.xrTableHeader.StylePriority.UseBorders = false;
- this.xrTableHeader.StylePriority.UseFont = false;
- this.xrTableHeader.StylePriority.UsePadding = false;
- this.xrTableHeader.StylePriority.UseTextAlignment = false;
- this.xrTableHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
- // xrTableCell26
- //
- this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")});
- this.xrTableCell26.Name = "xrTableCell26";
- this.xrTableCell26.Text = "xrTableCell26";
- this.xrTableCell26.Weight = 0.063119927862939573D;
- //
- // xrTableCell24
- //
- this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")});
- this.xrTableCell24.Name = "xrTableCell24";
- this.xrTableCell24.Text = "xrTableCell24";
- this.xrTableCell24.Weight = 0.0631199278629396D;
- //
- // xrTableCell25
- //
- this.xrTableCell25.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")});
- this.xrTableCell25.Name = "xrTableCell25";
- this.xrTableCell25.Text = "xrTableCell25";
- this.xrTableCell25.Weight = 0.063119927862939587D;
- //
- // xrTableCell21
- //
- this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.RelationFlsZuMittelbar", "{0:0.00}")});
- this.xrTableCell21.Name = "xrTableCell21";
- this.xrTableCell21.Text = "xrTableCell21";
- this.xrTableCell21.Weight = 0.063119927862939615D;
- //
- // xrTableCell23
- //
- this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")});
- this.xrTableCell23.Name = "xrTableCell23";
- this.xrTableCell23.Text = "xrTableCell23";
- this.xrTableCell23.Weight = 0.063119927862939559D;
- //
- // xrTableCell22
- //
- this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsDiff", "{0:0.00}")});
- this.xrTableCell22.Name = "xrTableCell22";
- this.xrTableCell22.Text = "xrTableCell22";
- this.xrTableCell22.Weight = 0.063119927862939587D;
- //
- // xrTableCell27
- //
- this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst", "{0:0.00}")});
- this.xrTableCell27.Name = "xrTableCell27";
- this.xrTableCell27.Text = "xrTableCell27";
- this.xrTableCell27.Weight = 0.063119927862939615D;
- //
- // xrTableCell16
- //
- this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsSoll", "{0:0.00}")});
- this.xrTableCell16.Name = "xrTableCell16";
- this.xrTableCell16.Text = "xrTableCell16";
- this.xrTableCell16.Weight = 0.063119927862939587D;
- //
- // xrTableCell28
- //
- this.xrTableCell28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")});
- this.xrTableCell28.Name = "xrTableCell28";
- this.xrTableCell28.Text = "xrTableCell28";
- this.xrTableCell28.Weight = 0.0721370604147881D;
- //
- // xrTableCell20
- //
- this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")});
- this.xrTableCell20.Name = "xrTableCell20";
- this.xrTableCell20.Text = "xrTableCell20";
- this.xrTableCell20.Weight = 0.094679933071566441D;
- //
- // xrTableCell19
- //
- this.xrTableCell19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")});
- this.xrTableCell19.Name = "xrTableCell19";
- this.xrTableCell19.Text = "xrTableCell19";
- this.xrTableCell19.Weight = 0.081154151689479551D;
- //
- // xrTableCell3
- //
- this.xrTableCell3.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
- new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")});
- this.xrTableCell3.Name = "xrTableCell3";
- this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F);
- this.xrTableCell3.StylePriority.UseFont = false;
- this.xrTableCell3.StylePriority.UsePadding = false;
- this.xrTableCell3.StylePriority.UseTextAlignment = false;
- this.xrTableCell3.Text = "xrTableCell3";
- this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
- this.xrTableCell3.Weight = 0.15329125338142471D;
- //
- // xrTableRowDetail
- //
- this.xrTableRowDetail.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
- this.xrTableCell3,
- this.xrTableCell19,
- this.xrTableCell20,
- this.xrTableCell28,
- this.xrTableCell16,
- this.xrTableCell27,
- this.xrTableCell22,
- this.xrTableCell23,
- this.xrTableCell21,
- this.xrTableCell25,
- this.xrTableCell24,
- this.xrTableCell26});
- this.xrTableRowDetail.Name = "xrTableRowDetail";
- this.xrTableRowDetail.Weight = 1D;
- //
- // xrTableDetail
- //
- 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", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((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(1005F, 25F);
- this.xrTableDetail.StylePriority.UseBorders = false;
- this.xrTableDetail.StylePriority.UseFont = false;
- this.xrTableDetail.StylePriority.UsePadding = false;
- this.xrTableDetail.StylePriority.UseTextAlignment = false;
- this.xrTableDetail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
- //
// Mitarbeiterstundenkonto
//
this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
@@ -632,7 +663,7 @@ namespace AssistenzaReports
this.fieldFLS});
this.DataSource = this.bindingSource1;
this.Landscape = true;
- this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 30);
+ this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 30F);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -641,11 +672,13 @@ namespace AssistenzaReports
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.xrTable1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit();
((System.ComponentModel.ISupportInitialize)(this)).EndInit();
}
@@ -712,5 +745,7 @@ namespace AssistenzaReports
private DevExpress.XtraReports.UI.XRTableCell xrTableCell47;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell51;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel2;
}
}
diff --git a/ReportImp/AssistenzaReports/Mitarbeiterstundenkonto.resx b/ReportImp/AssistenzaReports/Mitarbeiterstundenkonto.resx
index d25f3eba2..d58980a38 100644
--- a/ReportImp/AssistenzaReports/Mitarbeiterstundenkonto.resx
+++ b/ReportImp/AssistenzaReports/Mitarbeiterstundenkonto.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
diff --git a/ReportImp/AssistenzaReports/MitarbeiterstundenkontoJahr.designer.cs b/ReportImp/AssistenzaReports/MitarbeiterstundenkontoJahr.designer.cs
index 2c07b7db0..8c7660dc8 100644
--- a/ReportImp/AssistenzaReports/MitarbeiterstundenkontoJahr.designer.cs
+++ b/ReportImp/AssistenzaReports/MitarbeiterstundenkontoJahr.designer.cs
@@ -35,6 +35,7 @@ namespace AssistenzaReports
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.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable();
this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow();
@@ -97,6 +98,8 @@ namespace AssistenzaReports
this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField();
+ this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+ this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit();
@@ -115,7 +118,8 @@ namespace AssistenzaReports
//
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", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 8F, 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);
@@ -251,7 +255,7 @@ namespace AssistenzaReports
this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top)
| DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom)));
- this.xrTableHeader.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold);
+ this.xrTableHeader.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrTableHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTableHeader.Name = "xrTableHeader";
this.xrTableHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -367,7 +371,8 @@ namespace AssistenzaReports
//
// xrTable1
//
- this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+ new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrTable1.Name = "xrTable1";
this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -502,18 +507,18 @@ namespace AssistenzaReports
//
// xrPageInfo2
//
- this.xrPageInfo2.Font = new System.Drawing.Font("Arial", 8F);
- this.xrPageInfo2.Format = "Seite {0} von {1}";
+ this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(864.9999F, 25F);
this.xrPageInfo2.Name = "xrPageInfo2";
this.xrPageInfo2.SizeF = new System.Drawing.SizeF(139.9999F, 23F);
this.xrPageInfo2.StyleName = "PageInfo";
this.xrPageInfo2.StylePriority.UseFont = false;
this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+ this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
//
// xrPageInfo1
//
- this.xrPageInfo1.Font = new System.Drawing.Font("Arial", 8F);
+ this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
this.xrPageInfo1.Name = "xrPageInfo1";
this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
@@ -527,7 +532,7 @@ namespace AssistenzaReports
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";
//
@@ -537,7 +542,7 @@ namespace AssistenzaReports
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";
//
@@ -547,7 +552,7 @@ namespace AssistenzaReports
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";
//
@@ -557,7 +562,7 @@ namespace AssistenzaReports
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";
//
@@ -610,7 +615,7 @@ namespace AssistenzaReports
//
this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrTableDetail});
- this.Detail3.Font = new System.Drawing.Font("Arial", 9.75F);
+ this.Detail3.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F);
this.Detail3.HeightF = 25F;
this.Detail3.Name = "Detail3";
this.Detail3.StylePriority.UseFont = false;
@@ -625,14 +630,16 @@ namespace AssistenzaReports
// GroupHeader3
//
this.GroupHeader3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+ this.xrLabel2,
+ this.xrLabel3,
this.xrLabel1});
- this.GroupHeader3.HeightF = 35F;
+ this.GroupHeader3.HeightF = 67.29169F;
this.GroupHeader3.Level = 1;
this.GroupHeader3.Name = "GroupHeader3";
//
// xrLabel1
//
- this.xrLabel1.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold);
+ this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold);
this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
this.xrLabel1.Multiline = true;
this.xrLabel1.Name = "xrLabel1";
@@ -656,6 +663,29 @@ namespace AssistenzaReports
this.fieldRelationGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
this.fieldRelationGesamt.Name = "fieldRelationGesamt";
//
+ // xrLabel2
+ //
+ this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 44.29167F);
+ this.xrLabel2.Multiline = true;
+ this.xrLabel2.Name = "xrLabel2";
+ this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel2.SizeF = new System.Drawing.SizeF(82.29166F, 23F);
+ this.xrLabel2.StylePriority.UseFont = false;
+ this.xrLabel2.Text = "Resturlaub:";
+ //
+ // xrLabel3
+ //
+ this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+ this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(82.29166F, 44.29169F);
+ this.xrLabel3.Multiline = true;
+ this.xrLabel3.Name = "xrLabel3";
+ this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+ this.xrLabel3.SizeF = new System.Drawing.SizeF(593.75F, 23F);
+ this.xrLabel3.StylePriority.UseFont = false;
+ this.xrLabel3.Text = "[EmployeeDetail.Custom1!0.0] Tage";
+ this.xrLabel3.TextFormatString = "{0:0.0}";
+ //
// bindingSource1
//
this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoMonateRO);
@@ -674,7 +704,7 @@ namespace AssistenzaReports
this.DataSource = this.bindingSource1;
this.DisplayName = "Mitarbeiterstundenkonto";
this.Landscape = true;
- this.Margins = new System.Drawing.Printing.Margins(75, 75, 50, 30);
+ this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 30F);
this.PageHeight = 827;
this.PageWidth = 1169;
this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
@@ -683,7 +713,9 @@ namespace AssistenzaReports
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.xrTable1)).EndInit();
@@ -757,5 +789,7 @@ namespace AssistenzaReports
private DevExpress.XtraReports.UI.XRLabel xrLabel1;
private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
private DevExpress.XtraReports.UI.CalculatedField fieldRelationGesamt;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel2;
+ private DevExpress.XtraReports.UI.XRLabel xrLabel3;
}
}
diff --git a/ReportImp/AssistenzaReports/MitarbeiterstundenkontoJahr.resx b/ReportImp/AssistenzaReports/MitarbeiterstundenkontoJahr.resx
index d25f3eba2..d58980a38 100644
--- a/ReportImp/AssistenzaReports/MitarbeiterstundenkontoJahr.resx
+++ b/ReportImp/AssistenzaReports/MitarbeiterstundenkontoJahr.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