1 files changed, 24 insertions, 2 deletions
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;
                     }
                 }