diff --git a/ENI-2/ENI2/ENI2/AnmeldungenControl.xaml.cs b/ENI-2/ENI2/ENI2/AnmeldungenControl.xaml.cs
new file mode 100644
index 00000000..c1d5a49f
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/AnmeldungenControl.xaml.cs
@@ -0,0 +1,29 @@
+// Copyright (c) 2017 Informatibüro Daniel Schick
+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
+{
+ ///
+ /// Interaction logic for anmeldungenControl.xaml
+ ///
+ public partial class AnmeldungenControl : UserControl
+ {
+ public AnmeldungenControl()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config
new file mode 100644
index 00000000..85221ef7
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/App.config
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ENI-2/ENI2/ENI2/App.xaml b/ENI-2/ENI2/ENI2/App.xaml
new file mode 100644
index 00000000..d31823f0
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/App.xaml
@@ -0,0 +1,9 @@
+
+
+
+
+
diff --git a/ENI-2/ENI2/ENI2/App.xaml.cs b/ENI-2/ENI2/ENI2/App.xaml.cs
new file mode 100644
index 00000000..fa179ea3
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/App.xaml.cs
@@ -0,0 +1,18 @@
+// Copyright (c) 2017 Informatibüro Daniel Schick
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace ENI2
+{
+ ///
+ /// Interaction logic for App.xaml
+ ///
+ public partial class App : Application
+ {
+ }
+}
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
new file mode 100644
index 00000000..f768d517
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -0,0 +1,196 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {67A7452A-A3F2-4199-8D98-1D95AEB7B649}
+ WinExe
+ Properties
+ ENI2
+ ENI2
+ v4.5.2
+ 512
+ {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ 4
+ true
+ publish\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ false
+ true
+
+
+ AnyCPU
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ AnyCPU
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+ ENI2.App
+
+
+ true
+
+
+ bsmdKey.snk
+
+
+
+ packages\log4net.2.0.8\lib\net45-full\log4net.dll
+ True
+
+
+
+
+
+
+
+
+
+
+
+ 4.0
+
+
+
+
+
+
+
+ MSBuild:Compile
+ Designer
+
+
+ Properties\AssemblyProductInfo.cs
+
+
+ Properties\AssemblyProjectInfo.cs
+
+
+ Properties\AssemblyProjectKeyInfo.cs
+
+
+ SucheControl.xaml
+
+
+ VorgaengeControl.xaml
+
+
+
+ Designer
+ MSBuild:Compile
+
+
+ MSBuild:Compile
+ Designer
+
+
+ AnmeldungenControl.xaml
+
+
+ App.xaml
+ Code
+
+
+ MainWindow.xaml
+ Code
+
+
+ Designer
+ MSBuild:Compile
+
+
+ Designer
+ MSBuild:Compile
+
+
+
+
+ Code
+
+
+ True
+ True
+ Resources.resx
+
+
+ True
+ Settings.settings
+ True
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
+
+
+ SettingsSingleFileGenerator
+ Settings.Designer.cs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ False
+ Microsoft .NET Framework 4.5.2 %28x86 and x64%29
+ true
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
+
+
+ {19945af2-379b-46a5-b27a-303b5ec1d557}
+ bsmd.database
+
+
+
+
+
\ No newline at end of file
diff --git a/ENI-2/ENI2/ENI2/ENI2.licenseheader b/ENI-2/ENI2/ENI2/ENI2.licenseheader
new file mode 100644
index 00000000..e06ef084
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/ENI2.licenseheader
@@ -0,0 +1,13 @@
+extensions: designer.cs generated.cs
+extensions: .cs .cpp .h
+// Copyright (c) 2017 Informatibüro Daniel Schick
+extensions: .aspx .ascx
+<%--
+Copyright (c) 2017 Informatikbüro Daniel Schick
+--%>
+extensions: .vb
+'Sample license text.
+extensions: .xml .config .xsd
+
\ No newline at end of file
diff --git a/ENI-2/ENI2/ENI2/ENI2.sln b/ENI-2/ENI2/ENI2/ENI2.sln
new file mode 100644
index 00000000..b37e9d37
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/ENI2.sln
@@ -0,0 +1,28 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ENI2", "ENI2.csproj", "{67A7452A-A3F2-4199-8D98-1D95AEB7B649}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "bsmd.database", "..\..\..\nsw\Source\bsmd.database\bsmd.database.csproj", "{19945AF2-379B-46A5-B27A-303B5EC1D557}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {67A7452A-A3F2-4199-8D98-1D95AEB7B649}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {67A7452A-A3F2-4199-8D98-1D95AEB7B649}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {67A7452A-A3F2-4199-8D98-1D95AEB7B649}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {67A7452A-A3F2-4199-8D98-1D95AEB7B649}.Release|Any CPU.Build.0 = Release|Any CPU
+ {19945AF2-379B-46A5-B27A-303B5EC1D557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {19945AF2-379B-46A5-B27A-303B5EC1D557}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {19945AF2-379B-46A5-B27A-303B5EC1D557}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {19945AF2-379B-46A5-B27A-303B5EC1D557}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/ENI-2/ENI2/ENI2/MainWindow.xaml b/ENI-2/ENI2/ENI2/MainWindow.xaml
new file mode 100644
index 00000000..360f0884
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/MainWindow.xaml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ENI-2/ENI2/ENI2/MainWindow.xaml.cs b/ENI-2/ENI2/ENI2/MainWindow.xaml.cs
new file mode 100644
index 00000000..d0ca2c83
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/MainWindow.xaml.cs
@@ -0,0 +1,110 @@
+// Copyright (c) 2017 Informatibüro Daniel Schick
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+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;
+
+namespace ENI2
+{
+ ///
+ /// Interaction logic for MainWindow.xaml
+ ///
+ public partial class MainWindow : Window
+ {
+ private bool dbConnected;
+ private VorgaengeControl vorgaengeControl;
+ private AnmeldungenControl anmeldungenControl;
+ private SucheControl sucheControl;
+ private List anmeldungen = new List();
+
+ public MainWindow()
+ {
+ InitializeComponent();
+
+ this.vorgaengeControl = new VorgaengeControl();
+ this.anmeldungenControl = new AnmeldungenControl();
+ this.sucheControl = new SucheControl();
+
+
+ }
+
+ #region Window control click event handler
+
+ private void buttonAnmeldungen_Click(object sender, RoutedEventArgs e)
+ {
+ mainFrame.Children.Clear();
+ if (dbConnected)
+ {
+ this.anmeldungen = DBManager.Instance.GetMessageCoresByStatus(MessageCore.BSMDStatus.PREPARE);
+ /*
+ this.generalProgressStatus.Value = 0;
+ this.generalProgressStatus.Maximum = cores.Count;
+ foreach (MessageCore core in cores)
+ {
+ this.generalProgressStatus.Dispatcher.Invoke(() => this.generalProgressStatus.Value++, System.Windows.Threading.DispatcherPriority.Background);
+ MessageCoreModel mcm = new MessageCoreModel(core);
+ this.anmeldungen.Add(mcm);
+ }
+ */
+ }
+ anmeldungenControl.dataGrid.ItemsSource = this.anmeldungen;
+
+ mainFrame.Children.Add(this.anmeldungenControl);
+
+ }
+
+ private void buttonVorgaenge_Click(object sender, RoutedEventArgs e)
+ {
+ mainFrame.Children.Clear();
+ mainFrame.Children.Add(this.vorgaengeControl);
+ }
+
+ private void buttonSuche_Click(object sender, RoutedEventArgs e)
+ {
+ mainFrame.Children.Clear();
+ mainFrame.Children.Add(this.sucheControl);
+ }
+
+ private void logoImage_MouseUp(object sender, MouseButtonEventArgs e)
+ {
+ Process.Start("http://www.eureport.de/");
+ }
+
+ #endregion
+
+ #region window lifetime event handler
+
+ private void Window_Loaded(object sender, RoutedEventArgs e)
+ {
+ this.dbConnected = DBManager.Instance.Connect(Properties.Settings.Default.ConnectionString);
+ labelGeneralStatus.Text = dbConnected ? "DB Connected" : "DB Connect failed";
+ }
+
+ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+ {
+ DBManager.Instance.Disconnect();
+ Properties.Settings.Default.MainWindowPlacement = this.GetPlacement();
+ Properties.Settings.Default.Save();
+ }
+
+ private void Window_SourceInitialized(object sender, EventArgs e)
+ {
+ this.SetPlacement(Properties.Settings.Default.MainWindowPlacement);
+ }
+
+ #endregion
+ }
+}
diff --git a/ENI-2/ENI2/ENI2/Properties/AssemblyInfo.cs b/ENI-2/ENI2/ENI2/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..0b788519
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/Properties/AssemblyInfo.cs
@@ -0,0 +1,37 @@
+// Copyright (c) 2017 Informatibüro Daniel Schick
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ENI2")]
+[assembly: AssemblyDescription("Frontend for BSMD NSW database and processing NSW data")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set
+//CultureYouAreCodingWith in your .csproj file
+//inside a . For example, if you are using US english
+//in your source files, set the to en-US. Then uncomment
+//the NeutralResourceLanguage attribute below. Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+ ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+ //(used if a resource is not found in the page,
+ // or application resource dictionaries)
+ ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+ //(used if a resource is not found in the page,
+ // app, or any theme specific resource dictionaries)
+)]
diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs b/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
new file mode 100644
index 00000000..860c5bd4
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/Properties/Resources.Designer.cs
@@ -0,0 +1,83 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace ENI2.Properties {
+ using System;
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ENI2.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+ ///
+ internal static System.Drawing.Icon containership {
+ get {
+ object obj = ResourceManager.GetObject("containership", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap EUREPORT {
+ get {
+ object obj = ResourceManager.GetObject("EUREPORT", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+ }
+}
diff --git a/ENI-2/ENI2/ENI2/Properties/Resources.resx b/ENI-2/ENI2/ENI2/Properties/Resources.resx
new file mode 100644
index 00000000..0cc0367d
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/Properties/Resources.resx
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+ ..\Resources\containership.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\EUREPORT.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
\ No newline at end of file
diff --git a/ENI-2/ENI2/ENI2/Properties/Settings.Designer.cs b/ENI-2/ENI2/ENI2/Properties/Settings.Designer.cs
new file mode 100644
index 00000000..b993b06d
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/Properties/Settings.Designer.cs
@@ -0,0 +1,48 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace ENI2.Properties {
+
+
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+ internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
+ private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+ public static Settings Default {
+ get {
+ return defaultInstance;
+ }
+ }
+
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("Data Source=(localdb)\\Projects;Initial Catalog=nsw;Integrated Security=True;Conne" +
+ "ct Timeout=30;Encrypt=False;TrustServerCertificate=False")]
+ public string ConnectionString {
+ get {
+ return ((string)(this["ConnectionString"]));
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("")]
+ public string MainWindowPlacement {
+ get {
+ return ((string)(this["MainWindowPlacement"]));
+ }
+ set {
+ this["MainWindowPlacement"] = value;
+ }
+ }
+ }
+}
diff --git a/ENI-2/ENI2/ENI2/Properties/Settings.settings b/ENI-2/ENI2/ENI2/Properties/Settings.settings
new file mode 100644
index 00000000..caf8dbb4
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/Properties/Settings.settings
@@ -0,0 +1,12 @@
+
+
+
+
+
+ Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ENI-2/ENI2/ENI2/Resources/EUREPORT.png b/ENI-2/ENI2/ENI2/Resources/EUREPORT.png
new file mode 100644
index 00000000..f3724082
Binary files /dev/null and b/ENI-2/ENI2/ENI2/Resources/EUREPORT.png differ
diff --git a/ENI-2/ENI2/ENI2/Resources/containership.ico b/ENI-2/ENI2/ENI2/Resources/containership.ico
new file mode 100644
index 00000000..51fbac0f
Binary files /dev/null and b/ENI-2/ENI2/ENI2/Resources/containership.ico differ
diff --git a/ENI-2/ENI2/ENI2/SplashScreen.png b/ENI-2/ENI2/ENI2/SplashScreen.png
new file mode 100644
index 00000000..ee866d01
Binary files /dev/null and b/ENI-2/ENI2/ENI2/SplashScreen.png differ
diff --git a/ENI-2/ENI2/ENI2/SucheControl.xaml b/ENI-2/ENI2/ENI2/SucheControl.xaml
new file mode 100644
index 00000000..eae5fda9
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/SucheControl.xaml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/ENI-2/ENI2/ENI2/SucheControl.xaml.cs b/ENI-2/ENI2/ENI2/SucheControl.xaml.cs
new file mode 100644
index 00000000..b29950e1
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/SucheControl.xaml.cs
@@ -0,0 +1,29 @@
+// Copyright (c) 2017 Informatibüro Daniel Schick
+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
+{
+ ///
+ /// Interaction logic for SucheControl.xaml
+ ///
+ public partial class SucheControl : UserControl
+ {
+ public SucheControl()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/ENI-2/ENI2/ENI2/VorgaengeControl.xaml b/ENI-2/ENI2/ENI2/VorgaengeControl.xaml
new file mode 100644
index 00000000..c03beac9
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/VorgaengeControl.xaml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/ENI-2/ENI2/ENI2/VorgaengeControl.xaml.cs b/ENI-2/ENI2/ENI2/VorgaengeControl.xaml.cs
new file mode 100644
index 00000000..04009307
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/VorgaengeControl.xaml.cs
@@ -0,0 +1,29 @@
+// Copyright (c) 2017 Informatibüro Daniel Schick
+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
+{
+ ///
+ /// Interaction logic for VorgaengeControl.xaml
+ ///
+ public partial class VorgaengeControl : UserControl
+ {
+ public VorgaengeControl()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/ENI-2/ENI2/ENI2/WindowPlacement.cs b/ENI-2/ENI2/ENI2/WindowPlacement.cs
new file mode 100644
index 00000000..22cf4c52
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/WindowPlacement.cs
@@ -0,0 +1,132 @@
+// Copyright (c) 2017 Informatibüro Daniel Schick
+
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows;
+using System.Windows.Interop;
+using System.Xml;
+using System.Xml.Serialization;
+
+namespace ENI2
+{
+
+ // RECT structure required by WINDOWPLACEMENT structure
+ [Serializable]
+ [StructLayout(LayoutKind.Sequential)]
+ public struct RECT
+ {
+ public int Left;
+ public int Top;
+ public int Right;
+ public int Bottom;
+
+ public RECT(int left, int top, int right, int bottom)
+ {
+ this.Left = left;
+ this.Top = top;
+ this.Right = right;
+ this.Bottom = bottom;
+ }
+ }
+
+ // POINT structure required by WINDOWPLACEMENT structure
+ [Serializable]
+ [StructLayout(LayoutKind.Sequential)]
+ public struct POINT
+ {
+ public int X;
+ public int Y;
+
+ public POINT(int x, int y)
+ {
+ this.X = x;
+ this.Y = y;
+ }
+ }
+
+ // WINDOWPLACEMENT stores the position, size, and state of a window
+ [Serializable]
+ [StructLayout(LayoutKind.Sequential)]
+ public struct WINDOWPLACEMENT
+ {
+ public int length;
+ public int flags;
+ public int showCmd;
+ public POINT minPosition;
+ public POINT maxPosition;
+ public RECT normalPosition;
+ }
+
+ public static class WindowPlacement
+ {
+
+ private static Encoding encoding = new UTF8Encoding();
+ private static XmlSerializer serializer = new XmlSerializer(typeof(WINDOWPLACEMENT));
+
+ [DllImport("user32.dll")]
+ private static extern bool SetWindowPlacement(IntPtr hWnd, [In] ref WINDOWPLACEMENT lpwndpl);
+
+ [DllImport("user32.dll")]
+ private static extern bool GetWindowPlacement(IntPtr hWnd, out WINDOWPLACEMENT lpwndpl);
+
+ private const int SW_SHOWNORMAL = 1;
+ private const int SW_SHOWMINIMIZED = 2;
+
+ public static void SetPlacement(IntPtr windowHandle, string placementXml)
+ {
+ if (string.IsNullOrEmpty(placementXml))
+ {
+ return;
+ }
+
+ WINDOWPLACEMENT placement;
+ byte[] xmlBytes = encoding.GetBytes(placementXml);
+
+ try
+ {
+ using (MemoryStream memoryStream = new MemoryStream(xmlBytes))
+ {
+ placement = (WINDOWPLACEMENT)serializer.Deserialize(memoryStream);
+ }
+
+ placement.length = Marshal.SizeOf(typeof(WINDOWPLACEMENT));
+ placement.flags = 0;
+ placement.showCmd = (placement.showCmd == SW_SHOWMINIMIZED ? SW_SHOWNORMAL : placement.showCmd);
+ SetWindowPlacement(windowHandle, ref placement);
+ }
+ catch (InvalidOperationException)
+ {
+ // Parsing placement XML failed. Fail silently.
+ }
+ }
+
+ public static string GetPlacement(IntPtr windowHandle)
+ {
+ WINDOWPLACEMENT placement = new WINDOWPLACEMENT();
+ GetWindowPlacement(windowHandle, out placement);
+
+ using (MemoryStream memoryStream = new MemoryStream())
+ {
+ using (XmlTextWriter xmlTextWriter = new XmlTextWriter(memoryStream, Encoding.UTF8))
+ {
+ serializer.Serialize(xmlTextWriter, placement);
+ byte[] xmlBytes = memoryStream.ToArray();
+ return encoding.GetString(xmlBytes);
+ }
+ }
+ }
+
+ public static void SetPlacement(this Window window, string placementXml)
+ {
+ WindowPlacement.SetPlacement(new WindowInteropHelper(window).Handle, placementXml);
+ }
+
+ public static string GetPlacement(this Window window)
+ {
+ return WindowPlacement.GetPlacement(new WindowInteropHelper(window).Handle);
+ }
+
+ }
+}
diff --git a/ENI-2/ENI2/ENI2/anmeldungenControl.xaml b/ENI-2/ENI2/ENI2/anmeldungenControl.xaml
new file mode 100644
index 00000000..fc8ad751
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/anmeldungenControl.xaml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ENI-2/ENI2/ENI2/bsmdKey.snk b/ENI-2/ENI2/ENI2/bsmdKey.snk
new file mode 100644
index 00000000..fd20ba24
Binary files /dev/null and b/ENI-2/ENI2/ENI2/bsmdKey.snk differ
diff --git a/ENI-2/ENI2/ENI2/packages.config b/ENI-2/ENI2/ENI2/packages.config
new file mode 100644
index 00000000..7c1eb7f1
--- /dev/null
+++ b/ENI-2/ENI2/ENI2/packages.config
@@ -0,0 +1,7 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 7dd4bef4..6253e2d1 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.database/MessageCore.cs b/nsw/Source/bsmd.database/MessageCore.cs
index d3ecc565..0c1ac5f4 100644
--- a/nsw/Source/bsmd.database/MessageCore.cs
+++ b/nsw/Source/bsmd.database/MessageCore.cs
@@ -122,6 +122,16 @@ namespace bsmd.database
get { return this.PoC?.StartsWith("DK") ?? false; }
}
+ ///
+ /// ENI-2
+ ///
+ public string EditedBy { get; set; }
+
+ ///
+ /// ENI-2
+ ///
+ public string Shipname { get; set; }
+
///
/// Flag zeigt an ob ein Excelsheet erzeugt werden soll
///
@@ -172,6 +182,7 @@ namespace bsmd.database
scmd.Parameters.AddWithValue("@P24", this.Incoming ? 1 : 0);
scmd.Parameters.AddWithNullableValue("@P25", this.DefaultReportingPartyId);
scmd.Parameters.AddWithValue("@P26", this.CreateExcel ? 1 : 0);
+ scmd.Parameters.AddWithValue("@P27", this.EditedBy);
if (this.IsNew)
{
@@ -180,9 +191,9 @@ namespace bsmd.database
string query = string.Format("INSERT INTO {0} (Id, VisitId, TransitId, IMO, ENI, PoC, Portname, ETA, CustomerId, " +
"Previous, Next, IsTransit, Wetris_zz_56_datensatz_id, BSMDStatus, InitialHIS, HerbergFormGuid, " +
"HerbergFormTemplateGuid, HerbergReportType, HerbergEmailcontactReportingVessel, HerbergEmail24HrsContact, " +
- "ETAKielCanal, HerbergRevDate, ReportStatus, SietasSheetVersion, Incoming, DefaultReportingPartyId, CreateExcel) VALUES " +
+ "ETAKielCanal, HerbergRevDate, ReportStatus, SietasSheetVersion, Incoming, DefaultReportingPartyId, CreateExcel, EditedBy) VALUES " +
"(@ID, @P1, @P2, @P3, @P4, @P5, @P6, @P7, @P8, @P9, @P10, @P11, @P12, @P13, @P14, @P15, @P16, @P17, " +
- "@P18, @P19, @P20, @P21, @P22, @P23, @P24, @P25, @P26)",
+ "@P18, @P19, @P20, @P21, @P22, @P23, @P24, @P25, @P26, @P27)",
this.Tablename);
scmd.CommandText = query;
}
@@ -194,7 +205,8 @@ namespace bsmd.database
"Wetris_zz_56_datensatz_id = @P12, BSMDStatus = @P13, InitialHIS = @P14, HerbergFormGuid = @P15, " +
"HerbergFormTemplateGuid = @P16, HerbergReportType = @P17, HerbergEmailContactReportingVessel = @P18, " +
"HerbergEmail24HrsContact = @P19, ETAKielCanal = @P20, HerbergRevDate = @P21, ReportStatus = @P22, " +
- "SietasSheetVersion = @P23, Incoming = @P24, DefaultReportingPartyId = @P25, CreateExcel = @P26 WHERE Id = @ID", this.Tablename);
+ "SietasSheetVersion = @P23, Incoming = @P24, DefaultReportingPartyId = @P25, CreateExcel = @P26, EditedBy = @P27 " +
+ "WHERE Id = @ID", this.Tablename);
scmd.CommandText = query;
}
}
@@ -205,7 +217,7 @@ namespace bsmd.database
"ETA, CustomerId, Previous, Next, IsTransit, Wetris_zz_56_datensatz_id, BSMDStatus, InitialHIS, " +
"HerbergFormGuid, HerbergFormTemplateGuid, HerbergReportType, HerbergEmailContactReportingVessel, " +
"HerbergEmail24HrsContact, ETAKielCanal, HerbergRevDate, ReportStatus, SietasSheetVersion, Incoming, " +
- "DefaultReportingPartyId, Created, Changed, CreateExcel FROM {0} ",
+ "DefaultReportingPartyId, Created, Changed, CreateExcel, EditedBy FROM {0} ",
this.Tablename);
switch (filter)
@@ -308,6 +320,7 @@ namespace bsmd.database
if (!reader.IsDBNull(26)) core.created = reader.GetDateTime(26);
if (!reader.IsDBNull(27)) core.changed = reader.GetDateTime(27);
if (!reader.IsDBNull(28)) core.CreateExcel = reader.GetBoolean(28);
+ if (!reader.IsDBNull(29)) core.EditedBy = reader.GetString(29);
result.Add(core);
}