DeliveryAdminWindow: Empty scale only after saving to database
This commit is contained in:
@ -656,7 +656,6 @@ namespace Elwig.Windows {
|
|||||||
WeightInput.Text = $"{res.Weight:N0}";
|
WeightInput.Text = $"{res.Weight:N0}";
|
||||||
ScaleId = s.ScaleId;
|
ScaleId = s.ScaleId;
|
||||||
WeighingId = res.FullWeighingId;
|
WeighingId = res.FullWeighingId;
|
||||||
s.Empty();
|
|
||||||
} else {
|
} else {
|
||||||
WeightInput.Text = "";
|
WeightInput.Text = "";
|
||||||
ScaleId = null;
|
ScaleId = null;
|
||||||
@ -762,12 +761,19 @@ namespace Elwig.Windows {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void EmptyScale() {
|
||||||
|
var scale = App.Scales.Where(s => s.ScaleId == ScaleId).FirstOrDefault();
|
||||||
|
if (scale == null) return;
|
||||||
|
scale.Empty();
|
||||||
|
}
|
||||||
|
|
||||||
private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
|
private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
|
||||||
FinishButton.IsEnabled = false;
|
FinishButton.IsEnabled = false;
|
||||||
NewDeliveryPartButton.IsEnabled = false;
|
NewDeliveryPartButton.IsEnabled = false;
|
||||||
NewDeliveryPartButton.Cursor = Cursors.Wait;
|
NewDeliveryPartButton.Cursor = Cursors.Wait;
|
||||||
DeliveryPartList.IsEnabled = false;
|
DeliveryPartList.IsEnabled = false;
|
||||||
var p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
|
var p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
|
||||||
|
EmptyScale();
|
||||||
await RefreshDeliveryList();
|
await RefreshDeliveryList();
|
||||||
await RefreshDeliveryParts();
|
await RefreshDeliveryParts();
|
||||||
NewDeliveryPartButton.Cursor = null;
|
NewDeliveryPartButton.Cursor = null;
|
||||||
@ -783,7 +789,8 @@ namespace Elwig.Windows {
|
|||||||
FinishButton.Cursor = Cursors.Wait;
|
FinishButton.Cursor = Cursors.Wait;
|
||||||
DeliveryPartList.IsEnabled = false;
|
DeliveryPartList.IsEnabled = false;
|
||||||
var p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
|
var p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
|
||||||
await RefreshDeliveryList();
|
EmptyScale();
|
||||||
|
await RefreshDeliveryList();
|
||||||
await RefreshDeliveryParts();
|
await RefreshDeliveryParts();
|
||||||
if (p?.Delivery != null) {
|
if (p?.Delivery != null) {
|
||||||
Mouse.OverrideCursor = Cursors.Wait;
|
Mouse.OverrideCursor = Cursors.Wait;
|
||||||
|
Reference in New Issue
Block a user