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

Add proper validation to AreaCommAdminWindow

Browse Source
This commit is contained in:
Thomas Hilscher
2023-04-13 14:48:55 +02:00
parent 086107a800
commit a263e82cf4
2 changed files with 138 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Elwig/Windows/AreaCommAdminWindow.xaml
View File

@ -59,7 +59,6 @@
<ColumnDefinition Width="125"/>
<ColumnDefinition Width="125"/>
<ColumnDefinition Width="125"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<DataGrid x:Name="ContractList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
@ -88,14 +87,14 @@
<Button x:Name="NewAreaCommitmentButton" Content="Neu" Click="NewAreaCommitmentButton_Click" IsEnabled="False"
HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="5,10,0,10" Width="110" Grid.Column="2"/>
<Button x:Name="EditAreaCommitmentButton" Content="Bearbeiten" Click="EditAreaCommitmentButton_Click" IsEnabled="False"
HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,10,0,10" Width="110" Grid.Column="3"/>
HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="-5,10,0,10" Width="110" Grid.Column="3"/>
<Button x:Name="DeleteAreaCommitmentButton" Content="Löschen" Click="DeleteAreaCommitmentButton_Click" IsEnabled="False"
HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,10,10" Width="110" Grid.Column="4"/>
<Button x:Name="AreaCommitmentSaveButton" Content="Speichern" Click="AreaCommitmentSaveButton_Click" IsEnabled="False" Visibility="Hidden"
HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="10,10,0,10" Width="110" Grid.Column="2"/>
<Button x:Name="AreaCommitmentResetButton" Content="Zurücksetzen" Click="AreaCommitmentResetButton_Click" IsEnabled="False" Visibility="Hidden"
HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="0,10,0,10" Width="110" Grid.Column="3"/>
HorizontalAlignment="Center" VerticalAlignment="Bottom" Margin="-5,10,0,10" Width="110" Grid.Column="3"/>
<Button x:Name="AreaCommitmentCancelButton" Content="Abbrechen" Click="AreaCommitmentCancelButton_Click" IsEnabled="False" Visibility="Hidden" IsCancel="True"
HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,10,10" Width="110" Grid.Column="4"/>
@ -115,22 +114,25 @@
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="70"/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<Label Content="VNr.:" Margin="10,10,0,0" Grid.Column="0"/>
<TextBox x:Name="VNrInput" Margin="0,10,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"/>
<TextBox x:Name="VNrInput" Margin="0,10,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
TextChanged="VNrInput_TextChanged" LostFocus="VNrInput_LostFocus"/>
<Label Content="MgNr.:" Margin="10,40,0,0" Grid.Column="0"/>
<TextBox x:Name="MgNrInput" Margin="0,40,0,0" Width="48" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"/>
<Label Content="Von:" Margin="10,10,0,0" Grid.Column="2"/>
<TextBox x:Name="YearFromInput" Margin="0,10,0,0" Width="100" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"/>
<TextBox x:Name="YearFromInput" Margin="0,10,0,0" Width="100" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
TextChanged="YearFromInput_TextChanged"/>
<Label Content="Bis:" Margin="10,40,0,0" Grid.Column="2"/>
<TextBox x:Name="YearToInput" Margin="0,40,0,0" Width="100" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"/>
<TextBox x:Name="YearToInput" Margin="0,40,0,0" Width="100" Grid.Column="3" TextAlignment="Right" HorizontalAlignment="Left"
TextChanged="YearToInput_TextChanged"/>
</Grid>
</GroupBox>
@ -143,7 +145,7 @@
<Label Content="Gemeinde:" Margin="10,10,0,0" Grid.Column="0"/>
<ComboBox x:Name="KgInput" ItemTemplate="{StaticResource KgTemplate}" TextSearch.TextPath="Name"
Width="200" HorizontalAlignment="Left" SelectionChanged="ComboBox_SelectionChanged"
Width="200" HorizontalAlignment="Left" SelectionChanged="KgInput_SelectionChanged"
Margin="0,10,10,0" Grid.Column="1"/>
<Label Content="Ried:" Margin="10,40,0,0" Grid.Column="0"/>
@ -152,10 +154,12 @@
Margin="0,40,0,0" Grid.Column="1"/>
<Label Content="Parzelle:" Margin="10,70,0,0" Grid.Column="0"/>
<TextBox x:Name="GstNrInput" Margin="0,70,0,0" Width="100" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"/>
<TextBox x:Name="GstNrInput" Margin="0,70,0,0" Width="100" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
TextChanged="GstNrInput_TextChanged" LostFocus="GstNrInput_LostFocus"/>
<Label Content="Fläche (m²):" Margin="10,100,0,0" Grid.Column="0"/>
<TextBox x:Name="AreaInput" Margin="0,100,0,0" Width="100" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"/>
<TextBox x:Name="AreaInput" Margin="0,100,0,0" Width="100" Grid.Column="1" TextAlignment="Right" HorizontalAlignment="Left"
TextChanged="AreaInput_TextChanged"/>
</Grid>
</GroupBox>

