Begleitzettel

This commit is contained in:
2024-11-20 15:17:13 +01:00
parent 7db7f0ae1c
commit 57f55ea7a7
25 changed files with 2909 additions and 11 deletions

View File

@@ -135,22 +135,33 @@
<StackPanel.Resources />
<Button
x:Name="btn_details"
Width="20"
Width="18"
Height="18"
Margin="1"
Padding="0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Click="btn_details_Click"
Content="¥"
FontFamily="Webdings"
FontSize="11"
FontSize="12"
Foreground="#FFFFFF"
ToolTip="Details anzeigen" />
ToolTip="Details anzeigen">
<TextBlock
Width="12"
Height="12"
Padding="0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Webdings"
FontSize="12"
Foreground="#FFFFFF"
Text="¥" />
</Button>
<!--<Button Click="btn_nutz_Click" Content="¥" Padding="0" Margin="1" ToolTip="Nutzdatendatei" Foreground="#BBBBBB" FontSize="10" FontFamily="Webdings" x:Name="btn_nutz" Height="17" Width="20" VerticalAlignment="Center" />
<Button Click="btn_auf_Click" Content="¥" Padding="0" Margin="1" ToolTip="Auftragsdatei" Foreground="#BBBBBB" FontSize="10" FontFamily="Webdings" x:Name="btn_auf" Height="17" Width="20" VerticalAlignment="Center" />-->
<Button
x:Name="btn_send"
Width="20"
Width="18"
Height="18"
Margin="1"
Padding="0"
@@ -158,12 +169,39 @@
Click="btn_send_Click"
Content="*"
FontFamily="Wingdings"
FontSize="11"
FontSize="9"
Foreground="#ffffff"
IsEnabled="{Binding Row.IsReady2Send}"
ToolTip="{Binding Row, Converter={StaticResource TooltipTextConverter}, ConverterParameter=Send}"
ToolTipService.ShowOnDisabled="True"
Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static shared:UserRightType.Finance_Gkv_Send}}" />
<Button
x:Name="btn_report"
Width="18"
Height="18"
Margin="1"
VerticalAlignment="Center"
IsEnabled="{Binding Row.IsFormularEnabled}"
ToolTip="Formular anzeigen">
<TextBlock Padding="0">
<Hyperlink
NavigateUri="{Binding DisplayText, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
RequestNavigate="Hyperlink_OnRequestNavigate"
TextDecorations="None"
TargetName="_NewWindow">
<TextBlock
Width="12"
Height="12"
Padding="0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontFamily="Webdings"
FontSize="12"
Foreground="#FFFFFF"
Text="¥" />
</Hyperlink>
</TextBlock>
</Button>
<Button
x:Name="btn_delete"
Width="20"
@@ -174,7 +212,7 @@
Click="btn_delete_Click"
Content="r"
FontFamily="Webdings"
FontSize="11"
FontSize="12"
Foreground="#FF0000"
ToolTip="Löschen"
Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static shared:UserRightType.Finance_Gkv_Delete}}" />

View File

@@ -369,5 +369,10 @@ namespace BeWo.View.Detail.Accounting
RefreshGkvAbrechnungenList();
}
}
private void Hyperlink_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
{
BeWoUtils.NavigateToReportUri(((Hyperlink)sender).NavigateUri.ToString(), "Druckvorschau");
}
}
}

View File

@@ -13,6 +13,7 @@ using BS.Shared.DataContracts.Compact;
using BS.Shared.DataContracts.GkvAbrechnung;
using BS.Shared.Extensions;
using BS.Shared.Interface;
using BS.Shared.ReportRequests;
using DevExpress.Xpf.Core;
namespace BeWo.ViewModel
@@ -338,6 +339,13 @@ namespace BeWo.ViewModel
}
}
public bool IsFormularEnabled => LastTransferProtokoll is object;
public GkvAbrechnungReportRequest ReportRequest
=> new GkvAbrechnungReportRequest(DataContract.GkvAbrechnungOid.Value);
public string ReportLink
=> BeWoApp.SiteOfOrigin + "/ReportView.aspx" + ReportRequest.GetUrlPathString();
public void FirePropertyIsReady2CreateChanged()
=> FirePropertyChanged(nameof(IsReady2Create));
public bool IsReady2Create

View File

