From c70d90e9dad056b581b7bb282c145dc0a03961db Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Tue, 16 May 2017 06:42:54 +0000 Subject: [PATCH] 3.5.7.8: kleine Zwischenversion --- ENI-2/ENI2/ENI2/App.config | 14 +- ENI-2/ENI2/ENI2/App.xaml.cs | 11 + ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs | 8 +- ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs | 4 +- .../OverViewDetailControl.xaml | 46 ++-- .../OverViewDetailControl.xaml.cs | 164 ++++++++++++-- ENI-2/ENI2/ENI2/ENI2.csproj | 40 +++- .../ENI2/ENI2/EditControls/VisitIdDialog.xaml | 60 ++++++ .../ENI2/EditControls/VisitIdDialog.xaml.cs | 65 ++++++ ENI-2/ENI2/ENI2/LocalizedLookup.cs | 2 +- ENI-2/ENI2/ENI2/MainWindow.xaml | 2 +- ENI-2/ENI2/ENI2/MainWindow.xaml.cs | 94 ++++---- .../ENI2/Properties/Resources.Designer.cs | 49 ++++- ENI-2/ENI2/ENI2/Properties/Resources.resx | 19 +- .../LockingService.disco | 4 + .../LockingService.wsdl | 96 +++++++++ .../LockingService.xsd | 60 ++++++ .../LockingService1.xsd | 10 + .../LockingService2.xsd | 42 ++++ .../LockingServiceReference/Reference.cs | 102 +++++++++ .../LockingServiceReference/Reference.svcmap | 35 +++ .../configuration.svcinfo | 10 + .../configuration91.svcinfo | 201 ++++++++++++++++++ ENI-2/ENI2/ENI2/SucheControl.xaml | 4 +- Stundensheet.xlsx | Bin 30262 -> 30412 bytes nsw/Source/SQL/random_data.sql | 5 + .../bsmd.ExcelReadService/Confirmation.cs | 2 +- .../bsmd.ExcelReadService/ExcelReadService.cs | 21 +- nsw/Source/bsmd.LockingService.sln | 28 +++ nsw/Source/bsmd.LockingService/IService.cs | 73 +++++++ .../bsmd.LockingService/LockingService.svc | 1 + .../bsmd.LockingService/LockingService.svc.cs | 107 ++++++++++ .../Properties/AssemblyInfo.cs | 18 ++ .../bsmd.LockingService/Web.Debug.config | 30 +++ .../bsmd.LockingService/Web.Release.config | 31 +++ nsw/Source/bsmd.LockingService/Web.config | 36 ++++ .../bsmd.LockingService.csproj | 140 ++++++++++++ .../bsmd.LockingService.csproj.user | 31 +++ .../bsmd.LockingService.licenseheader | 15 ++ .../bsmd.LockingService/packages.config | 4 + nsw/Source/bsmd.database/MessageCore.cs | 24 ++- .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- nsw/Source/bsmd.database/bsmd.database.csproj | 1 + .../bsmd.database/bsmd.database.licenseheader | 15 ++ 45 files changed, 1607 insertions(+), 121 deletions(-) create mode 100644 ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml create mode 100644 ENI-2/ENI2/ENI2/EditControls/VisitIdDialog.xaml.cs create mode 100644 ENI-2/ENI2/ENI2/Service References/LockingServiceReference/LockingService.disco create mode 100644 ENI-2/ENI2/ENI2/Service References/LockingServiceReference/LockingService.wsdl create mode 100644 ENI-2/ENI2/ENI2/Service References/LockingServiceReference/LockingService.xsd create mode 100644 ENI-2/ENI2/ENI2/Service References/LockingServiceReference/LockingService1.xsd create mode 100644 ENI-2/ENI2/ENI2/Service References/LockingServiceReference/LockingService2.xsd create mode 100644 ENI-2/ENI2/ENI2/Service References/LockingServiceReference/Reference.cs create mode 100644 ENI-2/ENI2/ENI2/Service References/LockingServiceReference/Reference.svcmap create mode 100644 ENI-2/ENI2/ENI2/Service References/LockingServiceReference/configuration.svcinfo create mode 100644 ENI-2/ENI2/ENI2/Service References/LockingServiceReference/configuration91.svcinfo create mode 100644 nsw/Source/SQL/random_data.sql create mode 100644 nsw/Source/bsmd.LockingService.sln create mode 100644 nsw/Source/bsmd.LockingService/IService.cs create mode 100644 nsw/Source/bsmd.LockingService/LockingService.svc create mode 100644 nsw/Source/bsmd.LockingService/LockingService.svc.cs create mode 100644 nsw/Source/bsmd.LockingService/Properties/AssemblyInfo.cs create mode 100644 nsw/Source/bsmd.LockingService/Web.Debug.config create mode 100644 nsw/Source/bsmd.LockingService/Web.Release.config create mode 100644 nsw/Source/bsmd.LockingService/Web.config create mode 100644 nsw/Source/bsmd.LockingService/bsmd.LockingService.csproj create mode 100644 nsw/Source/bsmd.LockingService/bsmd.LockingService.csproj.user create mode 100644 nsw/Source/bsmd.LockingService/bsmd.LockingService.licenseheader create mode 100644 nsw/Source/bsmd.LockingService/packages.config create mode 100644 nsw/Source/bsmd.database/bsmd.database.licenseheader diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config index 85221ef7..b54015b3 100644 --- a/ENI-2/ENI2/ENI2/App.config +++ b/ENI-2/ENI2/ENI2/App.config @@ -17,7 +17,7 @@ Sample license text. - Data Source=(localdb)\Projects;Initial Catalog=nsw;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False + Data Source=192.168.2.12;Initial Catalog=nsw;Uid=dfuser;Pwd=dfpasswd;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False @@ -28,4 +28,16 @@ Sample license text. + + + + + + + + + + \ No newline at end of file diff --git a/ENI-2/ENI2/ENI2/App.xaml.cs b/ENI-2/ENI2/ENI2/App.xaml.cs index 325415f6..f4960bf5 100644 --- a/ENI-2/ENI2/ENI2/App.xaml.cs +++ b/ENI-2/ENI2/ENI2/App.xaml.cs @@ -9,6 +9,7 @@ using bsmd.database; using System.Windows.Controls; using System.Windows.Input; using System; +using ENI2.LockingServiceReference; namespace ENI2 { @@ -17,6 +18,7 @@ namespace ENI2 /// public partial class App : Application { + private ServiceClient lockingServiceClient; public App() : base() { @@ -39,6 +41,15 @@ namespace ENI2 LADG.CargoHandlingDict.Add(key, cargoHandlingDict[key]); EventManager.RegisterClassHandler(typeof(DatePicker), DatePicker.PreviewKeyDownEvent, new KeyEventHandler(this.DatePicker_PreviewKeyDown)); + try + { + // this.lockingServiceClient = new ServiceClient(); + } + catch(Exception ex) + { + System.Diagnostics.Trace.WriteLine("Exception creating locking service client: {0}", ex.ToString()); + } + } private void Dispatcher_UnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e) diff --git a/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs b/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs index 17dab016..99c94d4d 100644 --- a/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs +++ b/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs @@ -12,13 +12,14 @@ namespace ENI2.Controls /// /// Basisklasse aller Bearbeitungsdialoge. OK/Cancel Buttons und Window Placement /// - [TemplatePart(Name = "buttonOK",Type = typeof(Button))] + [TemplatePart(Name = "buttonOK", Type = typeof(Button))] [TemplatePart(Name = "buttonCancel", Type = typeof(Button))] public class EditWindowBase : Window { public event Action OKClicked; public event Action CancelClicked; + protected bool shouldCancel; static EditWindowBase() { @@ -36,9 +37,9 @@ namespace ENI2.Controls }; } - private void Window_Closing(object sender, CancelEventArgs e) + private void Window_Closing(object sender, CancelEventArgs e) { - // ENI2.Properties.Settings.Default.M + if (this.shouldCancel) e.Cancel = true; } protected override void OnSourceInitialized(EventArgs e) @@ -50,6 +51,7 @@ namespace ENI2.Controls protected virtual void OnOkClicked() { this.DialogResult = true; + this.shouldCancel = false; OKClicked?.Invoke(); } diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs index 9f09799e..5aa15457 100644 --- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs @@ -36,9 +36,9 @@ namespace ENI2 this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textSecurity, MessageGroupControlType = typeof(SecurityDetailControl), ImagePath = "Resources/shield_yellow.png" }); this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textPSC72h, MessageGroupControlType = typeof(PSC72hDetailControl), ImagePath = "Resources/alarmclock.png" }); this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textMDH, MessageGroupControlType = typeof(MaritimeHealthDeclarationDetailControl), ImagePath = "Resources/medical_bag.png" }); - this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textShipData, MessageGroupControlType = typeof(ShipDataDetailControl), ImagePath = "Resources/containership.png" }); - this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textBorderPolice, MessageGroupControlType = typeof(BorderPoliceDetailControl), ImagePath = "Resources/policeman_german.png" }); this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textDepartureNotification, MessageGroupControlType = typeof(DepartureNotificationDetailControl), ImagePath = "Resources/arrow_up_right_green.png" }); + this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textShipData, MessageGroupControlType = typeof(ShipDataDetailControl), ImagePath = "Resources/containership.png" }); + this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textBorderPolice, MessageGroupControlType = typeof(BorderPoliceDetailControl), ImagePath = "Resources/policeman_german.png" }); this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textDGArrival, MessageGroupControlType = typeof(DangerousGoodsDetailControl), ImagePath = "Resources/sign_warning_radiation.png" }); this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textDGDeparture, MessageGroupControlType = typeof(DangerousGoodsDetailControl), ImagePath = "Resources/sign_warning_radiation.png" }); this._listBoxList.Add(new MessageGroup() { MessageGroupName = Properties.Resources.textTowage, MessageGroupControlType = typeof(TowageDetailControl), ImagePath = "Resources/ship2.png" }); diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml index d3e9fad7..d791a5ce 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml @@ -18,16 +18,19 @@ + - - + + + +