From 9d017524ef2b6c4eb63adbde9c9bf05c8e746d15 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 12 Jul 2024 09:32:09 +0200
Subject: [PATCH] Added shifting sequence number, storage hidden in flags. This
 is a prototype.

---
 src/BreCalClient/BreCalClient.csproj          |  4 +--
 src/BreCalClient/EditShipcallControl.xaml     | 11 +++++---
 src/BreCalClient/EditShipcallControl.xaml.cs  |  9 +++++++
 .../ClickOnceDevelProfile.pubxml              |  2 +-
 .../Resources/Resources.Designer.cs           |  9 +++++++
 src/BreCalClient/Resources/Resources.de.resx  |  3 +++
 src/BreCalClient/Resources/Resources.resx     |  3 +++
 src/BreCalClient/ShipcallControl.xaml         |  8 ++++--
 src/BreCalClient/ShipcallControl.xaml.cs      |  5 ++++
 src/BreCalClient/ShipcallControlModel.cs      | 25 +++++++++++++++++++
 10 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/src/BreCalClient/BreCalClient.csproj b/src/BreCalClient/BreCalClient.csproj
index 5ce5682..7a12570 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.3.0.0</AssemblyVersion>
-    <FileVersion>1.3.0.0</FileVersion>
+    <AssemblyVersion>1.3.0.1</AssemblyVersion>
+    <FileVersion>1.3.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/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml
index 8a44182..956cc2e 100644
--- a/src/BreCalClient/EditShipcallControl.xaml
+++ b/src/BreCalClient/EditShipcallControl.xaml
@@ -8,7 +8,7 @@
         xmlns:api="clr-namespace:BreCalClient.misc.Model"
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         mc:Ignorable="d" Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
-        Title="{x:Static p:Resources.textEditShipcall}" Height="270" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
+        Title="{x:Static p:Resources.textEditShipcall}" Height="298" Width="800" Loaded="Window_Loaded" ResizeMode="NoResize" Icon="Resources/containership.ico">
     <Window.Resources>
         <local:BoolToIndexConverter x:Key="boolToIndexConverter" />
         <local:EnumToStringConverter x:Key="enumToStringConverter" />
@@ -29,6 +29,7 @@
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
+            <RowDefinition Height="28" />
         </Grid.RowDefinitions>
 
         <Label Content="{x:Static p:Resources.textShip}" Grid.Column="0" Grid.Row="0"  HorizontalContentAlignment="Right"/>
@@ -80,8 +81,12 @@
             </ComboBox.ContextMenu>
         </ComboBox>
 
-        <Label x:Name="labelBSMDGranted" Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="1" Content="{x:Static p:Resources.textBSMDGranted}" Visibility="Hidden" FontWeight="DemiBold" />
-        <StackPanel Grid.Row="7" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
+        <Label x:Name="labelBSMDGranted" Grid.Row="7" Grid.Column="3" Grid.ColumnSpan="1" Content="{x:Static p:Resources.textBSMDGranted}" Visibility="Hidden" FontWeight="DemiBold" />
+
+        <Label x:Name="labelShiftingCount" Grid.Row="6" Grid.Column="2" HorizontalAlignment="Right" Content="{x:Static p:Resources.textShiftingSequence}" />
+        <xctk:IntegerUpDown x:Name="integerUpDownShiftingCount" Grid.Row="6" Grid.Column="3" Margin="2" Minimum="0" Maximum="255" />
+
+        <StackPanel Grid.Row="8" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="False" />
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
         </StackPanel>
diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 077eebb..74dd3d5 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -64,6 +64,8 @@ namespace BreCalClient
 
             this.comboBoxTimeRef.ItemsSource = BreCalLists.TimeRefs;
 
+            this.integerUpDownShiftingCount.Value = this.ShipcallModel.ShiftSequence;
+
             if (this.ShipcallModel.Shipcall == null) this.ShipcallModel.Shipcall = new();
             this.CopyToControls();
 
