Husky/DaSaSo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

viewmodel ins wpf gepackt, build failed

Browse Source
This commit is contained in:
HuskyTeufel
2022-03-30 14:59:12 +02:00
parent f34f4517ca
commit 1bf0c3b615
87 changed files with 157 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
DaSaSo.ViewModel/DaSaSo.ViewModel.csproj
View File

@@ -5,19 +5,8 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<None Remove="version.txt" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="version.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
<PackageReference Include="PresentationFramework" Version="4.6.0" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
</ItemGroup>

10
DaSaSo.Wpf/App.xaml.cs
View File

@@ -5,11 +5,11 @@ using DaSaSo.Domain.Services.ProjectServices;
using DaSaSo.Domain.Services.SewerObjectService;
using DaSaSo.EntityFramework;
using DaSaSo.EntityFramework.Services;
using DaSaSo.ViewModel;
using DaSaSo.ViewModel.Factories;
using DaSaSo.ViewModel.Interface;
using DaSaSo.ViewModel.State.ActualState;
using DaSaSo.ViewModel.State.Navigation;
using DaSaSo.Wpf.ViewModel;
using DaSaSo.Wpf.ViewModel.Factories;
using DaSaSo.Wpf.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.State.ActualState;
using DaSaSo.Wpf.ViewModel.State.Navigation;
using DaSaSo.Wpf.HostBuilders;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;

4
DaSaSo.Wpf/Controls/MainWindowNavigationBar.xaml
View File

@@ -5,10 +5,10 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DaSaSo.Wpf.Controls"
xmlns:nav="clr-namespace:DaSaSo.Domain.Enums;assembly=DaSaSo.Domain"
xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel"
xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel"
xmlns:converters="clr-namespace:DaSaSo.Wpf.Converters"
d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
mc:Ignorable="d"
d:DesignHeight="375" d:DesignWidth="200">
<UserControl.Resources>

2
DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml
View File

@@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:nav="clr-namespace:DaSaSo.Domain.Enums;assembly=DaSaSo.Domain"
xmlns:local="clr-namespace:DaSaSo.Wpf.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerMainListViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerMainListViewModel}"
mc:Ignorable="d"
d:DesignHeight="647.5" d:DesignWidth="200">
<Grid>

4
DaSaSo.Wpf/DaSaSo.Wpf.csproj
View File

@@ -13,11 +13,13 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DaSaSo.Domain\DaSaSo.Domain.csproj" />
<ProjectReference Include="..\DaSaSo.ViewModel\DaSaSo.ViewModel.csproj" />
<ProjectReference Include="..\DaSaSo.EntityFramework\DaSaSo.EntityFramework.csproj" />
<ProjectReference Include="..\DaSaSo.InMemoryProvider\DaSaSo.InMemoryProvider.csproj" />
</ItemGroup>
<ItemGroup>

6
DaSaSo.Wpf/HostBuilders/AddStoresHostBuilderExtensions.cs
View File

@@ -1,6 +1,6 @@
using DaSaSo.ViewModel.Interface;
using DaSaSo.ViewModel.State.ActualState;
using DaSaSo.ViewModel.State.Navigation;
using DaSaSo.Wpf.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.State.ActualState;
using DaSaSo.Wpf.ViewModel.State.Navigation;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using System;

8
DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs
View File

@@ -4,10 +4,10 @@ using DaSaSo.Domain.Services.BuildingsiteServices;
using DaSaSo.Domain.Services.ProjectServices;
using DaSaSo.Domain.Services.SewerObjectService;
using DaSaSo.Domain.Services.SewerPointServices;
using DaSaSo.ViewModel;
using DaSaSo.ViewModel.Factories;
using DaSaSo.ViewModel.Interface;
using DaSaSo.ViewModel.State.Navigation;
using DaSaSo.Wpf.ViewModel;
using DaSaSo.Wpf.ViewModel.Factories;
using DaSaSo.Wpf.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.State.Navigation;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using System;

2
DaSaSo.Wpf/View/Buildingsites/BuildingSiteEditView.xaml
View File

@@ -3,7 +3,7 @@
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:local="clr-namespace:DaSaSo.Wpf.View.Buildingsites" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:BuildingsiteEditViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.Buildingsites" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:BuildingsiteEditViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>

2
DaSaSo.Wpf/View/Buildingsites/BuildingSiteListView.xaml
View File

@@ -3,7 +3,7 @@
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:local="clr-namespace:DaSaSo.Wpf.View.Buildingsites" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:BuildingsiteListViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.Buildingsites" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:BuildingsiteListViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>

