From 542b495d95f95ac0499effe3fe89999f51ebbebb Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Wed, 16 Aug 2023 16:06:15 +0200
Subject: [PATCH] fixed yaml and added additional input fields

---
 misc/BreCalApi.cs                             | 99 ++++++++++++++-----
 misc/BreCalApi.yaml                           | 15 ++-
 src/BreCalClient/EditShipcallControl.xaml     | 31 ++++++
 src/BreCalClient/EditShipcallControl.xaml.cs  |  8 ++
 src/BreCalClient/MainWindow.xaml.cs           |  6 +-
 .../Resources/Resources.Designer.cs           | 65 +++++++++++-
 src/BreCalClient/Resources/Resources.de.resx  | 15 +++
 src/BreCalClient/Resources/Resources.resx     | 23 ++++-
 src/BreCalClient/SearchFilterControl.xaml     |  4 +-
 src/BreCalClient/SearchFilterControl.xaml.cs  |  5 +
 10 files changed, 239 insertions(+), 32 deletions(-)

diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs
index c64a353..c0f8c34 100644
--- a/misc/BreCalApi.cs
+++ b/misc/BreCalApi.cs
@@ -1,7 +1,7 @@
 
 //----------------------
 // <auto-generated>
-//     Generated REST API Client Code Generator v1.7.17.0 on 16.08.2023 11:42:30
+//     Generated REST API Client Code Generator v1.7.17.0 on 16.08.2023 15:05:44
 //     Using the tool OpenAPI Generator v6.6.0
 // </auto-generated>
 //----------------------
@@ -4704,13 +4704,19 @@ namespace BreCalClient.misc.Model
         /// Initializes a new instance of the <see cref="Berth" /> class.
         /// </summary>
         /// <param name="id">id.</param>
-        /// <param name="name1">name1.</param>
-        /// <param name="name2">name2.</param>
-        public Berth(int id = default(int), string name1 = default(string), string name2 = default(string))
+        /// <param name="name">name.</param>
+        /// <param name="participantId">participantId.</param>
+        /// <param name="_lock">_lock.</param>
+        /// <param name="created">created.</param>
+        /// <param name="modified">modified.</param>
+        public Berth(int id = default(int), string name = default(string), int? participantId = default(int?), bool? _lock = default(bool?), DateTime created = default(DateTime), DateTime? modified = default(DateTime?))
         {
             this.Id = id;
-            this.Name1 = name1;
-            this.Name2 = name2;
+            this.Name = name;
+            this.ParticipantId = participantId;
+            this.Lock = _lock;
+            this.Created = created;
+            this.Modified = modified;
         }
         /// <summary>
         /// Gets or Sets Id
@@ -4718,15 +4724,30 @@ namespace BreCalClient.misc.Model
         [DataMember(Name = "id", EmitDefaultValue = true)]
         public int Id { get; set; }
         /// <summary>
-        /// Gets or Sets Name1
+        /// Gets or Sets Name
         /// </summary>
-        [DataMember(Name = "name1", EmitDefaultValue = true)]
-        public string Name1 { get; set; }
+        [DataMember(Name = "name", EmitDefaultValue = true)]
+        public string Name { get; set; }
         /// <summary>
-        /// Gets or Sets Name2
+        /// Gets or Sets ParticipantId
         /// </summary>
-        [DataMember(Name = "name2", EmitDefaultValue = true)]
-        public string Name2 { get; set; }
+        [DataMember(Name = "participant_id", EmitDefaultValue = true)]
+        public int? ParticipantId { get; set; }
+        /// <summary>
+        /// Gets or Sets Lock
+        /// </summary>
+        [DataMember(Name = "lock", EmitDefaultValue = true)]
+        public bool? Lock { get; set; }
+        /// <summary>
+        /// Gets or Sets Created
+        /// </summary>
+        [DataMember(Name = "created", EmitDefaultValue = true)]
+        public DateTime Created { get; set; }
+        /// <summary>
+        /// Gets or Sets Modified
+        /// </summary>
+        [DataMember(Name = "modified", EmitDefaultValue = true)]
+        public DateTime? Modified { get; set; }
         /// <summary>
         /// Returns the string presentation of the object
         /// </summary>
