diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index fe483583f..139a53d34 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -391,6 +391,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -1301,6 +1305,10 @@
+
+ ComboBoxEmployeeSearch.xaml
+
+
CustomerVermittlungArbeitControl.xaml
@@ -2890,392 +2898,392 @@
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
False
+ Include
+ True
- Include
- True
Assembly
diff --git a/BeWo/Converter/TestDebugConverter.cs b/BeWo/Converter/TestDebugConverter.cs
index 9bff02a21..d428f40b1 100644
--- a/BeWo/Converter/TestDebugConverter.cs
+++ b/BeWo/Converter/TestDebugConverter.cs
@@ -12,7 +12,7 @@ namespace BeWo.Converter
if (value is null)
return null;
- return "Test";
+ return value;
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/BeWo/DebugConfig.cs b/BeWo/DebugConfig.cs
index 0c7d5f04e..7431fa369 100644
--- a/BeWo/DebugConfig.cs
+++ b/BeWo/DebugConfig.cs
@@ -117,7 +117,7 @@ namespace BeWo
{
DebugConfigMode = DebugConfigMode.FeatureDakota,
AutoLogin = true,
- SelectView = UIContext.Finance,
+ SelectView = UIContext.Administration,
SelectIndex = 8,
//Username = "m1",
//Password = "bewobewo",
diff --git a/BeWo/MainControl.xaml.cs b/BeWo/MainControl.xaml.cs
index 1b36e8300..d6a4c7f62 100644
--- a/BeWo/MainControl.xaml.cs
+++ b/BeWo/MainControl.xaml.cs
@@ -51,7 +51,8 @@ namespace BeWo
Vertretungen,
CustomerTeam,
Scheduling,
- Finance
+ Finance,
+ Administration
}
public partial class MainControl
@@ -246,6 +247,9 @@ namespace BeWo
private BeWoView GetViewForUIContext(UIContext uiContext)
{
+ if (uiContext == UIContext.Administration)
+ return new AdministrationView();
+
if (!_Views.ContainsKey(uiContext))
{
BeWoView view = null;
@@ -913,7 +917,7 @@ namespace BeWo
{
if (DoSaveCheck())
{
- NavigateTo(new AdministrationView());
+ NavigateTo(GetViewForUIContext(UIContext.Administration));
}
}
diff --git a/BeWo/Styles/OrangeBlack.xaml b/BeWo/Styles/OrangeBlack.xaml
index 8830a0f09..1750759f1 100644
--- a/BeWo/Styles/OrangeBlack.xaml
+++ b/BeWo/Styles/OrangeBlack.xaml
@@ -2515,7 +2515,7 @@
x:Name="PART_NewButton"
Grid.Column="2"
Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Self}}"
- Height="20"
+ Height="18"
Margin="1,0,1,0"
Padding="0"
VerticalAlignment="Stretch"
@@ -2537,7 +2537,7 @@
x:Name="PART_DeleteButton"
Grid.Column="3"
Width="{Binding Path=ActualHeight, RelativeSource={RelativeSource Self}}"
- Height="20"
+ Height="18"
Margin="1,0,1,0"
Padding="0"
VerticalAlignment="Stretch"
diff --git a/BeWo/View/Controls/ComboBoxes/ComboBoxEmployeeSearch.xaml b/BeWo/View/Controls/ComboBoxes/ComboBoxEmployeeSearch.xaml
new file mode 100644
index 000000000..8b0843804
--- /dev/null
+++ b/BeWo/View/Controls/ComboBoxes/ComboBoxEmployeeSearch.xaml
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
diff --git a/BeWo/View/Controls/ComboBoxes/ComboBoxEmployeeSearch.xaml.cs b/BeWo/View/Controls/ComboBoxes/ComboBoxEmployeeSearch.xaml.cs
new file mode 100644
index 000000000..60ca6d7e0
--- /dev/null
+++ b/BeWo/View/Controls/ComboBoxes/ComboBoxEmployeeSearch.xaml.cs
@@ -0,0 +1,85 @@
+using BeWo.View.Search;
+using BS.Shared.Core;
+using BS.Shared.DataContracts.Compact;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BeWo.View.Controls.ComboBoxes
+{
+ ///
+ /// Interaktionslogik für ComboBoxEmployeeSearch.xaml
+ ///
+ public partial class ComboBoxEmployeeSearch : ComboBoxGenericSearch
+ {
+ // Using a DependencyProperty as the backing store for SelectedCompactEmployeeDC. This enables animation, styling, binding, etc...
+ public static readonly DependencyProperty SelectedCompactEmployeeDCProperty =
+ DependencyProperty.Register("SelectedCompactEmployeeDC",
+ typeof(CompactEmployeeDC),
+ typeof(ComboBoxEmployeeSearch),
+ new UIPropertyMetadata(null,
+ selectCompactEmployee2));
+
+ public CompactEmployeeDC SelectedCompactEmployeeDC
+ {
+ get { return (CompactEmployeeDC)GetValue(SelectedCompactEmployeeDCProperty); }
+ set { SetValue(SelectedCompactEmployeeDCProperty, value); }
+ }
+
+ static ComboBoxEmployeeSearch()
+ {
+ SearchModeProperty.OverrideMetadata(typeof(ComboBoxEmployeeSearch), new UIPropertyMetadata(SearchMode.All, updateSearchMode));
+ }
+
+ public ComboBoxEmployeeSearch()
+ {
+ InitializeComponent();
+ }
+
+ private void popupedit_PopUpClick(object sender, EventArgs e)
+ {
+ searchview.ItemSelected += searchview_Selected;
+ popup.IsOpen = true;
+ }
+
+ private void searchview_Selected(object sender, EventArgs e)
+ {
+ popup.IsOpen = false;
+ searchview.ItemSelected -= searchview_Selected;
+
+ SelectedCompactEmployeeDC = e.Data;
+
+ popupedit.Focus();
+ }
+
+ private static void selectCompactEmployee2(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ var control = d as ComboBoxEmployeeSearch;
+
+ control.popupedit.Text = e.NewValue?.ToString();
+ }
+
+ private static void updateSearchMode(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ var control = d as ComboBoxEmployeeSearch;
+
+ control.searchview.SearchMode = (SearchMode)e.NewValue;
+ }
+
+ private void popupedit_DeleteClick(object sender, RoutedEventArgs e)
+ {
+ SelectedCompactEmployeeDC = null;
+ }
+ }
+}
diff --git a/BeWo/View/Controls/ComboBoxes/ComboBoxGenericSearch.cs b/BeWo/View/Controls/ComboBoxes/ComboBoxGenericSearch.cs
new file mode 100644
index 000000000..843b69318
--- /dev/null
+++ b/BeWo/View/Controls/ComboBoxes/ComboBoxGenericSearch.cs
@@ -0,0 +1,34 @@
+using BeWo.View.Search;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace BeWo.View.Controls.ComboBoxes
+{
+ public class ComboBoxGenericSearch : UserControl
+ {
+ // Using a DependencyProperty as the backing store for DeleteButtonVisibility. This enables animation, styling, binding, etc...
+ public static readonly DependencyProperty DeleteButtonVisibilityProperty =
+ DependencyProperty.Register("DeleteButtonVisibility", typeof(Visibility), typeof(ComboBoxGenericSearch), new PropertyMetadata(null));
+
+ // Using a DependencyProperty as the backing store for MyProperty. This enables animation, styling, binding, etc...
+ public static readonly DependencyProperty SearchModeProperty =
+ DependencyProperty.Register("SearchMode", typeof(SearchMode), typeof(ComboBoxGenericSearch), new UIPropertyMetadata(SearchMode.All));
+
+ public Visibility DeleteButtonVisibility
+ {
+ get { return (Visibility)GetValue(DeleteButtonVisibilityProperty); }
+ set { SetValue(DeleteButtonVisibilityProperty, value); }
+ }
+
+ public SearchMode SearchMode
+ {
+ get { return (SearchMode)GetValue(SearchModeProperty); }
+ set { SetValue(SearchModeProperty, value); }
+ }
+ }
+}
diff --git a/BeWo/View/Controls/ListboxSelectControl.xaml b/BeWo/View/Controls/ListboxSelectControl.xaml
index 6420a7a0d..bd78f87dc 100644
--- a/BeWo/View/Controls/ListboxSelectControl.xaml
+++ b/BeWo/View/Controls/ListboxSelectControl.xaml
@@ -1,26 +1,46 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BeWo/View/Detail/MandatorView.xaml b/BeWo/View/Detail/MandatorView.xaml
index 0bc86777e..bad028196 100644
--- a/BeWo/View/Detail/MandatorView.xaml
+++ b/BeWo/View/Detail/MandatorView.xaml
@@ -2,6 +2,7 @@
x:Class="BeWo.View.Detail.MandatorView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:comboboxes="clr-namespace:BeWo.View.Controls.ComboBoxes"
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
@@ -217,10 +218,45 @@
Text="{Binding Path=IBAN, UpdateSourceTrigger=PropertyChanged}" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -312,7 +348,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
>), typeof(SupportConceptAnalysisListViewItem), new UIPropertyMetadata(new KeyValuePair>(), (s, e) => ((SupportConceptAnalysisListViewItem)s).DataContext = e.NewValue));
+ public static readonly DependencyProperty OverviewItemProperty = DependencyProperty.Register("OverviewItem",
+ typeof(KeyValuePair>),
+ typeof(SupportConceptAnalysisListViewItem),
+ new UIPropertyMetadata(new KeyValuePair>(),
+ (s, e) => ((SupportConceptAnalysisListViewItem)s).DataContext = e.NewValue));
public SupportConceptAnalysisListViewItem()
{
diff --git a/BeWo/View/Search/GenericSearchView.cs b/BeWo/View/Search/GenericSearchView.cs
index 9ad3aabe2..1d77f0564 100644
--- a/BeWo/View/Search/GenericSearchView.cs
+++ b/BeWo/View/Search/GenericSearchView.cs
@@ -17,7 +17,6 @@ namespace BeWo.View.Search
{
public class GenericSearchView : UserControl where T : class, IFilterableDC
{
-
private readonly ListBox _ResultListBox;
private readonly Grid _Root;
diff --git a/BeWo/View/Search/MultiEmployeeSearch.xaml b/BeWo/View/Search/MultiEmployeeSearch.xaml
index f7254a591..98d930ab2 100644
--- a/BeWo/View/Search/MultiEmployeeSearch.xaml
+++ b/BeWo/View/Search/MultiEmployeeSearch.xaml
@@ -1,95 +1,166 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BeWo/ViewModel/MandatorVM.cs b/BeWo/ViewModel/MandatorVM.cs
index b83eb49c0..d11cd8087 100644
--- a/BeWo/ViewModel/MandatorVM.cs
+++ b/BeWo/ViewModel/MandatorVM.cs
@@ -6,6 +6,7 @@ using BS.Shared.DataContracts;
using BS.Shared.Extensions;
using BeWo.Core;
using BS.Shared.Core;
+using BS.Shared.DataContracts.Compact;
namespace BeWo.ViewModel
{
@@ -49,6 +50,7 @@ namespace BeWo.ViewModel
private string _BankCode;
private string _Bic;
private string _IBAN;
+ private CompactEmployeeDC _SoziotherapieAnsprechpartner;
public MandatorVM(IList invoiceNumberList, MandatorDC pDC) : base(pDC, true)
{
@@ -545,6 +547,21 @@ namespace BeWo.ViewModel
}
}
+ public CompactEmployeeDC SoziotherapieAnsprechpartner
+ {
+ get { return _SoziotherapieAnsprechpartner; }
+
+ set
+ {
+ if (!AreDifferent(SoziotherapieAnsprechpartner, value))
+ return;
+
+ _SoziotherapieAnsprechpartner = value;
+ StoreDirtyInformation(AreDifferent(DataContract.SoziotherapieAnsprechpartner, value), nameof(SoziotherapieAnsprechpartner));
+ FirePropertyChanged(nameof(SoziotherapieAnsprechpartner));
+ }
+ }
+
public bool CanEditIKLeistungserbringer { get; set; }
public string CanEditIKLeistungserbringerTooltip { get; set; }
@@ -568,6 +585,7 @@ namespace BeWo.ViewModel
_IBAN = pDataContract.BankAccount.IBAN;
CanEditIKLeistungserbringer = pDataContract.CanEditIKLeistungserbringer;
CanEditIKLeistungserbringerTooltip = pDataContract.CanEditIKLeistungserbringerTooltip;
+ _SoziotherapieAnsprechpartner = pDataContract.SoziotherapieAnsprechpartner;
if (_Settings == null)
{
@@ -628,6 +646,7 @@ namespace BeWo.ViewModel
pDataContract.BankAccount.BankName = BankName;
pDataContract.BankAccount.Bic = Bic;
pDataContract.BankAccount.IBAN = IBAN;
+ pDataContract.SoziotherapieAnsprechpartner = SoziotherapieAnsprechpartner;
return pDataContract;
}
diff --git a/Data/Entities/Mandator.cs b/Data/Entities/Mandator.cs
index f0ccff71e..c49f14b54 100644
--- a/Data/Entities/Mandator.cs
+++ b/Data/Entities/Mandator.cs
@@ -365,6 +365,7 @@ namespace BeWo.Data.Entities
}
}
public virtual BankAccount BankAccount { get; set; }
+ public virtual Employee SoziotherapieAnsprechpartner { get; set; }
protected virtual string GetSettingValue(string key)
{
diff --git a/Data/Mappings/Mandator.hbm.xml b/Data/Mappings/Mandator.hbm.xml
index 068bbecb6..dc517edeb 100644
--- a/Data/Mappings/Mandator.hbm.xml
+++ b/Data/Mappings/Mandator.hbm.xml
@@ -29,5 +29,6 @@
+
\ No newline at end of file
diff --git a/Model/Changes_2024_11_26 Mandator SoziotherapieAnsprechpartner.txt b/Model/Changes_2024_11_26 Mandator SoziotherapieAnsprechpartner.txt
new file mode 100644
index 000000000..1921888c8
--- /dev/null
+++ b/Model/Changes_2024_11_26 Mandator SoziotherapieAnsprechpartner.txt
@@ -0,0 +1,2 @@
+ALTER TABLE `mandator`
+ADD COLUMN `SoziotherapieAnsprechpartnerOid` BIGINT NULL DEFAULT NULL AFTER `BankAccountOid`;
diff --git a/Service/DCEntityMapper/MandatorDC_Mandator.cs b/Service/DCEntityMapper/MandatorDC_Mandator.cs
index 9760594fc..a12959f45 100644
--- a/Service/DCEntityMapper/MandatorDC_Mandator.cs
+++ b/Service/DCEntityMapper/MandatorDC_Mandator.cs
@@ -6,93 +6,97 @@ using System;
namespace BeWo.Service.DCEntityMapper
{
- public class MandatorDC_Mandator : AbstractIDCEntityMapper
- {
- public override MandatorDC MergeWithDC(Mandator pEntity, MandatorDC pDataContract)
- {
- pDataContract.MandatorOid = pEntity.Oid;
- pDataContract.MandatorVersion = pEntity.Version;
- pDataContract.Name = pEntity.Name;
- pDataContract.ClientId = pEntity.ClientId;
- pDataContract.BeWoClientType = pEntity.BeWoClientType;
- pDataContract.Country = pEntity.Country;
- pDataContract.State = pEntity.State;
- pDataContract.Town = pEntity.Town;
- pDataContract.PostalCode = pEntity.PostalCode;
- pDataContract.Street = pEntity.Street;
- pDataContract.Settings = pEntity.Settings;
+ public class MandatorDC_Mandator : AbstractIDCEntityMapper
+ {
+ public override MandatorDC MergeWithDC(Mandator pEntity, MandatorDC pDataContract)
+ {
+ pDataContract.MandatorOid = pEntity.Oid;
+ pDataContract.MandatorVersion = pEntity.Version;
+ pDataContract.Name = pEntity.Name;
+ pDataContract.ClientId = pEntity.ClientId;
+ pDataContract.BeWoClientType = pEntity.BeWoClientType;
+ pDataContract.Country = pEntity.Country;
+ pDataContract.State = pEntity.State;
+ pDataContract.Town = pEntity.Town;
+ pDataContract.PostalCode = pEntity.PostalCode;
+ pDataContract.Street = pEntity.Street;
+ pDataContract.Settings = pEntity.Settings;
pDataContract.RssFeedUrl = pEntity.RssFeedUrl;
pDataContract.IsSchedulerAllowed = pEntity.IsSchedulerAllowed;
pDataContract.IsMedicationAllowed = pEntity.IsMedicationAllowed;
- pDataContract.BankAccount = MapperFactory.BankAccountDC_BankAccount.MapToNewDC(pEntity.BankAccount, false);
+ pDataContract.BankAccount = MapperFactory.BankAccountDC_BankAccount.MapToNewDC(pEntity.BankAccount, false);
- pDataContract.AllowSbd = !string.IsNullOrEmpty(pDataContract.ClientId) && pDataContract.ClientId == "SBD";
+ pDataContract.AllowSbd = !string.IsNullOrEmpty(pDataContract.ClientId) && pDataContract.ClientId == "SBD";
#if DEBUG
- //pDataContract.AllowSbd = true;
+ //pDataContract.AllowSbd = true;
#endif
- pDataContract.Apikey = pEntity.Apikey;
- pDataContract.IKLeistungserbringer = pEntity.IKLeistungserbringer;
- var can_edit = GetCanEditIKLeistungserbringer();
+ pDataContract.Apikey = pEntity.Apikey;
+ pDataContract.IKLeistungserbringer = pEntity.IKLeistungserbringer;
+ var can_edit = GetCanEditIKLeistungserbringer();
- pDataContract.CanEditIKLeistungserbringer = can_edit;
- pDataContract.CanEditIKLeistungserbringerTooltip = can_edit ? null :
- "Mit dem Senden mind. einer GKV Abrechnung haben Sie sich bereits\n" +
- "mit dieser IK bei uns registiert. Bei Änderungswunsch wenden Sie\n" +
- "sich bitte an unseren Support.";
+ pDataContract.CanEditIKLeistungserbringer = can_edit;
+ pDataContract.CanEditIKLeistungserbringerTooltip = can_edit ? null :
+ "Mit dem Senden mind. einer GKV Abrechnung haben Sie sich bereits\n" +
+ "mit dieser IK bei uns registiert. Bei Änderungswunsch wenden Sie\n" +
+ "sich bitte an unseren Support.";
- return pDataContract;
- }
+ if (pEntity.SoziotherapieAnsprechpartner is object)
+ pDataContract.SoziotherapieAnsprechpartner = MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(pEntity.SoziotherapieAnsprechpartner);
- public override Mandator MergeWithEntity(MandatorDC pDataContract, Mandator pEntity)
- {
- this.ConcurrencyCheck(pDataContract.MandatorVersion, pEntity);
+ return pDataContract;
+ }
- pEntity.Name = pDataContract.Name;
- pEntity.ClientId = pDataContract.ClientId;
- pEntity.BeWoClientType = pDataContract.BeWoClientType;
- pEntity.Country = pDataContract.Country;
- pEntity.State = pDataContract.State;
- pEntity.Town = pDataContract.Town;
- pEntity.PostalCode = pDataContract.PostalCode;
- pEntity.Street = pDataContract.Street;
- pEntity.Settings = pDataContract.Settings;
+ public override Mandator MergeWithEntity(MandatorDC pDataContract, Mandator pEntity)
+ {
+ this.ConcurrencyCheck(pDataContract.MandatorVersion, pEntity);
+
+ pEntity.Name = pDataContract.Name;
+ pEntity.ClientId = pDataContract.ClientId;
+ pEntity.BeWoClientType = pDataContract.BeWoClientType;
+ pEntity.Country = pDataContract.Country;
+ pEntity.State = pDataContract.State;
+ pEntity.Town = pDataContract.Town;
+ pEntity.PostalCode = pDataContract.PostalCode;
+ pEntity.Street = pDataContract.Street;
+ pEntity.Settings = pDataContract.Settings;
pEntity.RssFeedUrl = pDataContract.RssFeedUrl;
pEntity.IsSchedulerAllowed = pDataContract.IsSchedulerAllowed;
pEntity.IsMedicationAllowed = pDataContract.IsMedicationAllowed;
- pEntity.Apikey = pDataContract.Apikey;
- pEntity.IKLeistungserbringer = pDataContract.IKLeistungserbringer;
+ pEntity.Apikey = pDataContract.Apikey;
+ pEntity.IKLeistungserbringer = pDataContract.IKLeistungserbringer;
- pEntity.BankAccount = MapperFactory.BankAccountDC_BankAccount.MergeWithEntity(pDataContract.BankAccount, pEntity.BankAccount, false);
+ pEntity.BankAccount = MapperFactory.BankAccountDC_BankAccount.MergeWithEntity(pDataContract.BankAccount, pEntity.BankAccount, false);
+ pEntity.SoziotherapieAnsprechpartner = MapperFactory.CompactEmployeeDC_Employee.MergeWithEntity(pDataContract.SoziotherapieAnsprechpartner, pEntity.SoziotherapieAnsprechpartner, false);
- return pEntity;
- }
+ return pEntity;
+ }
- protected override bool AreDCAndEntityEqual(MandatorDC pDC, Mandator pEntity)
- {
- if (pDC.MandatorOid == null)
- {
- return false;
- }
+ protected override bool AreDCAndEntityEqual(MandatorDC pDC, Mandator pEntity)
+ {
+ if (pDC.MandatorOid == null)
+ {
+ return false;
+ }
- return pDC.MandatorOid == pEntity.Oid;
- }
+ return pDC.MandatorOid == pEntity.Oid;
+ }
- private bool GetCanEditIKLeistungserbringer()
+ private bool GetCanEditIKLeistungserbringer()
{
try
{
- var row_count = DAOFactory.GenericDAO.GetRowCount();
+ var row_count = DAOFactory.GenericDAO.GetRowCount();
- return row_count == 0;
+ return row_count == 0;
}
catch (Exception)
{
}
- return true;
+ return true;
}
- }
+ }
}
\ No newline at end of file
diff --git a/Shared/DataContracts/MandatorDC.cs b/Shared/DataContracts/MandatorDC.cs
index 051a6750a..bb84ab790 100644
--- a/Shared/DataContracts/MandatorDC.cs
+++ b/Shared/DataContracts/MandatorDC.cs
@@ -1,3 +1,4 @@
+using BS.Shared.DataContracts.Compact;
using BS.Shared.DataContracts.Invoicing;
using System.Runtime.Serialization;
@@ -27,5 +28,6 @@ namespace BS.Shared.DataContracts
[DataMember] public string IKLeistungserbringer { get; set; }
[DataMember] public bool CanEditIKLeistungserbringer { get; set; }
[DataMember] public string CanEditIKLeistungserbringerTooltip { get; set; }
+ [DataMember] public CompactEmployeeDC SoziotherapieAnsprechpartner { get; set; }
}
}
\ No newline at end of file