Version 3.9.9 Zwischenstand

ENI-2/ENI2/ENI2/DetailViewControls/ArrivalNotificationDetailControl.xaml

@@ -12,7 +12,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="800" d:DesignWidth="1024">
     <GroupBox Name="arrivalNotificationGroupBox" Header="{x:Static p:Resources.textPortNotification}">
-        <ScrollViewer>
+        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="50" />

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

@@ -7,6 +7,7 @@ using System.Windows;
 using bsmd.database;
 using ENI2.EditControls;
 using System.Windows.Media;
+using System.Windows.Controls;
 
 namespace ENI2.DetailViewControls
 {
@@ -239,5 +240,16 @@ namespace ENI2.DetailViewControls
 
         #endregion
 
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
+
     }
 }

ENI-2/ENI2/ENI2/DetailViewControls/BorderPoliceDetailControl.xaml

@@ -14,7 +14,7 @@
     <TabControl Margin="10" Name="mainFrame">
         <TabItem Header="{x:Static p:Resources.textTabBorderPolice}" Name="tabBorderPolice">
             <GroupBox Name="groupBoxBorderPolice" Header="{x:Static p:Resources.textGroupBoxBorderPolice}">
-                <ScrollViewer>
+                <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="1*" />

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

@@ -565,5 +565,16 @@ namespace ENI2.DetailViewControls
 
         #endregion
 
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
+
     }
 }

ENI-2/ENI2/ENI2/DetailViewControls/DepartureNotificationDetailControl.xaml

@@ -12,7 +12,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="800" d:DesignWidth="1024">
     <GroupBox Name="arrivalNotificationGroupBox" Header="{x:Static p:Resources.textPortNotification}">
-        <ScrollViewer>
+        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="50" />

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

@@ -7,6 +7,7 @@ using System.Windows;
 using bsmd.database;
 using ENI2.EditControls;
 using ENI2.Util;
+using System.Windows.Controls;
 
 namespace ENI2.DetailViewControls
 {
@@ -254,5 +255,16 @@ namespace ENI2.DetailViewControls
 
         #endregion
 
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
+
     }
 }

ENI-2/ENI2/ENI2/DetailViewControls/MaritimeHealthDeclarationDetailControl.xaml

@@ -13,7 +13,7 @@
     <TabControl Margin="10" Name="mainFrame">
         <TabItem Header="{x:Static p:Resources.textMaritimeHealthDeclaration}" Name="tabMaritimeHealthDeclaration">
             <GroupBox Name="mdhGroupBox" Header="{x:Static p:Resources.textMDH}">
-                <ScrollViewer>
+                <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="3*" />

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

@@ -512,6 +512,17 @@ namespace ENI2.DetailViewControls
         }
 
         #endregion
-        
+
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
+
     }
 }

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

@@ -26,7 +26,7 @@
         </xctk:BusyIndicator.BusyContent>
         
         <GroupBox Name="visitTransitGroupBox" Header="{x:Static p:Resources.textVisitTransit}">
-            <ScrollViewer>
+            <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="28" />

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

@@ -690,7 +690,18 @@ namespace ENI2.DetailViewControls
         {
             this.OnRequestValidate();           
         }
-        
+
+        #endregion
+
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
         #endregion
 
     }

ENI-2/ENI2/ENI2/DetailViewControls/PSC72hDetailControl.xaml

@@ -12,7 +12,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="800" d:DesignWidth="1024">
     <GroupBox Name="groupBoxPre72H" Header="{x:Static p:Resources.textPre72hGroupBox}">
-        <ScrollViewer>
+        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="28" />

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

@@ -6,6 +6,7 @@ using System.Windows;
 
 using bsmd.database;
 using ENI2.Util;
+using System.Windows.Controls;
 
 namespace ENI2.DetailViewControls
 {
@@ -116,6 +117,17 @@ namespace ENI2.DetailViewControls
 
         #endregion
 
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
+
     }
 
 }

ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml

@@ -12,7 +12,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="600" d:DesignWidth="800">
     <GroupBox Name="portCallGroupBox" Header="{x:Static p:Resources.textPortCall}">
-        <ScrollViewer>
+        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="300" />

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

@@ -211,5 +211,16 @@ namespace ENI2.DetailViewControls
 
         #endregion
 
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
+
     }
 }

ENI-2/ENI2/ENI2/DetailViewControls/PortNotificationDetailControl.xaml