@@ -4736,8 +4757,11 @@ namespace BreCalClient.misc.Model
             StringBuilder sb = new StringBuilder();
             sb.Append("class Berth {\n");
             sb.Append("  Id: ").Append(Id).Append("\n");
-            sb.Append("  Name1: ").Append(Name1).Append("\n");
-            sb.Append("  Name2: ").Append(Name2).Append("\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("  ParticipantId: ").Append(ParticipantId).Append("\n");
+            sb.Append("  Lock: ").Append(Lock).Append("\n");
+            sb.Append("  Created: ").Append(Created).Append("\n");
+            sb.Append("  Modified: ").Append(Modified).Append("\n");
             sb.Append("}\n");
             return sb.ToString();
         }
@@ -4775,14 +4799,29 @@ namespace BreCalClient.misc.Model
                     this.Id.Equals(input.Id)
                 ) && 
                 (
-                    this.Name1 == input.Name1 ||
-                    (this.Name1 != null &&
-                    this.Name1.Equals(input.Name1))
+                    this.Name == input.Name ||
+                    (this.Name != null &&
+                    this.Name.Equals(input.Name))
                 ) && 
                 (
-                    this.Name2 == input.Name2 ||
-                    (this.Name2 != null &&
-                    this.Name2.Equals(input.Name2))
+                    this.ParticipantId == input.ParticipantId ||
+                    (this.ParticipantId != null &&
+                    this.ParticipantId.Equals(input.ParticipantId))
+                ) && 
+                (
+                    this.Lock == input.Lock ||
+                    (this.Lock != null &&
+                    this.Lock.Equals(input.Lock))
+                ) && 
+                (
+                    this.Created == input.Created ||
+                    (this.Created != null &&
+                    this.Created.Equals(input.Created))
+                ) && 
+                (
+                    this.Modified == input.Modified ||
+                    (this.Modified != null &&
+                    this.Modified.Equals(input.Modified))
                 );
         }
         /// <summary>
@@ -4795,13 +4834,25 @@ namespace BreCalClient.misc.Model
             {
                 int hashCode = 41;
                 hashCode = (hashCode * 59) + this.Id.GetHashCode();
-                if (this.Name1 != null)
+                if (this.Name != null)
                 {
-                    hashCode = (hashCode * 59) + this.Name1.GetHashCode();
+                    hashCode = (hashCode * 59) + this.Name.GetHashCode();
                 }
-                if (this.Name2 != null)
+                if (this.ParticipantId != null)
                 {
-                    hashCode = (hashCode * 59) + this.Name2.GetHashCode();
+                    hashCode = (hashCode * 59) + this.ParticipantId.GetHashCode();
+                }
+                if (this.Lock != null)
+                {
+                    hashCode = (hashCode * 59) + this.Lock.GetHashCode();
+                }
+                if (this.Created != null)
+                {
+                    hashCode = (hashCode * 59) + this.Created.GetHashCode();
+                }
+                if (this.Modified != null)
+                {
+                    hashCode = (hashCode * 59) + this.Modified.GetHashCode();
                 }
                 return hashCode;
             }
diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml
index c7fbdce..254c462 100644
--- a/misc/BreCalApi.yaml
+++ b/misc/BreCalApi.yaml
@@ -437,10 +437,21 @@ components:
       properties:
         id:
           type: integer
-        name1:
+        name:
           type: string
-        name2:
+        participant_id:
+          type: integer
+          nullable: true
+        lock:
+          type: boolean
+          nullable: true
+        created:
           type: string
+          format: date-time
+        modified:
+          type: string
+          format: date-time
+          nullable: true
 
     berth_list:
       type: array
diff --git a/src/BreCalClient/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml
index e6da3af..864dd16 100644
--- a/src/BreCalClient/EditShipcallControl.xaml
+++ b/src/BreCalClient/EditShipcallControl.xaml
@@ -29,6 +29,37 @@
             <RowDefinition Height="28" />
         </Grid.RowDefinitions>
 
