diff --git a/WGneu/MainWindow.xaml b/WGneu/MainWindow.xaml
index 55d3786..eaca478 100644
--- a/WGneu/MainWindow.xaml
+++ b/WGneu/MainWindow.xaml
@@ -18,5 +18,10 @@
+
diff --git a/WGneu/MainWindow.xaml.cs b/WGneu/MainWindow.xaml.cs
index 622b62b..11e955f 100644
--- a/WGneu/MainWindow.xaml.cs
+++ b/WGneu/MainWindow.xaml.cs
@@ -28,7 +28,7 @@ namespace WGneu
public MainWindow()
{
InitializeComponent();
- countryViewSource = (CollectionViewSource)FindResource("countryViewSource");
+ countryViewSource = (CollectionViewSource) FindResource("countryViewSource");
}
private void Window_Loaded(object sender, RoutedEventArgs e)
@@ -49,6 +49,12 @@ namespace WGneu
w.Show();
}
+ private void Button2_Click(object sender, EventArgs e)
+ {
+ MemberListWindow w = new MemberListWindow();
+ w.Show();
+ }
+
private void Button_Click(object sender, RoutedEventArgs e)
{
diff --git a/WGneu/MemberListWindow.xaml b/WGneu/MemberListWindow.xaml
new file mode 100644
index 0000000..4a5f92f
--- /dev/null
+++ b/WGneu/MemberListWindow.xaml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WGneu/MemberListWindow.xaml.cs b/WGneu/MemberListWindow.xaml.cs
new file mode 100644
index 0000000..40a15c0
--- /dev/null
+++ b/WGneu/MemberListWindow.xaml.cs
@@ -0,0 +1,51 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+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.Shapes;
+
+namespace WGneu
+{
+ ///
+ /// Interaktionslogik für Window1.xaml
+ ///
+ public partial class MemberListWindow : Window
+ {
+ private readonly WGContext _context = new WGContext();
+
+ public MemberListWindow()
+ {
+ InitializeComponent();
+ }
+
+ private void Window_Loaded(object sender, RoutedEventArgs e)
+ {
+ _context.Members.Load();
+ MemberList.ItemsSource = _context.Members.ToList();
+ }
+
+ protected override void OnClosing(CancelEventArgs e)
+ {
+ _context.Dispose();
+ base.OnClosing(e);
+ }
+
+ private void MemberList_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ Member m = (Member) MemberList.SelectedItem;
+ MgNr.Text = m.MgNr.ToString();
+ GivenName.Text = m.GivenName;
+ FamilyName.Text = m.FamilyName;
+ }
+ }
+}
diff --git a/WGneu/Country.cs b/WGneu/Models/Country.cs
similarity index 92%
rename from WGneu/Country.cs
rename to WGneu/Models/Country.cs
index 57939bf..35a7b28 100644
--- a/WGneu/Country.cs
+++ b/WGneu/Models/Country.cs
@@ -13,13 +13,17 @@ namespace WGneu
{
[Column("alpha2")]
public String Alpha2 { get; set; }
+
[Column("alpha3")]
public String Alpha3 { get; set; }
+
[Column("num")]
public int Num { get; set; }
+
[Column("name")]
public String Name { get; set; }
+
[Column("is_visible")]
- public int IsVisible {get; set; }
+ public int IsVisible { get; set; }
}
}
diff --git a/WGneu/Gradation.cs b/WGneu/Models/Gradation.cs
similarity index 100%
rename from WGneu/Gradation.cs
rename to WGneu/Models/Gradation.cs
diff --git a/WGneu/Models/Member.cs b/WGneu/Models/Member.cs
new file mode 100644
index 0000000..72876b3
--- /dev/null
+++ b/WGneu/Models/Member.cs
@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WGneu
+{
+ [Table("member"), PrimaryKey("MgNr")]
+ public class Member
+ {
+ [Column("mgnr")]
+ public int MgNr { get; set; }
+
+ [Column("given_name")]
+ public String GivenName { get; set; }
+
+ [Column("family_name")]
+ public String FamilyName { get; set; }
+ }
+}
diff --git a/WGneu/WGContext.cs b/WGneu/WGContext.cs
index 1e4eb0b..a03a957 100644
--- a/WGneu/WGContext.cs
+++ b/WGneu/WGContext.cs
@@ -10,6 +10,8 @@ namespace WGneu
public class WGContext : DbContext
{
public DbSet Countries { get; set; }
+ public DbSet Members { get; set; }
+
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
optionsBuilder.UseSqlite("Data Source=\"C:\\Users\\Lorenz\\Desktop\\wgtest.sqlite3\"");
diff --git a/WGneu/WGneu.csproj.user b/WGneu/WGneu.csproj.user
index a0469b1..8e6dd29 100644
--- a/WGneu/WGneu.csproj.user
+++ b/WGneu/WGneu.csproj.user
@@ -10,6 +10,9 @@
Code
+
+ Code
+
@@ -18,5 +21,8 @@
Designer
+
+ Designer
+
\ No newline at end of file