From 3eb451abce6c66d989a5d2f132e11aa7fafc3bf3 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Tue, 15 Oct 2024 13:12:35 +0200
Subject: [PATCH] Organisation BezDatenannahmestelle + AppSettingsConverter +
 BoolVisibilityCollapsedConverter

---
 BeWo/BeWo.csproj                              |  2 ++
 BeWo/BeWoApp.xaml                             |  5 +++
 BeWo/Converter/AppSettingsConverter.cs        | 33 +++++++++++++++++++
 .../BoolVisibilityCollapsedConverter.cs       | 30 +++++++++++++++++
 BeWo/Styles/ControlStyles/TextBoxStyles.xaml  |  1 +
 BeWo/ViewModel/OrganisationVM.cs              | 18 ++++++++++
 Data/Entities/Organisation.cs                 | 18 ++++++++++
 Data/Mappings/Organisation.hbm.xml            |  1 +
 ..._15 Organisation BezDatenannahmestelle.txt |  2 ++
 .../OrganisationDC_Organisation.cs            |  2 ++
 .../AccountingServiceImp.cs                   |  2 +-
 .../GkvAbrechnung/GkvApp8GetIKResponse.cs     |  3 ++
 Shared/DataContracts/OrganisationDC.cs        |  3 ++
 13 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 BeWo/Converter/AppSettingsConverter.cs
 create mode 100644 BeWo/Converter/BoolVisibilityCollapsedConverter.cs
 create mode 100644 Model/Changes_2024_10_15 Organisation BezDatenannahmestelle.txt

diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 19ff28c1f..2204004c0 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -962,12 +962,14 @@
       <DependentUpon>BSLogoControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="Converter\AnonymizationRight2VisibilityConverter.cs" />
+    <Compile Include="Converter\AppSettingsConverter.cs" />
     <Compile Include="Converter\BooleanOrVisibilityMultiConverter.cs" />
     <Compile Include="Converter\BooleanAndVisibilityMultiConverter.cs" />
     <Compile Include="Converter\BoolNullCheckConverter.cs" />
     <Compile Include="Converter\BoolReverseConverter.cs" />
     <Compile Include="Converter\BoolEnabledToTabitemBackgroundConverter.cs" />
     <Compile Include="Converter\BoolToParameterReturnConverter.cs" />
+    <Compile Include="Converter\BoolVisibilityCollapsedConverter.cs" />
     <Compile Include="Converter\CellColorConverter.cs" />
     <Compile Include="Converter\CollectionContainsTag2BoolConverter.cs" />
     <Compile Include="Converter\CollectionCountToBoolConverter.cs" />
diff --git a/BeWo/BeWoApp.xaml b/BeWo/BeWoApp.xaml
index 18ebcba2b..551e2f6c4 100644
--- a/BeWo/BeWoApp.xaml
+++ b/BeWo/BeWoApp.xaml
@@ -90,6 +90,11 @@
             <conv:GkvState2StringConverter x:Key="GkvState2StringConverter" />
             <conv:RadioBoolToIntConverter x:Key="RadioBoolToIntConverter" />
             <conv:EnumTranslationConverter x:Key="EnumTranslationConverter" />
+            <conv:AppSettingsConverter x:Key="AppSettingsConverter" />
+            <conv:ValueConverterGroup x:Key="AppSettings2Visible">
+                <conv:AppSettingsConverter />
+                <conv:BoolVisibilityCollapsedConverter/>
+            </conv:ValueConverterGroup>
 
             <Style x:Key="SupportConceptDetailStyle" TargetType="{x:Type ListBoxItem}">
                 <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />
diff --git a/BeWo/Converter/AppSettingsConverter.cs b/BeWo/Converter/AppSettingsConverter.cs
new file mode 100644
index 000000000..cf34b06b6
--- /dev/null
+++ b/BeWo/Converter/AppSettingsConverter.cs
@@ -0,0 +1,33 @@
+using BeWo.Core.Config;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+	public class AppSettingsConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (parameter == null)
+				return false;
+
+			if(parameter is string setting)
+			{
+				if (setting == nameof(AppSettings.AllowGkvAbrechnung))
+					return BeWoApp.AppSettings.AllowGkvAbrechnung;
+			}
+
+			return false;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
diff --git a/BeWo/Converter/BoolVisibilityCollapsedConverter.cs b/BeWo/Converter/BoolVisibilityCollapsedConverter.cs
new file mode 100644
index 000000000..15d3bbe6d
--- /dev/null
+++ b/BeWo/Converter/BoolVisibilityCollapsedConverter.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class BoolVisibilityCollapsedConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return Visibility.Visible;
+            }
+
+            if(value is bool b)
+            {
+                return (bool)value ? Visibility.Visible : Visibility.Collapsed;
+            }
+
+            return Visibility.Visible;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/TextBoxStyles.xaml b/BeWo/Styles/ControlStyles/TextBoxStyles.xaml
index 03f97a58e..bf44be0ae 100644
--- a/BeWo/Styles/ControlStyles/TextBoxStyles.xaml
+++ b/BeWo/Styles/ControlStyles/TextBoxStyles.xaml
@@ -2,6 +2,7 @@
     <Style x:Key="TextBoxBase" TargetType="{x:Type TextBox}">
         <Setter Property="Margin" Value="3" />
         <Setter Property="Padding" Value="3" />
