Kein individueller Report -> wird standard mit neuem Logo in der Verwaltung

This commit is contained in:
2024-11-27 14:33:35 +01:00
parent 7b88310481
commit 82c53c152a
7 changed files with 38 additions and 1447 deletions

View File

@@ -29,6 +29,7 @@ namespace BeWo.Report.DefaultReports.Invoices
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GkvBegleitzettel));
DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
this.Detail = new DevExpress.XtraReports.UI.DetailBand();
this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
@@ -134,10 +135,13 @@ namespace BeWo.Report.DefaultReports.Invoices
this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell();
this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
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.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
@@ -166,6 +170,9 @@ namespace BeWo.Report.DefaultReports.Invoices
//
// bottomMarginBand1
//
this.bottomMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
this.xrRichTextBankConnection,
this.xrLineBankConnection});
this.bottomMarginBand1.HeightF = 71F;
this.bottomMarginBand1.Name = "bottomMarginBand1";
//
@@ -1064,7 +1071,7 @@ namespace BeWo.Report.DefaultReports.Invoices
this.xrTableCell18.StylePriority.UseFont = false;
this.xrTableCell18.StylePriority.UsePadding = false;
this.xrTableCell18.StylePriority.UseTextAlignment = false;
this.xrTableCell18.Text = "ANSPRECHPARTNER DAT";
this.xrTableCell18.Text = "ANSPRECHPARTNER DTA";
this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
this.xrTableCell18.Weight = 0.96909884259238122D;
//
@@ -1087,6 +1094,22 @@ namespace BeWo.Report.DefaultReports.Invoices
//
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[] {
@@ -1112,6 +1135,7 @@ namespace BeWo.Report.DefaultReports.Invoices
((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();
}
@@ -1221,5 +1245,7 @@ namespace BeWo.Report.DefaultReports.Invoices
private DevExpress.XtraReports.UI.XRTableCell xrTableCell67;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell68;
private DevExpress.XtraReports.UI.XRTableCell xrTableCell69;
private DevExpress.XtraReports.UI.XRRichText xrRichTextBankConnection;
private DevExpress.XtraReports.UI.XRLine xrLineBankConnection;
}
}

View File

@@ -38,6 +38,14 @@ namespace BeWo.Report.DefaultReports.Invoices
if (pRO.ReceiverPostCodeAndTown.ToNullIfEmpty() is null)
xrTableRowReceiverPostCodeTown.Visible = false;
if (pRO.SenderBankName.ToNullIfEmpty() is null ||
pRO.SenderBankIBAN.ToNullIfEmpty() is null ||
pRO.SenderBankName.ToNullIfEmpty() is null)
{
xrLineBankConnection.Visible = false;
xrRichTextBankConnection.Visible = false;
}
bindingSource1.DataSource = pRO;
}
}

View File

@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="xrRichTextBankConnection.SerializableRtfString" xml:space="preserve">
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAE0AZQB0AGEATQBlAGQAaQB1AG0ALQBSAG8AbQBhAG4AOwB9AHsAXABmADMAIABBAHIAaQBhAGwAOwB9AHsAXABmADQAXABmAGMAaABhAHIAcwBlAHQAMgAgAFcAZQBiAGQAaQBuAGcAcwA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAKgBcAGQAZQBmAHAAYQBwACAAXAB3AGkAZABjAHQAbABwAGEAcgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAGYAMQBcAGYAcwAyADQAXAB1AGwAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABoAHQAbQBhAHUAdABzAHAAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAYwBcAHMAYQAzADAAXAB0AHEAYwBcAHQAeAA0ADUAMwA2AFwAdABxAHIAXAB0AHgAOQA0ADkAOAB7AFwAZgAyAFwAZgBzADEANgBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABjAGYAMQAgAFsAUwBlAG4AZABlAHIAQgBhAG4AawBOAGEAbQBlAF0AfQB7AFwAZgAzAFwAZgBzADEANABcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABjAGYAMQAgACAAIAB9AHsAXABmADQAXABmAHMANgBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABjAGYAMQAgADwAfQB7AFwAZgAzAFwAZgBzADEANABcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABjAGYAMQAgACAAfQB7AFwAZgAyAFwAZgBzADEANgBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABjAGYAMQAgACAAWwBTAGUAbgBkAGUAcgBCAGEAbgBrAEkAQgBBAE4AXQAgACAAfQB7AFwAZgA0AFwAZgBzADYAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAIAA8AH0AewBcAGYAMwBcAGYAcwAxADQAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAIAAgACAAfQB7AFwAZgAyAFwAZgBzADEANgBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABjAGYAMQAgAFsAUwBlAG4AZABlAHIAQgBhAG4AawBCAEkAQwBdAH0AXABmADIAXABmAHMAMQA2AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAZgAxAFwAZgBzADIANABcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABjAGYAMQBcAHAAYQByAH0A</value>
</data>
</root>

View File

@@ -180,12 +180,6 @@
<Compile Include="RechnungSelbstzahler.Designer.cs">
<DependentUpon>RechnungSelbstzahler.cs</DependentUpon>
</Compile>
<Compile Include="GkvBegleitzettel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="GkvBegleitzettel.Designer.cs">
<DependentUpon>GkvBegleitzettel.cs</DependentUpon>
</Compile>
<Compile Include="Reporting\DkkkAnnualReportFactory.cs" />
<Compile Include="QuittierungsbelegDienstleistung.cs">
<SubType>Component</SubType>
@@ -334,10 +328,6 @@
<DependentUpon>RechnungSelbstzahler.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="GkvBegleitzettel.resx">
<DependentUpon>GkvBegleitzettel.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="RechnungSoziotherapie.resx">
<DependentUpon>RechnungSoziotherapie.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -394,7 +384,6 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="BeWo.Report.ReportObjects.GkvAbrechnungRO.datasource" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

File diff suppressed because it is too large Load Diff

View File

@@ -1,45 +0,0 @@
using System;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
namespace BeWo.DiakonieKKKleve
{
public partial class GkvBegleitzettel : XtraReport, IBeWoReport<GkvAbrechnungRO>
{
public GkvBegleitzettel()
{
this.InitializeComponent();
}
public void SetReportDataSource(GkvAbrechnungRO pRO)
{
pRO.SenderWebsite = "www.diakonie-kkkleve.de";
if (pRO.SenderWebsite.ToNullIfEmpty() is null)
xrTableRowSenderWebsite.Visible = false;
if (pRO.ReceiverDatenannahmestelle.ToNullIfEmpty() is null)
xrTableRowReceiverDatenannahmestelle.Visible = false;
if (pRO.ReceiverDivision.ToNullIfEmpty() is null)
xrTableRowReceiverDivision.Visible = false;
if (pRO.ReceiverContactPerson.ToNullIfEmpty() is null)
xrTableRowReceiverContactPerson.Visible = false;
if (pRO.ReceiverStreet.ToNullIfEmpty() is null)
xrTableRowReceiverStreet.Visible = false;
if (pRO.ReceiverPostCodeAndTown.ToNullIfEmpty() is null)
xrTableRowReceiverPostCodeTown.Visible = false;
bindingSource1.DataSource = pRO;
}
}
}

File diff suppressed because one or more lines are too long