From c27685df6ebccffcf91ac0735824bb494eb6871a Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Mon, 28 Apr 2025 15:43:31 +0200
Subject: [PATCH] Draft instead of callsign in BSMD cell

---
 src/BreCalClient/ShipcallControl.xaml    | 25 ++++++++++++------------
 src/BreCalClient/ShipcallControl.xaml.cs |  8 ++++----
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index 5557643..1f1b0e2 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -29,7 +29,6 @@
                     <RowDefinition Height=".125*"/>
                     <RowDefinition Height=".125*"/>
                     <RowDefinition Height=".125*"/>
-
                     <RowDefinition Height=".125*"/>
                     <RowDefinition Height=".125*"/>
                     <RowDefinition Height=".125*"/>
@@ -64,32 +63,32 @@
                     <TextBlock x:Name="textBlockIMO" Padding="0" FontWeight="DemiBold" />
                 </Viewbox>
                 <Viewbox Grid.Row="2" Grid.Column="0" HorizontalAlignment="Left">
-                    <TextBlock Text="{x:Static p:Resources.textCallsign}" />
-                </Viewbox>
-                <Viewbox Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left">
-                    <TextBlock x:Name="textBlockCallsign" Padding="0"/>
-                </Viewbox>
-                <Viewbox Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="{x:Static p:Resources.textLengthWidth}" Padding="0" />
                 </Viewbox>
-                <Viewbox Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="2" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockLengthWidth" Padding="0"/>
                 </Viewbox>
-                <Viewbox Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="3" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="ETA" x:Name="labelETA"/>
                 </Viewbox>
-                <Viewbox Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="3" Grid.Column="1" HorizontalAlignment="Left">
                     <TextBlock x:Name="textBlockETA"  Padding="0" FontWeight="DemiBold"/>
                 </Viewbox>
-                <Viewbox Grid.Row="5" Grid.Column="0" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="4" Grid.Column="0" HorizontalAlignment="Left">
                     <TextBlock Text="{x:Static p:Resources.textBerth}"/>
                 </Viewbox>
-                <Viewbox Grid.Row="5" Grid.Column="1" HorizontalAlignment="Left">
+                <Viewbox Grid.Row="4" 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">
+                <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>
 
             </Grid>
             <Grid Grid.Row="0" Grid.Column="1">
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index 1ff0158..4cf3262 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -267,10 +267,10 @@ namespace BreCalClient
                         this.imageEvaluation.ToolTip = this.ShipcallControlModel?.Shipcall?.EvaluationMessage;
                     else
                         this.imageEvaluation.ToolTip = null;
-                    
-                    this.textBlockBerth.Text = this.ShipcallControlModel?.GetBerthText(null);                    
-                    this.textBlockCallsign.Text = this.ShipcallControlModel?.Ship?.Callsign;
-                    this.textBlockETA.Text = this.ShipcallControlModel?.GetETAETD(true);                    
+
+                    this.textBlockBerth.Text = this.ShipcallControlModel?.GetBerthText(null);
+                    this.textBlockDraft.Text = (this.ShipcallControlModel?.Shipcall?.Draft != null) ? this.ShipcallControlModel?.Shipcall?.Draft.Value.ToString("N1") : "-";
+                    this.textBlockETA.Text = this.ShipcallControlModel?.GetETAETD(true);
 
                     this.textBlockIMO.Text = this.ShipcallControlModel?.Ship?.Imo.ToString();
                     this.textBlockLengthWidth.Text = $"{this.ShipcallControlModel?.Ship?.Length} / {this.ShipcallControlModel?.Ship?.Width}";