153
Elwig/Windows/AreaCommAdminWindow.xaml.cs
View File

@ -8,6 +8,7 @@ using Elwig.Models;
using System.Runtime.CompilerServices;
using System;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore.ChangeTracking;
namespace Elwig.Windows {
public partial class AreaCommAdminWindow : AdministrationWindow {
@ -20,22 +21,20 @@ namespace Elwig.Windows {
this.member = member;
Title = $"Flächenbindungen - {member.FamilyName} {member.GivenName} - Elwig";
ExemptInputs = new Control[] {
ContractList, AreaCommitmentList, NewContractButton, DeleteContractButton,
MgNrInput, ContractList, AreaCommitmentList, NewContractButton, DeleteContractButton,
ContractSaveButton, ContractCancelButton, NewAreaCommitmentButton,
EditAreaCommitmentButton, DeleteAreaCommitmentButton, AreaCommitmentSaveButton,
AreaCommitmentResetButton, AreaCommitmentCancelButton
};
RequiredInputs = new Control[] {
VNrInput, MgNrInput, YearFromInput, YearToInput, KgInput,
VNrInput, YearFromInput, KgInput,
GstNrInput, AreaInput, SortInput, CultInput
};
}
private async void Window_Loaded(object sender, RoutedEventArgs e) {
await RefreshContractList();
//TODO Sources von Ried sollten sich auf Gemeinde beziehen
KgInput.ItemsSource = Context.WbKgs.Select(k => k.Kg).OrderBy(k => k.Name).ToList();
RdInput.ItemsSource = Context.WbRde.OrderBy(r => r.Name).ToList();
SortInput.ItemsSource = Context.WineVarieties.OrderBy(s => s.Name).ToList();
AttrInput.ItemsSource = Context.WineAttributes.OrderBy(a => a.Name).ToList();
CultInput.ItemsSource = Context.WineCultivations.OrderBy(c => c.Name).ToList();
@ -58,6 +57,7 @@ namespace Elwig.Windows {
if (contracts.Count == 1)
ContractList.SelectedIndex = 0;
//TODO notwendig?
await RefreshAreaCommitmentList();
RefreshInputs();
}
@ -75,6 +75,7 @@ namespace Elwig.Windows {
AreaCommitmentList.ItemsSource = commitments;
if (commitments.Count == 1)
AreaCommitmentList.SelectedIndex = 0;
RefreshInputs();
}
private void RefreshInputs(bool validate = false) {
@ -98,6 +99,7 @@ namespace Elwig.Windows {
EditAreaCommitmentButton.IsEnabled = false;
DeleteAreaCommitmentButton.IsEnabled = false;
ClearInputs();
MgNrInput.Text = "";
}
if (!validate) ClearInputStates();
GC.Collect();
@ -132,6 +134,9 @@ namespace Elwig.Windows {
ShowAreaCommitmentSaveResetCancelButtons();
DisableContractNewDeleteButtons();
UnlockInputs();
VNrInput.IsReadOnly = true;
YearFromInput.IsReadOnly = true;
YearToInput.IsReadOnly = true;
InitInputs();
}
@ -147,9 +152,6 @@ namespace Elwig.Windows {
ShowAreaCommitmentSaveResetCancelButtons();
DisableContractNewDeleteButtons();
UnlockInputs();
//TODO schöner?
VNrInput.IsReadOnly = true;
MgNrInput.IsReadOnly = true;
}
private async void DeleteAreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
@ -176,16 +178,6 @@ namespace Elwig.Windows {
ShowContractSaveCancelButtons();
DisableAreaCommitmentNewEditDeleteButtons();
UnlockInputs();
//TODO schöner?
KgInput.IsEnabled = false;
RdInput.IsEnabled = false;
GstNrInput.IsReadOnly = true;
GstNrInput.IsEnabled = false;
AreaInput.IsReadOnly = true;
AreaInput.IsEnabled = false;
SortInput.IsEnabled = false;
AttrInput.IsEnabled = false;
CultInput.IsEnabled = false;
InitInputs();
}
@ -203,31 +195,70 @@ namespace Elwig.Windows {
}
}
private async void AreaCommitmentSaveButton_Click(object sender, RoutedEventArgs evt) {
AreaCommitment? a = new();
if (IsEditing)
a = (AreaCommitment)AreaCommitmentList.SelectedItem;
else if (IsCreating)
a = new();
private async Task<Contract> UpdateContract(Contract c) {
int newVNr = int.Parse(VNrInput.Text);
c.MgNr = int.Parse(MgNrInput.Text);
c.YearFrom = int.Parse(YearFromInput.Text);
c.YearTo = (YearToInput.Text == "") ? null : int.Parse(YearToInput.Text);
//TODO
EntityEntry<Contract>? tr = null;
try {
if (IsEditing) {
tr = Context.Update(c);
} else if (IsCreating) {
c.VNr = newVNr;
tr = (await Context.AddAsync(c));
}
await Context.SaveChangesAsync();
if (newVNr != c.VNr) {
await Context.Database.ExecuteSqlAsync($"UPDATE contract SET vnr = {newVNr} WHERE mgnr = {c.VNr}");
await Context.Contracts.LoadAsync();
c = await Context.Contracts.FindAsync(newVNr);
}
} catch (Exception exc) {
if (tr != null) await tr.ReloadAsync();
var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
MessageBox.Show(str, "Vertrag aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
}
return c;
}
private async Task<AreaCommitment> UpdateaAreaCommitment(AreaCommitment a) {
a.VNr = int.Parse(VNrInput.Text);
a.KgNr = ((AT_Kg)KgInput.SelectedItem).KgNr;
a.RdNr = ((WbRd)RdInput.SelectedItem).RdNr;
a.GstNr = GstNrInput.Text;
a.Area = int.Parse(AreaInput.Text);
a.SortId = ((WineVar)SortInput.SelectedItem).SortId;
a.AttrId = ((WineAttr)AttrInput.SelectedItem).AttrId;
a.CultId = ((WineCult)CultInput.SelectedItem).CultId;
EntityEntry<AreaCommitment>? tr = null;
try {
if (IsEditing)
Context.Update(a);
else if (IsCreating)
Context.Add(a);
Context.SaveChanges();
if (IsEditing) {
tr = Context.Update(a);
} else if (IsCreating) {
tr = (await Context.AddAsync(a));
}
await Context.SaveChangesAsync();
} catch (Exception exc) {
if (tr != null) await tr.ReloadAsync();
var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
MessageBox.Show(str, "Flächenbindung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
}
return a;
}
private async void AreaCommitmentSaveButton_Click(object sender, RoutedEventArgs evt) {
Contract c = await UpdateContract((Contract)ContractList.SelectedItem);
AreaCommitment a = await UpdateaAreaCommitment(IsEditing ? (AreaCommitment)AreaCommitmentList.SelectedItem : Context.CreateProxy<AreaCommitment>());
IsEditing = false;
IsCreating = false;
AreaCommitmentList.IsEnabled = true;
@ -237,6 +268,9 @@ namespace Elwig.Windows {
EnableContractNewDeleteButtons();
LockInputs();
await RefreshContractList();
await RefreshAreaCommitmentList();
ContractList.SelectedItem = c;
AreaCommitmentList.SelectedItem = a;
}
private void AreaCommitmentResetButton_Click(object sender, RoutedEventArgs evt) {
@ -262,6 +296,9 @@ namespace Elwig.Windows {
}
private async void ContractSaveButton_Click(object sender, RoutedEventArgs evt) {
Contract c = await UpdateContract(Context.CreateProxy<Contract>());
AreaCommitment a = await UpdateaAreaCommitment(Context.CreateProxy<AreaCommitment>());
IsEditing = false;
IsCreating = false;
AreaCommitmentList.IsEnabled = true;
@ -271,6 +308,9 @@ namespace Elwig.Windows {
EnableAreaCommitmentNewEditDeleteButtons();
LockInputs();
await RefreshContractList();
await RefreshAreaCommitmentList();
ContractList.SelectedItem = c;
AreaCommitmentList.SelectedItem = a;
}
private void ContractCancelButton_Click(object sender, RoutedEventArgs evt) {
@ -289,12 +329,16 @@ namespace Elwig.Windows {
override protected void UpdateButtons() {
if (!IsEditing && !IsCreating) return;
bool ch = HasChanged(), v = IsValid();
ContractSaveButton.IsEnabled = (v && ch);
AreaCommitmentResetButton.IsEnabled = (ch);
AreaCommitmentSaveButton.IsEnabled = (v && ch);
}
private void InitInputs() {
private async void InitInputs() {
VNrInput.Text = ContractList.SelectedItem == null ? (await Utils.NextVNr(Context)).ToString() : ((Contract)ContractList.SelectedItem).VNr.ToString();
MgNrInput.Text = member.MgNr.ToString();
FillOriginalValues();
ValidateRequiredInputs();
}
private void EnableContractNewDeleteButtons() {
@ -378,11 +422,60 @@ namespace Elwig.Windows {
}
private async void ContractList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
//await RefreshContractListQuery();
await RefreshAreaCommitmentList();
}
private void AreaCommitmentList_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
RefreshInputs();
}
private void KgInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
AT_Kg? curr_kg = (AT_Kg)KgInput.SelectedItem;
if (curr_kg != null) {
RdInput.ItemsSource = Context.WbRde.Where(r => r.KgNr == curr_kg.KgNr).OrderBy(r => r.Name).ToList();
}
ComboBox_SelectionChanged(sender, evt);
}
protected void InputTextChanged(TextBox input, Func<TextBox, bool, AppDbContext, Contract?, ValidationResult> checker) {
InputTextChanged(input, checker(input, SenderIsRequired(input), Context, (Contract)ContractList.SelectedItem));
}
protected void InputLostFocus(TextBox input, Func<TextBox, bool, AppDbContext, Contract?, ValidationResult> checker, string? msg = null) {
InputLostFocus(input, checker(input, SenderIsRequired(input), Context, (Contract)ContractList.SelectedItem), msg);
}
private void NumericInput_TextChanged(object sender, RoutedEventArgs evt) {
InputTextChanged((TextBox)sender, Validator.CheckNumeric);
}
private void VNrInput_TextChanged(object sender, RoutedEventArgs evt) {
InputTextChanged((TextBox)sender, Validator.CheckVNr);
}
private void VNrInput_LostFocus(object sender, RoutedEventArgs evt) {
InputLostFocus((TextBox)sender, Validator.CheckVNr);
}
private void YearFromInput_TextChanged(object sender, RoutedEventArgs evt) {
InputTextChanged((TextBox)sender, Validator.CheckNumeric);
}
private void YearToInput_TextChanged(object sender, RoutedEventArgs evt) {
InputTextChanged((TextBox)sender, Validator.CheckNumeric);
}
private void GstNrInput_TextChanged(object sender, RoutedEventArgs evt) {
InputTextChanged((TextBox)sender, Validator.CheckGstNr);
}
private void GstNrInput_LostFocus(object sender, RoutedEventArgs evt) {
InputLostFocus((TextBox)sender, Validator.CheckGstNr);
}
private void AreaInput_TextChanged(object sender, RoutedEventArgs evt) {
InputTextChanged((TextBox)sender, Validator.CheckNumeric);
}
}
}