From 8cf0373a95643989837c70570857c45d664aa603 Mon Sep 17 00:00:00 2001
From: HuskyTeufel <damianbodde@googlemail.com>
Date: Tue, 28 Sep 2021 18:25:29 +0200
Subject: [PATCH] Codecleanup

---
 DaSaSo.ViewModel/Commands/SaveSewerCommand.cs     | 15 ++++-----------
 DaSaSo.ViewModel/SewerMainListViewModel.cs        |  7 +++++--
 DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml |  2 +-
 .../View/Buildingsites/BuildingSiteListView.xaml  |  8 +++++++-
 DaSaSo.Wpf/View/Client/ClientListView.xaml        |  2 +-
 DaSaSo.Wpf/View/Project/ProjectListView.xaml      |  8 ++++++--
 DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml    |  7 +++++--
 .../View/SewerObjecte/SewerObjecteListView.xaml   |  3 ++-
 8 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/DaSaSo.ViewModel/Commands/SaveSewerCommand.cs b/DaSaSo.ViewModel/Commands/SaveSewerCommand.cs
index 82e3184..20a2676 100644
--- a/DaSaSo.ViewModel/Commands/SaveSewerCommand.cs
+++ b/DaSaSo.ViewModel/Commands/SaveSewerCommand.cs
@@ -14,26 +14,24 @@ namespace DaSaSo.ViewModel.Commands
 {
     public class SaveSewerCommand : AsyncCommandBase
     {
-        private readonly SewerMainListViewModel _sewerMainListViewModel;
+
         private IDataService<SewerObject> _dataService;
-        private readonly ISewerpointService _sewerPointService;
         private IActualProject _actualProject;
         private readonly ISewerObjectService _sewerObjectService;
         private readonly IRenavigator _renavigator;
         private readonly ISewerMainNavigator _navigator;
 
         public SaveSewerCommand(
-            SewerMainListViewModel sewerMainListViewModel,
+            
             IDataService<SewerObject> dataService,
             IActualProject actualProject,
             ISewerObjectService sewerObjectService,
             IRenavigator renavigator,
-            ISewerpointService sewerpointService,
             ISewerMainNavigator navigator)
         {
-            _sewerMainListViewModel = sewerMainListViewModel;
+            
             _dataService = dataService;
-            _sewerPointService = sewerpointService;
+ 
             _actualProject = actualProject;
             _sewerObjectService = sewerObjectService;
             _renavigator = renavigator;
@@ -44,11 +42,6 @@ namespace DaSaSo.ViewModel.Commands
         public override async Task ExecuteAsync(object? parameter)
         {
             _navigator.CurrentViewModel = null;
-            
-            //Debugger.Break();
-            
-            //_actualProject.AktuellSewerObject.PunktOben = d;
-            //_ = await _dataService.Update(_actualProject.AktuellSewerObject.Id, _actualProject.AktuellSewerObject);
             _renavigator.Renavigate(new SewerObjectListViewModel(_dataService, _actualProject, _sewerObjectService));
         }
     }
diff --git a/DaSaSo.ViewModel/SewerMainListViewModel.cs b/DaSaSo.ViewModel/SewerMainListViewModel.cs
index 99b114d..c8101b5 100644
--- a/DaSaSo.ViewModel/SewerMainListViewModel.cs
+++ b/DaSaSo.ViewModel/SewerMainListViewModel.cs
@@ -23,7 +23,7 @@ namespace DaSaSo.ViewModel
         private readonly IRenavigator _renavigator;
         private IActualProject _actualProject {  get; set; }
         public ICommand UpdateCurrentSewerViewModelCommand { get; }
-        public ICommand SaveCommand { get; set; }
+        public ICommand CloseCommand { get; set; }
         public BaseViewModel CurrentSewerViewModel => _navigator.CurrentViewModel;
 
         public bool IsLoading
@@ -39,6 +39,9 @@ namespace DaSaSo.ViewModel
             }
         }
 
