SinglePage erweitert

DaSaSo.ViewModel/State/ActualState/ActualProject.cs

@@ -10,14 +10,18 @@ namespace DaSaSo.ViewModel.State.ActualState
 {
     public class ActualProject : IActualProject
     {
-        public Client AktuellClient { get; private set; }
-        public Buildingsite AktuellBaustelle { get; private set; }
-        public Project AktuellProjekt { get; private set; }
+        public Client? AktuellClient { get; private set; }
+        public Buildingsite? AktuellBaustelle { get; private set; }
+        public Project? AktuellProjekt { get; private set; }
+        public SewerObject? AktuellSewerObject { get; private set; }
+
 
         #region events
         public event EventHandler? ClientChanged;
         public event EventHandler? ProjectChanged;
         public event EventHandler? BuildingSiteChanged;
+        public event EventHandler? SewerObjectChanged;
+
         protected void OnClientChanged()
         {
             ClientChanged?.Invoke(this, new EventArgs());
@@ -48,5 +52,22 @@ namespace DaSaSo.ViewModel.State.ActualState
             AktuellBaustelle = buildingsite;
             OnBuildingSiteChanged();
         }
+
+        public void SetSewerObject(SewerObject sewerObject)
+        {
+            AktuellSewerObject = sewerObject;
+            
+        }
+
+        public void ResetProject()
+        {
+            SetProject(null);
+            ResetBuildingSite();
+        }
+
+        public void ResetBuildingSite()
+        {
+            SetBuildingSite(null);
+        }
     }
 }

DaSaSo.ViewModel/State/Navigation/Navigator.cs

@@ -15,9 +15,11 @@ namespace DaSaSo.ViewModel.State.Navigation
             get => _currentViewModel;
             set
             {
+                _currentViewModel?.Dispose();
                 _currentViewModel = value;
-                OnPropertyChanged();
+                StateChanged?.Invoke();
             }
         }
+        public event Action StateChanged;
     }
 }