Changes for 6.0.13

ENI-2/ENI2/ENI2/App.config

@@ -26,12 +26,12 @@
                 <value>1000</value>
             </setting>
             <setting name="LockingServerAddress" serializeAs="String">
-				<!--value>http://192.168.2.24/LockingService/LockingService.svc</value-->
+				<value>http://192.168.2.24/LockingService/LockingService.svc</value>
-				<value>http://heupferd/bsmd.LockingService/LockingService.svc</value>
+					<!--value>http://heupferd/bsmd.LockingService/LockingService.svc</value-->
             </setting>
             <setting name="ConnectionString" serializeAs="String">
-				<!--value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value-->
+				<value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
-				<value>Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False</value>
+				<!--value>Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False</value-->
             </setting>
         </ENI2.Properties.Settings>
     </applicationSettings>

ENI-2/ENI2/ENI2/Controls/ClosableTabItem.cs

@@ -88,7 +88,16 @@ namespace ENI2.Controls
 
                 if (value) this.textBlock.Foreground = Brushes.Red; //this.BlinkTextStoryboard.Begin(); // warum auch immer das nicht funktioniert
                 else this.textBlock.Foreground = Brushes.Black; //this.BlinkTextStoryboard.Stop();
+            }
+        }
 
+        public bool IsHighlightResponded
+        {
+            private get { return false; }
+            set
+            {
+                if (value) this.textBlock.Foreground = Brushes.Green;
+                else this.textBlock.Foreground = Brushes.Black;
             }
         }
 

ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs

@@ -29,7 +29,7 @@ namespace ENI2.DetailViewControls
         private Timer _checkStatusTimer;
         private DateTime _startStatusCheck;
         private readonly object _collectionLock = new object();
-        private MessageSendStatusDialog mssd = null;
+        // private MessageSendStatusDialog mssd = null;
 
         public OverViewDetailControl()
         {
@@ -437,7 +437,10 @@ namespace ENI2.DetailViewControls
                 DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).Save(this.Core); // löst auch den Watchdog aus
                 this.OnRequestSendValidation();
                 this.dataGridMessages.Items.Refresh();
+                
+                
 
+                /*
                 if (this.mssd == null)
                 {
                     this.mssd = new MessageSendStatusDialog(this.Core);
@@ -456,7 +459,7 @@ namespace ENI2.DetailViewControls
                 }
                 this.mssd.Activate(); // bring to foreground
                 this.mssd.AddMessages(watchList);                
-
+                */
             }
         }
 

ENI-2/ENI2/ENI2/ENI2.csproj

@@ -35,7 +35,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>6.0.13.%2a</ApplicationVersion>
+    <ApplicationVersion>6.0.14.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>

ENI-2/ENI2/ENI2/EditControls/MessageSendStatusDialog.xaml.cs

@@ -1,6 +1,8 @@
 // Copyright (c) 2017- schick Informatik
 // Description: Overview of messages currently in transmission
-//
+// 8/3/21: Diese Klasse wird wieder (aus der Verwendung) entfernt, da sie
+// nach RS mit CH keinen Mehrwert im Workflow bringt.
+// 
 
 using bsmd.database;
 using ENI2.Controls;

ENI-2/ENI2/ENI2/MainWindow.xaml.cs

@@ -504,18 +504,32 @@ namespace ENI2
         private void _dbWatchDog_DatabaseEntityChanged(DatabaseEntity entity)
         {
             if (entity is MessageCore changedCore)
-            {
+            {                
+
                 // tab färben
                 if (this.openTabs.ContainsKey(changedCore.Id.Value))
                 {
-                    TabItem tabitem = this.openTabs[changedCore.Id.Value];
+                    TabItem tabitem = this.openTabs[changedCore.Id.Value];                    
+                   
                     this.Dispatcher.BeginInvoke(new Action(() =>
                     {
+                        DetailRootControl drc = tabitem.Content as DetailRootControl;
+                        if (tabitem != this.mainFrame.SelectedItem)
+                            drc.ReloadCore(); // hoffentlich ist das nicht "too much"
+
+                        bool respondHighlight = false;
+                        if (changedCore.BSMDStatusInternal == MessageCore.BSMDStatus.RESPONDED)
+                            respondHighlight = true;
                         if (tabitem is ClosableTabItem closableTabItem)
-                            (closableTabItem).IsHighlighted = true;
+                        {
+                            if (respondHighlight)
+                                (closableTabItem).IsHighlightResponded = true;
+                            else
+                                (closableTabItem).IsHighlighted = true;
+                        }                       
                     }));
                     changedCore.IsHighlighted = false;
-                }
+                }                
             }
         }
 

ENI-2/ENI2/ENI2/SucheControl.xaml.cs

