From 7f659144b72e66e37d19a259559382647781cc6b Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Thu, 7 Dec 2017 18:29:49 +0000
Subject: [PATCH] Version 3.9.3 Korrekturen

---
 ENI-2/ENI2/ENI2/App.config                    |  2 +-
 .../ENI2/Controls/ServerStatusControl.xaml.cs | 24 ++++++++++++-
 ENI-2/ENI2/ENI2/ENI2.csproj                   |  2 +-
 .../ENI2/EditControls/EditSERVDialog.xaml     |  6 ++--
 ENI-2/ENI2/ENI2/MainWindow.xaml.cs            | 35 ++-----------------
 .../ENI2/Properties/Resources.Designer.cs     |  9 +++++
 ENI-2/ENI2/ENI2/Properties/Resources.resx     |  3 ++
 ENI-2/ENI2/ENI2/SucheControl.xaml.cs          | 25 +++++++++++++
 .../Properties/AssemblyProductInfo.cs         |  2 +-
 .../Properties/AssemblyProjectInfo.cs         |  2 +-
 nsw/Source/bsmd.database/RuleEngine.cs        |  4 +++
 nsw/Source/bsmd.database/SERV.cs              | 11 +++---
 .../bsmd.database/ValidationAttribute.cs      |  7 ++--
 13 files changed, 84 insertions(+), 48 deletions(-)

diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config
index 59067348..097725ac 100644
--- a/ENI-2/ENI2/ENI2/App.config
+++ b/ENI-2/ENI2/ENI2/App.config
@@ -45,7 +45,7 @@
     <system.serviceModel>
         <bindings>
             <basicHttpBinding>
-                <binding name="BasicHttpBinding_IService" />
+                <binding name="BasicHttpBinding_IService" maxReceivedMessageSize="2147483647" />
             </basicHttpBinding>
         </bindings>
         <client>
diff --git a/ENI-2/ENI2/ENI2/Controls/ServerStatusControl.xaml.cs b/ENI-2/ENI2/ENI2/Controls/ServerStatusControl.xaml.cs
index eda4c6ee..5bfba771 100644
--- a/ENI-2/ENI2/ENI2/Controls/ServerStatusControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/Controls/ServerStatusControl.xaml.cs
@@ -28,7 +28,13 @@ namespace ENI2.Controls
         public ServerStatusControl()
         {
             InitializeComponent();
-            this.dataGridStatus.ItemsSource = this.entries;            
+            this.dataGridStatus.ItemsSource = this.entries;
+            this.Loaded += ServerStatusControl_Loaded;
+        }
+
+        private void ServerStatusControl_Loaded(object sender, System.Windows.RoutedEventArgs e)
+        {
+            this.refreshButton_Click(null, null);
         }
 
         internal void Update(LockingServiceReference.ServerStatus serverStatus)
@@ -132,6 +138,22 @@ namespace ENI2.Controls
         private void refreshButton_Click(object sender, System.Windows.RoutedEventArgs e)
         {
             StatusEntry.ClearIds();
+
+            if (App.LockingServiceClient != null)
+            {
+                try
+                {
+                    LockingServiceReference.ServerStatus serverStatus = App.LockingServiceClient.GetStatus();
+                    if (serverStatus != null)
+                    {
+                        this.Update(serverStatus);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _log.DebugFormat("LockingService.GetStatus() threw an exception: {0}", ex.Message);
+                }
+            }
         }
     }
 
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index 19fdf730..4e49ad29 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -36,7 +36,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
     <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>3.9.2.%2a</ApplicationVersion>
+    <ApplicationVersion>3.9.3.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/ENI-2/ENI2/ENI2/EditControls/EditSERVDialog.xaml b/ENI-2/ENI2/ENI2/EditControls/EditSERVDialog.xaml
index 01620f08..68dcdf07 100644
--- a/ENI-2/ENI2/ENI2/EditControls/EditSERVDialog.xaml
+++ b/ENI-2/ENI2/ENI2/EditControls/EditSERVDialog.xaml
@@ -21,8 +21,8 @@
         <Label Name="labelServiceName" Grid.Row="0" Grid.Column="0" Content="{x:Static p:Resources.textServiceName}" />
         <Label Name="labelServiceBeneficiary" Grid.Row="1" Grid.Column="0" Content="{x:Static p:Resources.textServiceBeneficiary}" />
         <Label Name="labelServiceInvoiceRecipient" Grid.Row="2" Grid.Column="0" Content="{x:Static p:Resources.textServiceInvoiceRecipient}" />