2
DaSaSo.Wpf/View/Client/ClientEditView.xaml
View File

@@ -3,7 +3,7 @@
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:local="clr-namespace:DaSaSo.Wpf.View.Client" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ClientEditViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.Client" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ClientEditViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>

2
DaSaSo.Wpf/View/Client/ClientListView.xaml
View File

@@ -3,7 +3,7 @@
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:local="clr-namespace:DaSaSo.Wpf.View.Client" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ClientListViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.Client" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ClientListViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>

2
DaSaSo.Wpf/View/HomeView.xaml
View File

@@ -3,7 +3,7 @@
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:local="clr-namespace:DaSaSo.Wpf.View" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:HomeViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>

2
DaSaSo.Wpf/View/Impregnation/ImpregnationEditView.xaml
View File

@@ -3,7 +3,7 @@
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:local="clr-namespace:DaSaSo.Wpf.View.Impregnation" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ImpregnierungEditViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.Impregnation" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ImpregnierungEditViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>

2
DaSaSo.Wpf/View/Impregnation/ImpregnationListView.xaml
View File

@@ -3,7 +3,7 @@
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:local="clr-namespace:DaSaSo.Wpf.View.Impregnation" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ImpregnierungListViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.Impregnation" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ImpregnierungListViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>

2
DaSaSo.Wpf/View/Project/ProjectEditView.xaml
View File

@@ -3,7 +3,7 @@
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:local="clr-namespace:DaSaSo.Wpf.View.Project" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ProjectEditViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.Project" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ProjectEditViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>

2
DaSaSo.Wpf/View/Project/ProjectListView.xaml
View File

@@ -3,7 +3,7 @@
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:local="clr-namespace:DaSaSo.Wpf.View.Project" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ProjectListViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.Project" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ProjectListViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>

2
DaSaSo.Wpf/View/SewerObject/Controls/SewerDamage.xaml
View File

