From 6ccd2ee79d33669baea3d5d49b3fc5597e32d177 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Tue, 16 Mar 2021 15:23:40 +0200
Subject: Changed bit result Pending to Skipped. Changed status display order.
 Increased BIT fetch timeout to 5 min.

---
 .../PPC/Tango.PPC.UI/Dialogs/BitResultsView.xaml     |  4 ++--
 Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest |  2 +-
 .../Tango.Emulations/Emulators/MachineEmulator.cs    |  3 ++-
 .../Operation/BitResultComposition.cs                |  4 ++--
 .../Tango.Integration/Operation/JobHandler.cs        | 20 ++++++++++----------
 .../Tango.Integration/Operation/MachineOperator.cs   |  4 ++--
 .../Tango.PMR/Diagnostics/BitResultStatus.cs         |  4 ++--
 7 files changed, 21 insertions(+), 20 deletions(-)

(limited to 'Software/Visual_Studio')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/BitResultsView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/BitResultsView.xaml
index d6c6a9b0f..c9618d594 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/BitResultsView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/BitResultsView.xaml
@@ -68,8 +68,8 @@
                                     <touch:TouchIcon Width="16">
                                         <touch:TouchIcon.Style>
                                             <Style TargetType="touch:TouchIcon" BasedOn="{StaticResource {x:Type touch:TouchIcon}}">
-                                                <Setter Property="Icon" Value="TimerSand"></Setter>
-                                                <Setter Property="Foreground" Value="{StaticResource TangoDarkForegroundBrush}"></Setter>
+                                                <Setter Property="Icon" Value="SkipNextCircleOutline"></Setter>
+                                                <Setter Property="Foreground" Value="{StaticResource TangoGrayBrush}"></Setter>
                                                 <Style.Triggers>
                                                     <DataTrigger Binding="{Binding BitResult.Status}" Value="Passed">
                                                         <Setter Property="Icon" Value="Check"></Setter>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index d72e75011..efc5f8179 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
       </requestedPrivileges>
     </security>
   </trustInfo>
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index 1f8c34358..a4639f874 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -1808,7 +1808,8 @@ namespace Tango.Emulations.Emulators
 
                 if (rnd < 25)
                 {
-                    result.Status = BitResultStatus.Pending;
+                    result.Status = BitResultStatus.Skipped;
+                    result.Description = "Skipped";
                 }
                 else if (rnd >= 25 && rnd < 50)
                 {
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/BitResultComposition.cs b/Software/Visual_Studio/Tango.Integration/Operation/BitResultComposition.cs
index cbe6e5fa3..8c27d36fa 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/BitResultComposition.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/BitResultComposition.cs
@@ -22,9 +22,9 @@ namespace Tango.Integration.Operation
         {
             switch (status)
             {
-                case BitResultStatus.Passed:
+                case BitResultStatus.Skipped:
                     return 3;
-                case BitResultStatus.Pending:
+                case BitResultStatus.Passed:
                     return 2;
                 case BitResultStatus.Warning:
                     return 1;
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
index 605e8be47..342bc01e3 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
@@ -26,7 +26,7 @@ namespace Tango.Integration.Operation
         protected double _last_progress;
         protected const int PROGRESS_REPORT_RANGE_METERS = 5;
         protected bool loggedContinueMessage;
-        private int _handlerCounter;
+        private static int _handlerCounter;
 
         #region Events
 
@@ -335,15 +335,15 @@ namespace Tango.Integration.Operation
 
             if (_last_progress != s.Progress)
             {
-                if (s.Progress <= PROGRESS_REPORT_RANGE_METERS || s.Progress >= Status.TotalProgress - PROGRESS_REPORT_RANGE_METERS)
-                {
-                    LogManager.Log($"Updating job progress {s.Progress}/{Status.TotalProgress}...");
-                }
-                else if (!loggedContinueMessage)
-                {
-                    loggedContinueMessage = true;
-                    LogManager.Log($"Progress logging will continue {PROGRESS_REPORT_RANGE_METERS} meters before completion...");
-                }
+                //if (s.Progress <= PROGRESS_REPORT_RANGE_METERS || s.Progress >= Status.TotalProgress - PROGRESS_REPORT_RANGE_METERS)
+                //{
+                    LogManager.Log($"{GetJobHandlerString()} Updating job progress {s.Progress}/{Status.TotalProgress}...");
+                //}
+                //else if (!loggedContinueMessage)
+                //{
+                //    loggedContinueMessage = true;
+                //    LogManager.Log($"Progress logging will continue {PROGRESS_REPORT_RANGE_METERS} meters before completion...");
+                //}
             }
 
             if (s.Progress < 0)
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 3bbbd2efe..bf21df35d 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -4193,7 +4193,7 @@ namespace Tango.Integration.Operation
                 var response = await SendRequest<BitResultsRequest, BitResultsResponse>(new BitResultsRequest(), new TransportRequestConfig()
                 {
                     ShouldLog = true,
-                    Timeout = TimeSpan.FromMinutes(1.5)
+                    Timeout = TimeSpan.FromMinutes(5)
                 });
 
                 var compositions = new List<BitResultComposition>();
@@ -4202,7 +4202,7 @@ namespace Tango.Integration.Operation
                 {
                     BitResultComposition composition = new BitResultComposition();
                     composition.BitType = bitType;
-                    composition.BitResult = new BitResult() { BitType = (PMR.Diagnostics.BitType)bitType.Code }; 
+                    composition.BitResult = new BitResult() { BitType = (PMR.Diagnostics.BitType)bitType.Code, Description = "Skipped" }; 
                     compositions.Add(composition);
                 }
 
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/BitResultStatus.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/BitResultStatus.cs
index 2abeab630..49634660b 100644
--- a/Software/Visual_Studio/Tango.PMR/Diagnostics/BitResultStatus.cs
+++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/BitResultStatus.cs
@@ -23,7 +23,7 @@ namespace Tango.PMR.Diagnostics {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChVCaXRSZXN1bHRTdGF0dXMucHJvdG8SFVRhbmdvLlBNUi5EaWFnbm9zdGlj",
-            "cypDCg9CaXRSZXN1bHRTdGF0dXMSCwoHUGVuZGluZxAAEgoKBlBhc3NlZBAB",
+            "cypDCg9CaXRSZXN1bHRTdGF0dXMSCwoHU2tpcHBlZBAAEgoKBlBhc3NlZBAB",
             "EgoKBkZhaWxlZBACEgsKB1dhcm5pbmcQA0IhCh9jb20udHdpbmUudGFuZ28u",
             "cG1yLmRpYWdub3N0aWNzYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
@@ -35,7 +35,7 @@ namespace Tango.PMR.Diagnostics {
   }
   #region Enums
   public enum BitResultStatus {
-    [pbr::OriginalName("Pending")] Pending = 0,
+    [pbr::OriginalName("Skipped")] Skipped = 0,
     [pbr::OriginalName("Passed")] Passed = 1,
     [pbr::OriginalName("Failed")] Failed = 2,
     [pbr::OriginalName("Warning")] Warning = 3,
-- 
cgit v1.3.1