From c7bcf2aa004d869d18ccf7b25bef0459c916778b Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Mon, 27 Feb 2023 19:47:58 +0100
Subject: [PATCH] Add Buchhaltungskonto in MemberListWindow

---
 WGneu/Windows/MemberListWindow.xaml    | 40 +++++++++++++++-----------
 WGneu/Windows/MemberListWindow.xaml.cs |  5 ++--
 2 files changed, 26 insertions(+), 19 deletions(-)

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 @@
                 <MenuItem Header="E-Mail senden"/>
             </MenuItem>
             <MenuItem Header="Drucken">
+                <MenuItem Header="Stammdatenblatt drucken"/>
                 <MenuItem Header="Mitgliederliste drucken"/>
-                <MenuItem Header="Alle Stammdatenblätter drucken"/>
+            </MenuItem>
+            <MenuItem Header="Rundschreiben">
+                <MenuItem Header="Runschreiben ausschicken"/>
+                <MenuItem Header="Alle Stammdatenblätter ausschicken"/>
             </MenuItem>
             <MenuItem Header="Werkzeuge">
                 <MenuItem Header="Alle Mitglieder überprüfen"/>
@@ -219,15 +223,19 @@
 
                 <Label Content="Eintritt:" HorizontalAlignment="Left" Margin="10,12,0,0" VerticalAlignment="Top" Padding="2"/>
                 <TextBox x:Name="EntryDateInput" IsReadOnly="True"
-                         Grid.Column="1" TextWrapping="NoWrap" Margin="0,10,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" FontSize="14" Padding="2" Height="25" Width="76" TextAlignment="Right"/>
+                         Grid.Column="1" TextWrapping="NoWrap" Margin="0,10,10,0" VerticalAlignment="Top" HorizontalAlignment="Left" FontSize="14" Padding="2" Height="25" Width="76" TextAlignment="Right"/>
 
                 <Label Content="Austritt:" HorizontalAlignment="Left" Margin="10,42,0,0" VerticalAlignment="Top" Padding="2"/>
                 <TextBox x:Name="ExitDateInput" IsReadOnly="True"
-                         Grid.Column="1" TextWrapping="NoWrap" Margin="0,40,0,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"/>
 
                 <Label Content="Geschäftsanteile:" HorizontalAlignment="Left" Margin="10,72,0,0" VerticalAlignment="Top" Padding="2"/>
                 <TextBox x:Name="BusinessSharesInput" IsReadOnly="True"
-                         HorizontalAlignment="Left" Margin="0,70,0,0" TextWrapping="NoWrap" VerticalAlignment="Top" Width="48" FontSize="14" Padding="2" Grid.Column="1" TextAlignment="Right"/>
+                         HorizontalAlignment="Left" Margin="0,70,10,0" TextWrapping="NoWrap" VerticalAlignment="Top" Width="48" FontSize="14" Padding="2" Grid.Column="1" TextAlignment="Right"/>
+
+                <Label Content="BH-Konto:" HorizontalAlignment="Left" Margin="10,102,0,0" VerticalAlignment="Top" Padding="2"/>
+                <TextBox x:Name="AccountingNrInput" IsReadOnly="True"
+                         Margin="0,100,10,0" TextWrapping="NoWrap" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1"/>
 
                 <CheckBox x:Name="ActiveInput" Content="Aktiv" IsEnabled="False"
                           Grid.Column="2" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top" IsChecked="False"/>
@@ -238,25 +246,25 @@
                 <CheckBox x:Name="FunkionärInput" Content="Funktionär" IsEnabled="False"
                           Grid.Column="2" HorizontalAlignment="Left" Margin="10,75,0,0" VerticalAlignment="Top" IsChecked="False"/>
 
-                <Label Content="StammZwst.:" HorizontalAlignment="Left" Margin="10,102,0,0" VerticalAlignment="Top" Padding="2"/>
+                <Label Content="StammZwst.:" HorizontalAlignment="Left" Margin="10,132,0,0" VerticalAlignment="Top" Padding="2"/>
                 <ComboBox x:Name="BranchInput" ItemTemplate="{StaticResource BranchTemplate}" IsEnabled="False"
-                          SelectionChanged="ComboBox_SelectionChanged"
-                          Margin="0,100,10,0" VerticalAlignment="Top" Grid.Column="1" FontSize="14" Height="25" Grid.ColumnSpan="2"/>
-
-                <Label Content="Stammgemeinde:" HorizontalAlignment="Left" Margin="10,132,0,0" VerticalAlignment="Top" Padding="2"/>
-                <ComboBox x:Name="DefaultKgInput" ItemTemplate="{StaticResource KgTemplate}" IsEnabled="False"
                           SelectionChanged="ComboBox_SelectionChanged"
                           Margin="0,130,10,0" VerticalAlignment="Top" Grid.Column="1" FontSize="14" Height="25" Grid.ColumnSpan="2"/>
 
-                <Label Content="Anmerkung:" HorizontalAlignment="Left" Margin="10,162,0,0" VerticalAlignment="Top" Padding="2"/>
-                <TextBox x:Name="CommentInput" IsReadOnly="True"
-                         Margin="0,160,10,0" TextWrapping="NoWrap" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1" Grid.ColumnSpan="2" TextAlignment="Right"/>
+                <Label Content="Stammgemeinde:" HorizontalAlignment="Left" Margin="10,162,0,0" VerticalAlignment="Top" Padding="2"/>
+                <ComboBox x:Name="DefaultKgInput" ItemTemplate="{StaticResource KgTemplate}" IsEnabled="False"
+                          SelectionChanged="ComboBox_SelectionChanged"
+                          Margin="0,160,10,0" VerticalAlignment="Top" Grid.Column="1" FontSize="14" Height="25" Grid.ColumnSpan="2"/>
 
-                <Label Content="Kontaktart:" HorizontalAlignment="Left" Margin="10,192,0,0" VerticalAlignment="Top" Padding="2"/>
+                <Label Content="Anmerkung:" HorizontalAlignment="Left" Margin="10,192,0,0" VerticalAlignment="Top" Padding="2"/>
+                <TextBox x:Name="CommentInput" IsReadOnly="True"
+                         Margin="0,190,10,0" TextWrapping="NoWrap" VerticalAlignment="Top" FontSize="14" Padding="2" Grid.Column="1" Grid.ColumnSpan="2" TextAlignment="Right"/>
+
+                <Label Content="Kontaktart:" HorizontalAlignment="Left" Margin="10,222,0,0" VerticalAlignment="Top" Padding="2"/>
                 <RadioButton x:Name="ContactPostInput" GroupName="DefaultContact" Content="Post" IsEnabled="False"
-                             HorizontalAlignment="Left" Margin="0,195,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
+                             HorizontalAlignment="Left" Margin="0,225,0,0" VerticalAlignment="Top" Grid.Column="1" Grid.ColumnSpan="2"/>
                 <RadioButton x:Name="ContactEmailInput" GroupName="DefaultContact" Content="E-Mail" IsEnabled="False"
-                             HorizontalAlignment="Left" Margin="60,195,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"/>
             </Grid>
         </GroupBox>
     </Grid>
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;