diff --git a/WGneu/Windows/MemberListWindow.xaml b/WGneu/Windows/MemberListWindow.xaml
index bb23dd8..a046a48 100644
--- a/WGneu/Windows/MemberListWindow.xaml
+++ b/WGneu/Windows/MemberListWindow.xaml
@@ -25,8 +25,12 @@
+
+
+
@@ -219,15 +223,19 @@
+ Grid.Column="1" TextWrapping="NoWrap" Margin="0,10,10,0" VerticalAlignment="Top" HorizontalAlignment="Left" FontSize="14" Padding="2" Height="25" Width="76" TextAlignment="Right"/>
+ Grid.Column="1" TextWrapping="NoWrap" Margin="0,40,10,0" VerticalAlignment="Top" HorizontalAlignment="Left" FontSize="14" Padding="2" Height="25" Width="76" TextAlignment="Right"/>
+ HorizontalAlignment="Left" Margin="0,70,10,0" TextWrapping="NoWrap" VerticalAlignment="Top" Width="48" FontSize="14" Padding="2" Grid.Column="1" TextAlignment="Right"/>
+
+
+
@@ -238,25 +246,25 @@
-
+
-
-
-
-
-
+
+
-
+
+
+
+
+ HorizontalAlignment="Left" Margin="0,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
+ HorizontalAlignment="Left" Margin="60,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
diff --git a/WGneu/Windows/MemberListWindow.xaml.cs b/WGneu/Windows/MemberListWindow.xaml.cs
index ceea02d..2b2475c 100644
--- a/WGneu/Windows/MemberListWindow.xaml.cs
+++ b/WGneu/Windows/MemberListWindow.xaml.cs
@@ -137,8 +137,6 @@ namespace WGneu.Windows {
}
private void SaveButton_Click(object sender, RoutedEventArgs e) {
- // TODO only allow to click button, if values were checked
-
Member? m = new();
if (IsEditing)
m = (Member)MemberList.SelectedItem;
@@ -173,6 +171,7 @@ namespace WGneu.Windows {
m.EntryDate = (EntryDateInput.Text == "") ? null : string.Join("-", EntryDateInput.Text.Split(".").Reverse());
m.ExitDate = (ExitDateInput.Text == "") ? null : string.Join("-", ExitDateInput.Text.Split(".").Reverse());
m.BusinessShares = (BusinessSharesInput.Text == "") ? 0 : int.Parse(BusinessSharesInput.Text);
+ m.AccountingNr = (AccountingNrInput.Text == "") ? null : AccountingNrInput.Text;
m.Active = ActiveInput.IsChecked ?? false;
m.VollLieferant = VollLieferantInput.IsChecked ?? false;
m.Funktionär = FunkionärInput.IsChecked ?? false;
@@ -181,7 +180,6 @@ namespace WGneu.Windows {
m.Comment = (CommentInput.Text == "") ? null : CommentInput.Text;
if (ContactPostInput.IsChecked ?? false) m.DefaultContact = "post";
if (ContactEmailInput.IsChecked ?? false) m.DefaultContact = "email";
- // TODO Buchhaltungskonto
try {
if (IsEditing)
@@ -337,6 +335,7 @@ namespace WGneu.Windows {
EntryDateInput.Text = (m.EntryDate != null) ? string.Join(".", m.EntryDate.Split("-").Reverse()) : null;
ExitDateInput.Text = (m.ExitDate != null) ? string.Join(".", m.ExitDate.Split("-").Reverse()) : null;
BusinessSharesInput.Text = m.BusinessShares.ToString();
+ AccountingNrInput.Text = m.AccountingNr;
BranchInput.SelectedItem = m.Branch;
DefaultKgInput.SelectedItem = m.DefaultKg;
CommentInput.Text = m.Comment;