diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj index c8eabc69..46365423 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.14.%2a + 6.1.0.%2a false true true diff --git a/ENI-2/ENI2/ENI2/SucheControl.xaml.cs b/ENI-2/ENI2/ENI2/SucheControl.xaml.cs index 72743c4e..87f701c5 100644 --- a/ENI-2/ENI2/ENI2/SucheControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/SucheControl.xaml.cs @@ -134,7 +134,7 @@ namespace ENI2 int? resultLimit = null; - int? expectedResultNum = null; + int? expectedResultNum; if (sender == this.buttonLast10Ids) { @@ -197,8 +197,9 @@ namespace ENI2 } + if(!latestIdsSearch) // 31.5.17: Komische Display ETA Vorsortierung - this.anmeldungen.Sort(); + this.anmeldungen.Sort(); // ergebnis anzeigen this.dataGrid.ItemsSource = this.anmeldungen; diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index f3f43d40..0073b24c 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs index 94d4dadc..338edbce 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.14")] +[assembly: AssemblyInformationalVersion("6.1.0")] [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 a4f84bb4..cdbfd50f 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.14.*")] +[assembly: AssemblyVersion("6.1.0.*")]