From 32296f7d155da8b39feb55cb0b183ae808a04ced Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 29 Mar 2024 10:13:23 +0100
Subject: [PATCH] Change history Part 3

Finished layout of history control, reversed sort order (newest on top)
May need to move labels to HistoryDialog
---
 src/BreCalClient/BreCalClient.licenseheader   |  4 +--
 src/BreCalClient/HistoryControl.xaml          | 32 +++++++++++++++++++
 src/BreCalClient/HistoryControl.xaml.cs       | 27 ++++++++++++++++
 src/BreCalClient/HistoryDialog.xaml.cs        | 31 ++++++++++--------
 .../Resources/Resources.Designer.cs           | 27 ++++++++++++++++
 src/BreCalClient/Resources/Resources.de.resx  |  9 ++++++
 src/BreCalClient/Resources/Resources.resx     |  9 ++++++
 7 files changed, 124 insertions(+), 15 deletions(-)
 create mode 100644 src/BreCalClient/HistoryControl.xaml
 create mode 100644 src/BreCalClient/HistoryControl.xaml.cs

diff --git a/src/BreCalClient/BreCalClient.licenseheader b/src/BreCalClient/BreCalClient.licenseheader
index 82bf51d..ae39ce3 100644
--- a/src/BreCalClient/BreCalClient.licenseheader
+++ b/src/BreCalClient/BreCalClient.licenseheader
@@ -1,12 +1,12 @@
 extensions: designer.cs generated.cs
 extensions: .cs .cpp .h
-// Copyright (c) 2023 schick Informatik
+// Copyright (c) 2024- schick Informatik
 // Description:
 // 
 
 extensions: .aspx .ascx
 <%-- 
-Copyright (c) 2023 schick Informatik
+Copyright (c) 2024- schick Informatik
 --%>
 extensions: .vb
 'Sample license text.
diff --git a/src/BreCalClient/HistoryControl.xaml b/src/BreCalClient/HistoryControl.xaml
new file mode 100644
index 0000000..90c87f6
--- /dev/null
+++ b/src/BreCalClient/HistoryControl.xaml
@@ -0,0 +1,32 @@
+<UserControl x:Class="BreCalClient.HistoryControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:BreCalClient"
+             xmlns:p = "clr-namespace:BreCalClient.Resources"
+             mc:Ignorable="d" 
+             d:DesignHeight="46" d:DesignWidth="800">
+    <Border BorderBrush="Black" BorderThickness="0 0 0 .5">
+        <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="14" />
+            <RowDefinition Height="25" />
+        </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width=".25*" />
+                <ColumnDefinition Width=".25*" />
+                <ColumnDefinition Width=".25*" />
+                <ColumnDefinition Width=".25*" />
+            </Grid.ColumnDefinitions>
+            <TextBlock Grid.Row="0" Grid.Column="0" FontSize="10" FontWeight="DemiBold" Text="{x:Static p:Resources.textShip}" VerticalAlignment="Center" Foreground="Gray" />
+            <TextBlock Grid.Row="0" Grid.Column="1" FontSize="10" FontWeight="DemiBold" Text="{x:Static p:Resources.textTimestamp}" VerticalAlignment="Center" Foreground="Gray"/>
+            <TextBlock Grid.Row="0" Grid.Column="2" FontSize="10" FontWeight="DemiBold" Text="{x:Static p:Resources.textOperation}" VerticalAlignment="Center" Foreground="Gray"/>
+            <TextBlock Grid.Row="0" Grid.Column="3" FontSize="10" FontWeight="DemiBold" Text="{x:Static p:Resources.textParticipant}" VerticalAlignment="Center" Foreground="Gray"/>
+            <TextBlock Grid.Row="1" Grid.Column="0" x:Name="textBlockShip" FontWeight="DemiBold" />
+            <TextBlock Grid.Row="1" Grid.Column="1" x:Name="textBlockTimestamp" />
+            <TextBlock Grid.Row="1" Grid.Column="2" x:Name="textBlockOperation" />
+            <TextBlock Grid.Row="1" Grid.Column="3" x:Name="textBlockParticipant" />
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/src/BreCalClient/HistoryControl.xaml.cs b/src/BreCalClient/HistoryControl.xaml.cs
new file mode 100644
index 0000000..caa0d72
--- /dev/null
+++ b/src/BreCalClient/HistoryControl.xaml.cs
@@ -0,0 +1,27 @@
+// Copyright (c) 2024- schick Informatik
+// Description: display single history element (later shown in a list)
+// 
+
+using BreCalClient.misc.Model;
+using System.Windows.Controls;
+
+namespace BreCalClient
+{
+    /// <summary>
+    /// Interaction logic for HistoryControl.xaml
+    /// </summary>
+    public partial class HistoryControl : UserControl
+    {
+        public HistoryControl(string ship, History history)
+        {
+            InitializeComponent();
+
+            this.textBlockOperation.Text = $"{history.Operation} on {history.Type}";
+            this.textBlockShip.Text = ship;
+            if(BreCalLists.ParticipantLookupDict.ContainsKey(history.ParticipantId))
+                this.textBlockParticipant.Text = BreCalLists.ParticipantLookupDict[history.ParticipantId].Name;
+            this.textBlockTimestamp.Text = history.Timestamp.ToString();
+
+        }
+    }
+}
diff --git a/src/BreCalClient/HistoryDialog.xaml.cs b/src/BreCalClient/HistoryDialog.xaml.cs
index 4b3f074..f348258 100644
--- a/src/BreCalClient/HistoryDialog.xaml.cs
+++ b/src/BreCalClient/HistoryDialog.xaml.cs
@@ -1,23 +1,12 @@
-// Copyright (c) 2023 schick Informatik
-// Description:
+// Copyright (c) 2024- schick Informatik
+// Description: Window to show (complete) list of current shipcall histories
 // 
 
 using BreCalClient.misc.Api;
 using BreCalClient.misc.Model;