@@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:damagetype="clr-namespace:DaSaSo.Domain.Model;assembly=DaSaSo.Domain"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:controls="clr-namespace:DaSaSo.ViewModel.Controls;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=controls:SewerDamageControllViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:controls="clr-namespace:DaSaSo.Wpf.ViewModel.Controls" d:DataContext="{d:DesignInstance Type=controls:SewerDamageControllViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid Background="LightBlue">

2
DaSaSo.Wpf/View/SewerObject/Controls/SewerDamagePreparation.xaml
View File

@@ -3,7 +3,7 @@
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:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:controls="clr-namespace:DaSaSo.ViewModel.Controls;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=controls:SewerPreperationControllViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:controls="clr-namespace:DaSaSo.Wpf.ViewModel.Controls" d:DataContext="{d:DesignInstance Type=controls:SewerPreperationControllViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid Background="LightBlue">

2
DaSaSo.Wpf/View/SewerObject/Controls/SewerRehabilation.xaml
View File

@@ -3,7 +3,7 @@
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:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" xmlns:controls="clr-namespace:DaSaSo.ViewModel.Controls;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=controls:SewerRhebalationControllViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" xmlns:controls="clr-namespace:DaSaSo.ViewModel.Controls;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=controls:SewerRhebalationControllViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>

2
DaSaSo.Wpf/View/SewerObject/PhotodocumentationView.xaml
View File

@@ -3,7 +3,7 @@
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:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerPictureDocumentationViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerPictureDocumentationViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>

2
DaSaSo.Wpf/View/SewerObject/SewerDamageEditView.xaml
View File

@@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:selfControls="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerDamageEditViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerDamageEditViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>

2
DaSaSo.Wpf/View/SewerObject/SewerDamageListView.xaml
View File

@@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:sd="clr-namespace:DaSaSo.Wpf.Sampledata"
xmlns:damagetype ="clr-namespace:DaSaSo.Domain.Model;assembly=DaSaSo.Domain"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel"
xmlns:converters="clr-namespace:DaSaSo.Wpf.Converters"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="1020">

4
DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml
View File

@@ -3,8 +3,8 @@
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:viewModel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:Controls="clr-namespace:DaSaSo.Wpf.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerMainListViewModel}"
xmlns:viewModel="clr-namespace:DaSaSo.Wpf.ViewModel"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:Controls="clr-namespace:DaSaSo.Wpf.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerMainListViewModel}"
mc:Ignorable="d"
xmlns:views ="clr-namespace:DaSaSo.Wpf.View.SewerObject"
d:DesignHeight="900" d:DesignWidth="800">

2
DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml
View File

@@ -4,7 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject"
xmlns:controls="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerPipeLinerViewModel}"
xmlns:controls="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerPipeLinerViewModel}"
mc:Ignorable="d" d:DesignWidth="800" Height="722">
<Grid>
<Grid.RowDefinitions>

2
DaSaSo.Wpf/View/SewerObject/SewerStammdatenView.xaml
View File

@@ -3,7 +3,7 @@
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:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerStammdatenViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerStammdatenViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>

3
DaSaSo.ViewModel/BaseViewModel.cs → DaSaSo.Wpf/ViewModel/BaseViewModel.cs
View File

@@ -1,4 +1,5 @@
namespace DaSaSo.ViewModel

namespace DaSaSo.Wpf.ViewModel
{
public delegate TViewModel CreateViewModel<TViewModel>() where TViewModel : BaseViewModel;
public class BaseViewModel : ObservableObject

4
DaSaSo.ViewModel/BuildingsiteEditViewModel.cs → DaSaSo.Wpf/ViewModel/BuildingsiteEditViewModel.cs
View File

@@ -1,7 +1,7 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.Domain.Services.BuildingsiteServices;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Interface;
using Microsoft.Toolkit.Mvvm.Input;
using System;
using System.Collections.Generic;
@@ -10,7 +10,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public class BuildingsiteEditViewModel : BaseViewModel
{

6
DaSaSo.ViewModel/BuildingsiteListViewModel.cs → DaSaSo.Wpf/ViewModel/BuildingsiteListViewModel.cs
View File

@@ -2,8 +2,8 @@
using DaSaSo.Domain.Services;
using DaSaSo.Domain.Services.BuildingsiteServices;
using DaSaSo.EntityFramework.Services;
using DaSaSo.ViewModel.Commands;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Commands;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -12,7 +12,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public class BuildingsiteListViewModel: BaseViewModel
{

4
DaSaSo.ViewModel/ClientEditViewModel.cs → DaSaSo.Wpf/ViewModel/ClientEditViewModel.cs
View File

@@ -1,6 +1,6 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Interface;
using Microsoft.Toolkit.Mvvm.Input;
using System;
using System.Collections.Generic;
@@ -9,7 +9,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public class ClientEditViewModel : BaseViewModel
{

8
DaSaSo.ViewModel/ClientListViewModel.cs → DaSaSo.Wpf/ViewModel/ClientListViewModel.cs
View File

@@ -1,8 +1,8 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.ViewModel.Commands;
using DaSaSo.ViewModel.Enums;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Commands;
using DaSaSo.Wpf.ViewModel.Enums;
using DaSaSo.Wpf.ViewModel.Interface;
using Microsoft.Toolkit.Mvvm.Input;
using System;
using System.Collections.Generic;
@@ -13,7 +13,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public class ClientListViewModel : BaseViewModel
{

8
DaSaSo.ViewModel/Commands/AddBuildingsiteCommand.cs → DaSaSo.Wpf/ViewModel/Commands/AddBuildingsiteCommand.cs
View File

@@ -1,14 +1,10 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.Domain.Services.BuildingsiteServices;
using DaSaSo.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using DaSaSo.Wpf.ViewModel.Interface;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
public class AddBuildingsiteCommand: AsyncCommandBase
{

8
DaSaSo.ViewModel/Commands/AddClientCommand.cs → DaSaSo.Wpf/ViewModel/Commands/AddClientCommand.cs
View File

@@ -1,13 +1,9 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using DaSaSo.Wpf.ViewModel.Interface;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
public class AddClientCommand : AsyncCommandBase
{

8
DaSaSo.ViewModel/Commands/AddDamageCommand.cs → DaSaSo.Wpf/ViewModel/Commands/AddDamageCommand.cs
View File

@@ -1,13 +1,9 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.ViewModel.Interface;
using System;
using System.Collections.Generic;
using DaSaSo.Wpf.ViewModel.Interface;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
class AddDamageCommand : AsyncCommandBase
{

7
DaSaSo.ViewModel/Commands/AddImpregnationCommand.cs → DaSaSo.Wpf/ViewModel/Commands/AddImpregnationCommand.cs
View File

@@ -1,13 +1,10 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
internal class AddImpregnationCommand : AsyncCommandBase
{

8
DaSaSo.ViewModel/Commands/AddProjectCommand.cs → DaSaSo.Wpf/ViewModel/Commands/AddProjectCommand.cs
View File

@@ -1,14 +1,10 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.Domain.Services.ProjectServices;
using DaSaSo.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using DaSaSo.Wpf.ViewModel.Interface;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
public class AddProjectCommand : AsyncCommandBase
{

8
DaSaSo.ViewModel/Commands/AddSewerObjectCommand.cs → DaSaSo.Wpf/ViewModel/Commands/AddSewerObjectCommand.cs
View File

@@ -1,13 +1,9 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services.SewerObjectService;
using DaSaSo.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using DaSaSo.Wpf.ViewModel.Interface;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
public class AddSewerObjectCommand : AsyncCommandBase
{

2
DaSaSo.ViewModel/Commands/AsyncCommandBase.cs → DaSaSo.Wpf/ViewModel/Commands/AsyncCommandBase.cs
View File

@@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
public abstract class AsyncCommandBase : ICommand
{

8
DaSaSo.ViewModel/Commands/EditBuildingsiteCommand.cs → DaSaSo.Wpf/ViewModel/Commands/EditBuildingsiteCommand.cs
View File

@@ -1,15 +1,11 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.Domain.Services.BuildingsiteServices;
using DaSaSo.ViewModel.Interface;
using System;
using System.Collections.Generic;
using DaSaSo.Wpf.ViewModel.Interface;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
public class EditBuildingsiteCommand : AsyncCommandBase
{

10
DaSaSo.ViewModel/Commands/EditClientCommand.cs → DaSaSo.Wpf/ViewModel/Commands/EditClientCommand.cs
View File

@@ -1,16 +1,10 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.ViewModel.Interface;
using System;
using System.Collections.Generic;
using DaSaSo.Wpf.ViewModel.Interface;
using System.ComponentModel;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
public class EditClientCommand : AsyncCommandBase
{

9
DaSaSo.ViewModel/Commands/EditImpregnationCommand.cs → DaSaSo.Wpf/ViewModel/Commands/EditImpregnationCommand.cs
View File

@@ -1,14 +1,9 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using DaSaSo.Wpf.ViewModel.Interface;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
internal class EditImpregnationCommand : AsyncCommandBase
{

8
DaSaSo.ViewModel/Commands/EditProjectCommand.cs → DaSaSo.Wpf/ViewModel/Commands/EditProjectCommand.cs
View File

@@ -1,15 +1,11 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.Domain.Services.ProjectServices;
using DaSaSo.ViewModel.Interface;
using System;
using System.Collections.Generic;
using DaSaSo.Wpf.ViewModel.Interface;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
class EditProjectCommand : AsyncCommandBase
{

2
DaSaSo.ViewModel/Commands/SaveImpregnationCommand.cs → DaSaSo.Wpf/ViewModel/Commands/SaveImpregnationCommand.cs
View File

@@ -7,7 +7,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
internal class SaveImpregnationCommand : AsyncCommandBase
{

4
DaSaSo.ViewModel/Commands/SaveSewerCommand.cs → DaSaSo.Wpf/ViewModel/Commands/SaveSewerCommand.cs
View File

@@ -2,7 +2,7 @@
using DaSaSo.Domain.Services;
using DaSaSo.Domain.Services.SewerObjectService;
using DaSaSo.Domain.Services.SewerPointServices;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -10,7 +10,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
public class SaveSewerCommand : AsyncCommandBase
{

2
DaSaSo.ViewModel/Commands/SaveSewerStammdatenCommand.cs → DaSaSo.Wpf/ViewModel/Commands/SaveSewerStammdatenCommand.cs
View File

@@ -8,7 +8,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
class SaveSewerStammdatenCommand : AsyncCommandBase
{

4
DaSaSo.ViewModel/Commands/SelectBuildingsiteCommand.cs → DaSaSo.Wpf/ViewModel/Commands/SelectBuildingsiteCommand.cs
View File

@@ -1,4 +1,4 @@
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
public class SelectBuildingsiteCommand : AsyncCommandBase
{

4
DaSaSo.ViewModel/Commands/SelectClientCommand.cs → DaSaSo.Wpf/ViewModel/Commands/SelectClientCommand.cs
View File

@@ -1,6 +1,6 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -9,7 +9,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
public class SelectClientCommand : AsyncCommandBase
{

2
DaSaSo.ViewModel/Commands/SelectDamageCommand.cs → DaSaSo.Wpf/ViewModel/Commands/SelectDamageCommand.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
class SelectDamageCommand : AsyncCommandBase
{

4
DaSaSo.ViewModel/Commands/SelectProjectCommand.cs → DaSaSo.Wpf/ViewModel/Commands/SelectProjectCommand.cs
View File

@@ -1,4 +1,4 @@
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
public class SelectProjectCommand : AsyncCommandBase
{

4
DaSaSo.ViewModel/Commands/SelectSewerObjectCommand.cs → DaSaSo.Wpf/ViewModel/Commands/SelectSewerObjectCommand.cs
View File

@@ -1,12 +1,12 @@
using DaSaSo.Domain.Model;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
public class SelectSewerObjectCommand : AsyncCommandBase
{

4
DaSaSo.ViewModel/Commands/UpdateCurrentSewerViewModelCommand.cs → DaSaSo.Wpf/ViewModel/Commands/UpdateCurrentSewerViewModelCommand.cs
View File

@@ -1,12 +1,12 @@
using DaSaSo.Domain.Enums;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
class UpdateCurrentSewerViewModelCommand : AsyncCommandBase
{

6
DaSaSo.ViewModel/Commands/UpdateCurrentViewModelCommand.cs → DaSaSo.Wpf/ViewModel/Commands/UpdateCurrentViewModelCommand.cs
View File

@@ -1,11 +1,11 @@
using DaSaSo.Domain.Enums;
using DaSaSo.ViewModel.Enums;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Enums;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel.Commands
namespace DaSaSo.Wpf.ViewModel.Commands
{
class UpdateCurrentViewModelCommand : AsyncCommandBase
{

2
DaSaSo.ViewModel/Controls/SewerDamageControllViewModel.cs → DaSaSo.Wpf/ViewModel/Controls/SewerDamageControllViewModel.cs
View File

@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Controls
namespace DaSaSo.Wpf.ViewModel.Controls
{
public class SewerDamageControllViewModel : BaseViewModel
{

2
DaSaSo.ViewModel/Controls/SewerPreperationControllViewModel.cs → DaSaSo.Wpf/ViewModel/Controls/SewerPreperationControllViewModel.cs
View File

@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Controls
namespace DaSaSo.Wpf.ViewModel.Controls
{
public class SewerPreperationControllViewModel : BaseViewModel
{

2
DaSaSo.ViewModel/Controls/SewerRhebalationControllViewModel.cs → DaSaSo.Wpf/ViewModel/Controls/SewerRhebalationControllViewModel.cs
View File

@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Controls
namespace DaSaSo.Wpf.ViewModel.Controls
{
public class SewerRhebalationControllViewModel : BaseViewModel
{

2
DaSaSo.ViewModel/Enums/EMediator.cs → DaSaSo.Wpf/ViewModel/Enums/EMediator.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Enums
namespace DaSaSo.Wpf.ViewModel.Enums
{
enum EMediator

4
DaSaSo.ViewModel/Factories/MainWindowViewModelFactory.cs → DaSaSo.Wpf/ViewModel/Factories/MainWindowViewModelFactory.cs
View File

@@ -1,8 +1,8 @@
using DaSaSo.Domain.Enums;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
namespace DaSaSo.ViewModel.Factories
namespace DaSaSo.Wpf.ViewModel.Factories
{
public class MainWindowViewModelFactory : IViewModelAbstractFactory
{

4
DaSaSo.ViewModel/Factories/SewerWindowViewModelFactory.cs → DaSaSo.Wpf/ViewModel/Factories/SewerWindowViewModelFactory.cs
View File

@@ -1,12 +1,12 @@
using DaSaSo.Domain.Enums;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Factories
namespace DaSaSo.Wpf.ViewModel.Factories
{
public class SewerWindowViewModelFactory : IViewModelSewerMainFactory
{

2
DaSaSo.ViewModel/HomeViewModel.cs → DaSaSo.Wpf/ViewModel/HomeViewModel.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public class HomeViewModel : BaseViewModel
{

6
DaSaSo.ViewModel/ImpregnierungEditViewModel.cs → DaSaSo.Wpf/ViewModel/ImpregnierungEditViewModel.cs
View File

@@ -1,7 +1,7 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.ViewModel.Commands;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Commands;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -9,7 +9,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public class ImpregnierungEditViewModel : BaseViewModel
{

6
DaSaSo.ViewModel/ImpregnierungListViewModel.cs → DaSaSo.Wpf/ViewModel/ImpregnierungListViewModel.cs
View File

@@ -1,7 +1,7 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.ViewModel.Commands;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Commands;
using DaSaSo.Wpf.ViewModel.Interface;
using Microsoft.Toolkit.Mvvm.Input;
using System;
using System.Collections.Generic;
@@ -11,7 +11,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public class ImpregnierungListViewModel : BaseViewModel
{

2
DaSaSo.ViewModel/Interface/IActualProject.cs → DaSaSo.Wpf/ViewModel/Interface/IActualProject.cs
View File

@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Interface
namespace DaSaSo.Wpf.ViewModel.Interface
{
public interface IActualProject
{

2
DaSaSo.ViewModel/Interface/IMainWindowNavigator.cs → DaSaSo.Wpf/ViewModel/Interface/IMainWindowNavigator.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Interface
namespace DaSaSo.Wpf.ViewModel.Interface
{
public interface IMainWindowNavigator : INavigator
{

2
DaSaSo.ViewModel/Interface/INavigator.cs → DaSaSo.Wpf/ViewModel/Interface/INavigator.cs
View File

@@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel.Interface
namespace DaSaSo.Wpf.ViewModel.Interface
{
public interface INavigator
{

2
DaSaSo.ViewModel/Interface/IRenavigator.cs → DaSaSo.Wpf/ViewModel/Interface/IRenavigator.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Interface
namespace DaSaSo.Wpf.ViewModel.Interface
{
public interface IRenavigator
{

2
DaSaSo.ViewModel/Interface/ISewerMainNavigator.cs → DaSaSo.Wpf/ViewModel/Interface/ISewerMainNavigator.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Interface
namespace DaSaSo.Wpf.ViewModel.Interface
{
public interface ISewerMainNavigator : INavigator
{

2
DaSaSo.ViewModel/Interface/IViewModelAbstractFactory.cs → DaSaSo.Wpf/ViewModel/Interface/IViewModelAbstractFactory.cs
View File

@@ -1,6 +1,6 @@
using DaSaSo.Domain.Enums;
namespace DaSaSo.ViewModel.Interface
namespace DaSaSo.Wpf.ViewModel.Interface
{
public interface IViewModelAbstractFactory
{

2
DaSaSo.ViewModel/Interface/IViewModelFactory.cs → DaSaSo.Wpf/ViewModel/Interface/IViewModelFactory.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Interface
namespace DaSaSo.Wpf.ViewModel.Interface
{
public interface IViewModelFactory<T> where T: BaseViewModel
{

2
DaSaSo.ViewModel/Interface/IViewModelSewerMainFactory.cs → DaSaSo.Wpf/ViewModel/Interface/IViewModelSewerMainFactory.cs
View File

@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Interface
namespace DaSaSo.Wpf.ViewModel.Interface
{
public interface IViewModelSewerMainFactory
{

2
DaSaSo.ViewModel/Interface/IWindowService.cs → DaSaSo.Wpf/ViewModel/Interface/IWindowService.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.Interface
namespace DaSaSo.Wpf.ViewModel.Interface
{
public interface IWindowService
{

4
DaSaSo.ViewModel/Mediator.cs → DaSaSo.Wpf/ViewModel/Mediator.cs
View File

@@ -1,11 +1,11 @@
using DaSaSo.ViewModel.Enums;
using DaSaSo.Wpf.ViewModel.Enums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
class Mediator
{

2
DaSaSo.ViewModel/ObservableObject.cs → DaSaSo.Wpf/ViewModel/ObservableObject.cs
View File

@@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public class ObservableObject : INotifyPropertyChanged
{

6
DaSaSo.ViewModel/ProjectEditViewModel.cs → DaSaSo.Wpf/ViewModel/ProjectEditViewModel.cs
View File

@@ -1,8 +1,8 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.Domain.Services.ProjectServices;
using DaSaSo.ViewModel.Commands;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Commands;
using DaSaSo.Wpf.ViewModel.Interface;
using Microsoft.Toolkit.Mvvm.Input;
using System;
using System.Collections.Generic;
@@ -11,7 +11,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public class ProjectEditViewModel : BaseViewModel
{

6
DaSaSo.ViewModel/ProjectListViewModel.cs → DaSaSo.Wpf/ViewModel/ProjectListViewModel.cs
View File

@@ -2,8 +2,8 @@
using DaSaSo.Domain.Services;
using DaSaSo.Domain.Services.ProjectServices;
using DaSaSo.EntityFramework.Services;
using DaSaSo.ViewModel.Commands;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Commands;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -13,7 +13,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public class ProjectListViewModel : BaseViewModel
{

6
DaSaSo.ViewModel/SewerDamageEditViewModel.cs → DaSaSo.Wpf/ViewModel/SewerDamageEditViewModel.cs
View File

@@ -1,6 +1,6 @@
using DaSaSo.Domain.Model;
using DaSaSo.ViewModel.Controls;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Controls;
using DaSaSo.Wpf.ViewModel.Interface;
using Microsoft.Toolkit.Mvvm.Input;
using System;
using System.Collections.Generic;
@@ -9,7 +9,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public class SewerDamageEditViewModel : BaseViewModel
{

6
DaSaSo.ViewModel/SewerDamageListViewModel.cs → DaSaSo.Wpf/ViewModel/SewerDamageListViewModel.cs
View File

@@ -1,7 +1,7 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.ViewModel.Commands;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Commands;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -9,7 +9,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public class SewerDamageListViewModel : BaseViewModel
{

6
DaSaSo.ViewModel/SewerMainListViewModel.cs → DaSaSo.Wpf/ViewModel/SewerMainListViewModel.cs
View File

@@ -3,8 +3,8 @@ using DaSaSo.Domain.Services;
using DaSaSo.Domain.Services.SewerObjectService;
using DaSaSo.Domain.Services.SewerPointServices;
using DaSaSo.EntityFramework.Services;
using DaSaSo.ViewModel.Commands;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Commands;
using DaSaSo.Wpf.ViewModel.Interface;
using Microsoft.Toolkit.Mvvm.Input;
using System;
using System.Collections.Generic;
@@ -13,7 +13,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public class SewerMainListViewModel : BaseViewModel
{

6
DaSaSo.ViewModel/SewerObjectListViewModel.cs → DaSaSo.Wpf/ViewModel/SewerObjectListViewModel.cs
View File

@@ -4,8 +4,8 @@ using DaSaSo.Domain.Services;
using DaSaSo.Domain.Services.SewerObjectService;
using DaSaSo.EntityFramework.Services;
using DaSaSo.InMemoryProvider;
using DaSaSo.ViewModel.Commands;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Commands;
using DaSaSo.Wpf.ViewModel.Interface;
using Microsoft.Toolkit.Mvvm.Input;
using System;
using System.Collections.Generic;
@@ -16,7 +16,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public class SewerObjectListViewModel : BaseViewModel
{

2
DaSaSo.ViewModel/SewerPictureDocumentationViewModel.cs → DaSaSo.Wpf/ViewModel/SewerPictureDocumentationViewModel.cs
View File

@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public static class BitmapConversion
{

6
DaSaSo.ViewModel/SewerPipeLinerViewModel.cs → DaSaSo.Wpf/ViewModel/SewerPipeLinerViewModel.cs
View File

@@ -1,6 +1,6 @@
using DaSaSo.Domain.Model;
using DaSaSo.ViewModel.Controls;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Controls;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -8,7 +8,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public class SewerPipeLinerViewModel : BaseViewModel
{

6
DaSaSo.ViewModel/SewerStammdatenViewModel.cs → DaSaSo.Wpf/ViewModel/SewerStammdatenViewModel.cs
View File

@@ -2,8 +2,8 @@
using DaSaSo.Domain.Services;
using DaSaSo.Domain.Services.SewerPointServices;
using DaSaSo.EntityFramework.Services;
using DaSaSo.ViewModel.Commands;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Commands;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -12,7 +12,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public class SewerStammdatenViewModel : BaseViewModel
{

4
DaSaSo.ViewModel/State/ActualState/ActualProject.cs → DaSaSo.Wpf/ViewModel/State/ActualState/ActualProject.cs
View File

@@ -1,12 +1,12 @@
using DaSaSo.Domain.Model;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.State.ActualState
namespace DaSaSo.Wpf.ViewModel.State.ActualState
{
public class ActualProject : IActualProject
{

6
DaSaSo.ViewModel/State/Navigation/MainWindowNavigator.cs → DaSaSo.Wpf/ViewModel/State/Navigation/MainWindowNavigator.cs
View File

@@ -1,11 +1,11 @@
using DaSaSo.ViewModel.Commands;
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Commands;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.ComponentModel;
using System.Runtime.CompilerServices;
using System.Windows.Input;
namespace DaSaSo.ViewModel.State.Navigation
namespace DaSaSo.Wpf.ViewModel.State.Navigation
{
public class MainWindowNavigator : ObservableObject, IMainWindowNavigator
{

4
DaSaSo.ViewModel/State/Navigation/SewerMainNavigator.cs → DaSaSo.Wpf/ViewModel/State/Navigation/SewerMainNavigator.cs
View File

@@ -1,11 +1,11 @@
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.State.Navigation
namespace DaSaSo.Wpf.ViewModel.State.Navigation
{
public class SewerMainNavigator : ISewerMainNavigator
{

4
DaSaSo.ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs → DaSaSo.Wpf/ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs
View File

@@ -1,11 +1,11 @@
using DaSaSo.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.Interface;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace DaSaSo.ViewModel.State.Navigation
namespace DaSaSo.Wpf.ViewModel.State.Navigation
{
public class ViewModelDelegateRenavigator<TViewModel> : IRenavigator where TViewModel: BaseViewModel
{

10
DaSaSo.ViewModel/Window/MainWindowViewModel.cs → DaSaSo.Wpf/ViewModel/Window/MainWindowViewModel.cs
View File

@@ -3,10 +3,10 @@ using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.EntityFramework;
using DaSaSo.EntityFramework.Services;
using DaSaSo.ViewModel.Commands;
using DaSaSo.ViewModel.Enums;
using DaSaSo.ViewModel.Interface;
using DaSaSo.ViewModel.State.Navigation;
using DaSaSo.Wpf.ViewModel.Commands;
using DaSaSo.Wpf.ViewModel.Enums;
using DaSaSo.Wpf.ViewModel.Interface;
using DaSaSo.Wpf.ViewModel.State.Navigation;
using Microsoft.Toolkit.Mvvm.Input;
using Microsoft.Win32;
using System;
@@ -19,7 +19,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
namespace DaSaSo.ViewModel
namespace DaSaSo.Wpf.ViewModel
{
public sealed class MainWindowViewModel : BaseViewModel
{

4
DaSaSo.Wpf/Window/MainWindow.xaml
View File

@@ -11,7 +11,7 @@
xmlns:ImpregnationViews="clr-namespace:DaSaSo.Wpf.View.Impregnation"
xmlns:controls="clr-namespace:DaSaSo.Wpf.Controls"
xmlns:View="clr-namespace:DaSaSo.Wpf.View"
xmlns:local="clr-namespace:DaSaSo.Wpf" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf" xmlns:viewmodel="clr-namespace:DaSaSo.Wpf.ViewModel"
mc:Ignorable="d"
Title="{Binding ApplicationTitle}" Height="450" Width="800" WindowState="Maximized" FontSize="20">
<Window.Resources>
@@ -58,7 +58,7 @@
<RowDefinition />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<controls:MainWindowNavigationBar Grid.Column="0" Grid.Row="0"/>
<!--<controls:MainWindowNavigationBar Grid.Column="0" Grid.Row="0"/>-->
<ContentControl Grid.Column="1" Grid.Row="0" Content="{Binding CurrentViewModel}" />
<StatusBar FontSize="20" Grid.Row="1" Grid.ColumnSpan="2">
<StatusBarItem FontSize="20" Content="{Binding Projektnummer}" />

6
DaSaSo.sln
View File

@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DaSaSo.ConsoleApp", "DaSaSo
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DaSaSo.Wpf", "DaSaSo.Wpf\DaSaSo.Wpf.csproj", "{0B11DE2B-BBAB-465E-B9D4-9E02B804A9CC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DaSaSo.ViewModel", "DaSaSo.ViewModel\DaSaSo.ViewModel.csproj", "{7CC8889C-87AD-4E32-B9AB-C4B322828797}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DaSaSo.InMemoryProvider", "DaSaSo.InMemoryProvider\DaSaSo.InMemoryProvider.csproj", "{838B8397-FF4A-4E61-A6A8-B3F8D00D120D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DaSaSo.DatabaseConverter", "DaSaSo.DatabaseConverter\DaSaSo.DatabaseConverter.csproj", "{E0842F1A-E74D-4B84-BD27-3585901B0DE9}"
@@ -44,10 +42,6 @@ Global
{0B11DE2B-BBAB-465E-B9D4-9E02B804A9CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B11DE2B-BBAB-465E-B9D4-9E02B804A9CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0B11DE2B-BBAB-465E-B9D4-9E02B804A9CC}.Release|Any CPU.Build.0 = Release|Any CPU
{7CC8889C-87AD-4E32-B9AB-C4B322828797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7CC8889C-87AD-4E32-B9AB-C4B322828797}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7CC8889C-87AD-4E32-B9AB-C4B322828797}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7CC8889C-87AD-4E32-B9AB-C4B322828797}.Release|Any CPU.Build.0 = Release|Any CPU
{838B8397-FF4A-4E61-A6A8-B3F8D00D120D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{838B8397-FF4A-4E61-A6A8-B3F8D00D120D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{838B8397-FF4A-4E61-A6A8-B3F8D00D120D}.Release|Any CPU.ActiveCfg = Release|Any CPU