From ce9d40aeb335bb7fc5ebc074e3c088d11f4ae091 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 8 Nov 2024 15:44:26 +0100 Subject: [PATCH] =?UTF-8?q?BeWoAuxilio/CustomMitarbeiterstundenkontoBerech?= =?UTF-8?q?nung.cs=20-=20f=C3=BCr=20Bonussystem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...CustomMitarbeiterstundenkontoBerechnung.cs | 111 +++- .../BeWoAuxilio/Mitarbeiterstundenkonto.cs | 68 ++- .../Mitarbeiterstundenkonto.designer.cs | 517 +++++++++++++++++- .../BeWoAuxilio/Mitarbeiterstundenkonto.resx | 3 - 4 files changed, 662 insertions(+), 37 deletions(-) diff --git a/ReportImp/BeWoAuxilio/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/BeWoAuxilio/CustomMitarbeiterstundenkontoBerechnung.cs index 56297c331..69e1bad33 100644 --- a/ReportImp/BeWoAuxilio/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/BeWoAuxilio/CustomMitarbeiterstundenkontoBerechnung.cs @@ -3,11 +3,19 @@ using System.Collections.Generic; using BeWo.Data.Entities; using BeWo.Report.ReportObjects; using BS.Shared.Core; +using System.Linq; +using BeWo.Data.Access; +using BeWo.Service.DCEntityMapper; +using BS.Shared; +using BS.Shared.Extensions; + namespace BeWo.BeWoAuxilio { public class CustomMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung { + public decimal bonusVormonate = 0; + public DateTime reportStart; public override decimal GetFeiertagsFaktor(DateTime start) { // 24.12. und 31.12. halbe Tage @@ -23,15 +31,112 @@ namespace BeWo.BeWoAuxilio public override void CreateEmployeeDetails(MitarbeiterstundenkontoRO ro) { - base.CreateEmployeeDetails(ro); + reportStart = ro.ReportStartDate; + base.CreateEmployeeDetails(ro); foreach (var ed in ro.EmployeeDetailList) { - ed.FlsDiff = ed.Custom1 - ed.FlsSoll; + //ed.FlsDiff = ed.Custom1 - ed.FlsSoll; + var urlaubKrankheit = 0m; + if (ed.TageUrlaub.HasValue) + urlaubKrankheit += ed.TageUrlaub.Value; + if (ed.TageKrankheit.HasValue) + urlaubKrankheit += ed.TageKrankheit.Value; + + ed.UrlaubUndKrankheit = urlaubKrankheit; + + // Bonusberechnung + ed.Custom10 = bonusVormonate; + ed.Custom15 = 0.75m; + var preis = GetPreis(ro.ReportStartDate); + if (ed.Employee.LastContract.WeeklyTotalHours.HasValue && ed.Employee.LastContract.WeeklyFLS.HasValue) + { + ed.Custom15 = Math.Round(ed.Employee.LastContract.WeeklyFLS.Value / ed.Employee.LastContract.WeeklyTotalHours.Value, 2); + } + ed.Custom2 = ed.StundenSollOhneUrlaubKrankheit; // Monatssoll + ed.Custom3 = Math.Round(ed.Custom15 * ed.Custom2, 2, MidpointRounding.AwayFromZero); //FLSMonatsSoll + if (ed.UrlaubUndKrankheit < 3 && ed.StundenGesamtIst > ed.Custom2) + { + ed.Custom3 = Math.Round(ed.Custom15 * ed.StundenGesamtIst, 2, MidpointRounding.AwayFromZero); + ed.Custom14 = ed.Custom1 / ed.StundenGesamtIst; //FLS Quote Monat + ed.Custom13 = ed.Custom14 - ed.Custom15; // Quoten Diff zum Soll + if (ed.Custom13 > 0) + { + ed.Custom12 = Math.Round(ed.Custom1 - ed.Custom3, 2, MidpointRounding.AwayFromZero); + ed.Custom11 = ed.Custom12 * preis; + if (ed.Custom11 > 150) // Deckelung bei 150 € im Monat + { + ed.Custom11 = 150; + } + } + else + { + ed.Custom13 = 0; + } + } } } - public override bool ShouldCreateDayDetails() + protected override decimal? BerechneUeberstunden(MitarbeiterstundenkontoRO.EmployeeDetail ed, decimal? ueberstundenStd, Contract contract, DateTime start, DateTime ende) + { + // Bonusberechnung funktioniert fast, mir fehlt nur das ed.Custom1 + base.BerechneUeberstunden(ed, ueberstundenStd, contract, start, ende); + //if ((reportStart.Month == 3 || reportStart.Month == 6 || reportStart.Month == 9 || reportStart.Month == 12) + // && (start == reportStart.AddMonths(-2) || start == reportStart.AddMonths(-1))) + //{ + // decimal ratio = 75 / 100; + // if (contract.WeeklyFLS.HasValue && contract.WeeklyTotalHours.HasValue) + // { + // ratio = Math.Round(contract.WeeklyFLS.Value / contract.WeeklyTotalHours.Value, 2, MidpointRounding.AwayFromZero); + // } + // ed.FlsDiff = ed.Custom1 - ed.FlsSoll; + // var urlaubKrankheit = 0m; + // if (ed.TageUrlaub.HasValue) + // urlaubKrankheit += ed.TageUrlaub.Value; + // if (ed.TageKrankheit.HasValue) + // urlaubKrankheit += ed.TageKrankheit.Value; + + // var preis = GetPreis(start); + // ed.Custom2 = ed.StundenSollOhneUrlaubKrankheit; // Monatssoll + // ed.Custom3 = Math.Round(ratio * ed.Custom2, 2, MidpointRounding.AwayFromZero); //FLSMonatsSoll + // if (urlaubKrankheit < 3 && ed.StundenGesamtIst > ed.Custom2) + // { + // ed.Custom3 = Math.Round(ratio * ed.StundenGesamtIst, 2, MidpointRounding.AwayFromZero); + // ed.Custom14 = ed.Custom1 / ed.StundenGesamtIst; //FLS Quote Monat + // ed.Custom13 = ed.Custom14 - ratio; // Quoten Diff zum Soll + // if (ed.Custom13 > 0) + // { + // ed.Custom12 = Math.Round(ed.Custom1 - ed.Custom3, 2, MidpointRounding.AwayFromZero); + // var bonus = ed.Custom12 * preis; + // if (bonus > 150) // Deckelung bei 150 € im Monat + // { + // bonus = 150; + // } + // bonusVormonate += bonus; + // } + // } + //} + return ueberstundenStd; + } + + public virtual decimal GetPreis(DateTime datum) + { + var preise = DAOFactory.GenericDAO.GetAllActive(); + var preis = preise.Where(p => p.Name.Contains("Bonus")).FirstOrDefault(); + if (preis != null) + { + var crlist = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(preis.CostRatePeriods); + + var cr = crlist.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, datum); + if (cr != null && cr.CostRateValue.HasValue) + { + return cr.CostRateValue.Value; + } + } + return 13; + } + + public override bool ShouldCreateDayDetails() { return true; } diff --git a/ReportImp/BeWoAuxilio/Mitarbeiterstundenkonto.cs b/ReportImp/BeWoAuxilio/Mitarbeiterstundenkonto.cs index 90702581c..d5a027ffb 100644 --- a/ReportImp/BeWoAuxilio/Mitarbeiterstundenkonto.cs +++ b/ReportImp/BeWoAuxilio/Mitarbeiterstundenkonto.cs @@ -1,16 +1,19 @@ using System; +using System.Linq; +using BeWo.Data.Access; +using BeWo.Data.Entities; using BeWo.Report; using BeWo.Report.ReportObjects; +using BeWo.Service.DCEntityMapper; +using BS.Shared; using BS.Shared.Core; - +using BS.Shared.Extensions; namespace BeWo.BeWoAuxilio { [IDSpecificClass(Identifier = "Mitarbeiterstundenkonto")] public partial class Mitarbeiterstundenkonto : DevExpress.XtraReports.UI.XtraReport, IBeWoReport { - - public Mitarbeiterstundenkonto() { InitializeComponent(); @@ -23,17 +26,62 @@ namespace BeWo.BeWoAuxilio foreach (var emp in pRO.EmployeeDetailList) { - var urlaubKrankheit = 0m; - if (emp.TageUrlaub.HasValue) - urlaubKrankheit += emp.TageUrlaub.Value; - if (emp.TageKrankheit.HasValue) - urlaubKrankheit += emp.TageKrankheit.Value; + //var urlaubKrankheit = 0m; + //if (emp.TageUrlaub.HasValue) + // urlaubKrankheit += emp.TageUrlaub.Value; + //if (emp.TageKrankheit.HasValue) + // urlaubKrankheit += emp.TageKrankheit.Value; - emp.UrlaubUndKrankheit = urlaubKrankheit; + //emp.UrlaubUndKrankheit = urlaubKrankheit; + + + lblJaNein.Text = "Nein"; + lblSchwelle.Text = ""; + //emp.Custom15 = 0.75m; + //var preis = GetPreis(pRO.ReportStartDate); + //if (emp.Employee.LastContract.WeeklyTotalHours.HasValue && emp.Employee.LastContract.WeeklyFLS.HasValue) + //{ + // emp.Custom15 = Math.Round(emp.Employee.LastContract.WeeklyFLS.Value / emp.Employee.LastContract.WeeklyTotalHours.Value, 2); + //} + //emp.Custom2 = emp.Employee.LastContract.WeeklyTotalHours.Value * 4.33m; // Monatssoll + //emp.Custom3 = Math.Round(emp.Custom15 * emp.Custom2, 2, MidpointRounding.AwayFromZero); //FLSMonatsSoll + //if (emp.UrlaubUndKrankheit < 3 && emp.StundenGesamtIst > emp.Custom2) + //{ + // emp.Custom3 = Math.Round(emp.Custom15 * emp.StundenGesamtIst, 2, MidpointRounding.AwayFromZero); + // emp.Custom14 = emp.Custom1 / emp.StundenGesamtIst; //FLS Quote Monat + // emp.Custom13 = emp.Custom14 - emp.Custom15; // Quoten Diff zum Soll + if (emp.Custom13 > 0) + { + //emp.Custom12 = Math.Round(emp.Custom1 - emp.Custom3, 2, MidpointRounding.AwayFromZero); + //emp.Custom11 = emp.Custom12 * preis; + lblJaNein.Text = "Ja"; + lblSchwelle.Text = "Über Schwelle"; + } + // else + // { + // emp.Custom13 = 0; + // } + //} } this.bindingSource1.DataSource = pRO; } - } + public virtual decimal GetPreis(DateTime datum) + { + var preise = DAOFactory.GenericDAO.GetAllActive(); + var preis = preise.Where(p => p.Name.Contains("Bonus")).FirstOrDefault(); + if (preis != null) + { + var crlist = MapperFactory.CostRatePeriodDC_CostRatePeriod.MapToNewDCs(preis.CostRatePeriods); + + var cr = crlist.GetCostRatePeriodForDate(CostRatePeriodType.AmountOfMoney, datum); + if (cr != null && cr.CostRateValue.HasValue) + { + return cr.CostRateValue.Value; + } + } + return 13; + } + } } diff --git a/ReportImp/BeWoAuxilio/Mitarbeiterstundenkonto.designer.cs b/ReportImp/BeWoAuxilio/Mitarbeiterstundenkonto.designer.cs index 23f0bad28..7c60a3573 100644 --- a/ReportImp/BeWoAuxilio/Mitarbeiterstundenkonto.designer.cs +++ b/ReportImp/BeWoAuxilio/Mitarbeiterstundenkonto.designer.cs @@ -31,6 +31,7 @@ namespace BeWo.BeWoAuxilio { this.components = new System.ComponentModel.Container(); DevExpress.XtraReports.UI.XRSummary xrSummary1 = 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(); this.xrTableDetail = new DevExpress.XtraReports.UI.XRTable(); @@ -66,6 +67,43 @@ namespace BeWo.BeWoAuxilio this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell29 = 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.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell36 = 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(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell44 = 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.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell53 = 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(); + this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblSchwelle = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell62 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell63 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell64 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow7 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell65 = new DevExpress.XtraReports.UI.XRTableCell(); + this.lblJaNein = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell68 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell69 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell70 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -81,7 +119,6 @@ namespace BeWo.BeWoAuxilio this.xrTableCell47 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.lblMonat = new DevExpress.XtraReports.UI.XRLabel(); this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand(); @@ -96,8 +133,10 @@ namespace BeWo.BeWoAuxilio this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.fieldRelationAZFls = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldGesamtRelAZFls = new DevExpress.XtraReports.UI.CalculatedField(); + 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(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); @@ -113,7 +152,8 @@ namespace BeWo.BeWoAuxilio // this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableDetail}); - this.Detail1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.Detail1.HeightF = 25F; this.Detail1.Name = "Detail1"; this.Detail1.StylePriority.UseFont = false; @@ -122,7 +162,8 @@ namespace BeWo.BeWoAuxilio // this.xrTableDetail.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableDetail.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableDetail.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableDetail.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableDetail.Name = "xrTableDetail"; this.xrTableDetail.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -286,7 +327,7 @@ namespace BeWo.BeWoAuxilio 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); @@ -425,15 +466,409 @@ namespace BeWo.BeWoAuxilio // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable2, this.xrTable1}); - this.GroupFooter1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); - this.GroupFooter1.HeightF = 48.95833F; + this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); + this.GroupFooter1.HeightF = 220.4167F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // + // xrTable2 + // + this.xrTable2.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 60.62501F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F); + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow2, + this.xrTableRow3, + this.xrTableRow4, + this.xrTableRow5, + this.xrTableRow6, + this.xrTableRow7}); + this.xrTable2.SizeF = new System.Drawing.SizeF(500F, 150F); + this.xrTable2.StylePriority.UseFont = false; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell29, + this.xrTableCell31, + this.xrTableCell32, + this.xrTableCell33, + this.xrTableCell34}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 1D; + // + // xrTableCell29 + // + this.xrTableCell29.Multiline = true; + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.Text = "Wochenarbeitszeit"; + this.xrTableCell29.Weight = 1.6999998474121094D; + // + // xrTableCell31 + // + this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Employee.Contracts.WeeklyTotalHours")}); + this.xrTableCell31.Multiline = true; + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.StylePriority.UseTextAlignment = false; + this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell31.TextFormatString = "{0:0.00}"; + this.xrTableCell31.Weight = 1D; + // + // xrTableCell32 + // + this.xrTableCell32.Multiline = true; + this.xrTableCell32.Name = "xrTableCell32"; + this.xrTableCell32.StylePriority.UseTextAlignment = false; + this.xrTableCell32.Text = "%"; + this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell32.Weight = 0.7499996948242188D; + // + // xrTableCell33 + // + this.xrTableCell33.Multiline = true; + this.xrTableCell33.Name = "xrTableCell33"; + this.xrTableCell33.StylePriority.UseTextAlignment = false; + this.xrTableCell33.Text = "Stunden"; + this.xrTableCell33.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell33.Weight = 0.75D; + // + // xrTableCell34 + // + this.xrTableCell34.Multiline = true; + this.xrTableCell34.Name = "xrTableCell34"; + this.xrTableCell34.StylePriority.UseTextAlignment = false; + this.xrTableCell34.Text = "Bonusbetrag"; + this.xrTableCell34.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell34.Weight = 0.80000091706867338D; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell36, + this.xrTableCell40, + this.xrTableCell41, + this.xrTableCell42, + this.xrTableCell43}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 1D; + // + // xrTableCell36 + // + this.xrTableCell36.Multiline = true; + this.xrTableCell36.Name = "xrTableCell36"; + this.xrTableCell36.Text = "Sollstunden Monat"; + this.xrTableCell36.Weight = 1.6999998474121094D; + // + // xrTableCell40 + // + this.xrTableCell40.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell40.Multiline = true; + this.xrTableCell40.Name = "xrTableCell40"; + this.xrTableCell40.StylePriority.UseFont = false; + this.xrTableCell40.StylePriority.UseTextAlignment = false; + this.xrTableCell40.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell40.Weight = 1D; + // + // xrTableCell41 + // + this.xrTableCell41.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell41.Multiline = true; + this.xrTableCell41.Name = "xrTableCell41"; + this.xrTableCell41.StylePriority.UseFont = false; + this.xrTableCell41.StylePriority.UseTextAlignment = false; + this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell41.Weight = 0.7499996948242188D; + // + // xrTableCell42 + // + this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom2")}); + this.xrTableCell42.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell42.Multiline = true; + this.xrTableCell42.Name = "xrTableCell42"; + this.xrTableCell42.StylePriority.UseFont = false; + this.xrTableCell42.StylePriority.UseTextAlignment = false; + this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell42.TextFormatString = "{0:0.00}"; + this.xrTableCell42.Weight = 0.75D; + // + // xrTableCell43 + // + this.xrTableCell43.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell43.Multiline = true; + this.xrTableCell43.Name = "xrTableCell43"; + this.xrTableCell43.StylePriority.UseFont = false; + this.xrTableCell43.StylePriority.UseTextAlignment = false; + this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell43.Weight = 0.80000091706867338D; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell44, + this.xrTableCell46, + this.xrTableCell49, + this.xrTableCell50, + this.xrTableCell52}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 1D; + // + // xrTableCell44 + // + this.xrTableCell44.Multiline = true; + this.xrTableCell44.Name = "xrTableCell44"; + this.xrTableCell44.Text = "Arbeitsstunden Monat"; + this.xrTableCell44.Weight = 1.6999998474121094D; + // + // xrTableCell46 + // + this.xrTableCell46.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell46.Multiline = true; + this.xrTableCell46.Name = "xrTableCell46"; + this.xrTableCell46.StylePriority.UseFont = false; + this.xrTableCell46.StylePriority.UseTextAlignment = false; + this.xrTableCell46.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell46.Weight = 1D; + // + // xrTableCell49 + // + this.xrTableCell49.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell49.Multiline = true; + this.xrTableCell49.Name = "xrTableCell49"; + this.xrTableCell49.StylePriority.UseFont = false; + this.xrTableCell49.StylePriority.UseTextAlignment = false; + this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell49.Weight = 0.7499996948242188D; + // + // xrTableCell50 + // + this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.StundenGesamtIst")}); + this.xrTableCell50.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell50.Multiline = true; + this.xrTableCell50.Name = "xrTableCell50"; + this.xrTableCell50.StylePriority.UseFont = false; + this.xrTableCell50.StylePriority.UseTextAlignment = false; + this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell50.TextFormatString = "{0:0.00}"; + this.xrTableCell50.Weight = 0.75D; + // + // xrTableCell52 + // + this.xrTableCell52.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell52.Multiline = true; + this.xrTableCell52.Name = "xrTableCell52"; + this.xrTableCell52.StylePriority.UseFont = false; + this.xrTableCell52.StylePriority.UseTextAlignment = false; + this.xrTableCell52.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell52.Weight = 0.80000091706867338D; + // + // xrTableRow5 + // + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell53, + this.xrTableCell55, + this.xrTableCell56, + this.xrTableCell57, + this.xrTableCell58}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 1D; + // + // xrTableCell53 + // + this.xrTableCell53.Multiline = true; + this.xrTableCell53.Name = "xrTableCell53"; + this.xrTableCell53.Text = "FLS Monat"; + this.xrTableCell53.Weight = 1.6999998474121094D; + // + // xrTableCell55 + // + this.xrTableCell55.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell55.Multiline = true; + this.xrTableCell55.Name = "xrTableCell55"; + this.xrTableCell55.StylePriority.UseFont = false; + this.xrTableCell55.StylePriority.UseTextAlignment = false; + this.xrTableCell55.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell55.Weight = 1D; + // + // xrTableCell56 + // + this.xrTableCell56.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom14")}); + this.xrTableCell56.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell56.Multiline = true; + this.xrTableCell56.Name = "xrTableCell56"; + this.xrTableCell56.StylePriority.UseFont = false; + this.xrTableCell56.StylePriority.UseTextAlignment = false; + this.xrTableCell56.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell56.TextFormatString = "{0:0.00%}"; + this.xrTableCell56.Weight = 0.7499996948242188D; + // + // xrTableCell57 + // + this.xrTableCell57.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom1")}); + this.xrTableCell57.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell57.Multiline = true; + this.xrTableCell57.Name = "xrTableCell57"; + this.xrTableCell57.StylePriority.UseFont = false; + this.xrTableCell57.StylePriority.UseTextAlignment = false; + this.xrTableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell57.TextFormatString = "{0:0.00}"; + this.xrTableCell57.Weight = 0.75D; + // + // xrTableCell58 + // + this.xrTableCell58.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell58.Multiline = true; + this.xrTableCell58.Name = "xrTableCell58"; + this.xrTableCell58.StylePriority.UseFont = false; + this.xrTableCell58.StylePriority.UseTextAlignment = false; + this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell58.Weight = 0.80000091706867338D; + // + // xrTableRow6 + // + this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell59, + this.lblSchwelle, + this.xrTableCell62, + this.xrTableCell63, + this.xrTableCell64}); + this.xrTableRow6.Name = "xrTableRow6"; + this.xrTableRow6.Weight = 1D; + // + // xrTableCell59 + // + this.xrTableCell59.Multiline = true; + this.xrTableCell59.Name = "xrTableCell59"; + this.xrTableCell59.Text = "FLS-Schwelle Monat"; + this.xrTableCell59.Weight = 1.6999998474121094D; + // + // lblSchwelle + // + this.lblSchwelle.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.lblSchwelle.Multiline = true; + this.lblSchwelle.Name = "lblSchwelle"; + this.lblSchwelle.StylePriority.UseFont = false; + this.lblSchwelle.StylePriority.UseTextAlignment = false; + this.lblSchwelle.Text = "über Schwelle"; + this.lblSchwelle.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.lblSchwelle.Weight = 1D; + // + // xrTableCell62 + // + this.xrTableCell62.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom15")}); + this.xrTableCell62.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell62.Multiline = true; + this.xrTableCell62.Name = "xrTableCell62"; + this.xrTableCell62.StylePriority.UseFont = false; + this.xrTableCell62.StylePriority.UseTextAlignment = false; + this.xrTableCell62.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell62.TextFormatString = "{0:0.00%}"; + this.xrTableCell62.Weight = 0.7499996948242188D; + // + // xrTableCell63 + // + this.xrTableCell63.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom3")}); + this.xrTableCell63.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell63.Multiline = true; + this.xrTableCell63.Name = "xrTableCell63"; + this.xrTableCell63.StylePriority.UseFont = false; + this.xrTableCell63.StylePriority.UseTextAlignment = false; + this.xrTableCell63.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell63.TextFormatString = "{0:0.00}"; + this.xrTableCell63.Weight = 0.75D; + // + // xrTableCell64 + // + this.xrTableCell64.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell64.Multiline = true; + this.xrTableCell64.Name = "xrTableCell64"; + this.xrTableCell64.StylePriority.UseFont = false; + this.xrTableCell64.StylePriority.UseTextAlignment = false; + this.xrTableCell64.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell64.TextFormatString = "{0:0.00}"; + this.xrTableCell64.Weight = 0.80000091706867338D; + // + // xrTableRow7 + // + this.xrTableRow7.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell65, + this.lblJaNein, + this.xrTableCell68, + this.xrTableCell69, + this.xrTableCell70}); + this.xrTableRow7.Name = "xrTableRow7"; + this.xrTableRow7.Weight = 1D; + // + // xrTableCell65 + // + this.xrTableCell65.Multiline = true; + this.xrTableCell65.Name = "xrTableCell65"; + this.xrTableCell65.Text = "Bonus"; + this.xrTableCell65.Weight = 1.6999998474121094D; + // + // lblJaNein + // + this.lblJaNein.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.lblJaNein.Multiline = true; + this.lblJaNein.Name = "lblJaNein"; + this.lblJaNein.StylePriority.UseFont = false; + this.lblJaNein.StylePriority.UseTextAlignment = false; + this.lblJaNein.Text = "Ja / Nein"; + this.lblJaNein.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.lblJaNein.Weight = 1D; + // + // xrTableCell68 + // + this.xrTableCell68.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom13")}); + this.xrTableCell68.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell68.Multiline = true; + this.xrTableCell68.Name = "xrTableCell68"; + this.xrTableCell68.StylePriority.UseFont = false; + this.xrTableCell68.StylePriority.UseTextAlignment = false; + this.xrTableCell68.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell68.TextFormatString = "{0:0.00%}"; + this.xrTableCell68.Weight = 0.7499996948242188D; + // + // xrTableCell69 + // + this.xrTableCell69.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom12")}); + this.xrTableCell69.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell69.Multiline = true; + this.xrTableCell69.Name = "xrTableCell69"; + this.xrTableCell69.StylePriority.UseFont = false; + this.xrTableCell69.StylePriority.UseTextAlignment = false; + this.xrTableCell69.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell69.TextFormatString = "{0:0.00}"; + this.xrTableCell69.Weight = 0.75D; + // + // xrTableCell70 + // + this.xrTableCell70.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeDetailList.Custom11")}); + this.xrTableCell70.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold); + this.xrTableCell70.Multiline = true; + this.xrTableCell70.Name = "xrTableCell70"; + this.xrTableCell70.StylePriority.UseFont = false; + this.xrTableCell70.StylePriority.UseTextAlignment = false; + this.xrTableCell70.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell70.TextFormatString = "{0:0.00} €"; + this.xrTableCell70.Weight = 0.80000091706867338D; + // // xrTable1 // - this.xrTable1.Font = new System.Drawing.Font("Arial", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 8F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -555,10 +990,6 @@ namespace BeWo.BeWoAuxilio this.xrTableCell51.Name = "xrTableCell51"; this.xrTableCell51.Weight = 0.05861134782796297D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); - // // ReportHeader // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -570,7 +1001,7 @@ namespace BeWo.BeWoAuxilio // this.lblMonat.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ReportStartDate", "Stundenkonto {0:MMMM yy}")}); - this.lblMonat.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); + this.lblMonat.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold); this.lblMonat.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.lblMonat.Multiline = true; this.lblMonat.Name = "lblMonat"; @@ -589,18 +1020,18 @@ namespace BeWo.BeWoAuxilio // // 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(900F, 25F); this.xrPageInfo2.Name = "xrPageInfo2"; this.xrPageInfo2.SizeF = new System.Drawing.SizeF(134.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; @@ -614,7 +1045,7 @@ namespace BeWo.BeWoAuxilio 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"; // @@ -624,7 +1055,7 @@ namespace BeWo.BeWoAuxilio 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"; // @@ -634,7 +1065,7 @@ namespace BeWo.BeWoAuxilio 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"; // @@ -644,7 +1075,7 @@ namespace BeWo.BeWoAuxilio 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"; // @@ -676,6 +1107,10 @@ namespace BeWo.BeWoAuxilio // this.fieldGesamtRelAZFls.Name = "fieldGesamtRelAZFls"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.MitarbeiterstundenkontoRO); + // // Mitarbeiterstundenkonto // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -691,7 +1126,7 @@ namespace BeWo.BeWoAuxilio this.fieldGesamtRelAZFls}); this.DataSource = this.bindingSource1; this.Landscape = true; - this.Margins = new System.Drawing.Printing.Margins(65, 65, 50, 30); + this.Margins = new DevExpress.Drawing.DXMargins(65F, 65F, 50F, 30F); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; @@ -700,9 +1135,12 @@ namespace BeWo.BeWoAuxilio this.FieldCaption, this.PageInfo, this.DataField}); - this.Version = "17.1"; + this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTableDetail)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableHeader)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); @@ -776,5 +1214,42 @@ namespace BeWo.BeWoAuxilio private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; private DevExpress.XtraReports.UI.CalculatedField fieldRelationAZFls; private DevExpress.XtraReports.UI.CalculatedField fieldGesamtRelAZFls; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell29; + 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.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell36; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell40; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell41; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell43; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell44; + 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.XRTableRow xrTableRow5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell53; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell55; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell56; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell57; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell58; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell59; + private DevExpress.XtraReports.UI.XRTableCell lblSchwelle; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell62; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell63; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell64; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow7; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell65; + private DevExpress.XtraReports.UI.XRTableCell lblJaNein; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell68; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell69; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell70; } } diff --git a/ReportImp/BeWoAuxilio/Mitarbeiterstundenkonto.resx b/ReportImp/BeWoAuxilio/Mitarbeiterstundenkonto.resx index 0f60e7858..c7e0d4bdf 100644 --- a/ReportImp/BeWoAuxilio/Mitarbeiterstundenkonto.resx +++ b/ReportImp/BeWoAuxilio/Mitarbeiterstundenkonto.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