-        <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxServiceName" Margin="2" MinLines="2" MaxLength="100" AcceptsReturn="True" TextWrapping="Wrap" />
-        <TextBox Grid.Row="1" Grid.Column="1" Width="auto" Name="textBoxServiceBeneficiary" Margin="2" MinLines="2" TextWrapping="Wrap" AcceptsReturn="True" MaxLength="100" />
-        <TextBox Grid.Row="2" Grid.Column="1" Width="auto" Name="textBoxServiceInvoiceRecipient" Margin="2" MinLines="2" TextWrapping="Wrap" AcceptsReturn="True" MaxLength="100" />
+        <TextBox Grid.Row="0" Grid.Column="1" Width="auto" Name="textBoxServiceName" Margin="2" MinLines="2" MaxLength="99" AcceptsReturn="True" TextWrapping="Wrap" />
+        <TextBox Grid.Row="1" Grid.Column="1" Width="auto" Name="textBoxServiceBeneficiary" Margin="2" MinLines="2" TextWrapping="Wrap" AcceptsReturn="True" MaxLength="99" />
+        <TextBox Grid.Row="2" Grid.Column="1" Width="auto" Name="textBoxServiceInvoiceRecipient" Margin="2" MinLines="2" TextWrapping="Wrap" AcceptsReturn="True" MaxLength="99" />
     </Grid>
 </enictrl:EditWindowBase>
diff --git a/ENI-2/ENI2/ENI2/MainWindow.xaml.cs b/ENI-2/ENI2/ENI2/MainWindow.xaml.cs
index 3c0560f2..e3edcbb6 100644
--- a/ENI-2/ENI2/ENI2/MainWindow.xaml.cs
+++ b/ENI-2/ENI2/ENI2/MainWindow.xaml.cs
@@ -47,8 +47,7 @@ namespace ENI2
         private int failedLogonCount = 0;
         private ReportingParty userEntity = null;
         private ILog _log = LogManager.GetLogger(typeof(MainWindow));
-        private DatabaseEntityWatchdog _dbWatchDog;
-        private System.Timers.Timer _statusTimer;
+        private DatabaseEntityWatchdog _dbWatchDog;        
 
         #endregion
 
@@ -69,12 +68,7 @@ namespace ENI2
             this._dbWatchDog.VisitTransitIdUpdated += _dbWatchDog_VisitTransitIdUpdated;
             App.SplashScreen.ShowMessage("done");
             Thread.Sleep(500);
-            App.SplashScreen.LoadComplete();
-            this._statusTimer = new System.Timers.Timer();
-            this._statusTimer.AutoReset = true;
-            this._statusTimer.Elapsed += _statusTimer_Elapsed; // TODO: Timer konfigurierbar
-            this._statusTimer.Interval = 10000; // alle 10 Sekunden
-            this._statusTimer.Start();
+            App.SplashScreen.LoadComplete();            
         }        
 
         #endregion
@@ -550,30 +544,7 @@ namespace ENI2
             this.Close();
         }
 
-        #endregion
-
-        #region Service Status timer handler
-
-        private void _statusTimer_Elapsed(object sender, ElapsedEventArgs e)
-        {            
-            if(App.LockingServiceClient != null)
-            {
-                try
-                {
-                    LockingServiceReference.ServerStatus serverStatus = App.LockingServiceClient.GetStatus();
-                    if ((serverStatus != null) && (this.statusControl != null))
-                    {
-                        this.statusControl.Update(serverStatus);
-                    }
-                }
-                catch(Exception ex)
-                {
-                    _log.DebugFormat("LockingService.GetStatus() threw an exception: {0}", ex.Message);
-                }
-            }
-        }
-
-        #endregion
+        #endregion        
 
     }
 }
diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs b/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
index f88c7046..5435ad42 100644
--- a/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
+++ b/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
@@ -1355,6 +1355,15 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Copy Id to clipboard.
+        /// </summary>
+        public static string textCopyClip {
+            get {
+                return ResourceManager.GetString("textCopyClip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Copy data.
         /// </summary>
diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.resx b/ENI-2/ENI2/ENI2/Properties/Resources.resx
index 81eedd2c..19a053c7 100644
--- a/ENI-2/ENI2/ENI2/Properties/Resources.resx
+++ b/ENI-2/ENI2/ENI2/Properties/Resources.resx
@@ -1597,4 +1597,7 @@
   <data name="textL10PImported" xml:space="preserve">
     <value>{0} ports visited imported</value>
   </data>
+  <data name="textCopyClip" xml:space="preserve">
+    <value>Copy Id to clipboard</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/ENI-2/ENI2/ENI2/SucheControl.xaml.cs b/ENI-2/ENI2/ENI2/SucheControl.xaml.cs
index 9335b853..441d242f 100644
--- a/ENI-2/ENI2/ENI2/SucheControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/SucheControl.xaml.cs
@@ -12,6 +12,7 @@ using System.Windows.Media;
 using bsmd.database;
 using System.Windows.Data;
 using log4net;
+using System.Windows.Media.Imaging;
 
 namespace ENI2
 {
@@ -29,8 +30,20 @@ namespace ENI2
         public SucheControl()
         {
             InitializeComponent();
+            Loaded += SucheControl_Loaded;
         }
 
+        private void SucheControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            this.dataGrid.ContextMenu = new ContextMenu();
+            this.dataGrid.CanUserAddRows = false;
+            MenuItem addItem = new MenuItem();
+            addItem.Header = Properties.Resources.textCopyClip;
+            addItem.Icon = new Image { Source = new BitmapImage(new Uri("pack://application:,,,/Resources/documents.png")) };
+            addItem.Click += new RoutedEventHandler(this.copyID);
+            this.dataGrid.ContextMenu.Items.Add(addItem);
+        }        
+
         #endregion
 
         public event MessageCore.MessageCoreSelectedHandler MessageCoreSelected;
@@ -208,6 +221,18 @@ namespace ENI2
             }
         }
 
+        private void copyID(object sender, RoutedEventArgs e)
+        {
+            MessageCore selectedCore = dataGrid.SelectedItem as MessageCore;
+            if(selectedCore != null)
+            {
+                if(selectedCore.DisplayId != null)
+                {
+                    Clipboard.SetText(selectedCore.DisplayId);
+                }
+            }
+        }
+
         #endregion
 
     }
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
index a5a307a6..2164a602 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProductInfo.cs
@@ -2,6 +2,6 @@
 
 [assembly: AssemblyCompany("schick Informatik")]
 [assembly: AssemblyProduct("BSMD NSW interface")]