+        public string Strasse { get => _actualProject.AktuellSewerObject.StreetName; }
+        public string AktualObject { get => _actualProject.AktuellSewerObject.ObjektName; }
+
         bool _isLoading = true;
         public bool CanSaveSewer => !string.IsNullOrEmpty(_actualProject.AktuellSewerObject.StreetName);
 
@@ -49,7 +52,7 @@ namespace DaSaSo.ViewModel
             _dataservice = (SewerObjectDataService)dataService;
             _renavigator = renavigator;
             _sewerObjectService = sewerObjectService;
-            SaveCommand = new SaveSewerCommand(this,dataService,actualProject,sewerObjectService,renavigator,sewerpointService,navigator); //RelayCommand(SaveSewer);
+            CloseCommand = new SaveSewerCommand(_dataservice,_actualProject,_sewerObjectService,_renavigator,_navigator); //RelayCommand(SaveSewer);
             LoadModel();
             UpdateCurrentSewerViewModelCommand = new UpdateCurrentSewerViewModelCommand(_navigator, viewModelFactory);
             _navigator.StateChanged += () => OnPropertyChanged(nameof(CurrentSewerViewModel));
diff --git a/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml b/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml
index b553646..801093f 100644
--- a/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml
+++ b/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml
@@ -11,7 +11,7 @@
         <StackPanel>
             <RadioButton Content="Stammdaten" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentSewerViewModelCommand}" CommandParameter="{x:Static nav:ESewerWindowViewType.SewerStammdaten}" Margin="20" />
             <RadioButton Content="Schäden" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentSewerViewModelCommand}" CommandParameter="{x:Static nav:ESewerWindowViewType.SewerDamageList}" Margin="20" />
-            <RadioButton Content="Schließen" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentSewerViewModelCommand}" CommandParameter="{x:Static nav:ESewerWindowViewType.SewerStammdaten}" Margin="20" />
+            <RadioButton Content="Schließen" Style="{StaticResource ToggleButtonList}" Command="{Binding CloseCommand}" Margin="20" />
         </StackPanel>
             
     </Grid>
diff --git a/DaSaSo.Wpf/View/Buildingsites/BuildingSiteListView.xaml b/DaSaSo.Wpf/View/Buildingsites/BuildingSiteListView.xaml
index eb9298b..349af49 100644
--- a/DaSaSo.Wpf/View/Buildingsites/BuildingSiteListView.xaml
+++ b/DaSaSo.Wpf/View/Buildingsites/BuildingSiteListView.xaml
@@ -8,7 +8,13 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <StackPanel>
-            <DataGrid ItemsSource="{Binding Buildingsites}" SelectedItem="{Binding SelectedBuildingsite}" IsReadOnly="True" />
+            <DataGrid Margin="20" AutoGenerateColumns="False" ItemsSource="{Binding Buildingsites}" SelectedItem="{Binding SelectedBuildingsite}" IsReadOnly="True">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="Baustellennummer" Binding="{Binding BuildingSiteNumber}" />
+                    <DataGridTextColumn Header="Ort" Binding="{Binding Country}" />
+                    <DataGridTextColumn Header="Ansprechpartner" Binding="{Binding ContactPerson}" />
+                </DataGrid.Columns>
+            </DataGrid>
             <Button Content="Selektiere" Command="{Binding SelectCommand}" />
             <Button Content="Hinzufügen" Command="{Binding AddCommand}" />
             <Button Content="Bearbeiten" Command="{Binding EditCommand}" />
diff --git a/DaSaSo.Wpf/View/Client/ClientListView.xaml b/DaSaSo.Wpf/View/Client/ClientListView.xaml
index 398269a..7424e16 100644
--- a/DaSaSo.Wpf/View/Client/ClientListView.xaml
+++ b/DaSaSo.Wpf/View/Client/ClientListView.xaml
@@ -12,7 +12,7 @@
     <Grid>
         <StackPanel>
             <TextBlock Text="Kundenliste" />
