Machine Studio. Changes in Statistics Job Runs and Action log. Improving data creation performance.

1 files changed, 112 insertions, 11 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs
index df2643d88..c1bf63ce4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/ViewModels/MainViewVM.cs
@@ -24,6 +24,7 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels
     public class MainViewVM : StudioViewModel
     {
         private INotificationProvider _notification;
+        private List<User> _allUsers;
 
         #region Properties
 
@@ -86,6 +87,17 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels
             set { _differenceObject = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _isLoading;
+
+        public bool IsLoading
+        {
+            get { return _isLoading; }
+            set { _isLoading = value; RaisePropertyChangedAuto(); }
+        }
+
+
+
+
         #endregion
 
         public RelayCommand SearchCommand { get; set; }
@@ -96,6 +108,7 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels
         {
             _notification = notification;
 
+            IsLoading = false;
             ActionLogs = new ObservableCollection<ActionLog>();
             SearchCommand = new RelayCommand(GetActionLogs, () => IsFree);
             CopyRelateObjectIDCommand = new RelayCommand(CopyRelateObjectID);
@@ -111,7 +124,28 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels
 
         public override void OnApplicationReady()
         {
+            InitUsers();
+        }
+        public async void InitUsers()
+        {
+            try
+            {
+                IsFree = false;
+
+                using (var db = ObservablesContext.CreateDefault())
+                {
 
+                    _allUsers = await db.Users.Include(x => x.Contact).ToListAsync();
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error loading users.");
+            }
+            finally
+            {
+                IsFree = true;
+            }
         }
 
         private void CopyToClipBoard()
@@ -129,8 +163,9 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels
         /// <summary>
         /// New Database Query with search parameters. Initialization ActionLogs property.
         /// </summary>
-        private async void GetActionLogs()
+        private  void GetActionLogs()
         {
+            IsLoading = true;
             string filter = SearchFilter?.ToLower();
 
             if (String.IsNullOrWhiteSpace(filter)) filter = null;
@@ -147,17 +182,48 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels
                     DateTime endUtc = new DateTime(EndSelectedDate.Date.Ticks + offsetTime.Ticks, DateTimeKind.Utc);
 
                     Debug.Write($"TEST TIME  {startUtc}  from {endUtc} " + System.Environment.NewLine);
+                    
+                    var db_ActionLogs = db.ActionLogs.Where(x => x.LastUpdated <= DbFunctions.TruncateTime(endUtc) && x.LastUpdated >= DbFunctions.TruncateTime(startUtc))
+                           .Select(x => new
+                           {
+                               x.ID,x.Guid,x.UserGuid, x.LastUpdated,x.Type,x.RelatedObjectName, x.RelatedObjectGuid,x.Message
+                           });
+                    int[] actionTypes = SelectedActionLogTypes.SynchedSource.ToArray().Select(x => (int)x).ToArray();
+                    if(actionTypes.Length > 0)
+                    {
+                        db_ActionLogs = db_ActionLogs.Where(x => actionTypes.Contains(x.Type));
+                    }
 
-                    ActionLogs = await new ActionLogsCollectionBuilder(db).Set(x => x.LastUpdated <= DbFunctions.TruncateTime(endUtc) && x.LastUpdated >= DbFunctions.TruncateTime(startUtc))
-                        .WithUsers()
-                        .WithActionType(SelectedActionLogTypes.SynchedSource.ToArray())
-                        .Query(y => y.Where
-                        (x => filter == null ||
-                        (x.ID.ToString().ToLower().StartsWith(filter)
-                        || (x.RelatedObjectName != null && x.RelatedObjectName.ToLower().StartsWith(filter))
+                    var runs = db_ActionLogs.ToList()
+                             .Select(x => new ActionLog()
+                             {
+                                 ID = x.ID,Guid = x.Guid,
+                                 UserGuid = x.UserGuid,
+                                 LastUpdated = x.LastUpdated,
+                                 Type = x.Type,
+                                 RelatedObjectName = x.RelatedObjectName,
+                                 RelatedObjectGuid = x.RelatedObjectGuid,
+                                 Message = x.Message,
+                                 User = _allUsers.SingleOrDefault(y => y.Guid == x.UserGuid)
+                             });
+                    if (!String.IsNullOrEmpty(filter))
+                    {
+                        runs = runs.Where(x => x.ID.ToString().ToLower().StartsWith(filter) || (x.RelatedObjectName != null && x.RelatedObjectName.ToLower().StartsWith(filter))
                         || (x.RelatedObjectGuid != null && x.RelatedObjectGuid.ToLower().StartsWith(filter))
-                        || (x.User != null && x.User.Contact != null && x.User.Contact.FullName.ToLower().StartsWith(filter)))))
-                        .BuildAsync();
+                        || (x.User != null && x.User.Contact != null && x.User.Contact.FullName.ToLower().StartsWith(filter)));
+                    }
+                    ActionLogs = runs.ToObservableCollection();
+
+                    //ActionLogs = await new ActionLogsCollectionBuilder(db).Set(x => x.LastUpdated <= DbFunctions.TruncateTime(endUtc) && x.LastUpdated >= DbFunctions.TruncateTime(startUtc))
+                    //    .WithUsers()
+                    //    .WithActionType(SelectedActionLogTypes.SynchedSource.ToArray())
+                    //    .Query(y => y.Where
+                    //    (x => filter == null ||
+                    //    (x.ID.ToString().ToLower().StartsWith(filter)
+                    //    || (x.RelatedObjectName != null && x.RelatedObjectName.ToLower().StartsWith(filter))
+                    //    || (x.RelatedObjectGuid != null && x.RelatedObjectGuid.ToLower().StartsWith(filter))
+                    //    || (x.User != null && x.User.Contact != null && x.User.Contact.FullName.ToLower().StartsWith(filter)))))
+                    //    .BuildAsync();
                 }
             }
             catch (Exception ex)
@@ -169,14 +235,49 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels
             finally
             {
                 IsFree = true;
+                IsLoading = false;
             }
         }
 
+        /// <summary>
+        /// Update DifferenceObject on Selected item changed
+        /// </summary>
         private void SelectedItemChanged()
         {
-            if (SelectedActionLog == null || SelectedActionLog.DifferenceObject == null)
+            if (SelectedActionLog == null)
                 return;
+            if(SelectedActionLog.Difference==null)
+            {
+                InitSelectedActionLogDifference();
+            }
             DifferenceObject = SelectedActionLog.DifferenceObject;
         }
+
+        /// <summary>
+        /// Initializes the selected action log difference.
+        /// </summary>
+        public void InitSelectedActionLogDifference()
+        {
+            IsLoading = true;
+            try
+            {
+                using (var db = ObservablesContext.CreateDefault())
+                {
+                    var difference = db.ActionLogs.SingleOrDefault(x => x.Guid.Equals(SelectedActionLog.Guid));
+                    if (difference != null)
+                    {
+                        SelectedActionLog.DifferenceObject = difference.DifferenceObject;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error loading difference of the selected action log.");
+            }
+            finally
+            {
+                IsLoading = false;
+            }
+        }
     }
 }