From 3d2acddd0b95ca700850437c4119e6aadf4fa94d Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Fri, 29 Nov 2024 12:29:31 +0100 Subject: [PATCH] Logo auf Report - Erster Entwurf --- .../Invoices/GkvBegleitzettel.Designer.cs | 53 +++++--- .../Invoices/GkvBegleitzettel.cs | 2 + Report/Properties/Resources.Designer.cs | 63 +++++++++ Report/Properties/Resources.resx | 120 ++++++++++++++++++ Report/Report.csproj | 9 ++ Report/ReportObjects/GkvAbrechnungRO.cs | 6 + 6 files changed, 232 insertions(+), 21 deletions(-) create mode 100644 Report/Properties/Resources.Designer.cs create mode 100644 Report/Properties/Resources.resx diff --git a/Report/DefaultReports/Invoices/GkvBegleitzettel.Designer.cs b/Report/DefaultReports/Invoices/GkvBegleitzettel.Designer.cs index fb77aa397..e3ff392f1 100644 --- a/Report/DefaultReports/Invoices/GkvBegleitzettel.Designer.cs +++ b/Report/DefaultReports/Invoices/GkvBegleitzettel.Designer.cs @@ -36,6 +36,8 @@ namespace BeWo.Report.DefaultReports.Invoices this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); + this.xrRichTextBankConnection = new DevExpress.XtraReports.UI.XRRichText(); + this.xrLineBankConnection = new DevExpress.XtraReports.UI.XRLine(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -134,14 +136,13 @@ namespace BeWo.Report.DefaultReports.Invoices this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); - this.xrRichTextBankConnection = new DevExpress.XtraReports.UI.XRRichText(); - this.xrLineBankConnection = new DevExpress.XtraReports.UI.XRLine(); + ((System.ComponentModel.ISupportInitialize)(this.xrRichTextBankConnection)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichTextBankConnection)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -153,8 +154,9 @@ namespace BeWo.Report.DefaultReports.Invoices // // ReportHeader // + this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrPictureBox1}); this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.ReportHeader.HeightF = 90.70666F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; // @@ -176,6 +178,22 @@ namespace BeWo.Report.DefaultReports.Invoices this.bottomMarginBand1.HeightF = 71F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // + // xrRichTextBankConnection + // + this.xrRichTextBankConnection.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); + this.xrRichTextBankConnection.LocationFloat = new DevExpress.Utils.PointFloat(0F, 12.99998F); + this.xrRichTextBankConnection.Name = "xrRichTextBankConnection"; + this.xrRichTextBankConnection.SerializableRtfString = resources.GetString("xrRichTextBankConnection.SerializableRtfString"); + this.xrRichTextBankConnection.SizeF = new System.Drawing.SizeF(678F, 32.37503F); + // + // xrLineBankConnection + // + this.xrLineBankConnection.ForeColor = System.Drawing.Color.Black; + this.xrLineBankConnection.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLineBankConnection.Name = "xrLineBankConnection"; + this.xrLineBankConnection.SizeF = new System.Drawing.SizeF(678F, 13F); + this.xrLineBankConnection.StylePriority.UseForeColor = false; + // // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -1090,26 +1108,18 @@ namespace BeWo.Report.DefaultReports.Invoices this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; this.xrTableCell20.Weight = 1.3569801834867468D; // + // xrPictureBox1 + // + this.xrPictureBox1.ImageAlignment = DevExpress.XtraPrinting.ImageAlignment.BottomRight; + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(353.3891F, 0F); + this.xrPictureBox1.Name = "xrPictureBox1"; + this.xrPictureBox1.SizeF = new System.Drawing.SizeF(326.611F, 100F); + this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.GkvAbrechnungRO); // - // xrRichTextBankConnection - // - this.xrRichTextBankConnection.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.xrRichTextBankConnection.LocationFloat = new DevExpress.Utils.PointFloat(0F, 12.99998F); - this.xrRichTextBankConnection.Name = "xrRichTextBankConnection"; - this.xrRichTextBankConnection.SerializableRtfString = resources.GetString("xrRichTextBankConnection.SerializableRtfString"); - this.xrRichTextBankConnection.SizeF = new System.Drawing.SizeF(678F, 32.37503F); - // - // xrLineBankConnection - // - this.xrLineBankConnection.ForeColor = System.Drawing.Color.Black; - this.xrLineBankConnection.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrLineBankConnection.Name = "xrLineBankConnection"; - this.xrLineBankConnection.SizeF = new System.Drawing.SizeF(678F, 13F); - this.xrLineBankConnection.StylePriority.UseForeColor = false; - // // GkvBegleitzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1131,11 +1141,11 @@ namespace BeWo.Report.DefaultReports.Invoices this.Version = "23.2"; xrWatermark1.Id = "Watermark1"; this.Watermarks.Add(xrWatermark1); + ((System.ComponentModel.ISupportInitialize)(this.xrRichTextBankConnection)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrRichTextBankConnection)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1247,5 +1257,6 @@ namespace BeWo.Report.DefaultReports.Invoices private DevExpress.XtraReports.UI.XRTableCell xrTableCell69; private DevExpress.XtraReports.UI.XRRichText xrRichTextBankConnection; private DevExpress.XtraReports.UI.XRLine xrLineBankConnection; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; } } diff --git a/Report/DefaultReports/Invoices/GkvBegleitzettel.cs b/Report/DefaultReports/Invoices/GkvBegleitzettel.cs index e3ae2f3d9..0a5f91315 100644 --- a/Report/DefaultReports/Invoices/GkvBegleitzettel.cs +++ b/Report/DefaultReports/Invoices/GkvBegleitzettel.cs @@ -20,6 +20,8 @@ namespace BeWo.Report.DefaultReports.Invoices public void SetReportDataSource(GkvAbrechnungRO pRO) { + xrPictureBox1.ImageSource = pRO.Logo; + if (pRO.SenderWebsite.ToNullIfEmpty() is null) xrTableRowSenderWebsite.Visible = false; diff --git a/Report/Properties/Resources.Designer.cs b/Report/Properties/Resources.Designer.cs new file mode 100644 index 000000000..14f09c480 --- /dev/null +++ b/Report/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// +// Dieser Code wurde von einem Tool generiert. +// Laufzeitversion:4.0.30319.42000 +// +// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +// der Code erneut generiert wird. +// +//------------------------------------------------------------------------------ + +namespace BeWo.Report.Properties { + using System; + + + /// + /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. + /// + // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BeWo.Report.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/Report/Properties/Resources.resx b/Report/Properties/Resources.resx new file mode 100644 index 000000000..1af7de150 --- /dev/null +++ b/Report/Properties/Resources.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Report/Report.csproj b/Report/Report.csproj index c79f5929f..73ea3a474 100644 --- a/Report/Report.csproj +++ b/Report/Report.csproj @@ -489,6 +489,11 @@ ServicesOverviewReport.cs + + True + True + Resources.resx + @@ -768,6 +773,10 @@ ServicesOverviewReport.cs Designer + + ResXFileCodeGenerator + Resources.Designer.cs + diff --git a/Report/ReportObjects/GkvAbrechnungRO.cs b/Report/ReportObjects/GkvAbrechnungRO.cs index 51efe6ba5..5263ed07d 100644 --- a/Report/ReportObjects/GkvAbrechnungRO.cs +++ b/Report/ReportObjects/GkvAbrechnungRO.cs @@ -1,10 +1,13 @@ using BeWo.Data.Entities; using BS.Shared; +using BS.Shared.Core; using BS.Shared.DataContracts; using BS.Shared.DataContracts.GkvAbrechnung; using BS.Shared.Extensions; +using DevExpress.XtraPrinting.Drawing; using System; using System.Collections.Generic; +using System.Drawing; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -41,6 +44,8 @@ namespace BeWo.Report.ReportObjects public InvoiceBaseDC InvoiceBase { get; set; } + public ImageSource Logo { get; set; } + public static GkvAbrechnungRO Create(GkvAbrechnungDC abrechnung, Mandator mandator, Employee employee) { var protokoll = (GkvTransferProtokollDC)abrechnung.LastTransferProtokoll; @@ -87,6 +92,7 @@ namespace BeWo.Report.ReportObjects result.AnzahlDerUrbelege = string.Empty; result.InvoiceBase = invoicebase; + result.Logo = new ImageSource(false, mandator.Logo.Original); return result; }