@@ -12,7 +12,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="800" d:DesignWidth="800">
     <GroupBox Name="portNotificationGroupBox" Header="{x:Static p:Resources.textPortNotification}">
-        <ScrollViewer>
+        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="50" />

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

@@ -341,5 +341,16 @@ namespace ENI2.DetailViewControls
 
         #endregion
 
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
+
     }
 }

ENI-2/ENI2/ENI2/DetailViewControls/SecurityDetailControl.xaml

@@ -14,7 +14,7 @@
     <TabControl Margin="10" Name="mainFrame">
         <TabItem Header="{x:Static p:Resources.textSecurityNotification}" Name="tabSecurityNotification">
             <GroupBox Name="secGroupBox" Header="{x:Static p:Resources.textSEC}">
-                <ScrollViewer>
+                <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="1*" />

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

@@ -438,6 +438,17 @@ namespace ENI2.DetailViewControls
         }
 
         #endregion
-        
+
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
+
     }
 }

ENI-2/ENI2/ENI2/DetailViewControls/ShipDataDetailControl.xaml

@@ -11,7 +11,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="600" d:DesignWidth="800">
     <GroupBox Name="shipDataGroupBox" Header="{x:Static p:Resources.textShipData}" >
-        <ScrollViewer>
+        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="210" />

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

@@ -8,6 +8,7 @@ using bsmd.database;
 using ENI2.EditControls;
 using System.Windows.Media;
 using ENI2.Util;
+using System.Windows.Controls;
 
 namespace ENI2.DetailViewControls
 {
@@ -105,5 +106,16 @@ namespace ENI2.DetailViewControls
 
         #endregion
 
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
+
     }
 }

ENI-2/ENI2/ENI2/DetailViewControls/TowageDetailControl.xaml

@@ -10,7 +10,7 @@
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              mc:Ignorable="d" 
              d:DesignHeight="800" d:DesignWidth="1024">
-    <ScrollViewer>
+    <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="300" />

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

@@ -286,5 +286,16 @@ namespace ENI2.DetailViewControls
 
         #endregion
 
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
+
     }
 }

ENI-2/ENI2/ENI2/DetailViewControls/WasteDetailControl.xaml

@@ -12,7 +12,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="600" d:DesignWidth="800">
     <GroupBox Name="wasGroupBox" Header="{x:Static p:Resources.textWaste}">
-        <ScrollViewer>
+        <ScrollViewer PreviewMouseWheel="ScrollViewer_PreviewMouseWheel">
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="250" />

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

@@ -202,6 +202,17 @@ namespace ENI2.DetailViewControls
         }
 
         #endregion
-        
+
+        #region mouse wheel
+
+        private void ScrollViewer_PreviewMouseWheel(object sender, System.Windows.Input.MouseWheelEventArgs e)
+        {
+            ScrollViewer scv = (ScrollViewer)sender;
+            scv.ScrollToVerticalOffset(scv.VerticalOffset - e.Delta);
+            e.Handled = true;
+        }
+
+        #endregion
+
     }
 }

ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs

@@ -2508,7 +2508,7 @@ namespace ENI2.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Last port where waste or cargo residues where discharged.
+        ///   Looks up a localized string similar to Last port where waste or cargo residues were discharged.
         /// </summary>
         public static string textLastPortWasteDischarge {
             get {

ENI-2/ENI2/ENI2/Properties/Resources.resx

@@ -863,7 +863,7 @@
     <value>cbm</value>
   </data>
   <data name="textLastPortWasteDischarge" xml:space="preserve">
-    <value>Last port where waste or cargo residues where discharged</value>
+    <value>Last port where waste or cargo residues were discharged</value>
   </data>
   <data name="textValidExemption" xml:space="preserve">
     <value>Valid exemption</value>

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

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

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

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

nsw/Source/bsmd.database/RuleEngine.cs

@@ -331,6 +331,10 @@ namespace bsmd.database
                             {
                                 errors.Add(RuleEngine.CreateError(validationCode, property.Name, value, entity.Title, identifier, entity.Tablename));
                             }
+                            if(!value.IsNullOrEmpty() && !(value.Trim().Any(char.IsDigit))) // falls "-" oder keine Zahl enthalten, Fehler!
+                            {
+                                errors.Add(RuleEngine.CreateError(ValidationCode.IMPLAUSIBLE, property.Name, value, entity.Title, identifier, entity.Tablename));
+                            }
                             break;
                         }
                     case ValidationCode.VESSEL_TYPE: