diff --git a/.gitignore b/.gitignore
index 86bbd14f7..eac96fd63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -415,3 +415,5 @@ FodyWeavers.xsd
# JetBrains Rider
*.sln.iml
/ReportImp/RatPlusTat/CustomBudgetnachweisAnhangRO.cs
+/.claude/worktrees
+/.claude
diff --git a/BeWo/AI/View/AiTranskriptionView.xaml.cs b/BeWo/AI/View/AiTranskriptionView.xaml.cs
index 8108ca190..9cd82b623 100644
--- a/BeWo/AI/View/AiTranskriptionView.xaml.cs
+++ b/BeWo/AI/View/AiTranskriptionView.xaml.cs
@@ -220,6 +220,7 @@ namespace BeWo.AI.View
PanelAnimation.Visibility = Visibility.Hidden;
ButtonText.Text = "Neue Aufnahme starten";
+ lblStatus.Content = "";
}
},
this.Dispatcher).Start();
diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 503ffac42..4f8390765 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -43,12 +43,12 @@
de-DE
BeWoPlaner
ownSoft GmbH
- 2.0.1.292
+ 2.0.1.293
true
publish.htm
false
true
- 293
+ 294
2.0.1.%2a
false
true
@@ -3808,6 +3808,9 @@
app.config
+
+
+
diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index dcdcf5497..302a615e5 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -56,7 +56,7 @@ namespace BeWo
public static LoginControl LoginControl;
public static MainControl MainControl;
- public static string ShortVersion = "3.30";
+ public static string ShortVersion = "3.30.2";
public static string Version => BeWoAppInfo.BeWoAppVersion.ToString();
public static int RenderTier = 0;
@@ -658,8 +658,8 @@ namespace BeWo
AppSettings.AllowStorno = true;
AppSettings.AllowXRechnung = true;
- //AppSettings.ShowAI = false;
- //AppSettings.ShowAIVoice = false;
+ AppSettings.ShowAI = true;
+ AppSettings.ShowAIVoice = true;
AppSettings.ShowWorktime = true;
AppSettings.ShowPersehImport = true;
diff --git a/BeWo/BeWoAppInfo.cs b/BeWo/BeWoAppInfo.cs
index 16e961ad8..f67e545ca 100644
--- a/BeWo/BeWoAppInfo.cs
+++ b/BeWo/BeWoAppInfo.cs
@@ -18,6 +18,11 @@ namespace BeWo
var stageVersion = new Version("4.5");
var feature = BeWoClientFeature.AI;
+#if !DEBUG
+ stage = BeWoClientReleaseStage.Release;
+ feature = BeWoClientFeature.None;
+#endif
+
BeWoAppVersion = new BeWoAppVersion(baseVersion, stage, stageVersion, feature);
}
diff --git a/BeWo/LoginControl.xaml.cs b/BeWo/LoginControl.xaml.cs
index d2ce24d6e..5ae66594e 100644
--- a/BeWo/LoginControl.xaml.cs
+++ b/BeWo/LoginControl.xaml.cs
@@ -273,6 +273,14 @@ namespace BeWo
private static String PUB_KEY_R13 = "00a567708dd0568164151761cdb906d4ad19908c2650379816639254dbd9cc840593ecd3ec081ba0605143487d2bc748969eb42dda9dc8273b57a19fabf0d60ed40e30ca6f9bb1d1d6a49d323e584e356f4558687117fc3ed85d82a02fb2516cb01a5db859ce3565c88ba1af1037ffe39c5dc2491734ff8c2b8b8df0bc712c930c1d05c4bac7cdaac95e7cd1c901f79c03f6fc0a5df4da7be6db764270ebf44d22da00776fd6c95f17fdda752ea5570cf6ea5cb6e073a568cfa174e275827e109fc1f5a2eb01e938b10a44ccd3c289f54935820a34b31ce988c2474e820e0a36f0474f8af1290475dacde19a5cff5e9d9895ba9a43d04aa21705010430d332b38f";
+ private static String PUB_KEY_YE1 = "0407655075fe68a695ada17d2babca549c8cf31968e2572f3fcd9c0736b32966f160f2854f42729fb3012422e6f4b0186263486925903f5f74f47c1a9c8320e2230847eb9dbb7fbfe65210f2cb1066da33a11c7036cdee9f71b5e226d80bdffabc";
+
+ private static String PUB_KEY_YE2 = "04719ab43391d6c410bdcca97b7774942db58738edac647434c7b9de533ea336cf9b920f97269345ab1e5597be796fa812ea881df8925bb121b98cc808aadff603e9ef34fef576e7d2bc5d021d8c55e5a1839ad26214ef57fb1d0d3d3ef603970f";
+
+ private static String PUB_KEY_YR1 = "00a158bc5f6c42620317bc9c4d3caa7fa05d7750c8263c0041d3b5422cd0eda179adf65b8464d252055d745724f53f3e8b0fc66ad5dda0738dd6365d40751ae3e2c1276b36ce8b3d273e9986069da1ba2e3da19b43218eb074a799022e416cd536d021fa45204130b490f5c5eb1fc77176fe0f009e39b2c18c2faf14484dc1b230b66ba70037d2f90a05d52108b9b5f3624cfa05659dd2d0e957a8b9a6b5d57de6e75601be5be9efc5e3d0e20ac1f4634d0083bd815486f5873ca798a7be5f49844414edb1bdc1c26a55f62a5e06330ba11fc3f5c1f11d0096a22e654e65f0634d79279ac67a5cf59d98c9bb1736922a1a5f6f572419e13243f9df5ad2746e6e33";
+
+ private static String PUB_KEY_YR2 = "00d9d0bc70069a6a87ce25baa31ead5fde78bfdf5d0ee62d042fd4b9e958a65bcaf1a9c7ac21e807e7b2502717a7b04e470703e8123a806f9b70df9b4e80b86885f8a46eb787c0728c2a9c0410096f7cf903cffde3afff0ba0ec8ca4e0d90ec5fd88ea0d9fe794fa9c9a0e4cb15cba4791abcd091901186a7f9d3c5afd38652040ada118a80d916f3ba5aa69b0e02e50972ba18851b79b948ace2a6998ab7a2b1ebb7da0cc324d04088ab6cbdde875f8bf6e5ba6444d712fc1fc6b5cf6455b5290fed8f2cfc5d7a2dd38a6e79938b5f0045f00f6ab288f4f1ad336aea537e00caf983673574daa4393c23c5e57a2f99693f5ac6898bcb9d168f94eab26513d6fb9";
+
private bool PinPublicKey(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslpolicyerrors)
{
try
@@ -296,7 +304,11 @@ namespace BeWo
pk.Contains(PUB_KEY_R10.ToLower()) ||
pk.Contains(PUB_KEY_R11.ToLower()) ||
pk.Contains(PUB_KEY_R12.ToLower()) ||
- pk.Contains(PUB_KEY_R13.ToLower()))
+ pk.Contains(PUB_KEY_R13.ToLower()) ||
+ pk.Contains(PUB_KEY_YE1.ToLower()) ||
+ pk.Contains(PUB_KEY_YE2.ToLower()) ||
+ pk.Contains(PUB_KEY_YR1.ToLower()) ||
+ pk.Contains(PUB_KEY_YR2.ToLower()))
{
chainContainsPk = true;
}
diff --git a/BeWo/Ressources/Icons/bewoplaner_haus.png b/BeWo/Ressources/Icons/bewoplaner_haus.png
new file mode 100644
index 000000000..968cc3582
Binary files /dev/null and b/BeWo/Ressources/Icons/bewoplaner_haus.png differ
diff --git a/BeWo/Styles/Colors/Colors.xaml b/BeWo/Styles/Colors/Colors.xaml
index 76c1162e0..51dbd3d25 100644
--- a/BeWo/Styles/Colors/Colors.xaml
+++ b/BeWo/Styles/Colors/Colors.xaml
@@ -106,13 +106,29 @@
+
+ #FFFFFFFF
+ #FFD2D2D2
+
+ #FFD2D2D2
+ #FFA0A0A0
+
+ #FF111111
+ #FF777777
+
#ffaaaaaa
#FFD7DADB
#FF92A9B3
- #FF5C1919
+
+
+ #FFC80000
+ #FFD7DADB
+ #FF92A9B3
+ #FF111111
+ #FF555555
#FF5C1919
#FF993B3B
@@ -136,14 +152,6 @@
#FFC8C000
#FF706000
- #FFFFFFFF
- #FFD2D2D2
-
- #FFD2D2D2
- #FFA0A0A0
-
- #FF111111
- #FF777777
diff --git a/BeWo/Styles/ControlStyles/LabelStyles.xaml b/BeWo/Styles/ControlStyles/LabelStyles.xaml
index ccaf8b845..0e839e401 100644
--- a/BeWo/Styles/ControlStyles/LabelStyles.xaml
+++ b/BeWo/Styles/ControlStyles/LabelStyles.xaml
@@ -31,4 +31,19 @@
+
+
\ No newline at end of file
diff --git a/BeWo/Styles/DataTemplates/ControlTemplates.xaml b/BeWo/Styles/DataTemplates/ControlTemplates.xaml
index b69ac26a7..4ff63f5f2 100644
--- a/BeWo/Styles/DataTemplates/ControlTemplates.xaml
+++ b/BeWo/Styles/DataTemplates/ControlTemplates.xaml
@@ -108,13 +108,13 @@
+ Height="6"
+ Background="{DynamicResource NavigationHeaderBrush}">
+ Background="{DynamicResource NavigationContentBrush}">
+
+
+
@@ -150,22 +155,22 @@
+ Source="..\..\Ressources\Icons\bewoplaner_haus.png" />
@@ -177,28 +182,9 @@
-
-
-
+ Text="{Binding DurationSec, StringFormat=Nachgedacht für {0} Sekunden}">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+ SystemPrompt
+
+
+
@@ -252,7 +282,7 @@
Width="auto"
Margin="30,0,0,0"
HorizontalAlignment="Right"
- Background="#15000000"
+ Background="#DEFFFFFF"
BorderBrush="Black"
BorderThickness="0"
CornerRadius="15, 15, 15, 15"
diff --git a/BeWo/View/Controls/AI/AiConversationButton.xaml.cs b/BeWo/View/Controls/AI/AiConversationButton.xaml.cs
index 6f0fd16bb..897933012 100644
--- a/BeWo/View/Controls/AI/AiConversationButton.xaml.cs
+++ b/BeWo/View/Controls/AI/AiConversationButton.xaml.cs
@@ -148,7 +148,7 @@ namespace BeWo.View.Controls.AI
{
var control = (AiConversationButton)d;
var actionType = (AiActionType)e.NewValue;
- if (BeWoApp.AppSettings.ShowAI)
+ if (BeWoApp.AppSettings.ShowAI && BeWoApp.HasLoggedOnUserRight(UserRightType.AiModulePromptbausteineView))
{
ServiceFacade.DoAiEnhancedServiceAsnyc(x => x.GetAiPromptbausteinFolder(actionType), folders => control.InitPromptbausteine(actionType, folders));
}
diff --git a/BeWo/View/Controls/AI/AiPromptbausteinButton.xaml.cs b/BeWo/View/Controls/AI/AiPromptbausteinButton.xaml.cs
index 7aba4148f..c91d88dd4 100644
--- a/BeWo/View/Controls/AI/AiPromptbausteinButton.xaml.cs
+++ b/BeWo/View/Controls/AI/AiPromptbausteinButton.xaml.cs
@@ -167,7 +167,7 @@ namespace BeWo.View.Controls.AI
{
ActionType = actionType;
- if (!BeWoApp.AppSettings.ShowAI)
+ if (!BeWoApp.AppSettings.ShowAI || !BeWoApp.HasLoggedOnUserRight(UserRightType.AiModulePromptbausteineView))
{
State = AiPromptbausteinButtonState.Hidden;
return;
diff --git a/BeWo/View/Detail/AI/AiConfigView.xaml b/BeWo/View/Detail/AI/AiConfigView.xaml
index dc82d2e8c..671ff81fc 100644
--- a/BeWo/View/Detail/AI/AiConfigView.xaml
+++ b/BeWo/View/Detail/AI/AiConfigView.xaml
@@ -25,8 +25,10 @@
-
-
+
+
@@ -34,7 +36,7 @@
HorizontalAlignment="Left"
FontFamily="Microsoft Sans Serif"
FontSize="14"
- Foreground="#FFFFFF"
+ Foreground="Black"
Text="KI Module Einstellungen" />
@@ -103,7 +104,7 @@
-
+
-->
-
+
+
+
+ BeWo Serverstatus
+ Tenant: –
+ Serverzeit: –
+ Version: –
+ Datenbank: –
+
+ Services
+
+ | Service | Status | Meldung |
+
+
+
+
+
+