Merge pull request #3599 from Ginger-Automation/Beta/BugFix/D37427_RQ…

…MActivityStatusFixed RQM Activity Status is not update correctly
Ginger-Automation · Apr 11, 2024 · 2ed1693 · 2ed1693
2 parents 63a59a1 + 3c14847
commit 2ed1693
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/Ginger/Ginger/Run/RunSetActions/ExportResultsToALMConfigPage.xaml.cs b/Ginger/Ginger/Run/RunSetActions/ExportResultsToALMConfigPage.xaml.cs
@@ -119,6 +119,7 @@ public bool Init(ObservableList<BusinessFlow> bfs, ValueExpression VE, Context C
                 xALMTestSetLevelCbx.Init(PublishToALMConfig.eALMTestSetLevel.BusinessFlow, nameof(RunSetActionPublishToQC.ALMTestSetLevel), Enum.GetValues(typeof(eALMTestSetLevel)).Cast<eALMTestSetLevel>().ToList(), ComboBox.SelectedValueProperty);
                 xALMTypeCbx.ComboBox.SelectedValue = AlmConfig.AlmType;
                 xALMTestSetLevelCbx.ComboBox.SelectedValue = PublishToALMConfig.eALMTestSetLevel.BusinessFlow;
+                SearchALMEntityByNamePnl.Visibility = Visibility.Collapsed;
                 xALMTestSetLevelCbx.IsEnabled = false;
                 xALMTypeCbx.IsEnabled = false;
                 mBfs = bfs;

diff --git a/Ginger/GingerCore/ALM/RQM/RQMConnect.cs b/Ginger/GingerCore/ALM/RQM/RQMConnect.cs
@@ -216,7 +216,7 @@ private void GetRQMProjectListConfiguration()
                     {
                         XmlSerializer serializer = new XmlSerializer(typeof(RQMProjectListConfiguration));
 
-                        FileStream fs = new FileStream(importConfigTemplate, FileMode.Open);
+                        FileStream fs = new FileStream(importConfigTemplate, FileMode.Open,FileAccess.Read);
                         reader = XmlReader.Create(fs);
                         RQMProjectListConfig = (RQMProjectListConfiguration)serializer.Deserialize(reader);
                         fs.Close();

diff --git a/Ginger/GingerCoreNET/Run/RunSetActions/RunSetActionPublishToQCOperations.cs b/Ginger/GingerCoreNET/Run/RunSetActions/RunSetActionPublishToQCOperations.cs
@@ -179,6 +179,8 @@ private BusinessFlow ConvertRunSetToBF(IReportInfo reportInfo)
                         virtualAG.Description = runSetBF.Description;
                         virtualAG.ExternalID = !string.IsNullOrEmpty(runSetBF.ExternalID) ? runSetBF.ExternalID : string.Empty;
                         virtualAG.ParentGuid = runSetBF.Guid;//Business flow instance Guid passing in Parent Guid to Update External Id back
+                        virtualAG.StartTimeStamp = runSetBF.StartTimeStamp;
+                        virtualAG.EndTimeStamp = runSetBF.EndTimeStamp;
                         if (Enum.IsDefined(typeof(eActivitiesGroupRunStatus), runSetBF.RunStatus.ToString()))
                         {
                             virtualAG.RunStatus = (eActivitiesGroupRunStatus)Enum.Parse(typeof(eActivitiesGroupRunStatus), runSetBF.RunStatus.ToString());
@@ -190,7 +192,9 @@ private BusinessFlow ConvertRunSetToBF(IReportInfo reportInfo)
                         virtualBF.AddActivitiesGroup(virtualAG);
                         foreach (Activity runSetAct in runSetBF.Activities)
                         {
-                            virtualBF.AddActivity((Activity)runSetAct.CreateCopy(false), virtualAG, -1, false);
+                            Activity activitycopy = (Activity)runSetAct.CreateCopy(false);
+                            activitycopy.Status = runSetAct.Status;
+                            virtualBF.AddActivity(activitycopy, virtualAG, -1, false);
                         }
                     }
                 }