From f15d0b298306bc05108412a95f689be0e640bc70 Mon Sep 17 00:00:00 2001 From: HuskyTeufel Date: Wed, 29 Sep 2021 12:55:28 +0200 Subject: [PATCH] Sewerdamagelist angefangen --- .../Services/SewerObjectDataService.cs | 1 + DaSaSo.ViewModel/SewerDamageListViewModel.cs | 18 +++++++++++- DaSaSo.Wpf/DaSaSo.Wpf.csproj.user | 6 ++++ .../AddViewModelsHostBuilderExtensions.cs | 6 ++-- .../View/SewerObject/SewerDamageListView.xaml | 13 +++++++++ .../SewerObject/SewerDamageListView.xaml.cs | 28 +++++++++++++++++++ .../View/SewerObject/SewerMainView.xaml | 3 ++ DaSaSo.Wpf/appsettings.json | 2 +- 8 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 DaSaSo.Wpf/View/SewerObject/SewerDamageListView.xaml create mode 100644 DaSaSo.Wpf/View/SewerObject/SewerDamageListView.xaml.cs diff --git a/DaSaSo.EntityFramework/Services/SewerObjectDataService.cs b/DaSaSo.EntityFramework/Services/SewerObjectDataService.cs index 2a5e13f..441cdf3 100644 --- a/DaSaSo.EntityFramework/Services/SewerObjectDataService.cs +++ b/DaSaSo.EntityFramework/Services/SewerObjectDataService.cs @@ -44,6 +44,7 @@ namespace DaSaSo.EntityFramework.Services .Include("BuildingSite") .Include("PunktOben") .Include("PunktUnten") + .Include("SewerDamages") .FirstOrDefaultAsync((e) => e.Id == id); return s; } diff --git a/DaSaSo.ViewModel/SewerDamageListViewModel.cs b/DaSaSo.ViewModel/SewerDamageListViewModel.cs index 5150424..c2cb1c1 100644 --- a/DaSaSo.ViewModel/SewerDamageListViewModel.cs +++ b/DaSaSo.ViewModel/SewerDamageListViewModel.cs @@ -1,4 +1,7 @@ -using System; +using DaSaSo.Domain.Model; +using DaSaSo.Domain.Services; +using DaSaSo.ViewModel.Interface; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -8,5 +11,18 @@ namespace DaSaSo.ViewModel { public class SewerDamageListViewModel : BaseViewModel { + private readonly IActualProject _actualProject; + private readonly IDataService _dataService; + + SewerObject _model; + public List Damages { get => _model.SewerDamages.ToList(); } + + public SewerDamageListViewModel(IActualProject actualProject, IDataService dataService) + { + _actualProject = actualProject; + _dataService = dataService; + _model = _actualProject.AktuellSewerObject; + } + } } diff --git a/DaSaSo.Wpf/DaSaSo.Wpf.csproj.user b/DaSaSo.Wpf/DaSaSo.Wpf.csproj.user index e83a250..f682e0c 100644 --- a/DaSaSo.Wpf/DaSaSo.Wpf.csproj.user +++ b/DaSaSo.Wpf/DaSaSo.Wpf.csproj.user @@ -37,6 +37,9 @@ Code + + Code + Code @@ -81,6 +84,9 @@ Designer + + Designer + Designer diff --git a/DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs b/DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs index e5955ac..3ae316a 100644 --- a/DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs +++ b/DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs @@ -53,9 +53,11 @@ namespace DaSaSo.Wpf.HostBuilders services.GetRequiredService() ); }); - services.AddSingleton>(services => + services.AddTransient>(services => { - return () => new SewerDamageListViewModel(); + return () => new SewerDamageListViewModel( + services.GetRequiredService(), + services.GetRequiredService>()); }); services.AddSingleton>(services => diff --git a/DaSaSo.Wpf/View/SewerObject/SewerDamageListView.xaml b/DaSaSo.Wpf/View/SewerObject/SewerDamageListView.xaml new file mode 100644 index 0000000..313e211 --- /dev/null +++ b/DaSaSo.Wpf/View/SewerObject/SewerDamageListView.xaml @@ -0,0 +1,13 @@ + + + + + + diff --git a/DaSaSo.Wpf/View/SewerObject/SewerDamageListView.xaml.cs b/DaSaSo.Wpf/View/SewerObject/SewerDamageListView.xaml.cs new file mode 100644 index 0000000..ef1355d --- /dev/null +++ b/DaSaSo.Wpf/View/SewerObject/SewerDamageListView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace DaSaSo.Wpf.View.SewerObject +{ + /// + /// Interaction logic for SewerDamageListView.xaml + /// + public partial class SewerDamageListView : UserControl + { + public SewerDamageListView() + { + InitializeComponent(); + } + } +} diff --git a/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml b/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml index f65d64d..a8911b3 100644 --- a/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml +++ b/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml @@ -12,6 +12,9 @@ + + + diff --git a/DaSaSo.Wpf/appsettings.json b/DaSaSo.Wpf/appsettings.json index 0da8e7f..626e6f1 100644 --- a/DaSaSo.Wpf/appsettings.json +++ b/DaSaSo.Wpf/appsettings.json @@ -1,6 +1,6 @@ { "ConnectionStrings": { - "databaseToUse": "default", + "databaseToUse": "sqlite", "default": "Host = localhost; Database = dasaso; Username = kansan; Password = kansan", "sqlite": "Data Source=database.db" }