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

Bugfixes in MemberListWindow

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-02-21 23:45:06 +01:00
parent a060728a48
commit 3369aafbf7
3 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
WGneu/WGneu.csproj.user
View File

@ -10,12 +10,6 @@
<Compile Update="Windows\BankDetailsWindow.xaml.cs"> <Compile Update="Windows\BankDetailsWindow.xaml.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Update="Windows\MemberAddWindow.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="Windows\MemberEditWindow.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="Windows\MemberListWindow.xaml.cs"> <Compile Update="Windows\MemberListWindow.xaml.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
@ -27,12 +21,6 @@
<Page Update="Windows\MainWindow.xaml"> <Page Update="Windows\MainWindow.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
<Page Update="Windows\MemberAddWindow.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="Windows\MemberEditWindow.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="Windows\MemberListWindow.xaml"> <Page Update="Windows\MemberListWindow.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>

3
WGneu/Windows/MemberListWindow.xaml
View File

@ -10,7 +10,8 @@
Title="Mitglieder" Height="500" Width="800" MinHeight="500" MinWidth="800" Title="Mitglieder" Height="500" Width="800" MinHeight="500" MinWidth="800"
Loaded="Window_Loaded"> Loaded="Window_Loaded">
<Grid> <Grid>
<DataGrid x:Name="MemberList" AutoGenerateColumns="False" CanUserAddRows="False" HeadersVisibility="Column" IsReadOnly="True" <DataGrid x:Name="MemberList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False"
SelectionChanged="MemberList_SelectionChanged" SelectionChanged="MemberList_SelectionChanged"
Margin="10,10,0,47.5" FontSize="14" Width="310" HorizontalAlignment="Left"> Margin="10,10,0,47.5" FontSize="14" Width="310" HorizontalAlignment="Left">
<DataGrid.Columns> <DataGrid.Columns>

85
WGneu/Windows/MemberListWindow.xaml.cs
View File