-[assembly: AssemblyInformationalVersion("3.9.2")]
+[assembly: AssemblyInformationalVersion("3.9.3")]
 [assembly: AssemblyCopyright("Copyright ©  2014-2017 schick Informatik")]
 [assembly: AssemblyTrademark("")]
\ No newline at end of file
diff --git a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
index a026d89f..54829404 100644
--- a/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
+++ b/nsw/Source/bsmd.database/Properties/AssemblyProjectInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.9.2.*")]
+[assembly: AssemblyVersion("3.9.3.*")]
 
diff --git a/nsw/Source/bsmd.database/RuleEngine.cs b/nsw/Source/bsmd.database/RuleEngine.cs
index df779ec5..3343e5c9 100644
--- a/nsw/Source/bsmd.database/RuleEngine.cs
+++ b/nsw/Source/bsmd.database/RuleEngine.cs
@@ -322,6 +322,10 @@ namespace bsmd.database
                             }
                             break;
                         }
+                    case ValidationCode.NOT_NULL_MAX_LEN:
+                        if ((value.Length > maxlen) || (value.Length == 0))
+                            errors.Add(RuleEngine.CreateError(validationCode, property.Name, value, entity.Title, identifier, entity.Tablename));
+                        break;
                     default:
                         break;
                 }
diff --git a/nsw/Source/bsmd.database/SERV.cs b/nsw/Source/bsmd.database/SERV.cs
index 821078ec..e5741058 100644
--- a/nsw/Source/bsmd.database/SERV.cs
+++ b/nsw/Source/bsmd.database/SERV.cs
@@ -25,21 +25,22 @@ namespace bsmd.database
         #region Properties
 
         [ShowReport]
-        [MaxLength(100)]
+        [MaxLength(99)]
         [ENI2Validation]
+        [Validation(ValidationCode.STRING_MAXLEN, 99)]
         public string ServiceName { get; set; }
 
         [ShowReport]
-        [Validation1(ValidationCode.NOT_NULL)]
+        [Validation(ValidationCode.NOT_NULL_MAX_LEN, 99)]
         [LookupName("SERV.ServiceBeneficiary")]
-        [MaxLength(100)]
+        [MaxLength(99)]
         [ENI2Validation]
         public string ServiceBeneficiary { get; set; }
 
         [ShowReport]
-        [Validation1(ValidationCode.NOT_NULL)]
+        [Validation(ValidationCode.NOT_NULL_MAX_LEN, 99)]
         [LookupName("SERV.ServiceInvoiceRecipient")]
-        [MaxLength(100)]
+        [MaxLength(99)]
         [ENI2Validation]
         public string ServiceInvoiceRecipient { get; set; }
 
diff --git a/nsw/Source/bsmd.database/ValidationAttribute.cs b/nsw/Source/bsmd.database/ValidationAttribute.cs
index d8fbcd0d..867d8b8f 100644
--- a/nsw/Source/bsmd.database/ValidationAttribute.cs
+++ b/nsw/Source/bsmd.database/ValidationAttribute.cs
@@ -23,19 +23,20 @@ namespace bsmd.database
         LOCODE,
         LOCODE_GER,
         GISIS,
-        INT_GT_ZERO,
+        INT_GT_ZERO, // 5
         DOUBLE_GT_ZERO,
         FLAG_CODE,
         TWO_DIGIT,
         STRING_MAXLEN,
-        STRING_EXACT_LEN,
+        STRING_EXACT_LEN, // 10
         LIST_EMPTY,
         IMPLAUSIBLE,
         IMPLAUSIBLE_ZZUKN,
         LOCODE_NOPORT,
-        LOCODE_SSN,
+        LOCODE_SSN, // 15
         DOT_NO_COMMA,
         VESSEL_TYPE,
+        NOT_NULL_MAX_LEN,
         POSITION_COUNT = 22,
         STRING_UNNUMBER = 23,
         STRING_IMOCLASS = 24,