From 88592d90c1e12d0c56ef925d9c39a24e4fad48c3 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Mon, 12 Nov 2018 09:36:54 +0000 Subject: [PATCH] Bearbeitung Version 5.1.0 (Erweiterungen Validierung, Eingabeoptionen Enums in excel) --- ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs | 27 ++++++++++ .../BorderPoliceDetailControl.xaml | 12 ++++- .../BorderPoliceDetailControl.xaml.cs | 4 ++ ENI-2/ENI2/ENI2/ENI2.csproj | 4 +- .../ENI2/Properties/Resources.Designer.cs | 9 ++++ ENI-2/ENI2/ENI2/Properties/Resources.resx | 3 ++ Stundensheet.xlsx | Bin 39302 -> 39345 bytes .../bsmd.ExcelReadService/ExcelReader.cs | 37 +++++++++++--- nsw/Source/bsmd.ExcelReadService/Util.cs | 14 +----- nsw/Source/bsmd.database/DBManager.cs | 7 ++- nsw/Source/bsmd.database/MDH.cs | 4 ++ nsw/Source/bsmd.database/MessageCore.cs | 41 ++++++++------- .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- nsw/Source/bsmd.database/RuleEngine.cs | 47 ++++++++---------- nsw/Source/bsmd.database/SEC.cs | 3 ++ 16 files changed, 146 insertions(+), 70 deletions(-) diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs index 5abb4a01..8cf2dbe7 100644 --- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs @@ -610,6 +610,33 @@ namespace ENI2 vViolations.AddRange(violations); } + #region 12.11.18: ein paar neue komische globale Plausi-Prüfungen + Message crewMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.CREW); + Message pasMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.PAS); + Message pobaMessage = _messages.Find(message => message.MessageNotificationClass == Message.NotificationClass.POBA); + + if (pobaMessage.Elements.Count == 1) + { + POBA poba = pobaMessage.Elements[0] as POBA; + + if (crewMessage.Elements.Count != poba.TotalCrewMembersOnBoardUponArrival) + { + MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "POBA crew member count different from CREW count!", null, "Crew count mismatch", null, "CREW"); + mv.MessageGroupName = Properties.Resources.textOverview; + vViolations.Add(mv); + } + + if(pasMessage.Elements.Count != poba.TotalPassengersOnBoardUponArrival) + { + MessageViolation mv = RuleEngine.CreateViolation(ValidationCode.IMPLAUSIBLE, "POBA passenger count different from PAS count!", null, "Passenger count mismatch", null, "PAS"); + mv.MessageGroupName = Properties.Resources.textOverview; + vViolations.Add(mv); + } + + } + + #endregion + foreach (MessageError me in vErrors) { this.highlightService.HighlightError(me, this.GetContainerForMessageGroupName(me.MessageGroupName)); diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml index 0463b64d..97f26563 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml @@ -56,7 +56,11 @@ -