diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 10f54c9cf..f4c824e44 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -39,16 +39,16 @@
false
true
false
- https://app.ownsoft.de/test/
+ https://app.ownsoft.de/
de-DE
BeWoPlaner
ownSoft GmbH
- 2.0.1.266
+ 2.0.1.268
true
publish.htm
false
true
- 267
+ 269
2.0.1.%2a
false
true
@@ -96,7 +96,6 @@
-
@@ -3559,6 +3558,8 @@
+
+
diff --git a/BeWo/BeWo.csproj.user b/BeWo/BeWo.csproj.user
index c3f5d6713..060d57d23 100644
--- a/BeWo/BeWo.csproj.user
+++ b/BeWo/BeWo.csproj.user
@@ -2,7 +2,7 @@
D:\Projects\beyondsoft\BeWoPlaner\Publish\|publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\
- https://app.ownsoft.de/test/|https://app.ownsoft.de/|https://app.ownsoft.de/dev/|http://app.ownsoft.de/dev/|http://app.beyondsoft.de/dev/
+ https://app.ownsoft.de/|https://app.ownsoft.de/test/|https://app.ownsoft.de/dev/|http://app.ownsoft.de/dev/|http://app.beyondsoft.de/dev/
https://app.ownsoft.de/|https://app.ownsoft.de/bewoplaner.application/
diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index f7f9ae6f4..2bae0584b 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -58,7 +58,7 @@ namespace BeWo
public static string ShortVersion = "3.26";
- public static string Version = "Version 3.26 Test";
+ public static string Version = "Version 3.26";
public static int RenderTier = 0;
public static bool IsInDesignMode = DesignerProperties.GetIsInDesignMode(new DependencyObject());
diff --git a/BeWo/Converter/Features/AiConversationMessageSystemConverter.cs b/BeWo/Converter/Features/AiConversationMessageSystemConverter.cs
deleted file mode 100644
index 9b27509d5..000000000
--- a/BeWo/Converter/Features/AiConversationMessageSystemConverter.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using BeWo.View.Navigation.Filter;
-using BS.Shared.DataContracts;
-using BS.Shared;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-using BeWo.ViewModel;
-
-namespace BeWo.Converter.Features
-{
- public class AiConversationMessageSystemConverter : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- if (BeWoApp.IsInDeveloperMode)
- return value;
-
- var ret = (value as IEnumerable).Where(vm => vm.Role != AiConversationMessageRole.System);
-
- return ret;
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- throw new NotImplementedException();
- }
- }
-}
diff --git a/BeWo/DebugConfig.cs b/BeWo/DebugConfig.cs
index ef82c0ab7..90b48f5b2 100644
--- a/BeWo/DebugConfig.cs
+++ b/BeWo/DebugConfig.cs
@@ -146,11 +146,11 @@ namespace BeWo
{
DebugConfigMode = DebugConfigMode.FeatureAiModule,
AutoLogin = true,
- //SelectView = UIContext.AiConversation,
+ SelectView = UIContext.Customer,
//SelectIndex = 8,
- //DefaultLoginUsername = "m1",
- //DefaultLoginPassword = "bewobewo",
- //DefaultProfilename = "5000000000",
+ DefaultLoginUsername = "m1",
+ DefaultLoginPassword = "bewobewo",
+ DefaultProfilename = "5000000000",
EnableAutoRemoteDebugging = true
});
diff --git a/BeWo/MainControl.xaml.cs b/BeWo/MainControl.xaml.cs
index 83572c52f..8434fb235 100644
--- a/BeWo/MainControl.xaml.cs
+++ b/BeWo/MainControl.xaml.cs
@@ -178,7 +178,7 @@ namespace BeWo
}
- if (BeWoApp.LoggedOnUser != null && BeWoApp.LoggedOnUser.HasRight(UserRightType.DocumentsAllowViewAll))
+ if (BeWoApp.LoggedOnUser != null && BeWoApp.LoggedOnUser.HasRight(UserRightType.DocumentsAllowViewAll) && BeWoApp.AppSettings.ShowWohnhilfe)
{
this.button_Dokumente.Visibility = Visibility.Visible;
}
diff --git a/BeWo/View/Detail/AI/AiConversationChatView.xaml b/BeWo/View/Detail/AI/AiConversationChatView.xaml
index 5bf69aca8..6d6f990d4 100644
--- a/BeWo/View/Detail/AI/AiConversationChatView.xaml
+++ b/BeWo/View/Detail/AI/AiConversationChatView.xaml
@@ -3,7 +3,6 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ai="clr-namespace:BeWo.View.Detail.AI"
- xmlns:conv="clr-namespace:BeWo.Converter.Features"
xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
@@ -31,7 +30,6 @@
-
@@ -114,7 +112,7 @@
+ SelectionChanged="listview_conversations_SelectionChanged">