From acdb064f4a5070110ab5e13b2eb2a9f26f8d6e58 Mon Sep 17 00:00:00 2001 From: Lyndon Date: Fri, 27 Mar 2026 16:59:10 +0100 Subject: [PATCH] =?UTF-8?q?Unterschriften=20werden=20nicht=20mehr=20von=20?= =?UTF-8?q?nicht=20bewilligten=20Eintr=C3=A4gen=20beeinflusst.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ReportController.cs | 27 ++- .../Controllers/ReportViewerController.cs | 37 +--- BeWoPlanerMobil/Models/ReportModel.cs | 76 ++++++-- .../Quittierungsbeleg.Designer.cs | 171 +++++++++++------- Report/DefaultReports/Quittierungsbeleg.resx | 3 - Report/ReportObjects/ServicesOverviewRO.cs | 8 +- Service/Plugins/PluginLoader.cs | 2 +- 7 files changed, 180 insertions(+), 144 deletions(-) diff --git a/BeWoPlanerMobil/Controllers/ReportController.cs b/BeWoPlanerMobil/Controllers/ReportController.cs index 34951a2f6..2265a2472 100644 --- a/BeWoPlanerMobil/Controllers/ReportController.cs +++ b/BeWoPlanerMobil/Controllers/ReportController.cs @@ -17,7 +17,6 @@ using BeWo.Service.Plugins; using DevExpress.XtraReports.UI; // Controller des Quittierungsbelegsmoduls - namespace BeWoPlanerMobil.Controllers { public class ReportController : AbstractBaseController @@ -152,7 +151,7 @@ namespace BeWoPlanerMobil.Controllers { try { - if(!MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer") || Model?.LoggedInEmployee?.EmployeeOid is null) + if(false == MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer") || Model?.LoggedInEmployee?.EmployeeOid is null) { return Logout(); } @@ -247,10 +246,6 @@ namespace BeWoPlanerMobil.Controllers { var stringBuilder = new StringBuilder(isDativ ? string.Empty : "Einträge für "); - // Einträge für [alle Klienten/die Klienten meines Teams/meine Klienten/[CustomerName]/[TeamName]] [von [Mitarbeiter] [bei [Kostenträger]] und [Leistungskategorie]] vom 01.10. bis 31.10.2020 - // Einträge für Grube, Clair von Fisher, George bei LWL und face-to-face vom 01.10. bis 31.10.2020 - // Unterschrift für x erbrachte Leistungen von - switch(Model.SelectedFilterItem?.FilterEnum) { case QBFilterEnum.KlientenAuswahl: @@ -1012,6 +1007,7 @@ namespace BeWoPlanerMobil.Controllers TempData[TempDataConstants.DoLogoutKey] = true; return PartialView("QuittierungsbelegsPreviewPartial"); } + Model.QuittierungsbelegsReport = CreateQuittierungsbelegsReportFromSettings(); return PartialView("QuittierungsbelegsPreviewPartial", Model); @@ -1019,16 +1015,17 @@ namespace BeWoPlanerMobil.Controllers private XtraReport CreateQuittierungsbelegsReportFromSettings() { - if (Model.QuittierungsbelegsReportSettings == null) + if(Model.QuittierungsbelegsReportSettings is null) { return null; } - var s = Model.QuittierungsbelegsReportSettings; - DateTime startDate = new DateTime(s.Year, s.Month, s.StartDay); - DateTime endDate = new DateTime(s.Year, s.Month, s.EndDay); + var reportSettings = Model.QuittierungsbelegsReportSettings; - var report = Model.ReportCreator.CreateServiceOverviewReportNew(s.FilterEnum, s.CustomerOid, s.TeamOid, s.EmployeeOid, s.OrganisationOid, s.ServiceCategoryOid, startDate, endDate, false); + var startDate = new DateTime(reportSettings.Year, reportSettings.Month, reportSettings.StartDay); + var endDate = new DateTime(reportSettings.Year, reportSettings.Month, reportSettings.EndDay); + + var report = Model.ReportCreator.CreateServiceOverviewReportNew(reportSettings.FilterEnum, reportSettings.CustomerOid, reportSettings.TeamOid, reportSettings.EmployeeOid, reportSettings.OrganisationOid, reportSettings.ServiceCategoryOid, startDate, endDate, false); report.ExportOptions.PrintPreview.DefaultFileName = CreateFileName(); report.DisplayName = CreateFileName(); @@ -1042,6 +1039,7 @@ namespace BeWoPlanerMobil.Controllers var selectedFilter = Model.SelectedFilterItem.FilterEnum; var filterText = string.Empty; + switch(selectedFilter) { case QBFilterEnum.AlleKlienten: @@ -1083,7 +1081,7 @@ namespace BeWoPlanerMobil.Controllers fileName += $"{selectedServiceCategory.Name}_"; } - if(!Model.SelectedMonth.HasValue || !Model.SelectedYear.HasValue || !Model.SelectedStartDay.HasValue || !Model.SelectedEndDay.HasValue) + if(false == Model.SelectedMonth.HasValue || false == Model.SelectedYear.HasValue || false == Model.SelectedStartDay.HasValue || false == Model.SelectedEndDay.HasValue) { return fileName; } @@ -1229,9 +1227,6 @@ namespace BeWoPlanerMobil.Controllers reportObjects = reportObjects.Where(servicesOverview => false == servicesOverview is null).ToList(); var srOids = new List(); - //var srOidsBillable = new List(); - - //reportObjects.DoForEach(servicesOverview => servicesOverview.Services.DoForEach(s => srOids.AddIfNotIn(s.ServiceRecordOid))); foreach(var reportObject in reportObjects) { @@ -1441,7 +1436,7 @@ namespace BeWoPlanerMobil.Controllers [Serializable] public class ConfirmationReceiptSignatureObject { - public String Identifier { get; } + public string Identifier { get; } public string ImageStr { get; } public string InsTsStr { get; } public string PersonName { get; } diff --git a/BeWoPlanerMobil/Controllers/ReportViewerController.cs b/BeWoPlanerMobil/Controllers/ReportViewerController.cs index e6f982bdd..6fd41d43d 100644 --- a/BeWoPlanerMobil/Controllers/ReportViewerController.cs +++ b/BeWoPlanerMobil/Controllers/ReportViewerController.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Web.Mvc; -using BeWo.Data.Entities; using BeWo.Report; using BeWo.Service.Plugins; using BeWo.View.Navigation.Filter; @@ -17,7 +16,6 @@ using BS.Shared.DataContracts.Compact; using BS.Shared.Extensions; // Controller des Auswertungsmoduls - namespace BeWoPlanerMobil.Controllers { public class ReportViewerController : ReportBaseController @@ -28,30 +26,20 @@ namespace BeWoPlanerMobil.Controllers { get { - if(!MobileSessionFacade.IsUserLoggedIn()) + if(false == MobileSessionFacade.IsUserLoggedIn()) { RedirectToActionPermanent("Index", "Login"); return null; } - if (_Model == null) + if(_Model is null) { _Model = new ReportViewerModel { ReportCreator = GetReportCreator() }; InitModel(_Model); InitViewModel(); } - //if (((ReportViewerModel)Session[ModelSessionConstants.ReportViewerModelKey])?.LoggedInEmployee is null) - //{ - // _Model = new ReportViewerModel { ReportCreator = GetReportCreator() }; - // Session[ModelSessionConstants.ReportViewerModelKey] = _Model; - //} - //else - //{ - // _Model = (ReportViewerModel)Session[ModelSessionConstants.ReportViewerModelKey]; - //} - return _Model; } } @@ -203,8 +191,6 @@ namespace BeWoPlanerMobil.Controllers return Logout(); } - - return View(Model); } @@ -323,25 +309,6 @@ namespace BeWoPlanerMobil.Controllers return PartialView("BerichteFormPartialView", Model); } - //[Authorize] - //private string GetQueryReportUrl(QueryDC query) - //{ - // var url = Request?.Url; - - // if(Model?.Employee?.EmployeeOid is null || url is null || query is null) - // { - // return null; - // } - - // //DEBUG: http://localhost:3777/service - // //RELEASE: https://app4.bewoplaner.de/service - // // http://localhost:3777/Host/ReportView.aspx?dcid=demoqueryeoid372&qoid=1304&type=QueryReport - - // var urlSuffix = $"/ReportView.aspx?dcid={MobileSessionFacade.Tenant}queryeoid{Model.Employee.EmployeeOid.Value}&qoid={query.Oid}&type={Utils.EnumName(ReportTypes.QueryReport)}"; - - // return GetSiteOfOrigin() + urlSuffix; - //} - private string GetSiteOfOrigin() { if(Model?.LoggedInEmployee?.EmployeeOid is null) diff --git a/BeWoPlanerMobil/Models/ReportModel.cs b/BeWoPlanerMobil/Models/ReportModel.cs index bcaa935db..2742164c5 100644 --- a/BeWoPlanerMobil/Models/ReportModel.cs +++ b/BeWoPlanerMobil/Models/ReportModel.cs @@ -54,7 +54,11 @@ namespace BeWoPlanerMobil.Models }; [Display(Name = "Klient")] - public long? SelectedCustomerOid { get { return ReportSessionModel.SelectedCustomerOid; } set { ReportSessionModel.SelectedCustomerOid = value; } } + public long? SelectedCustomerOid + { + get => ReportSessionModel.SelectedCustomerOid; + set => ReportSessionModel.SelectedCustomerOid = value; + } public CompactCustomerDC SelectedCustomer { get; set; } @@ -148,22 +152,38 @@ namespace BeWoPlanerMobil.Models set => ReportSessionModel.SelectedEndDay = value; } - public ConfirmationReceiptObject ConfirmationReceiptObject { get { return ReportSessionModel.ConfirmationReceiptObject; } set { ReportSessionModel.ConfirmationReceiptObject = value; } } + public ConfirmationReceiptObject ConfirmationReceiptObject + { + get => ReportSessionModel.ConfirmationReceiptObject; + set => ReportSessionModel.ConfirmationReceiptObject = value; + } [Display(Name = "Mitarbeiter")] - public long? SelectedEmployeeOid { get { return ReportSessionModel.SelectedEmployeeOid; } set { ReportSessionModel.SelectedEmployeeOid = value; } } + public long? SelectedEmployeeOid + { + get => ReportSessionModel.SelectedEmployeeOid; + set => ReportSessionModel.SelectedEmployeeOid = value; + } public CompactEmployeeDC SelectedEmployee { get; set; } [Display(Name="Kostenträger")] - public long? SelectedOrganisationOid { get { return ReportSessionModel.SelectedOrganisationOid; } set { ReportSessionModel.SelectedOrganisationOid = value; } } + public long? SelectedOrganisationOid + { + get => ReportSessionModel.SelectedOrganisationOid; + set => ReportSessionModel.SelectedOrganisationOid = value; + } public CompactOrganisationDC SelectedOrganisation { get; set; } public List Organisations { get; set; } = new List(); - [Display(Name="Leistungskategorie")] - public long? SelectedServiceCategoryOid { get { return ReportSessionModel.SelectedServiceCategoryOid; } set { ReportSessionModel.SelectedServiceCategoryOid = value; } } + [Display(Name = "Leistungskategorie")] + public long? SelectedServiceCategoryOid + { + get => ReportSessionModel.SelectedServiceCategoryOid; + set => ReportSessionModel.SelectedServiceCategoryOid = value; + } public ServiceCategoryDC SelectedServiceCategory { get; set; } @@ -200,10 +220,11 @@ namespace BeWoPlanerMobil.Models { get { - if (QbFilters == null || !SelectedFilterItemId.HasValue) + if(QbFilters is null || false == SelectedFilterItemId.HasValue) { return null; } + return QbFilters.FirstOrDefault(f => f.FilterEnum == SelectedFilterItemId.Value); } } @@ -235,8 +256,12 @@ namespace BeWoPlanerMobil.Models } } - [Display(Name = "Team")] - public long? SelectedTeamOid { get { return ReportSessionModel.SelectedTeamOid; } set { ReportSessionModel.SelectedTeamOid = value; } } + [Display(Name = "Team")] + public long? SelectedTeamOid + { + get => ReportSessionModel.SelectedTeamOid; + set => ReportSessionModel.SelectedTeamOid = value; + } public CompactTeamDC SelectedTeam { get; set; } @@ -281,13 +306,36 @@ namespace BeWoPlanerMobil.Models ConfirmationReceiptSignatures.Where(crs => crs.ConfirmationReceiptSignatureOid != null && confirmationReceiptSignatureOids.Contains(crs.ConfirmationReceiptSignatureOid.Value)).ToList(); } - public bool IsForSelectedEmployeesOnly { get { return ReportSessionModel.IsForSelectedEmployeesOnly; } set { ReportSessionModel.IsForSelectedEmployeesOnly = value; } } - public bool IsForSelectedCostbearersOnly { get { return ReportSessionModel.IsForSelectedCostbearersOnly; } set { ReportSessionModel.IsForSelectedCostbearersOnly = value; } } - public bool IsForSelectedCategoryOnly { get { return ReportSessionModel.IsForSelectedCategoryOnly; } set { ReportSessionModel.IsForSelectedCategoryOnly = value; } } + public bool IsForSelectedEmployeesOnly + { + get => ReportSessionModel.IsForSelectedEmployeesOnly; + set => ReportSessionModel.IsForSelectedEmployeesOnly = value; + } - public List SelectedConfirmationReceiptSignatures { get { return ReportSessionModel.SelectedConfirmationReceiptSignatures; } set { ReportSessionModel.SelectedConfirmationReceiptSignatures = value; } } + public bool IsForSelectedCostbearersOnly + { + get => ReportSessionModel.IsForSelectedCostbearersOnly; + set => ReportSessionModel.IsForSelectedCostbearersOnly = value; + } - public Quittierungsbelegsunterschriftenobjekt Quittierungsbelegsunterschriftenobjekt { get { return ReportSessionModel.Quittierungsbelegsunterschriftenobjekt; } set { ReportSessionModel.Quittierungsbelegsunterschriftenobjekt = value; } } + public bool IsForSelectedCategoryOnly + { + get => ReportSessionModel.IsForSelectedCategoryOnly; + set => ReportSessionModel.IsForSelectedCategoryOnly = value; + } + + + public List SelectedConfirmationReceiptSignatures + { + get => ReportSessionModel.SelectedConfirmationReceiptSignatures; + set => ReportSessionModel.SelectedConfirmationReceiptSignatures = value; + } + + public Quittierungsbelegsunterschriftenobjekt Quittierungsbelegsunterschriftenobjekt + { + get => ReportSessionModel.Quittierungsbelegsunterschriftenobjekt; + set => ReportSessionModel.Quittierungsbelegsunterschriftenobjekt = value; + } public AbstractReportCreator ReportCreator { get; set; } diff --git a/Report/DefaultReports/Quittierungsbeleg.Designer.cs b/Report/DefaultReports/Quittierungsbeleg.Designer.cs index 593a4fd1c..7097a0495 100644 --- a/Report/DefaultReports/Quittierungsbeleg.Designer.cs +++ b/Report/DefaultReports/Quittierungsbeleg.Designer.cs @@ -167,7 +167,8 @@ namespace BeWo.Report.DefaultReports this.xrTable3.BorderColor = System.Drawing.Color.Black; this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTable3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTable3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -197,7 +198,8 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd/MM/yyyy}")}); - this.xrTableCell13.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell13.Name = "xrTableCell13"; this.xrTableCell13.StylePriority.UseBorders = false; this.xrTableCell13.StylePriority.UseFont = false; @@ -211,7 +213,8 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDateMinutes", "{0:HH:mm}")}); - this.xrTableCell14.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell14.Name = "xrTableCell14"; this.xrTableCell14.StylePriority.UseBorders = false; this.xrTableCell14.StylePriority.UseFont = false; @@ -225,7 +228,8 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EndDateMinutes", "{0:HH:mm}")}); - this.xrTableCell10.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell10.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.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.StylePriority.UseBorders = false; this.xrTableCell10.StylePriority.UseFont = false; @@ -239,7 +243,8 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")}); - this.xrTableCell2.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell2.Name = "xrTableCell2"; this.xrTableCell2.StylePriority.UseFont = false; this.xrTableCell2.StylePriority.UsePadding = false; @@ -251,7 +256,8 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.CustomerCount", "{0:0}")}); - this.xrTableCell15.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell15.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell15.Name = "xrTableCell15"; this.xrTableCell15.StylePriority.UseBorders = false; this.xrTableCell15.StylePriority.UseFont = false; @@ -264,7 +270,7 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes", "{0:0.##}")}); - this.xrTableCell12.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrTableCell12.Name = "xrTableCell12"; this.xrTableCell12.StylePriority.UseBorders = false; this.xrTableCell12.StylePriority.UseFont = false; @@ -321,7 +327,8 @@ namespace BeWo.Report.DefaultReports // this.xrTableServiceRecords1.BackColor = System.Drawing.Color.Gainsboro; this.xrTableServiceRecords1.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.xrTableServiceRecords1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableServiceRecords1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTableServiceRecords1.Name = "xrTableServiceRecords1"; this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -352,7 +359,8 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell3.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell3.Name = "xrTableCell3"; this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); this.xrTableCell3.StylePriority.UseBorders = false; @@ -367,7 +375,8 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell4.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell4.Multiline = true; this.xrTableCell4.Name = "xrTableCell4"; this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 4, 0, 0, 100F); @@ -383,7 +392,8 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell11.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(12, 12, 0, 0, 100F); this.xrTableCell11.StylePriority.UseBorders = false; @@ -398,7 +408,8 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell9.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell9.Multiline = true; this.xrTableCell9.Name = "xrTableCell9"; this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -414,7 +425,7 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell28.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell28.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell28.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrTableCell28.Name = "xrTableCell28"; this.xrTableCell28.StylePriority.UseBorders = false; this.xrTableCell28.StylePriority.UseFont = false; @@ -427,7 +438,7 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell48.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell48.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrTableCell48.Multiline = true; this.xrTableCell48.Name = "xrTableCell48"; this.xrTableCell48.StylePriority.UseBorders = false; @@ -463,7 +474,8 @@ namespace BeWo.Report.DefaultReports this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell8.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell8.Name = "xrTableCell8"; this.xrTableCell8.StylePriority.UseBorders = false; this.xrTableCell8.StylePriority.UseFont = false; @@ -477,7 +489,8 @@ namespace BeWo.Report.DefaultReports this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell5.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell5.Name = "xrTableCell5"; this.xrTableCell5.StylePriority.UseBorders = false; this.xrTableCell5.StylePriority.UseFont = false; @@ -491,7 +504,8 @@ namespace BeWo.Report.DefaultReports this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell6.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell6.Multiline = true; this.xrTableCell6.Name = "xrTableCell6"; this.xrTableCell6.StylePriority.UseBorders = false; @@ -506,7 +520,8 @@ namespace BeWo.Report.DefaultReports this.xrTableCell7.BackColor = System.Drawing.Color.Gainsboro; this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell7.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell7.Multiline = true; this.xrTableCell7.Name = "xrTableCell7"; this.xrTableCell7.StylePriority.UseBackColor = false; @@ -521,7 +536,7 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell43.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell43.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrTableCell43.Name = "xrTableCell43"; this.xrTableCell43.StylePriority.UseBorders = false; this.xrTableCell43.StylePriority.UseFont = false; @@ -531,7 +546,7 @@ namespace BeWo.Report.DefaultReports // this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell49.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell49.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrTableCell49.Multiline = true; this.xrTableCell49.Name = "xrTableCell49"; this.xrTableCell49.StylePriority.UseBorders = false; @@ -572,7 +587,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel14.BackColor = System.Drawing.Color.Gainsboro; this.xrLabel14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel14.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(414.9999F, 47.1111F); this.xrLabel14.Name = "xrLabel14"; this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -590,7 +605,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel16.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.##}")}); - this.xrLabel16.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(593.75F, 47.1111F); this.xrLabel16.Name = "xrLabel16"; this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -608,7 +623,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel7.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel7.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(415F, 77.6111F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -625,7 +640,7 @@ namespace BeWo.Report.DefaultReports // this.xrLabel8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel8.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 77.6111F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -642,7 +657,7 @@ namespace BeWo.Report.DefaultReports // this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel6.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(170F, 77.6111F); this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -658,7 +673,7 @@ namespace BeWo.Report.DefaultReports // xrLabel5 // this.xrLabel5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel5.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(170F, 47.1111F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -677,7 +692,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel4.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(49.36111F, 77.6111F); this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -695,7 +710,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel3.BackColor = System.Drawing.Color.Gainsboro; this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel3.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 47.11109F); this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -710,7 +725,8 @@ namespace BeWo.Report.DefaultReports // // xrLabel2 // - this.xrLabel2.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrLabel2.ForeColor = System.Drawing.Color.Black; this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel2.Multiline = true; @@ -746,7 +762,6 @@ namespace BeWo.Report.DefaultReports // // topMarginBand1 // - this.topMarginBand1.HeightF = 100F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 @@ -788,7 +803,7 @@ namespace BeWo.Report.DefaultReports // xrLabel22 // this.xrLabel22.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrLabel22.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(244.9998F, 20.00001F); this.xrLabel22.Name = "xrLabel22"; this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -804,7 +819,7 @@ namespace BeWo.Report.DefaultReports // this.xrLabel23.BackColor = System.Drawing.Color.Transparent; this.xrLabel23.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel23.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(329.9998F, 20.00001F); this.xrLabel23.Name = "xrLabel23"; this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -819,7 +834,7 @@ namespace BeWo.Report.DefaultReports // xrLabel19 // this.xrLabel19.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrLabel19.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(244.9999F, 40.00003F); this.xrLabel19.Name = "xrLabel19"; this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -837,7 +852,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte", "{0:0.##}")}); - this.xrLabel20.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(329.9999F, 40.00003F); this.xrLabel20.Name = "xrLabel20"; this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -853,7 +868,7 @@ namespace BeWo.Report.DefaultReports // this.xrLabel21.BackColor = System.Drawing.Color.Gainsboro; this.xrLabel21.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel21.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(414.9999F, 40.00003F); this.xrLabel21.Name = "xrLabel21"; this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -868,7 +883,7 @@ namespace BeWo.Report.DefaultReports // // lblFehlkontakt // - this.lblFehlkontakt.Font = new System.Drawing.Font("Arial", 10F); + this.lblFehlkontakt.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40.00005F); this.lblFehlkontakt.Name = "lblFehlkontakt"; this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -895,7 +910,7 @@ namespace BeWo.Report.DefaultReports // xrPictureBox2 // this.xrPictureBox2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Image", null, "CustomerSignature")}); + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "CustomerSignature")}); this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(186.6944F, 214.5F); this.xrPictureBox2.Name = "xrPictureBox2"; this.xrPictureBox2.SizeF = new System.Drawing.SizeF(199.3611F, 35.50002F); @@ -904,7 +919,7 @@ namespace BeWo.Report.DefaultReports // lblUnterschriftKlient // this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.lblUnterschriftKlient.Font = new System.Drawing.Font("Arial", 10F); + this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 250F); this.lblUnterschriftKlient.Name = "lblUnterschriftKlient"; this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -920,7 +935,7 @@ namespace BeWo.Report.DefaultReports // lblUnterschriftMitarbeiter // this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.lblUnterschriftMitarbeiter.Font = new System.Drawing.Font("Arial", 10F); + this.lblUnterschriftMitarbeiter.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 250F); this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter"; this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -939,7 +954,8 @@ namespace BeWo.Report.DefaultReports this.xrTableAbwesenheiten.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableAbwesenheiten.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 80.00005F); this.xrTableAbwesenheiten.Name = "xrTableAbwesenheiten"; this.xrTableAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -967,7 +983,8 @@ namespace BeWo.Report.DefaultReports // // xrTableCell16 // - this.xrTableCell16.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell16.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell16.Name = "xrTableCell16"; this.xrTableCell16.StylePriority.UseBorders = false; this.xrTableCell16.StylePriority.UseFont = false; @@ -979,7 +996,8 @@ namespace BeWo.Report.DefaultReports // // xrTableCell17 // - this.xrTableCell17.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell17.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell17.Name = "xrTableCell17"; this.xrTableCell17.StylePriority.UseBorders = false; this.xrTableCell17.StylePriority.UseFont = false; @@ -991,7 +1009,8 @@ namespace BeWo.Report.DefaultReports // // xrTableCell18 // - this.xrTableCell18.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell18.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.xrTableCell18.Name = "xrTableCell18"; this.xrTableCell18.StylePriority.UseBorders = false; this.xrTableCell18.StylePriority.UseFont = false; @@ -1012,7 +1031,8 @@ namespace BeWo.Report.DefaultReports // // xrTableCell19 // - this.xrTableCell19.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell19.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell19.Name = "xrTableCell19"; this.xrTableCell19.StylePriority.UseFont = false; this.xrTableCell19.StylePriority.UseTextAlignment = false; @@ -1021,7 +1041,8 @@ namespace BeWo.Report.DefaultReports // // xrTableCell20 // - this.xrTableCell20.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell20.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.StylePriority.UseFont = false; this.xrTableCell20.StylePriority.UseTextAlignment = false; @@ -1030,7 +1051,8 @@ namespace BeWo.Report.DefaultReports // // xrTableCell21 // - this.xrTableCell21.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell21.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.xrTableCell21.Name = "xrTableCell21"; this.xrTableCell21.StylePriority.UseFont = false; this.xrTableCell21.StylePriority.UseTextAlignment = false; @@ -1048,7 +1070,8 @@ namespace BeWo.Report.DefaultReports // // xrTableCell22 // - this.xrTableCell22.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell22.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell22.Name = "xrTableCell22"; this.xrTableCell22.StylePriority.UseFont = false; this.xrTableCell22.StylePriority.UseTextAlignment = false; @@ -1057,7 +1080,8 @@ namespace BeWo.Report.DefaultReports // // xrTableCell23 // - this.xrTableCell23.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell23.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell23.Name = "xrTableCell23"; this.xrTableCell23.StylePriority.UseFont = false; this.xrTableCell23.StylePriority.UseTextAlignment = false; @@ -1066,7 +1090,8 @@ namespace BeWo.Report.DefaultReports // // xrTableCell24 // - this.xrTableCell24.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell24.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.xrTableCell24.Name = "xrTableCell24"; this.xrTableCell24.StylePriority.UseFont = false; this.xrTableCell24.StylePriority.UseTextAlignment = false; @@ -1084,7 +1109,8 @@ namespace BeWo.Report.DefaultReports // // xrTableCell25 // - this.xrTableCell25.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell25.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell25.Name = "xrTableCell25"; this.xrTableCell25.StylePriority.UseFont = false; this.xrTableCell25.StylePriority.UseTextAlignment = false; @@ -1093,7 +1119,8 @@ namespace BeWo.Report.DefaultReports // // xrTableCell26 // - this.xrTableCell26.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell26.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell26.Name = "xrTableCell26"; this.xrTableCell26.StylePriority.UseFont = false; this.xrTableCell26.StylePriority.UseTextAlignment = false; @@ -1102,7 +1129,8 @@ namespace BeWo.Report.DefaultReports // // xrTableCell27 // - this.xrTableCell27.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell27.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.xrTableCell27.Name = "xrTableCell27"; this.xrTableCell27.StylePriority.UseFont = false; this.xrTableCell27.StylePriority.UseTextAlignment = false; @@ -1120,7 +1148,8 @@ namespace BeWo.Report.DefaultReports // // xrTableCell29 // - this.xrTableCell29.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell29.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell29.Name = "xrTableCell29"; this.xrTableCell29.StylePriority.UseFont = false; this.xrTableCell29.StylePriority.UseTextAlignment = false; @@ -1129,7 +1158,8 @@ namespace BeWo.Report.DefaultReports // // xrTableCell30 // - this.xrTableCell30.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell30.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); this.xrTableCell30.Name = "xrTableCell30"; this.xrTableCell30.StylePriority.UseFont = false; this.xrTableCell30.StylePriority.UseTextAlignment = false; @@ -1138,7 +1168,8 @@ namespace BeWo.Report.DefaultReports // // xrTableCell31 // - this.xrTableCell31.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell31.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.xrTableCell31.Name = "xrTableCell31"; this.xrTableCell31.StylePriority.UseFont = false; this.xrTableCell31.StylePriority.UseTextAlignment = false; @@ -1150,7 +1181,7 @@ namespace BeWo.Report.DefaultReports this.lblHatAbwesenheiten.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblHatAbwesenheiten.Font = new System.Drawing.Font("Arial", 10F); + this.lblHatAbwesenheiten.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.lblHatAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 130F); this.lblHatAbwesenheiten.Name = "lblHatAbwesenheiten"; this.lblHatAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1167,7 +1198,7 @@ namespace BeWo.Report.DefaultReports this.lblHatGruppen.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.lblHatGruppen.Font = new System.Drawing.Font("Arial", 10F); + this.lblHatGruppen.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.lblHatGruppen.LocationFloat = new DevExpress.Utils.PointFloat(435.1388F, 80.00005F); this.lblHatGruppen.Name = "lblHatGruppen"; this.lblHatGruppen.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1181,7 +1212,7 @@ namespace BeWo.Report.DefaultReports // // xrRichText2 // - this.xrRichText2.Font = new System.Drawing.Font("Arial", 8F); + this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4724F, 130F); this.xrRichText2.Name = "xrRichText2"; this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString"); @@ -1190,7 +1221,7 @@ namespace BeWo.Report.DefaultReports // // xrRichText1 // - this.xrRichText1.Font = new System.Drawing.Font("Arial", 8F); + this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4724F, 80.00005F); this.xrRichText1.Name = "xrRichText1"; this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString"); @@ -1199,7 +1230,7 @@ namespace BeWo.Report.DefaultReports // // xrLabel15 // - this.xrLabel15.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Underline); + this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Underline); this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 80.00005F); this.xrLabel15.Multiline = true; this.xrLabel15.Name = "xrLabel15"; @@ -1215,7 +1246,7 @@ namespace BeWo.Report.DefaultReports // // xrLabel13 // - this.xrLabel13.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00004F); this.xrLabel13.Name = "xrLabel13"; this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1230,7 +1261,7 @@ namespace BeWo.Report.DefaultReports // // xrLabel12 // - this.xrLabel12.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1247,7 +1278,7 @@ namespace BeWo.Report.DefaultReports // this.xrLabel11.BackColor = System.Drawing.Color.Transparent; this.xrLabel11.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel11.Font = new System.Drawing.Font("Arial", 8F); + this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Arial", 8F); this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(415F, 20.00001F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.SizeF = new System.Drawing.SizeF(320F, 20F); @@ -1263,7 +1294,7 @@ namespace BeWo.Report.DefaultReports // this.xrLabel10.BackColor = System.Drawing.Color.Gainsboro; this.xrLabel10.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel10.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(415F, 0F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1279,7 +1310,7 @@ namespace BeWo.Report.DefaultReports // xrLabel9 // this.xrLabel9.Borders = DevExpress.XtraPrinting.BorderSide.Right; - this.xrLabel9.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(245F, 0F); this.xrLabel9.Name = "xrLabel9"; this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1297,7 +1328,7 @@ namespace BeWo.Report.DefaultReports this.xrLabel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMoFehlkontakte", "{0:0.##}")}); - this.xrLabel1.Font = new System.Drawing.Font("Arial", 10F); + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(330F, 0F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); @@ -1312,7 +1343,7 @@ namespace BeWo.Report.DefaultReports // xrPictureBox1 // this.xrPictureBox1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Image", null, "EmployeeSignature")}); + new DevExpress.XtraReports.UI.XRBinding("ImageSource", null, "EmployeeSignature")}); this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 214.5F); this.xrPictureBox1.Name = "xrPictureBox1"; this.xrPictureBox1.Scripts.OnBeforePrint = "xrPictureBox1_BeforePrint"; @@ -1351,17 +1382,17 @@ namespace BeWo.Report.DefaultReports this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] { this.fieldKontaktArt}); this.DataSource = this.bindingSource1; - this.Font = new System.Drawing.Font("Arial", 10F); + this.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.formattingRuleStartDate, this.formattingRuleServiceDesc, this.formattingRuleCostBearer, this.formattingRuleEmployeeName}); - this.Margins = new System.Drawing.Printing.Margins(50, 30, 100, 30); + this.Margins = new DevExpress.Drawing.DXMargins(50F, 30F, 100F, 30F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); diff --git a/Report/DefaultReports/Quittierungsbeleg.resx b/Report/DefaultReports/Quittierungsbeleg.resx index 9f46badba..40576e684 100644 --- a/Report/DefaultReports/Quittierungsbeleg.resx +++ b/Report/DefaultReports/Quittierungsbeleg.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 21, 17 - ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEsAZQBpAG4AZQAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXAB1AGwAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABLAHIAYQBuAGsAZQBuAGgAYQB1AHMAYQB1AGYAZQBuAHQAaABhAGwAdABlAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAYgBlAGsAYQBuAG4AdAAgAG8AZABlAHIAIAB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAGEAYgByAGUAYwBoAG4AdQBuAGcAcwByAGUAbABlAHYAYQBuAHQAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAaQBtACAAQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A diff --git a/Report/ReportObjects/ServicesOverviewRO.cs b/Report/ReportObjects/ServicesOverviewRO.cs index d1ad9c87c..c0d1e08ac 100644 --- a/Report/ReportObjects/ServicesOverviewRO.cs +++ b/Report/ReportObjects/ServicesOverviewRO.cs @@ -1518,12 +1518,11 @@ namespace BeWo.Report.ReportObjects var mandatorSettings = lResult.Mandator?.Settings; - - var serviceRecordOids = lResult.Services.Select(service => service.ServiceRecordOid).ToList(); + var serviceRecordOids = lResult.Services.Where(service => service.IsBillable).Select(service => service.ServiceRecordOid).ToList(); var employeeSignature = DAOFactory.SearchDAO.GetConfirmationReceiptSignatureForServiceRecords(serviceRecordOids, SignatureType.Employee); - if(!(employeeSignature?.SignatureImage is null)) + if(employeeSignature?.SignatureImage != null) { lResult.EmployeeSignature = ImageUtils.ConvertBase64StringToBitmap(employeeSignature?.SignatureImage); lResult.EmployeeSignatureDate = employeeSignature?.InsTs; @@ -1531,12 +1530,11 @@ namespace BeWo.Report.ReportObjects var customerSignature = DAOFactory.SearchDAO.GetConfirmationReceiptSignatureForServiceRecords(serviceRecordOids, SignatureType.Customer); - if(!(customerSignature?.SignatureImage is null)) + if(customerSignature?.SignatureImage != null) { lResult.CustomerSignature = ImageUtils.ConvertBase64StringToBitmap(customerSignature.SignatureImage); lResult.CustomerSignatureDate = customerSignature.InsTs; } - return lResult; } diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 3cf68bf5e..fe0b42704 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -280,7 +280,7 @@ namespace BeWo.Service.Plugins //t = "6860475645"; // Lebenshilfe Duisburg ATZ (Projekt heißt LebenshilfeDuisburgAtz6860475645) //t = "9678360705"; // Lebenshilfe Duisburg HPTG (Projekt heißt LebenshilfeDuisburgHPTG) //t = "4823067940"; // Die Kette 2 - t = "8283849714"; // Forum e.V. (proviel GmbH) + //t = "8283849714"; // Forum e.V. (proviel GmbH) //t = "3915346496"; // Sprungbrett 2. DB (Haus Theresia) //t = "2387527289"; // Lebenshilfe Duisburg HPFH //t = "2314784470"; // Lebenshilfe Duisburg BeWo