diff --git a/ENI2/Properties/Resources.Designer.cs b/ENI2/Properties/Resources.Designer.cs
index f17f7862..c4e05a3c 100644
--- a/ENI2/Properties/Resources.Designer.cs
+++ b/ENI2/Properties/Resources.Designer.cs
@@ -858,6 +858,15 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to 2 IBC.
+ ///
+ public static string text102 {
+ get {
+ return ResourceManager.GetString("text102", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to 10.2 IBC data (on arrival), if applicable.
///
@@ -867,6 +876,15 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to 3 IGC.
+ ///
+ public static string text103 {
+ get {
+ return ResourceManager.GetString("text103", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to 10.3 IGC data (on arrival), if applicable.
///
@@ -876,6 +894,15 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to 4 IMSBC.
+ ///
+ public static string text104 {
+ get {
+ return ResourceManager.GetString("text104", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to 10.4 IMSBC data (on arrival), if applicable.
///
@@ -885,6 +912,15 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to 5 MARPOL I.
+ ///
+ public static string text105 {
+ get {
+ return ResourceManager.GetString("text105", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to 10.5 MARPOL I data (on arrival), if applicable.
///
@@ -894,6 +930,15 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to 6 IMDG.
+ ///
+ public static string text106 {
+ get {
+ return ResourceManager.GetString("text106", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to 10.6 IMDG data (on arrival), if applicable.
///
@@ -5556,6 +5601,105 @@ namespace ENI2.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to 1-6 Actual.
+ ///
+ public static string textTab11 {
+ get {
+ return ResourceManager.GetString("textTab11", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 7-9 Tables.
+ ///
+ public static string textTab12 {
+ get {
+ return ResourceManager.GetString("textTab12", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 10 MDH.
+ ///
+ public static string textTab13 {
+ get {
+ return ResourceManager.GetString("textTab13", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Cruise.
+ ///
+ public static string textTab14 {
+ get {
+ return ResourceManager.GetString("textTab14", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 1-2 Berth.
+ ///
+ public static string textTab21 {
+ get {
+ return ResourceManager.GetString("textTab21", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 3-4 Contact.
+ ///
+ public static string textTab22 {
+ get {
+ return ResourceManager.GetString("textTab22", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 5-6 Cargo.
+ ///
+ public static string textTab23 {
+ get {
+ return ResourceManager.GetString("textTab23", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 7 Waste.
+ ///
+ public static string textTab24 {
+ get {
+ return ResourceManager.GetString("textTab24", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 1 General.
+ ///
+ public static string textTab51 {
+ get {
+ return ResourceManager.GetString("textTab51", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 2-3 MDH / SEC.
+ ///
+ public static string textTab52 {
+ get {
+ return ResourceManager.GetString("textTab52", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to 4 Tanker.
+ ///
+ public static string textTab53 {
+ get {
+ return ResourceManager.GetString("textTab53", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Border police.
///
diff --git a/ENI2/Properties/Resources.resx b/ENI2/Properties/Resources.resx
index a5e0cd9c..3c31bdc3 100644
--- a/ENI2/Properties/Resources.resx
+++ b/ENI2/Properties/Resources.resx
@@ -2170,4 +2170,52 @@
..\Resources\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ 2 IBC
+
+
+ 3 IGC
+
+
+ 4 IMSBC
+
+
+ 5 MARPOL I
+
+
+ 6 IMDG
+
+
+ 1-6 Actual
+
+
+ 7-9 Tables
+
+
+ 10 MDH
+
+
+ Cruise
+
+
+ 1-2 Berth
+
+
+ 3-4 Contact
+
+
+ 5-6 Cargo
+
+
+ 7 Waste
+
+
+ 1 General
+
+
+ 2-3 MDH / SEC
+
+
+ 4 Tanker
+
\ No newline at end of file
diff --git a/ENI2/SheetDisplayControls/DangerousCargoControl.xaml b/ENI2/SheetDisplayControls/DangerousCargoControl.xaml
index a7c1261d..e5e396de 100644
--- a/ENI2/SheetDisplayControls/DangerousCargoControl.xaml
+++ b/ENI2/SheetDisplayControls/DangerousCargoControl.xaml
@@ -22,24 +22,15 @@
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
@@ -47,146 +38,178 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
diff --git a/ENI2/SheetDisplayControls/PortControl.xaml b/ENI2/SheetDisplayControls/PortControl.xaml
index cc69c225..a719dca8 100644
--- a/ENI2/SheetDisplayControls/PortControl.xaml
+++ b/ENI2/SheetDisplayControls/PortControl.xaml
@@ -10,263 +10,118 @@
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:local="clr-namespace:ENI2.SheetDisplayControls"
mc:Ignorable="d"
- d:DesignHeight="2450" d:DesignWidth="800">
+ d:DesignHeight="1050" d:DesignWidth="800">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -277,130 +132,301 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
diff --git a/ENI2/SheetDisplayControls/PortControl.xaml.cs b/ENI2/SheetDisplayControls/PortControl.xaml.cs
index 000daf74..74ff3640 100644
--- a/ENI2/SheetDisplayControls/PortControl.xaml.cs
+++ b/ENI2/SheetDisplayControls/PortControl.xaml.cs
@@ -175,13 +175,13 @@ namespace ENI2.SheetDisplayControls
if (_stoMessage != null)
{
- this.dataGridSTO.Initialize();
- this.dataGridSTO.ItemsSource = _stoMessage.Elements;
+ // this.dataGridSTO.Initialize();
+ // this.dataGridSTO.ItemsSource = _stoMessage.Elements;
}
- // 2.9
- this.dataGridEffects.Initialize();
- this.dataGridEffects.ItemsSource = _crewMessage.Elements;
+ // 2.9
+ // this.dataGridEffects.Initialize();
+ // this.dataGridEffects.ItemsSource = _crewMessage.Elements;
}
diff --git a/ENI2/SheetDisplayControls/ShipDataControl.xaml b/ENI2/SheetDisplayControls/ShipDataControl.xaml
index dbd61a7a..a46889eb 100644
--- a/ENI2/SheetDisplayControls/ShipDataControl.xaml
+++ b/ENI2/SheetDisplayControls/ShipDataControl.xaml
@@ -10,182 +10,199 @@
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:local="clr-namespace:ENI2.SheetDisplayControls"
mc:Ignorable="d"
- d:DesignHeight="1450" d:DesignWidth="800">
+ d:DesignHeight="1050" d:DesignWidth="800">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ENI2/SheetDisplayControls/VoyageControl.xaml b/ENI2/SheetDisplayControls/VoyageControl.xaml
index e59e7eae..4f57b382 100644
--- a/ENI2/SheetDisplayControls/VoyageControl.xaml
+++ b/ENI2/SheetDisplayControls/VoyageControl.xaml
@@ -10,277 +10,313 @@
xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
xmlns:local="clr-namespace:ENI2.SheetDisplayControls"
mc:Ignorable="d"
- d:DesignHeight="2450" d:DesignWidth="800">
+ d:DesignHeight="1150" d:DesignWidth="800">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/bsmd.database/DatabaseEntity.cs b/bsmd.database/DatabaseEntity.cs
index e038eecd..9ab8a91a 100644
--- a/bsmd.database/DatabaseEntity.cs
+++ b/bsmd.database/DatabaseEntity.cs
@@ -244,7 +244,7 @@ namespace bsmd.database
// das sieht riskanter aus als es ist, diese Funktion wird aber nur für Elemente angewendet, die
// ISublistElement implementieren
- foreach(ISublistElement element in sublist)
+ foreach(ISublistElement element in sublist.Cast())
{
if (element.Identifier.IsNullOrEmpty()) continue;
int elementIdent;
@@ -287,7 +287,7 @@ namespace bsmd.database
{
List tmpList = new List(sublist);
sublist.Clear();
- foreach(ISublistElement element in tmpList)
+ foreach(ISublistElement element in tmpList.Cast())
{
element.Identifier = DatabaseEntity.GetNewIdentifier(sublist);
sublist.Add(element as DatabaseEntity);