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

Add Lieferungen Button in MemberAdminWindow

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-07-19 22:09:45 +02:00
parent 05f9e94260
commit df4e254305
5 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Elwig/Windows/AreaComAdminWindow.xaml.cs
View File

@ -5,14 +5,15 @@ using System.Windows.Controls;
using Elwig.Helpers; using Elwig.Helpers;
using Elwig.Models; using Elwig.Models;
using System.Threading.Tasks; using System.Threading.Tasks;
using System;
namespace Elwig.Windows { namespace Elwig.Windows {
public partial class AreaComAdminWindow : AdministrationWindow { public partial class AreaComAdminWindow : AdministrationWindow {
private readonly Member Member; private readonly Member Member;
public AreaComAdminWindow(Member member) { public AreaComAdminWindow(int mgnr) {
InitializeComponent(); InitializeComponent();
Member = member; Member = Context.Members.Find(mgnr) ?? throw new ArgumentException("MgNr argument has invalid value");
Title = $"Flächenbindungen - {Member.AdministrativeName} - Elwig"; Title = $"Flächenbindungen - {Member.AdministrativeName} - Elwig";
ExemptInputs = new Control[] { ExemptInputs = new Control[] {
MgNrInput, ContractList, AreaCommitmentList, NewContractButton, DeleteContractButton, MgNrInput, ContractList, AreaCommitmentList, NewContractButton, DeleteContractButton,

25
Elwig/Windows/DeliveryAdminWindow.xaml
View File

@ -69,7 +69,7 @@
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="42"/> <RowDefinition Height="42"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="47"/> <RowDefinition Height="42"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
@ -105,18 +105,18 @@
</DataGrid> </DataGrid>
<Button x:Name="NewMemberButton" Content="Neu" <Button x:Name="NewMemberButton" Content="Neu"
HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="0" Grid.Row="2"/> HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0" Grid.Row="2"/>
<Button x:Name="EditMemberButton" Content="Bearbeiten" IsEnabled="False" <Button x:Name="EditMemberButton" Content="Bearbeiten" IsEnabled="False"
HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="1" Grid.Row="2"/> HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1" Grid.Row="2"/>
<Button x:Name="DeleteMemberButton" Content="Löschen" IsEnabled="False" <Button x:Name="DeleteMemberButton" Content="Löschen" IsEnabled="False"
HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="2" Grid.Row="2"/> HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2" Grid.Row="2"/>
<Button x:Name="SaveButton" Content="Speichern" IsEnabled="False" Visibility="Hidden" <Button x:Name="SaveButton" Content="Speichern" IsEnabled="False" Visibility="Hidden"
HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="0"/> HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,5,2.5,10" Grid.Column="0"/>
<Button x:Name="ResetButton" Content="Zurücksetzen" IsEnabled="False" Visibility="Hidden" <Button x:Name="ResetButton" Content="Zurücksetzen" IsEnabled="False" Visibility="Hidden"
HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="1"/> HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,2.5,10" Grid.Column="1"/>
<Button x:Name="CancelButton" Content="Abbrechen" IsEnabled="False" Visibility="Hidden" IsCancel="True" <Button x:Name="CancelButton" Content="Abbrechen" IsEnabled="False" Visibility="Hidden" IsCancel="True"
HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,5,10" Grid.Column="2"/> HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,5,5,10" Grid.Column="2"/>
</Grid> </Grid>
<GroupBox Header="Mitglied" Grid.Column="1" Grid.Row="1" Margin="5,5,5,5"> <GroupBox Header="Mitglied" Grid.Column="1" Grid.Row="1" Margin="5,5,5,5">
@ -288,7 +288,11 @@
<GroupBox Header="Teillieferungen" Grid.Column="1" Grid.Row="3" Margin="5,5,5,5"> <GroupBox Header="Teillieferungen" Grid.Column="1" Grid.Row="3" Margin="5,5,5,5">
<Grid> <Grid>
<ListBox x:Name="DeliveryPartList" Margin="5,5,5,5" <Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<ListBox x:Name="DeliveryPartList" Margin="5,5,5,38" Grid.ColumnSpan="2"
SelectionChanged="DeliveryPartList_SelectionChanged"> SelectionChanged="DeliveryPartList_SelectionChanged">
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
@ -302,6 +306,11 @@
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>
<Button x:Name="ExtractDeliveryPartButton" Content="Herausheben" IsEnabled="False"
HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,2.5,5" Grid.Column="0" Grid.Row="2"/>
<Button x:Name="DeleteDeliveryPartButton" Content="Löschen" IsEnabled="False"
HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,10,5,5" Grid.Column="1" Grid.Row="2"/>
</Grid> </Grid>
</GroupBox> </GroupBox>

9
Elwig/Windows/DeliveryAdminWindow.xaml.cs
View File

@ -17,6 +17,7 @@ namespace Elwig.Windows {
private bool IsUpdatingGradation = false; private bool IsUpdatingGradation = false;
private bool IsRefreshingInputs = false; private bool IsRefreshingInputs = false;
private readonly bool IsReceipt = false; private readonly bool IsReceipt = false;
private readonly Member? Member = null;
private readonly DispatcherTimer Timer; private readonly DispatcherTimer Timer;
private List<string> TextFilter = new(); private List<string> TextFilter = new();
private readonly RoutedCommand CtrlF = new(); private readonly RoutedCommand CtrlF = new();
@ -50,10 +51,13 @@ namespace Elwig.Windows {
public DeliveryAdminWindow(bool receipt) : this() { public DeliveryAdminWindow(bool receipt) : this() {
IsReceipt = receipt; IsReceipt = receipt;
Title = "Übernahme - Elwig";
TodayOnlyInput.IsChecked = true;
} }
public DeliveryAdminWindow(int mgnr) : this() { public DeliveryAdminWindow(int mgnr) : this() {
// TODO Member = Context.Members.Find(mgnr) ?? throw new ArgumentException("MgNr argument has invalid value");
Title = $"Lieferungen - {Member.AdministrativeName} - Elwig";
} }
private void Window_Loaded(object sender, RoutedEventArgs evt) { private void Window_Loaded(object sender, RoutedEventArgs evt) {
@ -81,6 +85,9 @@ namespace Elwig.Windows {
private async Task RefreshDeliveryListQuery(bool updateSort = false) { private async Task RefreshDeliveryListQuery(bool updateSort = false) {
IQueryable<Delivery> deliveryQuery = Context.Deliveries; IQueryable<Delivery> deliveryQuery = Context.Deliveries;
if (Member != null) {
deliveryQuery = deliveryQuery.Where(d => d.MgNr == Member.MgNr);
}
if (TodayOnlyInput.IsChecked == true) { if (TodayOnlyInput.IsChecked == true) {
deliveryQuery = deliveryQuery deliveryQuery = deliveryQuery
.Where(d => (d.DateString == Utils.Today.ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") > 0) || .Where(d => (d.DateString == Utils.Today.ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") > 0) ||

3
Elwig/Windows/MemberAdminWindow.xaml
View File

@ -346,9 +346,8 @@
<TextBlock x:Name="AreaCommitment" Text="- m²" <TextBlock x:Name="AreaCommitment" Text="- m²"
Grid.Column="1" HorizontalAlignment="Stretch" Margin="5,252,5,0" TextWrapping="NoWrap" VerticalAlignment="Top" FontSize="14" TextAlignment="Right"/> Grid.Column="1" HorizontalAlignment="Stretch" Margin="5,252,5,0" TextWrapping="NoWrap" VerticalAlignment="Top" FontSize="14" TextAlignment="Right"/>
<Button x:Name="DeliveryButton" Content="Lieferungen" Click="AreaCommitmentButton_Click" IsEnabled="False" <Button x:Name="DeliveryButton" Content="Lieferungen" Click="DeliveryButton_Click" IsEnabled="False"
HorizontalAlignment="Right" Margin="10,00,10,37" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/> HorizontalAlignment="Right" Margin="10,00,10,37" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
<Button x:Name="AreaCommitmentButton" Content="Flächenbindungen" Click="AreaCommitmentButton_Click" IsEnabled="False" <Button x:Name="AreaCommitmentButton" Content="Flächenbindungen" Click="AreaCommitmentButton_Click" IsEnabled="False"
HorizontalAlignment="Right" Margin="10,10,10,5" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/> HorizontalAlignment="Right" Margin="10,10,10,5" Width="150" VerticalAlignment="Bottom" Grid.ColumnSpan="3"/>
</Grid> </Grid>

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

@ -103,11 +103,13 @@ namespace Elwig.Windows {
EditMemberButton.IsEnabled = true; EditMemberButton.IsEnabled = true;
DeleteMemberButton.IsEnabled = true; DeleteMemberButton.IsEnabled = true;
AreaCommitmentButton.IsEnabled = true; AreaCommitmentButton.IsEnabled = true;
DeliveryButton.IsEnabled = true;
FillInputs(m); FillInputs(m);
} else { } else {
EditMemberButton.IsEnabled = false; EditMemberButton.IsEnabled = false;
DeleteMemberButton.IsEnabled = false; DeleteMemberButton.IsEnabled = false;
AreaCommitmentButton.IsEnabled = false; AreaCommitmentButton.IsEnabled = false;
DeliveryButton.IsEnabled = false;
ClearOriginalValues(); ClearOriginalValues();
ClearInputs(); ClearInputs();
} }
@ -247,7 +249,12 @@ namespace Elwig.Windows {
} }
private void AreaCommitmentButton_Click(object sender, RoutedEventArgs evt) { private void AreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
var w = new AreaComAdminWindow((Member)MemberList.SelectedItem); var w = new AreaComAdminWindow(((Member)MemberList.SelectedItem).MgNr);
w.Show();
}
private void DeliveryButton_Click(object sender, RoutedEventArgs evt) {
var w = new DeliveryAdminWindow(((Member)MemberList.SelectedItem).MgNr);
w.Show(); w.Show();
} }