diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index ca202f66f..91bdf6657 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -275,6 +275,14 @@
Designer
MSBuild:Compile
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
MSBuild:Compile
Designer
@@ -287,6 +295,10 @@
MSBuild:Compile
Designer
+
+ MSBuild:Compile
+ Designer
+
MSBuild:Compile
Designer
@@ -831,12 +843,21 @@
+
+ ListboxSelectControl.xaml
+
+
+ ValueListEntryEditControl.xaml
+
NotizenKategorieView.xaml
BudgetView.xaml
+
+ IcfImportControl.xaml
+
FlexibleReportEntryDetail.xaml
@@ -2227,362 +2248,362 @@
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/Core/SupportConceptGoalTreeItem.cs b/BeWo/Core/SupportConceptGoalTreeItem.cs
index d1554c2ec..9bd2ddb80 100644
--- a/BeWo/Core/SupportConceptGoalTreeItem.cs
+++ b/BeWo/Core/SupportConceptGoalTreeItem.cs
@@ -4,89 +4,44 @@ using BS.Shared;
using BeWo.ViewModel;
using BS.Shared.DataContracts.ClientPartials;
+using BS.Shared.Extensions;
namespace BeWo.Core
{
public class SupportConceptGoalTreeItem : SupportConceptGoalDC
{
private ValueListEntryVM _GoalEntryVM;
-
private BindingList _Children;
+ private bool _ShowNotice;
public ValueListEntryVM GoalEntryVM
{
- get
- {
- return _GoalEntryVM;
- }
+ get => _GoalEntryVM;
+ set => _GoalEntryVM = value;
+ }
+ public bool IsGoal => GoalEntryVM != null ?
+ GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType) :
+ GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType);
+
+
+
+ public bool ShowNotice
+ {
+ get => _ShowNotice;
set
{
- _GoalEntryVM = value;
+ _ShowNotice = value;
+ RaisePropertyChanged(nameof(ShowNotice));
}
}
- public string ItemName
+ public BindingList Items
{
- get => _GoalEntryVM != null ? _GoalEntryVM.Description : GoalEntryDC?.TypeDescription;
- set
- {
- if (_GoalEntryVM != null)
- {
- _GoalEntryVM.Description = value;
- }
-
- if (GoalEntryDC != null)
- {
- GoalEntryDC.TypeDescription = value;
- }
- }
+ get => _Children ?? (_Children = new BindingList());
+ set => _Children = value;
}
- public string Notice
- {
- get => _GoalEntryVM != null ? _GoalEntryVM.Notice : GoalEntryDC?.Notice;
-
- set
- {
- if(_GoalEntryVM != null)
- {
- _GoalEntryVM.Notice = value;
- }
-
- if(GoalEntryDC != null)
- {
- GoalEntryDC.Notice = value;
- }
- }
- }
-
- public bool IsGoal
- {
- get
- {
- return GoalEntryVM != null ?
- GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType) :
- GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType);
- }
- }
-
- public BindingList Items
- {
- get
- {
- return _Children ?? (_Children = new BindingList());
- }
-
- set
- {
- _Children = value;
- }
- }
-
- public ValueListEntryType GoalType
- {
- get { return GoalEntryDC == null ? GoalEntryVM.Type : GoalEntryDC.Type; }
- }
+ public ValueListEntryType GoalType => GoalEntryDC?.Type ?? GoalEntryVM.Type;
}
}
\ No newline at end of file
diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs
index 36c789643..66671d2b5 100644
--- a/BeWo/ServiceProxy/Generated.cs
+++ b/BeWo/ServiceProxy/Generated.cs
@@ -4245,6 +4245,10 @@ namespace BeWo.ServiceProxy
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetHomeViewPanelsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
System.Collections.Generic.List GetHomeViewPanels();
+ [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetIcf", ReplyAction="http://tempuri.org/IOperationsService/GetIcfResponse")]
+ [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetIcfBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+ System.Collections.Generic.List GetIcf();
+
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDCResponse" +
"")]
[System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDCBeWoFaul" +
@@ -5175,6 +5179,11 @@ namespace BeWo.ServiceProxy
return base.Channel.GetHomeViewPanels();
}
+ public System.Collections.Generic.List GetIcf()
+ {
+ return base.Channel.GetIcf();
+ }
+
public void UpdateIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType)
{
base.Channel.UpdateIsChatActiveCustomerAPPCodeDC(customerOid, activeType);
diff --git a/BeWo/View/Controls/ComboBoxTreeViewControl.xaml b/BeWo/View/Controls/ComboBoxTreeViewControl.xaml
index 7cfe9d7ff..8c20e41db 100644
--- a/BeWo/View/Controls/ComboBoxTreeViewControl.xaml
+++ b/BeWo/View/Controls/ComboBoxTreeViewControl.xaml
@@ -67,7 +67,7 @@
Click="Bd_OnClick" />
diff --git a/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs b/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs
index cc0b65c3c..0d40e81a1 100644
--- a/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs
+++ b/BeWo/View/Controls/ComboBoxTreeViewControl.xaml.cs
@@ -47,7 +47,7 @@ namespace BeWo.View.Controls
var allSelected = selectedGoals.Count == GoalCount && GoalCount > 0;
- var ToolTipString = selectedGoals.Aggregate(string.Empty, (s, dc) => s + (dc.TypeDescription + "; "));
+ var ToolTipString = selectedGoals.Aggregate(string.Empty, (s, dc) => s + (dc.DisplayName + "; "));
DeSelectAllCheckBox.IsChecked = allSelected;
diff --git a/BeWo/View/Controls/ListboxSelectControl.xaml b/BeWo/View/Controls/ListboxSelectControl.xaml
new file mode 100644
index 000000000..2290b72c1
--- /dev/null
+++ b/BeWo/View/Controls/ListboxSelectControl.xaml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/BeWo/View/Controls/ListboxSelectControl.xaml.cs b/BeWo/View/Controls/ListboxSelectControl.xaml.cs
new file mode 100644
index 000000000..96c732c4e
--- /dev/null
+++ b/BeWo/View/Controls/ListboxSelectControl.xaml.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Web.UI.WebControls;
+using System.Windows;
+using System.Windows.Documents;
+using BeWo.Annotations;
+
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+
+namespace BeWo.View.Controls
+{
+ public partial class ListboxSelectControl
+ {
+ public event Action CancelButtonClicked;
+ public event Action SelectButtonClicked;
+
+ public ListboxSelectControl(List