diff --git a/SewerStammGen.EntityFramework/SewerStammGen.EntityFramework.csproj b/SewerStammGen.EntityFramework/SewerStammGen.EntityFramework.csproj index 4ed4142..c12d619 100644 --- a/SewerStammGen.EntityFramework/SewerStammGen.EntityFramework.csproj +++ b/SewerStammGen.EntityFramework/SewerStammGen.EntityFramework.csproj @@ -17,7 +17,7 @@ - + diff --git a/SewerStammGen/App.xaml b/SewerStammGen/App.xaml index 56ffa5b..2514256 100644 --- a/SewerStammGen/App.xaml +++ b/SewerStammGen/App.xaml @@ -1,4 +1,4 @@ - /// Interaction logic for App.xaml diff --git a/SewerStammGen/Commands/AsyncCommandBase.cs b/SewerStammGen/Commands/AsyncCommandBase.cs index 2efd230..b1407a4 100644 --- a/SewerStammGen/Commands/AsyncCommandBase.cs +++ b/SewerStammGen/Commands/AsyncCommandBase.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Input; -namespace SewerStammGen.Commands +namespace SewerStammGen.WPF.Commands { internal abstract class AsyncCommandBase : ICommand { diff --git a/SewerStammGen/Commands/UpdateCurrentViewModelCommand.cs b/SewerStammGen/Commands/UpdateCurrentViewModelCommand.cs index ffd8472..27bada8 100644 --- a/SewerStammGen/Commands/UpdateCurrentViewModelCommand.cs +++ b/SewerStammGen/Commands/UpdateCurrentViewModelCommand.cs @@ -1,13 +1,13 @@ using SewerStammGen.Enum; -using SewerStammGen.Interface; -using SewerStammGen.Interface.Navigator; +using SewerStammGen.WPF.Interface; +using SewerStammGen.WPF.Interface.Navigator; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.Commands +namespace SewerStammGen.WPF.Commands { internal class UpdateCurrentViewModelCommand : AsyncCommandBase { diff --git a/SewerStammGen/HostBuilders/AddServicesHostBuilderExtensions.cs b/SewerStammGen/HostBuilders/AddServicesHostBuilderExtensions.cs index d554946..c52ccc0 100644 --- a/SewerStammGen/HostBuilders/AddServicesHostBuilderExtensions.cs +++ b/SewerStammGen/HostBuilders/AddServicesHostBuilderExtensions.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using SewerStammGen.Interface.Navigator; -using SewerStammGen.ViewModel.State.Navigation; +using SewerStammGen.WPF.Interface.Navigator; +using SewerStammGen.WPF.ViewModel.State.Navigation; using System; using System.Collections.Generic; using System.Linq; diff --git a/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs b/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs index a071db6..94889f2 100644 --- a/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs +++ b/SewerStammGen/HostBuilders/AddViewModelsHostBuilderExtensions.cs @@ -1,8 +1,8 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using SewerStammGen.Interface; -using SewerStammGen.ViewModel; -using SewerStammGen.ViewModel.Factories; +using SewerStammGen.WPF.Interface; +using SewerStammGen.WPF.ViewModel; +using SewerStammGen.WPF.ViewModel.Factories; using System; using System.Collections.Generic; using System.Linq; diff --git a/SewerStammGen/Interface/IViewModelAbstractFactory.cs b/SewerStammGen/Interface/IViewModelAbstractFactory.cs index 227dba8..9f0ae4c 100644 --- a/SewerStammGen/Interface/IViewModelAbstractFactory.cs +++ b/SewerStammGen/Interface/IViewModelAbstractFactory.cs @@ -1,12 +1,12 @@ using SewerStammGen.Enum; -using SewerStammGen.ViewModel; +using SewerStammGen.WPF.ViewModel; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.Interface +namespace SewerStammGen.WPF.Interface { public interface IViewModelAbstractFactory { diff --git a/SewerStammGen/Interface/Navigator/IMainWindowNavigator.cs b/SewerStammGen/Interface/Navigator/IMainWindowNavigator.cs index d00c87a..7bd8303 100644 --- a/SewerStammGen/Interface/Navigator/IMainWindowNavigator.cs +++ b/SewerStammGen/Interface/Navigator/IMainWindowNavigator.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.Interface.Navigator +namespace SewerStammGen.WPF.Interface.Navigator { public interface IMainWindowNavigator : INavigator { diff --git a/SewerStammGen/Interface/Navigator/INavigator.cs b/SewerStammGen/Interface/Navigator/INavigator.cs index a079e53..af5762b 100644 --- a/SewerStammGen/Interface/Navigator/INavigator.cs +++ b/SewerStammGen/Interface/Navigator/INavigator.cs @@ -1,11 +1,11 @@ -using SewerStammGen.ViewModel; +using SewerStammGen.WPF.ViewModel; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.Interface.Navigator +namespace SewerStammGen.WPF.Interface.Navigator { public interface INavigator { diff --git a/SewerStammGen/MainWindow.xaml b/SewerStammGen/MainWindow.xaml index 8570eef..9f792f3 100644 --- a/SewerStammGen/MainWindow.xaml +++ b/SewerStammGen/MainWindow.xaml @@ -1,13 +1,13 @@ - diff --git a/SewerStammGen/MainWindow.xaml.cs b/SewerStammGen/MainWindow.xaml.cs index 59577d8..70d90ad 100644 --- a/SewerStammGen/MainWindow.xaml.cs +++ b/SewerStammGen/MainWindow.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace SewerStammGen +namespace SewerStammGen.WPF { /// /// Interaction logic for MainWindow.xaml diff --git a/SewerStammGen/SewerStammGen.csproj b/SewerStammGen/SewerStammGen.WPF.csproj similarity index 100% rename from SewerStammGen/SewerStammGen.csproj rename to SewerStammGen/SewerStammGen.WPF.csproj diff --git a/SewerStammGen/SewerStammGen.csproj.user b/SewerStammGen/SewerStammGen.WPF.csproj.user similarity index 87% rename from SewerStammGen/SewerStammGen.csproj.user rename to SewerStammGen/SewerStammGen.WPF.csproj.user index 32373c9..480d87c 100644 --- a/SewerStammGen/SewerStammGen.csproj.user +++ b/SewerStammGen/SewerStammGen.WPF.csproj.user @@ -13,6 +13,9 @@ Code + + Code + Code @@ -33,6 +36,9 @@ Designer + + Designer + Designer diff --git a/SewerStammGen/ViewModel/BaseViewModel.cs b/SewerStammGen/ViewModel/BaseViewModel.cs index 5861806..147242c 100644 --- a/SewerStammGen/ViewModel/BaseViewModel.cs +++ b/SewerStammGen/ViewModel/BaseViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.ViewModel +namespace SewerStammGen.WPF.ViewModel { public delegate TViewModel CreateViewModel() where TViewModel : BaseViewModel; public class BaseViewModel : ObservableObject diff --git a/SewerStammGen/ViewModel/EditManHoleViewModel.cs b/SewerStammGen/ViewModel/EditManHoleViewModel.cs index c4c38ae..409b528 100644 --- a/SewerStammGen/ViewModel/EditManHoleViewModel.cs +++ b/SewerStammGen/ViewModel/EditManHoleViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.ViewModel +namespace SewerStammGen.WPF.ViewModel { public class EditManHoleViewModel : BaseViewModel { diff --git a/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs b/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs index 604584b..4bf9700 100644 --- a/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs +++ b/SewerStammGen/ViewModel/Factories/MainWindowViewModelFactory.cs @@ -1,12 +1,12 @@ using SewerStammGen.Enum; -using SewerStammGen.Interface; +using SewerStammGen.WPF.Interface; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.ViewModel.Factories +namespace SewerStammGen.WPF.ViewModel.Factories { public class MainWindowViewModelFactory : IViewModelAbstractFactory { diff --git a/SewerStammGen/ViewModel/HomeViewModel.cs b/SewerStammGen/ViewModel/HomeViewModel.cs index cb75f79..c6a5604 100644 --- a/SewerStammGen/ViewModel/HomeViewModel.cs +++ b/SewerStammGen/ViewModel/HomeViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.ViewModel +namespace SewerStammGen.WPF.ViewModel { public class HomeViewModel : BaseViewModel { diff --git a/SewerStammGen/ViewModel/MainWindowViewModel.cs b/SewerStammGen/ViewModel/MainWindowViewModel.cs index 56d3e9f..fd62346 100644 --- a/SewerStammGen/ViewModel/MainWindowViewModel.cs +++ b/SewerStammGen/ViewModel/MainWindowViewModel.cs @@ -1,7 +1,7 @@ -using SewerStammGen.Commands; +using SewerStammGen.WPF.Commands; using SewerStammGen.Enum; -using SewerStammGen.Interface; -using SewerStammGen.Interface.Navigator; +using SewerStammGen.WPF.Interface; +using SewerStammGen.WPF.Interface.Navigator; using System; using System.Collections.Generic; using System.Linq; @@ -10,7 +10,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Input; -namespace SewerStammGen.ViewModel +namespace SewerStammGen.WPF.ViewModel { public class MainWindowViewModel : BaseViewModel { diff --git a/SewerStammGen/ViewModel/ObservableObject.cs b/SewerStammGen/ViewModel/ObservableObject.cs index 22ee986..a142c20 100644 --- a/SewerStammGen/ViewModel/ObservableObject.cs +++ b/SewerStammGen/ViewModel/ObservableObject.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using System.Runtime.CompilerServices; -namespace SewerStammGen.ViewModel +namespace SewerStammGen.WPF.ViewModel { public class ObservableObject : INotifyPropertyChanged { diff --git a/SewerStammGen/ViewModel/ProjectListViewModel.cs b/SewerStammGen/ViewModel/ProjectListViewModel.cs index 82bea97..72d90fb 100644 --- a/SewerStammGen/ViewModel/ProjectListViewModel.cs +++ b/SewerStammGen/ViewModel/ProjectListViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.ViewModel +namespace SewerStammGen.WPF.ViewModel { public class ProjectListViewModel : BaseViewModel { diff --git a/SewerStammGen/ViewModel/Projekt/ProjektListViewModel.cs b/SewerStammGen/ViewModel/Projekt/ProjektListViewModel.cs new file mode 100644 index 0000000..2382b34 --- /dev/null +++ b/SewerStammGen/ViewModel/Projekt/ProjektListViewModel.cs @@ -0,0 +1,13 @@ +using SewerStammGen.WPF.ViewModel; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SewerStammGen.WPF.ViewModel +{ + public class ProjektListViewModel : BaseViewModel + { + } +} diff --git a/SewerStammGen/ViewModel/RelayCommand.cs b/SewerStammGen/ViewModel/RelayCommand.cs index db205d4..af1326e 100644 --- a/SewerStammGen/ViewModel/RelayCommand.cs +++ b/SewerStammGen/ViewModel/RelayCommand.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Input; -namespace SewerStammGen.ViewModel +namespace SewerStammGen.WPF.ViewModel { [Serializable] class RelayCommand : ICommand diff --git a/SewerStammGen/ViewModel/SewerConnectorViewModel.cs b/SewerStammGen/ViewModel/SewerConnectorViewModel.cs index 8e62d28..8ccd35a 100644 --- a/SewerStammGen/ViewModel/SewerConnectorViewModel.cs +++ b/SewerStammGen/ViewModel/SewerConnectorViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.ViewModel +namespace SewerStammGen.WPF.ViewModel { public class SewerConnectorViewModel : BaseViewModel { diff --git a/SewerStammGen/ViewModel/State/Navigation/MainWindowNavigator.cs b/SewerStammGen/ViewModel/State/Navigation/MainWindowNavigator.cs index 8a5c0bc..36288db 100644 --- a/SewerStammGen/ViewModel/State/Navigation/MainWindowNavigator.cs +++ b/SewerStammGen/ViewModel/State/Navigation/MainWindowNavigator.cs @@ -1,11 +1,11 @@ -using SewerStammGen.Interface.Navigator; +using SewerStammGen.WPF.Interface.Navigator; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.ViewModel.State.Navigation +namespace SewerStammGen.WPF.ViewModel.State.Navigation { internal class MainWindowNavigator : ObservableObject, IMainWindowNavigator { diff --git a/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml b/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml index ed42711..2767b3a 100644 --- a/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml +++ b/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml @@ -1,12 +1,12 @@ - diff --git a/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml.cs b/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml.cs index 1089341..54bec52 100644 --- a/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml.cs +++ b/SewerStammGen/Views/Controls/UCMainWindowNavigationBar.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace SewerStammGen.Views.Controls +namespace SewerStammGen.WPF.Views.Controls { /// /// Interaktionslogik für UCMainWindowNavigationBar.xaml diff --git a/SewerStammGen/Views/Converters/EqualValueToParameterConverter.cs b/SewerStammGen/Views/Converters/EqualValueToParameterConverter.cs index 2ad9793..2a91f0c 100644 --- a/SewerStammGen/Views/Converters/EqualValueToParameterConverter.cs +++ b/SewerStammGen/Views/Converters/EqualValueToParameterConverter.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Data; -namespace SewerStammGen.Views.Converters +namespace SewerStammGen.WPF.Views.Converters { public class EqualValueToParameterConverter : IValueConverter { diff --git a/SewerStammGen/Views/HomeView.xaml b/SewerStammGen/Views/HomeView.xaml index 90ca2ed..e1d05cd 100644 --- a/SewerStammGen/Views/HomeView.xaml +++ b/SewerStammGen/Views/HomeView.xaml @@ -1,9 +1,9 @@ - diff --git a/SewerStammGen/Views/HomeView.xaml.cs b/SewerStammGen/Views/HomeView.xaml.cs index 901125f..e163203 100644 --- a/SewerStammGen/Views/HomeView.xaml.cs +++ b/SewerStammGen/Views/HomeView.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace SewerStammGen.Views +namespace SewerStammGen.WPF.Views { /// /// Interaktionslogik für HomeView.xaml diff --git a/SewerStammGen/Views/Projekte/ProjektListView.xaml b/SewerStammGen/Views/Projekte/ProjektListView.xaml new file mode 100644 index 0000000..64bec4f --- /dev/null +++ b/SewerStammGen/Views/Projekte/ProjektListView.xaml @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/SewerStammGen/Views/Projekte/ProjektListView.xaml.cs b/SewerStammGen/Views/Projekte/ProjektListView.xaml.cs new file mode 100644 index 0000000..450bca1 --- /dev/null +++ b/SewerStammGen/Views/Projekte/ProjektListView.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 SewerStammGen.WPF.Views.Projekte +{ + /// + /// Interaktionslogik für ProjektListView.xaml + /// + public partial class ProjektListView : UserControl + { + public ProjektListView() + { + InitializeComponent(); + } + } +} diff --git a/SewerStammGen/Views/UCEditSchacht.xaml b/SewerStammGen/Views/UCEditSchacht.xaml index 5162173..6a5b171 100644 --- a/SewerStammGen/Views/UCEditSchacht.xaml +++ b/SewerStammGen/Views/UCEditSchacht.xaml @@ -1,9 +1,9 @@ - diff --git a/SewerStammGen/Views/UCEditSchacht.xaml.cs b/SewerStammGen/Views/UCEditSchacht.xaml.cs index e61d5b3..6bf4849 100644 --- a/SewerStammGen/Views/UCEditSchacht.xaml.cs +++ b/SewerStammGen/Views/UCEditSchacht.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace SewerStammGen.Views +namespace SewerStammGen.WPF.Views { /// /// Interaktionslogik für UCEditSchacht.xaml diff --git a/SewerStammGen/Views/UCNormXML.xaml b/SewerStammGen/Views/UCNormXML.xaml index 368e785..d0166d2 100644 --- a/SewerStammGen/Views/UCNormXML.xaml +++ b/SewerStammGen/Views/UCNormXML.xaml @@ -1,9 +1,9 @@ - diff --git a/SewerStammGen/Views/UCNormXML.xaml.cs b/SewerStammGen/Views/UCNormXML.xaml.cs index bce2000..cab9b5f 100644 --- a/SewerStammGen/Views/UCNormXML.xaml.cs +++ b/SewerStammGen/Views/UCNormXML.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace SewerStammGen.Views +namespace SewerStammGen.WPF.Views { /// /// Interaktionslogik für UCNormXML.xaml diff --git a/SewerStammGen/Views/UCSewerConnector.xaml b/SewerStammGen/Views/UCSewerConnector.xaml index 9fd9d68..c9db62c 100644 --- a/SewerStammGen/Views/UCSewerConnector.xaml +++ b/SewerStammGen/Views/UCSewerConnector.xaml @@ -1,10 +1,10 @@ - diff --git a/SewerStammGen/Views/UCSewerConnector.xaml.cs b/SewerStammGen/Views/UCSewerConnector.xaml.cs index 35f7b3f..ccaf50b 100644 --- a/SewerStammGen/Views/UCSewerConnector.xaml.cs +++ b/SewerStammGen/Views/UCSewerConnector.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace SewerStammGen.Views +namespace SewerStammGen.WPF.Views { /// /// Interaktionslogik für UCSewerConnector.xaml diff --git a/Shared/Domain/Projekt.cs b/Shared/Domain/Projekt.cs index 7982580..7686c75 100644 --- a/Shared/Domain/Projekt.cs +++ b/Shared/Domain/Projekt.cs @@ -13,6 +13,7 @@ namespace Shared.Domain public string Erstelldatum { get; set; } public string Strasse { get;set; } public string Ort { get; set; } + public Auftraggeber Auftraggeber { get; set; } public EExportType ExportType { get; set; } public EKodierungssystem Kodierungssystem { get; set; } public IList Kanaele { get; set; } diff --git a/Shared/Shared.csproj b/Shared/SewerStammGen.Shared.csproj similarity index 100% rename from Shared/Shared.csproj rename to Shared/SewerStammGen.Shared.csproj diff --git a/Stammdatengenerator.sln b/Stammdatengenerator.sln index dd3aa34..f204a63 100644 --- a/Stammdatengenerator.sln +++ b/Stammdatengenerator.sln @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.5.33502.453 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SewerStammGen", "SewerStammGen\SewerStammGen.csproj", "{7052AE7B-9E3C-4C04-9756-7488D21512C1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SewerStammGen.WPF", "SewerStammGen\SewerStammGen.WPF.csproj", "{7052AE7B-9E3C-4C04-9756-7488D21512C1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "Shared\Shared.csproj", "{3A47BD31-36C2-45C4-9609-D0D9D92A993B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SewerStammGen.Shared", "Shared\SewerStammGen.Shared.csproj", "{3A47BD31-36C2-45C4-9609-D0D9D92A993B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SewerStammGen.EntityFramework", "SewerStammGen.EntityFramework\SewerStammGen.EntityFramework.csproj", "{803CB44F-F68C-4872-8408-047D02BBF201}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SewerStammGen.EntityFramework", "SewerStammGen.EntityFramework\SewerStammGen.EntityFramework.csproj", "{803CB44F-F68C-4872-8408-047D02BBF201}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution