merge conflicts -take remote

3 files changed, 157 insertions, 35 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Tango.MachineStudio.ActionLogs.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Tango.MachineStudio.ActionLogs.csproj
index 280356aa8..de4783237 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Tango.MachineStudio.ActionLogs.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Tango.MachineStudio.ActionLogs.csproj
@@ -156,5 +156,8 @@
   <ItemGroup>
     <Resource Include="Images\action_logs.jpg" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Models\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
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 534bb364f..3e5c59fee 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
@@ -16,12 +16,16 @@ using Tango.BL.ValueObjects;
 using Tango.Core.Commands;
 using Tango.Core.ExtensionMethods;
 using Tango.MachineStudio.Common;
+using Tango.MachineStudio.Common.Notifications;
 using Tango.SharedUI.Components;
 
 namespace Tango.MachineStudio.ActionLogs.ViewModels
 {
     public class MainViewVM : StudioViewModel
     {
+        private INotificationProvider _notification;
+        private List<User> _allUsers;
+
         #region Properties
 
         private DateTime _startSelectedDate;
@@ -83,30 +87,44 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels
             set { _differenceObject = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _isLoading;
+
+        public bool IsLoading
+        {
+            get { return _isLoading; }
+            set { _isLoading = value; RaisePropertyChangedAuto(); }
+        }
+
+        private bool _isLoadingDifferences;
 
-        private bool _isRunning;
-        public bool IsRunning
+        public bool IsLoadingDifferences
         {
-            get { return _isRunning; }
-            set { _isRunning = value; }
+            get { return _isLoadingDifferences; }
+            set { _isLoadingDifferences = value; RaisePropertyChangedAuto(); }
         }
 
+
+
+
         #endregion
 
         public RelayCommand SearchCommand { get; set; }
         public RelayCommand CopyToClipBoardCommand { get; set; }
         public RelayCommand CopyRelateObjectIDCommand { get; set; }
 
-        public MainViewVM()
+        public MainViewVM(INotificationProvider notification)
         {
+            _notification = notification;
+
+            IsLoading = false;
+            IsLoadingDifferences = false;
             ActionLogs = new ObservableCollection<ActionLog>();
-            SearchCommand = new RelayCommand(GetActionLogs, () => !IsRunning);
+            SearchCommand = new RelayCommand(async () => await GetActionLogs(), () => IsFree);
             CopyRelateObjectIDCommand = new RelayCommand(CopyRelateObjectID);
             CopyToClipBoardCommand = new RelayCommand(CopyToClipBoard, () => SelectedActionLog != null && SelectedActionLog.DifferenceObject != null);
             DateTime now = DateTime.Now;
             StartSelectedDate = now.AddMonths(-1);
             EndSelectedDate = now;
-            _isRunning = false;
             var source = Enum.GetValues(typeof(ActionLogType)).Cast<ActionLogType>().ToObservableCollection();
             var syncedSource = Enum.GetValues(typeof(ActionLogType)).Cast<ActionLogType>().ToObservableCollection();
 
@@ -115,7 +133,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,45 +168,123 @@ namespace Tango.MachineStudio.ActionLogs.ViewModels
             DataObject data = new DataObject(SelectedActionLog.RelatedObjectGuid);
             System.Windows.Clipboard.SetDataObject(data);
         }
-
+        
         /// <summary>
         /// New Database Query with search parameters. Initialization ActionLogs property.
         /// </summary>
-        private async void GetActionLogs()
+        private async Task GetActionLogs()
         {
+            IsLoading = true;
             string filter = SearchFilter?.ToLower();
 
             if (String.IsNullOrWhiteSpace(filter)) filter = null;
 
-            using (ObservablesContext db = ObservablesContext.CreateDefault())
+            try
             {
-                
-                DateTime startUtc = new DateTime(StartSelectedDate.Date.Ticks, DateTimeKind.Utc);
-                TimeSpan offsetTime = (EndSelectedDate.Date == DateTime.Now.Date) ? DateTime.Now.TimeOfDay : new TimeSpan(24, 0, 0);
-                DateTime endUtc = new DateTime(EndSelectedDate.Date.Ticks + offsetTime.Ticks, DateTimeKind.Utc);
+                IsFree = false;
+
+                using (ObservablesContext db = ObservablesContext.CreateDefault())
+                {
+                    DateTime startUtc = new DateTime(StartSelectedDate.Year, StartSelectedDate.Month, StartSelectedDate.Day, 0, 0, 0).ToUniversalTime();
+                    TimeSpan offsetTime = (EndSelectedDate.Date == DateTime.Now.Date) ? DateTime.Now.TimeOfDay : new TimeSpan(23, 59, 59);
+                    DateTime endUtc = EndSelectedDate.ToUniversalTime() + offsetTime;
+
+                    Debug.Write($"TEST TIME {startUtc} to {endUtc}  "+ System.Environment.NewLine);
 
-                Debug.Write($"TEST TIME  {startUtc}  from {endUtc} " + System.Environment.NewLine);
+                    var db_ActionLogs = db.ActionLogs.Where(x => x.LastUpdated <= endUtc && x.LastUpdated >= startUtc)
+                           .Select(x => new
+                           {
+                               x.ID,
+                               x.Guid,
+                               x.UserGuid,
+                               x.LastUpdated,
+                               x.Type,
+                               x.RelatedObjectName,
+                               x.RelatedObjectGuid,
+                               x.Message
+                           });
 
-                IsRunning = true;
-                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();
-                IsRunning = false;
+                    int[] actionTypes = SelectedActionLogTypes.SynchedSource.ToArray().Select(x => (int)x).ToArray();
+                    if (actionTypes.Length > 0)
+                    {
+                        db_ActionLogs = db_ActionLogs.Where(x => actionTypes.Contains(x.Type));
+                    }
+
+                    var runs_db = await db_ActionLogs.ToListAsync();
+                    var runs = runs_db.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)));
+                    }
+                    ActionLogs = runs.ToObservableCollection();
+                }
+            }
+            catch (Exception ex)
+            {
+                IsFree = true;
+                LogManager.Log(ex, "Error getting action logs.");
+                _notification.ShowError($"Error occurred while trying to retrieve the action logs.\n{ex.Message}");
+            }
+            finally
+            {
+                IsFree = true;
+                IsLoading = false;
             }
         }
 
-        private void SelectedItemChanged()
+        /// <summary>
+        /// Update DifferenceObject on Selected item changed
+        /// </summary>
+        private async void SelectedItemChanged()
         {
-            if (SelectedActionLog == null || SelectedActionLog.DifferenceObject == null)
+            if (SelectedActionLog == null)
                 return;
+            if (SelectedActionLog.Difference == null)
+            {
+                await InitSelectedActionLogDifference();
+            }
             DifferenceObject = SelectedActionLog.DifferenceObject;
         }
+
+        /// <summary>
+        /// Initializes the selected action log difference.
+        /// </summary>
+        public async Task InitSelectedActionLogDifference()
+        {
+            IsLoadingDifferences = true;
+            try
+            {
+                using (var db = ObservablesContext.CreateDefault())
+                {
+                    var difference = await db.ActionLogs.SingleOrDefaultAsync(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
+            {
+                IsLoadingDifferences = false;
+            }
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml
index 3a7eaa802..e2d65d7a3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml
@@ -82,8 +82,9 @@
                                                                 <ItemsControl.ItemTemplate>
                                                                     <DataTemplate>
                                                                         <DockPanel Margin="2">
-                                                                            <CheckBox VerticalAlignment="Center" DockPanel.Dock="Left" IsChecked="{Binding IsSelected}" />
-                                                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" Text="{Binding Data,Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock>
+                                                                            <CheckBox VerticalAlignment="Center" DockPanel.Dock="Left" IsChecked="{Binding IsSelected}" >
+                                                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" Text="{Binding Data,Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock>
+                                                                            </CheckBox>
                                                                         </DockPanel>
                                                                     </DataTemplate>
                                                                 </ItemsControl.ItemTemplate>
@@ -149,13 +150,13 @@
                         <DataGridTextColumn Header="ACTION" Binding="{Binding ActionType, Converter={StaticResource EnumToDescriptionConverter}}" Width="Auto"/>
                         <DataGridTextColumn Header="USER" Binding="{Binding User.Contact.FullName}" Width="Auto"/>
                         <DataGridTextColumn Header="RELATED OBJECT NAME" Binding="{Binding RelatedObjectName}" Width="Auto" />
-                        <DataGridTextColumn Header="RELATED OBJECT ID" Binding="{Binding RelatedObjectGuid}" Width="Auto" >
+                        <DataGridTextColumn Header="RELATED OBJECT ID" Binding="{Binding RelatedObjectGuid}" Width="Auto"  >
                             <DataGridTextColumn.CellStyle>
                                 <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}" >
                                     <Setter Property="BorderThickness" Value="0"/>
                                     <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
                                     <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
-                                    <Setter Property="Tag" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type UserControl}},  Path=DataContext}"/>
+                                    <Setter Property="Tag" Value="{Binding RelativeSource={RelativeSource AncestorType=UserControl},  Path=DataContext}"/>
                                     <Setter Property="ContextMenu">
                                         <Setter.Value>
                                             <ContextMenu DataContext="{Binding PlacementTarget.Tag, RelativeSource={RelativeSource Self}}" Padding="0" Margin="0" >
@@ -207,9 +208,9 @@
                     </DataGrid.Columns>
                 </DataGrid>
             </Grid>
-            <Grid Grid.Row="1" Grid.Column="0"  Visibility="{Binding IsRunning,Converter={StaticResource BooleanToVisibilityConverter}}">
+            <Grid Grid.Row="1" Grid.Column="0"  Visibility="{Binding IsLoading,Converter={StaticResource BooleanToVisibilityConverter}}">
                 <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
-                    <mahapps:ProgressRing Margin="20 60 20 40" Width="80" Height="80" IsActive="{Binding IsRunning}"></mahapps:ProgressRing>
+                    <mahapps:ProgressRing Margin="20 60 20 40" Width="80" Height="80" IsActive="{Binding IsLoading}"></mahapps:ProgressRing>
                     <TextBlock Text="Loading..." HorizontalAlignment="Center" FontSize="20" FontStyle="Italic" VerticalAlignment="Center" Margin="0 20 0 0"></TextBlock>
                 </StackPanel>
             </Grid>
@@ -314,6 +315,7 @@
 
                 </DockPanel>
             </Border>
+            <mahapps:ProgressRing Grid.Row="1" Grid.Column="1" Margin="20 0 20 40" Width="80" Height="80" IsActive="{Binding IsLoadingDifferences}"></mahapps:ProgressRing>
 
         </Grid>
     </Grid>