@@ -105,13 +105,7 @@ namespace ENI2
             // filter auswerten
             Dictionary<MessageCore.SearchFilterType, string> filterDict = new Dictionary<MessageCore.SearchFilterType, string>();
 
-            bool latestIdsSearch = false;
+            bool latestIdsSearch = false;            
-            if (sender == this.buttonLast10Ids)
-            {
-                filterDict.Add(MessageCore.SearchFilterType.FILTER_LATESTIDS, null);
-                filterDict.Add(MessageCore.SearchFilterType.FILTER_CREATEDBY, ReportingParty.CurrentReportingParty.Id.Value.ToString());
-                latestIdsSearch = true;
-            }
 
             if (!this.textBoxHafen.Text.Trim().IsNullOrEmpty())
                 filterDict.Add(MessageCore.SearchFilterType.FILTER_PORT, this.textBoxHafen.Text.Trim());
@@ -138,15 +132,26 @@ namespace ENI2
             if (from.HasValue || to.HasValue)
                 filterDict.Add(MessageCore.SearchFilterType.FILTER_ETA, string.Format("{0}:{1}", from?.ToString() ?? "", to?.ToString() ?? ""));
 
-            // menge suchen
 
             int? resultLimit = null;
-            int? expectedResultNum = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetNumCoresWithFilters(filterDict);
+            int? expectedResultNum = null;
-            if ((expectedResultNum ?? 0) > 100)
-                resultLimit = 100;
-            if (latestIdsSearch)
-                resultLimit = 10;
 
+            if (sender == this.buttonLast10Ids)
+            {
+                filterDict.Clear();
+                filterDict.Add(MessageCore.SearchFilterType.FILTER_LATESTIDS, null);
+                filterDict.Add(MessageCore.SearchFilterType.FILTER_CREATEDBY, ReportingParty.CurrentReportingParty.Id.Value.ToString());
+                latestIdsSearch = true;
+                resultLimit = 10;
+                expectedResultNum = 10;
+            } 
+            else
+            {
+                expectedResultNum = DBManager.GetSingleCon(Properties.Settings.Default.ConnectionString).GetNumCoresWithFilters(filterDict);
+                if ((expectedResultNum ?? 0) > 100)
+                    resultLimit = 100;
+            }
+                                 
             Util.UIHelper.SetBusyState();
                 
             // suche auslösen

ENI-2/ENI2/ENI2/Util/DatabaseEntityWatchdog.cs

@@ -46,7 +46,8 @@ namespace ENI2.Util
                         // (wenn die Nachrichten bearbeitet sind)
                         bool isValidState = (entity.BSMDStatusInternal == MessageCore.BSMDStatus.FAILURE) ||
                                             (entity.BSMDStatusInternal == MessageCore.BSMDStatus.SENT) ||
-                                            (entity.BSMDStatusInternal == MessageCore.BSMDStatus.PREPARE);
+                                            (entity.BSMDStatusInternal == MessageCore.BSMDStatus.PREPARE) ||
+                                            (entity.BSMDStatusInternal == MessageCore.BSMDStatus.RESPONDED);
 
                         if (isValidState && ((entity.Changed > this._watchedEntities[watchedEntity]) || watchedEntity.IsHighlighted))
                         {
@@ -83,7 +84,7 @@ namespace ENI2.Util
                 if (!this._watchedEntities.ContainsKey(entity))
                 {
                     this._watchedEntities.Add(entity, DateTime.Now);
-                    if (this._watchedEntities.Count == 1)
+                    if (this._watchedEntities.Count > 0)
                         this.bgTimer.Start();
                 }
             }

nsw/Source/bsmd.database/MessageCore.cs

@@ -482,7 +482,8 @@ namespace bsmd.database
             if (latestIdSearch)
             {
                 sb.AppendFormat(" ORDER BY [{0}].Changed DESC", this.Tablename);
-            } else 
+            } 
+            else 
             {
                 sb.Append(" ORDER BY COALESCE(ETA, ETAKielCanal) DESC");
             }

nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs

@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("6.0.13")]
+[assembly: AssemblyInformationalVersion("6.0.14")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2021 schick Informatik")]
 [assembly: AssemblyTrademark("")]

nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("6.0.13.*")]
+[assembly: AssemblyVersion("6.0.14.*")]
 

nsw/Source/bsmd.hisnord/Request.cs

@@ -71,7 +71,9 @@ namespace bsmd.hisnord
                 }
 
                 foreach (Message removeMessage in responseList)
-                    coreFilenameDict[core].Remove(removeMessage);
+                {
+                    coreFilenameDict[core].Remove(removeMessage);                
+                }
 
             }
         }