Merge branch 'feature/fixes_7.4' into develop

ENI2/DetailRootControl.xaml.cs

@@ -14,6 +14,7 @@ using ENI2.DetailViewControls;
 using ENI2.Util;
 
 using ENI2.EditControls;
+using System.Windows.Input;
 
 namespace ENI2
 {
@@ -135,14 +136,31 @@ namespace ENI2
             this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textTowage, MessageGroupControlType = typeof(TowageDetailControl), ImagePath = "Resources/ship2.png" });
 
 
-            this.listBoxMessages.ItemsSource = this._listBoxList;            
+            this.listBoxMessages.ItemsSource = this._listBoxList;
-            
+
             _messages = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetMessagesForCore(Core, DBManager.MessageLoad.ALL);
             List<Message> missingMessages = bsmd.database.Util.CreateMessagesForCore(Core, _messages, this.LockedBy);
             _messages.AddRange(missingMessages);
 
             BindingOperations.EnableCollectionSynchronization(_messages, this.messageListLock);
-            Dispatcher.BeginInvoke((Action)(() => this.listBoxMessages.SelectedIndex = 0));            
+            Dispatcher.BeginInvoke((Action)(() => this.listBoxMessages.SelectedIndex = 0));
+
+            RoutedCommand saveCmd = new RoutedCommand();
+            saveCmd.InputGestures.Add(new KeyGesture(Key.S, ModifierKeys.Control));
+            CommandBindings.Add(new CommandBinding(saveCmd, this.buttonSave_Click));
+
+            RoutedCommand saveAllCmd = new RoutedCommand();
+            saveAllCmd.InputGestures.Add(new KeyGesture(Key.A, ModifierKeys.Control));
+            CommandBindings.Add(new CommandBinding(saveAllCmd, this.buttonSaveAll_Click));
+
+            RoutedCommand reloadCmd = new RoutedCommand();
+            reloadCmd.InputGestures.Add(new KeyGesture(Key.R, ModifierKeys.Control));
+            CommandBindings.Add(new CommandBinding(reloadCmd, this.ShortCutReload));
+
+            RoutedCommand validateCmd = new RoutedCommand();
+            validateCmd.InputGestures.Add(new KeyGesture(Key.F, ModifierKeys.Control));
+            CommandBindings.Add(new CommandBinding(validateCmd, this.ShortCutValidate));
+
         }
 
         #endregion
@@ -541,6 +559,16 @@ namespace ENI2
         }
         */
 
+        private void ShortCutReload(object sender, ExecutedRoutedEventArgs e)
+        {
+            this.DetailControl_RequestReload(this.Core.Id.Value);
+        }
+
+        private void ShortCutValidate(object sender, ExecutedRoutedEventArgs e)
+        {
+            this.DetailControl_RequestValidate();
+        }
+
         private void DetailControl_RequestReload(Guid id)
         {
             /// core und messages neu laden

ENI2/ENI2.csproj

@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>3</ApplicationRevision>
+    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>7.3.0.3</ApplicationVersion>
+    <ApplicationVersion>7.4.0.1</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>

ENI2/Excel/ExcelComparer.cs

@@ -27,11 +27,20 @@ namespace ENI2.Excel
         {
             try
             {
+                // sheet.Columns.ClearFormats();
+                // sheet.Rows.ClearFormats();
+                Range usedRange = sheet.UsedRange;
+                lastUsedRow = usedRange.Rows.Count;
+                lastUsedColumn = usedRange.Columns.Count;
+
+                /*
                 Range last = sheet.Cells.SpecialCells(XlCellType.xlCellTypeLastCell, Type.Missing);
                 Range range = sheet.get_Range("A1", last);
 
                 lastUsedRow = last.Row;
                 lastUsedColumn = last.Column;
+                */
+
                 return true;
             }
             catch(Exception)

ENI2/Excel/ExcelUtil.cs

@@ -982,6 +982,9 @@ namespace ENI2.Excel
                 }
             }
 
+            if (!stat.Flag.IsNullOrEmpty()) stat.Flag = stat.Flag.ToUpper();
+            if (!stat.PortOfRegistry.IsNullOrEmpty()) stat.PortOfRegistry = stat.PortOfRegistry.ToUpper();
+
             stat.MMSINumber = reader.ReadTextNoWhitespace("STAT.MMSINumber");
             stat.CallSign = reader.ReadTextNoWhitespace("STAT.CallSign");
             stat.ISMCompanyId = reader.ReadTextNoWhitespace("STAT.ISMCompanyId");

ENI2/MainWindow.xaml.cs

@@ -135,7 +135,7 @@ namespace ENI2
                 {
                     Dispatcher.BeginInvoke((Action)(() => this.mainFrame.SelectedItem = openTabs[aMessageCore.Id.Value]));                    
                 }
-            }            
+            }
         }
 
         private void Drc_ReloadCoreRequested(Guid obj)

bsmd.database/Properties/AssemblyProductInfo.cs

@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("7.3.0")]
+[assembly: AssemblyInformationalVersion("7.4.0")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2022 schick Informatik")]
 [assembly: AssemblyTrademark("")]

bsmd.database/Properties/AssemblyProjectInfo.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("7.3.0.*")]
+[assembly: AssemblyVersion("7.4.0.*")]