diff --git a/.gitignore b/.gitignore
index d2f1dc6..c4aec5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/KanSan/version.txt
/KanSan.ViewModel/bin/*
/KanSan.ViewModel/obj/*
+*/version.txt
diff --git a/KanSan.ViewModel/BaustellenListViewModel.cs b/KanSan.ViewModel/BaustellenListViewModel.cs
new file mode 100644
index 0000000..13e6d5f
--- /dev/null
+++ b/KanSan.ViewModel/BaustellenListViewModel.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace KanSan.ViewModel
+{
+ class BaustellenListViewModel
+ {
+ }
+}
diff --git a/KanSan.ViewModel/KanSan.ViewModel.csproj b/KanSan.ViewModel/KanSan.ViewModel.csproj
index 336311a..f8bf120 100644
--- a/KanSan.ViewModel/KanSan.ViewModel.csproj
+++ b/KanSan.ViewModel/KanSan.ViewModel.csproj
@@ -4,8 +4,22 @@
netcoreapp3.1
+
+
+
+
+
+
+ Always
+
+
+
+
+
+
+
diff --git a/KanSan.ViewModel/MainWindowViewModel.cs b/KanSan.ViewModel/MainWindowViewModel.cs
new file mode 100644
index 0000000..3163700
--- /dev/null
+++ b/KanSan.ViewModel/MainWindowViewModel.cs
@@ -0,0 +1,44 @@
+using KanSan.Base.Models;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Text;
+
+namespace KanSan.ViewModel
+{
+ public class MainWindowViewModel
+ {
+ private Kunde _selectedKunde;
+ private string applicationTitle;
+
+ public string ApplicationTitle
+ {
+ get
+ {
+ string gitVersion;
+
+ using (Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("KanSan.ViewModel.version.txt"))
+ using (StreamReader reader = new StreamReader(stream))
+ {
+ gitVersion = reader.ReadToEnd();
+ }
+
+ return gitVersion;
+ }
+ }
+
+ public Kunde SelectedKunde
+ {
+ get
+ {
+ return _selectedKunde;
+ }
+ }
+
+ public MainWindowViewModel()
+ {
+
+ }
+ }
+}
diff --git a/KanSan.ViewModel/ProjektListViewModel.cs b/KanSan.ViewModel/ProjektListViewModel.cs
new file mode 100644
index 0000000..2981ed1
--- /dev/null
+++ b/KanSan.ViewModel/ProjektListViewModel.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace KanSan.ViewModel
+{
+ public class ProjektListViewModel
+ {
+ }
+}
diff --git a/KanSan/KanSan.csproj b/KanSan/KanSan.csproj
index c25c9bd..81d0f99 100644
--- a/KanSan/KanSan.csproj
+++ b/KanSan/KanSan.csproj
@@ -36,8 +36,4 @@
-
-
-
-
\ No newline at end of file
diff --git a/KanSan/MainWindow.xaml b/KanSan/MainWindow.xaml
index 8f673b0..951cdd9 100644
--- a/KanSan/MainWindow.xaml
+++ b/KanSan/MainWindow.xaml
@@ -6,13 +6,27 @@
xmlns:local="clr-namespace:KanSan"
xmlns:syncfusion="http://schemas.syncfusion.com/wpf" x:Class="KanSan.MainWindow"
mc:Ignorable="d"
- Title="MainWindow" Height="450" Width="800" WindowStartupLocation="CenterScreen" WindowState="Maximized">
+ Title="{Binding ApplicationTitle}" Height="450" Width="800" WindowStartupLocation="CenterScreen" WindowState="Maximized">
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/KanSan/MainWindow.xaml.cs b/KanSan/MainWindow.xaml.cs
index 39ea9b4..4184aae 100644
--- a/KanSan/MainWindow.xaml.cs
+++ b/KanSan/MainWindow.xaml.cs
@@ -15,6 +15,7 @@ using System.Windows.Navigation;
using System.Windows.Shapes;
using KanSan.Base;
using KanSan.Base.Models;
+using KanSan.ViewModel;
using Microsoft.EntityFrameworkCore;
namespace KanSan
@@ -27,15 +28,8 @@ namespace KanSan
public MainWindow()
{
InitializeComponent();
- this.Title = ProgrammHashVersion.GIT_HASH;
-
-
- /*UI.UCKundeEdit uCKundeEdit = new UI.UCKundeEdit();
- ContentController.Content = uCKundeEdit;*/
-
- UI.UCKundeList uCKundeList = new UI.UCKundeList();
- uCKundeList.KundeAdded += UCKundeList_KundeAdded;
- ContentController.Content = uCKundeList;
+ this.DataContext = new MainWindowViewModel();
+ //this.Title = ProgrammHashVersion.GIT_HASH;
}
private void UCKundeList_KundeAdded(object sender, UI.KundeAddedKlickEventArgs e)
@@ -43,6 +37,13 @@ namespace KanSan
UI.UCKundeEdit uCKundeEdit = new UI.UCKundeEdit(e.kunde);
ContentController.Content = uCKundeEdit;
}
+
+ private void btnKunden_Click(object sender, RoutedEventArgs e)
+ {
+ UI.UCKundeList uCKundeList = new UI.UCKundeList();
+ uCKundeList.KundeAdded += UCKundeList_KundeAdded;
+ ContentController.Content = uCKundeList;
+ }
}
}
diff --git a/KanSan/UI/Kunde/UCKundeList.xaml b/KanSan/UI/Kunde/UCKundeList.xaml
index 67ff8f9..68e26e4 100644
--- a/KanSan/UI/Kunde/UCKundeList.xaml
+++ b/KanSan/UI/Kunde/UCKundeList.xaml
@@ -10,8 +10,17 @@
+
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/KanSan/UI/Kunde/UCKundeList.xaml.cs b/KanSan/UI/Kunde/UCKundeList.xaml.cs
index e8aaa35..7a0477e 100644
--- a/KanSan/UI/Kunde/UCKundeList.xaml.cs
+++ b/KanSan/UI/Kunde/UCKundeList.xaml.cs
@@ -2,6 +2,7 @@
using KanSan.ViewModel;
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Text;
using System.Windows;
using System.Windows.Controls;
@@ -41,6 +42,14 @@ namespace KanSan.UI
handler(this, e);
}
public event EventHandler KundeAdded;
+
+ private void EditKunde_Click(object sender, RoutedEventArgs e)
+ {
+ Kunde selectedKunde = (dgKundenList.SelectedItem as Kunde);
+ if (selectedKunde == null) return;
+
+ OnKlickedKunde(new KundeAddedKlickEventArgs() { kunde = selectedKunde });
+ }
}
public class KundeAddedKlickEventArgs : EventArgs