@ -49,23 +49,35 @@ namespace WGneu.Windows
{ {
context.Members.Load(); context.Members.Load();
MemberList.ItemsSource = context.Members.ToList(); MemberList.ItemsSource = context.Members.ToList();
RefreshInputs();
}
private void RefreshInputs()
{
Member m = (Member)MemberList.SelectedItem; Member m = (Member)MemberList.SelectedItem;
if (m != null) if (m != null)
{ {
EditMemberButton.IsEnabled = true; EditMemberButton.IsEnabled = true;
DeleteMemberButton.IsEnabled = true;
FillInputs(m); FillInputs(m);
} }
else
{
EditMemberButton.IsEnabled = false;
DeleteMemberButton.IsEnabled = false;
ClearInputs();
}
}
private void InitInputs()
{
ClearInputs();
MgNrInput.Text = NextMgNr().ToString();
} }
private void MemberList_SelectionChanged(object sender, SelectionChangedEventArgs e) private void MemberList_SelectionChanged(object sender, SelectionChangedEventArgs e)
{ {
Member m = (Member) MemberList.SelectedItem; RefreshInputs();
if (m == null)
return;
FillInputs(m);
EditMemberButton.IsEnabled = true;
} }
private void PlzInput_TextChanged(object sender, RoutedEventArgs e) private void PlzInput_TextChanged(object sender, RoutedEventArgs e)
@ -83,12 +95,7 @@ namespace WGneu.Windows
{ {
isCreating = true; isCreating = true;
MemberList.IsEnabled = false; MemberList.IsEnabled = false;
InitInputs();
// TODO fill input fields
ClearInputs();
MgNrInput.Text = (context.Members.Select(m => m.MgNr).Max() + 1).ToString();
HideNewEditDeleteButtons(); HideNewEditDeleteButtons();
ShowSaveResetCancelButtons(); ShowSaveResetCancelButtons();
UnlockInputs(); UnlockInputs();
@ -109,46 +116,50 @@ namespace WGneu.Windows
private void DeleteMemberButton_Click(object sender, RoutedEventArgs e) private void DeleteMemberButton_Click(object sender, RoutedEventArgs e)
{ {
// TODO delete member button Member m = (Member)MemberList.SelectedItem;
if (m == null) return;
var r = MessageBox.Show(
$"Soll das Mitglied {m.FamilyName} {m.GivenName} ({m.MgNr}) wirklich unwiderruflich gelöscht werden?",
"Mitglied löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No);
if (r == MessageBoxResult.Yes)
{
context.Remove(m);
context.SaveChanges();
RefreshMemberList();
}
} }
private void SaveButton_Click(object sender, RoutedEventArgs e) private void SaveButton_Click(object sender, RoutedEventArgs e)
{ {
// TODO only allow to click button, if values were checked // TODO only allow to click button, if values were checked
int originalMgNr = -1;
Member? m = null; Member? m = null;
if (isEditing) if (isEditing)
{
m = (Member)MemberList.SelectedItem; m = (Member)MemberList.SelectedItem;
originalMgNr = m.MgNr;
}
else if (isCreating) else if (isCreating)
{
m = new(); m = new();
}
m.MgNr = int.Parse(MgNrInput.Text); int newMgNr = int.Parse(MgNrInput.Text);
m.GivenName = GivenNameInput.Text; m.GivenName = GivenNameInput.Text;
m.FamilyName = FamilyNameInput.Text; m.FamilyName = FamilyNameInput.Text;
m.ZwstId = ((Branch)BranchInput.SelectedItem).ZwstId; m.ZwstId = ((Branch)BranchInput.SelectedItem).ZwstId;
m.CountryCode = "AT"; m.CountryCode = "AT";
m.PostalDestId = ((AT_Plz)OrtInput.SelectedItem).Id; m.PostalDestId = ((AT_Plz)OrtInput.SelectedItem).Id;
m.PostalDest = context.PostalDestinations.Find(m.CountryCode, m.PostalDestId);
m.Address = AddressInput.Text; m.Address = AddressInput.Text;
m.DefaultKgNr = ((AT_Kg)DefaultKgInput.SelectedItem).KgNr; m.DefaultKgNr = ((AT_Kg)DefaultKgInput.SelectedItem).KgNr;
try try
{ {
if (isEditing) if (isEditing)
{
context.Update(m); context.Update(m);
}
else if (isCreating) else if (isCreating)
{
context.Add(m); context.Add(m);
}
context.SaveChanges(); context.SaveChanges();
if (newMgNr != m.MgNr)
context.Database.ExecuteSql($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {m.MgNr}");
} }
catch (Exception exc) catch (Exception exc)
{ {
@ -156,8 +167,7 @@ namespace WGneu.Windows
"Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message.ToString(), "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message.ToString(),
"Mitglied aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error); "Mitglied aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
} }
finally
{
isEditing = false; isEditing = false;
isCreating = false; isCreating = false;
MemberList.IsEnabled = true; MemberList.IsEnabled = true;
@ -166,11 +176,13 @@ namespace WGneu.Windows
LockInputs(); LockInputs();
RefreshMemberList(); RefreshMemberList();
} }
}
private void ResetButton_Click(object sender, RoutedEventArgs e) private void ResetButton_Click(object sender, RoutedEventArgs e)
{ {
// TODO reset button if (isEditing)
RefreshInputs();
else if (isCreating)
InitInputs();
} }
private void CancelButton_Click(object sender, RoutedEventArgs e) private void CancelButton_Click(object sender, RoutedEventArgs e)
@ -180,9 +192,17 @@ namespace WGneu.Windows
MemberList.IsEnabled = true; MemberList.IsEnabled = true;
HideSaveResetCancelButtons(); HideSaveResetCancelButtons();
ShowNewEditDeleteButtons(); ShowNewEditDeleteButtons();
RefreshInputs();
LockInputs(); LockInputs();
} }
private int NextMgNr()
{
int c = context.Members.Select(m => m.MgNr).Min();
context.Members.OrderBy(m => m.MgNr).Select(m => m.MgNr).ToList().ForEach(a => { if (a <= c + 100) c = a; });
return c + 1;
}
private void ShowSaveResetCancelButtons() private void ShowSaveResetCancelButtons()
{ {
SaveButton.IsEnabled = true; SaveButton.IsEnabled = true;
@ -207,7 +227,7 @@ namespace WGneu.Windows
{ {
NewMemberButton.IsEnabled = true; NewMemberButton.IsEnabled = true;
EditMemberButton.IsEnabled = MemberList.SelectedItem != null; EditMemberButton.IsEnabled = MemberList.SelectedItem != null;
DeleteMemberButton.IsEnabled = true; DeleteMemberButton.IsEnabled = MemberList.SelectedItem != null;
NewMemberButton.Visibility = Visibility.Visible; NewMemberButton.Visibility = Visibility.Visible;
EditMemberButton.Visibility = Visibility.Visible; EditMemberButton.Visibility = Visibility.Visible;
DeleteMemberButton.Visibility = Visibility.Visible; DeleteMemberButton.Visibility = Visibility.Visible;
@ -256,14 +276,11 @@ namespace WGneu.Windows
DefaultKgInput.SelectedItem = m.DefaultKg; DefaultKgInput.SelectedItem = m.DefaultKg;
AddressInput.Text = m.Address; AddressInput.Text = m.Address;
// TODO PostalDest may be null after creation?
AT_Plz? p = m.PostalDest.Plz(context); AT_Plz? p = m.PostalDest.Plz(context);
if (p != null) if (p != null)
{ {
PlzInput.Text = p.Plz.ToString(); PlzInput.Text = p.Plz.ToString();
OrtInput.ItemsSource = p.Orte(context);
var o = p.Orte(context);
OrtInput.ItemsSource = o;
OrtInput.SelectedItem = p; OrtInput.SelectedItem = p;
} }
else else