+        <Label Content="{x:Static p:Resources.textShip}" Grid.Column="0" Grid.Row="0" />
+        <Label Content="{x:Static p:Resources.textType}" Grid.Column="0" Grid.Row="1" />
+        <Label Content="ETA" Grid.Column="0" Grid.Row="2" />
+        <Label Content="{x:Static p:Resources.textVoyage}" Grid.Column="0" Grid.Row="3" />
+        <Label Content="ETD" Grid.Column="0" Grid.Row="4" />
+        <Label Content="{x:Static p:Resources.textArrivalTerminal}" Grid.Column="0" Grid.Row="5" />
+        <Label Content="{x:Static p:Resources.textDepartureTerminal}" Grid.Column="0" Grid.Row="6" />
+
+        <ComboBox x:Name="comboBoxShip" Margin="2" Grid.Column="1" Grid.Row="0" >
+            <ComboBox.ItemTemplate>
+                <DataTemplate>
+                    <!--Border-->
+                        <TextBlock>
+                            <TextBlock.Text>
+                                <MultiBinding StringFormat="{}{0} ({1})">
+                                    <Binding Path="Name" />
+                                    <Binding Path="Imo" />
+                                </MultiBinding>
+                            </TextBlock.Text>
+                        </TextBlock>
+                    <!--/Border-->
+                </DataTemplate>
+            </ComboBox.ItemTemplate>
+        </ComboBox>
+        <ComboBox x:Name="comboBoxCategories" Grid.Column="1" Margin="2" Grid.Row="1" />
+        <xctk:DateTimePicker x:Name="datePickerETA" Grid.Column="1" Grid.Row="2" Margin="2" />
+        <TextBox x:Name="textBoxVoyage" Grid.Column="1" Grid.Row="3" Margin="2" VerticalContentAlignment="Center" />
+        <xctk:DateTimePicker x:Name="datePickerETD" Grid.Column="1" Grid.Row="4" Margin="2" />
+        <ComboBox Name="comboBoxArrivalBerth" Grid.Column="1" Grid.Row="5" Margin="2" DisplayMemberPath="Name" />
+        <ComboBox Name="comboBoxDepartureBerth" Grid.Column="1" Grid.Row="6" Margin="2" DisplayMemberPath="Name" />
+
         <Label Content="{x:Static p:Resources.textParticipants}" FontWeight="DemiBold" Grid.Column="2" Grid.Row="0" />
         <Label Content="{x:Static p:Resources.textAgency}" Grid.Column="2" Grid.Row="1" />
         <Label Content="{x:Static p:Resources.textMooring}" Grid.Column="2" Grid.Row="2" />
diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index fd40810..ced0f09 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -34,6 +34,10 @@ namespace BreCalClient
 
         public List<Participant> Participants { get; set; } = new();
 
+        public List<Berth> Berths { get; set; } = new();
+
+        public List<Ship> Ships { get; set; } = new();
+
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             List<Participant> aList = new();
@@ -57,6 +61,10 @@ namespace BreCalClient
             this.comboBoxTug.ItemsSource = tList;
             this.comboBoxTerminal.ItemsSource = terList;
 
