6.0.12 (aktueller Korrekturstand) + Infos zu NSW 7.0

ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml.cs

@@ -18,7 +18,7 @@ namespace ENI2.DetailViewControls
     /// </summary>
     public partial class ArrivalNotificationDetailControl : DetailBaseControl
     {
-
+        bool startupComplete = false;
         private Message _ataMessage;
         private Message _tiefaMessage;
         private Message _pobaMessage;
@@ -39,6 +39,7 @@ namespace ENI2.DetailViewControls
             this.RegisterIntegerUpDownChange(this.integerUpDownPassengersOnBoard, Message.NotificationClass.POBA);
             this.RegisterIntegerUpDownChange(this.integerUpDownPersonsOnBoard, Message.NotificationClass.POBA);
             this.RegisterIntegerUpDownChange(this.integerUpDownStowawaysOnBoard, Message.NotificationClass.POBA);
+            startupComplete = true;
         }
 
         public override void Initialize()
@@ -293,7 +294,7 @@ namespace ENI2.DetailViewControls
 
         private void dateTimePickerATA_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
         {
-            if(this.dateTimePickerATA.Value.HasValue)
+            if(startupComplete && this.dateTimePickerATA.Value.HasValue)
             {
                 DateTime setTime = this.dateTimePickerATA.Value.Value;
                 if ((setTime > DateTime.Now.AddDays(14)) || (setTime < DateTime.Now.AddDays(-14)))

ENI-2/ENI2/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml.cs

@@ -22,7 +22,7 @@ namespace ENI2.DetailViewControls
         private Message _tiefdMessage;
         private Message _pobdMessage;
         private Message _bkrdMessage;
-
+        bool startupComplete = false;
 
         public DepartureNotificationDetailControl()
         {
@@ -38,6 +38,7 @@ namespace ENI2.DetailViewControls
             this.RegisterIntegerUpDownChange(this.integerUpDownPassengersOnBoard, Message.NotificationClass.POBD);
             this.RegisterIntegerUpDownChange(this.integerUpDownPersonsOnBoard, Message.NotificationClass.POBD);
             this.RegisterIntegerUpDownChange(this.integerUpDownStowawaysOnBoard, Message.NotificationClass.POBD);
+            startupComplete = true;
         }
 
         public override void Initialize()
@@ -278,7 +279,7 @@ namespace ENI2.DetailViewControls
 
         private void dateTimePickerATD_ValueChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
         {
-            if (this.dateTimePickerATD.Value.HasValue)
+            if (startupComplete && this.dateTimePickerATD.Value.HasValue)
             {
                 DateTime setTime = this.dateTimePickerATD.Value.Value;
                 if ((setTime > DateTime.Now.AddDays(14)) || (setTime < DateTime.Now.AddDays(-14)))

ENI-2/ENI2/ENI2/ENI2.csproj

@@ -35,7 +35,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>6.0.11.%2a</ApplicationVersion>
+    <ApplicationVersion>6.0.12.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>

nsw/Source/bsmd.database/MessageCore.cs

@@ -473,8 +473,19 @@ namespace bsmd.database
             sb.AppendFormat(" FROM {0} ", this.Tablename);
 
             this.SetFilters(sb, cmd, filter, criteria);
+            bool latestIdSearch = false;
+            if(filter == Message.LoadFilter.SEARCH_CORE_FILTERS)
+            {
+                latestIdSearch = (criteria[0] is Dictionary<SearchFilterType, string> searchDict && searchDict.ContainsKey(SearchFilterType.FILTER_LATESTIDS));
+            }
 
+            if (latestIdSearch)
+            {
+                sb.AppendFormat(" ORDER BY [{0}].Changed DESC", this.Tablename);
+            } else 
+            {
                 sb.Append(" ORDER BY COALESCE(ETA, ETAKielCanal) DESC");
+            }
 
             cmd.CommandText = sb.ToString();
         }

nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs

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

nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs

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