Logo auf Report - Erster Entwurf

This commit is contained in:
2024-11-29 12:29:31 +01:00
parent 302059277a
commit 3d2acddd0b
6 changed files with 232 additions and 21 deletions

View File

@@ -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;
}
}

View File

@@ -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;

63
Report/Properties/Resources.Designer.cs generated Normal file
View File

@@ -0,0 +1,63 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 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.
// </auto-generated>
//------------------------------------------------------------------------------
namespace BeWo.Report.Properties {
using System;
/// <summary>
/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
/// </summary>
// 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() {
}
/// <summary>
/// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
/// </summary>
[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;
}
}
/// <summary>
/// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
/// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
set {
resourceCulture = value;
}
}
}
}

View File

@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@@ -489,6 +489,11 @@
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReportCreator.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="ReportObjects\AbwesenheitsPrintRO.cs" />
<Compile Include="ReportObjects\GkvAbrechnungRO.cs" />
<Compile Include="ReportObjects\LwvKASpitzabrechnungRO.cs" />
@@ -768,6 +773,10 @@
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Data\Data.csproj">

View File

@@ -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;
}