+        <Setter Property="Height" Value="23" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
     </Style>
diff --git a/BeWo/ViewModel/OrganisationVM.cs b/BeWo/ViewModel/OrganisationVM.cs
index bec288711..c1b9e21e6 100644
--- a/BeWo/ViewModel/OrganisationVM.cs
+++ b/BeWo/ViewModel/OrganisationVM.cs
@@ -164,6 +164,7 @@ namespace BeWo.ViewModel
         private string _IKKrankenkasse; 
         private string _IKKostentrager; 
         private string _IKDatenannahmestelle;
+        private string _BezDatenannahmestelle;
         private string _Leistungserbringergruppe;
         private string _BusinessPartnerId;
         private GkvVerfahrensstufe _Verfahrensstufe;
@@ -813,6 +814,21 @@ namespace BeWo.ViewModel
             }
         }
 
+        public string BezDatenannahmestelle
+        {
+            get { return this._BezDatenannahmestelle; }
+
+            set
+            {
+                if (this.AreDifferent(this._BezDatenannahmestelle, value))
+                {
+                    this._BezDatenannahmestelle = value;
+                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.BezDatenannahmestelle, value), nameof(BezDatenannahmestelle));
+                    this.FirePropertyChanged(nameof(BezDatenannahmestelle));
+                }
+            }
+        }
+
         public string Leistungserbringergruppe
         {
             get { return this._Leistungserbringergruppe; }
@@ -936,6 +952,7 @@ namespace BeWo.ViewModel
                 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;
@@ -1043,6 +1060,7 @@ namespace BeWo.ViewModel
 			pDataContract.ActivationType = this._IsArchived ? ActivationTypeId.Archived : ActivationTypeId.Active;
             pDataContract.Function = this._Function;
             pDataContract.IKDatenannahmestelle = this._IKDatenannahmestelle;
+            pDataContract.BezDatenannahmestelle = this._BezDatenannahmestelle;
             pDataContract.IKKostentrager = this._IKKostentrager;
             pDataContract.IKKrankenkasse = this._IKKrankenkasse;
             pDataContract.Leistungserbringergruppe = _Leistungserbringergruppe;
diff --git a/Data/Entities/Organisation.cs b/Data/Entities/Organisation.cs
index 5b96277a0..0237aec3d 100644
--- a/Data/Entities/Organisation.cs
+++ b/Data/Entities/Organisation.cs
@@ -66,6 +66,8 @@ namespace BeWo.Data.Entities
 
         private string _IKDatenannahmestelle;
 
+        private string _BezDatenannahmestelle;
+
         private string _Leistungserbringergruppe;
 
         private string _BusinessPartnerId;
@@ -320,6 +322,22 @@ namespace BeWo.Data.Entities
             }
         }
 
