winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

Use checkboxes for prefered contact

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-04-28 09:42:13 +02:00
parent 35421bb585
commit af6bcb4a96
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Elwig/Models/Member.cs
View File

@ -130,8 +130,11 @@ namespace Elwig.Models {
[Column("default_kgnr")] [Column("default_kgnr")]
public int? DefaultKgNr { get; set; } public int? DefaultKgNr { get; set; }
[Column("default_contact")] [Column("contact_postal")]
public string DefaultContact { get; set; } public bool ContactViaPost { get; set; }
[Column("contact_email")]
public bool ContactViaEmail { get; set; }
[Column("comment")] [Column("comment")]
public string? Comment { get; set; } public string? Comment { get; set; }

12
Elwig/Windows/MemberAdminWindow.xaml
View File

@ -289,12 +289,12 @@
TextChanged="TextBox_TextChanged"/> TextChanged="TextBox_TextChanged"/>
<Label Content="Kontaktart:" Margin="10,220,0,0" Grid.Column="0"/> <Label Content="Kontaktart:" Margin="10,220,0,0" Grid.Column="0"/>
<RadioButton x:Name="ContactPostInput" GroupName="DefaultContact" Content="Post" IsEnabled="False" <CheckBox x:Name="ContactPostalInput" Content="Post" IsEnabled="False"
Checked="RadioButton_Changed" Unchecked="RadioButton_Changed" Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
HorizontalAlignment="Left" Margin="0,225,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" <CheckBox x:Name="ContactEmailInput" Content="E-Mail" IsEnabled="False"
Checked="RadioButton_Changed" Unchecked="RadioButton_Changed" Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"
HorizontalAlignment="Left" Margin="60,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"/>
<Label Content="Gebundene Fläche:" Margin="10,250,0,0" Grid.Column="0"/> <Label Content="Gebundene Fläche:" Margin="10,250,0,0" Grid.Column="0"/>
<TextBlock x:Name="AreaCommitment" Text="- m²" <TextBlock x:Name="AreaCommitment" Text="- m²"

14
Elwig/Windows/MemberAdminWindow.xaml.cs
View File

@ -99,7 +99,8 @@ namespace Elwig.Windows {
if (Context.Branches.Count() == 1) if (Context.Branches.Count() == 1)
BranchInput.SelectedItem = Context.Branches.First(); BranchInput.SelectedItem = Context.Branches.First();
ActiveInput.IsChecked = true; ActiveInput.IsChecked = true;
ContactPostInput.IsChecked = true; ContactPostalInput.IsChecked = true;
ContactEmailInput.IsChecked = false;
FillOriginalValues(); FillOriginalValues();
ValidateRequiredInputs(); ValidateRequiredInputs();
} }
@ -289,9 +290,8 @@ namespace Elwig.Windows {
m.ZwstId = ((Branch)BranchInput.SelectedItem).ZwstId; m.ZwstId = ((Branch)BranchInput.SelectedItem).ZwstId;
m.DefaultKgNr = ((AT_Kg)DefaultKgInput.SelectedItem).KgNr; m.DefaultKgNr = ((AT_Kg)DefaultKgInput.SelectedItem).KgNr;
m.Comment = (CommentInput.Text == "") ? null : CommentInput.Text; m.Comment = (CommentInput.Text == "") ? null : CommentInput.Text;
m.DefaultContact = "post"; m.ContactViaPost = ContactPostalInput.IsChecked ?? false;
if (ContactPostInput.IsChecked ?? false) m.DefaultContact = "post"; m.ContactViaEmail = ContactEmailInput.IsChecked ?? false;
if (ContactEmailInput.IsChecked ?? false) m.DefaultContact = "email";
EntityEntry<Member>? tr = null; EntityEntry<Member>? tr = null;
try { try {
@ -400,10 +400,8 @@ namespace Elwig.Windows {
ActiveInput.IsChecked = m.IsActive; ActiveInput.IsChecked = m.IsActive;
VollLieferantInput.IsChecked = m.IsVollLieferant; VollLieferantInput.IsChecked = m.IsVollLieferant;
FunkionärInput.IsChecked = m.IsFunktionär; FunkionärInput.IsChecked = m.IsFunktionär;
switch (m.DefaultContact) { ContactPostalInput.IsChecked = m.ContactViaPost;
case "post": ContactPostInput.IsChecked = true; break; ContactEmailInput.IsChecked = m.ContactViaEmail;
case "email": ContactEmailInput.IsChecked = true; break;
}
AreaCommitment.Text = $"{m.ActiveContracts.Select(c => c.Area).Sum():N0} m²"; AreaCommitment.Text = $"{m.ActiveContracts.Select(c => c.Area).Sum():N0} m²";