From f02530f9604095d45deee247d276d5f8a40bc898 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Sun, 21 May 2017 10:23:11 +0000 Subject: [PATCH] =?UTF-8?q?3.6.0=20neuer=20Stand=20(DB=20Erweiterung=20f?= =?UTF-8?q?=C3=BCr=20NSW=20"Live"-Abfrage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ENI-2/ENI2/ENI2/Controls/ClosableTabItem.cs | 5 + ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs | 7 +- ENI-2/ENI2/ENI2/DetailBaseControl.cs | 22 +- ENI-2/ENI2/ENI2/DetailRootControl.xaml | 7 +- ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs | 53 +++-- .../OverViewDetailControl.xaml | 203 ++++++++++-------- .../OverViewDetailControl.xaml.cs | 59 +++++ ENI-2/ENI2/ENI2/ENI2.csproj | 2 + ENI-2/ENI2/ENI2/MainWindow.xaml | 10 +- ENI-2/ENI2/ENI2/MainWindow.xaml.cs | 40 +++- .../ENI2/Properties/Resources.Designer.cs | 46 ++++ ENI-2/ENI2/ENI2/Properties/Resources.resx | 28 ++- .../ENI2/ENI2/Resources/nav_refresh_blue.png | Bin 0 -> 1732 bytes .../ENI2/Util/BoolToVisibilityConverter.cs | 43 ++++ Stundensheet.xlsx | Bin 30412 -> 30484 bytes nsw/Source/SQL/Update_3.5.9_To_3.6.0.sql | 17 ++ .../SendNSWMessageService/NSWSendService.cs | 40 +++- nsw/Source/SendNSWMessageService/Program.cs | 8 +- .../SendNSWMessageService.csproj | 4 +- .../SendNSWMessageService/packages.config | 2 +- nsw/Source/bsmd.dakosy/bsmd.dakosy.csproj | 4 +- nsw/Source/bsmd.dakosy/packages.config | 2 +- nsw/Source/bsmd.database/DBManager.cs | 124 ++++++++--- nsw/Source/bsmd.database/Message.cs | 3 +- nsw/Source/bsmd.database/MessageCore.cs | 44 +++- .../Properties/AssemblyProductInfo.cs | 2 +- .../Properties/AssemblyProjectInfo.cs | 2 +- nsw/Source/bsmd.database/bsmd.database.csproj | 8 +- nsw/Source/bsmd.database/packages.config | 2 +- nsw/Source/bsmd.dbh/bsmd.dbh.csproj | 4 +- nsw/Source/bsmd.dbh/packages.config | 2 +- nsw/Source/bsmd.hisnord/bsmd.hisnord.csproj | 4 +- nsw/Source/bsmd.hisnord/packages.config | 2 +- nsw/Source/bsmd.status/Status.cs | 96 +++++++-- nsw/Source/bsmd.status/bsmd.status.csproj | 14 ++ nsw/Source/bsmd.status/dataset.cs | 7 + nsw/Source/misc/db.sqlite | Bin 12046336 -> 12046336 bytes 37 files changed, 686 insertions(+), 230 deletions(-) create mode 100644 ENI-2/ENI2/ENI2/Resources/nav_refresh_blue.png create mode 100644 ENI-2/ENI2/ENI2/Util/BoolToVisibilityConverter.cs create mode 100644 nsw/Source/SQL/Update_3.5.9_To_3.6.0.sql diff --git a/ENI-2/ENI2/ENI2/Controls/ClosableTabItem.cs b/ENI-2/ENI2/ENI2/Controls/ClosableTabItem.cs index 59682f0c..cc47d729 100644 --- a/ENI-2/ENI2/ENI2/Controls/ClosableTabItem.cs +++ b/ENI-2/ENI2/ENI2/Controls/ClosableTabItem.cs @@ -48,6 +48,9 @@ namespace ENI2.Controls } */ + public event EventHandler TabClosing; + + public void SetHeaderText(string headerText) { // Container for header controls @@ -80,6 +83,8 @@ namespace ENI2.Controls { var tabControl = Parent as ItemsControl; tabControl.Items.Remove(this); + if (TabClosing != null) + this.TabClosing(this, new EventArgs()); }; dockPanel.Children.Add(closeButton); diff --git a/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs b/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs index 99c94d4d..6d39ef86 100644 --- a/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs +++ b/ENI-2/ENI2/ENI2/Controls/EditWindowBase.cs @@ -32,11 +32,14 @@ namespace ENI2.Controls { var okButton = (Button)Template.FindName("buttonOK", this); var cancelButton = (Button)Template.FindName("buttonCancel", this); - okButton.Click += (s, e) => { DialogResult = true; OKClicked?.Invoke(); }; - cancelButton.Click += (s, e) => { DialogResult = false; CancelClicked?.Invoke(); }; + okButton.Click += (s, e) => { if (IsModal) DialogResult = true; else this.Close(); OKClicked?.Invoke(); }; + cancelButton.Click += (s, e) => { if (IsModal) DialogResult = false; else this.Close(); CancelClicked?.Invoke(); }; }; + this.IsModal = true; // default } + public bool IsModal { get; set; } + private void Window_Closing(object sender, CancelEventArgs e) { if (this.shouldCancel) e.Cancel = true; diff --git a/ENI-2/ENI2/ENI2/DetailBaseControl.cs b/ENI-2/ENI2/ENI2/DetailBaseControl.cs index 0b59f80e..0ef1ba0e 100644 --- a/ENI-2/ENI2/ENI2/DetailBaseControl.cs +++ b/ENI-2/ENI2/ENI2/DetailBaseControl.cs @@ -26,7 +26,6 @@ namespace ENI2 AMBIGUOUS } - #endregion #region events @@ -37,6 +36,11 @@ namespace ENI2 /// public event Action JumpToListElementRequest; + /// + /// Mit diesem Event kann ein Listen-Element einen Reload der gesamten Anmeldung auslösen (ob das so eine tolle Idee ist.) + /// + public event Action RequestReload; + #endregion #region Properties @@ -47,18 +51,26 @@ namespace ENI2 #endregion - #region protected methods + #region public methods public virtual void Initialize() { - - } + #endregion + + #region protected methods + protected virtual void OnJumpToListElementRequest(int index) { this.JumpToListElementRequest?.Invoke(index); - } + } + + protected virtual void OnRequestReload() + { + this.RequestReload?.Invoke(); + } + protected void SetLocodeStateImage(Image stateImage, LocodeState state) { diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml b/ENI-2/ENI2/ENI2/DetailRootControl.xaml index 88c76e54..9b783284 100644 --- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml @@ -3,6 +3,7 @@ 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:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:local="clr-namespace:ENI2" mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300"> @@ -16,9 +17,9 @@ -