@@ -128,6 +130,8 @@ namespace BreCalClient
                         this.comboBoxDepartureBerth.IsEnabled = false;
                         this.comboBoxArrivalBerth.IsEnabled = true;
                         this.comboBoxTimeRef.IsEnabled = true;
+                        this.labelShiftingCount.Visibility = Visibility.Hidden;
+                        this.integerUpDownShiftingCount.Visibility = Visibility.Hidden;
                         break;
                     case ShipcallType.Departure:
                         this.datePickerETD.Visibility = Visibility.Visible;
@@ -140,6 +144,8 @@ namespace BreCalClient
                         this.comboBoxDepartureBerth.IsEnabled = true;
                         this.comboBoxTimeRef.IsEnabled = false;
                         this.comboBoxTimeRef.SelectedIndex = 0;
+                        this.labelShiftingCount.Visibility = Visibility.Hidden;
+                        this.integerUpDownShiftingCount.Visibility = Visibility.Hidden;
                         break;
                     case ShipcallType.Shifting:
                         Grid.SetRow(datePickerETA, 4);
@@ -152,6 +158,8 @@ namespace BreCalClient
                         this.comboBoxDepartureBerth.IsEnabled = true;
                         this.comboBoxTimeRef.IsEnabled = false;
                         this.comboBoxTimeRef.SelectedIndex = 0;
+                        this.labelShiftingCount.Visibility = Visibility.Visible;
+                        this.integerUpDownShiftingCount.Visibility = Visibility.Visible;
                         break;
                 }
             }
@@ -236,6 +244,7 @@ namespace BreCalClient
                 {
                     this.ShipcallModel.Shipcall.DepartureBerthId = (this.comboBoxArrivalBerth.SelectedItem != null) ? ((Berth)this.comboBoxArrivalBerth.SelectedItem).Id : null;
                     this.ShipcallModel.Shipcall.ArrivalBerthId = (this.comboBoxDepartureBerth.SelectedItem != null) ? ((Berth)this.comboBoxDepartureBerth.SelectedItem).Id : null;
+                    this.ShipcallModel.ShiftSequence = (byte?) this.integerUpDownShiftingCount.Value;
                 }
 
                 Participant? participant;
diff --git a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
index bb9764c..fb2b52a 100644
--- a/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
+++ b/src/BreCalClient/Properties/PublishProfiles/ClickOnceDevelProfile.pubxml
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.3.0.0</ApplicationVersion>
+    <ApplicationVersion>1.3.0.1</ApplicationVersion>
     <BootstrapperEnabled>True</BootstrapperEnabled>
     <Configuration>Debug</Configuration>
     <CreateDesktopShortcut>True</CreateDesktopShortcut>
diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs
index 0538c96..679e66a 100644
--- a/src/BreCalClient/Resources/Resources.Designer.cs
+++ b/src/BreCalClient/Resources/Resources.Designer.cs
@@ -1027,6 +1027,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Shift. number.
+        /// </summary>
+        public static string textShiftingSequence {
+            get {
+                return ResourceManager.GetString("textShiftingSequence", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Shifting to.
         /// </summary>
diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx
index e81f260..1d95aef 100644
--- a/src/BreCalClient/Resources/Resources.de.resx
+++ b/src/BreCalClient/Resources/Resources.de.resx
@@ -502,4 +502,7 @@
   <data name="textPortAuthority" xml:space="preserve">
     <value>Hafenamt</value>
   </data>
+  <data name="textShiftingSequence" xml:space="preserve">
+    <value>Verhol. Nr.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx
index bf31b56..a6d08f6 100644
--- a/src/BreCalClient/Resources/Resources.resx
+++ b/src/BreCalClient/Resources/Resources.resx
@@ -427,6 +427,9 @@
   <data name="textShiftingFrom" xml:space="preserve">
     <value>Shifting from</value>
   </data>
+  <data name="textShiftingSequence" xml:space="preserve">
+    <value>Shift. number</value>
+  </data>
   <data name="textShiftingTo" xml:space="preserve">
     <value>Shifting to</value>
   </data>
diff --git a/src/BreCalClient/ShipcallControl.xaml b/src/BreCalClient/ShipcallControl.xaml
index b9faa9f..0f102c6 100644
--- a/src/BreCalClient/ShipcallControl.xaml
+++ b/src/BreCalClient/ShipcallControl.xaml
@@ -41,15 +41,19 @@
                 <Grid Grid.Row="0" Grid.Column="0" Grid.RowSpan="1" Grid.ColumnSpan="3">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="30" />
+                        <ColumnDefinition Width="20" x:Name="columnDefinitionShiftingSequence"/>
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="32" />
                     </Grid.ColumnDefinitions>
                     <Image Margin="2" Grid.Column="0" PreviewMouseUp="Image_PreviewMouseUp" x:Name="imageShipcallType" />
-                    <Label Grid.Column="1" FontSize="12" x:Name="labelShipName" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
+                    <Viewbox Grid.Column="1">
+                        <TextBlock x:Name="textBlockShiftingSequence"></TextBlock>
+                    </Viewbox>
+                    <Label Grid.Column="2" FontSize="12" x:Name="labelShipName" Foreground="White" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}" VerticalAlignment="Stretch" 
                        HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" PreviewMouseUp="Image_PreviewMouseUp">
                         <TextBlock Name="textBlockShipName" />
                     </Label>
-                    <Grid Grid.Column="2" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}">
+                    <Grid Grid.Column="3" Background="{Binding Source={x:Static sets:Settings.Default}, Path=BG_COLOR}">
                         <Image Grid.Column="3" Margin="2" x:Name="imageEvaluation" />
                     </Grid>
                 </Grid>
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index fb726f2..6beb445 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -68,6 +68,11 @@ namespace BreCalClient
             {
                 if (this.ShipcallControlModel != null)
                 {
+
+                    bool shiftingNoVisible = ((this.ShipcallControlModel?.Shipcall?.Type == ShipcallType.Shifting) && this.ShipcallControlModel.ShiftSequence.HasValue);
+                    this.textBlockShiftingSequence.Text = shiftingNoVisible ? this.ShipcallControlModel?.ShiftSequence.ToString() : "";
+                    this.columnDefinitionShiftingSequence.Width = shiftingNoVisible ? new(20) : new(0);
+
                     string agentName = "";
                     string? name;
                     _agency = this.ShipcallControlModel.GetParticipantForType(Extensions.ParticipantType.AGENCY);
diff --git a/src/BreCalClient/ShipcallControlModel.cs b/src/BreCalClient/ShipcallControlModel.cs
index 4d34de7..dd95c2a 100644
--- a/src/BreCalClient/ShipcallControlModel.cs
+++ b/src/BreCalClient/ShipcallControlModel.cs
@@ -90,6 +90,31 @@ namespace BreCalClient
             }
         }
 
+        /// <summary>
+        /// This property attempts to store the (hopefully short) shifting sequence in the topmost
+        /// byte of the "flags" integer which will not be used for the forseeable future
+        /// 
+        /// This is a workaround to avoid adding another field to the interface and is only used in the
+        /// client display anyway. You could say hack as well.
+        /// </summary>
+        public byte? ShiftSequence
+        {
+            get
+            {
+                if((this.Shipcall == null) || (this.Shipcall.Flags == null)) return null;
+                return (byte?) (this.Shipcall?.Flags >> 24);
+            }
+            set
+            {                
+                if ((value != null) && (this.Shipcall != null))
+                {
+                    int currentFlag = this.Shipcall.Flags ?? 0;
+                    int moveUp = ((value ?? 0) << 24);
+                    this.Shipcall.Flags = (currentFlag & 0xffffff) | moveUp;
+                }               
+            }
+        }
+
         #endregion
 
         #region public methods