From 2a8ee1705933782944a135818170b087765b8d91 Mon Sep 17 00:00:00 2001 From: Daniel Schick Date: Mon, 17 Apr 2017 16:22:37 +0000 Subject: [PATCH] 3.5.3.2 Databinding Korrektur, Initialize() damit es keine weiteren OnLoad/Konstruktor Kollisionen gibt --- ENI-2/ENI2/ENI2/DetailBaseControl.cs | 10 +++++ ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs | 1 + .../OverViewDetailControl.xaml | 19 ++++++--- .../OverViewDetailControl.xaml.cs | 40 ++++++++++++++++++ ENI-2/ENI2/ENI2/ENI2.csproj | 2 +- ENI-2/ENI2/ENI2/SucheControl.xaml | 4 +- Stundensheet.xlsx | Bin 29419 -> 29494 bytes nsw/Source/bsmd.ExcelReadService/Util.cs | 6 +-- 8 files changed, 70 insertions(+), 12 deletions(-) diff --git a/ENI-2/ENI2/ENI2/DetailBaseControl.cs b/ENI-2/ENI2/ENI2/DetailBaseControl.cs index 31d3a9f3..2ebf9634 100644 --- a/ENI-2/ENI2/ENI2/DetailBaseControl.cs +++ b/ENI-2/ENI2/ENI2/DetailBaseControl.cs @@ -16,10 +16,20 @@ namespace ENI2 public class DetailBaseControl : UserControl { + #region Properties + public MessageCore Core { get; set; } public List Messages { get; set; } + #endregion + + #region protected methods + + public virtual void Initialize() { } + + #endregion + } } diff --git a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs index e33231d0..8450a489 100644 --- a/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs +++ b/ENI-2/ENI2/ENI2/DetailRootControl.xaml.cs @@ -85,6 +85,7 @@ namespace ENI2 DetailBaseControl detailControl = (DetailBaseControl) Activator.CreateInstance(mg.MessageGroupControlType); detailControl.Core = _core; detailControl.Messages = _messages; + detailControl.Initialize(); // plug it in ;-) detailView.Children.Clear(); detailView.Children.Add(detailControl); diff --git a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml index 31bc139c..5b34f39e 100644 --- a/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml +++ b/ENI-2/ENI2/ENI2/DetailViewControls/OverViewDetailControl.xaml @@ -3,7 +3,8 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 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:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:local="clr-namespace:ENI2.DetailViewControls" mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="600"> @@ -23,14 +24,20 @@