@@ -44,5 +44,7 @@ namespace BeWo.Data.Entities
public virtual string Fehlertitel { get; set; }
public virtual DateTime? Fehlerdatum { get; set; }
public virtual string Fehlernachricht { get; set; }
public virtual string BezDatenannahmestelle => EmpfangerBezeichnung;
}
}

View File

@@ -22,6 +22,7 @@ using System.Globalization;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BS.Shared.ReportRequests;
namespace Host
{
@@ -186,6 +187,9 @@ namespace Host
case ReportTypes.ValidationMessageReport:
report = CreateValidationMessageListReport();
break;
case ReportTypes.GkvAbrechnung:
report = CreateGkvAbrechnungReport();
break;
default:
report = CreateQueryReport();
break;
@@ -948,6 +952,13 @@ namespace Host
return reportCreator.CreateValidationMessageListReport(start, end);
}
private XtraReport CreateGkvAbrechnungReport()
{
var request = GkvAbrechnungReportRequest.Parse(Request.Params);
return reportCreator.CreateGkvAbrechnungReport(request);
}
private AbstractReportCreator GetReportCreator()
{
@@ -976,5 +987,6 @@ namespace Host
return creator;
}
}
}

View File

@@ -3,6 +3,7 @@ using System.Collections.Generic;
using BS.Shared;
using BS.Shared.Core;
using BS.Shared.DataContracts;
using BS.Shared.ReportRequests;
using DevExpress.XtraReports.UI;
namespace BeWo.Report
@@ -125,6 +126,6 @@ namespace BeWo.Report
public abstract XtraReport CreateUserGroupListReport(List<long> oids);
public abstract XtraReport CreateGkvAbrechnungReport(GkvAbrechnungReportRequest gkvAbrechnungReportRequest);
}
}

View File

