diff --git a/ReportImp/AssistenzaReports/AssistenzaReports.csproj b/ReportImp/AssistenzaReports/AssistenzaReports.csproj index 113b4a435..b74f6bb70 100644 --- a/ReportImp/AssistenzaReports/AssistenzaReports.csproj +++ b/ReportImp/AssistenzaReports/AssistenzaReports.csproj @@ -71,12 +71,14 @@ false + + diff --git a/ReportImp/AssistenzaReports/FLSGroupReport.Designer.cs b/ReportImp/AssistenzaReports/FLSGroupReport.Designer.cs index 253d666b1..026c1816e 100644 --- a/ReportImp/AssistenzaReports/FLSGroupReport.Designer.cs +++ b/ReportImp/AssistenzaReports/FLSGroupReport.Designer.cs @@ -85,6 +85,18 @@ namespace BeWo.AssistenzaReports this.fieldGroupFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel18 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel20 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel(); + this.TextStunden = new DevExpress.XtraReports.UI.FormattingRule(); + this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel(); + this.TextFLS = new DevExpress.XtraReports.UI.FormattingRule(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); @@ -135,6 +147,14 @@ namespace BeWo.AssistenzaReports // Detail1 // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel20, + this.xrLabel21, + this.xrLabel22, + this.xrLabel19, + this.xrLabel15, + this.xrLabel16, + this.xrLabel17, + this.xrLabel18, this.xrLabel13, this.xrLabel12, this.xrLabel11, @@ -142,7 +162,7 @@ namespace BeWo.AssistenzaReports this.xrTable1}); 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 = 92F; + this.Detail1.HeightF = 129.5F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; // @@ -153,7 +173,7 @@ namespace BeWo.AssistenzaReports this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(160F, 57.99999F); this.xrLabel13.Name = "xrLabel13"; - this.xrLabel13.SizeF = new System.Drawing.SizeF(50F, 25F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(50F, 19.79F); this.xrLabel13.StylePriority.UseFont = false; this.xrLabel13.StylePriority.UsePadding = false; this.xrLabel13.StylePriority.UseTextAlignment = false; @@ -165,7 +185,7 @@ namespace BeWo.AssistenzaReports this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 58F); this.xrLabel12.Name = "xrLabel12"; - this.xrLabel12.SizeF = new System.Drawing.SizeF(110F, 25F); + this.xrLabel12.SizeF = new System.Drawing.SizeF(110F, 19.79F); this.xrLabel12.StylePriority.UseFont = false; this.xrLabel12.StylePriority.UsePadding = false; this.xrLabel12.Text = "Minuten gesamt:"; @@ -173,14 +193,15 @@ namespace BeWo.AssistenzaReports // xrLabel11 // this.xrLabel11.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.fieldGroupFLS", "{0:0.00} FLS")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.fieldGroupFLS")}); this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(280F, 57.99999F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel11.SizeF = new System.Drawing.SizeF(203F, 25F); + this.xrLabel11.SizeF = new System.Drawing.SizeF(203F, 19.79F); this.xrLabel11.StylePriority.UseFont = false; this.xrLabel11.Text = "xrLabel11"; + this.xrLabel11.TextFormatString = "{0:0.00} Stunden"; // // xrLabel10 // @@ -188,7 +209,7 @@ namespace BeWo.AssistenzaReports this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(210F, 57.99999F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(70F, 25F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(70F, 19.79F); this.xrLabel10.StylePriority.UseFont = false; this.xrLabel10.StylePriority.UseTextAlignment = false; this.xrLabel10.Text = "entspricht"; @@ -218,6 +239,8 @@ namespace BeWo.AssistenzaReports // Detail2 // this.Detail2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel24, + this.xrLabel23, this.xrLabel14, this.lblAufteilungLeistungen, this.xrLabel8, @@ -225,7 +248,7 @@ namespace BeWo.AssistenzaReports this.xrLabel6, this.xrLabel7, this.xrTable3}); - this.Detail2.HeightF = 101.6666F; + this.Detail2.HeightF = 101.3333F; this.Detail2.KeepTogether = true; this.Detail2.KeepTogetherWithDetailReports = true; this.Detail2.Name = "Detail2"; @@ -258,15 +281,15 @@ namespace BeWo.AssistenzaReports // // xrLabel8 // - this.xrLabel8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.FLSReportDetails.fieldFLS", "{0:0.00} FLS")}); this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel8.FormattingRules.Add(this.TextStunden); this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(280F, 50F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel8.SizeF = new System.Drawing.SizeF(203F, 25F); + this.xrLabel8.SizeF = new System.Drawing.SizeF(40F, 25F); this.xrLabel8.StylePriority.UseFont = false; - this.xrLabel8.Text = "xrLabel8"; + this.xrLabel8.Text = "[fieldFLS!0.00]"; + this.xrLabel8.TextFormatString = "{0:#.00}"; // // xrLabel9 // @@ -650,6 +673,142 @@ namespace BeWo.AssistenzaReports this.bottomMarginBand1.HeightF = 50F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrLabel15 + // + this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(210F, 77.78998F); + this.xrLabel15.Name = "xrLabel15"; + this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel15.SizeF = new System.Drawing.SizeF(70F, 19.79166F); + this.xrLabel15.StylePriority.UseFont = false; + this.xrLabel15.StylePriority.UseTextAlignment = false; + this.xrLabel15.Text = "entspricht"; + this.xrLabel15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // xrLabel16 + // + this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.CustomValue2")}); + this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(280F, 77.78998F); + this.xrLabel16.Name = "xrLabel16"; + this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel16.SizeF = new System.Drawing.SizeF(203F, 19.79166F); + this.xrLabel16.StylePriority.UseFont = false; + this.xrLabel16.Text = "xrLabel11"; + this.xrLabel16.TextFormatString = "{0:0} FLS"; + // + // xrLabel17 + // + this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 77.79001F); + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.SizeF = new System.Drawing.SizeF(140.8333F, 19.79166F); + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.StylePriority.UsePadding = false; + this.xrLabel17.Text = "davon abrechenbar:"; + // + // xrLabel18 + // + this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.CustomValue1", "{0:0.##}")}); + this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(160F, 77.78998F); + this.xrLabel18.Name = "xrLabel18"; + this.xrLabel18.SizeF = new System.Drawing.SizeF(50F, 19.79166F); + this.xrLabel18.StylePriority.UseFont = false; + this.xrLabel18.StylePriority.UsePadding = false; + this.xrLabel18.StylePriority.UseTextAlignment = false; + this.xrLabel18.Text = "xrLabel13"; + this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel19 + // + this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 97.58167F); + this.xrLabel19.Name = "xrLabel19"; + this.xrLabel19.SizeF = new System.Drawing.SizeF(140.8333F, 19.79166F); + this.xrLabel19.StylePriority.UseFont = false; + this.xrLabel19.StylePriority.UsePadding = false; + this.xrLabel19.Text = "davon indirekt:"; + // + // xrLabel20 + // + this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.CustomValue3", "{0:0.##}")}); + this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(160F, 97.58164F); + this.xrLabel20.Name = "xrLabel20"; + this.xrLabel20.SizeF = new System.Drawing.SizeF(50F, 19.79166F); + this.xrLabel20.StylePriority.UseFont = false; + this.xrLabel20.StylePriority.UsePadding = false; + this.xrLabel20.StylePriority.UseTextAlignment = false; + this.xrLabel20.Text = "xrLabel13"; + this.xrLabel20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel21 + // + this.xrLabel21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FLSReportGroups.CustomValue4")}); + this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(280F, 97.58164F); + this.xrLabel21.Name = "xrLabel21"; + this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel21.SizeF = new System.Drawing.SizeF(203F, 19.79166F); + this.xrLabel21.StylePriority.UseFont = false; + this.xrLabel21.Text = "xrLabel11"; + this.xrLabel21.TextFormatString = "{0:0} Stunden"; + // + // xrLabel22 + // + this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(210F, 97.58164F); + this.xrLabel22.Name = "xrLabel22"; + this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel22.SizeF = new System.Drawing.SizeF(70F, 19.79166F); + this.xrLabel22.StylePriority.UseFont = false; + this.xrLabel22.StylePriority.UseTextAlignment = false; + this.xrLabel22.Text = "entspricht"; + this.xrLabel22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // + // TextStunden + // + this.TextStunden.Condition = "[Name] == \'Indirekte Leistungen\'"; + this.TextStunden.DataMember = "FLSReportGroups.FLSReportDetails"; + this.TextStunden.Formatting.Visible = DevExpress.Utils.DefaultBoolean.True; + this.TextStunden.Name = "TextStunden"; + // + // xrLabel23 + // + this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel23.FormattingRules.Add(this.TextStunden); + this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(320F, 50F); + this.xrLabel23.Name = "xrLabel23"; + this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel23.SizeF = new System.Drawing.SizeF(107.75F, 25F); + this.xrLabel23.StylePriority.UseFont = false; + this.xrLabel23.Text = "Stunden"; + this.xrLabel23.Visible = false; + // + // xrLabel24 + // + this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrLabel24.FormattingRules.Add(this.TextFLS); + this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(320F, 50F); + this.xrLabel24.Name = "xrLabel24"; + this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel24.SizeF = new System.Drawing.SizeF(70.70834F, 25F); + this.xrLabel24.StylePriority.UseFont = false; + this.xrLabel24.Text = "FLS"; + this.xrLabel24.Visible = false; + // + // TextFLS + // + this.TextFLS.Condition = "[Name] != \'Indirekte Leistungen\'"; + this.TextFLS.DataMember = "FLSReportGroups.FLSReportDetails"; + this.TextFLS.Formatting.Visible = DevExpress.Utils.DefaultBoolean.True; + this.TextFLS.Name = "TextFLS"; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FLSReportRO); @@ -667,6 +826,9 @@ namespace BeWo.AssistenzaReports this.fieldFLS, this.fieldGroupFLS}); this.DataSource = this.bindingSource1; + this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { + this.TextStunden, + this.TextFLS}); this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 50F); this.PageHeight = 1169; this.PageWidth = 827; @@ -745,5 +907,17 @@ namespace BeWo.AssistenzaReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRLabel lblAufteilungLeistungen; private DevExpress.XtraReports.UI.XRLabel xrLabel14; + private DevExpress.XtraReports.UI.XRLabel xrLabel15; + private DevExpress.XtraReports.UI.XRLabel xrLabel16; + private DevExpress.XtraReports.UI.XRLabel xrLabel17; + private DevExpress.XtraReports.UI.XRLabel xrLabel18; + private DevExpress.XtraReports.UI.XRLabel xrLabel19; + private DevExpress.XtraReports.UI.XRLabel xrLabel20; + private DevExpress.XtraReports.UI.XRLabel xrLabel21; + private DevExpress.XtraReports.UI.XRLabel xrLabel22; + private DevExpress.XtraReports.UI.FormattingRule TextStunden; + private DevExpress.XtraReports.UI.XRLabel xrLabel23; + private DevExpress.XtraReports.UI.XRLabel xrLabel24; + private DevExpress.XtraReports.UI.FormattingRule TextFLS; } } diff --git a/ReportImp/AssistenzaReports/FLSGroupReport.cs b/ReportImp/AssistenzaReports/FLSGroupReport.cs index f508b1a33..df6252d46 100644 --- a/ReportImp/AssistenzaReports/FLSGroupReport.cs +++ b/ReportImp/AssistenzaReports/FLSGroupReport.cs @@ -18,6 +18,8 @@ namespace BeWo.AssistenzaReports { foreach (var group in pRO.FLSReportGroups) { + var abrechenbar = 0m; + var indirekt = 0m; FLSReportRO.FLSReportDetail sonstigesAlt = null; FLSReportRO.FLSReportDetail fahrzeiten = null; @@ -49,6 +51,11 @@ namespace BeWo.AssistenzaReports foreach (var item in leistungenZuMinuten) { + if (item.Key == "Sonstiges") + indirekt += item.Value; + else + abrechenbar += item.Value; + detail.CustomValue1 += string.Format("{0}\n", item.Key); detail.CustomValue2 += string.Format("{0:0.00}\n", item.Value); } @@ -56,7 +63,7 @@ namespace BeWo.AssistenzaReports if (detail.Name == "Sonstiges") { - detail.Name = "Mittelbare Leistungen"; + detail.Name = "Indirekte Leistungen"; //sonstigesAlt = detail; } else @@ -126,6 +133,11 @@ namespace BeWo.AssistenzaReports } } + group.CustomValue1 = string.Format("{0:0}", abrechenbar); // Abrechenbar in Minuten + group.CustomValue2 = string.Format("{0:0.00}", abrechenbar / 60); // Abrechenbar in Stunden + group.CustomValue3 = string.Format("{0:0}", indirekt); // Indirekt in Minuten + group.CustomValue4 = string.Format("{0:0.00}", indirekt / 60); // Indirekt in Stunden + } } diff --git a/ReportImp/AssistenzaReports/Mitarbeiterarbeitszeitkonto.designer.cs b/ReportImp/AssistenzaReports/Mitarbeiterarbeitszeitkonto.designer.cs index 074c571f4..73845d916 100644 --- a/ReportImp/AssistenzaReports/Mitarbeiterarbeitszeitkonto.designer.cs +++ b/ReportImp/AssistenzaReports/Mitarbeiterarbeitszeitkonto.designer.cs @@ -35,6 +35,8 @@ 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.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary6 = 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(); @@ -105,6 +107,7 @@ 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(); @@ -123,7 +126,11 @@ namespace AssistenzaReports this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldTatsSoll = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); @@ -565,7 +572,7 @@ namespace AssistenzaReports this.xrTable4, this.xrTable1}); this.GroupFooter2.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.GroupFooter2.HeightF = 116.6667F; + this.GroupFooter2.HeightF = 136.6667F; this.GroupFooter2.KeepTogether = true; this.GroupFooter2.Name = "GroupFooter2"; this.GroupFooter2.StylePriority.UseFont = false; @@ -677,9 +684,10 @@ namespace AssistenzaReports this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow4, this.xrTableRow2, + this.xrTableRow7, this.xrTableRow5, this.xrTableRow6}); - this.xrTable1.SizeF = new System.Drawing.SizeF(669.9999F, 80F); + this.xrTable1.SizeF = new System.Drawing.SizeF(669.9999F, 100F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -761,7 +769,7 @@ namespace AssistenzaReports this.xrTableCell4.StylePriority.UseBorders = false; this.xrTableCell4.StylePriority.UsePadding = false; this.xrTableCell4.StylePriority.UseTextAlignment = false; - this.xrTableCell4.Text = "Stunden Abwesenheiten:"; + this.xrTableCell4.Text = "Stunden Krankheit:"; this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell4.Weight = 0.17987241552156494D; // @@ -769,10 +777,13 @@ namespace AssistenzaReports // this.xrTableCell9.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.HoursSick")}); this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.StylePriority.UseBorders = false; this.xrTableCell9.StylePriority.UseTextAlignment = false; + xrSummary5.FormatString = "{0:0.00}"; + xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell9.Summary = xrSummary5; this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell9.Weight = 0.089936205759550983D; // @@ -894,9 +905,9 @@ namespace AssistenzaReports this.xrTableCell57.StylePriority.UseBorders = false; this.xrTableCell57.StylePriority.UseFont = false; this.xrTableCell57.StylePriority.UseTextAlignment = false; - xrSummary5.FormatString = "{0:0.00}"; - xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell57.Summary = xrSummary5; + xrSummary7.FormatString = "{0:0.00}"; + xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell57.Summary = xrSummary7; this.xrTableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell57.Weight = 0.089936204907626063D; // @@ -925,6 +936,10 @@ 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; @@ -1061,9 +1076,67 @@ namespace AssistenzaReports this.fieldTatsSoll.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldTatsSoll.Name = "fieldTatsSoll"; // - // bindingSource1 + // xrTableRow7 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell29, + this.xrTableCell30, + this.xrTableCell32, + this.xrTableCell33}); + this.xrTableRow7.Name = "xrTableRow7"; + this.xrTableRow7.Weight = 0.8D; + // + // xrTableCell29 + // + this.xrTableCell29.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top))); + this.xrTableCell29.Multiline = true; + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); + this.xrTableCell29.StylePriority.UseBorders = false; + this.xrTableCell29.StylePriority.UsePadding = false; + this.xrTableCell29.StylePriority.UseTextAlignment = false; + this.xrTableCell29.Text = "Stunden Urlaub:"; + this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell29.Weight = 0.17987241552156494D; + // + // xrTableCell30 + // + this.xrTableCell30.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.HoursInVacation")}); + this.xrTableCell30.Multiline = true; + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.StylePriority.UseBorders = false; + this.xrTableCell30.StylePriority.UseTextAlignment = false; + xrSummary6.FormatString = "{0:0.00}"; + xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell30.Summary = xrSummary6; + this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell30.Weight = 0.089936205759550983D; + // + // xrTableCell32 + // + this.xrTableCell32.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTableCell32.Multiline = true; + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); + this.xrTableCell32.StylePriority.UseBorders = false; + this.xrTableCell32.StylePriority.UsePadding = false; + this.xrTableCell32.StylePriority.UseTextAlignment = false; + this.xrTableCell32.Text = "xrTableCell32"; + this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell32.Weight = 0.22133304473557486D; + // + // xrTableCell33 + // + this.xrTableCell33.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell33.Multiline = true; + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.StylePriority.UseBorders = false; + this.xrTableCell33.StylePriority.UseTextAlignment = false; + this.xrTableCell33.Text = "xrTableCell33"; + this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell33.Weight = 0.11143080023343803D; // // Mitarbeiterarbeitszeitkonto // @@ -1202,5 +1275,10 @@ namespace AssistenzaReports private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; } } diff --git a/ReportImp/AssistenzaReports/Mitarbeiterstundenkonto.designer.cs b/ReportImp/AssistenzaReports/Mitarbeiterstundenkonto.designer.cs index 21165b35c..0b12a4e3f 100644 --- a/ReportImp/AssistenzaReports/Mitarbeiterstundenkonto.designer.cs +++ b/ReportImp/AssistenzaReports/Mitarbeiterstundenkonto.designer.cs @@ -49,6 +49,8 @@ namespace AssistenzaReports this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -78,6 +80,7 @@ namespace AssistenzaReports this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.lblMonat = new DevExpress.XtraReports.UI.XRLabel(); this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); @@ -90,9 +93,9 @@ 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.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(); @@ -127,7 +130,7 @@ namespace AssistenzaReports 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.SizeF = new System.Drawing.SizeF(1049F, 25F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UseFont = false; this.xrTableDetail.StylePriority.UsePadding = false; @@ -140,6 +143,7 @@ namespace AssistenzaReports this.xrTableCell3, this.xrTableCell19, this.xrTableCell20, + this.xrTableCell6, this.xrTableCell28, this.xrTableCell16, this.xrTableCell27, @@ -176,7 +180,7 @@ namespace AssistenzaReports // xrTableCell20 // this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.TageUrlaub", "{0:0.00}")}); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.Text = "xrTableCell20"; this.xrTableCell20.Weight = 0.094679933071566441D; @@ -274,6 +278,29 @@ namespace AssistenzaReports this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.RepeatEveryPage = true; // + // 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}"; + // + // 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:"; + // // xrTableHeader // this.xrTableHeader.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) @@ -285,7 +312,7 @@ namespace AssistenzaReports 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.SizeF = new System.Drawing.SizeF(1049F, 55.41668F); this.xrTableHeader.StylePriority.UseBorders = false; this.xrTableHeader.StylePriority.UseFont = false; this.xrTableHeader.StylePriority.UsePadding = false; @@ -298,6 +325,7 @@ namespace AssistenzaReports this.xrTableCell5, this.xrTableCell4, this.xrTableCell2, + this.xrTableCell1, this.xrTableCell9, this.xrTableCell8, this.xrTableCell10, @@ -329,7 +357,7 @@ namespace AssistenzaReports // xrTableCell2 // this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)"; + this.xrTableCell2.Text = "Urlaub (Tage)"; this.xrTableCell2.Weight = 0.094679896646570338D; // // xrTableCell9 @@ -369,7 +397,7 @@ namespace AssistenzaReports // xrTableCell12 // this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)"; + this.xrTableCell12.Text = "Relation FLS IST zu Indirekte IST (in %)"; this.xrTableCell12.Weight = 0.063119929511863376D; // // xrTableCell13 @@ -409,7 +437,7 @@ namespace AssistenzaReports this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(1005F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1049F, 25F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -422,6 +450,7 @@ namespace AssistenzaReports this.xrTableCell35, this.xrTableCell37, this.xrTableCell39, + this.xrTableCell17, this.cellSollGesamt, this.cellFLSSollGesamt, this.cellFLSIstGesamt, @@ -518,6 +547,10 @@ namespace AssistenzaReports this.xrTableCell51.Name = "xrTableCell51"; this.xrTableCell51.Weight = 0.063119927862939573D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + // // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -623,32 +656,26 @@ namespace AssistenzaReports this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // xrLabel1 + // xrTableCell1 // - 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:"; + this.xrTableCell1.Multiline = true; + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Text = "Krankheit (Tage)\r\n"; + this.xrTableCell1.Weight = 0.094679896646570338D; // - // xrLabel2 + // xrTableCell6 // - 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}"; + this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.TageKrankheit")}); + this.xrTableCell6.Multiline = true; + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Weight = 0.094679933071566441D; // - // bindingSource1 + // xrTableCell17 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + this.xrTableCell17.Multiline = true; + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.Weight = 0.094679919312514085D; // // Mitarbeiterstundenkonto // @@ -663,7 +690,7 @@ namespace AssistenzaReports this.fieldFLS}); this.DataSource = this.bindingSource1; this.Landscape = true; - this.Margins = new DevExpress.Drawing.DXMargins(75F, 75F, 50F, 30F); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 45F, 50F, 30F); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -747,5 +774,8 @@ namespace AssistenzaReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell51; private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; } } diff --git a/ReportImp/AssistenzaReports/MitarbeiterstundenkontoJahr.designer.cs b/ReportImp/AssistenzaReports/MitarbeiterstundenkontoJahr.designer.cs index 8c7660dc8..03e516380 100644 --- a/ReportImp/AssistenzaReports/MitarbeiterstundenkontoJahr.designer.cs +++ b/ReportImp/AssistenzaReports/MitarbeiterstundenkontoJahr.designer.cs @@ -95,12 +95,15 @@ namespace AssistenzaReports this.Detail3 = new DevExpress.XtraReports.UI.DetailBand(); this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); 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); + 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(); @@ -125,7 +128,7 @@ namespace AssistenzaReports 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.SizeF = new System.Drawing.SizeF(1019F, 25F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UseFont = false; this.xrTableDetail.StylePriority.UsePadding = false; @@ -138,6 +141,7 @@ namespace AssistenzaReports this.xrTableCell3, this.xrTableCell19, this.xrTableCell20, + this.xrTableCell6, this.xrTableCell28, this.xrTableCell16, this.xrTableCell27, @@ -160,7 +164,7 @@ namespace AssistenzaReports this.xrTableCell3.StylePriority.UsePadding = false; this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell3.Weight = 0.15329125338142471D; + this.xrTableCell3.Weight = 0.15279402063754533D; // // xrTableCell19 // @@ -168,15 +172,15 @@ namespace AssistenzaReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollMax", "{0:0.00}")}); this.xrTableCell19.Name = "xrTableCell19"; this.xrTableCell19.Text = "xrTableCell19"; - this.xrTableCell19.Weight = 0.081154151689479551D; + this.xrTableCell19.Weight = 0.080890968171161093D; // // xrTableCell20 // this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UrlaubUndKrankheit", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.TageUrlaub", "{0:0.00}")}); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.Text = "xrTableCell20"; - this.xrTableCell20.Weight = 0.094679933071566441D; + this.xrTableCell20.Weight = 0.0616044091665026D; // // xrTableCell28 // @@ -184,7 +188,7 @@ namespace AssistenzaReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollOhneUrlaubKrankheit", "{0:0.00}")}); this.xrTableCell28.Name = "xrTableCell28"; this.xrTableCell28.Text = "xrTableCell28"; - this.xrTableCell28.Weight = 0.0721370604147881D; + this.xrTableCell28.Weight = 0.10303344612983333D; // // xrTableCell16 // @@ -261,7 +265,7 @@ namespace AssistenzaReports 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.SizeF = new System.Drawing.SizeF(1019F, 70F); this.xrTableHeader.StylePriority.UseBorders = false; this.xrTableHeader.StylePriority.UseFont = false; this.xrTableHeader.StylePriority.UsePadding = false; @@ -274,6 +278,7 @@ namespace AssistenzaReports this.xrTableCell5, this.xrTableCell4, this.xrTableCell2, + this.xrTableCell1, this.xrTableCell9, this.xrTableCell8, this.xrTableCell10, @@ -305,15 +310,15 @@ namespace AssistenzaReports // xrTableCell2 // this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)"; - this.xrTableCell2.Weight = 0.094679896646570338D; + this.xrTableCell2.Text = "Urlaub (Tage)"; + this.xrTableCell2.Weight = 0.061804918165728216D; // // xrTableCell9 // this.xrTableCell9.Multiline = true; this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.Text = "Tatsächliche SOLL Stunden"; - this.xrTableCell9.Weight = 0.072137063712635591D; + this.xrTableCell9.Weight = 0.10501204219347771D; // // xrTableCell8 // @@ -345,7 +350,7 @@ namespace AssistenzaReports // xrTableCell12 // this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Text = "Relation FLS IST zu Mittelbare IST (in %)"; + this.xrTableCell12.Text = "Relation FLS IST zu Indirekte IST (in %)"; this.xrTableCell12.Weight = 0.063119929511863376D; // // xrTableCell13 @@ -378,7 +383,7 @@ namespace AssistenzaReports this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(1005F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1019F, 25F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -391,6 +396,7 @@ namespace AssistenzaReports this.xrTableCell35, this.xrTableCell37, this.xrTableCell39, + this.xrTableCell17, this.cellSollGesamt, this.cellFLSSollGesamt, this.cellFLSIstGesamt, @@ -412,17 +418,17 @@ namespace AssistenzaReports this.xrTableCell35.StylePriority.UseTextAlignment = false; this.xrTableCell35.Text = "Gesamt"; this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell35.Weight = 0.15329126714047708D; + this.xrTableCell35.Weight = 0.15279400618906355D; // // xrTableCell37 // this.xrTableCell37.Name = "xrTableCell37"; - this.xrTableCell37.Weight = 0.081154151689479551D; + this.xrTableCell37.Weight = 0.080890968171161093D; // // xrTableCell39 // this.xrTableCell39.Name = "xrTableCell39"; - this.xrTableCell39.Weight = 0.094679919312514085D; + this.xrTableCell39.Weight = 0.0616044091665026D; // // cellSollGesamt // @@ -432,7 +438,7 @@ namespace AssistenzaReports xrSummary1.FormatString = "{0:0.00}"; xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.cellSollGesamt.Summary = xrSummary1; - this.cellSollGesamt.Weight = 0.0721370604147881D; + this.cellSollGesamt.Weight = 0.10303346057831508D; // // cellFLSSollGesamt // @@ -637,6 +643,29 @@ namespace AssistenzaReports this.GroupHeader3.Level = 1; this.GroupHeader3.Name = "GroupHeader3"; // + // 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}"; + // // xrLabel1 // this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold); @@ -663,33 +692,32 @@ 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); // + // xrTableCell1 + // + this.xrTableCell1.Multiline = true; + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Text = "Krankheit\r\n(Tage)"; + this.xrTableCell1.Weight = 0.061804918165728216D; + // + // xrTableCell6 + // + this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.TageKrankheit")}); + this.xrTableCell6.Multiline = true; + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Text = "xrTableCell6"; + this.xrTableCell6.Weight = 0.061604452511947905D; + // + // xrTableCell17 + // + this.xrTableCell17.Multiline = true; + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.Weight = 0.061604452511947905D; + // // MitarbeiterstundenkontoJahr // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -791,5 +819,8 @@ namespace AssistenzaReports private DevExpress.XtraReports.UI.CalculatedField fieldRelationGesamt; private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; } } diff --git a/ReportImp/AssistenzaReports/Teamstundenkonto.designer.cs b/ReportImp/AssistenzaReports/Teamstundenkonto.designer.cs index 416d9ef35..ce03a0663 100644 --- a/ReportImp/AssistenzaReports/Teamstundenkonto.designer.cs +++ b/ReportImp/AssistenzaReports/Teamstundenkonto.designer.cs @@ -30,6 +30,7 @@ namespace BeWo.Report.DefaultReports 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.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRowDetail = new DevExpress.XtraReports.UI.XRTableRow(); @@ -105,8 +106,11 @@ 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.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportFooter1 = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); @@ -125,13 +129,14 @@ namespace BeWo.Report.DefaultReports // 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); this.xrTableDetail.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRowDetail}); - this.xrTableDetail.SizeF = new System.Drawing.SizeF(1005F, 25F); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(1019F, 25F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UseFont = false; this.xrTableDetail.StylePriority.UsePadding = false; @@ -144,6 +149,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell3, this.xrTableCell19, this.xrTableCell20, + this.xrTableCell4, this.xrTableCell28, this.xrTableCell16, this.xrTableCell27, @@ -180,7 +186,7 @@ namespace BeWo.Report.DefaultReports // xrTableCell20 // this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.TageUrlaub", "{0:0.00}")}); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.Text = "xrTableCell20"; this.xrTableCell20.Weight = 0.09467990555346173D; @@ -259,13 +265,14 @@ namespace BeWo.Report.DefaultReports // // 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); this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable1.SizeF = new System.Drawing.SizeF(1005F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1019F, 25F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -279,6 +286,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell37, this.xrTableCell38, this.xrTableCell39, + this.xrTableCell5, this.cellSollGesamt, this.cellFLSSollGesamt, this.cellFLSIstGesamt, @@ -323,7 +331,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "SollGesamt", "{0:0.00}")}); this.cellSollGesamt.Name = "cellSollGesamt"; this.cellSollGesamt.Text = "cellSollGesamt"; - this.cellSollGesamt.Weight = 0.0721370604147881D; + this.cellSollGesamt.Weight = 0.069862493442848825D; // // cellFLSSollGesamt // @@ -331,7 +339,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsSollGesamt", "{0:0.00}")}); this.cellFLSSollGesamt.Name = "cellFLSSollGesamt"; this.cellFLSSollGesamt.Text = "cellFLSSollGesamt"; - this.cellFLSSollGesamt.Weight = 0.063119927862939587D; + this.cellFLSSollGesamt.Weight = 0.061129633680917159D; // // cellFLSIstGesamt // @@ -339,7 +347,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsIstGesamt", "{0:0.00}")}); this.cellFLSIstGesamt.Name = "cellFLSIstGesamt"; this.cellFLSIstGesamt.Text = "cellFLSIstGesamt"; - this.cellFLSIstGesamt.Weight = 0.063119927862939615D; + this.cellFLSIstGesamt.Weight = 0.061129865923999147D; // // cellFLSPlusMinusGesamt // @@ -347,7 +355,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "FlsDiffGesamt", "{0:0.00}")}); this.cellFLSPlusMinusGesamt.Name = "cellFLSPlusMinusGesamt"; this.cellFLSPlusMinusGesamt.Text = "cellFLSPlusMinusGesamt"; - this.cellFLSPlusMinusGesamt.Weight = 0.063119927862939587D; + this.cellFLSPlusMinusGesamt.Weight = 0.061129517559376172D; // // cellGesamtGesamt // @@ -355,7 +363,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")}); this.cellGesamtGesamt.Name = "cellGesamtGesamt"; this.cellGesamtGesamt.Text = "cellGesamtGesamt"; - this.cellGesamtGesamt.Weight = 0.063119927862939573D; + this.cellGesamtGesamt.Weight = 0.061129633680917138D; // // cellRelationGesamt // @@ -363,12 +371,12 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelationFlsZuMittelbar", "{0:0.00}")}); this.cellRelationGesamt.Name = "cellRelationGesamt"; this.cellRelationGesamt.Text = "cellRelationGesamt"; - this.cellRelationGesamt.Weight = 0.0631199278629396D; + this.cellRelationGesamt.Weight = 0.061129633680917179D; // // xrTableCell47 // this.xrTableCell47.Name = "xrTableCell47"; - this.xrTableCell47.Weight = 0.063119927862939587D; + this.xrTableCell47.Weight = 0.057149161438413289D; // // xrTableCell48 // @@ -391,7 +399,7 @@ namespace BeWo.Report.DefaultReports // 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"; @@ -410,18 +418,18 @@ namespace BeWo.Report.DefaultReports // // 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(522.0001F, 25F); this.xrPageInfo2.Name = "xrPageInfo2"; this.xrPageInfo2.SizeF = new System.Drawing.SizeF(482.9998F, 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(8F, 25F); this.xrPageInfo1.Name = "xrPageInfo1"; this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime; @@ -435,7 +443,7 @@ namespace BeWo.Report.DefaultReports 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"; // @@ -445,7 +453,7 @@ namespace BeWo.Report.DefaultReports 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"; // @@ -455,7 +463,7 @@ namespace BeWo.Report.DefaultReports 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"; // @@ -465,7 +473,7 @@ namespace BeWo.Report.DefaultReports 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"; // @@ -507,7 +515,7 @@ namespace BeWo.Report.DefaultReports // this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.TeamName")}); - this.xrLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel1.Multiline = true; this.xrLabel1.Name = "xrLabel1"; @@ -546,13 +554,13 @@ namespace BeWo.Report.DefaultReports this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable2.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold); + this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable2.Name = "xrTable2"; this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTable2.SizeF = new System.Drawing.SizeF(1005F, 70F); + this.xrTable2.SizeF = new System.Drawing.SizeF(1019F, 70F); this.xrTable2.StylePriority.UseBorders = false; this.xrTable2.StylePriority.UseFont = false; this.xrTable2.StylePriority.UsePadding = false; @@ -565,6 +573,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell6, this.xrTableCell18, this.xrTableCell30, + this.xrTableCell2, this.xrTableCell31, this.xrTableCell32, this.xrTableCell33, @@ -596,7 +605,7 @@ namespace BeWo.Report.DefaultReports // xrTableCell30 // this.xrTableCell30.Name = "xrTableCell30"; - this.xrTableCell30.Text = "Fehlzeiten Urlaub Krankheit(Tage)"; + this.xrTableCell30.Text = "Fehlzeiten Urlaub (Tage)"; this.xrTableCell30.Weight = 0.094679896646570338D; // // xrTableCell31 @@ -636,7 +645,7 @@ namespace BeWo.Report.DefaultReports // xrTableCell40 // this.xrTableCell40.Name = "xrTableCell40"; - this.xrTableCell40.Text = "Relation FLS IST zu Mittelbare IST (in %)"; + this.xrTableCell40.Text = "Relation FLS IST zu Indirekte IST (in %)"; this.xrTableCell40.Weight = 0.063119929511863376D; // // xrTableCell41 @@ -667,13 +676,14 @@ namespace BeWo.Report.DefaultReports // // xrTable3 // - this.xrTable3.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable3.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.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow3}); - this.xrTable3.SizeF = new System.Drawing.SizeF(1005F, 25F); + this.xrTable3.SizeF = new System.Drawing.SizeF(1019F, 25F); this.xrTable3.StylePriority.UseBorders = false; this.xrTable3.StylePriority.UseFont = false; this.xrTable3.StylePriority.UsePadding = false; @@ -705,7 +715,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell1.StylePriority.UseTextAlignment = false; this.xrTableCell1.Text = "Gesamt [TeamDetailList.TeamName]"; this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell1.Weight = 0.32912533814247075D; + this.xrTableCell1.Weight = 0.41426005342806138D; // // xrTableCell7 // @@ -713,7 +723,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.SollGesamt", "{0:0.00}")}); this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.Text = "xrTableCell7"; - this.xrTableCell7.Weight = 0.07213706041478804D; + this.xrTableCell7.Weight = 0.070512380520681456D; // // xrTableCell8 // @@ -721,7 +731,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.FlsSollGesamt", "{0:0.00}")}); this.xrTableCell8.Name = "xrTableCell8"; this.xrTableCell8.Text = "xrTableCell8"; - this.xrTableCell8.Weight = 0.063119927862939587D; + this.xrTableCell8.Weight = 0.061698336666200365D; // // xrTableCell9 // @@ -729,7 +739,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.FlsIstGesamt", "{0:0.00}")}); this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.Text = "xrTableCell9"; - this.xrTableCell9.Weight = 0.063119927862939615D; + this.xrTableCell9.Weight = 0.061698219464458359D; // // xrTableCell10 // @@ -737,7 +747,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.FlsDiffGesamt", "{0:0.00}")}); this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.Text = "xrTableCell10"; - this.xrTableCell10.Weight = 0.063119927862939587D; + this.xrTableCell10.Weight = 0.061698219464458581D; // // xrTableCell11 // @@ -745,7 +755,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.StundenGesamt", "{0:0.00}")}); this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.Text = "xrTableCell11"; - this.xrTableCell11.Weight = 0.063119927862939573D; + this.xrTableCell11.Weight = 0.061698336666200351D; // // xrTableCell12 // @@ -753,26 +763,22 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.RelationFlsZuMittelbar", "{0:0.00}")}); this.xrTableCell12.Name = "xrTableCell12"; this.xrTableCell12.Text = "xrTableCell12"; - this.xrTableCell12.Weight = 0.0631199278629396D; + this.xrTableCell12.Weight = 0.061698278065329487D; // // xrTableCell13 // this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.Weight = 0.063119927862939587D; + this.xrTableCell13.Weight = 0.061698278065329681D; // // xrTableCell14 // this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.Weight = 0.063119927862939587D; + this.xrTableCell14.Weight = 0.061698395267071049D; // // xrTableCell15 // this.xrTableCell15.Name = "xrTableCell15"; - this.xrTableCell15.Weight = 0.063119927862939573D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + this.xrTableCell15.Weight = 0.061698387941961752D; // // ReportFooter1 // @@ -781,6 +787,32 @@ namespace BeWo.Report.DefaultReports this.ReportFooter1.HeightF = 60F; this.ReportFooter1.Name = "ReportFooter1"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + // + // xrTableCell2 + // + this.xrTableCell2.Multiline = true; + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Text = "Fehlzeiten Krankheit (Tage)"; + this.xrTableCell2.Weight = 0.094679896646570338D; + // + // xrTableCell4 + // + this.xrTableCell4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TeamDetailList.EmployeeDetailList.TageKrankheit")}); + this.xrTableCell4.Multiline = true; + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Text = "xrTableCell4"; + this.xrTableCell4.Weight = 0.09467990555346173D; + // + // xrTableCell5 + // + this.xrTableCell5.Multiline = true; + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Weight = 0.0813166160479763D; + // // Teamstundenkonto // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -795,7 +827,7 @@ namespace BeWo.Report.DefaultReports 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; @@ -804,7 +836,9 @@ namespace BeWo.Report.DefaultReports 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.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); @@ -893,5 +927,8 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; } } diff --git a/ReportImp/AssistenzaReports/Teamstundenkonto.resx b/ReportImp/AssistenzaReports/Teamstundenkonto.resx index c8d42e2a4..d58980a38 100644 --- a/ReportImp/AssistenzaReports/Teamstundenkonto.resx +++ b/ReportImp/AssistenzaReports/Teamstundenkonto.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 14 - \ No newline at end of file