From 6f770c0290b4f2cccd037d5b33f37f84dd9dfbe4 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Mon, 10 Jan 2022 15:25:21 +0100 Subject: [PATCH] =?UTF-8?q?Version=206.9.9=20immer=20weitere=20Korrekturen?= =?UTF-8?q?,=20wir=20n=C3=A4hern=20uns=20dem=20Ziel..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ENI2/DetailRootControl.xaml.cs | 10 ++++++++-- ENI2/ENI2.csproj | 2 +- ENI2/Excel/ExcelReader.cs | 13 ++++++++++--- bsmd.database/Properties/AssemblyProductInfo.cs | 2 +- bsmd.database/Properties/AssemblyProjectInfo.cs | 2 +- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ENI2/DetailRootControl.xaml.cs b/ENI2/DetailRootControl.xaml.cs index 2188c966..eb06e98d 100644 --- a/ENI2/DetailRootControl.xaml.cs +++ b/ENI2/DetailRootControl.xaml.cs @@ -558,8 +558,14 @@ namespace ENI2 this.detailView.Children.Clear(); this.controlCache.Clear(); - // return to "new" overview - Dispatcher.BeginInvoke((Action)(() => this.listBoxMessages_SelectionChanged(this, null))); + // return to "new" overviewdan + Dispatcher.BeginInvoke((Action)(() => + { + this.listBoxMessages_SelectionChanged(this, null); + shipNameLabel.Text = this.Core.Shipname; + shipEMailLabel.Text = this.Core.HerbergEmailContactReportingVessel; + } + )); // if the entity has been highlighted (through remote change detection), reset this here this.OnHighlightReset(); diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index c17a40aa..213e3b4a 100644 --- a/ENI2/ENI2.csproj +++ b/ENI2/ENI2.csproj @@ -37,7 +37,7 @@ true publish.html 0 - 6.9.8.0 + 6.9.9.0 false true true diff --git a/ENI2/Excel/ExcelReader.cs b/ENI2/Excel/ExcelReader.cs index 41e056a3..956ef21e 100644 --- a/ENI2/Excel/ExcelReader.cs +++ b/ENI2/Excel/ExcelReader.cs @@ -385,12 +385,16 @@ namespace ENI2.Excel DateTime? etaDate = this.ReadDate(dateField); DateTime? etaTime = this.ReadTime(timeField); if (etaDate != null) - { - result = new DateTime(etaDate.Value.Year, etaDate.Value.Month, etaDate.Value.Day); + { if (etaTime != null) { result = new DateTime(etaDate.Value.Year, etaDate.Value.Month, etaDate.Value.Day, etaTime.Value.Hour, etaTime.Value.Minute, etaTime.Value.Second, DateTimeKind.Local); result = result.Value.ToUniversalTime(); + } + else + { + result = new DateTime(etaDate.Value.Year, etaDate.Value.Month, etaDate.Value.Day, 0, 0, 0, DateTimeKind.Local); + result = result.Value.ToUniversalTime(); } } @@ -429,8 +433,11 @@ namespace ENI2.Excel result = tmpDate; } } - } + + if((val is string) && ((string)val).EndsWith("lt", StringComparison.OrdinalIgnoreCase)) + val = ((string)val).Substring(0, ((string)val).Length - 2); + if (result == null) { if (DateTime.TryParseExact(val, "HH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.NoCurrentDateDefault, out DateTime date)) diff --git a/bsmd.database/Properties/AssemblyProductInfo.cs b/bsmd.database/Properties/AssemblyProductInfo.cs index baff66af..2905c92f 100644 --- a/bsmd.database/Properties/AssemblyProductInfo.cs +++ b/bsmd.database/Properties/AssemblyProductInfo.cs @@ -2,6 +2,6 @@ [assembly: AssemblyCompany("schick Informatik")] [assembly: AssemblyProduct("BSMD NSW interface")] -[assembly: AssemblyInformationalVersion("6.9.8")] +[assembly: AssemblyInformationalVersion("6.9.9")] [assembly: AssemblyCopyright("Copyright © 2014-2021 schick Informatik")] [assembly: AssemblyTrademark("")] \ No newline at end of file diff --git a/bsmd.database/Properties/AssemblyProjectInfo.cs b/bsmd.database/Properties/AssemblyProjectInfo.cs index c0f4cc37..5777a02a 100644 --- a/bsmd.database/Properties/AssemblyProjectInfo.cs +++ b/bsmd.database/Properties/AssemblyProjectInfo.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("6.9.8.*")] +[assembly: AssemblyVersion("6.9.9.*")]