diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml.cs index 15dc1b4a..c2edf943 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml.cs @@ -18,7 +18,7 @@ namespace ENI2.DetailViewControls /// public partial class ArrivalNotificationDetailControl : DetailBaseControl { - + bool startupComplete = false; private Message _ataMessage; private Message _tiefaMessage; private Message _pobaMessage; @@ -38,7 +38,8 @@ namespace ENI2.DetailViewControls this.RegisterIntegerUpDownChange(this.integerUpDownCrewMemberOnBoard, Message.NotificationClass.POBA); this.RegisterIntegerUpDownChange(this.integerUpDownPassengersOnBoard, Message.NotificationClass.POBA); this.RegisterIntegerUpDownChange(this.integerUpDownPersonsOnBoard, Message.NotificationClass.POBA); - this.RegisterIntegerUpDownChange(this.integerUpDownStowawaysOnBoard, 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 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))) diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml.cs index b13d177e..31e81650 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml.cs +++ b/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 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))) diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj index b10d13dc..d587894e 100644 --- a/ENI-2/ENI2/ENI2/ENI2.csproj +++ b/ENI-2/ENI2/ENI2/ENI2.csproj @@ -35,7 +35,7 @@ true publish.html 0 - 6.0.11.%2a + 6.0.12.%2a false true true diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index edab5820..5d23a39e 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/7.0/Agenda.pdf b/nsw/7.0/Agenda.pdf new file mode 100644 index 00000000..bd794166 Binary files /dev/null and b/nsw/7.0/Agenda.pdf differ diff --git a/nsw/7.0/Auszug aus Richtlinie 2019-883.pdf b/nsw/7.0/Auszug aus Richtlinie 2019-883.pdf new file mode 100644 index 00000000..4abdccce Binary files /dev/null and b/nsw/7.0/Auszug aus Richtlinie 2019-883.pdf differ diff --git a/nsw/7.0/Folienvortrag Datenqualität Februar 2021.pdf b/nsw/7.0/Folienvortrag Datenqualität Februar 2021.pdf new file mode 100644 index 00000000..2e837a6d Binary files /dev/null and b/nsw/7.0/Folienvortrag Datenqualität Februar 2021.pdf differ diff --git a/nsw/7.0/Folienvortrag NSW API 7.0 Update.pdf b/nsw/7.0/Folienvortrag NSW API 7.0 Update.pdf new file mode 100644 index 00000000..07c1687b Binary files /dev/null and b/nsw/7.0/Folienvortrag NSW API 7.0 Update.pdf differ diff --git a/nsw/7.0/Folienvortrag NSW Betriebs-Aspekte.pdf b/nsw/7.0/Folienvortrag NSW Betriebs-Aspekte.pdf new file mode 100644 index 00000000..af4ac7e8 Binary files /dev/null and b/nsw/7.0/Folienvortrag NSW Betriebs-Aspekte.pdf differ diff --git a/nsw/7.0/Folienvortrag Zertifikats-Management.pdf b/nsw/7.0/Folienvortrag Zertifikats-Management.pdf new file mode 100644 index 00000000..18afd94c Binary files /dev/null and b/nsw/7.0/Folienvortrag Zertifikats-Management.pdf differ diff --git a/nsw/Source/bsmd.database/MessageCore.cs b/nsw/Source/bsmd.database/MessageCore.cs index f2a689db..aa65b607 100644 --- a/nsw/Source/bsmd.database/MessageCore.cs +++ b/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 searchDict && searchDict.ContainsKey(SearchFilterType.FILTER_LATESTIDS)); + } - sb.Append(" ORDER BY COALESCE(ETA, ETAKielCanal) DESC"); + if (latestIdSearch) + { + sb.AppendFormat(" ORDER BY [{0}].Changed DESC", this.Tablename); + } else + { + sb.Append(" ORDER BY COALESCE(ETA, ETAKielCanal) DESC"); + } cmd.CommandText = sb.ToString(); } diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index ab4084d2..c9fceb7f 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/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("")] \ No newline at end of file diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs index f50c0e5b..99ee0792 100644 --- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("6.0.11.*")] +[assembly: AssemblyVersion("6.0.12.*")]