Umbau

KanSan.ViewModel/Objekte/ObjekteEditViewModel.cs

@@ -5,6 +5,7 @@ using KanSan.Base.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using System.Text;
 
 namespace KanSan.ViewModel
@@ -170,6 +171,8 @@ namespace KanSan.ViewModel
 
         public void Speichern()
         {
+            objekt.PunktOben = getPoint(punktOben, true);
+            objekt.PunktUnten = getPoint(punktUnten, true);
             objekt.StrasseName = strassename;
             objekt.DN = durchmesser;
             objekt.Haltungslaenge = haltungslaenge;
@@ -182,6 +185,29 @@ namespace KanSan.ViewModel
             unitOfWork.KanaeleRepository.Update(objekt);
             unitOfWork.Commit();
         }
-    
+
+        private SewerPoint getPoint(string objektnummer, bool createIfNotFound = false)
+        {
+            List<SewerPoint> sewerPoints = unitOfWork.ObjekteRepository.Get(x => x.Objektnummer.Equals(objektnummer)).ToList();
+            if (sewerPoints.Count < 1)
+            {
+                if (createIfNotFound == false)
+                    return null;
+                else
+                {
+                    Guid guidNr = Guid.NewGuid();
+                    unitOfWork.ObjekteRepository.Update(new SewerPoint()
+                    {
+                        Objektnummer = objektnummer,
+                        GuidNr = guidNr
+                    });
+                    unitOfWork.Commit();
+
+                    return unitOfWork.ObjekteRepository.Get(x => x.GuidNr.Equals(guidNr)).ToList().First();
+                }
+            }
+            return sewerPoints.First();
+        }
+
     }
 }

KanSan.ViewModel/Objekte/ObjekteListViewModel.cs

@@ -3,6 +3,7 @@ using KanSan.Base.Interfaces;
 using KanSan.Base.Interfaces.UI;
 using KanSan.Base.Models;
 using KanSan.ViewModel.Commands;
+using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -19,7 +20,17 @@ namespace KanSan.ViewModel
     }
     public class ObjekteListViewModel : BaseViewModel
     {
-        public ICommand ObjektSelected { get; set; }
+        private ICommand _objektSelected;
+        public ICommand ObjektSelected {
+            get
+            {
+                return _objektSelected ?? (_objektSelected = new RelayCommand(x =>
+                {
+                    Mediator.Notify("GoTo1Screen", "");
+                }));
+            }
+            
+        }
 
         IUnitOfWork unitOfWork = new UnitOfWork(new KanSanContext());
 
@@ -42,20 +53,24 @@ namespace KanSan.ViewModel
             }).ToList();
             kanalObjekte = x;
 
-            ObjektSelected = new RelayCommand(SelectObjekt);
+            //ObjektSelected = new RelayCommand(SelectObjekt);
 
             //kanalObjekte = unitOfWork.KanaeleRepository.Get(x => x.Baustelle.Equals(selectedBaustelle)).ToList();
         }
 
         private void SelectObjekt(object obj)
         {
+            
+            //Debugger.Break();
             if (!(obj is Sewer)) return;
             Sewer sewer = (Sewer)obj;
             if (sewer == null) return;
-            
-            SewerMainWindowViewModel t = new SewerMainWindowViewModel(sewer);
+           
+            //MainWindowViewModel.SelectedObjekt = sewer;
+            /*SewerMainWindowViewModel t = new SewerMainWindowViewModel(sewer);
             Debugger.Break();
             //throw new NotImplementedException();
+            */
         }
 
         public Sewer NeueObjektHinzufügen()