This commit is contained in:
Husky
2020-07-15 17:18:52 +02:00
parent 3e9a353fc0
commit 7911a44f2f
23 changed files with 290 additions and 127 deletions

View File

@@ -2,6 +2,7 @@
using KanSan.Base.Interfaces;
using KanSan.Base.Models;
using KanSan.ViewModel.Commands;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Win32;
using Syncfusion.XlsIO;
using System;
@@ -11,6 +12,7 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Text;
using System.Windows.Input;
@@ -32,10 +34,11 @@ namespace KanSan.ViewModel
private Sewer _selectedObjekt;
public static Baustelle Baustelle;
//public static Sewer SelectedObjekt;
public static List<LeistungsverzeichnisPosition> LVPositionen = null;
public static IServiceProvider ServiceProvider { get; private set; }
public ICommand ListClientsCommand { get; set; }
public ICommand ListProjectsCommand { get; set; }
public ICommand ListBaustellenCommand { get; set; }
@@ -48,13 +51,13 @@ namespace KanSan.ViewModel
{
get
{
Trace.WriteLine(actualViewModel);
return actualViewModel;
//return actualViewModel;
}
set
{
if (actualViewModel == value) return;
Trace.WriteLine("Setze viewModel auf " + value);
Trace.WriteLine("AktualView Geändert zu " + value);
actualViewModel = value;
OnPropertyChanged();
}
@@ -145,6 +148,7 @@ namespace KanSan.ViewModel
}
}
public Sewer SelectedObjekt
{
get
@@ -161,6 +165,7 @@ namespace KanSan.ViewModel
OnPropertyChanged();
}
}
private void SaveInRegistry(string key, string value)
{
Registry.SetValue(REGISTRYKEY, key, value);
@@ -223,10 +228,11 @@ namespace KanSan.ViewModel
}
public MainWindowViewModel()
{
ServiceProvider = ConfigureServiceProvider();
LadeRegistry();
LoadBaustellenLeistungsverzeichnis();
ListClients();
@@ -235,6 +241,22 @@ namespace KanSan.ViewModel
ListBaustellenCommand = new RelayCommand(paramter => ListBaustellen());
ListObjectsCommand = new RelayCommand(parameter => ListObjekte());
Mediator.Subscribe("GoTo1Screen", OnGo1Screen);
}
private void OnGo1Screen(object obj)
{
ListClients();
}
private IServiceProvider ConfigureServiceProvider()
{
IServiceCollection service = new ServiceCollection();
service.AddSingleton<MainWindowViewModel>();
return service.BuildServiceProvider();
}
private void ListClients()