Compare commits
3 Commits
5321be46c7
...
e18bc58b6c
| Author | SHA1 | Date | |
|---|---|---|---|
| e18bc58b6c | |||
| 21f68caf4c | |||
| 2ef10b4bb2 |
@@ -690,7 +690,7 @@ namespace Elwig.Windows {
|
||||
private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
|
||||
FinishButton.IsEnabled = false;
|
||||
NewDeliveryPartButton.IsEnabled = false;
|
||||
NewDeliveryPartButton.Cursor = Cursors.Wait;
|
||||
Mouse.OverrideCursor = Cursors.AppStarting;
|
||||
DeliveryPartList.IsEnabled = false;
|
||||
var p = await ViewModel.UpdateDeliveryPart(
|
||||
(DeliveryList.SelectedItem as Delivery)?.Year,
|
||||
@@ -703,9 +703,10 @@ namespace Elwig.Windows {
|
||||
EmptyScale();
|
||||
await RefreshList();
|
||||
await RefreshDeliveryParts();
|
||||
NewDeliveryPartButton.Cursor = null;
|
||||
Mouse.OverrideCursor = null;
|
||||
ControlUtils.SelectItem(DeliveryList, p?.Delivery);
|
||||
DeliveryPartList.SelectedItem = null;
|
||||
DeliveryPartList.ScrollIntoView(DeliveryPartList.ItemsSource.Cast<object>().Last());
|
||||
RefreshInputs();
|
||||
InitialInputs();
|
||||
}
|
||||
@@ -713,7 +714,7 @@ namespace Elwig.Windows {
|
||||
private async void FinishButton_Click(object sender, RoutedEventArgs evt) {
|
||||
FinishButton.IsEnabled = false;
|
||||
NewDeliveryPartButton.IsEnabled = false;
|
||||
FinishButton.Cursor = Cursors.Wait;
|
||||
Mouse.OverrideCursor = Cursors.AppStarting;
|
||||
DeliveryPartList.IsEnabled = false;
|
||||
var p = await ViewModel.UpdateDeliveryPart(
|
||||
(DeliveryList.SelectedItem as Delivery)?.Year,
|
||||
@@ -727,7 +728,6 @@ namespace Elwig.Windows {
|
||||
await RefreshList();
|
||||
await RefreshDeliveryParts();
|
||||
if (p?.Delivery != null) {
|
||||
Mouse.OverrideCursor = Cursors.AppStarting;
|
||||
try {
|
||||
using var ctx = new AppDbContext();
|
||||
using var doc = new DeliveryNote((await ctx.Deliveries.FindAsync(p.Year, p.DId))!, ctx);
|
||||
@@ -740,9 +740,8 @@ namespace Elwig.Windows {
|
||||
} catch (Exception exc) {
|
||||
MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
|
||||
}
|
||||
Mouse.OverrideCursor = null;
|
||||
}
|
||||
FinishButton.Cursor = null;
|
||||
Mouse.OverrideCursor = null;
|
||||
DeliveryList.SelectedItem = null;
|
||||
await RenewContext();
|
||||
RefreshInputs();
|
||||
@@ -937,7 +936,7 @@ namespace Elwig.Windows {
|
||||
|
||||
private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
|
||||
SaveButton.IsEnabled = false;
|
||||
SaveButton.Cursor = Cursors.Wait;
|
||||
Mouse.OverrideCursor = Cursors.AppStarting;
|
||||
|
||||
IsEditing = false;
|
||||
IsCreating = false;
|
||||
@@ -953,7 +952,7 @@ namespace Elwig.Windows {
|
||||
!InputIsNotDefault(TimeInput)
|
||||
);
|
||||
|
||||
SaveButton.Cursor = null;
|
||||
Mouse.OverrideCursor = null;
|
||||
|
||||
HideSaveResetCancelButtons();
|
||||
ShowNewEditDeleteButtons();
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
xmlns:local="clr-namespace:Elwig.Windows"
|
||||
xmlns:vm="clr-namespace:Elwig.ViewModels"
|
||||
xmlns:ctrl="clr-namespace:Elwig.Controls"
|
||||
Title="Traubenanmeldungen - Elwig" Height="700" Width="900" MinWidth="600" MinHeight="400"
|
||||
Title="Traubenanmeldungen - Elwig" Height="700" Width="940" MinWidth="600" MinHeight="400"
|
||||
Loaded="Window_Loaded">
|
||||
<Window.DataContext>
|
||||
<vm:DeliveryAncmtAdminViewModel/>
|
||||
|
||||
@@ -53,7 +53,7 @@ namespace Elwig.Windows {
|
||||
WeightInput.Focus();
|
||||
WeightInput.SelectAll();
|
||||
} else if (ctrl == WeightInput) {
|
||||
SaveButton_Click(null, null);
|
||||
ShortcutSave();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user