diff --git a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml index b7ce4acfb..6c2c5ef15 100644 --- a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml +++ b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml @@ -298,7 +298,7 @@ Opened="popup_Opened" Placement="MousePoint" StaysOpen="False"> - + diff --git a/BeWo/View/Search/OrganisationSearchView.cs b/BeWo/View/Search/OrganisationSearchView.cs index 0f6a46abe..244027a2c 100644 --- a/BeWo/View/Search/OrganisationSearchView.cs +++ b/BeWo/View/Search/OrganisationSearchView.cs @@ -32,7 +32,7 @@ namespace BeWo.View.Search pCallBack(r); }); } - else if (this.SearchMode == SearchMode.OnlyValid) + else if (this.SearchMode == SearchMode.OnlyValidGkvOrganisations) { ServiceFacade.DoCustomerServiceAsync( s => s.GetAllGkvValidOrganisationsCompact(), diff --git a/BeWo/View/Search/SearchMode.cs b/BeWo/View/Search/SearchMode.cs index dcee2f64d..421113461 100644 --- a/BeWo/View/Search/SearchMode.cs +++ b/BeWo/View/Search/SearchMode.cs @@ -8,6 +8,6 @@ ActiveCostbearer2SupportConcepts, OnlyToOrganisationRelatedPersons, OnlyTeamMember, - OnlyValid + OnlyValidGkvOrganisations } } \ No newline at end of file diff --git a/BeWo/ViewModel/OrganisationVM.cs b/BeWo/ViewModel/OrganisationVM.cs index 7dcfb1c93..a71d8639d 100644 --- a/BeWo/ViewModel/OrganisationVM.cs +++ b/BeWo/ViewModel/OrganisationVM.cs @@ -13,443 +13,370 @@ using BS.Shared.DataContracts; namespace BeWo.ViewModel { - public class OrganisationVM : AbstractDCMapperVM, IArbeitszeitenVM - { - public static string PropertyName_AccountNumber = "AccountNumber"; - - public static string PropertyName_BankCode = "BankCode"; - - public static string PropertyName_BankName = "BankName"; - - public static string PropertyName_Bic = "Bic"; - - public static string PropertyName_ContactPerson = "ContactPerson"; - - public static string PropertyName_CostRatePeriods = "CostRatePeriods"; - - public static string PropertyName_EMail = "EMail"; - - public static string PropertyName_Fax = "Fax"; - - public static string PropertyName_IBAN = "IBAN"; - - public static string PropertyName_InvoiceAddressPOBox = "InvoiceAddressPOBox"; - - public static string PropertyName_InvoiceAddressPostalCode = "InvoiceAddressPostalCode"; - - public static string PropertyName_InvoiceAddressStreet = "InvoiceAddressStreet"; - - public static string PropertyName_InvoiceAddressTown = "InvoiceAddressTown"; - - public static string PropertyName_InvoiceAddressLine1 = "InvoiceAddressLine1"; - - public static string PropertyName_IsCalculatingWithFactor = "IsCalculatingWithFactor"; - - public static string PropertyName_IsSingleInvoicePerCustomer = "IsSingleInvoicePerCustomer"; - - public static string PropertyName_Name = "Name"; - - public static string PropertyName_Name2 = "Name2"; - - public static string PropertyName_Notice = "Notice"; - - public static string PropertyName_POBox = "POBox"; - - public static string PropertyName_Phone = "Phone"; - - public static string PropertyName_PossibleQualifications = "PossibleQualifications"; - - public static string PropertyName_PersonRelations = "PersonRelations"; - - public static string PropertyName_PostalCode = "PostalCode"; - - public static string PropertyName_Street = "Street"; - - public static string PropertyName_Town = "Town"; - - public static string PropertyName_AddressLine1 = "AddressLine1"; - - public static string PropertyName_Website = "Website"; - - public static string PropertyName_DebitorNumber = "DebitorNumber"; - + public class OrganisationVM : AbstractDCMapperVM, IArbeitszeitenVM + { + public static string PropertyName_AccountNumber = "AccountNumber"; + public static string PropertyName_BankCode = "BankCode"; + public static string PropertyName_BankName = "BankName"; + public static string PropertyName_Bic = "Bic"; + public static string PropertyName_ContactPerson = "ContactPerson"; + public static string PropertyName_CostRatePeriods = "CostRatePeriods"; + public static string PropertyName_EMail = "EMail"; + public static string PropertyName_Fax = "Fax"; + public static string PropertyName_IBAN = "IBAN"; + public static string PropertyName_InvoiceAddressPOBox = "InvoiceAddressPOBox"; + public static string PropertyName_InvoiceAddressPostalCode = "InvoiceAddressPostalCode"; + public static string PropertyName_InvoiceAddressStreet = "InvoiceAddressStreet"; + public static string PropertyName_InvoiceAddressTown = "InvoiceAddressTown"; + public static string PropertyName_InvoiceAddressLine1 = "InvoiceAddressLine1"; + public static string PropertyName_IsCalculatingWithFactor = "IsCalculatingWithFactor"; + public static string PropertyName_IsSingleInvoicePerCustomer = "IsSingleInvoicePerCustomer"; + public static string PropertyName_Name = "Name"; + public static string PropertyName_Name2 = "Name2"; + public static string PropertyName_Notice = "Notice"; + public static string PropertyName_POBox = "POBox"; + public static string PropertyName_Phone = "Phone"; + public static string PropertyName_PossibleQualifications = "PossibleQualifications"; + public static string PropertyName_PersonRelations = "PersonRelations"; + public static string PropertyName_PostalCode = "PostalCode"; + public static string PropertyName_Street = "Street"; + public static string PropertyName_Town = "Town"; + public static string PropertyName_AddressLine1 = "AddressLine1"; + public static string PropertyName_Website = "Website"; + public static string PropertyName_DebitorNumber = "DebitorNumber"; public static string PropertyName_IsArchived = "IsArchived"; - public static string PropertyName_VarFields = "VarFields"; + public static string PropertyName_Function = "OrganisationsFunction"; + public static string PropertyName_Arbeitszeiten = "Arbeitszeiten"; + public static string PropertyName_Feiertage = "Feiertage"; - public static string PropertyName_Function = "OrganisationsFunction"; - - public static string PropertyName_Arbeitszeiten = "Arbeitszeiten"; - - public static string PropertyName_Feiertage = "Feiertage"; - - public static string PropertyName_IKKrankenkasse = nameof(IKKrankenkasse); - public static string PropertyName_IKKostentrager = nameof(IKKostentrager); - public static string PropertyName_IKDatenannahmestelle = nameof(IKDatenannahmestelle); - public static string PropertyName_Leistungserbringergruppe = nameof(Leistungserbringergruppe); - public static string PropertyName_BusinessPartnerId = nameof(BusinessPartnerId); - - private readonly List _AllQualifications; - - private string _AccountNumber; - - private string _BankCode; - - private string _BankName; - - private string _Bic; - - private string _ContactPerson; - - private CostRatePeriodListVM _CostRatePeriods; - - private string _EMail; - - private string _Fax; - - private string _IBAN; - - private string _InvoiceAddressPOBox; - - private string _InvoiceAddressPostalCode; - - private string _InvoiceAddressStreet; - - private string _InvoiceAddressTown; - - private string _InvoiceAddressLine1; - - private bool _IsCalculatingWithFactor; - - private bool _IsSingleInvoicePerCustomer; - - private string _Name; - - private string _Name2; - - private string _Notice; - - private string _POBox; - - private string _Phone; - - private OrganisationPersonRelationListVM _PersonRelations; - - private string _PostalCode; - - private string _Street; - - private string _Town; - - private string _AddressLine1; - - private string _Website; - - private string _DebitorNumber; + private readonly List _AllQualifications; + private string _AccountNumber; + private string _BankCode; + private string _BankName; + private string _Bic; + private string _ContactPerson; + private CostRatePeriodListVM _CostRatePeriods; + private string _EMail; + private string _Fax; + private string _IBAN; + private string _InvoiceAddressPOBox; + private string _InvoiceAddressPostalCode; + private string _InvoiceAddressStreet; + private string _InvoiceAddressTown; + private string _InvoiceAddressLine1; + private bool _IsCalculatingWithFactor; + private bool _IsSingleInvoicePerCustomer; + private string _Name; + private string _Name2; + private string _Notice; + private string _POBox; + private string _Phone; + private OrganisationPersonRelationListVM _PersonRelations; + private string _PostalCode; + private string _Street; + private string _Town; + private string _AddressLine1; + private string _Website; + private string _DebitorNumber; private bool _IsArchived; - private VarFieldListVM _VarFields; + private ObservableSortCollection _Functions; + private ObservableSortCollection _RoleInOrganisations; + private ValueListEntryDC _Function; + private ArbeitszeitListVM _ArbeitszeitListe; + private FeiertagListVM _Feiertage; + private string _IKKrankenkasse; + private string _IKKostentrager; + private string _IKDatenannahmestelle; + private string _BezDatenannahmestelle; + private string _Leistungserbringergruppe; + private string _BusinessPartnerId; + private GkvVerfahrensstufe? _Verfahrensstufe; + private bool _GkvAusblenden; - private ObservableSortCollection _Functions; + public OrganisationVM(OrganisationDC pDataContract, List pAllQualifications, List pPossibleFunctions, List pPossibleRoleInOrganisations) + : base(pDataContract, pDataContract.OrganisationOid == null) + { + this._AllQualifications = pAllQualifications; - private ObservableSortCollection _RoleInOrganisations; - - private ValueListEntryDC _Function; + this._Functions = new ObservableSortCollection(pPossibleFunctions, Comparer.ValueListEntryDCComparer); - private ArbeitszeitListVM _ArbeitszeitListe; + _RoleInOrganisations = new ObservableSortCollection(pPossibleRoleInOrganisations, Comparer.ValueListEntryDCComparer); - private FeiertagListVM _Feiertage; + Arbeitszeiten = new ArbeitszeitListVM(DataContract.Arbeitszeiten); - private string _IKKrankenkasse; - private string _IKKostentrager; - private string _IKDatenannahmestelle; - private string _BezDatenannahmestelle; - private string _Leistungserbringergruppe; - private string _BusinessPartnerId; - private GkvVerfahrensstufe? _Verfahrensstufe; + Feiertage = new FeiertagListVM(DataContract.Feiertage); + } - public OrganisationVM(OrganisationDC pDataContract, List pAllQualifications, List pPossibleFunctions, List pPossibleRoleInOrganisations) - : base(pDataContract, pDataContract.OrganisationOid == null) - { - this._AllQualifications = pAllQualifications; + public ArbeitszeitListVM Arbeitszeiten + { + get { return _ArbeitszeitListe; } - this._Functions = new ObservableSortCollection(pPossibleFunctions, Comparer.ValueListEntryDCComparer); + set + { + _ArbeitszeitListe = value; + FirePropertyChanged(PropertyName_Arbeitszeiten); + } + } - _RoleInOrganisations = new ObservableSortCollection(pPossibleRoleInOrganisations, Comparer.ValueListEntryDCComparer); + public FeiertagListVM Feiertage + { + get { return _Feiertage; } - Arbeitszeiten = new ArbeitszeitListVM(DataContract.Arbeitszeiten); + set + { + _Feiertage = value; + FirePropertyChanged(PropertyName_Feiertage); + } + } - Feiertage = new FeiertagListVM(DataContract.Feiertage); - } + public string AccountNumber + { + get { return this._AccountNumber; } - public ArbeitszeitListVM Arbeitszeiten - { - get { return _ArbeitszeitListe; } + set + { + if (this.AreDifferent(this._AccountNumber, value)) + { + this._AccountNumber = value; - set - { - _ArbeitszeitListe = value; - FirePropertyChanged(PropertyName_Arbeitszeiten); - } - } + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.AccountNumber, value), PropertyName_AccountNumber); - public FeiertagListVM Feiertage - { - get { return _Feiertage; } + this.FirePropertyChanged(PropertyName_AccountNumber); + } + } + } - set - { - _Feiertage = value; - FirePropertyChanged(PropertyName_Feiertage); - } - } + public string BankCode + { + get { return this._BankCode; } - public string AccountNumber - { - get { return this._AccountNumber; } + set + { + if (this.AreDifferent(this._BankCode, value)) + { + this._BankCode = value; - set - { - if (this.AreDifferent(this._AccountNumber, value)) - { - this._AccountNumber = value; + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.BankCode, value), PropertyName_BankCode); - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.AccountNumber, value), PropertyName_AccountNumber); + this.FirePropertyChanged(PropertyName_BankCode); + } + } + } - this.FirePropertyChanged(PropertyName_AccountNumber); - } - } - } + public string BankName + { + get { return this._BankName; } - public string BankCode - { - get { return this._BankCode; } + set + { + if (this.AreDifferent(this._BankName, value)) + { + this._BankName = value; - set - { - if (this.AreDifferent(this._BankCode, value)) - { - this._BankCode = value; + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.BankName, value), PropertyName_BankName); - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.BankCode, value), PropertyName_BankCode); + this.FirePropertyChanged(PropertyName_BankName); + } + } + } - this.FirePropertyChanged(PropertyName_BankCode); - } - } - } + public string Bic + { + get { return this._Bic; } - public string BankName - { - get { return this._BankName; } + set + { + if (this.AreDifferent(this._Bic, value)) + { + this._Bic = value; + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Bic, value), PropertyName_Bic); + this.FirePropertyChanged(PropertyName_Bic); + } + } + } - set - { - if (this.AreDifferent(this._BankName, value)) - { - this._BankName = value; + public string ContactPerson + { + get { return this._ContactPerson; } - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.BankName, value), PropertyName_BankName); + set + { + if (this.AreDifferent(this._ContactPerson, value)) + { + this._ContactPerson = value; - this.FirePropertyChanged(PropertyName_BankName); - } - } - } + this.StoreDirtyInformation( + this.DataContract.ContactInformations.Where(con => con.ContactType == ContactType.ContactPerson && con.ContactValue == value).SingleOrDefault() == null, + PropertyName_ContactPerson); - public string Bic - { - get { return this._Bic; } + this.FirePropertyChanged(PropertyName_ContactPerson); + } + } + } - set - { - if (this.AreDifferent(this._Bic, value)) - { - this._Bic = value; - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Bic, value), PropertyName_Bic); - this.FirePropertyChanged(PropertyName_Bic); - } - } - } + public CostRatePeriodListVM CostRatePeriods + { + get { return this._CostRatePeriods; } - public string ContactPerson - { - get { return this._ContactPerson; } + set + { + if (this.AreDifferent(this._CostRatePeriods, value)) + { + this._CostRatePeriods = value; + this.FirePropertyChanged(PropertyName_CostRatePeriods); + } + } + } - set - { - if (this.AreDifferent(this._ContactPerson, value)) - { - this._ContactPerson = value; + public string EMail + { + get { return this._EMail; } - this.StoreDirtyInformation( - this.DataContract.ContactInformations.Where(con => con.ContactType == ContactType.ContactPerson && con.ContactValue == value).SingleOrDefault() == null, - PropertyName_ContactPerson); + set + { + if (this.AreDifferent(this._EMail, value)) + { + this._EMail = value; - this.FirePropertyChanged(PropertyName_ContactPerson); - } - } - } + this.StoreDirtyInformation( + this.DataContract.ContactInformations.Where(con => con.ContactType == ContactType.business_Mail && con.ContactValue == value).SingleOrDefault() == null, PropertyName_EMail); - public CostRatePeriodListVM CostRatePeriods - { - get { return this._CostRatePeriods; } + this.FirePropertyChanged(PropertyName_EMail); + } + } + } - set - { - if (this.AreDifferent(this._CostRatePeriods, value)) - { - this._CostRatePeriods = value; - this.FirePropertyChanged(PropertyName_CostRatePeriods); - } - } - } + public string Fax + { + get { return this._Fax; } - public string EMail - { - get { return this._EMail; } + set + { + if (this.AreDifferent(this._Fax, value)) + { + this._Fax = value; - set - { - if (this.AreDifferent(this._EMail, value)) - { - this._EMail = value; + this.StoreDirtyInformation( + this.DataContract.ContactInformations.Where(con => con.ContactType == ContactType.business_Fax && con.ContactValue == value).SingleOrDefault() == null, PropertyName_Fax); - this.StoreDirtyInformation( - this.DataContract.ContactInformations.Where(con => con.ContactType == ContactType.business_Mail && con.ContactValue == value).SingleOrDefault() == null, PropertyName_EMail); + this.FirePropertyChanged(PropertyName_Fax); + } + } + } - this.FirePropertyChanged(PropertyName_EMail); - } - } - } + public string IBAN + { + get { return this._IBAN; } - public string Fax - { - get { return this._Fax; } + set + { + if (this.AreDifferent(this._IBAN, value)) + { + this._IBAN = value; - set - { - if (this.AreDifferent(this._Fax, value)) - { - this._Fax = value; + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IBAN, value), PropertyName_IBAN); - this.StoreDirtyInformation( - this.DataContract.ContactInformations.Where(con => con.ContactType == ContactType.business_Fax && con.ContactValue == value).SingleOrDefault() == null, PropertyName_Fax); + this.FirePropertyChanged(PropertyName_IBAN); + } + } + } - this.FirePropertyChanged(PropertyName_Fax); - } - } - } + public string InvoiceAddressPOBox + { + get { return this._InvoiceAddressPOBox; } - public string IBAN - { - get { return this._IBAN; } + set + { + if (this.AreDifferent(this._InvoiceAddressPOBox, value)) + { + this._InvoiceAddressPOBox = value; + this.StoreDirtyInformation( + this.DataContract.ContactInformations.Where(con => con.ContactType == ContactType.private_POBox && con.ContactValue == value).SingleOrDefault() == null, + PropertyName_InvoiceAddressPOBox); + this.FirePropertyChanged(PropertyName_InvoiceAddressPOBox); + } + } + } - set - { - if (this.AreDifferent(this._IBAN, value)) - { - this._IBAN = value; + public string InvoiceAddressPostalCode + { + get { return this._InvoiceAddressPostalCode; } - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IBAN, value), PropertyName_IBAN); + set + { + if (this.AreDifferent(this._InvoiceAddressPostalCode, value)) + { + this._InvoiceAddressPostalCode = value; + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.InvoiceAddressPostalCode, value), PropertyName_InvoiceAddressPostalCode); + this.FirePropertyChanged(PropertyName_InvoiceAddressPostalCode); + } + } + } - this.FirePropertyChanged(PropertyName_IBAN); - } - } - } + public string InvoiceAddressStreet + { + get { return this._InvoiceAddressStreet; } - public string InvoiceAddressPOBox - { - get { return this._InvoiceAddressPOBox; } + set + { + if (this.AreDifferent(this._InvoiceAddressStreet, value)) + { + this._InvoiceAddressStreet = value; + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.InvoiceAddressStreet, value), PropertyName_InvoiceAddressStreet); + this.FirePropertyChanged(PropertyName_InvoiceAddressStreet); + } + } + } - set - { - if (this.AreDifferent(this._InvoiceAddressPOBox, value)) - { - this._InvoiceAddressPOBox = value; - this.StoreDirtyInformation( - this.DataContract.ContactInformations.Where(con => con.ContactType == ContactType.private_POBox && con.ContactValue == value).SingleOrDefault() == null, - PropertyName_InvoiceAddressPOBox); - this.FirePropertyChanged(PropertyName_InvoiceAddressPOBox); - } - } - } + public string InvoiceAddressTown + { + get { return this._InvoiceAddressTown; } - public string InvoiceAddressPostalCode - { - get { return this._InvoiceAddressPostalCode; } + set + { + if (this.AreDifferent(this._InvoiceAddressTown, value)) + { + this._InvoiceAddressTown = value; + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.InvoiceAddressTown, value), PropertyName_InvoiceAddressTown); + this.FirePropertyChanged(PropertyName_InvoiceAddressTown); + } + } + } - set - { - if (this.AreDifferent(this._InvoiceAddressPostalCode, value)) - { - this._InvoiceAddressPostalCode = value; - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.InvoiceAddressPostalCode, value), PropertyName_InvoiceAddressPostalCode); - this.FirePropertyChanged(PropertyName_InvoiceAddressPostalCode); - } - } - } + public string InvoiceAddressLine1 + { + get { return this._InvoiceAddressLine1; } - public string InvoiceAddressStreet - { - get { return this._InvoiceAddressStreet; } + set + { + if (this.AreDifferent(this._InvoiceAddressLine1, value)) + { + this._InvoiceAddressLine1 = value; + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.InvoiceAddressLine1, value), PropertyName_InvoiceAddressLine1); + this.FirePropertyChanged(PropertyName_InvoiceAddressLine1); + } + } + } - set - { - if (this.AreDifferent(this._InvoiceAddressStreet, value)) - { - this._InvoiceAddressStreet = value; - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.InvoiceAddressStreet, value), PropertyName_InvoiceAddressStreet); - this.FirePropertyChanged(PropertyName_InvoiceAddressStreet); - } - } - } + public bool IsCalculatingWithFactor + { + get { return this._IsCalculatingWithFactor; } - public string InvoiceAddressTown - { - get { return this._InvoiceAddressTown; } + set + { + if (this.AreDifferent(this._IsCalculatingWithFactor, value)) + { + this._IsCalculatingWithFactor = value; - set - { - if (this.AreDifferent(this._InvoiceAddressTown, value)) - { - this._InvoiceAddressTown = value; - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.InvoiceAddressTown, value), PropertyName_InvoiceAddressTown); - this.FirePropertyChanged(PropertyName_InvoiceAddressTown); - } - } - } + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IsCalculatingWithFactor, value), PropertyName_IsCalculatingWithFactor); - public string InvoiceAddressLine1 - { - get { return this._InvoiceAddressLine1; } - - set - { - if (this.AreDifferent(this._InvoiceAddressLine1, value)) - { - this._InvoiceAddressLine1 = value; - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.InvoiceAddressLine1, value), PropertyName_InvoiceAddressLine1); - this.FirePropertyChanged(PropertyName_InvoiceAddressLine1); - } - } - } - - public bool IsCalculatingWithFactor - { - get { return this._IsCalculatingWithFactor; } - - set - { - if (this.AreDifferent(this._IsCalculatingWithFactor, value)) - { - this._IsCalculatingWithFactor = value; - - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IsCalculatingWithFactor, value), PropertyName_IsCalculatingWithFactor); - - this.FirePropertyChanged(PropertyName_IsCalculatingWithFactor); - } - } - } + this.FirePropertyChanged(PropertyName_IsCalculatingWithFactor); + } + } + } public bool IsArchived { @@ -467,248 +394,248 @@ namespace BeWo.ViewModel } } - public override bool IsDirty - { - get - { + public override bool IsDirty + { + get + { if (Utils.IsAnyNull(this._CostRatePeriods, _VarFields)) { return false; } return base.IsDirty || this._CostRatePeriods.IsDirty || this._VarFields.IsDirty || (_ArbeitszeitListe != null && _ArbeitszeitListe.IsDirty) || (_Feiertage != null && _Feiertage.IsDirty); - } + } - - } - public bool IsSingleInvoicePerCustomer - { - get { return this._IsSingleInvoicePerCustomer; } + } - set - { - if (this.AreDifferent(this._IsSingleInvoicePerCustomer, value)) - { - this._IsSingleInvoicePerCustomer = value; - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IsSingleInvoicePerCustomer, value), PropertyName_IsSingleInvoicePerCustomer); - this.FirePropertyChanged(PropertyName_IsSingleInvoicePerCustomer); - } - } - } + public bool IsSingleInvoicePerCustomer + { + get { return this._IsSingleInvoicePerCustomer; } - [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)] - public string Name - { - get { return this._Name; } + set + { + if (this.AreDifferent(this._IsSingleInvoicePerCustomer, value)) + { + this._IsSingleInvoicePerCustomer = value; + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IsSingleInvoicePerCustomer, value), PropertyName_IsSingleInvoicePerCustomer); + this.FirePropertyChanged(PropertyName_IsSingleInvoicePerCustomer); + } + } + } - set - { - if (this.AreDifferent(this._Name, value)) - { - this._Name = value; + [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)] + public string Name + { + get { return this._Name; } - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Name, value), PropertyName_Name); + set + { + if (this.AreDifferent(this._Name, value)) + { + this._Name = value; - this.FirePropertyChanged(PropertyName_Name); - } - } - } + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Name, value), PropertyName_Name); - public string Name2 - { - get { return this._Name2; } + this.FirePropertyChanged(PropertyName_Name); + } + } + } - set - { - if (this.AreDifferent(this._Name2, value)) - { - this._Name2 = value; + public string Name2 + { + get { return this._Name2; } - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Name2, value), PropertyName_Name2); + set + { + if (this.AreDifferent(this._Name2, value)) + { + this._Name2 = value; - this.FirePropertyChanged(PropertyName_Name2); - } - } - } + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Name2, value), PropertyName_Name2); - public string Notice - { - get { return this._Notice; } + this.FirePropertyChanged(PropertyName_Name2); + } + } + } - set - { - if (this.AreDifferent(this._Notice, value)) - { - this._Notice = value; + public string Notice + { + get { return this._Notice; } - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.OrganisationNotice, value), PropertyName_Notice); + set + { + if (this.AreDifferent(this._Notice, value)) + { + this._Notice = value; - this.FirePropertyChanged(PropertyName_Notice); - } - } - } + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.OrganisationNotice, value), PropertyName_Notice); - public string POBox - { - get { return this._POBox; } + this.FirePropertyChanged(PropertyName_Notice); + } + } + } - set - { - if (this.AreDifferent(this._POBox, value)) - { - this._POBox = value; + public string POBox + { + get { return this._POBox; } - this.StoreDirtyInformation( - this.DataContract.ContactInformations.Where(con => con.ContactType == ContactType.business_POBox && con.ContactValue == value).SingleOrDefault() == null, PropertyName_POBox); + set + { + if (this.AreDifferent(this._POBox, value)) + { + this._POBox = value; - this.FirePropertyChanged(PropertyName_POBox); - } - } - } + this.StoreDirtyInformation( + this.DataContract.ContactInformations.Where(con => con.ContactType == ContactType.business_POBox && con.ContactValue == value).SingleOrDefault() == null, PropertyName_POBox); - public string Phone - { - get { return this._Phone; } + this.FirePropertyChanged(PropertyName_POBox); + } + } + } - set - { - if (this.AreDifferent(this._Phone, value)) - { - this._Phone = value; + public string Phone + { + get { return this._Phone; } - this.StoreDirtyInformation( - this.DataContract.ContactInformations.Where(con => con.ContactType == ContactType.business_Phone && con.ContactValue == value).SingleOrDefault() == null, PropertyName_Phone); + set + { + if (this.AreDifferent(this._Phone, value)) + { + this._Phone = value; - this.FirePropertyChanged(PropertyName_Phone); - } - } - } + this.StoreDirtyInformation( + this.DataContract.ContactInformations.Where(con => con.ContactType == ContactType.business_Phone && con.ContactValue == value).SingleOrDefault() == null, PropertyName_Phone); - public List PossibleQualifications - { - get - { - var existing = this._CostRatePeriods.VMList.Where(i => i.ValueListEntry != null).Select(i => i.ValueListEntry.ValueListEntryOid).Distinct().ToList(); + this.FirePropertyChanged(PropertyName_Phone); + } + } + } - return this._AllQualifications.Where(i => !existing.Contains(i.ValueListEntryOid)).ToList(); - } - } + public List PossibleQualifications + { + get + { + var existing = this._CostRatePeriods.VMList.Where(i => i.ValueListEntry != null).Select(i => i.ValueListEntry.ValueListEntryOid).Distinct().ToList(); - public OrganisationPersonRelationListVM PersonRelations - { - get { return _PersonRelations; } + return this._AllQualifications.Where(i => !existing.Contains(i.ValueListEntryOid)).ToList(); + } + } - set - { - _PersonRelations = value; - FirePropertyChanged(PropertyName_PersonRelations); - } - } + public OrganisationPersonRelationListVM PersonRelations + { + get { return _PersonRelations; } - public string PostalCode - { - get { return this._PostalCode; } + set + { + _PersonRelations = value; + FirePropertyChanged(PropertyName_PersonRelations); + } + } - set - { - if (this.AreDifferent(this._PostalCode, value)) - { - this._PostalCode = value; + public string PostalCode + { + get { return this._PostalCode; } - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.PostalCode, value), PropertyName_PostalCode); + set + { + if (this.AreDifferent(this._PostalCode, value)) + { + this._PostalCode = value; - this.FirePropertyChanged(PropertyName_PostalCode); - } - } - } + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.PostalCode, value), PropertyName_PostalCode); - public string Street - { - get { return this._Street; } + this.FirePropertyChanged(PropertyName_PostalCode); + } + } + } - set - { - if (this.AreDifferent(this._Street, value)) - { - this._Street = value; + public string Street + { + get { return this._Street; } - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Street, value), PropertyName_Street); + set + { + if (this.AreDifferent(this._Street, value)) + { + this._Street = value; - this.FirePropertyChanged(PropertyName_Street); - } - } - } + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Street, value), PropertyName_Street); - public string Town - { - get { return this._Town; } + this.FirePropertyChanged(PropertyName_Street); + } + } + } - set - { - if (this.AreDifferent(this._Town, value)) - { - this._Town = value; + public string Town + { + get { return this._Town; } - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Town, value), PropertyName_Town); + set + { + if (this.AreDifferent(this._Town, value)) + { + this._Town = value; - this.FirePropertyChanged(PropertyName_Town); - } - } - } + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Town, value), PropertyName_Town); - public string AddressLine1 - { - get { return this._AddressLine1; } + this.FirePropertyChanged(PropertyName_Town); + } + } + } - set - { - if (this.AreDifferent(this._AddressLine1, value)) - { - this._AddressLine1 = value; + public string AddressLine1 + { + get { return this._AddressLine1; } - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.AddressLine1, value), PropertyName_AddressLine1); + set + { + if (this.AreDifferent(this._AddressLine1, value)) + { + this._AddressLine1 = value; - this.FirePropertyChanged(PropertyName_AddressLine1); - } - } - } + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.AddressLine1, value), PropertyName_AddressLine1); - public string Website - { - get { return this._Website; } + this.FirePropertyChanged(PropertyName_AddressLine1); + } + } + } - set - { - if (this.AreDifferent(this._Website, value)) - { - this._Website = value; + public string Website + { + get { return this._Website; } - this.StoreDirtyInformation( - this.DataContract.ContactInformations.Where(con => con.ContactType == ContactType.business_Homepage && con.ContactValue == value).SingleOrDefault() == null, - PropertyName_Website); + set + { + if (this.AreDifferent(this._Website, value)) + { + this._Website = value; - this.FirePropertyChanged(PropertyName_Website); - } - } - } + this.StoreDirtyInformation( + this.DataContract.ContactInformations.Where(con => con.ContactType == ContactType.business_Homepage && con.ContactValue == value).SingleOrDefault() == null, + PropertyName_Website); - public string DebitorNumber - { - get { return this._DebitorNumber; } + this.FirePropertyChanged(PropertyName_Website); + } + } + } - set - { - if (this.AreDifferent(this._DebitorNumber, value)) - { - this._DebitorNumber = value; + public string DebitorNumber + { + get { return this._DebitorNumber; } - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.DebitorNumber, value), PropertyName_DebitorNumber); + set + { + if (this.AreDifferent(this._DebitorNumber, value)) + { + this._DebitorNumber = value; - this.FirePropertyChanged(PropertyName_DebitorNumber); - } - } - } + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.DebitorNumber, value), PropertyName_DebitorNumber); + + this.FirePropertyChanged(PropertyName_DebitorNumber); + } + } + } public VarFieldListVM VarFields { @@ -724,62 +651,62 @@ namespace BeWo.ViewModel } } - public ObservableSortCollection Functions - { - get - { - if (this._Functions == null) - { - this._Functions = new ObservableSortCollection(); - } - - return this._Functions; - } - } - - public ObservableSortCollection RoleInOrganisations - { - get - { - if (this._RoleInOrganisations == null) - { - this._RoleInOrganisations = new ObservableSortCollection(); - } - - return this._RoleInOrganisations; - } - } - - - - public ValueListEntryDC Function - { - get { return this._Function; } - - set - { - if (this.AreDifferent(this._Function, value)) - { - this._Function = value; - - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Function, value), PropertyName_Function); - - this.FirePropertyChanged(PropertyName_Function); - } - } - } - - public bool IsIKNumberValid - => Validator.IsIKNumberValid(IKKrankenkasse) - && Validator.IsLeistungserbringergruppeValid(Leistungserbringergruppe); - - public string IKKrankenkasse - { - get { return this._IKKrankenkasse; } - - set + public ObservableSortCollection Functions + { + get { - if (!AreDifferent(_IKKrankenkasse, value)) + if (this._Functions == null) + { + this._Functions = new ObservableSortCollection(); + } + + return this._Functions; + } + } + + public ObservableSortCollection RoleInOrganisations + { + get + { + if (this._RoleInOrganisations == null) + { + this._RoleInOrganisations = new ObservableSortCollection(); + } + + return this._RoleInOrganisations; + } + } + + + + public ValueListEntryDC Function + { + get { return this._Function; } + + set + { + if (this.AreDifferent(this._Function, value)) + { + this._Function = value; + + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Function, value), PropertyName_Function); + + this.FirePropertyChanged(PropertyName_Function); + } + } + } + + public bool IsIKNumberValid + => Validator.IsIKNumberValid(IKKrankenkasse) + && Validator.IsLeistungserbringergruppeValid(Leistungserbringergruppe); + + public string IKKrankenkasse + { + get { return this._IKKrankenkasse; } + + set + { + if (!AreDifferent(_IKKrankenkasse, value)) return; _IKKrankenkasse = value; @@ -789,13 +716,13 @@ namespace BeWo.ViewModel } } - public string IKKostentrager - { - get { return this._IKKostentrager; } + public string IKKostentrager + { + get { return this._IKKostentrager; } - set + set { - if (!AreDifferent(_IKKostentrager, value)) + if (!AreDifferent(_IKKostentrager, value)) return; _IKKostentrager = value; @@ -804,11 +731,11 @@ namespace BeWo.ViewModel } } - public string IKDatenannahmestelle - { - get { return this._IKDatenannahmestelle; } + public string IKDatenannahmestelle + { + get { return this._IKDatenannahmestelle; } - set + set { if (!AreDifferent(_IKDatenannahmestelle, value)) return; @@ -819,13 +746,13 @@ namespace BeWo.ViewModel } } - public string BezDatenannahmestelle - { - get { return this._BezDatenannahmestelle; } + public string BezDatenannahmestelle + { + get { return this._BezDatenannahmestelle; } - set + set { - if (!AreDifferent(_BezDatenannahmestelle, value)) + if (!AreDifferent(_BezDatenannahmestelle, value)) return; _BezDatenannahmestelle = value; @@ -834,13 +761,13 @@ namespace BeWo.ViewModel } } - public string Leistungserbringergruppe - { - get { return _Leistungserbringergruppe; } + public string Leistungserbringergruppe + { + get { return _Leistungserbringergruppe; } - set + set { - if (!AreDifferent(_Leistungserbringergruppe, value)) + if (!AreDifferent(_Leistungserbringergruppe, value)) return; _Leistungserbringergruppe = value; @@ -850,273 +777,273 @@ namespace BeWo.ViewModel } } - public string BusinessPartnerId - { - get { return this._BusinessPartnerId; } + 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)); - } - } - } + set + { + if (this.AreDifferent(this._BusinessPartnerId, value)) + { + this._BusinessPartnerId = value; + this.StoreDirtyInformation(this.AreDifferent(this.DataContract.BusinessPartnerId, value), nameof(BusinessPartnerId)); + this.FirePropertyChanged(nameof(BusinessPartnerId)); + } + } + } - public GkvVerfahrensstufe Verfahrensstufe - { - get { return _Verfahrensstufe ?? GkvVerfahrensstufe.Erprobung; } + public GkvVerfahrensstufe Verfahrensstufe + { + get { return _Verfahrensstufe ?? GkvVerfahrensstufe.Erprobung; } - set - { - if (this.AreDifferent(this._Verfahrensstufe, value)) - { - this._Verfahrensstufe = value; - this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Verfahrensstufe, value), nameof(Verfahrensstufe)); - this.FirePropertyChanged(nameof(Verfahrensstufe)); - this.FirePropertyChanged(nameof(VerfahrensstufeInt)); - this.FirePropertyChanged(nameof(Echtverfahren)); - } - } - } + set + { + if (!AreDifferent(_Verfahrensstufe, value)) + return; - public int VerfahrensstufeInt - { - get { return (int)Verfahrensstufe; } + _Verfahrensstufe = value; + StoreDirtyInformation(AreDifferent(DataContract.Verfahrensstufe, value), nameof(Verfahrensstufe)); + FirePropertyChanged(nameof(Verfahrensstufe)); + FirePropertyChanged(nameof(VerfahrensstufeInt)); + } + } - set - { - if (!AreDifferent(this.VerfahrensstufeInt, value)) - return; + public int VerfahrensstufeInt + { + get { return (int)Verfahrensstufe; } - Verfahrensstufe = (GkvVerfahrensstufe)value; - } - } + set + { + if (!AreDifferent(VerfahrensstufeInt, value)) + return; - public bool Echtverfahren - { - get { return Verfahrensstufe == GkvVerfahrensstufe.Echt; } + Verfahrensstufe = (GkvVerfahrensstufe)value; + } + } - set - { - if (!AreDifferent(Echtverfahren, value)) - return; + public bool GkvAusblenden + { + get { return _GkvAusblenden; } - if (value) - Verfahrensstufe = GkvVerfahrensstufe.Echt; - else - Verfahrensstufe = GkvVerfahrensstufe.Erprobung; - } - } + set + { + if (!AreDifferent(GkvAusblenden, value)) + return; - protected void CommitContact(string pValue, ContactType pContactType) - { - List lOldContactDCs; - if (this.DataContract.ContactInformations != null) - { - lOldContactDCs = this.DataContract.ContactInformations.ToList(); - } - else - { - lOldContactDCs = new List(); - } + _GkvAusblenden = value; + StoreDirtyInformation(AreDifferent(DataContract.GkvAusblenden, value), nameof(GkvAusblenden)); + FirePropertyChanged(nameof(GkvAusblenden)); + } + } - ContactDC lContactDC = lOldContactDCs.SingleOrDefault(con => con.ContactType == pContactType); + protected void CommitContact(string pValue, ContactType pContactType) + { + List lOldContactDCs; + if (this.DataContract.ContactInformations != null) + { + lOldContactDCs = this.DataContract.ContactInformations.ToList(); + } + else + { + lOldContactDCs = new List(); + } - if (string.IsNullOrEmpty(pValue) && lContactDC != null) - { - lOldContactDCs.Remove(lContactDC); - } - else if (!string.IsNullOrEmpty(pValue)) - { - if (lContactDC == null) - { - lContactDC = new ContactDC - { - ContactType = pContactType - }; - lOldContactDCs.Add(lContactDC); - } + ContactDC lContactDC = lOldContactDCs.SingleOrDefault(con => con.ContactType == pContactType); - lContactDC.ContactValue = pValue; - } + if (string.IsNullOrEmpty(pValue) && lContactDC != null) + { + lOldContactDCs.Remove(lContactDC); + } + else if (!string.IsNullOrEmpty(pValue)) + { + if (lContactDC == null) + { + lContactDC = new ContactDC + { + ContactType = pContactType + }; + lOldContactDCs.Add(lContactDC); + } - this.DataContract.ContactInformations = lOldContactDCs; - } + lContactDC.ContactValue = pValue; + } - protected override void InitByDataContract(OrganisationDC pDataContract) - { + this.DataContract.ContactInformations = lOldContactDCs; + } + + protected override void InitByDataContract(OrganisationDC pDataContract) + { this._VarFields = new VarFieldListVM(pDataContract.VarFields); - if (!this.IsNew) - { - this._AccountNumber = pDataContract.AccountNumber; - this._BankCode = pDataContract.BankCode; - this._BankName = pDataContract.BankName; - this._Bic = pDataContract.Bic; - this._IBAN = pDataContract.IBAN; - this._Name = pDataContract.Name; - this._Name2 = pDataContract.Name2; - this._Notice = pDataContract.OrganisationNotice; - this._PostalCode = pDataContract.PostalCode; - this._Street = pDataContract.Street; - this._Town = pDataContract.Town; - this._AddressLine1 = pDataContract.AddressLine1; - this._InvoiceAddressPostalCode = pDataContract.InvoiceAddressPostalCode; - this._InvoiceAddressStreet = pDataContract.InvoiceAddressStreet; - this._InvoiceAddressTown = pDataContract.InvoiceAddressTown; - this._InvoiceAddressLine1 = pDataContract.InvoiceAddressLine1; - this._IsCalculatingWithFactor = pDataContract.IsCalculatingWithFactor; - this._IsSingleInvoicePerCustomer = pDataContract.IsSingleInvoicePerCustomer; - this._DebitorNumber = pDataContract.DebitorNumber; - this._IsArchived = pDataContract.ActivationType == ActivationTypeId.Archived; - this._IKKrankenkasse = pDataContract.IKKrankenkasse; - this._IKKostentrager = pDataContract.IKKostentrager; - this._IKDatenannahmestelle = pDataContract.IKDatenannahmestelle; - this._BezDatenannahmestelle = pDataContract.BezDatenannahmestelle; - _Leistungserbringergruppe = pDataContract.Leistungserbringergruppe; - _BusinessPartnerId = pDataContract.BusinessPartnerId; - _Verfahrensstufe = pDataContract.Verfahrensstufe; + if (!this.IsNew) + { + _AccountNumber = pDataContract.AccountNumber; + _BankCode = pDataContract.BankCode; + _BankName = pDataContract.BankName; + _Bic = pDataContract.Bic; + _IBAN = pDataContract.IBAN; + _Name = pDataContract.Name; + _Name2 = pDataContract.Name2; + _Notice = pDataContract.OrganisationNotice; + _PostalCode = pDataContract.PostalCode; + _Street = pDataContract.Street; + _Town = pDataContract.Town; + _AddressLine1 = pDataContract.AddressLine1; + _InvoiceAddressPostalCode = pDataContract.InvoiceAddressPostalCode; + _InvoiceAddressStreet = pDataContract.InvoiceAddressStreet; + _InvoiceAddressTown = pDataContract.InvoiceAddressTown; + _InvoiceAddressLine1 = pDataContract.InvoiceAddressLine1; + _IsCalculatingWithFactor = pDataContract.IsCalculatingWithFactor; + _IsSingleInvoicePerCustomer = pDataContract.IsSingleInvoicePerCustomer; + _DebitorNumber = pDataContract.DebitorNumber; + _IsArchived = pDataContract.ActivationType == ActivationTypeId.Archived; + _IKKrankenkasse = pDataContract.IKKrankenkasse; + _IKKostentrager = pDataContract.IKKostentrager; + _IKDatenannahmestelle = pDataContract.IKDatenannahmestelle; + _BezDatenannahmestelle = pDataContract.BezDatenannahmestelle; + _Leistungserbringergruppe = pDataContract.Leistungserbringergruppe; + _BusinessPartnerId = pDataContract.BusinessPartnerId; + _Verfahrensstufe = pDataContract.Verfahrensstufe; + _GkvAusblenden = pDataContract.GkvAusblenden; - _Function = pDataContract.Function; + _Function = pDataContract.Function; - foreach (ContactDC iContactDC in pDataContract.ContactInformations) - { - if (iContactDC.ContactType == ContactType.business_Mail) - { - this._EMail = iContactDC.ContactValue; - } + foreach (ContactDC iContactDC in pDataContract.ContactInformations) + { + if (iContactDC.ContactType == ContactType.business_Mail) + { + this._EMail = iContactDC.ContactValue; + } - if (iContactDC.ContactType == ContactType.business_Homepage) - { - this._Website = iContactDC.ContactValue; - } + if (iContactDC.ContactType == ContactType.business_Homepage) + { + this._Website = iContactDC.ContactValue; + } - if (iContactDC.ContactType == ContactType.business_Fax) - { - this._Fax = iContactDC.ContactValue; - } + if (iContactDC.ContactType == ContactType.business_Fax) + { + this._Fax = iContactDC.ContactValue; + } - if (iContactDC.ContactType == ContactType.business_Phone) - { - this._Phone = iContactDC.ContactValue; - } + if (iContactDC.ContactType == ContactType.business_Phone) + { + this._Phone = iContactDC.ContactValue; + } - if (iContactDC.ContactType == ContactType.ContactPerson) - { - this._ContactPerson = iContactDC.ContactValue; - } + if (iContactDC.ContactType == ContactType.ContactPerson) + { + this._ContactPerson = iContactDC.ContactValue; + } - if (iContactDC.ContactType == ContactType.ContactPerson) - { - this._ContactPerson = iContactDC.ContactValue; - } + if (iContactDC.ContactType == ContactType.ContactPerson) + { + this._ContactPerson = iContactDC.ContactValue; + } - if (iContactDC.ContactType == ContactType.business_POBox) - { - this._POBox = iContactDC.ContactValue; - } + if (iContactDC.ContactType == ContactType.business_POBox) + { + this._POBox = iContactDC.ContactValue; + } - if (iContactDC.ContactType == ContactType.private_POBox) - { - this._InvoiceAddressPOBox = iContactDC.ContactValue; - } - } - } + if (iContactDC.ContactType == ContactType.private_POBox) + { + this._InvoiceAddressPOBox = iContactDC.ContactValue; + } + } + } - VMFactory.CreateOrganisationPersonRelationListVMAsync( - pDataContract.RelatedPersons ?? (pDataContract.RelatedPersons = new List()), cb => PersonRelations = cb); + VMFactory.CreateOrganisationPersonRelationListVMAsync( + pDataContract.RelatedPersons ?? (pDataContract.RelatedPersons = new List()), cb => PersonRelations = cb); - if (pDataContract.CostRatePeriods == null) - { - pDataContract.CostRatePeriods = new List(); - } + if (pDataContract.CostRatePeriods == null) + { + pDataContract.CostRatePeriods = new List(); + } - Utils.GetAllEnumValues().ToList().ForEach( - t => - { - if (t != CostRatePeriodType.Unknown && !pDataContract.CostRatePeriods.Exists(i => i.CostRateType == t)) - { - pDataContract.CostRatePeriods.Add( - new CostRatePeriodDC - { - CostRateType = t - }); - } - }); + Utils.GetAllEnumValues().ToList().ForEach( + t => + { + if (t != CostRatePeriodType.Unknown && !pDataContract.CostRatePeriods.Exists(i => i.CostRateType == t)) + { + pDataContract.CostRatePeriods.Add( + new CostRatePeriodDC + { + CostRateType = t + }); + } + }); - this._CostRatePeriods = new CostRatePeriodListVM(pDataContract.CostRatePeriods); + this._CostRatePeriods = new CostRatePeriodListVM(pDataContract.CostRatePeriods); - this._CostRatePeriods.VMList.ListChanged += (s, e) => - { - if (e.ListChangedType != ListChangedType.ItemChanged) - { - this.FirePropertyChanged(PropertyName_PossibleQualifications); - } - }; - } + this._CostRatePeriods.VMList.ListChanged += (s, e) => + { + if (e.ListChangedType != ListChangedType.ItemChanged) + { + this.FirePropertyChanged(PropertyName_PossibleQualifications); + } + }; + } - protected override OrganisationDC MapToDataContract(OrganisationDC pDataContract, bool doCommit) - { - pDataContract.AccountNumber = _AccountNumber; - pDataContract.BankCode = _BankCode; - pDataContract.BankName = _BankName; - pDataContract.Bic = _Bic; - pDataContract.IBAN = _IBAN; - pDataContract.Name = _Name; - pDataContract.Name2 = _Name2; - pDataContract.OrganisationNotice = _Notice; - pDataContract.PostalCode = _PostalCode; - pDataContract.RelatedPersons = _PersonRelations.CopyToDCList(doCommit); - pDataContract.Street = _Street; - pDataContract.Town = _Town; - pDataContract.AddressLine1 = _AddressLine1; - pDataContract.InvoiceAddressStreet = _InvoiceAddressStreet; - pDataContract.InvoiceAddressTown = _InvoiceAddressTown; - pDataContract.InvoiceAddressPostalCode = _InvoiceAddressPostalCode; - pDataContract.InvoiceAddressLine1 = _InvoiceAddressLine1; - pDataContract.IsCalculatingWithFactor = _IsCalculatingWithFactor; - pDataContract.IsSingleInvoicePerCustomer = _IsSingleInvoicePerCustomer; - pDataContract.DebitorNumber = _DebitorNumber; + protected override OrganisationDC MapToDataContract(OrganisationDC pDataContract, bool doCommit) + { + pDataContract.AccountNumber = _AccountNumber; + pDataContract.BankCode = _BankCode; + pDataContract.BankName = _BankName; + pDataContract.Bic = _Bic; + pDataContract.IBAN = _IBAN; + pDataContract.Name = _Name; + pDataContract.Name2 = _Name2; + pDataContract.OrganisationNotice = _Notice; + pDataContract.PostalCode = _PostalCode; + pDataContract.RelatedPersons = _PersonRelations.CopyToDCList(doCommit); + pDataContract.Street = _Street; + pDataContract.Town = _Town; + pDataContract.AddressLine1 = _AddressLine1; + pDataContract.InvoiceAddressStreet = _InvoiceAddressStreet; + pDataContract.InvoiceAddressTown = _InvoiceAddressTown; + pDataContract.InvoiceAddressPostalCode = _InvoiceAddressPostalCode; + pDataContract.InvoiceAddressLine1 = _InvoiceAddressLine1; + pDataContract.IsCalculatingWithFactor = _IsCalculatingWithFactor; + pDataContract.IsSingleInvoicePerCustomer = _IsSingleInvoicePerCustomer; + pDataContract.DebitorNumber = _DebitorNumber; pDataContract.ActivationType = _IsArchived ? ActivationTypeId.Archived : ActivationTypeId.Active; - pDataContract.Function = _Function; - pDataContract.IKDatenannahmestelle = _IKDatenannahmestelle?.Trim(); - pDataContract.BezDatenannahmestelle = _BezDatenannahmestelle?.Trim(); - pDataContract.IKKostentrager = _IKKostentrager?.Trim(); - pDataContract.IKKrankenkasse = _IKKrankenkasse?.Trim(); - pDataContract.Leistungserbringergruppe = _Leistungserbringergruppe?.Trim(); - pDataContract.BusinessPartnerId = _BusinessPartnerId; - pDataContract.Verfahrensstufe = Verfahrensstufe; + pDataContract.Function = _Function; + pDataContract.IKDatenannahmestelle = _IKDatenannahmestelle?.Trim(); + pDataContract.BezDatenannahmestelle = _BezDatenannahmestelle?.Trim(); + pDataContract.IKKostentrager = _IKKostentrager?.Trim(); + pDataContract.IKKrankenkasse = _IKKrankenkasse?.Trim(); + pDataContract.Leistungserbringergruppe = _Leistungserbringergruppe?.Trim(); + pDataContract.BusinessPartnerId = _BusinessPartnerId; + pDataContract.Verfahrensstufe = Verfahrensstufe; + pDataContract.GkvAusblenden = GkvAusblenden; - this.CommitContact(this._Phone, ContactType.business_Phone); - this.CommitContact(this._Website, ContactType.business_Homepage); - this.CommitContact(this._Fax, ContactType.business_Fax); - this.CommitContact(this._EMail, ContactType.business_Mail); - this.CommitContact(this._ContactPerson, ContactType.ContactPerson); - this.CommitContact(this._POBox, ContactType.business_POBox); - this.CommitContact(this._InvoiceAddressPOBox, ContactType.private_POBox); - + CommitContact(_Phone, ContactType.business_Phone); + CommitContact(_Website, ContactType.business_Homepage); + CommitContact(_Fax, ContactType.business_Fax); + CommitContact(_EMail, ContactType.business_Mail); + CommitContact(_ContactPerson, ContactType.ContactPerson); + CommitContact(_POBox, ContactType.business_POBox); + CommitContact(_InvoiceAddressPOBox, ContactType.private_POBox); - pDataContract.CostRatePeriods = this._CostRatePeriods.CopyToDCList(doCommit); + + pDataContract.CostRatePeriods = this._CostRatePeriods.CopyToDCList(doCommit); if (this._VarFields != null) { pDataContract.VarFields = this._VarFields.CopyToDCList(doCommit); } - if (_ArbeitszeitListe != null) - { - pDataContract.Arbeitszeiten = _ArbeitszeitListe.CopyToDCList(doCommit); - } + if (_ArbeitszeitListe != null) + { + pDataContract.Arbeitszeiten = _ArbeitszeitListe.CopyToDCList(doCommit); + } - if (_Feiertage != null) - { - pDataContract.Feiertage = _Feiertage.CopyToDCList(doCommit); - } + if (_Feiertage != null) + { + pDataContract.Feiertage = _Feiertage.CopyToDCList(doCommit); + } - return pDataContract; - } - } + return pDataContract; + } + } } \ No newline at end of file diff --git a/Data/Entities/Organisation.cs b/Data/Entities/Organisation.cs index 0237aec3d..033431865 100644 --- a/Data/Entities/Organisation.cs +++ b/Data/Entities/Organisation.cs @@ -371,5 +371,6 @@ namespace BeWo.Data.Entities } public virtual GkvVerfahrensstufe Verfahrensstufe { get; set; } + public virtual bool GkvAusblenden { get; set; } } } \ No newline at end of file diff --git a/Data/Mappings/Organisation.hbm.xml b/Data/Mappings/Organisation.hbm.xml index 5e3845f7f..254a6f592 100644 --- a/Data/Mappings/Organisation.hbm.xml +++ b/Data/Mappings/Organisation.hbm.xml @@ -16,15 +16,16 @@ - - - - - - - - - + + + + + + + + + + diff --git a/Model/Changes_2024_11_15 Organisation Gkv Ausblenden.txt b/Model/Changes_2024_11_15 Organisation Gkv Ausblenden.txt new file mode 100644 index 000000000..b5d3fd54c --- /dev/null +++ b/Model/Changes_2024_11_15 Organisation Gkv Ausblenden.txt @@ -0,0 +1,2 @@ +ALTER TABLE `organisation` +ADD COLUMN `GkvAusblenden` TINYINT NULL DEFAULT NULL AFTER `BusinessPartnerId`; diff --git a/Service/DCEntityMapper/OrganisationDC_Organisation.cs b/Service/DCEntityMapper/OrganisationDC_Organisation.cs index b7335fbfb..12be97179 100644 --- a/Service/DCEntityMapper/OrganisationDC_Organisation.cs +++ b/Service/DCEntityMapper/OrganisationDC_Organisation.cs @@ -34,6 +34,7 @@ namespace BeWo.Service.DCEntityMapper pDataContract.BezDatenannahmestelle = pEntity.BezDatenannahmestelle; pDataContract.Leistungserbringergruppe = pEntity.Leistungserbringergruppe; pDataContract.Verfahrensstufe = pEntity.Verfahrensstufe; + pDataContract.GkvAusblenden = pEntity.GkvAusblenden; pDataContract.BusinessPartnerId = pEntity.BusinessPartnerId; @@ -113,6 +114,7 @@ namespace BeWo.Service.DCEntityMapper pEntity.BezDatenannahmestelle = pDataContract.BezDatenannahmestelle; pEntity.Leistungserbringergruppe = pDataContract.Leistungserbringergruppe; pEntity.Verfahrensstufe = pDataContract.Verfahrensstufe; + pEntity.GkvAusblenden = pDataContract.GkvAusblenden; pEntity.BusinessPartnerId = pDataContract.BusinessPartnerId; diff --git a/Service/ServiceImplementations/CustomerServiceImp.cs b/Service/ServiceImplementations/CustomerServiceImp.cs index 3430fb140..728b6ccf6 100644 --- a/Service/ServiceImplementations/CustomerServiceImp.cs +++ b/Service/ServiceImplementations/CustomerServiceImp.cs @@ -859,7 +859,8 @@ namespace BeWo.Service.ServiceImplementations { IList list = DAOFactory.GenericDAO.GetAllActiveAndArchived(); - list = list.Where(x => Validator.IsOrganisationInformationValid(x.IKDatenannahmestelle, x.IKKostentrager, x.IKKrankenkasse, x.BezDatenannahmestelle)).ToList(); + list = list.Where(x => !x.GkvAusblenden && + Validator.IsOrganisationInformationValid(x.IKDatenannahmestelle, x.IKKostentrager, x.IKKrankenkasse, x.BezDatenannahmestelle)).ToList(); return CreateCompactOrganisations(list); } diff --git a/Shared/DataContracts/OrganisationDC.cs b/Shared/DataContracts/OrganisationDC.cs index 8d6e64bea..1bfc16c73 100644 --- a/Shared/DataContracts/OrganisationDC.cs +++ b/Shared/DataContracts/OrganisationDC.cs @@ -189,5 +189,8 @@ namespace BS.Shared.DataContracts [DataMember] public GkvVerfahrensstufe Verfahrensstufe { get; set; } + + [DataMember] + public bool GkvAusblenden { get; set; } } } \ No newline at end of file