From dd13554edc2816b026b00fbad26d17f82d8d16c3 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Tue, 17 Jun 2025 07:26:14 +0300
Subject: Merge

---
 .../PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs      | 1 +
 Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs      | 3 ++-
 Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml   | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
index cc8f7b4ab..7b26d8425 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
@@ -299,6 +299,7 @@ namespace Tango.PPC.UI.Notifications
         /// <returns></returns>
         public NotificationItem PushNotification(NotificationItem item)
         {
+            item.Time = DateTime.Now;
             LogManager.Log($"Pushing NotificationItem '{item.GetType().Name}'.");
             item.RemoveAction = () => { PopNotification(item); };
             NotificationItems.Insert(0, item);
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs
index 07b58e55f..64c56e5e9 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoginViewVM.cs
@@ -14,6 +14,7 @@ using Tango.BL.Entities;
 using Tango.BL.Enumerations;
 using Tango.Logging;
 using Tango.PPC.UI.Views;
+using System.Diagnostics;
 
 namespace Tango.PPC.UI.ViewModels
 {
@@ -97,7 +98,7 @@ namespace Tango.PPC.UI.ViewModels
             {
                 LogManager.Log("Application is ready! Navigating to home module...");
 
-                if (BuildProvider.IsEureka)
+                if (BuildProvider.IsEureka && !Debugger.IsAttached)
                 {
                     var secondsPassed = (DateTime.Now - LoadingView.VideoStartTime).TotalSeconds;
                     var secondsToHold = Math.Max(10 - secondsPassed, 0);
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
index 2f1a54e64..0acd1d7e5 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -1509,9 +1509,10 @@
                                                     </Grid>
                                                     <touch:TouchButton Opacity="0" Background="Transparent" Style="{StaticResource TangoFlatButton}" Command="{Binding CloseCommand}" CommandParameter="{Binding}" Foreground="{StaticResource TangoPrimaryBackgroundBrush}" Padding="5" />
                                                 </Grid>
-
                                             </Grid>
                                         </Border>
+
+                                        <TextBlock Text="{Binding Time,StringFormat='hh:mm:ss'}" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 5 7 0" />
                                     </Grid>
                                 </DataTemplate>
                             </ItemsControl.ItemTemplate>
-- 
cgit v1.3.1