+        public virtual string BezDatenannahmestelle
+        {
+            get
+            {
+                return this._BezDatenannahmestelle;
+            }
+
+            set
+            {
+                if (this.AreDifferent(this._BezDatenannahmestelle, value))
+                {
+                    this._BezDatenannahmestelle = value;
+                }
+            }
+        }
+
         public virtual string Leistungserbringergruppe
         {
             get
diff --git a/Data/Mappings/Organisation.hbm.xml b/Data/Mappings/Organisation.hbm.xml
index 02c6ff495..5e3845f7f 100644
--- a/Data/Mappings/Organisation.hbm.xml
+++ b/Data/Mappings/Organisation.hbm.xml
@@ -19,6 +19,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="BezDatenannahmestelle" type="String" name="BezDatenannahmestelle" length="256" />
 		<property column="Leistungserbringergruppe" type="String" name="Leistungserbringergruppe" length="256" />
     <property column="Verfahrensstufe" type="BS.Shared.GkvVerfahrensstufe, BS.Shared" name="Verfahrensstufe"/>
 		<property column="BusinessPartnerId" type="String" name="BusinessPartnerId" length="256" />
diff --git a/Model/Changes_2024_10_15 Organisation BezDatenannahmestelle.txt b/Model/Changes_2024_10_15 Organisation BezDatenannahmestelle.txt
new file mode 100644
index 000000000..455671e73
--- /dev/null
+++ b/Model/Changes_2024_10_15 Organisation BezDatenannahmestelle.txt	
@@ -0,0 +1,2 @@
+ALTER TABLE `organisation` 
+ADD COLUMN `BezDatenannahmestelle` VARCHAR(4096) NULL DEFAULT NULL AFTER `IKDatenannahmestelle`;
diff --git a/Service/DCEntityMapper/OrganisationDC_Organisation.cs b/Service/DCEntityMapper/OrganisationDC_Organisation.cs
index aec5a9a9d..b7335fbfb 100644
--- a/Service/DCEntityMapper/OrganisationDC_Organisation.cs
+++ b/Service/DCEntityMapper/OrganisationDC_Organisation.cs
@@ -31,6 +31,7 @@ namespace BeWo.Service.DCEntityMapper
             pDataContract.IKKrankenkasse = pEntity.IKKrankenkasse;
             pDataContract.IKKostentrager = pEntity.IKKostentrager;
             pDataContract.IKDatenannahmestelle = pEntity.IKDatenannahmestelle;
+            pDataContract.BezDatenannahmestelle = pEntity.BezDatenannahmestelle;
             pDataContract.Leistungserbringergruppe = pEntity.Leistungserbringergruppe;
             pDataContract.Verfahrensstufe = pEntity.Verfahrensstufe;
 
@@ -109,6 +110,7 @@ namespace BeWo.Service.DCEntityMapper
             pEntity.IKKrankenkasse = pDataContract.IKKrankenkasse;
             pEntity.IKKostentrager = pDataContract.IKKostentrager;
             pEntity.IKDatenannahmestelle = pDataContract.IKDatenannahmestelle;
+            pEntity.BezDatenannahmestelle = pDataContract.BezDatenannahmestelle;
             pEntity.Leistungserbringergruppe = pDataContract.Leistungserbringergruppe;
             pEntity.Verfahrensstufe = pDataContract.Verfahrensstufe;
 
diff --git a/Service/ServiceImplementations/AccountingServiceImp.cs b/Service/ServiceImplementations/AccountingServiceImp.cs
index 24be85664..b850be87d 100644
--- a/Service/ServiceImplementations/AccountingServiceImp.cs
+++ b/Service/ServiceImplementations/AccountingServiceImp.cs
@@ -950,7 +950,7 @@ namespace BeWo.Service.ServiceImplementations
 
                     orga.IKDatenannahmestelle = res.IKDatenannahmestelle;
                     orga.IKKostentrager = res.IKKostentrager;
-                    // orgadc.IKKrankenkasse = res.IKKrankenkasse;
+                    orga.BezDatenannahmestelle = res.BezDatenannahmestelle;
 
                     if (!DakotaValidator.ValidateIKNumbers(orga))
                         throw new DakotaException($"Für die Organisation \"{orga.Name}\" konnten die hinterlegten IKs nicht verifiziert werden: \"{orga.IKDatenannahmestelle}\", \"{orga.IKKostentrager}\", \"{orga.IKKrankenkasse}\"", "Interner Fehler");
diff --git a/Shared/DataContracts/GkvAbrechnung/GkvApp8GetIKResponse.cs b/Shared/DataContracts/GkvAbrechnung/GkvApp8GetIKResponse.cs
index 75a06cef3..2749cf9b4 100644
--- a/Shared/DataContracts/GkvAbrechnung/GkvApp8GetIKResponse.cs
+++ b/Shared/DataContracts/GkvAbrechnung/GkvApp8GetIKResponse.cs
@@ -20,5 +20,8 @@ namespace BS.Shared.DataContracts.GkvAbrechnung
 
         [DataMember]
         public string IKDatenannahmestelle { get; set; }
+
+        [DataMember]
+        public string BezDatenannahmestelle { get; set; }
     }
 }
diff --git a/Shared/DataContracts/OrganisationDC.cs b/Shared/DataContracts/OrganisationDC.cs
index 9fd34df40..8d6e64bea 100644
--- a/Shared/DataContracts/OrganisationDC.cs
+++ b/Shared/DataContracts/OrganisationDC.cs
@@ -45,6 +45,9 @@ namespace BS.Shared.DataContracts
 
         [DataMember]
         public string IKDatenannahmestelle { get; set; }
+        
+        [DataMember]
+        public string BezDatenannahmestelle { get; set; }
 
         [DataMember]
 		public ActivationTypeId ActivationType { get; set; }