+            this.comboBoxShip.ItemsSource = Ships;
+            this.comboBoxCategories.ItemsSource = Enum.GetValues(typeof(Shipcall.TypeEnum));
+            this.comboBoxArrivalBerth.ItemsSource = this.Berths;
+            this.comboBoxDepartureBerth.ItemsSource = this.Berths;
         }
 
         private void buttonOK_Click(object sender, RoutedEventArgs e)
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index 4146447..b15167f 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -96,7 +96,9 @@ namespace BreCalClient
         {
             EditShipcallControl esc = new()
             {
-                Participants = this._participants
+                Participants = this._participants,
+                Ships = this._ships,
+                Berths = this._berths
             };
 
             if (esc.ShowDialog() ?? false)
@@ -180,7 +182,7 @@ namespace BreCalClient
                             if (this._shipLookupDict.ContainsKey(shipcall.ShipId))
                                 selectedSCMModel.Ship = this._shipLookupDict[shipcall.ShipId];
                             if (this._berthLookupDict.ContainsKey(shipcall.ArrivalBerthId ?? 0))
-                                selectedSCMModel.Berth = this._berthLookupDict[shipcall.ArrivalBerthId ?? 0].Name1;
+                                selectedSCMModel.Berth = this._berthLookupDict[shipcall.ArrivalBerthId ?? 0].Name;
 
                             _controlModels.Add(selectedSCMModel);
                             this.Dispatcher.Invoke(new Action(() =>
diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs
index 2bc7bc6..3c02483 100644
--- a/src/BreCalClient/Resources/Resources.Designer.cs
+++ b/src/BreCalClient/Resources/Resources.Designer.cs
@@ -188,6 +188,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Arrival terminal.
+        /// </summary>
+        public static string textArrivalTerminal {
+            get {
+                return ResourceManager.GetString("textArrivalTerminal", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Berth.
         /// </summary>
@@ -233,6 +242,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Departure terminal.
+        /// </summary>
+        public static string textDepartureTerminal {
+            get {
+                return ResourceManager.GetString("textDepartureTerminal", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Edit ship call.
         /// </summary>
@@ -350,6 +368,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Pilot required.
+        /// </summary>
+        public static string textPilotRequired {
+            get {
+                return ResourceManager.GetString("textPilotRequired", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Search.
         /// </summary>
@@ -359,6 +386,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Ship.
+        /// </summary>
+        public static string textShip {
+            get {
+                return ResourceManager.GetString("textShip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Ship length.
         /// </summary>
@@ -378,7 +414,7 @@ namespace BreCalClient.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to .
+        ///   Looks up a localized string similar to Terminal.
         /// </summary>
         public static string textTerminal {
             get {
@@ -404,6 +440,24 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Tug required.
+        /// </summary>
+        public static string textTugRequired {
+            get {
+                return ResourceManager.GetString("textTugRequired", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Type.
+        /// </summary>
+        public static string textType {
+            get {
+                return ResourceManager.GetString("textType", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to User login.
         /// </summary>
@@ -422,6 +476,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Voyage.
+        /// </summary>
+        public static string textVoyage {
+            get {
+                return ResourceManager.GetString("textVoyage", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx
index a472445..362a339 100644
--- a/src/BreCalClient/Resources/Resources.de.resx
+++ b/src/BreCalClient/Resources/Resources.de.resx
@@ -151,6 +151,9 @@
   <data name="textAgency" xml:space="preserve">
     <value>Agentur</value>
   </data>
+  <data name="textArrivalTerminal" xml:space="preserve">
+    <value>Terminal Ankunft</value>
+  </data>
   <data name="textBerth" xml:space="preserve">
     <value>Liegeplatz</value>
   </data>
@@ -166,6 +169,9 @@
   <data name="textCategories" xml:space="preserve">
     <value>Kategorien</value>
   </data>
+  <data name="textDepartureTerminal" xml:space="preserve">
+    <value>Terminal Abfahrt</value>
+  </data>
   <data name="textEditShipcall" xml:space="preserve">
     <value>Schiffsanlauf bearbeiten</value>
   </data>
@@ -208,6 +214,9 @@
   <data name="textSearch" xml:space="preserve">
     <value>Suche</value>
   </data>
+  <data name="textShip" xml:space="preserve">
+    <value>Schiff</value>
+  </data>
   <data name="textShipLength" xml:space="preserve">
     <value>Schiffslänge</value>
   </data>
@@ -223,12 +232,18 @@
   <data name="textTug" xml:space="preserve">
     <value>Schlepper</value>
   </data>
+  <data name="textType" xml:space="preserve">
+    <value>Typ</value>
+  </data>
   <data name="textUserlogin" xml:space="preserve">
     <value>Anmeldung</value>
   </data>
   <data name="textUsername" xml:space="preserve">
     <value>Benutzername</value>
   </data>
+  <data name="textVoyage" xml:space="preserve">
+    <value>Reise</value>
+  </data>
   <data name="trafficlight_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>trafficlight_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx
index 82de618..bd3f0f8 100644
--- a/src/BreCalClient/Resources/Resources.resx
+++ b/src/BreCalClient/Resources/Resources.resx
@@ -157,6 +157,9 @@
   <data name="textAgency" xml:space="preserve">
     <value>Agency</value>
   </data>
+  <data name="textArrivalTerminal" xml:space="preserve">
+    <value>Arrival terminal</value>
+  </data>
   <data name="textBerth" xml:space="preserve">
     <value>Berth</value>
   </data>
@@ -172,6 +175,9 @@
   <data name="textCategories" xml:space="preserve">
     <value>Categories</value>
   </data>
+  <data name="textDepartureTerminal" xml:space="preserve">
+    <value>Departure terminal</value>
+  </data>
   <data name="textEditShipcall" xml:space="preserve">
     <value>Edit ship call</value>
   </data>
@@ -211,9 +217,15 @@
   <data name="textPilot" xml:space="preserve">
     <value>Pilot</value>
   </data>
+  <data name="textPilotRequired" xml:space="preserve">
+    <value>Pilot required</value>
+  </data>
   <data name="textSearch" xml:space="preserve">
     <value>Search</value>
   </data>
+  <data name="textShip" xml:space="preserve">
+    <value>Ship</value>
+  </data>
   <data name="textShipLength" xml:space="preserve">
     <value>Ship length</value>
   </data>
@@ -221,7 +233,7 @@
     <value>Sort order</value>
   </data>
   <data name="textTerminal" xml:space="preserve">
-    <value />
+    <value>Terminal</value>
   </data>
   <data name="textTo" xml:space="preserve">
     <value>to</value>
@@ -229,12 +241,21 @@
   <data name="textTug" xml:space="preserve">
     <value>Tug</value>
   </data>
+  <data name="textTugRequired" xml:space="preserve">
+    <value>Tug required</value>
+  </data>
+  <data name="textType" xml:space="preserve">
+    <value>Type</value>
+  </data>
   <data name="textUserlogin" xml:space="preserve">
     <value>User login</value>
   </data>
   <data name="textUsername" xml:space="preserve">
     <value>User name</value>
   </data>
+  <data name="textVoyage" xml:space="preserve">
+    <value>Voyage</value>
+  </data>
   <data name="trafficlight_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>trafficlight_green.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
diff --git a/src/BreCalClient/SearchFilterControl.xaml b/src/BreCalClient/SearchFilterControl.xaml
index f63ff3a..c122238 100644
--- a/src/BreCalClient/SearchFilterControl.xaml
+++ b/src/BreCalClient/SearchFilterControl.xaml
@@ -7,7 +7,7 @@
              xmlns:local="clr-namespace:BreCalClient"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              mc:Ignorable="d" 
-             d:DesignHeight="56" d:DesignWidth="800">
+             d:DesignHeight="56" d:DesignWidth="800" Loaded="UserControl_Loaded">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
@@ -75,7 +75,7 @@
             <xctk:DoubleUpDown x:Name="upDownShiplengthTo" Grid.Column="2" Margin="2" Minimum="0" Maximum="1000"/>
         </Grid>
         <xctk:WatermarkTextBox x:Name="textBoxSearch" Grid.Column="2" Grid.Row="1" Margin="2" Watermark="{x:Static p:Resources.textEnterKeyword}" />
-        <xctk:CheckComboBox x:Name="comboBoxBerths" DisplayMemberPath="Name1" Grid.Column="4" Grid.Row="1" Margin="2" />
+        <xctk:CheckComboBox x:Name="comboBoxBerths" DisplayMemberPath="Name" Grid.Column="4" Grid.Row="1" Margin="2" />
         <xctk:CheckComboBox x:Name="comboBoxAgencies" DisplayMemberPath="Name" Grid.Column="6" Grid.Row="1" Margin="2" />
     </Grid>
 </UserControl>
diff --git a/src/BreCalClient/SearchFilterControl.xaml.cs b/src/BreCalClient/SearchFilterControl.xaml.cs
index f4a8d66..4b675f7 100644
--- a/src/BreCalClient/SearchFilterControl.xaml.cs
+++ b/src/BreCalClient/SearchFilterControl.xaml.cs
@@ -55,6 +55,11 @@ namespace BreCalClient
         private void logoImage_MouseUp(object sender, MouseButtonEventArgs e)
         {
             LogoImageClicked?.Invoke();
+        }        
+
+        private void UserControl_Loaded(object sender, System.Windows.RoutedEventArgs e)
+        {
+            this.comboBoxCategories.ItemsSource = Enum.GetValues(typeof(Shipcall.TypeEnum));
         }
 
         #endregion