From dabe321cf10b63019151e9c61418347ed618f49e Mon Sep 17 00:00:00 2001 From: HirschleM Date: Mon, 13 Jan 2025 14:50:52 +0100 Subject: [PATCH] MH: VKM Hamm Stundenkonto --- ...stomerMitarbeiterstundenkontoBerechnung.cs | 41 +- .../Mitarbeiterarbeitszeitkonto.designer.cs | 195 ++++-- ReportImp/VkmHamm/Mitarbeiterstundenkonto.cs | 6 + .../Mitarbeiterstundenkonto.designer.cs | 139 +++-- .../VkmHamm/MitarbeiterstundenkontoJahr.cs | 12 + .../MitarbeiterstundenkontoJahr.designer.cs | 573 ++++++++++++------ .../VkmHamm/MitarbeiterstundenkontoJahr.resx | 3 - 7 files changed, 671 insertions(+), 298 deletions(-) diff --git a/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs b/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs index e0ec74237..ba538cb20 100644 --- a/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs @@ -97,6 +97,28 @@ namespace VkmHamm dd.TimeSick = String.Format("{0:00}:{1:00}", tspan.Hours, tspan.Minutes); } } + else if (IsOtherAbsenceServiceRecord(sr)) + { + if (sr.RoundedDuration > 0) + { + if (sr.Start < new DateTime(2024, 10, 01)) + { + dd.HoursOtherAbsenceTimes += Math.Round(sr.RoundedDuration / 60, 2, MidpointRounding.AwayFromZero); + } + else + { + dd.HoursOtherAbsenceTimes += sr.RoundedDuration / 60; + } + var tspan = TimeSpan.FromHours((double)dd.HoursOtherAbsenceTimes); + dd.TimeOtherAbsenceTimes = String.Format("{0:00}:{1:00}", tspan.Hours, tspan.Minutes); + } + else + { + dd.HoursOtherAbsenceTimes += 1; + var tspan = TimeSpan.FromHours((double)dd.HoursOtherAbsenceTimes); + dd.TimeOtherAbsenceTimes = String.Format("{0:00}:{1:00}", tspan.Hours, tspan.Minutes); + } + } else { dd.MinutesTotal += duration; @@ -222,7 +244,7 @@ namespace VkmHamm public override bool AddServiceRecordToDuration(ServiceRecord item) { - if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null && !IsKrankAbsenceServiceRecord(item) && !IsUrlaubAbsenceServiceRecord(item)) + if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null && !IsKrankAbsenceServiceRecord(item) && !IsUrlaubAbsenceServiceRecord(item) && !IsOtherAbsenceServiceRecord(item)) { if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit") { @@ -261,7 +283,7 @@ namespace VkmHamm if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null) { - if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit" && !IsUrlaubAbsenceServiceRecord(item) && !IsKrankAbsenceServiceRecord(item)) + if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit" && !IsUrlaubAbsenceServiceRecord(item) && !IsKrankAbsenceServiceRecord(item) && !IsOtherAbsenceServiceRecord(item)) { arbeitszeit += duration; } @@ -379,22 +401,31 @@ namespace VkmHamm return false; } + private bool IsOtherAbsenceServiceRecord(ServiceRecord item) + { + if (item.Start.HasValue && item.Start.Value >= new DateTime(2024, 04, 1) && item.Notice != null && item.Notice.Length > 0 && + (item.Notice.Trim().ToLower() == "ü-frei" || item.Notice.Trim().ToLower() == "fortbildung" || item.Notice.Trim().ToLower().Contains("reha"))) + return true; + + return false; + } + public virtual bool IsServiceRecordFehlzeit(ServiceRecord sr) { - if (sr.Start.HasValue && sr.Start.Value >= new DateTime(2024, 04, 1) && sr.Notice != null && sr.Notice.Length > 0 && (sr.Notice.Trim().ToLower() == "krank" || sr.Notice.Trim().ToLower() == "urlaub")) + if (sr.Start.HasValue && sr.Start.Value >= new DateTime(2024, 04, 1) && sr.Notice != null && sr.Notice.Length > 0 && (sr.Notice.Trim().ToLower() == "ü-frei")) return true; return false; } protected override AbsenceTimeHours GetAbwesenheitenDurchServiceRecords(MitarbeiterstundenkontoRO.EmployeeDetail empDetail, Contract c, IList groupFilteredRecords, DateTime berichtsAnfang, DateTime berichtsEnde) { - var abwesenheitenImZeitraum = groupFilteredRecords.Where(sr => sr.Start >= berichtsAnfang && sr.End <= berichtsEnde && (IsKrankAbsenceServiceRecord(sr) || IsUrlaubAbsenceServiceRecord(sr))).ToList(); + var abwesenheitenImZeitraum = groupFilteredRecords.Where(sr => sr.Start >= berichtsAnfang && sr.End <= berichtsEnde && (IsKrankAbsenceServiceRecord(sr) || IsUrlaubAbsenceServiceRecord(sr) || IsOtherAbsenceServiceRecord(sr))).ToList(); if (abwesenheitenImZeitraum.Count > 0) { var ath = new AbsenceTimeHours() { StundenKrankheit = Convert.ToDecimal(abwesenheitenImZeitraum.Where(sr => IsKrankAbsenceServiceRecord(sr)).ToList().Sum(sr => sr.DurationMinutes) / 60), - StundenSonstiges = 0, + StundenSonstiges = Convert.ToDecimal(abwesenheitenImZeitraum.Where(sr => IsOtherAbsenceServiceRecord(sr)).ToList().Sum(sr => sr.DurationMinutes) / 60), StundenUrlaub = Convert.ToDecimal(abwesenheitenImZeitraum.Where(sr => IsUrlaubAbsenceServiceRecord(sr)).ToList().Sum(sr => sr.DurationMinutes) / 60) }; diff --git a/ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.designer.cs b/ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.designer.cs index ef93f2b98..3f631f8d7 100644 --- a/ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.designer.cs +++ b/ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.designer.cs @@ -33,7 +33,9 @@ namespace VkmHamm DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary4 = 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(); @@ -110,7 +112,6 @@ namespace VkmHamm this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); 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(); @@ -128,6 +129,12 @@ namespace VkmHamm this.fieldSumHoliday2 = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell39 = 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(); @@ -162,7 +169,7 @@ namespace VkmHamm 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(701.3022F, 22F); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(739.2189F, 22F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UseFont = false; this.xrTableDetail.StylePriority.UsePadding = false; @@ -178,7 +185,8 @@ namespace VkmHamm this.xrTableCell22, this.xrTableCell12, this.xrTableCell67, - this.xrTableCell27}); + this.xrTableCell27, + this.xrTableCell35}); this.xrTableRowDetail.FormattingRules.Add(this.ruleIstFeiertagOderWE); this.xrTableRowDetail.Name = "xrTableRowDetail"; this.xrTableRowDetail.Weight = 0.88D; @@ -202,7 +210,7 @@ namespace VkmHamm new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.ZeitraeumeString", "{0:HH:mm}")}); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.Text = "xrTableCell20"; - this.xrTableCell20.Weight = 0.24119434262079117D; + this.xrTableCell20.Weight = 0.19345792830568964D; // // xrTableCell31 // @@ -212,7 +220,7 @@ namespace VkmHamm this.xrTableCell31.StylePriority.UseTextAlignment = false; this.xrTableCell31.Text = "xrTableCell31"; this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell31.Weight = 0.1905435295898936D; + this.xrTableCell31.Weight = 0.18803113128261387D; // // xrTableCell22 // @@ -222,7 +230,7 @@ namespace VkmHamm this.xrTableCell22.Name = "xrTableCell22"; this.xrTableCell22.StylePriority.UseTextAlignment = false; this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell22.Weight = 0.078388157812177867D; + this.xrTableCell22.Weight = 0.073363333595114488D; // // xrTableCell12 // @@ -233,7 +241,7 @@ namespace VkmHamm this.xrTableCell12.StylePriority.UseTextAlignment = false; this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell12.TextFormatString = "{0}"; - this.xrTableCell12.Weight = 0.078388162033818931D; + this.xrTableCell12.Weight = 0.0959753090173279D; // // xrTableCell67 // @@ -244,7 +252,7 @@ namespace VkmHamm this.xrTableCell67.Text = "xrTableCell67"; this.xrTableCell67.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell67.TextFormatString = "{0}"; - this.xrTableCell67.Weight = 0.078388159012220945D; + this.xrTableCell67.Weight = 0.083412928024276523D; // // xrTableCell27 // @@ -255,7 +263,7 @@ namespace VkmHamm this.xrTableCell27.Text = "xrTableCell27"; this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell27.TextFormatString = "{0}"; - this.xrTableCell27.Weight = 0.078388150491885092D; + this.xrTableCell27.Weight = 0.078388159692719728D; // // ruleIstFeiertagOderWE // @@ -314,7 +322,7 @@ namespace VkmHamm 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(701.3022F, 30F); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(739.2189F, 30F); this.xrTableHeader.StylePriority.UseBackColor = false; this.xrTableHeader.StylePriority.UseBorders = false; this.xrTableHeader.StylePriority.UseFont = false; @@ -331,7 +339,8 @@ namespace VkmHamm this.xrTableCell14, this.xrTableCell7, this.xrTableCell8, - this.xrTableCell10}); + this.xrTableCell10, + this.xrTableCell34}); this.xrTableRowHeader.Name = "xrTableRowHeader"; this.xrTableRowHeader.Weight = 0.79999999999999982D; // @@ -351,7 +360,7 @@ namespace VkmHamm this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.Text = "Uhrzeit"; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell2.Weight = 0.24887653550950245D; + this.xrTableCell2.Weight = 0.19961968512812472D; // // xrTableCell11 // @@ -360,7 +369,7 @@ namespace VkmHamm this.xrTableCell11.StylePriority.UseTextAlignment = false; this.xrTableCell11.Text = "Bemerkung"; this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell11.Weight = 0.19661247304552829D; + this.xrTableCell11.Weight = 0.194020034218609D; // // xrTableCell14 // @@ -369,7 +378,7 @@ namespace VkmHamm this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.Text = "km"; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell14.Weight = 0.080884872276445946D; + this.xrTableCell14.Weight = 0.075700004116494635D; // // xrTableCell7 // @@ -377,7 +386,7 @@ namespace VkmHamm this.xrTableCell7.StylePriority.UseTextAlignment = false; this.xrTableCell7.Text = "Stunden"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell7.Weight = 0.080884875873185991D; + this.xrTableCell7.Weight = 0.099032109057704168D; // // xrTableCell8 // @@ -386,7 +395,7 @@ namespace VkmHamm this.xrTableCell8.StylePriority.UseTextAlignment = false; this.xrTableCell8.Text = "Krank"; this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell8.Weight = 0.080884872265223978D; + this.xrTableCell8.Weight = 0.0860697594129498D; // // xrTableCell10 // @@ -396,7 +405,7 @@ namespace VkmHamm this.xrTableCell10.StylePriority.UseTextAlignment = false; this.xrTableCell10.Text = "Urlaub"; this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell10.Weight = 0.080884871622198942D; + this.xrTableCell10.Weight = 0.08088490010386068D; // // GroupHeader3 // @@ -434,7 +443,7 @@ namespace VkmHamm this.xrTableRow8, this.xrTableRow10, this.xrTableRow7}); - this.xrTable2.SizeF = new System.Drawing.SizeF(623.0334F, 72F); + this.xrTable2.SizeF = new System.Drawing.SizeF(739.2188F, 72F); this.xrTable2.StylePriority.UseBorders = false; this.xrTable2.StylePriority.UseFont = false; this.xrTable2.StylePriority.UsePadding = false; @@ -603,7 +612,7 @@ namespace VkmHamm this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow9}); - this.xrTable4.SizeF = new System.Drawing.SizeF(701.3022F, 22F); + this.xrTable4.SizeF = new System.Drawing.SizeF(739.2189F, 22F); this.xrTable4.StylePriority.UseBorders = false; this.xrTable4.StylePriority.UseFont = false; this.xrTable4.StylePriority.UsePadding = false; @@ -618,7 +627,8 @@ namespace VkmHamm this.tcSummeKm, this.cellSumMinutesTotalDecimal, this.cellSumHoursSickDecimal, - this.cellSumHoursInVacationDecimal}); + this.cellSumHoursInVacationDecimal, + this.xrTableCell37}); this.xrTableRow9.Name = "xrTableRow9"; this.xrTableRow9.Weight = 0.87999999999999978D; // @@ -631,7 +641,7 @@ namespace VkmHamm this.xrTableCell64.StylePriority.UseTextAlignment = false; this.xrTableCell64.Text = "Summe:"; this.xrTableCell64.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell64.Weight = 0.34269287854672692D; + this.xrTableCell64.Weight = 0.29195843483370243D; // // xrTableCell13 // @@ -639,7 +649,7 @@ namespace VkmHamm this.xrTableCell13.Name = "xrTableCell13"; this.xrTableCell13.StylePriority.UseTextAlignment = false; this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell13.Weight = 0.18595680840596432D; + this.xrTableCell13.Weight = 0.18677744323613429D; // // tcSummeKm // @@ -650,7 +660,7 @@ namespace VkmHamm this.tcSummeKm.StylePriority.UseTextAlignment = false; this.tcSummeKm.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.tcSummeKm.TextFormatString = "{0:0.00}"; - this.tcSummeKm.Weight = 0.07786552429323082D; + this.tcSummeKm.Weight = 0.072874275013605078D; // // cellSumMinutesTotalDecimal // @@ -664,7 +674,7 @@ namespace VkmHamm this.cellSumMinutesTotalDecimal.Summary = xrSummary1; this.cellSumMinutesTotalDecimal.Text = "cellSumMinutesTotalDecimal"; this.cellSumMinutesTotalDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellSumMinutesTotalDecimal.Weight = 0.077865524673783978D; + this.cellSumMinutesTotalDecimal.Weight = 0.0953354866495957D; // // cellSumHoursSickDecimal // @@ -679,7 +689,7 @@ namespace VkmHamm this.cellSumHoursSickDecimal.Summary = xrSummary2; this.cellSumHoursSickDecimal.Text = "cellSumHoursSickDecimal"; this.cellSumHoursSickDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellSumHoursSickDecimal.Weight = 0.077865523397693578D; + this.cellSumHoursSickDecimal.Weight = 0.082856717840377792D; // // cellSumHoursInVacationDecimal // @@ -695,7 +705,7 @@ namespace VkmHamm this.cellSumHoursInVacationDecimal.Summary = xrSummary3; this.cellSumHoursInVacationDecimal.Text = "cellSumHoursInVacationDecimal"; this.cellSumHoursInVacationDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellSumHoursInVacationDecimal.Weight = 0.077865555749319013D; + this.cellSumHoursInVacationDecimal.Weight = 0.077865510051867731D; // // xrTable1 // @@ -711,7 +721,7 @@ namespace VkmHamm this.xrTableRow2, this.xrTableRow5, this.xrTableRow6}); - this.xrTable1.SizeF = new System.Drawing.SizeF(700F, 100F); + this.xrTable1.SizeF = new System.Drawing.SizeF(739.2188F, 100F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -749,7 +759,7 @@ namespace VkmHamm this.cellSumMinutesTotalDecimal2.StylePriority.UseBorders = false; this.cellSumMinutesTotalDecimal2.StylePriority.UseTextAlignment = false; this.cellSumMinutesTotalDecimal2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellSumMinutesTotalDecimal2.Weight = 0.095076208582274377D; + this.cellSumMinutesTotalDecimal2.Weight = 0.058619045455791982D; // // xrTableCell17 // @@ -761,7 +771,7 @@ namespace VkmHamm this.xrTableCell17.StylePriority.UseTextAlignment = false; this.xrTableCell17.Text = "Überstunden neu:"; this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell17.Weight = 0.24488699135701075D; + this.xrTableCell17.Weight = 0.31462894338493175D; // // xrTableCell15 // @@ -773,7 +783,7 @@ namespace VkmHamm this.xrTableCell15.StylePriority.UseTextAlignment = false; this.xrTableCell15.Text = "xrTableCell15"; this.xrTableCell15.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell15.Weight = 0.11143078651026214D; + this.xrTableCell15.Weight = 0.11190624859289769D; // // xrTableRow3 // @@ -809,7 +819,7 @@ namespace VkmHamm this.xrTableCell30.StylePriority.UseTextAlignment = false; this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell30.TextFormatString = "{0:0.00}"; - this.xrTableCell30.Weight = 0.095076208582274377D; + this.xrTableCell30.Weight = 0.058619045455791982D; // // xrTableCell32 // @@ -822,7 +832,7 @@ namespace VkmHamm this.xrTableCell32.StylePriority.UseTextAlignment = false; this.xrTableCell32.Text = "Korridorstunden mit Faktor"; this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell32.Weight = 0.24488699135701075D; + this.xrTableCell32.Weight = 0.31462894338493175D; // // xrTableCell33 // @@ -835,7 +845,7 @@ namespace VkmHamm this.xrTableCell33.StylePriority.UseTextAlignment = false; this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell33.TextFormatString = "{0:0.00}"; - this.xrTableCell33.Weight = 0.11143078651026214D; + this.xrTableCell33.Weight = 0.11190624859289769D; // // xrTableRow2 // @@ -855,7 +865,7 @@ namespace VkmHamm this.xrTableCell4.StylePriority.UseBorders = false; this.xrTableCell4.StylePriority.UsePadding = false; this.xrTableCell4.StylePriority.UseTextAlignment = false; - this.xrTableCell4.Text = "Tatsächliche Soll-Stunden:"; + this.xrTableCell4.Text = "Stunden sonst. Abw.:"; this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell4.Weight = 0.15117847980058152D; // @@ -863,12 +873,15 @@ namespace VkmHamm // this.xrTableCell9.Borders = DevExpress.XtraPrinting.BorderSide.Top; this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.HoursOtherAbsenceTimes")}); 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.095076208582274377D; + this.xrTableCell9.Weight = 0.058619045455791982D; // // xrTableCell16 // @@ -880,7 +893,7 @@ namespace VkmHamm this.xrTableCell16.StylePriority.UseTextAlignment = false; this.xrTableCell16.Text = "Überstunden Vormonat:"; this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell16.Weight = 0.24488697763383488D; + this.xrTableCell16.Weight = 0.31462892966175582D; // // xrTableCell19 // @@ -891,7 +904,7 @@ namespace VkmHamm this.xrTableCell19.StylePriority.UseBorders = false; this.xrTableCell19.StylePriority.UseTextAlignment = false; this.xrTableCell19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell19.Weight = 0.11143080023343803D; + this.xrTableCell19.Weight = 0.11190626231607356D; // // xrTableRow5 // @@ -911,7 +924,7 @@ namespace VkmHamm this.sollStundenMonatLabelTableCell.StylePriority.UseBorders = false; this.sollStundenMonatLabelTableCell.StylePriority.UsePadding = false; this.sollStundenMonatLabelTableCell.StylePriority.UseTextAlignment = false; - this.sollStundenMonatLabelTableCell.Text = "Arbeitszeit:"; + this.sollStundenMonatLabelTableCell.Text = "Tatsächliche Soll-Stunden:"; this.sollStundenMonatLabelTableCell.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.sollStundenMonatLabelTableCell.Weight = 0.15117847215881841D; // @@ -919,15 +932,13 @@ namespace VkmHamm // this.xrTableCell50.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldHours")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit")}); this.xrTableCell50.Name = "xrTableCell50"; this.xrTableCell50.StylePriority.UseBorders = false; this.xrTableCell50.StylePriority.UseTextAlignment = false; - xrSummary4.FormatString = "{0:0.00}"; - xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell50.Summary = xrSummary4; this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell50.Weight = 0.095076207730348347D; + this.xrTableCell50.TextFormatString = "{0:0.00}"; + this.xrTableCell50.Weight = 0.058619044603865952D; // // xrTableCell51 // @@ -940,7 +951,7 @@ namespace VkmHamm this.xrTableCell51.StylePriority.UseTextAlignment = false; this.xrTableCell51.Text = "davon ausbezahlt:"; this.xrTableCell51.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell51.Weight = 0.24488696787504216D; + this.xrTableCell51.Weight = 0.31462894617303788D; // // xrTableCell18 // @@ -952,12 +963,14 @@ namespace VkmHamm this.xrTableCell18.StylePriority.UseTextAlignment = false; this.xrTableCell18.Text = "xrTableCell18"; this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell18.Weight = 0.11143081848591993D; + this.xrTableCell18.Weight = 0.11190625429848075D; // // xrTableRow6 // this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell58, + this.xrTableCell39, + this.xrTableCell38, this.xrTableCell26}); this.xrTableRow6.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.xrTableRow6.Name = "xrTableRow6"; @@ -967,15 +980,16 @@ namespace VkmHamm // xrTableCell58 // this.xrTableCell58.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell58.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrTableCell58.Name = "xrTableCell58"; this.xrTableCell58.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); this.xrTableCell58.StylePriority.UseBorders = false; this.xrTableCell58.StylePriority.UseFont = false; this.xrTableCell58.StylePriority.UsePadding = false; this.xrTableCell58.StylePriority.UseTextAlignment = false; - this.xrTableCell58.Text = "Überstunden Gesamt:"; + this.xrTableCell58.Text = "Arbeitszeit:"; this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell58.Weight = 0.4911416477642106D; + this.xrTableCell58.Weight = 0.15117847649609184D; // // xrTableCell26 // @@ -987,11 +1001,7 @@ namespace VkmHamm this.xrTableCell26.StylePriority.UseTextAlignment = false; this.xrTableCell26.Text = "xrTableCell26"; this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell26.Weight = 0.11143081848591821D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + this.xrTableCell26.Weight = 0.11190620175832955D; // // Title // @@ -1122,6 +1132,78 @@ namespace VkmHamm this.fieldUeberstundenGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldUeberstundenGesamt.Name = "fieldUeberstundenGesamt"; // + // xrTableCell34 + // + this.xrTableCell34.Multiline = true; + this.xrTableCell34.Name = "xrTableCell34"; + this.xrTableCell34.StylePriority.UseBackColor = false; + this.xrTableCell34.StylePriority.UseTextAlignment = false; + this.xrTableCell34.Text = "Sonstige"; + this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell34.Weight = 0.08088490010386068D; + // + // xrTableCell35 + // + this.xrTableCell35.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.HoursOtherAbsenceTimes")}); + this.xrTableCell35.Multiline = true; + this.xrTableCell35.Name = "xrTableCell35"; + this.xrTableCell35.StylePriority.UseTextAlignment = false; + this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell35.TextFormatString = "{0:0.00}"; + this.xrTableCell35.Weight = 0.078388159692719728D; + // + // xrTableCell37 + // + this.xrTableCell37.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.HoursOtherAbsenceTimes")}); + this.xrTableCell37.Multiline = true; + this.xrTableCell37.Name = "xrTableCell37"; + this.xrTableCell37.StylePriority.UseBackColor = false; + this.xrTableCell37.StylePriority.UseTextAlignment = false; + xrSummary4.FormatString = "{0:0.00}"; + xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell37.Summary = xrSummary4; + this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell37.Weight = 0.077865510051867731D; + // + // xrTableCell38 + // + this.xrTableCell38.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell38.Multiline = true; + this.xrTableCell38.Name = "xrTableCell38"; + this.xrTableCell38.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); + this.xrTableCell38.StylePriority.UseBorders = false; + this.xrTableCell38.StylePriority.UseFont = false; + this.xrTableCell38.StylePriority.UsePadding = false; + this.xrTableCell38.StylePriority.UseTextAlignment = false; + this.xrTableCell38.Text = "Überstunden Gesamt:"; + this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell38.Weight = 0.31462899213473922D; + // + // xrTableCell39 + // + this.xrTableCell39.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Days.fieldHours")}); + this.xrTableCell39.Font = new DevExpress.Drawing.DXFont("Arial", 10F); + this.xrTableCell39.Multiline = true; + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell39.StylePriority.UseBorders = false; + this.xrTableCell39.StylePriority.UseFont = false; + this.xrTableCell39.StylePriority.UsePadding = false; + this.xrTableCell39.StylePriority.UseTextAlignment = false; + xrSummary6.FormatString = "{0:0.00}"; + xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell39.Summary = xrSummary6; + this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell39.Weight = 0.058619046845042343D; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + // // Mitarbeiterarbeitszeitkonto // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1146,7 +1228,7 @@ namespace VkmHamm this.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleIstFeiertagOderWE}); - this.Margins = new DevExpress.Drawing.DXMargins(75F, 50F, 50F, 50F); + this.Margins = new DevExpress.Drawing.DXMargins(47F, 23F, 50F, 50F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -1263,5 +1345,10 @@ namespace VkmHamm private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; private DevExpress.XtraReports.UI.XRTableCell tcStundenkorridor; private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell35; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell38; } } diff --git a/ReportImp/VkmHamm/Mitarbeiterstundenkonto.cs b/ReportImp/VkmHamm/Mitarbeiterstundenkonto.cs index 12517fc7d..856694958 100644 --- a/ReportImp/VkmHamm/Mitarbeiterstundenkonto.cs +++ b/ReportImp/VkmHamm/Mitarbeiterstundenkonto.cs @@ -25,6 +25,12 @@ namespace VkmHamm { if (empDetail.StundenGesamtIst != 0) empDetail.RelationFlsZuMittelbar = (empDetail.FlsIst / (empDetail.FlsIst + empDetail.MittelbarIst)) * 100; + + foreach (var day in empDetail.Days) + { + if (day.HoursOtherAbsenceTimes > 0) + empDetail.Custom14 += day.HoursOtherAbsenceTimes / day.SollStunden; + } } this.bindingSource1.DataSource = pRO; diff --git a/ReportImp/VkmHamm/Mitarbeiterstundenkonto.designer.cs b/ReportImp/VkmHamm/Mitarbeiterstundenkonto.designer.cs index 2ede71b2d..0d2f0ee0d 100644 --- a/ReportImp/VkmHamm/Mitarbeiterstundenkonto.designer.cs +++ b/ReportImp/VkmHamm/Mitarbeiterstundenkonto.designer.cs @@ -33,13 +33,14 @@ namespace VkmHamm DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); - DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary8 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary9 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRSummary xrSummary10 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary11 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary4 = 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(); @@ -103,6 +104,9 @@ namespace VkmHamm this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell31 = 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(); @@ -152,6 +156,7 @@ namespace VkmHamm this.xrTableCell19, this.xrTableCell20, this.xrTableCell6, + this.xrTableCell21, this.xrTableCell33, this.xrTableCell28, this.xrTableCell23, @@ -175,7 +180,7 @@ namespace VkmHamm this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.Text = "xrTableCell3"; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell3.Weight = 0.11662984979379891D; + this.xrTableCell3.Weight = 0.11720893781665769D; // // xrTableCell19 // @@ -183,7 +188,7 @@ namespace VkmHamm new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")}); this.xrTableCell19.Name = "xrTableCell19"; this.xrTableCell19.Text = "xrTableCell19"; - this.xrTableCell19.Weight = 0.068580995227186956D; + this.xrTableCell19.Weight = 0.06892153105425608D; // // xrTableCell20 // @@ -191,7 +196,7 @@ namespace VkmHamm new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.TageUrlaub", "{0:0.00}")}); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.Text = "xrTableCell20"; - this.xrTableCell20.Weight = 0.066248904217210067D; + this.xrTableCell20.Weight = 0.064547012976701248D; // // xrTableCell6 // @@ -199,7 +204,7 @@ namespace VkmHamm new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.TageKrankheit", "{0:0.00}")}); this.xrTableCell6.Name = "xrTableCell6"; this.xrTableCell6.Text = "xrTableCell6"; - this.xrTableCell6.Weight = 0.068151058881433552D; + this.xrTableCell6.Weight = 0.080936336605828663D; // // xrTableCell33 // @@ -208,7 +213,7 @@ namespace VkmHamm this.xrTableCell33.Multiline = true; this.xrTableCell33.Name = "xrTableCell33"; this.xrTableCell33.TextFormatString = "{0:0.00}"; - this.xrTableCell33.Weight = 0.058933011138556521D; + this.xrTableCell33.Weight = 0.076169808777874715D; // // xrTableCell28 // @@ -216,7 +221,7 @@ namespace VkmHamm new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")}); this.xrTableCell28.Name = "xrTableCell28"; this.xrTableCell28.Text = "xrTableCell28"; - this.xrTableCell28.Weight = 0.075551478484678081D; + this.xrTableCell28.Weight = 0.0678205518983448D; // // xrTableCell23 // @@ -224,7 +229,7 @@ namespace VkmHamm new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom15", "{0:0.00}")}); this.xrTableCell23.Name = "xrTableCell23"; this.xrTableCell23.Text = "xrTableCell23"; - this.xrTableCell23.Weight = 0.097945170115763189D; + this.xrTableCell23.Weight = 0.0723119703518569D; // // xrTableCell25 // @@ -232,7 +237,7 @@ namespace VkmHamm new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")}); this.xrTableCell25.Name = "xrTableCell25"; this.xrTableCell25.Text = "xrTableCell25"; - this.xrTableCell25.Weight = 0.067849592793492092D; + this.xrTableCell25.Weight = 0.068186591018027765D; // // xrTableCell24 // @@ -240,7 +245,7 @@ namespace VkmHamm new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")}); this.xrTableCell24.Name = "xrTableCell24"; this.xrTableCell24.Text = "xrTableCell24"; - this.xrTableCell24.Weight = 0.0722522286789323D; + this.xrTableCell24.Weight = 0.072610869835652014D; // // xrTableCell26 // @@ -248,7 +253,7 @@ namespace VkmHamm new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")}); this.xrTableCell26.Name = "xrTableCell26"; this.xrTableCell26.Text = "xrTableCell26"; - this.xrTableCell26.Weight = 0.058314866566078843D; + this.xrTableCell26.Weight = 0.058604426245589231D; // // xrTableCell16 // @@ -257,7 +262,7 @@ namespace VkmHamm this.xrTableCell16.Multiline = true; this.xrTableCell16.Name = "xrTableCell16"; this.xrTableCell16.TextFormatString = "{0:0.00}"; - this.xrTableCell16.Weight = 0.058314866566078843D; + this.xrTableCell16.Weight = 0.058604412180089514D; // // xrTableCell17 // @@ -266,7 +271,7 @@ namespace VkmHamm this.xrTableCell17.Multiline = true; this.xrTableCell17.Name = "xrTableCell17"; this.xrTableCell17.TextFormatString = "{0:0.00}"; - this.xrTableCell17.Weight = 0.058314866566078843D; + this.xrTableCell17.Weight = 0.058959804373077428D; // // xrTableCell18 // @@ -321,6 +326,7 @@ namespace VkmHamm this.xrTableCell4, this.xrTableCell2, this.xrTableCell1, + this.xrTableCell12, this.xrTableCell32, this.xrTableCell9, this.xrTableCell11, @@ -354,33 +360,33 @@ namespace VkmHamm this.xrTableCell2.Multiline = true; this.xrTableCell2.Name = "xrTableCell2"; this.xrTableCell2.Text = "Urlaub/Tag"; - this.xrTableCell2.Weight = 0.066248907979937544D; + this.xrTableCell2.Weight = 0.064228080013663646D; // // xrTableCell1 // this.xrTableCell1.Name = "xrTableCell1"; this.xrTableCell1.Text = "Krankheit/Tag"; - this.xrTableCell1.Weight = 0.06815106550171765D; + this.xrTableCell1.Weight = 0.080536489713022838D; // // xrTableCell32 // this.xrTableCell32.Multiline = true; this.xrTableCell32.Name = "xrTableCell32"; this.xrTableCell32.Text = "Tatsächliche SOLL Stunden"; - this.xrTableCell32.Weight = 0.058933036908686176D; + this.xrTableCell32.Weight = 0.075793421887040455D; // // xrTableCell9 // this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.Text = "Gesamtstun-den lfd. Monat"; - this.xrTableCell9.Weight = 0.075551509241375658D; + this.xrTableCell9.Weight = 0.067485556174685629D; // // xrTableCell11 // this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.StylePriority.UseBackColor = false; - this.xrTableCell11.Text = "Korridorstunden mit Faktor"; - this.xrTableCell11.Weight = 0.097945173231715352D; + this.xrTableCell11.Text = "Korridorstun-den mit Faktor"; + this.xrTableCell11.Weight = 0.071954640060937367D; // // xrTableCell13 // @@ -427,7 +433,7 @@ namespace VkmHamm this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable1}); this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.GroupFooter1.HeightF = 48.95833F; + this.GroupFooter1.HeightF = 50F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // @@ -454,6 +460,7 @@ namespace VkmHamm this.xrTableCell37, this.xrTableCell39, this.cellSollGesamt, + this.xrTableCell31, this.xrTableCell34, this.cellGesamtGesamt, this.xrTableCell47, @@ -475,7 +482,7 @@ namespace VkmHamm this.xrTableCell35.StylePriority.UseTextAlignment = false; this.xrTableCell35.Text = "Gesamt"; this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell35.Weight = 0.11998071145968357D; + this.xrTableCell35.Weight = 0.11954775960513867D; // // xrTableCell37 // @@ -485,7 +492,7 @@ namespace VkmHamm xrSummary1.FormatString = "{0:0.00}"; xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.xrTableCell37.Summary = xrSummary1; - this.xrTableCell37.Weight = 0.070551403529493073D; + this.xrTableCell37.Weight = 0.070296801667429881D; // // xrTableCell39 // @@ -496,7 +503,7 @@ namespace VkmHamm xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.xrTableCell39.Summary = xrSummary2; this.xrTableCell39.TextFormatString = "{0:0.00}"; - this.xrTableCell39.Weight = 0.0700526689518739D; + this.xrTableCell39.Weight = 0.065835001423234729D; // // cellSollGesamt // @@ -507,7 +514,7 @@ namespace VkmHamm xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.cellSollGesamt.Summary = xrSummary3; this.cellSollGesamt.TextFormatString = "{0:0.00}"; - this.cellSollGesamt.Weight = 0.068208712965101517D; + this.cellSollGesamt.Weight = 0.082551359235113253D; // // xrTableCell34 // @@ -517,7 +524,7 @@ namespace VkmHamm this.xrTableCell34.Name = "xrTableCell34"; this.xrTableCell34.Text = "xrTableCell34"; this.xrTableCell34.TextFormatString = "{0:0.00}"; - this.xrTableCell34.Weight = 0.060626229033086523D; + this.xrTableCell34.Weight = 0.077689715812262264D; // // cellGesamtGesamt // @@ -525,37 +532,37 @@ namespace VkmHamm new DevExpress.XtraReports.UI.XRBinding("Text", null, "StundenGesamt", "{0:0.00}")}); this.cellGesamtGesamt.Name = "cellGesamtGesamt"; this.cellGesamtGesamt.Text = "cellGesamtGesamt"; - this.cellGesamtGesamt.Weight = 0.077722143539528943D; + this.cellGesamtGesamt.Weight = 0.069173742872277691D; // // xrTableCell47 // this.xrTableCell47.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom15")}); this.xrTableCell47.Name = "xrTableCell47"; - xrSummary4.FormatString = "{0:0.00}"; - xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell47.Summary = xrSummary4; - this.xrTableCell47.Weight = 0.10075913645105392D; + xrSummary5.FormatString = "{0:0.00}"; + xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell47.Summary = xrSummary5; + this.xrTableCell47.Weight = 0.073755010747008229D; // // xrTableCell48 // this.xrTableCell48.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden")}); this.xrTableCell48.Name = "xrTableCell48"; - xrSummary5.FormatString = "{0:0.00}"; - xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell48.Summary = xrSummary5; - this.xrTableCell48.Weight = 0.0697990121660843D; + xrSummary6.FormatString = "{0:0.00}"; + xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell48.Summary = xrSummary6; + this.xrTableCell48.Weight = 0.069547143138637774D; // // xrTableCell51 // this.xrTableCell51.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat")}); this.xrTableCell51.Name = "xrTableCell51"; - xrSummary6.FormatString = "{0:0.00}"; - xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell51.Summary = xrSummary6; - this.xrTableCell51.Weight = 0.074328106948123362D; + xrSummary7.FormatString = "{0:0.00}"; + xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell51.Summary = xrSummary7; + this.xrTableCell51.Weight = 0.0731445292891512D; // // xrTableCell22 // @@ -563,10 +570,10 @@ namespace VkmHamm new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt")}); this.xrTableCell22.Multiline = true; this.xrTableCell22.Name = "xrTableCell22"; - xrSummary7.FormatString = "{0:0.00}"; - xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell22.Summary = xrSummary7; - this.xrTableCell22.Weight = 0.059990293814106227D; + xrSummary8.FormatString = "{0:0.00}"; + xrSummary8.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell22.Summary = xrSummary8; + this.xrTableCell22.Weight = 0.060689115051217088D; // // xrTableCell27 // @@ -574,10 +581,10 @@ namespace VkmHamm new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsSoll")}); this.xrTableCell27.Multiline = true; this.xrTableCell27.Name = "xrTableCell27"; - xrSummary8.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell27.Summary = xrSummary8; + xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell27.Summary = xrSummary9; this.xrTableCell27.TextFormatString = "{0:0.00}"; - this.xrTableCell27.Weight = 0.059990128705477958D; + this.xrTableCell27.Weight = 0.0592913074683671D; // // xrTableCell29 // @@ -585,10 +592,10 @@ namespace VkmHamm new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst")}); this.xrTableCell29.Multiline = true; this.xrTableCell29.Name = "xrTableCell29"; - xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell29.Summary = xrSummary9; + xrSummary10.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell29.Summary = xrSummary10; this.xrTableCell29.TextFormatString = "{0:0.00}"; - this.xrTableCell29.Weight = 0.059990128705477958D; + this.xrTableCell29.Weight = 0.060256196905377132D; // // xrTableCell30 // @@ -596,10 +603,10 @@ namespace VkmHamm new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsDiff")}); this.xrTableCell30.Multiline = true; this.xrTableCell30.Name = "xrTableCell30"; - xrSummary10.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell30.Summary = xrSummary10; + xrSummary11.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell30.Summary = xrSummary11; this.xrTableCell30.TextFormatString = "{0:0.00}"; - this.xrTableCell30.Weight = 0.073639504603857972D; + this.xrTableCell30.Weight = 0.0733734364039588D; // // ReportHeader // @@ -707,6 +714,33 @@ namespace VkmHamm this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrTableCell12 + // + this.xrTableCell12.Multiline = true; + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Text = "Sonstige/Tag"; + this.xrTableCell12.Weight = 0.076774968792509182D; + // + // xrTableCell21 + // + this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom14")}); + this.xrTableCell21.Multiline = true; + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.TextFormatString = "{0:0.00}"; + this.xrTableCell21.Weight = 0.0771561851248824D; + // + // xrTableCell31 + // + this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom14")}); + this.xrTableCell31.Multiline = true; + this.xrTableCell31.Name = "xrTableCell31"; + xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell31.Summary = xrSummary4; + this.xrTableCell31.TextFormatString = "{0:0.00}"; + this.xrTableCell31.Weight = 0.07869577421887694D; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); @@ -809,5 +843,8 @@ namespace VkmHamm private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; } } diff --git a/ReportImp/VkmHamm/MitarbeiterstundenkontoJahr.cs b/ReportImp/VkmHamm/MitarbeiterstundenkontoJahr.cs index 393f8e618..e56f497d1 100644 --- a/ReportImp/VkmHamm/MitarbeiterstundenkontoJahr.cs +++ b/ReportImp/VkmHamm/MitarbeiterstundenkontoJahr.cs @@ -20,6 +20,18 @@ namespace VkmHamm var msb = new CustomMitarbeiterstundenkontoBerechnungMonate(); msb.CreateReport(pRO); + foreach (var info in pRO.EmployeeInfoList) + { + foreach (var empDetail in info.EmployeeDetails) + { + foreach (var day in empDetail.EmployeeDetail.Days) + { + if (day.HoursOtherAbsenceTimes > 0) + empDetail.EmployeeDetail.Custom14 += day.HoursOtherAbsenceTimes / day.SollStunden; + } + } + } + this.bindingSource1.DataSource = pRO; } diff --git a/ReportImp/VkmHamm/MitarbeiterstundenkontoJahr.designer.cs b/ReportImp/VkmHamm/MitarbeiterstundenkontoJahr.designer.cs index 0c7230f93..a9f1349b9 100644 --- a/ReportImp/VkmHamm/MitarbeiterstundenkontoJahr.designer.cs +++ b/ReportImp/VkmHamm/MitarbeiterstundenkontoJahr.designer.cs @@ -35,21 +35,8 @@ namespace VkmHamm 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 xrSummary6 = new DevExpress.XtraReports.UI.XRSummary(); this.Detail = 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.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRowHeader = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -96,12 +83,45 @@ namespace VkmHamm this.GroupHeader3 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); + this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell33 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell34 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell40 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell54 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell55 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell56 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -111,147 +131,12 @@ namespace VkmHamm this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // 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; - // - // 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, "EmployeeInfoList.EmployeeDetails.Monat", "{0:MMMM}")}); - 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.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, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.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, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.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, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.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, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.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, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.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, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.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, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.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, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.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, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.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, "EmployeeInfoList.EmployeeDetails.LaufendeGesamtsumme", "{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, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenGesamt", "{0:0.00}")}); - this.xrTableCell26.Name = "xrTableCell26"; - this.xrTableCell26.Text = "xrTableCell26"; - this.xrTableCell26.Weight = 0.063119927862939573D; - // // 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.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,8 +252,9 @@ namespace VkmHamm // // xrTable1 // - this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + 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, 37.29165F); 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[] { @@ -502,18 +388,18 @@ namespace VkmHamm // // 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 +413,7 @@ namespace VkmHamm 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 +423,7 @@ namespace VkmHamm 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 +433,7 @@ namespace VkmHamm 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 +443,7 @@ namespace VkmHamm 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"; // @@ -609,8 +495,8 @@ namespace VkmHamm // Detail3 // this.Detail3.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTableDetail}); - this.Detail3.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrTable3}); + this.Detail3.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F); this.Detail3.HeightF = 25F; this.Detail3.Name = "Detail3"; this.Detail3.StylePriority.UseFont = false; @@ -618,8 +504,9 @@ namespace VkmHamm // GroupHeader2 // this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2, this.xrTableHeader}); - this.GroupHeader2.HeightF = 70F; + this.GroupHeader2.HeightF = 148.5417F; this.GroupHeader2.Name = "GroupHeader2"; // // GroupHeader3 @@ -632,7 +519,7 @@ namespace VkmHamm // // 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"; @@ -646,9 +533,13 @@ namespace VkmHamm // this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable1}); - this.GroupFooter2.HeightF = 25F; + this.GroupFooter2.HeightF = 62.29165F; this.GroupFooter2.Name = "GroupFooter2"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoMonateRO); + // // fieldRelationGesamt // this.fieldRelationGesamt.DataMember = "EmployeeInfoList.EmployeeDetails"; @@ -656,9 +547,302 @@ namespace VkmHamm this.fieldRelationGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldRelationGesamt.Name = "fieldRelationGesamt"; // - // bindingSource1 + // xrTable2 // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoMonateRO); + 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 DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 92.91669F); + 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(1091F, 55.62499F); + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.StylePriority.UseFont = false; + this.xrTable2.StylePriority.UsePadding = false; + this.xrTable2.StylePriority.UseTextAlignment = false; + this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1, + this.xrTableCell6, + this.xrTableCell17, + this.xrTableCell18, + this.xrTableCell29, + this.xrTableCell32, + this.xrTableCell30, + this.xrTableCell31, + this.xrTableCell33, + this.xrTableCell34, + this.xrTableCell36, + this.xrTableCell38, + this.xrTableCell40, + this.xrTableCell41}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 2.2249996948242186D; + // + // xrTableCell1 + // + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell1.StylePriority.UsePadding = false; + this.xrTableCell1.StylePriority.UseTextAlignment = false; + this.xrTableCell1.Text = "Name"; + this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell1.Weight = 0.11662984641522821D; + // + // xrTableCell6 + // + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Text = "Reguläre SOLL Stunden"; + this.xrTableCell6.Weight = 0.06858101917519227D; + // + // xrTableCell17 + // + this.xrTableCell17.Multiline = true; + this.xrTableCell17.Name = "xrTableCell17"; + this.xrTableCell17.Text = "Urlaub/Tag"; + this.xrTableCell17.Weight = 0.064228080013663646D; + // + // xrTableCell18 + // + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.Text = "Krankheit/Tag"; + this.xrTableCell18.Weight = 0.080536489713022838D; + // + // xrTableCell29 + // + this.xrTableCell29.Multiline = true; + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.Text = "Sonstige/Tag"; + this.xrTableCell29.Weight = 0.076774968792509182D; + // + // xrTableCell32 + // + this.xrTableCell32.Multiline = true; + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.Text = "Tatsächliche SOLL Stunden"; + this.xrTableCell32.Weight = 0.075793421887040455D; + // + // xrTableCell30 + // + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.Text = "Gesamtstun-den lfd. Monat"; + this.xrTableCell30.Weight = 0.067485556174685629D; + // + // xrTableCell31 + // + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.StylePriority.UseBackColor = false; + this.xrTableCell31.Text = "Korridorstun-den mit Faktor"; + this.xrTableCell31.Weight = 0.071954640060937367D; + // + // xrTableCell33 + // + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.Text = "Überstd. neu"; + this.xrTableCell33.Weight = 0.067849655785374136D; + // + // xrTableCell34 + // + this.xrTableCell34.Name = "xrTableCell34"; + this.xrTableCell34.StylePriority.UseBackColor = false; + this.xrTableCell34.Text = "Überstd. Vormonat"; + this.xrTableCell34.Weight = 0.072252170714831546D; + // + // xrTableCell36 + // + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.Text = "Überstd. Gesamt"; + this.xrTableCell36.Weight = 0.05831483002881134D; + // + // xrTableCell38 + // + this.xrTableCell38.Multiline = true; + this.xrTableCell38.Name = "xrTableCell38"; + this.xrTableCell38.Text = "FLS-Stunden Soll"; + this.xrTableCell38.Weight = 0.05831483002881134D; + // + // xrTableCell40 + // + this.xrTableCell40.Multiline = true; + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.Text = "FLS IST lfd. Monat"; + this.xrTableCell40.Weight = 0.05831483002881134D; + // + // xrTableCell41 + // + this.xrTableCell41.Multiline = true; + this.xrTableCell41.Name = "xrTableCell41"; + this.xrTableCell41.Text = "FLS Plus/Minus lfd. Monat"; + this.xrTableCell41.Weight = 0.071582608752264409D; + // + // xrTable3 + // + this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTable3.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.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(1091F, 25F); + this.xrTable3.StylePriority.UseBorders = false; + this.xrTable3.StylePriority.UseFont = false; + this.xrTable3.StylePriority.UsePadding = false; + this.xrTable3.StylePriority.UseTextAlignment = false; + this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell42, + this.xrTableCell43, + this.xrTableCell44, + this.xrTableCell45, + this.xrTableCell46, + this.xrTableCell49, + this.xrTableCell50, + this.xrTableCell52, + this.xrTableCell53, + this.xrTableCell54, + this.xrTableCell55, + this.xrTableCell56, + this.xrTableCell57, + this.xrTableCell58}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 1D; + // + // xrTableCell42 + // + this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FullName")}); + this.xrTableCell42.Name = "xrTableCell42"; + this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell42.StylePriority.UseFont = false; + this.xrTableCell42.StylePriority.UsePadding = false; + this.xrTableCell42.StylePriority.UseTextAlignment = false; + this.xrTableCell42.Text = "xrTableCell3"; + this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell42.Weight = 0.11720893781665769D; + // + // xrTableCell43 + // + this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollMax", "{0:0.00}")}); + this.xrTableCell43.Name = "xrTableCell43"; + this.xrTableCell43.Text = "xrTableCell19"; + this.xrTableCell43.Weight = 0.06892153105425608D; + // + // xrTableCell44 + // + this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.TageUrlaub", "{0:0.00}")}); + this.xrTableCell44.Name = "xrTableCell44"; + this.xrTableCell44.Text = "xrTableCell20"; + this.xrTableCell44.Weight = 0.064547012976701248D; + // + // xrTableCell45 + // + this.xrTableCell45.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.TageKrankheit", "{0:0.00}")}); + this.xrTableCell45.Name = "xrTableCell45"; + this.xrTableCell45.Text = "xrTableCell6"; + this.xrTableCell45.Weight = 0.080936336605828663D; + // + // xrTableCell46 + // + this.xrTableCell46.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Days.HoursOtherAbsenceTimes")}); + this.xrTableCell46.Multiline = true; + this.xrTableCell46.Name = "xrTableCell46"; + xrSummary6.FormatString = "{0:0.00}"; + xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell46.Summary = xrSummary6; + this.xrTableCell46.TextFormatString = "{0:0.00}"; + this.xrTableCell46.Weight = 0.0771561851248824D; + // + // xrTableCell49 + // + this.xrTableCell49.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenSollOhneUrlaubKrankheit")}); + this.xrTableCell49.Multiline = true; + this.xrTableCell49.Name = "xrTableCell49"; + this.xrTableCell49.TextFormatString = "{0:0.00}"; + this.xrTableCell49.Weight = 0.076169808777874715D; + // + // xrTableCell50 + // + this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.StundenGesamtIst", "{0:0.00}")}); + this.xrTableCell50.Name = "xrTableCell50"; + this.xrTableCell50.Text = "xrTableCell28"; + this.xrTableCell50.Weight = 0.0678205518983448D; + // + // xrTableCell52 + // + this.xrTableCell52.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.Custom15", "{0:0.00}")}); + this.xrTableCell52.Name = "xrTableCell52"; + this.xrTableCell52.Text = "xrTableCell23"; + this.xrTableCell52.Weight = 0.0723119703518569D; + // + // xrTableCell53 + // + this.xrTableCell53.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")}); + this.xrTableCell53.Name = "xrTableCell53"; + this.xrTableCell53.Text = "xrTableCell25"; + this.xrTableCell53.Weight = 0.068186591018027765D; + // + // xrTableCell54 + // + this.xrTableCell54.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenVormonat", "{0:0.00}")}); + this.xrTableCell54.Name = "xrTableCell54"; + this.xrTableCell54.Text = "xrTableCell24"; + this.xrTableCell54.Weight = 0.072610869835652014D; + // + // xrTableCell55 + // + this.xrTableCell55.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenGesamt", "{0:0.00}")}); + this.xrTableCell55.Name = "xrTableCell55"; + this.xrTableCell55.Text = "xrTableCell26"; + this.xrTableCell55.Weight = 0.058604426245589231D; + // + // xrTableCell56 + // + this.xrTableCell56.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsSoll")}); + this.xrTableCell56.Multiline = true; + this.xrTableCell56.Name = "xrTableCell56"; + this.xrTableCell56.TextFormatString = "{0:0.00}"; + this.xrTableCell56.Weight = 0.058604412180089514D; + // + // xrTableCell57 + // + this.xrTableCell57.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsIst")}); + this.xrTableCell57.Multiline = true; + this.xrTableCell57.Name = "xrTableCell57"; + this.xrTableCell57.TextFormatString = "{0:0.00}"; + this.xrTableCell57.Weight = 0.058959804373077428D; + // + // xrTableCell58 + // + this.xrTableCell58.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.FlsDiff")}); + this.xrTableCell58.Multiline = true; + this.xrTableCell58.Name = "xrTableCell58"; + this.xrTableCell58.TextFormatString = "{0:0.00}"; + this.xrTableCell58.Weight = 0.0715824557052146D; // // MitarbeiterstundenkontoJahr // @@ -674,7 +858,7 @@ namespace VkmHamm 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(25F, 50F, 50F, 30F); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -683,11 +867,12 @@ namespace VkmHamm this.FieldCaption, this.PageInfo, this.DataField}); - this.Version = "17.1"; - ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit(); + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -706,9 +891,6 @@ namespace VkmHamm private DevExpress.XtraReports.UI.XRTable xrTableHeader; private DevExpress.XtraReports.UI.XRTableRow xrTableRowHeader; private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; - private DevExpress.XtraReports.UI.XRTable xrTableDetail; - private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; private DevExpress.XtraReports.UI.CalculatedField fieldFLS; private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1; @@ -720,17 +902,6 @@ namespace VkmHamm private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell27; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell25; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell24; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell26; private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; @@ -757,5 +928,37 @@ namespace VkmHamm private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2; private DevExpress.XtraReports.UI.CalculatedField fieldRelationGesamt; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell38; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell41; + private DevExpress.XtraReports.UI.XRTable xrTable3; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell43; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell44; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell45; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell46; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell49; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell50; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell52; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell53; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell54; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell55; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell56; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell57; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell58; } } diff --git a/ReportImp/VkmHamm/MitarbeiterstundenkontoJahr.resx b/ReportImp/VkmHamm/MitarbeiterstundenkontoJahr.resx index d25f3eba2..d58980a38 100644 --- a/ReportImp/VkmHamm/MitarbeiterstundenkontoJahr.resx +++ b/ReportImp/VkmHamm/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