From ca290f55e6c26fe7d07780a3e12331685d8d7bba Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Sat, 1 May 2021 09:34:11 +0000 Subject: [PATCH] Arbeit an Version 6.2 --- ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs | 2 +- ENI-2/ENI2/ENI2/ENI2.csproj | 4 +- ENI-2/ENI2/ENI2/MainWindow.xaml.cs | 3 + ENI-2/ENI2/ENI2/SucheControl.xaml | 53 +++++++++--------- ENI-2/ENI2/ENI2/SucheControl.xaml.cs | 5 ++ Stundensheet.xlsx | Bin 46583 -> 46640 bytes nsw/Source/bsmd.ExcelReadService/Util.cs | 30 ++++++++++ nsw/Source/bsmd.database/DBManager.cs | 17 ++++++ nsw/Source/bsmd.database/MessageCore.cs | 5 ++ .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- nsw/Source/misc/db.sqlite | Bin 14106624 -> 14106624 bytes 12 files changed, 92 insertions(+), 31 deletions(-) diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs index 81d80ccd..1498a3dc 100644 --- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs @@ -773,7 +773,7 @@ namespace ENI2 DateTime comparison; if (noanod.ETDFromLastPort.HasValue) comparison = noanod.ETDFromLastPort.Value.ToLocalTime().Date; else comparison = DateTime.Now.Date; - if(sec.LastTenPortFacilitesCalled[0].PortFacilityDateOfDeparture != comparison) + if((sec.LastTenPortFacilitesCalled[0].PortFacilityDateOfDeparture == null) || (sec.LastTenPortFacilitesCalled[0].PortFacilityDateOfDeparture != comparison)) { MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "SEC last port departure doesn't match NOANOD ETDFromLastPort", null, "Last port departure mismatch", null, "SEC"); mv.MessageGroupName = Properties.Resources.textOverview; diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj index e4bf4cd6..ab5f3637 100644 --- a/ENI-2/ENI2/ENI2/ENI2.csproj +++ b/ENI-2/ENI2/ENI2/ENI2.csproj @@ -34,8 +34,8 @@ 5.4.0.0 true publish.html - 1 - 6.1.1.%2a + 0 + 6.2.0.%2a false true true diff --git a/ENI-2/ENI2/ENI2/MainWindow.xaml.cs b/ENI-2/ENI2/ENI2/MainWindow.xaml.cs index 724dded6..96834af1 100644 --- a/ENI-2/ENI2/ENI2/MainWindow.xaml.cs +++ b/ENI-2/ENI2/ENI2/MainWindow.xaml.cs @@ -484,6 +484,9 @@ namespace ENI2 // Meldeklassen für neuen Anlauf erzeugen: bsmd.database.Util.CreateMessagesForCore(newCore, null, userEntity); this.AnmeldungenControl_MessageCoreSelected(newCore); // in einem neuen Reiter öffnen + + // watchdog registrieren, damit die "grüne" Markierung erscheint, sobald die Anmeldung durch den Excel-Prozess gelaufen ist. + this._dbWatchDog.Register(newCore); } } diff --git a/ENI-2/ENI2/ENI2/SucheControl.xaml b/ENI-2/ENI2/ENI2/SucheControl.xaml index b5f362ac..b4b03d58 100644 --- a/ENI-2/ENI2/ENI2/SucheControl.xaml +++ b/ENI-2/ENI2/ENI2/SucheControl.xaml @@ -16,20 +16,20 @@ - - - - - - + + + + + + - - - - - - - + + + + + + +