diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs index 082b613c..ce9079a3 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml.cs @@ -483,6 +483,7 @@ namespace ENI2.DetailViewControls MessageHistoryDialog mhd = new MessageHistoryDialog(); mhd.Messages = this.Messages; mhd.MessageHistories = DBManager.Instance.GetMessageHistories(historyMessage.Id.Value); + mhd.RequestReload += () => this.OnRequestReload(); mhd.Show(); } } diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj index c7543676..dd5f038f 100644 --- a/ENI-2/ENI2/ENI2/ENI2.csproj +++ b/ENI-2/ENI2/ENI2/ENI2.csproj @@ -28,14 +28,14 @@ false true http://192.168.2.4/eni2.publish/ - http://192.168.2.4/eni2.publish/ + http://192.168.2.24/eni2.publish/ http://www.textbausteine.net/ ENI2 Informatikbüro Daniel Schick 3.5.1.0 true publish.html - 0 + 2 5.2.0.%2a false true diff --git a/ENI-2/ENI2/ENI2/EditControls/MessageHistoryDialog.xaml.cs b/ENI-2/ENI2/ENI2/EditControls/MessageHistoryDialog.xaml.cs index 7b926d41..f2e2720b 100644 --- a/ENI-2/ENI2/ENI2/EditControls/MessageHistoryDialog.xaml.cs +++ b/ENI-2/ENI2/ENI2/EditControls/MessageHistoryDialog.xaml.cs @@ -62,6 +62,8 @@ namespace ENI2.EditControls public List Messages { get; set; } + public event Action RequestReload; + #endregion #region event handler @@ -107,13 +109,18 @@ namespace ENI2.EditControls foreach (DatabaseEntity oldElement in targetMessage.Elements) DBManager.Instance.Delete(oldElement); foreach (DatabaseEntity element in selectedHistory.GetGroup(this.MessageHistories)) + { targetMessage.Elements.Add(element); + element.MessageHeader = targetMessage; + DBManager.Instance.Save(element); + } } else { targetMessage.Elements[0].OverwriteWith(selectedItem); } DBManager.Instance.Save(targetMessage); + this.RequestReload?.Invoke(); } else { diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index 94193187..c0240224 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/Serverumzug.txt b/nsw/Serverumzug.txt new file mode 100644 index 00000000..e117ced9 --- /dev/null +++ b/nsw/Serverumzug.txt @@ -0,0 +1,4 @@ +Neue VM: +NSW: 192.168.2.24 +Wetris: 192.168.2.23 +AIS: 192.168.2.25