From e0c85b6576aa2b1579995e783cb6263a79db1353 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Fri, 24 Feb 2023 18:34:34 +0100
Subject: [PATCH] Korrekturen gefixt

---
 ENI2/Controls/MaerskListControl.xaml          | 27 +++++++++----------
 ENI2/Controls/MaerskListControl.xaml.cs       | 18 ++++++++++---
 ENI2/ENI2.csproj                              |  2 +-
 .../CopyDeclarationDialog.xaml.cs             |  4 +++
 ENI2/EditControls/NewWithIdDialog.xaml.cs     | 11 ++++++++
 ENI2/EditControls/VisitIdDialog.xaml.cs       |  4 +++
 6 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/ENI2/Controls/MaerskListControl.xaml b/ENI2/Controls/MaerskListControl.xaml
index 4972c931..fe07b036 100644
--- a/ENI2/Controls/MaerskListControl.xaml
+++ b/ENI2/Controls/MaerskListControl.xaml
@@ -32,13 +32,12 @@
                     <ColumnDefinition Width="40" />
                     <ColumnDefinition Width="120" />
                     <ColumnDefinition Width="50" />
-                    <ColumnDefinition Width="50" />
+                    <ColumnDefinition Width="30" />
                     <ColumnDefinition Width="120" />
                     <ColumnDefinition Width="80" />
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="80" />
                     <ColumnDefinition Width="80" />
-                    <ColumnDefinition Width="30" />
                 </Grid.ColumnDefinitions>
                 <Label Content="From" Grid.Column="0" />
                 <xctk:DateTimePicker x:Name="dateTimePickerFrom" Margin="2" Grid.Column="1" Format="ShortDate" />
@@ -50,7 +49,7 @@
                 <Button x:Name="buttonRequestPlus3" Grid.Column="7" Content="Request +3" Margin="2" Click="buttonRequestIds_Click" />
                 <Button x:Name="buttonImport" Grid.Column="9" Margin="2" Content="Import" Click="buttonImport_Click" />
                 <Button x:Name="buttonExport" Grid.Column="10" Margin="2" Content="Export" Click="buttonExport_Click" />
-                <local:BusyControl x:Name="busyControl" Grid.Column="11" />
+                <local:BusyControl x:Name="busyControl" Grid.Column="5" />
             </Grid>
             <local:ENIDataGrid Grid.Row="1" Margin="2,8,2,2" x:Name="dataGridPOCores" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" 
                                SelectionMode="Extended" AutoGenerateColumns="False" CellEditEnding="dataGridPOCores_CellEditEnding" CanUserAddRows="False"
@@ -84,18 +83,18 @@
                 </local:ENIDataGrid.RowStyle>
                 <DataGrid.Columns>
                     <DataGridTextColumn Header="Status" Binding="{Binding Status}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Col A" Binding="{Binding ColA}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Col B" Binding="{Binding ColB}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Ship. Area" Binding="{Binding ColC}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Col D" Binding="{Binding ColD}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Name" Binding="{Binding ColE}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="ETA" Binding="{Binding ColA}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="ETD" Binding="{Binding ColB}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Rotation name" Binding="{Binding ColC}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Vessel code" Binding="{Binding ColD}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Vessel name" Binding="{Binding ColE}" IsReadOnly="True" />
                     <DataGridTextColumn Header="IMO" Binding="{Binding ColF}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Voy-No in" Binding="{Binding ColG}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Voy-No out" Binding="{Binding ColH}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Terminal" Binding="{Binding ColI}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="Oper" Binding="{Binding ColJ}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="ETA" Binding="{Binding ColK}" IsReadOnly="True" />
-                    <DataGridTextColumn Header="ETD" Binding="{Binding ColL}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Arr voy" Binding="{Binding ColG}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Dep voy" Binding="{Binding ColH}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Terminal name" Binding="{Binding ColI}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Operator code" Binding="{Binding ColJ}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Pro arr" Binding="{Binding ColK}" IsReadOnly="True" />
+                    <DataGridTextColumn Header="Pro dep" Binding="{Binding ColL}" IsReadOnly="True" />
                     <DataGridTextColumn Header="Id" Binding="{Binding ColM}" IsReadOnly="True" />
                     <DataGridTextColumn Header="Remark" Binding="{Binding Remark, Mode=TwoWay}" x:Name="gridColumnRemark" />
 
diff --git a/ENI2/Controls/MaerskListControl.xaml.cs b/ENI2/Controls/MaerskListControl.xaml.cs
index 69920a4c..432f4269 100644
--- a/ENI2/Controls/MaerskListControl.xaml.cs
+++ b/ENI2/Controls/MaerskListControl.xaml.cs
@@ -208,7 +208,7 @@ namespace ENI2.Controls
 
 
         private async void PerformSearch()