@@ -19,6 +19,8 @@ using BS.Shared.DataContracts.Compact;
using BeWo.Service.Plugins;
using BeWo.Service.Reporting;
using System.Web;
using BeWo.Data.Security;
using BS.Shared.ReportRequests;
namespace BeWo.Report
{
@@ -1771,5 +1773,23 @@ namespace BeWo.Report
return report as XtraReport;
}
public override XtraReport CreateGkvAbrechnungReport(GkvAbrechnungReportRequest req)
{
var os = new OperationsServiceImp();
var mandator = os.GetMandator2(false);
var person = UserRightHelper.GetLoggedInUser().Employee.Person;
var gkvAbrechnung = DAOFactory.GenericDAO.LoadByID<GkvAbrechnung>(req.Oid);
var gkvAbrechnungDC = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewDC(gkvAbrechnung);
var ro = GkvAbrechnungRO.Create(gkvAbrechnungDC, mandator, person);
var report = FindReportImp<GkvAbrechnungRO>();
report.SetReportDataSource(ro);
return report as XtraReport;
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,25 @@
using System;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using DevExpress.XtraReports.UI;
namespace BeWo.DiakonieKKKleve
{
[IDSpecificClass(Identifier = "GkvBegleitzettel")]
public partial class GkvBegleitzettel : XtraReport, IBeWoReport<GkvAbrechnungRO>
{
public GkvBegleitzettel()
{
this.InitializeComponent();
}
public void SetReportDataSource(GkvAbrechnungRO pRO)
{
bindingSource1.DataSource = pRO;
}
}
}

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

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is automatically generated by Visual Studio .Net. It is
used to store generic object data source configuration information.
Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="GkvAbrechnungRO" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>BeWo.Report.ReportObjects.GkvAbrechnungRO, BeWo.Report, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

View File

@@ -136,6 +136,12 @@
<Compile Include="DefaultReports\AbwesenheitsPrintReport.Designer.cs">
<DependentUpon>AbwesenheitsPrintReport.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\Invoices\GkvBegleitzettel.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="DefaultReports\Invoices\GkvBegleitzettel.Designer.cs">
<DependentUpon>GkvBegleitzettel.cs</DependentUpon>
</Compile>
<Compile Include="DefaultReports\LwvKASpitzabrechnung.cs">
<SubType>Component</SubType>
</Compile>
@@ -484,6 +490,7 @@
</Compile>
<Compile Include="DefaultReportCreator.cs" />
<Compile Include="ReportObjects\AbwesenheitsPrintRO.cs" />
<Compile Include="ReportObjects\GkvAbrechnungRO.cs" />
<Compile Include="ReportObjects\LwvKASpitzabrechnungRO.cs" />
<Compile Include="ReportObjects\BudgetnachweisAnhangRO.cs" />
<Compile Include="ReportObjects\ServiceRecordChangesAfterInvoiceDateRO.cs" />
@@ -546,6 +553,10 @@
<DependentUpon>AbwesenheitsPrintReport.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DefaultReports\Invoices\GkvBegleitzettel.resx">
<DependentUpon>GkvBegleitzettel.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="DefaultReports\LwvKASpitzabrechnung.resx">
<DependentUpon>LwvKASpitzabrechnung.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -778,6 +789,7 @@
<None Include="Properties\DataSources\BeWo.Report.DefaultReports.KalenderMonatsformatReport.datasource" />
<None Include="Properties\DataSources\BeWo.Report.ReportObjects.AdditionalServiceBookingRO.datasource" />
<None Include="Properties\DataSources\BeWo.Report.ReportObjects.AssessmentSheetRO.datasource" />
<None Include="Properties\DataSources\BeWo.Report.ReportObjects.GkvAbrechnungRO.datasource" />
<None Include="Properties\DataSources\BeWo.Report.ReportObjects.KalenderRO.datasource" />
<None Include="Properties\DataSources\BeWo.Report.ReportObjects.KassenbelegRO.datasource" />
<None Include="Properties\DataSources\BeWo.Report.ReportObjects.KassenbuchRO.datasource" />

View File

@@ -0,0 +1,65 @@
using BeWo.Data.Entities;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.GkvAbrechnung;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BeWo.Report.ReportObjects
{
public class GkvAbrechnungRO : AbstractBeWoReportObject<GkvAbrechnungRO>
{
public string SenderOrganisationName { get; set; }
public string SenderStreet { get; set; }
public string SenderPostCodeAndTown { get; set; }
public string SenderPhone { get; set; }
public string SenderFax { get; set; }
public string SenderMail { get; set; }
public string SenderWebsite { get; set; }
public string SenderContactPerson { get; set; }
public string ReceiverDatenannahmestelle { get; set; }
public string ReceiverStreet { get; set; }
public string ReceiverPostCodeAndTown { get; set; }
public string KrankenkasseIK { get; set; }
public string KrankenkasseName { get; set; }
public string SenderIK { get; set; }
public string Rechnungsnummer { get; set; }
public string Rechnungsdatum { get; set; }
public string AnzahlDerUrbelege { get; set; }
public static GkvAbrechnungRO Create(GkvAbrechnungDC abrechnung, MandatorDC mandator, Person person)
{
var protokoll = (GkvTransferProtokollDC)abrechnung.LastTransferProtokoll;
var organisation = abrechnung.Organisation;
var result = new GkvAbrechnungRO();
result.SenderOrganisationName = mandator.Name;
result.SenderStreet = mandator.Street;
result.SenderPostCodeAndTown = $"{mandator.PostalCode}, {mandator.Town}";
result.SenderPhone = person.Contacts.FirstOrDefault(x => x.Type == BS.Shared.ContactType.business_Phone)?.Value;
result.SenderFax = person.Contacts.FirstOrDefault(x => x.Type == BS.Shared.ContactType.business_Fax)?.Value;
result.SenderMail = person.Contacts.FirstOrDefault(x => x.Type == BS.Shared.ContactType.business_Mail)?.Value;
result.SenderContactPerson = person.LastNameFirstName;
result.ReceiverDatenannahmestelle = organisation.BezDatenannahmestelle;
result.ReceiverStreet = organisation.InvoiceAddressStreet;
result.ReceiverPostCodeAndTown = $"{organisation.InvoiceAddressPostalCode}, {organisation.InvoiceAddressTown}";
result.KrankenkasseIK = organisation.IKKostentrager;
result.KrankenkasseName = organisation.Name;
result.SenderIK = mandator.IKLeistungserbringer;
result.Rechnungsnummer = protokoll.Rechnungsnummer;
result.Rechnungsdatum = protokoll.ErstelltAm.Value.ToString("dd.MM.yyyy");
result.AnzahlDerUrbelege = string.Empty;
return result;
}
}
}

View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is automatically generated by Visual Studio .Net. It is
used to store generic object data source configuration information.
Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="GkvAbrechnungRO" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>BeWo.Report.ReportObjects.GkvAbrechnungRO, BeWo.Report, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>

View File

@@ -33,12 +33,14 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="DevExpress.DataAccess.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Pdf.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Utils.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpo.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v23.2.Wizard, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -178,6 +180,12 @@
<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>
@@ -326,6 +334,10 @@
<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>
@@ -382,6 +394,7 @@
</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

@@ -0,0 +1,26 @@
using System;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using DevExpress.XtraReports.UI;
namespace BeWo.DiakonieKKKleve
{
[IDSpecificClass(Identifier = "GkvBegleitzettel")]
public partial class GkvBegleitzettel : XtraReport, IBeWoReport<GkvAbrechnungRO>
{
public GkvBegleitzettel()
{
this.InitializeComponent();
}
public void SetReportDataSource(GkvAbrechnungRO pRO)
{
pRO.SenderWebsite = "www.diakonie-kkkleve.de";
bindingSource1.DataSource = pRO;
}
}
}

File diff suppressed because one or more lines are too long

View File

@@ -20,7 +20,7 @@ namespace BeWo.DiakonieKKKleve
{
if (!String.IsNullOrEmpty(pRO.SenderContactPersonMail))
{
pRO.SenderContactPersonMail = pRO.SenderContactPersonMail.Replace("E-Mail.:", "").Trim();
pRO.SenderContactPersonMail = pRO.SenderContactPersonMail.Replace("E-Mail:", "").Trim();
}
if (!String.IsNullOrEmpty(pRO.SenderContactPersonPhone))
{

View File

@@ -38,5 +38,7 @@ namespace BS.Shared.DataContracts.GkvAbrechnung
[DataMember] public string Fehlertitel { get; set; }
[DataMember] public DateTime? Fehlerdatum { get; set; }
[DataMember] public string Fehlernachricht { get; set; }
public string BezDatenannahmestelle => EmpfangerBezeichnung;
}
}

View File

@@ -40,6 +40,7 @@
KilometerAuswertung,
VertretungsPlanung,
ValidationMessageReport,
SBDEmployeeReport
SBDEmployeeReport,
GkvAbrechnung
}
}

