Implemented action logs for data store.

4 files changed, 52 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.BL/DTO/DataStoreItemDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/DataStoreItemDTO.cs
index 475c9f648..3262970a1 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/DataStoreItemDTO.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/DataStoreItemDTO.cs
@@ -4,11 +4,35 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.BL.Entities;
+using Tango.DataStore;
 
 namespace Tango.BL.DTO
 {
     public class DataStoreItemDTO : DataStoreItemDTOBase
     {
+        protected override string OnGetActionLogName()
+        {
+            return $"'{CollectionName}' => '{Key}'";
+        }
 
+        public DataType Type { get; set; }
+
+        public String Val { get; set; }
+
+        protected override void OnFromObservableCompleted(DataStoreItem observable)
+        {
+            base.OnFromObservableCompleted(observable);
+            Type = (DataType)observable.DataType;
+            Val = DataStoreHelper.FormatDataStoreValue(Type, DataStoreHelper.CreateObject(Type, observable.Value));
+        }
+
+        protected override bool OnShouldActionLogIgnore(string propName)
+        {
+            return
+                propName == nameof(Value) ||
+                propName == nameof(DataType) ||
+                propName == nameof(IsSynchronized);
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/ActionLogType.cs b/Software/Visual_Studio/Tango.BL/Enumerations/ActionLogType.cs
index e0ba5d586..868bf7915 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/ActionLogType.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/ActionLogType.cs
@@ -96,5 +96,17 @@ namespace Tango.BL.Enumerations
         //Firmware
         [Description("Firmware Upgraded")]
         FirmwareUpgraded = 800,
+
+        //Job Runs
+        [Description("Machine Counters Reset")]
+        MachineCountersReset = 900,
+
+        //Data Store
+        [Description("Data Store Item Created")]
+        DataStoreItemCreated = 1000,
+        [Description("Data Store Item Modified")]
+        DataStoreItemModified = 1001,
+        [Description("Data Store Item Deleted")]
+        DataStoreItemDeleted = 1002,
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/ObservableEntityDTO.cs b/Software/Visual_Studio/Tango.BL/ObservableEntityDTO.cs
index 9b8aa0687..1c3edac82 100644
--- a/Software/Visual_Studio/Tango.BL/ObservableEntityDTO.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservableEntityDTO.cs
@@ -106,6 +106,8 @@ namespace Tango.BL
                 }
             }
 
+            dto.OnFromObservableCompleted(observable);
+
             return dto;
         }
 
@@ -319,5 +321,14 @@ namespace Tango.BL
         {
             return this.GetType().Name;
         }
+
+        /// <summary>
+        /// Called when the static method <see cref="FromObservable(T)"/> completes.
+        /// </summary>
+        /// <param name="observable">The observable.</param>
+        protected virtual void OnFromObservableCompleted(T observable)
+        {
+            //Just for override
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index 1281c4949..4da8606f7 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -597,6 +597,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\DataStore\Tango.DataStore\Tango.DataStore.csproj">
+      <Project>{e0364dfa-0721-4637-9d32-9d22aac109d6}</Project>
+      <Name>Tango.DataStore</Name>
+    </ProjectReference>
     <ProjectReference Include="..\SideChains\ColorMine\ColorMine.csproj">
       <Project>{37e4ceab-b54b-451f-b535-04cf7da9c459}</Project>
       <Name>ColorMine</Name>
@@ -641,7 +645,7 @@
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file