ENI-2: kleines Stück weiter

ENI-2/ENI2/ENI2/DetailBaseControl.cs

@@ -1,5 +1,5 @@
 // Copyright (c) 2017 schick Informatik
-// Description:
+// Description: Basisklasse für die Detailansichten. Hier sollten Dinge wie Validierung etc. abgehandelt werden
 //
 
 using System;

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

@@ -40,19 +40,19 @@ namespace ENI2
 
             // Listbox befüllen
             this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Overview", MessageGroupControlType = typeof(OverViewDetailControl), ImagePath = "Resources/documents.png" });
-            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Port Call", MessageGroupControlType = typeof(DetailBaseControl), ImagePath = "Resources/eye_blue.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Port Call", MessageGroupControlType = typeof(PortCallDetailControl), ImagePath = "Resources/eye_blue.png" });
-            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Port Notification", MessageGroupControlType = typeof(DetailBaseControl), ImagePath = "Resources/anchor.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Port Notification", MessageGroupControlType = typeof(PortNotificationDetailControl), ImagePath = "Resources/anchor.png" });
-            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Waste", MessageGroupControlType = typeof(DetailBaseControl), ImagePath = "Resources/garbage.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Waste", MessageGroupControlType = typeof(WasteDetailControl), ImagePath = "Resources/garbage.png" });
-            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Arrival Notification", MessageGroupControlType = typeof(DetailBaseControl), ImagePath = "Resources/arrow_down_right_red.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Arrival Notification", MessageGroupControlType = typeof(ArrivalNotificationDetailControl), ImagePath = "Resources/arrow_down_right_red.png" });
-            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Security", MessageGroupControlType = typeof(DetailBaseControl), ImagePath = "Resources/shield_yellow.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Security", MessageGroupControlType = typeof(SecurityDetailControl), ImagePath = "Resources/shield_yellow.png" });
-            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "PSC 72h", MessageGroupControlType = typeof(DetailBaseControl), ImagePath = "Resources/alarmclock.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "PSC 72h", MessageGroupControlType = typeof(PSC72hDetailControl), ImagePath = "Resources/alarmclock.png" });
-            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Maritime Health Declaration", MessageGroupControlType = typeof(DetailBaseControl), ImagePath = "Resources/medical_bag.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Maritime Health Declaration", MessageGroupControlType = typeof(MaritimeHealthDeclarationDetailControl), ImagePath = "Resources/medical_bag.png" });
-            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Ship Data", MessageGroupControlType = typeof(DetailBaseControl), ImagePath = "Resources/containership.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Ship Data", MessageGroupControlType = typeof(ShipDataDetailControl), ImagePath = "Resources/containership.png" });
-            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Border Police", MessageGroupControlType = typeof(DetailBaseControl), ImagePath = "Resources/policeman_german.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Border Police", MessageGroupControlType = typeof(BorderPoliceDetailControl), ImagePath = "Resources/policeman_german.png" });
-            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Departure Notification", MessageGroupControlType = typeof(DetailBaseControl), ImagePath = "Resources/arrow_up_right_green.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Departure Notification", MessageGroupControlType = typeof(DepartureNotificationDetailControl), ImagePath = "Resources/arrow_up_right_green.png" });
-            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Dangerous Goods Arrival", MessageGroupControlType = typeof(DetailBaseControl), ImagePath = "Resources/sign_warning_radiation.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Dangerous Goods Arrival", MessageGroupControlType = typeof(DangerousGoodsDetailControl), ImagePath = "Resources/sign_warning_radiation.png" });
-            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Dangerous Goods Departure", MessageGroupControlType = typeof(DetailBaseControl), ImagePath = "Resources/sign_warning_radiation.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Dangerous Goods Departure", MessageGroupControlType = typeof(DangerousGoodsDetailControl), ImagePath = "Resources/sign_warning_radiation.png" });
-            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Towage", MessageGroupControlType = typeof(DetailBaseControl), ImagePath = "Resources/ship2.png" });
+            this._listBoxList.Add(new MessageGroup() { MessageGroupName = "Towage", MessageGroupControlType = typeof(TowageDetailControl), ImagePath = "Resources/ship2.png" });
 
 
             this.listBoxMessages.ItemsSource = this._listBoxList;

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

@@ -0,0 +1,13 @@
+<src:DetailBaseControl xmlns:src="clr-namespace:ENI2"
+             x:Class="ENI2.DetailViewControls.ArrivalNotificationDetailControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ENI2.DetailViewControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+            
+    </Grid>
+</src:DetailBaseControl>

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