View File

@@ -9,6 +9,7 @@ namespace BS.Shared.Interface
public interface IGkvTransferProtokoll
{
string IKDatenannahmestelle { get; set; }
string BezDatenannahmestelle { get; }
GkvTransferResultType? ResultType { get; set; }
}
}

View File

@@ -0,0 +1,43 @@
using BS.Shared.DataContracts;
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BS.Shared.ReportRequests
{
public abstract class AbstractReportRequest
{
public ReportTypes ReportType { get; set; }
public AbstractReportRequest(ReportTypes type)
{
ReportType = type;
}
internal abstract NameValueCollection GetParameters();
public string GetUrlPathString()
{
var sb = new StringBuilder();
sb.Append($"?type={ReportType}");
var parameters = GetParameters();
if (parameters is null)
return sb.ToString();
foreach (string key in parameters)
{
var value = parameters[key];
sb.Append($"&{key}={value}");
}
return sb.ToString();
}
}
}

View File

@@ -0,0 +1,54 @@
using BS.Shared.DataContracts;
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BS.Shared.ReportRequests
{
public class GkvAbrechnungReportRequest : AbstractReportRequest
{
public const string PropertyStringOid = "oid";
public long Oid { get; set; }
private GkvAbrechnungReportRequest() : base(ReportTypes.GkvAbrechnung)
{
}
public GkvAbrechnungReportRequest(long poid) : this()
{
Oid = poid;
}
internal override NameValueCollection GetParameters() =>
new NameValueCollection()
{
{PropertyStringOid, Oid.ToString() }
};
public static GkvAbrechnungReportRequest Parse(NameValueCollection collection)
{
var rtn = new GkvAbrechnungReportRequest();
foreach (string key in collection)
{
string value = collection[key];
switch (key)
{
case PropertyStringOid:
rtn.Oid = long.Parse(value);
break;
default:
break;
}
}
return rtn;
}
}
}

View File

@@ -360,6 +360,8 @@
<Compile Include="Interface\IGkvAbrechnung.cs" />
<Compile Include="Interface\IGkvTransferProtokoll.cs" />
<Compile Include="Packet.cs" />
<Compile Include="ReportRequests\AbstractReportRequest.cs" />
<Compile Include="ReportRequests\GkvAbrechnungReportRequest.cs" />
<Compile Include="Rss\RssManager.cs" />
<Compile Include="Services\BillingData.cs" />
<Compile Include="Services\Calculations.cs" />