From 8f1955ea0cfe5a8d18a620105f356a54b960b6a9 Mon Sep 17 00:00:00 2001 From: HirschleM Date: Thu, 23 Jul 2026 14:58:21 +0200 Subject: [PATCH] =?UTF-8?q?MH:=20HwHilfswerkInklusionUndTeilhabe=20Zuschl?= =?UTF-8?q?=C3=A4ge=20in=20Tages=20und=20Monatsansicht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...CustomMitarbeiterstundenkontoBerechnung.cs | 75 +++- .../Mitarbeiterstundenkonto.designer.cs | 372 ++++++++++++------ 2 files changed, 319 insertions(+), 128 deletions(-) diff --git a/ReportImp/HwHilfswerkInklusionUndTeilhabe/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/HwHilfswerkInklusionUndTeilhabe/CustomMitarbeiterstundenkontoBerechnung.cs index 6ca054819..52b3203f9 100644 --- a/ReportImp/HwHilfswerkInklusionUndTeilhabe/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/HwHilfswerkInklusionUndTeilhabe/CustomMitarbeiterstundenkontoBerechnung.cs @@ -107,6 +107,12 @@ namespace HwHilfswerkInklusionUndTeilhabe if (item.ServiceDescription != null && item.ServiceDescription.Category != null) { + // Claude: ProzentStundenkonto auf die IST-Dauer anwenden (analog GetDuration der + // Basisklasse und analog der Zuschlagsberechnung). Ohne dies bleiben StundenGesamtIst + // und die daraus abgeleiteten Ãœberstunden unreduziert, während Tagesansicht und + // Zuschläge die prozentuale Reduktion bereits berücksichtigen. + duration *= GetProzentStundenkontoFaktor(item); + if (item.Employee != null && IstNichtStationaer(item.Employee.GetValidContractForDate(item.Start))) { arbeitszeit += duration; @@ -196,15 +202,15 @@ namespace HwHilfswerkInklusionUndTeilhabe // ansonsten zählen alle Einträge als Arbeitszeit). if (!IsServiceRecordFehlzeit(item) && ZaehltAlsArbeitszeit(item)) { - decimal stunden = GetRecordDauerStunden(item); + // Claude: ProzentStundenkonto der Leistung/Kategorie auf die Zuschlagsstunden anwenden + // (analog GetDuration der Basisklasse). + decimal faktor = GetProzentStundenkontoFaktor(item); - if (item.Start.DayOfWeek == DayOfWeek.Sunday) - sonntagsStunden += stunden; - - if (IstFeiertag(item.Start)) - feiertagsStunden += stunden; - - weihnachtsStunden += GetWeihnachtsStunden(item, periodeStart.Year); + // Claude: Tagesgenaue Aufteilung, damit tagesübergreifende Einträge (z.B. Nachtbereitschaft + // 11.07. 20:00 - 12.07. 04:00) die am Sonntag/Feiertag geleisteten Stunden korrekt erfassen. + sonntagsStunden += GetSonntagsStunden(item) * faktor; + feiertagsStunden += GetFeiertagsStunden(item) * faktor; + weihnachtsStunden += GetWeihnachtsStunden(item, periodeStart.Year) * faktor; } } } @@ -232,10 +238,49 @@ namespace HwHilfswerkInklusionUndTeilhabe && item.ServiceDescription.Category.Name.ToLower().Contains("arbeitszeit"); } - // Claude: Dauer eines Records in Stunden (RoundedDuration bzw. GroupRoundedDuration sind Minuten). - private decimal GetRecordDauerStunden(StundenkontoServiceRecord item) + // Claude: ProzentStundenkonto-Faktor (0..1) analog GetDuration der Basisklasse (Default-Pfad, + // UseServiceDescriptionPercentage == false): ServiceDescription.ProzentStundenkonto hat Vorrang, + // danach Category.ProzentStundenkonto, sonst 100 %. + private decimal GetProzentStundenkontoFaktor(StundenkontoServiceRecord item) { - decimal minuten = item.GroupRoundedDuration.HasValue ? item.GroupRoundedDuration.Value : item.RoundedDuration; + decimal prozent = 100; + if (item.ServiceDescription != null) + { + if (item.ServiceDescription.ProzentStundenkonto.HasValue) + prozent = item.ServiceDescription.ProzentStundenkonto.Value; + else if (item.ServiceDescription.Category != null && item.ServiceDescription.Category.ProzentStundenkonto.HasValue) + prozent = item.ServiceDescription.Category.ProzentStundenkonto.Value; + } + return prozent / 100m; + } + + // Claude: Am Sonntag geleistete Stunden eines (ggf. tagesübergreifenden) Eintrags - tagesgenau + // über die tatsächlichen Start-/Endzeiten aufgeteilt. + private decimal GetSonntagsStunden(StundenkontoServiceRecord item) + { + decimal minuten = 0; + DateTime tag = item.Start.Date; + while (tag <= item.End.Date) + { + if (tag.DayOfWeek == DayOfWeek.Sunday) + minuten += (decimal)GetOverlappingMinutes(item.Start, item.End, tag, tag.AddDays(1)); + tag = tag.AddDays(1); + } + return minuten / 60m; + } + + // Claude: An Feiertagen geleistete Stunden eines (ggf. tagesübergreifenden) Eintrags - tagesgenau + // über die tatsächlichen Start-/Endzeiten aufgeteilt. + private decimal GetFeiertagsStunden(StundenkontoServiceRecord item) + { + decimal minuten = 0; + DateTime tag = item.Start.Date; + while (tag <= item.End.Date) + { + if (IstFeiertag(tag)) + minuten += (decimal)GetOverlappingMinutes(item.Start, item.End, tag, tag.AddDays(1)); + tag = tag.AddDays(1); + } return minuten / 60m; } @@ -245,13 +290,7 @@ namespace HwHilfswerkInklusionUndTeilhabe DateTime fensterStart = new DateTime(jahr, 12, 24, 14, 0, 0); DateTime fensterEnde = new DateTime(jahr, 12, 26).AddDays(1); // 27.12. 00:00 = bis einschl. 26.12. 23:59:59 - DateTime von = item.Start > fensterStart ? item.Start : fensterStart; - DateTime bis = item.End < fensterEnde ? item.End : fensterEnde; - - if (bis <= von) - return 0; - - return (decimal)(bis - von).TotalHours; + return (decimal)GetOverlappingMinutes(item.Start, item.End, fensterStart, fensterEnde) / 60m; } // Claude: true, wenn der Mitarbeiter in mindestens einem Team mit "wohngemeinschaft" im Namen ist. diff --git a/ReportImp/HwHilfswerkInklusionUndTeilhabe/Mitarbeiterstundenkonto.designer.cs b/ReportImp/HwHilfswerkInklusionUndTeilhabe/Mitarbeiterstundenkonto.designer.cs index f3cef0c02..102817e39 100644 --- a/ReportImp/HwHilfswerkInklusionUndTeilhabe/Mitarbeiterstundenkonto.designer.cs +++ b/ReportImp/HwHilfswerkInklusionUndTeilhabe/Mitarbeiterstundenkonto.designer.cs @@ -30,6 +30,12 @@ namespace BeWo.Report.DefaultReports private void InitializeComponent() { this.components = new System.ComponentModel.Container(); + DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary(); + DevExpress.XtraReports.UI.XRSummary 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(); @@ -43,11 +49,9 @@ namespace BeWo.Report.DefaultReports 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.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTableHeader = new DevExpress.XtraReports.UI.XRTable(); @@ -60,24 +64,18 @@ namespace BeWo.Report.DefaultReports this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); this.cellSollGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSSollGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSIstGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellFLSPlusMinusGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell(); - this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -95,6 +93,25 @@ namespace BeWo.Report.DefaultReports this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell32 = 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.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell37 = 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.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -147,11 +164,15 @@ namespace BeWo.Report.DefaultReports this.xrTableCell27, this.xrTableCell22, this.xrTableCell23, - this.xrTableCell21, this.xrTableCell25, this.xrTableCell24, this.xrTableCell26, - this.xrTableCell6}); + this.xrTableCell30, + this.xrTableCell31, + this.xrTableCell32, + this.xrTableCell33, + this.xrTableCell34, + this.xrTableCell36}); this.xrTableRowDetail.Name = "xrTableRowDetail"; this.xrTableRowDetail.Weight = 1D; // @@ -166,7 +187,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.Text = "xrTableCell3"; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell3.Weight = 0.15329125338142471D; + this.xrTableCell3.Weight = 0.10208865333708833D; // // xrTableCell19 // @@ -174,7 +195,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollMax", "{0:0.00}")}); this.xrTableCell19.Name = "xrTableCell19"; this.xrTableCell19.Text = "xrTableCell19"; - this.xrTableCell19.Weight = 0.081154151689479551D; + this.xrTableCell19.Weight = 0.0561071785622306D; // // xrTableCell20 // @@ -182,7 +203,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UrlaubUndKrankheit", "{0:0.00}")}); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.Text = "xrTableCell20"; - this.xrTableCell20.Weight = 0.094679933071566441D; + this.xrTableCell20.Weight = 0.0603541465001354D; // // xrTableCell28 // @@ -190,7 +211,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenSollOhneUrlaubKrankheit", "{0:0.00}")}); this.xrTableCell28.Name = "xrTableCell28"; this.xrTableCell28.Text = "xrTableCell28"; - this.xrTableCell28.Weight = 0.0721370604147881D; + this.xrTableCell28.Weight = 0.066554701015063611D; // // xrTableCell16 // @@ -198,7 +219,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsSoll", "{0:0.00}")}); this.xrTableCell16.Name = "xrTableCell16"; this.xrTableCell16.Text = "xrTableCell16"; - this.xrTableCell16.Weight = 0.063119927862939587D; + this.xrTableCell16.Weight = 0.051616632315479943D; // // xrTableCell27 // @@ -206,7 +227,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsIst", "{0:0.00}")}); this.xrTableCell27.Name = "xrTableCell27"; this.xrTableCell27.Text = "xrTableCell27"; - this.xrTableCell27.Weight = 0.063119927862939615D; + this.xrTableCell27.Weight = 0.050740967554329469D; // // xrTableCell22 // @@ -214,7 +235,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.FlsDiff", "{0:0.00}")}); this.xrTableCell22.Name = "xrTableCell22"; this.xrTableCell22.Text = "xrTableCell22"; - this.xrTableCell22.Weight = 0.063119927862939587D; + this.xrTableCell22.Weight = 0.062211559979775372D; // // xrTableCell23 // @@ -222,15 +243,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst", "{0:0.00}")}); this.xrTableCell23.Name = "xrTableCell23"; this.xrTableCell23.Text = "xrTableCell23"; - this.xrTableCell23.Weight = 0.063119927862939559D; - // - // xrTableCell21 - // - this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.RelationFlsZuMittelbar", "{0:0.00}")}); - this.xrTableCell21.Name = "xrTableCell21"; - this.xrTableCell21.Text = "xrTableCell21"; - this.xrTableCell21.Weight = 0.063119927862939615D; + this.xrTableCell23.Weight = 0.054987445273000563D; // // xrTableCell25 // @@ -238,7 +251,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Ueberstunden", "{0:0.00}")}); this.xrTableCell25.Name = "xrTableCell25"; this.xrTableCell25.Text = "xrTableCell25"; - this.xrTableCell25.Weight = 0.063119927862939587D; + this.xrTableCell25.Weight = 0.0568701237065416D; // // xrTableCell24 // @@ -246,7 +259,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenVormonat", "{0:0.00}")}); this.xrTableCell24.Name = "xrTableCell24"; this.xrTableCell24.Text = "xrTableCell24"; - this.xrTableCell24.Weight = 0.0631199278629396D; + this.xrTableCell24.Weight = 0.056958013346953523D; // // xrTableCell26 // @@ -254,16 +267,7 @@ namespace BeWo.Report.DefaultReports new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenGesamt", "{0:0.00}")}); this.xrTableCell26.Name = "xrTableCell26"; this.xrTableCell26.Text = "xrTableCell26"; - this.xrTableCell26.Weight = 0.063119927862939573D; - // - // xrTableCell6 - // - this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Resturlaub")}); - this.xrTableCell6.Multiline = true; - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.TextFormatString = "{0:0.00}"; - this.xrTableCell6.Weight = 0.063119927862939573D; + this.xrTableCell26.Weight = 0.056913960227203853D; // // DetailReport // @@ -313,11 +317,15 @@ namespace BeWo.Report.DefaultReports this.xrTableCell10, this.xrTableCell7, this.xrTableCell11, - this.xrTableCell12, this.xrTableCell13, this.xrTableCell14, this.xrTableCell15, - this.xrTableCell1}); + this.xrTableCell1, + this.xrTableCell6, + this.xrTableCell12, + this.xrTableCell18, + this.xrTableCell21, + this.xrTableCell29}); this.xrTableRowHeader.Name = "xrTableRowHeader"; this.xrTableRowHeader.Weight = 2.8D; // @@ -329,45 +337,45 @@ namespace BeWo.Report.DefaultReports this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "Name"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell5.Weight = 0.15329125016467182D; + this.xrTableCell5.Weight = 0.10992278134220325D; // // xrTableCell4 // this.xrTableCell4.Name = "xrTableCell4"; this.xrTableCell4.Text = "Reguläre SOLL Stunden"; - this.xrTableCell4.Weight = 0.081154192324637608D; + this.xrTableCell4.Weight = 0.060412762122516069D; // // xrTableCell2 // this.xrTableCell2.Name = "xrTableCell2"; this.xrTableCell2.Text = "Fehlzeiten Urlaub Krankheit(Tage)"; - this.xrTableCell2.Weight = 0.094679896646570338D; + this.xrTableCell2.Weight = 0.064985617423643241D; // // 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.071661988031053184D; // // xrTableCell8 // this.xrTableCell8.Name = "xrTableCell8"; this.xrTableCell8.Text = "FLS Stunden SOLL"; - this.xrTableCell8.Weight = 0.063119927721024038D; + this.xrTableCell8.Weight = 0.05557757691076172D; // // xrTableCell10 // this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.StylePriority.UseBackColor = false; this.xrTableCell10.Text = "FLS IST lfd. Monat"; - this.xrTableCell10.Weight = 0.063119927721024D; + this.xrTableCell10.Weight = 0.054634765796428932D; // // xrTableCell7 // this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.Text = "FLS Plus/Minus lfd. Monat"; - this.xrTableCell7.Weight = 0.06311992757910842D; + this.xrTableCell7.Weight = 0.0669855491304302D; // // xrTableCell11 // @@ -375,47 +383,33 @@ namespace BeWo.Report.DefaultReports this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.StylePriority.UseBackColor = false; this.xrTableCell11.Text = "Gesamt-\r\nstunden lfd. Monat"; - this.xrTableCell11.Weight = 0.063119927721024011D; - // - // xrTableCell12 - // - this.xrTableCell12.Multiline = true; - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Text = "Relation FLS IST zu Gesamt-stunden \r\n(in %)"; - this.xrTableCell12.Weight = 0.063119929511863376D; + this.xrTableCell11.Weight = 0.059207127055648276D; // // xrTableCell13 // this.xrTableCell13.Name = "xrTableCell13"; this.xrTableCell13.Text = "Überstd. neu"; - this.xrTableCell13.Weight = 0.063119928687401447D; + this.xrTableCell13.Weight = 0.061234334079615906D; // // xrTableCell14 // this.xrTableCell14.Name = "xrTableCell14"; this.xrTableCell14.StylePriority.UseBackColor = false; this.xrTableCell14.Text = "Überstd. Vormonat"; - this.xrTableCell14.Weight = 0.063119928275170531D; + this.xrTableCell14.Weight = 0.061328797076625564D; // // xrTableCell15 // this.xrTableCell15.Name = "xrTableCell15"; this.xrTableCell15.Text = "Überstd. Gesamt"; - this.xrTableCell15.Weight = 0.0631199213956443D; - // - // xrTableCell1 - // - this.xrTableCell1.Multiline = true; - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Text = "Resturlaub"; - this.xrTableCell1.Weight = 0.0631199213956443D; + this.xrTableCell15.Weight = 0.061281444146766929D; // // GroupFooter1 // 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 = 50.20835F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // @@ -439,18 +433,21 @@ namespace BeWo.Report.DefaultReports // this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell35, - this.xrTableCell37, this.xrTableCell39, this.cellSollGesamt, this.cellFLSSollGesamt, this.cellFLSIstGesamt, this.cellFLSPlusMinusGesamt, this.cellGesamtGesamt, - this.cellRelationGesamt, - this.xrTableCell47, this.xrTableCell48, this.xrTableCell51, - this.xrTableCell17}); + this.xrTableCell17, + this.xrTableCell37, + this.xrTableCell38, + this.xrTableCell40, + this.xrTableCell41, + this.xrTableCell42, + this.xrTableCell43}); this.xrTableRow1.Name = "xrTableRow1"; this.xrTableRow1.Weight = 1D; // @@ -463,17 +460,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell35.StylePriority.UseTextAlignment = false; this.xrTableCell35.Text = "Gesamt"; this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell35.Weight = 0.1527208718660181D; - // - // xrTableCell37 - // - this.xrTableCell37.Name = "xrTableCell37"; - this.xrTableCell37.Weight = 0.08085216800837608D; - // - // xrTableCell39 - // - this.xrTableCell39.Name = "xrTableCell39"; - this.xrTableCell39.Weight = 0.0943276875722075D; + this.xrTableCell35.Weight = 0.10170879312417225D; // // cellSollGesamt // @@ -481,7 +468,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.071868593785223173D; + this.cellSollGesamt.Weight = 0.066004616638566688D; // // cellFLSSollGesamt // @@ -489,7 +476,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.062885088357332058D; + this.cellFLSSollGesamt.Weight = 0.051727020228627081D; // // cellFLSIstGesamt // @@ -497,7 +484,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.062885033321122663D; + this.cellFLSIstGesamt.Weight = 0.050552162317435451D; // // cellFLSPlusMinusGesamt // @@ -505,7 +492,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.062885088357332058D; + this.cellFLSPlusMinusGesamt.Weight = 0.061980072969146545D; // // cellGesamtGesamt // @@ -513,36 +500,23 @@ 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.0628849782849132D; - // - // cellRelationGesamt - // - this.cellRelationGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "RelationFlsZuMittelbar", "{0:0.00}")}); - this.cellRelationGesamt.Name = "cellRelationGesamt"; - this.cellRelationGesamt.Text = "cellRelationGesamt"; - this.cellRelationGesamt.Weight = 0.062884978284913226D; - // - // xrTableCell47 - // - this.xrTableCell47.Name = "xrTableCell47"; - this.xrTableCell47.Weight = 0.062885088357332058D; + this.cellGesamtGesamt.Weight = 0.054782795550820267D; // // xrTableCell48 // this.xrTableCell48.Name = "xrTableCell48"; - this.xrTableCell48.Weight = 0.062884978284913212D; + this.xrTableCell48.Weight = 0.056658621889637391D; // // xrTableCell51 // this.xrTableCell51.Name = "xrTableCell51"; - this.xrTableCell51.Weight = 0.062885088357332045D; + this.xrTableCell51.Weight = 0.05674601938951182D; // // xrTableCell17 // this.xrTableCell17.Multiline = true; this.xrTableCell17.Name = "xrTableCell17"; - this.xrTableCell17.Weight = 0.062885253465960314D; + this.xrTableCell17.Weight = 0.056702155530949386D; // // bindingSource1 // @@ -668,6 +642,173 @@ namespace BeWo.Report.DefaultReports this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrTableCell1 + // + this.xrTableCell1.Multiline = true; + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Text = "Nacht-bereit-schaft"; + this.xrTableCell1.Weight = 0.052749133463774869D; + // + // xrTableCell6 + // + this.xrTableCell6.Multiline = true; + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Text = "Ein-spring-pau-schale"; + this.xrTableCell6.Weight = 0.052749133463774869D; + // + // xrTableCell12 + // + this.xrTableCell12.Multiline = true; + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Text = "Wechsel-schicht-pau-schale"; + this.xrTableCell12.Weight = 0.052749133463774869D; + // + // xrTableCell18 + // + this.xrTableCell18.Multiline = true; + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.Text = "Stunden am Sonntag"; + this.xrTableCell18.Weight = 0.052749133463774869D; + // + // xrTableCell21 + // + this.xrTableCell21.Multiline = true; + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.Text = "Stunden am Feiertag"; + this.xrTableCell21.Weight = 0.052749133463774869D; + // + // xrTableCell29 + // + this.xrTableCell29.Multiline = true; + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.Text = "Stunden über Weih-nachten"; + this.xrTableCell29.Weight = 0.052749133463774869D; + // + // xrTableCell30 + // + this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom1")}); + this.xrTableCell30.Multiline = true; + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.TextFormatString = "{0:C}"; + this.xrTableCell30.Weight = 0.048989695709380644D; + // + // xrTableCell31 + // + this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom2")}); + this.xrTableCell31.Multiline = true; + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.TextFormatString = "{0:C}"; + this.xrTableCell31.Weight = 0.048989695709380644D; + // + // xrTableCell32 + // + this.xrTableCell32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom6")}); + this.xrTableCell32.Multiline = true; + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.TextFormatString = "{0:C}"; + this.xrTableCell32.Weight = 0.048989695709380644D; + // + // xrTableCell33 + // + this.xrTableCell33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom3")}); + this.xrTableCell33.Multiline = true; + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.TextFormatString = "{0:0.00}"; + this.xrTableCell33.Weight = 0.048989695709380644D; + // + // xrTableCell34 + // + this.xrTableCell34.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom4")}); + this.xrTableCell34.Multiline = true; + this.xrTableCell34.Name = "xrTableCell34"; + this.xrTableCell34.TextFormatString = "{0:0.00}"; + this.xrTableCell34.Weight = 0.048989695709380644D; + // + // xrTableCell36 + // + this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom5")}); + this.xrTableCell36.Multiline = true; + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.TextFormatString = "{0:0.00}"; + this.xrTableCell36.Weight = 0.048989695709380644D; + // + // xrTableCell39 + // + this.xrTableCell39.Name = "xrTableCell39"; + this.xrTableCell39.Weight = 0.11602793496778616D; + // + // xrTableCell37 + // + this.xrTableCell37.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom1")}); + this.xrTableCell37.Multiline = true; + this.xrTableCell37.Name = "xrTableCell37"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell37.Summary = xrSummary1; + this.xrTableCell37.TextFormatString = "{0:C}"; + this.xrTableCell37.Weight = 0.04880748652723603D; + // + // xrTableCell38 + // + this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom2")}); + this.xrTableCell38.Multiline = true; + this.xrTableCell38.Name = "xrTableCell38"; + xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell38.Summary = xrSummary2; + this.xrTableCell38.TextFormatString = "{0:C}"; + this.xrTableCell38.Weight = 0.04880748652723603D; + // + // xrTableCell40 + // + this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom6")}); + this.xrTableCell40.Multiline = true; + this.xrTableCell40.Name = "xrTableCell40"; + xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell40.Summary = xrSummary3; + this.xrTableCell40.TextFormatString = "{0:C}"; + this.xrTableCell40.Weight = 0.04880748652723603D; + // + // xrTableCell41 + // + this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom3")}); + this.xrTableCell41.Multiline = true; + this.xrTableCell41.Name = "xrTableCell41"; + xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell41.Summary = xrSummary4; + this.xrTableCell41.TextFormatString = "{0:0.00}"; + this.xrTableCell41.Weight = 0.04880748652723603D; + // + // xrTableCell42 + // + this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom4")}); + this.xrTableCell42.Multiline = true; + this.xrTableCell42.Name = "xrTableCell42"; + xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell42.Summary = xrSummary5; + this.xrTableCell42.TextFormatString = "{0:0.00}"; + this.xrTableCell42.Weight = 0.04880748652723603D; + // + // xrTableCell43 + // + this.xrTableCell43.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom5")}); + this.xrTableCell43.Multiline = true; + this.xrTableCell43.Name = "xrTableCell43"; + xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell43.Summary = xrSummary6; + this.xrTableCell43.TextFormatString = "{0:0.00}"; + this.xrTableCell43.Weight = 0.04880748652723603D; + // // Mitarbeiterstundenkonto // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -729,7 +870,6 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRTableCell cellFLSIstGesamt; private DevExpress.XtraReports.UI.XRTableCell cellFLSPlusMinusGesamt; private DevExpress.XtraReports.UI.XRTableCell cellGesamtGesamt; - private DevExpress.XtraReports.UI.XRTableCell cellRelationGesamt; private DevExpress.XtraReports.UI.XRTable xrTableDetail; private DevExpress.XtraReports.UI.XRTableRow xrTableRowDetail; private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; @@ -740,7 +880,6 @@ namespace BeWo.Report.DefaultReports 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; @@ -754,18 +893,31 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; private DevExpress.XtraReports.UI.XRTableCell xrTableCell51; private DevExpress.XtraReports.UI.XRLabel xrLabel1; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell32; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell33; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell34; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell1; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell39; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell37; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell38; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell41; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell43; } }