-        {            
+        {
             busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY;
             Dictionary<MessageCore.SearchFilterType, string> filterDict = new Dictionary<MessageCore.SearchFilterType, string>();
 
@@ -221,7 +221,7 @@ namespace ENI2.Controls
 
             // suche auslösen
             List<MessageCore> searchResult = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessageCoresWithFilters(filterDict);
-            
+
             // alle anderen Häfen weg
             searchResult.RemoveAll(item => (item.PoC == null) || (!item.PoC.Equals(PortLocode)));
 
@@ -239,6 +239,7 @@ namespace ENI2.Controls
                 }
             }
 
+            this.SortItemSource();
             this.dataGridPOCores.SelectedItem = null;
             busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
         }
@@ -258,6 +259,15 @@ namespace ENI2.Controls
             return null;
         }
 
+        private void SortItemSource()
+        {
+            ObservableCollection<MaerskData> temp;
+            temp = new ObservableCollection<MaerskData>(this.maerskDataList.OrderBy(p => p.ColA));
+            this.maerskDataList.Clear();
+            foreach (MaerskData md in temp)
+                this.maerskDataList.Add(md);
+        }
+
         #endregion
 
         #region button event handler
@@ -359,8 +369,7 @@ namespace ENI2.Controls
                     
                     if (importData.Count > 0)
                     {
-                        busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY;
-                        importData.Sort();
+                        busyControl.BusyState = Util.UIHelper.BusyStateEnum.BUSY;                        
                         
                         foreach (MaerskData md in importData)
                         {
@@ -384,6 +393,7 @@ namespace ENI2.Controls
                                 maerskDataList.Add(md);
                             }
                         }
+                        this.SortItemSource();
                         busyControl.BusyState = Util.UIHelper.BusyStateEnum.NEUTRAL;
                     }
 
diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj
index 97eceeb7..86851fa9 100644
--- a/ENI2/ENI2.csproj
+++ b/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>6</ApplicationRevision>
+    <ApplicationRevision>7</ApplicationRevision>
     <ApplicationVersion>7.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
diff --git a/ENI2/EditControls/CopyDeclarationDialog.xaml.cs b/ENI2/EditControls/CopyDeclarationDialog.xaml.cs
index 2c9e5592..9bdeb82c 100644
--- a/ENI2/EditControls/CopyDeclarationDialog.xaml.cs
+++ b/ENI2/EditControls/CopyDeclarationDialog.xaml.cs
@@ -102,6 +102,10 @@ namespace ENI2.EditControls
             {
                 this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DBH;
             }
+            else
+            {
+                this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DUDR;
+            }
         }
 
         private void doubleUpDownIMO_ValueChanged(object sender, System.Windows.RoutedPropertyChangedEventArgs<object> e)
diff --git a/ENI2/EditControls/NewWithIdDialog.xaml.cs b/ENI2/EditControls/NewWithIdDialog.xaml.cs
index 7ba0d309..8f22cc65 100644
--- a/ENI2/EditControls/NewWithIdDialog.xaml.cs
+++ b/ENI2/EditControls/NewWithIdDialog.xaml.cs
@@ -37,6 +37,9 @@ namespace ENI2.EditControls
 
             this.comboBoxInitialHIS.ItemsSource = comboDataSource;
             this.comboBoxInitialHIS.SelectedIndex = 0;
+
+
+
         }
 
         public bool ValidId { get; set; }
@@ -54,6 +57,14 @@ namespace ENI2.EditControls
         private void textBoxVisitTransitId_TextChanged(object sender, TextChangedEventArgs e)
         {
             this.CheckComplete();
+            if(textBoxVisitTransitId.Text.StartsWith("DEBRE") || textBoxVisitTransitId.Text.StartsWith("DEBHV"))
+            {
+                this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DBH;
+            }
+            else
+            {
+                this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DUDR;
+            }
         }
 
         private void CheckComplete()
diff --git a/ENI2/EditControls/VisitIdDialog.xaml.cs b/ENI2/EditControls/VisitIdDialog.xaml.cs
index f9c68776..1f72f918 100644
--- a/ENI2/EditControls/VisitIdDialog.xaml.cs
+++ b/ENI2/EditControls/VisitIdDialog.xaml.cs
@@ -101,6 +101,10 @@ namespace ENI2.EditControls
             {
                 this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DBH;
             }
+            else
+            {
+                this.comboBoxInitialHIS.SelectedValue = Message.NSWProvider.DUDR;
+            }
         }
 
         private void datePickerETA_SelectedDateChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e)