diff --git a/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs b/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs index a87743712..e4c978b62 100644 --- a/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/VkmHamm/CustomerMitarbeiterstundenkontoBerechnung.cs @@ -50,7 +50,7 @@ namespace VkmHamm { var dd = dayToDetail[sr.Start.Value.Day]; - if (/*!IsServiceRecordFehlzeit(sr) && */AddServiceRecordToDuration(sr)) + if (sr.ServiceDescription != null && sr.ServiceDescription.ServiceCategory.Name == "Arbeitszeit") { decimal duration = GetDuration(sr, ed); if (IsUrlaubAbsenceServiceRecord(sr)) @@ -198,9 +198,9 @@ namespace VkmHamm public override bool AddServiceRecordToDuration(ServiceRecord item) { - if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null) + if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null && !IsKrankAbsenceServiceRecord(item) && !IsUrlaubAbsenceServiceRecord(item)) { - if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit" && !IsKrankAbsenceServiceRecord(item) && !IsUrlaubAbsenceServiceRecord(item)) + if (item.ServiceDescription.ServiceCategory.Name == "Arbeitszeit") { return true; } @@ -315,6 +315,7 @@ namespace VkmHamm } } } + protected override decimal? BerechneUeberstunden(MitarbeiterstundenkontoRO.EmployeeDetail ed, decimal? ueberstundenStd, Contract contract, DateTime start, DateTime ende) { if (start < new DateTime(2024, 02, 01)) @@ -341,7 +342,6 @@ namespace VkmHamm return ueberstundenStd; } - // public override void CreateEmployeeDetails(MitarbeiterstundenkontoRO ro) // { // // Anpassung: a) Abwesenheiten durch Servicerecords @@ -407,6 +407,7 @@ namespace VkmHamm return false; } + private bool IsKrankAbsenceServiceRecord(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() == "krank") @@ -414,12 +415,14 @@ namespace VkmHamm 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")) 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(); diff --git a/ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.designer.cs b/ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.designer.cs index 925949950..01862f736 100644 --- a/ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.designer.cs +++ b/ReportImp/VkmHamm/Mitarbeiterarbeitszeitkonto.designer.cs @@ -74,6 +74,9 @@ namespace VkmHamm this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell(); + this.tcStundenkorridor = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow9 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -107,6 +110,7 @@ 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(); @@ -124,10 +128,6 @@ namespace VkmHamm this.fieldSumHoliday2 = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); - this.tcStundenkorridor = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell36 = 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 +162,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(702.0001F, 22F); + this.xrTableDetail.SizeF = new System.Drawing.SizeF(701.3022F, 22F); this.xrTableDetail.StylePriority.UseBorders = false; this.xrTableDetail.StylePriority.UseFont = false; this.xrTableDetail.StylePriority.UsePadding = false; @@ -193,7 +193,7 @@ namespace VkmHamm this.xrTableCell3.StylePriority.UsePadding = false; this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell3.Weight = 0.069408200042972323D; + this.xrTableCell3.Weight = 0.10046015504952605D; this.xrTableCell3.XlsxFormatString = "ddd. dd.MM.yyyy"; // // xrTableCell20 @@ -202,7 +202,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.19453073128372625D; + this.xrTableCell20.Weight = 0.24119434262079117D; // // xrTableCell31 // @@ -212,7 +212,7 @@ namespace VkmHamm this.xrTableCell31.StylePriority.UseTextAlignment = false; this.xrTableCell31.Text = "xrTableCell31"; this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell31.Weight = 0.18569741360572162D; + this.xrTableCell31.Weight = 0.1905435295898936D; // // xrTableCell22 // @@ -222,7 +222,7 @@ namespace VkmHamm this.xrTableCell22.Name = "xrTableCell22"; this.xrTableCell22.StylePriority.UseTextAlignment = false; this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell22.Weight = 0.084886550335585578D; + this.xrTableCell22.Weight = 0.078388157812177867D; // // xrTableCell12 // @@ -233,7 +233,7 @@ namespace VkmHamm this.xrTableCell12.StylePriority.UseTextAlignment = false; this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell12.TextFormatString = "{0:0.00}"; - this.xrTableCell12.Weight = 0.092739392628634676D; + this.xrTableCell12.Weight = 0.078388162033818931D; // // xrTableCell67 // @@ -243,7 +243,7 @@ namespace VkmHamm this.xrTableCell67.StylePriority.UseTextAlignment = false; this.xrTableCell67.Text = "xrTableCell67"; this.xrTableCell67.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell67.Weight = 0.074960972619981137D; + this.xrTableCell67.Weight = 0.078388159012220945D; // // xrTableCell27 // @@ -253,7 +253,7 @@ namespace VkmHamm this.xrTableCell27.StylePriority.UseTextAlignment = false; this.xrTableCell27.Text = "xrTableCell27"; this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell27.Weight = 0.074960844488805425D; + this.xrTableCell27.Weight = 0.078388150491885092D; // // ruleIstFeiertagOderWE // @@ -312,7 +312,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(702F, 30F); + this.xrTableHeader.SizeF = new System.Drawing.SizeF(701.3022F, 30F); this.xrTableHeader.StylePriority.UseBackColor = false; this.xrTableHeader.StylePriority.UseBorders = false; this.xrTableHeader.StylePriority.UseFont = false; @@ -341,7 +341,7 @@ namespace VkmHamm this.xrTableCell5.StylePriority.UseTextAlignment = false; this.xrTableCell5.Text = "Datum"; this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell5.Weight = 0.075142773670084775D; + this.xrTableCell5.Weight = 0.10365986845090061D; // // xrTableCell2 // @@ -349,7 +349,7 @@ namespace VkmHamm this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.Text = "Uhrzeit"; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell2.Weight = 0.21060309066281205D; + this.xrTableCell2.Weight = 0.24887653550950245D; // // xrTableCell11 // @@ -358,7 +358,7 @@ namespace VkmHamm this.xrTableCell11.StylePriority.UseTextAlignment = false; this.xrTableCell11.Text = "Bemerkung"; this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell11.Weight = 0.20103994697733374D; + this.xrTableCell11.Weight = 0.19661247304552829D; // // xrTableCell14 // @@ -367,7 +367,7 @@ namespace VkmHamm this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.Text = "km"; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell14.Weight = 0.09189988618225009D; + this.xrTableCell14.Weight = 0.080884872276445946D; // // xrTableCell7 // @@ -375,7 +375,7 @@ namespace VkmHamm this.xrTableCell7.StylePriority.UseTextAlignment = false; this.xrTableCell7.Text = "Stunden"; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell7.Weight = 0.10040162426852979D; + this.xrTableCell7.Weight = 0.080884875873185991D; // // xrTableCell8 // @@ -384,7 +384,7 @@ namespace VkmHamm this.xrTableCell8.StylePriority.UseTextAlignment = false; this.xrTableCell8.Text = "Krank"; this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell8.Weight = 0.081154199562331691D; + this.xrTableCell8.Weight = 0.080884872265223978D; // // xrTableCell10 // @@ -394,7 +394,7 @@ namespace VkmHamm this.xrTableCell10.StylePriority.UseTextAlignment = false; this.xrTableCell10.Text = "Urlaub"; this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell10.Weight = 0.0811541853775325D; + this.xrTableCell10.Weight = 0.080884871622198942D; // // GroupHeader3 // @@ -553,6 +553,35 @@ namespace VkmHamm this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell23.Weight = 0.14263345752707424D; // + // xrTableRow7 + // + this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell36, + this.tcStundenkorridor}); + this.xrTableRow7.Name = "xrTableRow7"; + this.xrTableRow7.Weight = 0.75540991165010141D; + // + // xrTableCell36 + // + this.xrTableCell36.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell36.Multiline = true; + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell36.StylePriority.UseFont = false; + this.xrTableCell36.StylePriority.UsePadding = false; + this.xrTableCell36.StylePriority.UseTextAlignment = false; + this.xrTableCell36.Text = "Monatlicher Stundenkorridor:"; + this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell36.Weight = 0.24072693199653614D; + // + // tcStundenkorridor + // + this.tcStundenkorridor.Multiline = true; + this.tcStundenkorridor.Name = "tcStundenkorridor"; + this.tcStundenkorridor.StylePriority.UseTextAlignment = false; + this.tcStundenkorridor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.tcStundenkorridor.Weight = 0.47703886236140919D; + // // GroupFooter2 // this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -572,7 +601,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(702F, 22F); + this.xrTable4.SizeF = new System.Drawing.SizeF(701.3022F, 22F); this.xrTable4.StylePriority.UseBorders = false; this.xrTable4.StylePriority.UseFont = false; this.xrTable4.StylePriority.UsePadding = false; @@ -608,7 +637,7 @@ namespace VkmHamm this.xrTableCell13.Name = "xrTableCell13"; this.xrTableCell13.StylePriority.UseTextAlignment = false; this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell13.Weight = 0.14383372403190697D; + this.xrTableCell13.Weight = 0.18595680840596432D; // // tcSummeKm // @@ -619,7 +648,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.091851026972941424D; + this.tcSummeKm.Weight = 0.07786552429323082D; // // cellSumMinutesTotalDecimal // @@ -633,7 +662,7 @@ namespace VkmHamm this.cellSumMinutesTotalDecimal.Summary = xrSummary1; this.cellSumMinutesTotalDecimal.Text = "cellSumMinutesTotalDecimal"; this.cellSumMinutesTotalDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellSumMinutesTotalDecimal.Weight = 0.10034801527560705D; + this.cellSumMinutesTotalDecimal.Weight = 0.077865524673783978D; // // cellSumHoursSickDecimal // @@ -648,7 +677,7 @@ namespace VkmHamm this.cellSumHoursSickDecimal.Summary = xrSummary2; this.cellSumHoursSickDecimal.Text = "cellSumHoursSickDecimal"; this.cellSumHoursSickDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellSumHoursSickDecimal.Weight = 0.081111216580926154D; + this.cellSumHoursSickDecimal.Weight = 0.077865523397693578D; // // cellSumHoursInVacationDecimal // @@ -664,7 +693,7 @@ namespace VkmHamm this.cellSumHoursInVacationDecimal.Summary = xrSummary3; this.cellSumHoursInVacationDecimal.Text = "cellSumHoursInVacationDecimal"; this.cellSumHoursInVacationDecimal.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellSumHoursInVacationDecimal.Weight = 0.081110814806802156D; + this.cellSumHoursInVacationDecimal.Weight = 0.077865555749319013D; // // xrTable1 // @@ -707,7 +736,7 @@ namespace VkmHamm this.xrTableCell46.StylePriority.UseTextAlignment = false; this.xrTableCell46.Text = "Reguläre Soll-Stunden:"; this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell46.Weight = 0.17987241552156494D; + this.xrTableCell46.Weight = 0.15117847980058152D; // // cellSumMinutesTotalDecimal2 // @@ -718,7 +747,7 @@ namespace VkmHamm this.cellSumMinutesTotalDecimal2.StylePriority.UseBorders = false; this.cellSumMinutesTotalDecimal2.StylePriority.UseTextAlignment = false; this.cellSumMinutesTotalDecimal2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.cellSumMinutesTotalDecimal2.Weight = 0.089936205759550983D; + this.cellSumMinutesTotalDecimal2.Weight = 0.095076208582274377D; // // xrTableCell17 // @@ -730,7 +759,7 @@ namespace VkmHamm this.xrTableCell17.StylePriority.UseTextAlignment = false; this.xrTableCell17.Text = "Überstunden neu:"; this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell17.Weight = 0.22133305845875073D; + this.xrTableCell17.Weight = 0.24488699135701075D; // // xrTableCell15 // @@ -765,7 +794,7 @@ namespace VkmHamm this.xrTableCell29.StylePriority.UseTextAlignment = false; this.xrTableCell29.Text = "Stunden Urlaub/Krankheit:"; this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell29.Weight = 0.17987241552156494D; + this.xrTableCell29.Weight = 0.15117847980058152D; // // xrTableCell30 // @@ -777,7 +806,7 @@ namespace VkmHamm this.xrTableCell30.StylePriority.UseBorders = false; this.xrTableCell30.StylePriority.UseTextAlignment = false; this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell30.Weight = 0.089936205759550983D; + this.xrTableCell30.Weight = 0.095076208582274377D; // // xrTableCell32 // @@ -790,7 +819,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.22133305845875073D; + this.xrTableCell32.Weight = 0.24488699135701075D; // // xrTableCell33 // @@ -825,7 +854,7 @@ namespace VkmHamm this.xrTableCell4.StylePriority.UseTextAlignment = false; this.xrTableCell4.Text = "Tatsächliche Soll-Stunden:"; this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell4.Weight = 0.17987241552156494D; + this.xrTableCell4.Weight = 0.15117847980058152D; // // xrTableCell9 // @@ -836,7 +865,7 @@ namespace VkmHamm this.xrTableCell9.StylePriority.UseBorders = false; this.xrTableCell9.StylePriority.UseTextAlignment = false; this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell9.Weight = 0.089936205759550983D; + this.xrTableCell9.Weight = 0.095076208582274377D; // // xrTableCell16 // @@ -848,7 +877,7 @@ namespace VkmHamm this.xrTableCell16.StylePriority.UseTextAlignment = false; this.xrTableCell16.Text = "Überstunden Vormonat:"; this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell16.Weight = 0.22133304473557486D; + this.xrTableCell16.Weight = 0.24488697763383488D; // // xrTableCell19 // @@ -881,7 +910,7 @@ namespace VkmHamm this.sollStundenMonatLabelTableCell.StylePriority.UseTextAlignment = false; this.sollStundenMonatLabelTableCell.Text = "Arbeitszeit:"; this.sollStundenMonatLabelTableCell.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.sollStundenMonatLabelTableCell.Weight = 0.17987240787980183D; + this.sollStundenMonatLabelTableCell.Weight = 0.15117847215881841D; // // xrTableCell50 // @@ -895,7 +924,7 @@ namespace VkmHamm xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; this.xrTableCell50.Summary = xrSummary4; this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell50.Weight = 0.089936204907624953D; + this.xrTableCell50.Weight = 0.095076207730348347D; // // xrTableCell51 // @@ -908,7 +937,7 @@ namespace VkmHamm this.xrTableCell51.StylePriority.UseTextAlignment = false; this.xrTableCell51.Text = "davon ausbezahlt:"; this.xrTableCell51.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell51.Weight = 0.22133303497678214D; + this.xrTableCell51.Weight = 0.24488696787504216D; // // xrTableCell18 // @@ -934,7 +963,7 @@ namespace VkmHamm // // xrTableCell58 // - this.xrTableCell58.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrTableCell58.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell58.Name = "xrTableCell58"; this.xrTableCell58.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 8, 0, 0, 100F); this.xrTableCell58.StylePriority.UseBorders = false; @@ -957,6 +986,10 @@ namespace VkmHamm this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; this.xrTableCell26.Weight = 0.11143081848591821D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + // // Title // this.Title.BackColor = System.Drawing.Color.White; @@ -1086,39 +1119,6 @@ namespace VkmHamm this.fieldUeberstundenGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldUeberstundenGesamt.Name = "fieldUeberstundenGesamt"; // - // xrTableRow7 - // - this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell36, - this.tcStundenkorridor}); - this.xrTableRow7.Name = "xrTableRow7"; - this.xrTableRow7.Weight = 0.75540991165010141D; - // - // tcStundenkorridor - // - this.tcStundenkorridor.Multiline = true; - this.tcStundenkorridor.Name = "tcStundenkorridor"; - this.tcStundenkorridor.StylePriority.UseTextAlignment = false; - this.tcStundenkorridor.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.tcStundenkorridor.Weight = 0.47703886236140919D; - // - // xrTableCell36 - // - this.xrTableCell36.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell36.Multiline = true; - this.xrTableCell36.Name = "xrTableCell36"; - this.xrTableCell36.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell36.StylePriority.UseFont = false; - this.xrTableCell36.StylePriority.UsePadding = false; - this.xrTableCell36.StylePriority.UseTextAlignment = false; - this.xrTableCell36.Text = "Monatlicher Stundenkorridor:"; - this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell36.Weight = 0.24072693199653614D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); - // // Mitarbeiterarbeitszeitkonto // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {