DataStore EF !

7 files changed, 18 insertions, 2 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/DataStore/DefaultDataStoreService.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/DataStore/DefaultDataStoreService.cs
index 02d8e1858..e5bec90f2 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/DataStore/DefaultDataStoreService.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/DataStore/DefaultDataStoreService.cs
@@ -7,6 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.DI;
 using Tango.DataStore;
+using Tango.DataStore.EF;
 using Tango.DataStore.Lite;
 using Tango.DataStore.Remote;
 using Tango.Integration.ExternalBridge;
@@ -34,7 +35,7 @@ namespace Tango.PPC.Common.DataStore
         {
             if (_manager == null)
             {
-                _manager = new LiteDBDataStoreManager(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Twine", "Tango", "DataStore", Path.GetFileNameWithoutExtension(AppDomain.CurrentDomain.FriendlyName) + ".db"));
+                _manager = new EFDataStoreManager();
             }
 
             return _manager;
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
index fec0dfd1a..0a6e57f5d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
@@ -383,6 +383,10 @@
       <Project>{58e8825f-0c96-449c-b320-1e82b0aa876b}</Project>
       <Name>Tango.CSV</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Tango.DataStore.EF\Tango.DataStore.EF.csproj">
+      <Project>{88d9906b-8fc4-4fe0-b7eb-127a0a8fcee4}</Project>
+      <Name>Tango.DataStore.EF</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Tango.DataStore.LiteDB\Tango.DataStore.Lite.csproj">
       <Project>{fa96bc0c-4055-475c-9dcc-70a5a9436b10}</Project>
       <Name>Tango.DataStore.Lite</Name>
@@ -507,7 +511,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
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadMachineDataRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadMachineDataRequest.cs
index 66fca8e36..bbb0e883b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadMachineDataRequest.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadMachineDataRequest.cs
@@ -14,9 +14,11 @@ namespace Tango.PPC.Common.Web
         public bool RequestJobs { get; set; }
         public bool RequestJobRuns { get; set; }
         public bool RequestMachineEvents { get; set; }
+        public bool RequestDataStoreItems { get; set; }
 
         public int MaxJobs { get; set; }
         public int MaxJobRuns { get; set; }
         public int MaxMachinesEvents { get; set; }
+        public int MaxDataStoreItems { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadMachineDataResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadMachineDataResponse.cs
index 5c3f7ba78..e90c7c2ac 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadMachineDataResponse.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadMachineDataResponse.cs
@@ -14,12 +14,14 @@ namespace Tango.PPC.Common.Web
         public List<JobDTO> Jobs { get; set; }
         public List<JobRunDTO> JobRuns { get; set; }
         public List<MachinesEventDTO> MachineEvents { get; set; }
+        public List<DataStoreItemDTO> DataStoreItems { get; set; }
 
         public DownloadMachineDataResponse()
         {
             Jobs = new List<JobDTO>();
             JobRuns = new List<JobRunDTO>();
             MachineEvents = new List<MachinesEventDTO>();
+            DataStoreItems = new List<DataStoreItemDTO>();
         }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/NotifyMachineDataDownloadCompletedRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/NotifyMachineDataDownloadCompletedRequest.cs
index fc135c234..fda7a4666 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/NotifyMachineDataDownloadCompletedRequest.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/NotifyMachineDataDownloadCompletedRequest.cs
@@ -14,12 +14,14 @@ namespace Tango.PPC.Common.Web
         public List<String> SynchronizedJobs { get; set; }
         public List<String> SynchronizedJobRuns { get; set; }
         public List<String> SynchronizedMachineEvents { get; set; }
+        public List<String> SynchronizedDataStoreItems { get; set; }
 
         public NotifyMachineDataDownloadCompletedRequest()
         {
             SynchronizedJobs = new List<string>();
             SynchronizedJobRuns = new List<string>();
             SynchronizedMachineEvents = new List<string>();
+            SynchronizedDataStoreItems = new List<string>();
         }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadMachineDataRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadMachineDataRequest.cs
index d7475819c..8eee667cd 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadMachineDataRequest.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadMachineDataRequest.cs
@@ -15,6 +15,7 @@ namespace Tango.PPC.Common.Web
         public List<JobRunDTO> JobRuns { get; set; }
         public List<MachinesEventDTO> MachineEvents { get; set; }
         public List<TangoUpdateDTO> OfflineUpdates { get; set; }
+        public List<DataStoreItemDTO> DataStoreItems { get; set; }
         public String ApplicationVersion { get; set; }
         public String FirmwareVersion { get; set; }
 
@@ -24,6 +25,7 @@ namespace Tango.PPC.Common.Web
             JobRuns = new List<JobRunDTO>();
             MachineEvents = new List<MachinesEventDTO>();
             OfflineUpdates = new List<TangoUpdateDTO>();
+            DataStoreItems = new List<DataStoreItemDTO>();
         }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadMachineDataResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadMachineDataResponse.cs
index 0119c07b6..ba0b4089b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadMachineDataResponse.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadMachineDataResponse.cs
@@ -15,6 +15,8 @@ namespace Tango.PPC.Common.Web
         public List<SynchronizationFailedEntity> FailedJobRuns { get; set; }
         public List<SynchronizationFailedEntity> FailedMachineEvents { get; set; }
         public List<SynchronizationFailedEntity> FailedOfflineUpdates { get; set; }
+        public List<SynchronizationFailedEntity> FailedDataStoreItems { get; set; }
+
         public String NotifyCompletedToken { get; set; }
 
         public UploadMachineDataResponse()
@@ -23,6 +25,7 @@ namespace Tango.PPC.Common.Web
             FailedJobRuns = new List<SynchronizationFailedEntity>();
             FailedMachineEvents = new List<SynchronizationFailedEntity>();
             FailedOfflineUpdates = new List<SynchronizationFailedEntity>();
+            FailedDataStoreItems = new List<SynchronizationFailedEntity>();
         }
     }
 }