diff --git a/Report/DefaultReports/Mitarbeiterstundenkonto.designer.cs b/Report/DefaultReports/Mitarbeiterstundenkonto.designer.cs index 75696ac3f..490f98ad6 100644 --- a/Report/DefaultReports/Mitarbeiterstundenkonto.designer.cs +++ b/Report/DefaultReports/Mitarbeiterstundenkonto.designer.cs @@ -81,6 +81,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.lblMonat = new DevExpress.XtraReports.UI.XRLabel(); @@ -94,7 +95,6 @@ namespace BeWo.Report.DefaultReports this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - 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.xrTable1)).BeginInit(); @@ -379,8 +379,9 @@ namespace BeWo.Report.DefaultReports // // xrTableCell12 // + this.xrTableCell12.Multiline = true; this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)"; + this.xrTableCell12.Text = "Relation FLS IST zu Gesamt-stunden \r\n(in %)"; this.xrTableCell12.Weight = 0.063119929511863376D; // // xrTableCell13 @@ -543,6 +544,10 @@ namespace BeWo.Report.DefaultReports this.xrTableCell17.Name = "xrTableCell17"; this.xrTableCell17.Weight = 0.062885253465960314D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + // // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -663,10 +668,6 @@ namespace BeWo.Report.DefaultReports this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); - // // Mitarbeiterstundenkonto // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { diff --git a/Report/DefaultReports/MitarbeiterstundenkontoJahr.designer.cs b/Report/DefaultReports/MitarbeiterstundenkontoJahr.designer.cs index 9d9d77e2a..8a0e12da6 100644 --- a/Report/DefaultReports/MitarbeiterstundenkontoJahr.designer.cs +++ b/Report/DefaultReports/MitarbeiterstundenkontoJahr.designer.cs @@ -51,6 +51,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -65,6 +66,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -79,6 +81,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo(); this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo(); @@ -100,9 +103,6 @@ namespace BeWo.Report.DefaultReports this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -253,6 +253,15 @@ namespace BeWo.Report.DefaultReports this.xrTableCell26.Text = "xrTableCell26"; this.xrTableCell26.Weight = 0.063119927862939573D; // + // xrTableCell6 + // + this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Resturlaub")}); + this.xrTableCell6.Multiline = true; + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.TextFormatString = "{0:0.00}"; + this.xrTableCell6.Weight = 0.063119927862939573D; + // // xrTableHeader // this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) @@ -348,8 +357,9 @@ namespace BeWo.Report.DefaultReports // // xrTableCell12 // + this.xrTableCell12.Multiline = true; this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)"; + this.xrTableCell12.Text = "Relation FLS IST zu Gesamt-stunden \r\n(in %)"; this.xrTableCell12.Weight = 0.063119929511863376D; // // xrTableCell13 @@ -373,6 +383,13 @@ namespace BeWo.Report.DefaultReports this.xrTableCell15.Text = "Überstd. Gesamt"; this.xrTableCell15.Weight = 0.0631199213956443D; // + // xrTableCell1 + // + this.xrTableCell1.Multiline = true; + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Text = "Resturlaub"; + this.xrTableCell1.Weight = 0.0631199213956443D; + // // xrTable1 // this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { @@ -502,6 +519,12 @@ namespace BeWo.Report.DefaultReports this.xrTableCell51.Name = "xrTableCell51"; this.xrTableCell51.Weight = 0.063119927862939573D; // + // xrTableCell17 + // + this.xrTableCell17.Multiline = true; + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.Weight = 0.063119927862939573D; + // // pageFooterBand1 // this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -685,28 +708,6 @@ namespace BeWo.Report.DefaultReports this.fieldRelationGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldRelationGesamt.Name = "fieldRelationGesamt"; // - // xrTableCell1 - // - this.xrTableCell1.Multiline = true; - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Text = "Resturlaub"; - this.xrTableCell1.Weight = 0.0631199213956443D; - // - // xrTableCell6 - // - this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Resturlaub")}); - this.xrTableCell6.Multiline = true; - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.TextFormatString = "{0:0.00}"; - this.xrTableCell6.Weight = 0.063119927862939573D; - // - // xrTableCell17 - // - this.xrTableCell17.Multiline = true; - this.xrTableCell17.Name = "xrTableCell17"; - this.xrTableCell17.Weight = 0.063119927862939573D; - // // MitarbeiterstundenkontoJahr // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {