ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BusinessPartnerId (für GP-Nummer)

Browse Source
This commit is contained in:
Kojo
2024-09-18 08:59:44 +02:00
parent 092412f049
commit c0929cec61
8 changed files with 65 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
BeWo/ViewModel/OrganisationVM.cs
View File

@@ -91,6 +91,8 @@ namespace BeWo.ViewModel
public static string PropertyName_Leistungserbringergruppe = nameof(Leistungserbringergruppe);
public static string PropertyName_BusinessPartnerId = nameof(BusinessPartnerId);
private readonly List<ValueListEntryDC> _AllQualifications;
private string _AccountNumber;
@@ -171,6 +173,8 @@ namespace BeWo.ViewModel
private string _Leistungserbringergruppe;
private string _BusinessPartnerId;
public OrganisationVM(OrganisationDC pDataContract, List<ValueListEntryDC> pAllQualifications, List<ValueListEntryDC> pPossibleFunctions, List<ValueListEntryDC> pPossibleRoleInOrganisations)
: base(pDataContract, pDataContract.OrganisationOid == null)
{
@@ -831,6 +835,21 @@ namespace BeWo.ViewModel
}
}
public string BusinessPartnerId
{
get { return this._BusinessPartnerId; }
set
{
if (this.AreDifferent(this._BusinessPartnerId, value))
{
this._BusinessPartnerId = value;
this.StoreDirtyInformation(this.AreDifferent(this.DataContract.BusinessPartnerId, value), nameof(BusinessPartnerId));
this.FirePropertyChanged(nameof(BusinessPartnerId));
}
}
}
protected void CommitContact(string pValue, ContactType pContactType)
{
List<ContactDC> lOldContactDCs;
@@ -896,6 +915,7 @@ namespace BeWo.ViewModel
this._IKKostentrager = pDataContract.IKKostentrager;
this._IKDatenannahmestelle = pDataContract.IKDatenannahmestelle;
_Leistungserbringergruppe = pDataContract.Leistungserbringergruppe;
_BusinessPartnerId = pDataContract.BusinessPartnerId;
_Function = pDataContract.Function;
@@ -1003,6 +1023,7 @@ namespace BeWo.ViewModel
pDataContract.IKKostentrager = this._IKKostentrager;
pDataContract.IKKrankenkasse = this._IKKrankenkasse;
pDataContract.Leistungserbringergruppe = _Leistungserbringergruppe;
pDataContract.BusinessPartnerId = _BusinessPartnerId;
this.CommitContact(this._Phone, ContactType.business_Phone);
this.CommitContact(this._Website, ContactType.business_Homepage);

19
Data/Entities/Organisation.cs
View File

@@ -32,6 +32,8 @@ namespace BeWo.Data.Entities
public static string PropertyName_Leistungserbringergruppe = nameof(Leistungserbringergruppe);
public static string PropertyName_BusinessPartnerId = nameof(BusinessPartnerId);
private Address _Address;
private BankAccount _BankAccount;
@@ -66,6 +68,7 @@ namespace BeWo.Data.Entities
private string _Leistungserbringergruppe;
private string _BusinessPartnerId;
public Organisation()
{
@@ -332,5 +335,21 @@ namespace BeWo.Data.Entities
}
}
}
public virtual string BusinessPartnerId
{
get
{
return this._BusinessPartnerId;
}
set
{
if (this.AreDifferent(this._BusinessPartnerId, value))
{
this._BusinessPartnerId = value;
}
}
}
}
}

9
Data/Mappings/Organisation.hbm.xml
View File

@@ -16,10 +16,11 @@
<property column="UdpUser" type="String" name="UdpUser" length="256" />
<property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
<property column="IKKrankenkasse" type="String" name="IKKrankenkasse" length="16" />
<property column="IKKostentrager" type="String" name="IKKostentrager" length="16" />
<property column="IKDatenannahmestelle" type="String" name="IKDatenannahmestelle" length="16" />
<property column="Leistungserbringergruppe" type="String" name="Leistungserbringergruppe" length="7" />
<property column="IKKrankenkasse" type="String" name="IKKrankenkasse" length="256" />
<property column="IKKostentrager" type="String" name="IKKostentrager" length="256" />
<property column="IKDatenannahmestelle" type="String" name="IKDatenannahmestelle" length="256" />
<property column="Leistungserbringergruppe" type="String" name="Leistungserbringergruppe" length="256" />
<property column="BusinessPartnerId" type="String" name="BusinessPartnerId" length="256" />
<many-to-one name="Address" column="AddressOid" class="BeWo.Data.Entities.Address, BeWo.Data" cascade="all" fetch="join"/>
<many-to-one name="InvoiceAddress" column="InvoiceAddressOid" class="BeWo.Data.Entities.Address, BeWo.Data" cascade="all" fetch="join"/>

2
Model/Changes_2024_09_16 Organisation BusinessPartnerId.txt Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE `organisation`
ADD COLUMN `BusinessParnerId` VARCHAR(256) NULL DEFAULT NULL AFTER `Leistungserbringergruppe`;

7
Report/ReportObjects/Settlement2RO.cs
View File

@@ -141,6 +141,8 @@ namespace BeWo.Report.ReportObjects
public bool HasGroupRecords { get; set; }
public String BusinessPartnerId { get; set; }
public List<SettlementInvoiceItemRO> InvoiceItems { get; set; }
public IList<ServiceRecordDC> Fehlkontakte { get; set; }
@@ -346,6 +348,11 @@ namespace BeWo.Report.ReportObjects
if (contact != null)
lResult.RecipientPhone = contact.Value;
}
if (!org.BusinessPartnerId.IsNullOrEmpty())
{
lResult.BusinessPartnerId = "GP-Nummer: " + org.BusinessPartnerId;
}
}
lResult.SenderContactPerson = pDC.SenderContactPersonFirstName + " " + pDC.SenderContactPersonLastName;

4
Service/DCEntityMapper/OrganisationDC_Organisation.cs
View File

@@ -33,6 +33,8 @@ namespace BeWo.Service.DCEntityMapper
pDataContract.IKDatenannahmestelle = pEntity.IKDatenannahmestelle;
pDataContract.Leistungserbringergruppe = pEntity.Leistungserbringergruppe;
pDataContract.BusinessPartnerId = pEntity.BusinessPartnerId;
if (pEntity.Function != null)
{
pDataContract.Function = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDC(pEntity.Function);
@@ -108,6 +110,8 @@ namespace BeWo.Service.DCEntityMapper
pEntity.IKDatenannahmestelle = pDataContract.IKDatenannahmestelle;
pEntity.Leistungserbringergruppe = pDataContract.Leistungserbringergruppe;
pEntity.BusinessPartnerId = pDataContract.BusinessPartnerId;
if (pDataContract.Function == null)
{
pEntity.Function = null;

3
Shared/DataContracts/OrganisationDC.cs
View File

@@ -180,5 +180,8 @@ namespace BS.Shared.DataContracts
[DataMember]
public string Leistungserbringergruppe { get; set; }
[DataMember]
public string BusinessPartnerId { get; set; }
}
}

5
Shared/DataContracts/Settlement2DC.cs
View File

@@ -224,7 +224,10 @@ namespace BS.Shared.DataContracts
[DataMember]
public bool HasGroupRecords { get; set; }
[DataMember]
public string BusinessPartnerId { get; set; }
[DataMember]
public List<InvoiceItemDC> InvoiceItems { get; set; }