ENI2/DetailViewControls/OverViewDetailControl.xaml.cs

@@ -843,31 +843,41 @@ namespace ENI2.DetailViewControls
             {
                 addToSend = true;
 
-                // if ((message.ErrorCount ?? 0) > 0) continue; // skip selection if there are any errors left
+                if ((message.ErrorCount ?? 0) > 0) continue; // skip selection if there are any errors left
 
                 switch(message.MessageNotificationClass)
                 {
                     case NotificationClass.HAZA:
-                        addToSend = XtraSendLogic.ShouldSendMessage(message); break;
+                        addToSend = XtraSendLogic.ShouldSendMessage(message) && ((message.ViolationCount ?? 0) == 0); break;
                     case NotificationClass.HAZD:
-                        addToSend = XtraSendLogic.ShouldSendMessage(message); break;
+                        addToSend = XtraSendLogic.ShouldSendMessage(message) && ((message.ViolationCount ?? 0) == 0); break;
                     case NotificationClass.BPOL:
                         if (message.Elements.Count > 0)
                         {
                             if (message.Elements[0] is BPOL bpol)
                             {
                                 if (bpol.PortOfItineraries.Count == 0) addToSend = false;
-                            }                            
+                            }
+                            if((message.ViolationCount ?? 0) > 0) addToSend = false;
                         }
-                        break;                    
+                        break;
+                    case NotificationClass.WAS:
+                        // if ((message.PositionViolationCount ?? 0) > 0) addToSend = false;
+                        break; // WAS will be selected even if there are (any) violations left
                     case NotificationClass.WAS_RCPT:
                         addToSend = false;
-                        break;                    
-                    case NotificationClass.INFO:
-                        if (Core.PoC == "DEHAM") addToSend = false;                        
                         break;
-                     default:                        
+                    case NotificationClass.NOA_NOD:
-                        if(Message.IsListClass(message.MessageNotificationClass) && (message.Elements.Count == 0)) addToSend = false;                        
+                        if ((message.PositionViolationCount ?? 0) > 0) addToSend = false;
+                        break;
+                    case NotificationClass.INFO:
+                        if (Core.PoC == "DEHAM") addToSend = false;
+                        else addToSend = !((message.ViolationCount ?? 0) > 0);
+                        break;
+                     default:
+                        if((message.ViolationCount ?? 0) > 0) addToSend = false; 
+                        if(Message.IsListClass(message.MessageNotificationClass) && (message.Elements.Count == 0)) addToSend = false;
+                        
                         break;
                 }
 

ENI2/DetailViewControls/PortCallDetailControl.xaml.cs

@@ -390,7 +390,7 @@ namespace ENI2.DetailViewControls
             this.textBox_AgentPostalCode.GetBindingExpression(TextBox.TextProperty).UpdateSource();
             this.textBox_AgentStreetAndNumber.Text = this._currentTemplate.AgentStreetAndNumber;
             this.textBox_AgentStreetAndNumber.GetBindingExpression(TextBox.TextProperty).UpdateSource();
-            if ((this._currentTemplate.WasteDisposalServiceProviderName ?? "") != this.textBox_WasteDisposalServiceProvider.Text)
+            if (this._currentTemplate.WasteDisposalServiceProviderName != this.textBox_WasteDisposalServiceProvider.Text)
             {
                 this.textBox_WasteDisposalServiceProvider.Text = this._currentTemplate.WasteDisposalServiceProviderName;
                 this.textBox_WasteDisposalServiceProvider.GetBindingExpression(TextBox.TextProperty).UpdateSource();

ENI2/ENI2.csproj

@@ -36,8 +36,8 @@
     <MinimumRequiredVersion>5.4.0.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>7.2.12.2</ApplicationVersion>
+    <ApplicationVersion>7.2.12.1</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>