From dbd7347ac92a648edb9cb595ee8885f6f3fbecf3 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Tue, 13 May 2025 11:48:29 +0200
Subject: [PATCH] Moved draft up and put unit behind the value

---
 .../Resources/Resources.Designer.cs           | 18 ++++++++++
 src/BreCalClient/Resources/Resources.de.resx  |  3 ++
 src/BreCalClient/Resources/Resources.resx     |  6 ++++
 src/BreCalClient/ShipcallControl.xaml         | 33 +++++++++----------
 src/BreCalClient/ShipcallControl.xaml.cs      |  2 +-
 5 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs
index 7be1ee9..a0aa882 100644
--- a/src/BreCalClient/Resources/Resources.Designer.cs
+++ b/src/BreCalClient/Resources/Resources.Designer.cs
@@ -624,6 +624,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Draft.
+        /// </summary>
+        public static string textDraftNoUnit {
+            get {
+                return ResourceManager.GetString("textDraftNoUnit", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Edit.
         /// </summary>
@@ -1146,6 +1155,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Position.
+        /// </summary>
+        public static string textPosition {
+            get {
+                return ResourceManager.GetString("textPosition", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Rain sensitive cargo.
         /// </summary>
diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx
index 5c2755a..242e671 100644
--- a/src/BreCalClient/Resources/Resources.de.resx
+++ b/src/BreCalClient/Resources/Resources.de.resx
@@ -235,6 +235,9 @@
   <data name="textDraft" xml:space="preserve">
     <value>Tiefgang (m)</value>
   </data>
+  <data name="textDraftNoUnit" xml:space="preserve">
+    <value>Tiefgang</value>
+  </data>
   <data name="textEdit" xml:space="preserve">
     <value>Bearbeiten</value>
   </data>
diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx
index 0c2a7dd..6c9cdeb 100644
--- a/src/BreCalClient/Resources/Resources.resx
+++ b/src/BreCalClient/Resources/Resources.resx
@@ -649,4 +649,10 @@
   <data name="textNotifyOn" xml:space="preserve">
     <value>Notify on</value>
   </data>
+  <data name="textPosition" xml:space="preserve">
+    <value>Position</value>
+  </data>
+  <data name="textDraftNoUnit" xml:space="preserve">
+    <value>Draft</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index 1f1b0e2..3dc9001 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -69,27 +69,26 @@
                     <TextBlock x:Name="textBlockLengthWidth" Padding="0"/>
                 </Viewbox>
                 <Viewbox Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left">
-                    <TextBlock Text="ETA" x:Name="labelETA"/>
+                    <TextBlock Text="{x:Static p:Resources.textDraftNoUnit}" />
                 </Viewbox>
                 <Viewbox Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left">
-                    <TextBlock x:Name="textBlockETA"  Padding="0" FontWeight="DemiBold"/>
-                </Viewbox>
-                <Viewbox Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left">
-                    <TextBlock Text="{x:Static p:Resources.textBerth}"/>
-                </Viewbox>
-                <Viewbox Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left">
-                    <TextBlock x:Name="textBlockBerth" Padding="0" FontWeight="DemiBold" />
-                </Viewbox>
-                <Viewbox Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left">
-                    <TextBlock x:Name="textBlockHarbour" Padding="0" FontWeight="DemiBold" />
-                </Viewbox>
-                <Viewbox Grid.Row="6" Grid.Column="0" HorizontalAlignment="Left">
-                    <TextBlock Text="{x:Static p:Resources.textDraft}" />
-                </Viewbox>
-                <Viewbox Grid.Row="6" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockDraft" Padding="0"/>
                 </Viewbox>
-
+                <Viewbox Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left">
+                    <TextBlock Text="ETA" x:Name="labelETA"/>
+                </Viewbox>
+                <Viewbox Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left">
+                    <TextBlock x:Name="textBlockETA"  Padding="0" FontWeight="DemiBold"/>
+                </Viewbox>
+                <Viewbox Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left">
+                    <TextBlock Text="{x:Static p:Resources.textBerth}"/>
+                </Viewbox>
+                <Viewbox Grid.Row="5" Grid.Column="1" HorizontalAlignment="Left">
+                    <TextBlock x:Name="textBlockBerth" Padding="0" FontWeight="DemiBold" />
+                </Viewbox>
+                <Viewbox Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Left">
+                    <TextBlock x:Name="textBlockHarbour" Padding="0" FontWeight="DemiBold" />
+                </Viewbox>
             </Grid>
             <Grid Grid.Row="0" Grid.Column="1">
                 <Grid.RowDefinitions>
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 4cf3262..ee5b780 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -269,7 +269,7 @@ namespace BreCalClient
                         this.imageEvaluation.ToolTip = null;
 
                     this.textBlockBerth.Text = this.ShipcallControlModel?.GetBerthText(null);
-                    this.textBlockDraft.Text = (this.ShipcallControlModel?.Shipcall?.Draft != null) ? this.ShipcallControlModel?.Shipcall?.Draft.Value.ToString("N1") : "-";
+                    this.textBlockDraft.Text = (this.ShipcallControlModel?.Shipcall?.Draft != null) ? $"{this.ShipcallControlModel?.Shipcall?.Draft.Value.ToString("N1")} m" : "-";
                     this.textBlockETA.Text = this.ShipcallControlModel?.GetETAETD(true);
 
                     this.textBlockIMO.Text = this.ShipcallControlModel?.Ship?.Imo.ToString();