diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml
index 9fa17b45..d5ca2996 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml
@@ -43,18 +43,16 @@
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
+
diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
index f3db1343..b67ee983 100644
--- a/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
+++ b/ENI-2/ENI2/ENI2/DetailViewControls/PortCallDetailControl.xaml.cs
@@ -2,12 +2,15 @@
// Description: Detailansicht NOA_NOD, AGNT
//
+using System;
+using System.Text.RegularExpressions;
using System.Windows;
using System.Windows.Controls;
using bsmd.database;
using ENI2.EditControls;
using ENI2.Util;
+using Xceed.Wpf.Toolkit;
namespace ENI2.DetailViewControls
{
@@ -222,5 +225,29 @@ namespace ENI2.DetailViewControls
#endregion
+ #region "BHV Spezial" Datetime Parsing..
+
+ private void DateTimePicker_PreviewKeyUp(object sender, System.Windows.Input.KeyEventArgs e)
+ {
+ DateTimePicker thePicker = sender as DateTimePicker;
+ Regex r = new Regex(@"^(\d{12})$");
+ if((thePicker != null) && r.IsMatch(thePicker.Text))
+ {
+ try
+ {
+ string timevalText = r.Match(thePicker.Text).Captures[0].Value;
+ int day = Int32.Parse(timevalText.Substring(0, 2));
+ int month = Int32.Parse(timevalText.Substring(2, 2));
+ int year = Int32.Parse(timevalText.Substring(4, 4));
+ int hour = Int32.Parse(timevalText.Substring(8, 2));
+ int minute = Int32.Parse(timevalText.Substring(10, 2));
+ thePicker.Value = new DateTime(year, month, day, hour, minute, 0);
+ }
+ catch (FormatException) { }
+ }
+ }
+
+ #endregion
+
}
}
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index f47cccd5..95cc2935 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -94,8 +94,8 @@
true
-
- packages\ExcelDataReader.3.4.0\lib\net45\ExcelDataReader.dll
+
+ packages\ExcelDataReader.3.5.0\lib\net45\ExcelDataReader.dll
packages\log4net.2.0.8\lib\net45-full\log4net.dll
@@ -103,8 +103,8 @@
-
- packages\System.Data.SQLite.Core.1.0.108.0\lib\net451\System.Data.SQLite.dll
+
+ packages\System.Data.SQLite.Core.1.0.110.0\lib\net451\System.Data.SQLite.dll
@@ -125,23 +125,20 @@
-
- packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.AvalonDock.dll
+
+ packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.dll
-
- packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll
+
+ packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll
-
- packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll
+
+ packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll
-
- packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
+
+ packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll
-
- packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.DataGrid.dll
-
-
- packages\Extended.Wpf.Toolkit.3.2.0\lib\net40\Xceed.Wpf.Toolkit.dll
+
+ packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.Toolkit.dll
@@ -812,12 +809,12 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 96dc88da..1d2748ed 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.LockingService/IService.cs b/nsw/Source/bsmd.LockingService/IService.cs
index cd01e1b7..dbdba8fc 100644
--- a/nsw/Source/bsmd.LockingService/IService.cs
+++ b/nsw/Source/bsmd.LockingService/IService.cs
@@ -52,10 +52,23 @@ namespace bsmd.LockingService
[WebGet(BodyStyle = WebMessageBodyStyle.Wrapped, RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json)]
void Log(string msg, string host, Guid userId);
+ ///
+ /// Get current overview of sent/corrupted/open files (His-Nord)
+ ///
+ ///
[OperationContract]
[WebGet(BodyStyle = WebMessageBodyStyle.Wrapped, RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json)]
ServerStatus GetStatus();
+ ///
+ /// Takes this file from the "READY" Folder and copies contents back in the database (restore from unvoluntary overwrite)
+ ///
+ ///
+ /// true on success
+ [OperationContract]
+ [WebGet(BodyStyle = WebMessageBodyStyle.Wrapped, RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json)]
+ bool RestoreFromFile(string filename);
+
}
}
diff --git a/nsw/Source/bsmd.LockingService/LockingService.svc.cs b/nsw/Source/bsmd.LockingService/LockingService.svc.cs
index d17749c1..bd012032 100644
--- a/nsw/Source/bsmd.LockingService/LockingService.svc.cs
+++ b/nsw/Source/bsmd.LockingService/LockingService.svc.cs
@@ -175,6 +175,28 @@ namespace bsmd.LockingService
return serverStatus;
}
+ public bool RestoreFromFile(string filename)
+ {
+ bool result = false;
+ string readyPath = Path.Combine(Properties.Settings.Default.TransmitterRoot, "READY");
+ string filePath = string.Format("{0}\\{1}.xml", readyPath, filename);
+ if(File.Exists(filePath))
+ {
+ _log.InfoFormat("Restoring declaraction class from {0}", filePath);
+
+ // TBD
+
+ result = true;
+ }
+ else
+ {
+ _log.ErrorFormat("Restore file {0} does not exist", filePath);
+ }
+
+ return result;
+ }
+
+
#endregion
#region class LockEntry