diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-02-17 23:31:57 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-02-17 23:31:57 +0200 |
| commit | f9ad6d13e30ce2a2721bcbf631a22095cfca3e4e (patch) | |
| tree | 59bd96dfff3df28bd045073978742139e65c01b9 /Software/Visual_Studio/PPC | |
| parent | fe6d54eadd778487c9e6fdb9cc39cc88289d426f (diff) | |
| parent | 5a580c03b802bc67cc90296cee799e6608866a78 (diff) | |
| download | Tango-f9ad6d13e30ce2a2721bcbf631a22095cfca3e4e.tar.gz Tango-f9ad6d13e30ce2a2721bcbf631a22095cfca3e4e.zip | |
Merged job-prepare branch.
Diffstat (limited to 'Software/Visual_Studio/PPC')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/CartridgeValidationView.xaml | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs | 26 |
2 files changed, 25 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/CartridgeValidationView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/CartridgeValidationView.xaml index e0c7ccbb6..6df0e0980 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/CartridgeValidationView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/CartridgeValidationView.xaml @@ -56,7 +56,7 @@ <SolidColorBrush Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush> </Ellipse.Fill> </Ellipse> - <TextBlock Text="{Binding LiquidType.Name}" TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0 10 0 0"></TextBlock> + <TextBlock Text="{Binding LiquidType.Name}" TextAlignment="Center" TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0 10 0 0"></TextBlock> </StackPanel> </DataTemplate> </touch:TouchStaticListBox.ItemTemplate> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs index 13ad6ed89..42d947326 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs @@ -43,7 +43,14 @@ namespace Tango.PPC.UI.ViewModels { private IMachineProvider _machineProvider; - public CartridgeStatus Status { get; set; } + private CartridgeStatus _status; + public CartridgeStatus Status + { + get { return _status; } + set { _status = value; PreviousState = _status.State; } + } + + public CartridgeState PreviousState { get; set; } public bool InProgress { @@ -462,7 +469,7 @@ namespace Tango.PPC.UI.ViewModels NotificationProvider.ShowInfo("Cannot perform a machine update while the machine is dyeing."); return; } - + NavigationManager.NavigateTo(NavigationView.MachineUpdateView); TangoIOC.Default.GetInstance<MachineUpdateViewVM>().CheckForUpdates(); IsMenuOpened = false; @@ -496,6 +503,21 @@ namespace Tango.PPC.UI.ViewModels if (model != null) { + if (cartridgeStatus != null) + { + if ((cartridgeStatus.State == CartridgeState.Error || cartridgeStatus.State == CartridgeState.EmpyingFailed || cartridgeStatus.State == CartridgeState.FillingFailed) && (model.PreviousState != CartridgeState.Error && model.PreviousState != CartridgeState.FillingFailed && model.PreviousState != CartridgeState.EmpyingFailed)) + { + NotificationProvider.ShowError(cartridgeStatus.Message); + } + + if ((cartridgeStatus.State == CartridgeState.EmptyingCompleted || cartridgeStatus.State == CartridgeState.FillingCompleted) + && + (model.PreviousState != CartridgeState.EmptyingCompleted && model.PreviousState != CartridgeState.FillingCompleted)) + { + NotificationProvider.ShowSuccess(cartridgeStatus.Message); + } + } + model.Status = cartridgeStatus; } } |