From 1243ebf9e707dbaca18f55da112375a9b1f841bb Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 5 Sep 2024 06:49:25 +0200
Subject: [PATCH] Adjusted error formatting and bumped test version to 1.5.0.1

---
 src/BreCalClient/BreCalClient.csproj             |  4 ++--
 src/BreCalClient/MainWindow.xaml.cs              | 16 +++++++++++++++-
 .../PublishProfiles/ClickOnceTestProfile.pubxml  |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index ffda91f..3d00ee0 100644
--- a/src/BreCalClient/BreCalClient.csproj
+++ b/src/BreCalClient/BreCalClient.csproj
@@ -8,8 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <StartupObject>BreCalClient.App</StartupObject>
     <AssemblyOriginatorKeyFile>..\..\misc\brecal.snk</AssemblyOriginatorKeyFile>
-    <AssemblyVersion>1.5.0.0</AssemblyVersion>
-    <FileVersion>1.5.0.0</FileVersion>
+    <AssemblyVersion>1.5.0.1</AssemblyVersion>
+    <FileVersion>1.5.0.1</FileVersion>
     <Title>Bremen calling client</Title>
     <Description>A Windows WPF client for the Bremen calling API.</Description>
     <ApplicationIcon>containership.ico</ApplicationIcon>
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index 2152c96..5b21164 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -1072,7 +1072,21 @@ namespace BreCalClient
                     dynamic? msg = JsonConvert.DeserializeObject(m.Value);
                     if (msg != null)
                     {
-                        message = msg.message;
+                        if (msg.message != null)
+                        {
+                            caption = $"{caption}: {msg.message}";
+                        } 
+                                                
+                        if((msg.errors != null) && msg.errors.Count > 0)
+                        {
+                            message = "";
+                            foreach(string error in msg.errors)
+                            {
+                                message += error;
+                                message += Environment.NewLine;
+                            }
+                        }
+                        
                     }
                 }
                 catch (Exception) { }
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
index 6b9c078..8d71e33 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceTestProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.5.0.0</ApplicationVersion>
+    <ApplicationVersion>1.5.0.1</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>