@@ -0,0 +1,32 @@
+// Copyright (c) 2017 schick Informatik
+// Description:
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ENI2.DetailViewControls
+{
+    /// <summary>
+    /// Interaction logic for ArrivalNotificationDetailControl.xaml
+    /// </summary>
+    public partial class ArrivalNotificationDetailControl : DetailBaseControl
+    {
+        public ArrivalNotificationDetailControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+<src:DetailBaseControl xmlns:src="clr-namespace:ENI2"
+             x:Class="ENI2.DetailViewControls.BorderPoliceDetailControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ENI2.DetailViewControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+            
+    </Grid>
+</src:DetailBaseControl>

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

@@ -0,0 +1,32 @@
+// Copyright (c) 2017 schick Informatik
+// Description:
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ENI2.DetailViewControls
+{
+    /// <summary>
+    /// Interaction logic for BorderPoliceDetailControl.xaml
+    /// </summary>
+    public partial class BorderPoliceDetailControl : DetailBaseControl
+    {
+        public BorderPoliceDetailControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+<src:DetailBaseControl xmlns:src="clr-namespace:ENI2"
+             x:Class="ENI2.DetailViewControls.DangerousGoodsDetailControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ENI2.DetailViewControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+            
+    </Grid>
+</src:DetailBaseControl>

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

@@ -0,0 +1,32 @@
+// Copyright (c) 2017 schick Informatik
+// Description: Für Arrival / Departure
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ENI2.DetailViewControls
+{
+    /// <summary>
+    /// Interaction logic for DangerousGoodsDetailControl.xaml
+    /// </summary>
+    public partial class DangerousGoodsDetailControl : DetailBaseControl
+    {
+        public DangerousGoodsDetailControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+<src:DetailBaseControl xmlns:src="clr-namespace:ENI2"
+             x:Class="ENI2.DetailViewControls.DepartureNotificationDetailControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ENI2.DetailViewControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+            
+    </Grid>
+</src:DetailBaseControl>

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

@@ -0,0 +1,32 @@
+// Copyright (c) 2017 schick Informatik
+// Description:
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ENI2.DetailViewControls
+{
+    /// <summary>
+    /// Interaction logic for DepartureNotificationDetailControl.xaml
+    /// </summary>
+    public partial class DepartureNotificationDetailControl : DetailBaseControl
+    {
+        public DepartureNotificationDetailControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+<src:DetailBaseControl xmlns:src="clr-namespace:ENI2"
+             x:Class="ENI2.DetailViewControls.MaritimeHealthDeclarationDetailControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ENI2.DetailViewControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+            
+    </Grid>
+</src:DetailBaseControl>

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

@@ -0,0 +1,32 @@
+// Copyright (c) 2017 schick Informatik
+// Description:
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ENI2.DetailViewControls
+{
+    /// <summary>
+    /// Interaction logic for MaritimeHealthDeclarationDetailControl.xaml
+    /// </summary>
+    public partial class MaritimeHealthDeclarationDetailControl : DetailBaseControl
+    {
+        public MaritimeHealthDeclarationDetailControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+<src:DetailBaseControl xmlns:src="clr-namespace:ENI2"
+             x:Class="ENI2.DetailViewControls.PSC72hDetailControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ENI2.DetailViewControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+            
+    </Grid>
+</src:DetailBaseControl>

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

@@ -0,0 +1,32 @@
+// Copyright (c) 2017 schick Informatik
+// Description:
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ENI2.DetailViewControls
+{
+    /// <summary>
+    /// Interaction logic for PSC72hDetailControl.xaml
+    /// </summary>
+    public partial class PSC72hDetailControl : DetailBaseControl
+    {
+        public PSC72hDetailControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+ <src:DetailBaseControl xmlns:src="clr-namespace:ENI2"
+             x:Class="ENI2.DetailViewControls.PortCallDetailControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ENI2.DetailViewControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+            
+    </Grid>
+</src:DetailBaseControl>

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

@@ -0,0 +1,35 @@
+// Copyright (c) 2017 schick Informatik
+// Description:
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+using bsmd.database;
+using ENI2;
+
+namespace ENI2.DetailViewControls
+{
+    /// <summary>
+    /// Interaction logic for PortCallDetailControl.xaml
+    /// </summary>
+    public partial class PortCallDetailControl : DetailBaseControl
+    {
+        public PortCallDetailControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+<src:DetailBaseControl xmlns:src="clr-namespace:ENI2"
+             x:Class="ENI2.DetailViewControls.PortNotificationDetailControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ENI2.DetailViewControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+            
+    </Grid>
+</src:DetailBaseControl>

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

@@ -0,0 +1,32 @@
+// Copyright (c) 2017 schick Informatik
+// Description:
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ENI2.DetailViewControls
+{
+    /// <summary>
+    /// Interaction logic for PortNotificationDetailControl.xaml
+    /// </summary>
+    public partial class PortNotificationDetailControl : DetailBaseControl
+    {
+        public PortNotificationDetailControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+<src:DetailBaseControl xmlns:src="clr-namespace:ENI2"
+             x:Class="ENI2.DetailViewControls.SecurityDetailControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ENI2.DetailViewControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+            
+    </Grid>
+</src:DetailBaseControl>

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

@@ -0,0 +1,32 @@
+// Copyright (c) 2017 schick Informatik
+// Description:
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ENI2.DetailViewControls
+{
+    /// <summary>
+    /// Interaction logic for SecurityDetailControl.xaml
+    /// </summary>
+    public partial class SecurityDetailControl : DetailBaseControl
+    {
+        public SecurityDetailControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+<src:DetailBaseControl xmlns:src="clr-namespace:ENI2"
+             x:Class="ENI2.DetailViewControls.ShipDataDetailControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ENI2.DetailViewControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+            
+    </Grid>
+</src:DetailBaseControl>

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

@@ -0,0 +1,32 @@
+// Copyright (c) 2017 schick Informatik
+// Description:
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ENI2.DetailViewControls
+{
+    /// <summary>
+    /// Interaction logic for ShipDataDetailControl.xaml
+    /// </summary>
+    public partial class ShipDataDetailControl : DetailBaseControl
+    {
+        public ShipDataDetailControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+<src:DetailBaseControl xmlns:src="clr-namespace:ENI2"
+             x:Class="ENI2.DetailViewControls.TowageDetailControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ENI2.DetailViewControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+            
+    </Grid>
+</src:DetailBaseControl>

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

@@ -0,0 +1,32 @@
+// Copyright (c) 2017 schick Informatik
+// Description:
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ENI2.DetailViewControls
+{
+    /// <summary>
+    /// Interaction logic for TowageDetailControl.xaml
+    /// </summary>
+    public partial class TowageDetailControl : DetailBaseControl
+    {
+        public TowageDetailControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

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

@@ -0,0 +1,13 @@
+<src:DetailBaseControl xmlns:src="clr-namespace:ENI2"
+             x:Class="ENI2.DetailViewControls.WasteDetailControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:ENI2.DetailViewControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300">
+    <Grid>
+            
+    </Grid>
+</src:DetailBaseControl>

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

@@ -0,0 +1,32 @@
+// Copyright (c) 2017 schick Informatik
+// Description:
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace ENI2.DetailViewControls
+{
+    /// <summary>
+    /// Interaction logic for WasteDetailControl.xaml
+    /// </summary>
+    public partial class WasteDetailControl : DetailBaseControl
+    {
+        public WasteDetailControl()
+        {
+            InitializeComponent();
+        }
+    }
+}

ENI-2/ENI2/ENI2/ENI2.csproj

@@ -33,7 +33,7 @@
     <MinimumRequiredVersion>3.5.1.0</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.html</WebPage>
-    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationRevision>2</ApplicationRevision>
     <ApplicationVersion>3.5.3.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -152,9 +152,45 @@
     <Compile Include="DetailRootControl.xaml.cs">
       <DependentUpon>DetailRootControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="DetailViewControls\ArrivalNotificationDetailControl.xaml.cs">
+      <DependentUpon>ArrivalNotificationDetailControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DetailViewControls\BorderPoliceDetailControl.xaml.cs">
+      <DependentUpon>BorderPoliceDetailControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DetailViewControls\DangerousGoodsDetailControl.xaml.cs">
+      <DependentUpon>DangerousGoodsDetailControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DetailViewControls\DepartureNotificationDetailControl.xaml.cs">
+      <DependentUpon>DepartureNotificationDetailControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DetailViewControls\MaritimeHealthDeclarationDetailControl.xaml.cs">
+      <DependentUpon>MaritimeHealthDeclarationDetailControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="DetailViewControls\OverViewDetailControl.xaml.cs">
       <DependentUpon>OverViewDetailControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="DetailViewControls\PortCallDetailControl.xaml.cs">
+      <DependentUpon>PortCallDetailControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DetailViewControls\PortNotificationDetailControl.xaml.cs">
+      <DependentUpon>PortNotificationDetailControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DetailViewControls\PSC72hDetailControl.xaml.cs">
+      <DependentUpon>PSC72hDetailControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DetailViewControls\SecurityDetailControl.xaml.cs">
+      <DependentUpon>SecurityDetailControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DetailViewControls\ShipDataDetailControl.xaml.cs">
+      <DependentUpon>ShipDataDetailControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DetailViewControls\TowageDetailControl.xaml.cs">
+      <DependentUpon>TowageDetailControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DetailViewControls\WasteDetailControl.xaml.cs">
+      <DependentUpon>WasteDetailControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SucheControl.xaml.cs">
       <DependentUpon>SucheControl.xaml</DependentUpon>
     </Compile>
@@ -170,10 +206,58 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="DetailViewControls\ArrivalNotificationDetailControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DetailViewControls\BorderPoliceDetailControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DetailViewControls\DangerousGoodsDetailControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DetailViewControls\DepartureNotificationDetailControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DetailViewControls\MaritimeHealthDeclarationDetailControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="DetailViewControls\OverViewDetailControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="DetailViewControls\PortCallDetailControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DetailViewControls\PortNotificationDetailControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DetailViewControls\PSC72hDetailControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DetailViewControls\SecurityDetailControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DetailViewControls\ShipDataDetailControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DetailViewControls\TowageDetailControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DetailViewControls\WasteDetailControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -302,7 +386,9 @@
   <ItemGroup>
     <Resource Include="Resources\documents.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Resources\ef_logo.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

ENI-2/ENI2/ENI2/MainWindow.xaml

@@ -20,6 +20,7 @@
                     <ItemsPanelTemplate>
                         <Grid>
                             <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="100" />
                                 <ColumnDefinition Width="100" />
                                 <ColumnDefinition Width="100" />
                                 <ColumnDefinition Width="Auto" />
@@ -36,12 +37,15 @@
                 <StatusBarItem Grid.Column="1">
                     <TextBlock Name="labelVersion"></TextBlock>
                 </StatusBarItem>
-                <Separator Grid.Column="2"/>
+                <StatusBarItem Grid.Column="2">
-                <StatusBarItem Grid.Column="3">
+                    <TextBlock Name="labelUsername"></TextBlock>
+                </StatusBarItem>
+                <Separator Grid.Column="3"/>
+                <StatusBarItem Grid.Column="4">
                     <TextBlock Name="labelStatusBar"></TextBlock>
                 </StatusBarItem>
-                <Separator Grid.Column="4"/>
+                <Separator Grid.Column="5"/>
-                <StatusBarItem Grid.Column="5">
+                <StatusBarItem Grid.Column="6">
                     <ProgressBar Name="generalProgressStatus" Width="90" Height="16"/>
                 </StatusBarItem>
             </StatusBar>

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

@@ -32,6 +32,7 @@ namespace ENI2
         private AnmeldungenControl anmeldungenControl;
         private SucheControl sucheControl;
         private List<MessageCore> anmeldungen = new List<MessageCore>();
+        private bool efMode = false;
 
         public MainWindow()
         {
@@ -96,7 +97,8 @@ namespace ENI2
 
         private void logoImage_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            Process.Start("http://www.eureport.de/");
+            if(efMode) Process.Start("http://www.eintracht-frankfurt.de/home.html");
+            else Process.Start("http://www.eureport.de/");            
         }
 
         #endregion
@@ -108,6 +110,12 @@ namespace ENI2
             this.dbConnected = DBManager.Instance.Connect(Properties.Settings.Default.ConnectionString);
             labelGeneralStatus.Text = dbConnected ? "DB Connected" : "DB Connect failed";
             labelVersion.Text = "V. " + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+            labelUsername.Text = System.Security.Principal.WindowsIdentity.GetCurrent().Name;
+            if (Keyboard.IsKeyDown(Key.LeftShift))
+            {
+                efMode = true; 
+                logoImage.Source = new BitmapImage(new Uri("pack://application:,,,/Resources/ef_logo.png"));
+            }
         }
 
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)

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

@@ -130,6 +130,16 @@ namespace ENI2.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap ef_logo {
+            get {
+                object obj = ResourceManager.GetObject("ef_logo", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

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

@@ -166,4 +166,7 @@
   <data name="sign_warning_radiation" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\sign_warning_radiation.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ef_logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ef_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>