Merge branch 'develop' into release/eni_7.2.10

ENI2/ENI2.csproj

@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>5</ApplicationRevision>
+    <ApplicationRevision>7</ApplicationRevision>
-    <ApplicationVersion>7.2.10.5</ApplicationVersion>
+    <ApplicationVersion>7.2.10.7</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>

ENI2/Excel/ExcelUtil.cs

@@ -1421,10 +1421,10 @@ namespace ENI2.Excel
                         int i = 1;
                         foreach (LastTenPortFacilitiesCalled ltpfc in sec.LastTenPortFacilitesCalled)
                         {
-                            if (!(mdh.GetSublistElementWithIdentifier((i + 1).ToString()) is PortOfCallLast30Days poc30d))
+                            if (!(mdh.GetSublistElementWithIdentifier((i).ToString()) is PortOfCallLast30Days poc30d))
                             {
                                 poc30d = new PortOfCallLast30Days();
-                                poc30d.Identifier = (i + 1).ToString();
+                                poc30d.Identifier = (i).ToString();
                                 poc30d.MDH = mdh;
                                 mdh.PortOfCallLast30Days.Add(poc30d);
                             }
@@ -1456,17 +1456,17 @@ namespace ENI2.Excel
                                 mdh.PortOfCallLast30Days.Add(poc30d);
                             }
 
-                            string pName = reader.ReadCellAsText(sheetTitle, string.Format("C{0}", 81 + i));
+                            string pName = reader.ReadCellAsText(sheetTitle, string.Format("C{0}", 82 + i));
-                            string pCountry = reader.ReadCellAsText(sheetTitle, string.Format("E{0}", 81 + i));
+                            string pCountry = reader.ReadCellAsText(sheetTitle, string.Format("E{0}", 82 + i));
 
-                            poc30d.PortOfCallLast30DaysDateOfDeparture = reader.ReadCellAsDateTime(sheetTitle, string.Format("G{0}", 81 + i));
+                            poc30d.PortOfCallLast30DaysDateOfDeparture = reader.ReadCellAsDateTime(sheetTitle, string.Format("G{0}", 82 + i));
-                            poc30d.PortOfCallLast30DaysLocode = reader.ReadCellAsText(sheetTitle, string.Format("F{0}", 81 + i));
+                            poc30d.PortOfCallLast30DaysLocode = reader.ReadCellAsText(sheetTitle, string.Format("F{0}", 82 + i));
                             if (LocodeDB.PortNameFromLocode(poc30d.PortOfCallLast30DaysLocode).IsNullOrEmpty()) poc30d.PortOfCallLast30DaysLocode = "";
 
                             // Verbesserungsvorschlag Jul/21: CrewMembersJoined Häkchen abhängig von den Namen in der Spalte
-                            bool? PortOfCallLast30DaysCrewMembersJoinedFlag = reader.ReadCellAsBool(sheetTitle, string.Format("H{0}", 81 + i));
+                            bool? PortOfCallLast30DaysCrewMembersJoinedFlag = reader.ReadCellAsBool(sheetTitle, string.Format("H{0}", 82 + i));
 
-                            string crewNameString = reader.ReadCellAsText(sheetTitle, string.Format("I{0}", 81 + i));
+                            string crewNameString = reader.ReadCellAsText(sheetTitle, string.Format("I{0}", 82 + i));
                             poc30d.PortOfCallLast30DaysCrewMembersJoined = !crewNameString.IsNullOrEmpty();
 
                             // if crew members joined is set explicitly to true and the name is empty, still set the field to true

ENI2/SheetDisplayControls/PortControl.xaml

@@ -95,7 +95,7 @@
                     <Grid.RowDefinitions>
                         <RowDefinition Height="36" />
                         <RowDefinition Height="28" />
-                        <RowDefinition Height="28" />
+                        <RowDefinition Height="1" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="28" />
@@ -133,14 +133,11 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="26" />
                         </Grid.ColumnDefinitions>
-                        <Button Name="buttonSetTemplate" Margin="2"  Click="buttonSetTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Apply template" HorizontalContentAlignment="Right" IsEnabled="False">
+                        
-                            <StackPanel Orientation="Horizontal">
-                                <Image Source="../Resources/check.png" Margin="0,0,0,0" Height="20" Width="20" />
-                            </StackPanel>
-                        </Button>
                     </Grid>
-                    <Grid Grid.Row="2" Grid.Column="1" Name="gridTemplateControls" Visibility="Visible">
+                    <Grid Grid.Row="1" Grid.Column="2" Name="gridTemplateControls" Visibility="Visible">
                         <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="26" />
                             <ColumnDefinition Width="*"/>
                             <!-- Name -->
                             <ColumnDefinition Width="26"/>
@@ -150,18 +147,23 @@
                             <ColumnDefinition Width="52"/>
                             <!-- Undo button -->
                         </Grid.ColumnDefinitions>
-                        <TextBox Grid.Column="0" Margin="2" Name="textBoxTemplateTitle" VerticalContentAlignment="Center"/>
+                        <Button Name="buttonSetTemplate" Grid.Column="0" Margin="2"  Click="buttonSetTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Apply template" HorizontalContentAlignment="Right" IsEnabled="False">
-                        <Button Name="buttonSaveTemplate" Grid.Column="1" Grid.Row="0" Margin="2"  Click="buttonSaveTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Save template">
+                            <StackPanel Orientation="Horizontal">
+                                <Image Source="../Resources/check.png" Margin="0,0,0,0" Height="20" Width="20" />
+                            </StackPanel>
+                        </Button>
+                        <TextBox Grid.Column="1" Margin="2" Name="textBoxTemplateTitle" VerticalContentAlignment="Center"/>
+                        <Button Name="buttonSaveTemplate" Grid.Column="2" Grid.Row="0" Margin="2"  Click="buttonSaveTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Save template">
                             <StackPanel Orientation="Horizontal">
                                 <Image Source="../Resources/floppy_disk_blue.png" Margin="0,0,0,0" Height="20" Width="20" />
                             </StackPanel>
                         </Button>
-                        <Button Name="buttonDeleteTemplate" Grid.Column="2" Grid.Row="0" Margin="2"  Click="buttonDeleteTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Delete template" IsEnabled="False">
+                        <Button Name="buttonDeleteTemplate" Grid.Column="3" Grid.Row="0" Margin="2"  Click="buttonDeleteTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Delete template" IsEnabled="False">
                             <StackPanel Orientation="Horizontal">
                                 <Image Source="../Resources/delete.png" Margin="0,0,0,0" Height="20" Width="20" />
                             </StackPanel>
                         </Button>
-                        <Button Name="buttonUndoTemplate" Grid.Column="3" Grid.Row="0" Margin="22,2,2,2"  Click="buttonUndoTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Undo last overwrite" IsEnabled="False">
+                        <Button Name="buttonUndoTemplate" Grid.Column="4" Grid.Row="0" Margin="22,2,2,2"  Click="buttonUndoTemplate_Click" BorderThickness="0" Background="Transparent" ToolTip="Undo last overwrite" IsEnabled="False">
                             <StackPanel Orientation="Horizontal">
                                 <Image Source="../Resources/undo.png" Margin="0,0,0,0" Height="20" Width="20" />
                             </StackPanel>