-using System;
 using System.Collections.Concurrent;
 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.Shapes;
 
 namespace BreCalClient
 {
@@ -62,10 +51,26 @@ namespace BreCalClient
 
         private async void RefreshHistory()
         {
+            List<History> allHistories = new();
             foreach (int shipcall_id in _shipcalls.Keys)
             {
                 List<History> shipcallHistory = await _staticApi.HistoryGetAsync(shipcall_id);
                 System.Diagnostics.Trace.WriteLine($"{shipcallHistory.Count} history elements loaded for shipcall {shipcall_id}");
+                allHistories.AddRange( shipcallHistory );
+            }
+
+            // sort all entries
+            allHistories.Sort((x, y) => { return y.Timestamp.CompareTo(x.Timestamp); });
+
+            // create controls for all entries
+            foreach (History history in allHistories)
+            {
+                string shipname = "";
+                Ship? ship = this._shipcalls[history.ShipcallId].Ship;
+                if (ship != null)
+                    shipname = ship.Name;
+                HistoryControl hc = new(shipname, history);
+                this.stackPanel.Children.Add(hc);
             }
         }
 
diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs
index d3ae93d..d352e3c 100644
--- a/src/BreCalClient/Resources/Resources.Designer.cs
+++ b/src/BreCalClient/Resources/Resources.Designer.cs
@@ -717,6 +717,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Operation.
+        /// </summary>
+        public static string textOperation {
+            get {
+                return ResourceManager.GetString("textOperation", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Operations end.
         /// </summary>
@@ -744,6 +753,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Participant.
+        /// </summary>
+        public static string textParticipant {
+            get {
+                return ResourceManager.GetString("textParticipant", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Participants.
         /// </summary>
@@ -987,6 +1005,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Timestamp.
+        /// </summary>
+        public static string textTimestamp {
+            get {
+                return ResourceManager.GetString("textTimestamp", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to to.
         /// </summary>
diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx
index a5e4165..774c98e 100644
--- a/src/BreCalClient/Resources/Resources.de.resx
+++ b/src/BreCalClient/Resources/Resources.de.resx
@@ -457,4 +457,13 @@
   <data name="textShowHistory" xml:space="preserve">
     <value>Änderungshistorie der Anläufe anzeigen</value>
   </data>
+  <data name="textOperation" xml:space="preserve">
+    <value>Vorgang</value>
+  </data>
+  <data name="textParticipant" xml:space="preserve">
+    <value>Teilnehmer</value>
+  </data>
+  <data name="textTimestamp" xml:space="preserve">
+    <value>Zeitpunkt</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx
index 4a55bf0..7bf17cf 100644
--- a/src/BreCalClient/Resources/Resources.resx
+++ b/src/BreCalClient/Resources/Resources.resx
@@ -331,6 +331,9 @@
   <data name="textOldPassword" xml:space="preserve">
     <value>Old password</value>
   </data>
+  <data name="textOperation" xml:space="preserve">
+    <value>Operation</value>
+  </data>
   <data name="textOperationsEnd" xml:space="preserve">
     <value>Operations end</value>
   </data>
@@ -340,6 +343,9 @@
   <data name="textOutgoing" xml:space="preserve">
     <value>Outgoing</value>
   </data>
+  <data name="textParticipant" xml:space="preserve">
+    <value>Participant</value>
+  </data>
   <data name="textParticipants" xml:space="preserve">
     <value>Participants</value>
   </data>
@@ -421,6 +427,9 @@
   <data name="textTidalWindow" xml:space="preserve">
     <value>Tidal window</value>
   </data>
+  <data name="textTimestamp" xml:space="preserve">
+    <value>Timestamp</value>
+  </data>
   <data name="textTo" xml:space="preserve">
     <value>to</value>
   </data>