diff --git a/ENI2/DetailRootControl.xaml.cs b/ENI2/DetailRootControl.xaml.cs index 0655f344..c73543d5 100644 --- a/ENI2/DetailRootControl.xaml.cs +++ b/ENI2/DetailRootControl.xaml.cs @@ -113,8 +113,14 @@ namespace ENI2 if(this.Core.PoC.Equals("DEBRV") || this.Core.PoC.Equals("DEBRE")) { - - + foreach(Message aMessage in _messages) + { + if((aMessage.MessageNotificationClass == Message.NotificationClass.NOA_NOD) && (aMessage.InternalStatus != Message.BSMDStatus.CONFIRMED)) { messageText = "NOA_NOD"; return true; } + if ((aMessage.MessageNotificationClass == Message.NotificationClass.AGNT) && (aMessage.InternalStatus != Message.BSMDStatus.CONFIRMED)) { messageText = "AGNT"; return true; } + if ((aMessage.MessageNotificationClass == Message.NotificationClass.INFO) && (aMessage.InternalStatus != Message.BSMDStatus.CONFIRMED)) { messageText = "INFO"; return true; } + if ((aMessage.MessageNotificationClass == Message.NotificationClass.SEC) && (aMessage.InternalStatus != Message.BSMDStatus.CONFIRMED)) { messageText = "SEC"; return true; } + if ((aMessage.MessageNotificationClass == Message.NotificationClass.TIEFA) && (aMessage.InternalStatus != Message.BSMDStatus.CONFIRMED)) { messageText = "TIEFA"; return true; } + } } return false; diff --git a/ENI2/MainWindow.xaml.cs b/ENI2/MainWindow.xaml.cs index d5767354..57d88aec 100644 --- a/ENI2/MainWindow.xaml.cs +++ b/ENI2/MainWindow.xaml.cs @@ -83,7 +83,7 @@ namespace ENI2 { if (!openTabs.ContainsKey(aMessageCore.Id.Value)) { - ClosableTabItem searchResultItem = new ClosableTabItem(); + ClosableTabItem searchResultItem = new ClosableTabItem(); // try to lock the item Guid lockedUserId = Guid.Empty; @@ -207,6 +207,17 @@ namespace ENI2 e.Cancel = true; } + // Dez.22: Special case for BRE/BRV: Warning if some messages are not "confirmed" + if(drc.Core.PoC.Equals("DEBRE")||drc.Core.PoC.Equals("DEBRV")) + { + if(drc.HasCriticalInfoMissing(out string missingClass)) + { + if (MessageBox.Show(string.Format(Properties.Resources.textSpecialCaseBREBRV, missingClass), Properties.Resources.textConfirmation, MessageBoxButton.YesNo, + MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.No) + e.Cancel = true; + } + } + if (!e.Cancel) { if (lockedCores.ContainsKey(tabItem)) diff --git a/ENI2/Properties/Resources.Designer.cs b/ENI2/Properties/Resources.Designer.cs index 7609f390..58978e29 100644 --- a/ENI2/Properties/Resources.Designer.cs +++ b/ENI2/Properties/Resources.Designer.cs @@ -4551,6 +4551,15 @@ namespace ENI2.Properties { } } + /// + /// Looks up a localized string similar to One or more important classes haven't been sent for DEBRE/DEBRV: {0} Close anyway?. + /// + public static string textSpecialCaseBREBRV { + get { + return ResourceManager.GetString("textSpecialCaseBREBRV", resourceCulture); + } + } + /// /// Looks up a localized string similar to Special requirements. /// diff --git a/ENI2/Properties/Resources.resx b/ENI2/Properties/Resources.resx index 245b4264..ddd43f54 100644 --- a/ENI2/Properties/Resources.resx +++ b/ENI2/Properties/Resources.resx @@ -1858,4 +1858,7 @@ Search NST2007 list + + One or more important classes haven't been sent for DEBRE/DEBRV: {0} Close anyway? + \ No newline at end of file