-            <ListView ItemsSource="{Binding Clients}" DisplayMemberPath="Firstname" SelectedItem="{Binding SelectedClient, Mode=TwoWay}"/>
+            <ListView Margin="20" ItemsSource="{Binding Clients}" DisplayMemberPath="Firstname" SelectedItem="{Binding SelectedClient, Mode=TwoWay}"/>
             <Button Content="Kunde auswählen" Command="{Binding SelectCommand}" />
             <Button Content="Kunde Editieren"  Command="{Binding EditCommand}"/>
             <Button Content="Kunde Hinzufügen" Command="{Binding AddNewClientCommand}" />
diff --git a/DaSaSo.Wpf/View/Project/ProjectListView.xaml b/DaSaSo.Wpf/View/Project/ProjectListView.xaml
index 748493a..c3e50ef 100644
--- a/DaSaSo.Wpf/View/Project/ProjectListView.xaml
+++ b/DaSaSo.Wpf/View/Project/ProjectListView.xaml
@@ -8,8 +8,12 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <StackPanel>
-            <DataGrid IsReadOnly="True" ItemsSource="{Binding Projekte}" SelectedItem="{Binding SelectedProject}">
-
+            <DataGrid Margin="20" AutoGenerateColumns="False" SelectionMode="Single" IsReadOnly="True" ItemsSource="{Binding Projekte}" SelectedItem="{Binding SelectedProject}">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="Projektnummer" Binding="{Binding Projektnummer}" />
+                    <DataGridTextColumn Header="Name" Binding="{Binding Name}" />
+                </DataGrid.Columns>
+                
             </DataGrid>
             <Button Content="Selektiere" Command="{Binding SelectCommand}" />
             <Button Content="Hinzufügen" Command="{Binding AddCommand}" />
diff --git a/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml b/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml
index b910581..f65d64d 100644
--- a/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml
+++ b/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml
@@ -26,9 +26,12 @@
         <Controls:SewerObjectNavigationBar Grid.Column="0" />
         <ContentControl Grid.Column="1" Content="{Binding CurrentSewerViewModel}" />
         <StackPanel Grid.Row="1" Grid.ColumnSpan="2">
-            <Button Content="Schließen" Command="{Binding SaveCommand}" />
             <StatusBar Grid.Row="1" Grid.ColumnSpan="2">
-                <StatusBarItem Content="Dada" />
+                <StatusBarItem FontSize="20" Content="{Binding Strasse}" d:Content="Strasse" />
+                <Separator />
+                <StatusBarItem FontSize="20" Content="{Binding AktualObject}" d:Content="Aktuelle Objekt" />
+                <Separator />
+
             </StatusBar>
         </StackPanel>
         
diff --git a/DaSaSo.Wpf/View/SewerObjecte/SewerObjecteListView.xaml b/DaSaSo.Wpf/View/SewerObjecte/SewerObjecteListView.xaml
index cd6f768..d1668f5 100644
--- a/DaSaSo.Wpf/View/SewerObjecte/SewerObjecteListView.xaml
+++ b/DaSaSo.Wpf/View/SewerObjecte/SewerObjecteListView.xaml
@@ -14,7 +14,8 @@
     </d:UserControl.DataContext>
     <Grid>
         <StackPanel>
-            <TreeView ItemsSource="{Binding SewerObjects}" SelectedValuePath="{Binding Testme}">
+            <TextBlock Text="Objektliste" />
+            <TreeView Margin="20" ItemsSource="{Binding SewerObjects}" SelectedValuePath="{Binding Testme}">
                 <TreeView.Resources>
                     <HierarchicalDataTemplate DataType="{x:Type dsmodel:SewerObjectsToStreet}" ItemsSource="{Binding SewerObjects}">
                         <StackPanel Orientation="Horizontal">