fixed

Ginger-Automation · May 17, 2024 · 5579046 · 5579046
1 parent b4a2073
commit 5579046
Showing 1 changed file with 58 additions and 2 deletions.
diff --git a/Ginger/Ginger/AutomatePageLib/NewAutomatePage.xaml.cs b/Ginger/Ginger/AutomatePageLib/NewAutomatePage.xaml.cs
@@ -1262,10 +1262,66 @@ private async Task ContinueRunFromAutomatePage(eContinueFrom continueFrom, objec
                         await mExecutionEngine.ContinueRunAsync(eContinueLevel.StandalonBusinessFlow, eContinueFrom.LastStoppedAction);
                         break;
                     case eContinueFrom.SpecificAction:
-                        await mExecutionEngine.ContinueRunAsync(eContinueLevel.StandalonBusinessFlow, eContinueFrom.SpecificAction, mBusinessFlow, (Activity)((Tuple<Activity, Act>)executedItem).Item1, (Act)((Tuple<Activity, Act>)executedItem).Item2);
+                        Activity parentActivity = (Activity)((Tuple<Activity, Act>)executedItem).Item1;
+                        Act actionToExecute = (Act)((Tuple<Activity, Act>)executedItem).Item2;
+                        try
+                        {
+                            if (mExecutionEngine.ExecutionLoggerManager.Configuration.SelectedDataRepositoryMethod == ExecutionLoggerConfiguration.DataRepositoryMethod.LiteDB)
+                            {
+                                bool reachedCurrentAction = false;
+                                foreach (Activity activity in mBusinessFlow.Activities)
+                                {
+                                    foreach (Act action in activity.Acts.Cast<Act>())
+                                    {
+                                        if (activity == parentActivity && action == actionToExecute)
+                                        {
+                                            reachedCurrentAction = true;
+                                            break;
+                                        }
+                                        mExecutionEngine.ExecutionLoggerManager.ActionEnd(0, action);
+                                    }
+                                    if (reachedCurrentAction)
+                                    {
+                                        break;
+                                    }
+                                    mExecutionEngine.ExecutionLoggerManager.ActivityEnd(0, activity);
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            Reporter.ToLog(eLogLevel.ERROR, "Error while logging previous activity and actions", ex);
+                        }
+
+                        await mExecutionEngine.ContinueRunAsync(eContinueLevel.StandalonBusinessFlow, eContinueFrom.SpecificAction, mBusinessFlow, parentActivity, actionToExecute);
                         break;
                     case eContinueFrom.SpecificActivity:
-                        mBusinessFlow.CurrentActivity = (Activity)executedItem;
+                        Activity activityToExecute = (Activity)executedItem;
+                        try
+                        {
+                            if (mExecutionEngine.ExecutionLoggerManager.Configuration.SelectedDataRepositoryMethod == ExecutionLoggerConfiguration.DataRepositoryMethod.LiteDB)
+                            {
+                                foreach (Activity activity in mBusinessFlow.Activities)
+                                {
+                                    if (activity == activityToExecute)
+                                    {
+                                        break;
+                                    }
+                                    foreach (Act action in activity.Acts.Cast<Act>())
+                                    {
+                                        mExecutionEngine.ExecutionLoggerManager.ActionEnd(0, action);
+                                    }
+                                    mExecutionEngine.ExecutionLoggerManager.ActivityEnd(0, activity);
+                                }
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            Reporter.ToLog(eLogLevel.ERROR, "Error while logging previous activity and actions", ex);
+                        }
+
+                        mBusinessFlow.CurrentActivity = activityToExecute;
+
                         await mExecutionEngine.ContinueRunAsync(eContinueLevel.StandalonBusinessFlow, eContinueFrom.SpecificActivity, mBusinessFlow, (Activity)executedItem);
                         break;
                     default: