diff --git a/ReportImp/PerspektivenEV/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/PerspektivenEV/CustomMitarbeiterstundenkontoBerechnung.cs index 3af0ddfa1..be1420b1a 100644 --- a/ReportImp/PerspektivenEV/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/PerspektivenEV/CustomMitarbeiterstundenkontoBerechnung.cs @@ -12,7 +12,14 @@ namespace PerspektivenEV public override bool IstAnrechenbareAbsenceTime(AbsenceTime item) { if (item.AbsenceReason.Description.ToLower().Contains("98 - ganzer tag überstundenabbau (abzug durch nicht-eintragung der arbeitszeit)") || - item.AbsenceReason.Description.ToLower().Contains("99 - sonstige abwesenheit (abzug durch nicht-eintragung der arbeitszeit)")) + item.AbsenceReason.Description.ToLower().Contains("99 - sonstige abwesenheit (abzug durch nicht-eintragung der arbeitszeit)") || + item.AbsenceReason.Description.ToLower().Contains("02a - kindkrank") || + item.AbsenceReason.Description.ToLower().Contains("04 - Wiedereingliederung") || + item.AbsenceReason.Description.ToLower().Contains("05 - Fortbildung") || + item.AbsenceReason.Description.ToLower().Contains("08 - Sonderurlaub") || + item.AbsenceReason.Description.ToLower().Contains("09 - Umwandlungstage SuE-Zulage") || + item.AbsenceReason.Description.ToLower().Contains("10 - Elternzeit") + ) { return false; } diff --git a/ReportImp/PerspektivenEV/Mitarbeiterarbeitszeitkonto.cs b/ReportImp/PerspektivenEV/Mitarbeiterarbeitszeitkonto.cs index 37ef95f4e..3b9cb1f67 100644 --- a/ReportImp/PerspektivenEV/Mitarbeiterarbeitszeitkonto.cs +++ b/ReportImp/PerspektivenEV/Mitarbeiterarbeitszeitkonto.cs @@ -24,6 +24,8 @@ namespace BeWo.Report.DefaultReports var msb = PluginLoader.FindClass(); msb.CreateReport(pRO); + pRO.ReportEndDate = pRO.ReportEndDate.AddTicks(-1); + foreach (var ed in pRO.EmployeeDetailList) { var c = ed.Employee.GetValidContractForDate(pRO.ReportStartDate); diff --git a/ReportImp/PerspektivenEV/Mitarbeiterarbeitszeitkonto.designer.cs b/ReportImp/PerspektivenEV/Mitarbeiterarbeitszeitkonto.designer.cs index 6c6b566c6..0d4d400e3 100644 --- a/ReportImp/PerspektivenEV/Mitarbeiterarbeitszeitkonto.designer.cs +++ b/ReportImp/PerspektivenEV/Mitarbeiterarbeitszeitkonto.designer.cs @@ -74,6 +74,9 @@ namespace BeWo.Report.DefaultReports this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell22 = 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(); @@ -103,7 +106,6 @@ namespace BeWo.Report.DefaultReports this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.Title = new DevExpress.XtraReports.UI.XRControlStyle(); this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle(); this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle(); @@ -122,9 +124,9 @@ namespace BeWo.Report.DefaultReports this.fieldIstArbeitszeit = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldUeberstundenGesamt = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldTatsSoll = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); @@ -424,7 +426,7 @@ namespace BeWo.Report.DefaultReports this.xrTableRow8, this.xrTableRow10, this.xrTableRow3}); - this.xrTable2.SizeF = new System.Drawing.SizeF(552.2002F, 72F); + this.xrTable2.SizeF = new System.Drawing.SizeF(643.8669F, 72F); this.xrTable2.StylePriority.UseBorders = false; this.xrTable2.StylePriority.UseFont = false; this.xrTable2.StylePriority.UsePadding = false; @@ -449,7 +451,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell1.StylePriority.UseTextAlignment = false; this.xrTableCell1.Text = "Mitarbeiter/in:"; this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell1.Weight = 0.138246012405208D; + this.xrTableCell1.Weight = 0.19760675885726622D; // // xrTableCell25 // @@ -461,7 +463,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell25.StylePriority.UseFont = false; this.xrTableCell25.StylePriority.UseTextAlignment = false; this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell25.Weight = 0.49791629021026568D; + this.xrTableCell25.Weight = 0.43855554375820743D; // // xrTableRow8 // @@ -481,7 +483,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell6.StylePriority.UseTextAlignment = false; this.xrTableCell6.Text = "Regelarbeitszeit:"; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell6.Weight = 0.138246012405208D; + this.xrTableCell6.Weight = 0.19760675885726622D; // // cellRegelarbeitszeit // @@ -492,7 +494,7 @@ namespace BeWo.Report.DefaultReports this.cellRegelarbeitszeit.StylePriority.UseTextAlignment = false; this.cellRegelarbeitszeit.Text = "cellRegelarbeitszeit"; this.cellRegelarbeitszeit.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.cellRegelarbeitszeit.Weight = 0.49791629021026573D; + this.cellRegelarbeitszeit.Weight = 0.43855554375820749D; // // xrTableRow10 // @@ -514,7 +516,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell21.StylePriority.UseTextAlignment = false; this.xrTableCell21.Text = "Soll-Stunden:"; this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell21.Weight = 0.138246012405208D; + this.xrTableCell21.Weight = 0.19760677393346698D; // // xrTableCell24 // @@ -523,7 +525,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell24.Name = "xrTableCell24"; this.xrTableCell24.StylePriority.UseTextAlignment = false; this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell24.Weight = 0.17215478017129932D; + this.xrTableCell24.Weight = 0.14800822649448708D; // // xrTableCell28 // @@ -533,7 +535,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell28.StylePriority.UseTextAlignment = false; this.xrTableCell28.Text = "Arbeitstage diesen Monat:"; this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell28.Weight = 0.213129273221085D; + this.xrTableCell28.Weight = 0.17791506536963825D; // // xrTableCell23 // @@ -545,6 +547,40 @@ namespace BeWo.Report.DefaultReports this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell23.Weight = 0.11263223681788141D; // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell14, + this.xrTableCell22, + this.xrTableCell29, + this.xrTableCell30}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 0.75540991165010141D; + // + // xrTableCell14 + // + this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell14.Multiline = true; + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell14.StylePriority.UseFont = false; + this.xrTableCell14.StylePriority.UsePadding = false; + this.xrTableCell14.StylePriority.UseTextAlignment = false; + this.xrTableCell14.Text = "Resturlaub zum [ReportEndDate!dd.MM.yyyy]:"; + this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell14.Weight = 0.19760675885726622D; + // + // xrTableCell22 + // + this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Resturlaub")}); + this.xrTableCell22.Multiline = true; + this.xrTableCell22.Name = "xrTableCell22"; + this.xrTableCell22.StylePriority.UseTextAlignment = false; + this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell22.TextFormatString = "{0:0.00}"; + this.xrTableCell22.Weight = 0.14800828921261261D; + // // GroupFooter2 // this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -911,10 +947,6 @@ namespace BeWo.Report.DefaultReports 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; @@ -1051,37 +1083,30 @@ namespace BeWo.Report.DefaultReports this.fieldTatsSoll.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldTatsSoll.Name = "fieldTatsSoll"; // - // xrTableRow3 + // bindingSource1 // - this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell14, - this.xrTableCell22}); - this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.75540991165010141D; + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); // - // xrTableCell14 + // xrTableCell29 // - this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrTableCell14.Multiline = true; - this.xrTableCell14.Name = "xrTableCell14"; - this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell14.StylePriority.UseFont = false; - this.xrTableCell14.StylePriority.UsePadding = false; - this.xrTableCell14.StylePriority.UseTextAlignment = false; - this.xrTableCell14.Text = "Resturlaub:"; - this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell14.Weight = 0.138246012405208D; + this.xrTableCell29.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell29.Multiline = true; + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.StylePriority.UseFont = false; + this.xrTableCell29.StylePriority.UseTextAlignment = false; + this.xrTableCell29.Text = "Reg.-tage zum [ReportEndDate!dd.MM.yyyy]:"; + this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell29.Weight = 0.1779149361770582D; // - // xrTableCell22 + // xrTableCell30 // - this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Resturlaub")}); - this.xrTableCell22.Multiline = true; - this.xrTableCell22.Name = "xrTableCell22"; - this.xrTableCell22.StylePriority.UseTextAlignment = false; - this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell22.TextFormatString = "{0:0.00}"; - this.xrTableCell22.Weight = 0.49791629021026573D; + this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom25")}); + this.xrTableCell30.Multiline = true; + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.StylePriority.UseTextAlignment = false; + this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell30.Weight = 0.1126323183685367D; // // Mitarbeiterarbeitszeitkonto // @@ -1221,5 +1246,7 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; } } diff --git a/ReportImp/PerspektivenEV/Mitarbeiterstundenkonto.cs b/ReportImp/PerspektivenEV/Mitarbeiterstundenkonto.cs index ce1c4b0ee..77f74b624 100644 --- a/ReportImp/PerspektivenEV/Mitarbeiterstundenkonto.cs +++ b/ReportImp/PerspektivenEV/Mitarbeiterstundenkonto.cs @@ -22,7 +22,9 @@ namespace BeWo.Report.DefaultReports var msb = PluginLoader.FindClass(); msb.CreateReport(pRO); - this.bindingSource1.DataSource = pRO; + pRO.ReportEndDate = pRO.ReportEndDate.AddTicks(-1); + + this.bindingSource1.DataSource = pRO; } } diff --git a/ReportImp/PerspektivenEV/Mitarbeiterstundenkonto.designer.cs b/ReportImp/PerspektivenEV/Mitarbeiterstundenkonto.designer.cs index c0c75c327..828e611aa 100644 --- a/ReportImp/PerspektivenEV/Mitarbeiterstundenkonto.designer.cs +++ b/ReportImp/PerspektivenEV/Mitarbeiterstundenkonto.designer.cs @@ -32,9 +32,9 @@ namespace BeWo.Report.DefaultReports 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 xrSummary3 = 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(); @@ -51,6 +51,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell29 = 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(); @@ -68,6 +69,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell18 = 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(); @@ -84,8 +86,10 @@ namespace BeWo.Report.DefaultReports this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.lblMonat = new DevExpress.XtraReports.UI.XRLabel(); @@ -99,10 +103,7 @@ 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.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -257,6 +258,15 @@ namespace BeWo.Report.DefaultReports this.xrTableCell24.Text = "xrTableCell24"; this.xrTableCell24.Weight = 0.065051650359775018D; // + // xrTableCell29 + // + this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenAusbezahlt")}); + this.xrTableCell29.Multiline = true; + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.TextFormatString = "{0:0.00}"; + this.xrTableCell29.Weight = 0.072413005175999079D; + // // xrTableCell26 // this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -268,7 +278,7 @@ namespace BeWo.Report.DefaultReports // xrTableCell6 // this.xrTableCell6.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Resturlaub")}); + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom25")}); this.xrTableCell6.Multiline = true; this.xrTableCell6.Name = "xrTableCell6"; this.xrTableCell6.TextFormatString = "{0:0.00}"; @@ -327,7 +337,8 @@ namespace BeWo.Report.DefaultReports this.xrTableCell14, this.xrTableCell18, this.xrTableCell15, - this.xrTableCell1}); + this.xrTableCell1, + this.xrTableCell31}); this.xrTableRowHeader.Name = "xrTableRowHeader"; this.xrTableRowHeader.Weight = 2.8D; // @@ -406,6 +417,14 @@ namespace BeWo.Report.DefaultReports this.xrTableCell14.Text = "Überstd. Vormonat"; this.xrTableCell14.Weight = 0.065051586950130788D; // + // xrTableCell18 + // + this.xrTableCell18.Multiline = true; + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.StylePriority.UseBackColor = false; + this.xrTableCell18.Text = "Anpassung Überstunden"; + this.xrTableCell18.Weight = 0.072413055164153861D; + // // xrTableCell15 // this.xrTableCell15.Name = "xrTableCell15"; @@ -416,7 +435,7 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell1.Multiline = true; this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Text = "Resturlaub"; + this.xrTableCell1.Text = "Resturlaub\r\nzum\r\n[ReportEndDate!dd.MM.yyyy]"; this.xrTableCell1.Weight = 0.0631199213956443D; // // GroupFooter1 @@ -553,6 +572,17 @@ namespace BeWo.Report.DefaultReports this.xrTableCell48.Summary = xrSummary2; this.xrTableCell48.Weight = 0.064809590519044016D; // + // xrTableCell30 + // + this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenAusbezahlt")}); + this.xrTableCell30.Multiline = true; + this.xrTableCell30.Name = "xrTableCell30"; + xrSummary3.FormatString = "{0:0.00}"; + xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell30.Summary = xrSummary3; + this.xrTableCell30.Weight = 0.07214361015288992D; + // // xrTableCell51 // this.xrTableCell51.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -574,6 +604,10 @@ namespace BeWo.Report.DefaultReports this.xrTableCell17.Summary = xrSummary5; this.xrTableCell17.Weight = 0.062885253465960314D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + // // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -694,37 +728,12 @@ namespace BeWo.Report.DefaultReports this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // xrTableCell18 + // xrTableCell31 // - this.xrTableCell18.Multiline = true; - this.xrTableCell18.Name = "xrTableCell18"; - this.xrTableCell18.StylePriority.UseBackColor = false; - this.xrTableCell18.Text = "Anpassung Überstunden"; - this.xrTableCell18.Weight = 0.072413055164153861D; - // - // xrTableCell29 - // - this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenAusbezahlt")}); - this.xrTableCell29.Multiline = true; - this.xrTableCell29.Name = "xrTableCell29"; - this.xrTableCell29.TextFormatString = "{0:0.00}"; - this.xrTableCell29.Weight = 0.072413005175999079D; - // - // xrTableCell30 - // - this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.UeberstundenAusbezahlt")}); - this.xrTableCell30.Multiline = true; - this.xrTableCell30.Name = "xrTableCell30"; - xrSummary3.FormatString = "{0:0.00}"; - xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell30.Summary = xrSummary3; - this.xrTableCell30.Weight = 0.07214361015288992D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + this.xrTableCell31.Multiline = true; + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.Text = "Reg.-tage\r\nzum [ReportEndDate!dd.MM.yyyy]\r\n"; + this.xrTableCell31.Weight = 0.0631199213956443D; // // Mitarbeiterstundenkonto // @@ -828,5 +837,6 @@ namespace BeWo.Report.DefaultReports private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; } } diff --git a/ReportImp/PerspektivenEV/MitarbeiterstundenkontoJahr.designer.cs b/ReportImp/PerspektivenEV/MitarbeiterstundenkontoJahr.designer.cs index 7465be32b..294a85568 100644 --- a/ReportImp/PerspektivenEV/MitarbeiterstundenkontoJahr.designer.cs +++ b/ReportImp/PerspektivenEV/MitarbeiterstundenkontoJahr.designer.cs @@ -36,10 +36,10 @@ namespace BeWo.Report.DefaultReports 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 xrSummary7 = new DevExpress.XtraReports.UI.XRSummary(); DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); @@ -54,6 +54,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell29 = 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(); @@ -69,6 +70,7 @@ namespace BeWo.Report.DefaultReports this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell18 = 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(); @@ -84,6 +86,7 @@ namespace BeWo.Report.DefaultReports this.cellGesamtGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.cellRelationGesamt = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell30 = 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(); @@ -108,9 +111,6 @@ namespace BeWo.Report.DefaultReports this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.fieldRelationGesamt = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -246,6 +246,15 @@ namespace BeWo.Report.DefaultReports this.xrTableCell25.Text = "xrTableCell25"; this.xrTableCell25.Weight = 0.063119927862939587D; // + // xrTableCell29 + // + this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenAusbezahlt")}); + this.xrTableCell29.Multiline = true; + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.TextFormatString = "{0:0.00}"; + this.xrTableCell29.Weight = 0.063119927862939587D; + // // xrTableCell24 // this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -377,6 +386,13 @@ namespace BeWo.Report.DefaultReports this.xrTableCell13.Text = "Überstd. neu"; this.xrTableCell13.Weight = 0.063119928687401447D; // + // xrTableCell18 + // + this.xrTableCell18.Multiline = true; + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.Text = "Anpass.\r\nÜber-stunden"; + this.xrTableCell18.Weight = 0.063119928687401447D; + // // xrTableCell14 // this.xrTableCell14.Multiline = true; @@ -396,7 +412,7 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell1.Multiline = true; this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Text = "Resturlaub"; + this.xrTableCell1.Text = "Resturlaub zum \r\nMonats-letzten"; this.xrTableCell1.Weight = 0.0631199213956443D; // // xrTable1 @@ -524,6 +540,17 @@ namespace BeWo.Report.DefaultReports this.xrTableCell47.Summary = xrSummary6; this.xrTableCell47.Weight = 0.063119927862939587D; // + // xrTableCell30 + // + this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenAusbezahlt")}); + this.xrTableCell30.Multiline = true; + this.xrTableCell30.Name = "xrTableCell30"; + xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell30.Summary = xrSummary7; + this.xrTableCell30.TextFormatString = "{0:0.00}"; + this.xrTableCell30.Weight = 0.063119927862939587D; + // // xrTableCell48 // this.xrTableCell48.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -738,33 +765,6 @@ namespace BeWo.Report.DefaultReports this.fieldRelationGesamt.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldRelationGesamt.Name = "fieldRelationGesamt"; // - // xrTableCell18 - // - this.xrTableCell18.Multiline = true; - this.xrTableCell18.Name = "xrTableCell18"; - this.xrTableCell18.Text = "Anpass.\r\nÜber-stunden"; - this.xrTableCell18.Weight = 0.063119928687401447D; - // - // xrTableCell29 - // - this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenAusbezahlt")}); - this.xrTableCell29.Multiline = true; - this.xrTableCell29.Name = "xrTableCell29"; - this.xrTableCell29.TextFormatString = "{0:0.00}"; - this.xrTableCell29.Weight = 0.063119927862939587D; - // - // xrTableCell30 - // - this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeInfoList.EmployeeDetails.EmployeeDetail.UeberstundenAusbezahlt")}); - this.xrTableCell30.Multiline = true; - this.xrTableCell30.Name = "xrTableCell30"; - xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell30.Summary = xrSummary7; - this.xrTableCell30.TextFormatString = "{0:0.00}"; - this.xrTableCell30.Weight = 0.063119927862939587D; - // // MitarbeiterstundenkontoJahr // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {