aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Tango.PPC.Common/Web
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy@twine-s.com>2020-12-30 15:11:34 +0000
committerRoy Ben Shabat <Roy@twine-s.com>2020-12-30 15:11:34 +0000
commitd33c19b3ac6803de4b5c8d475832efef131c1a45 (patch)
treeea725abc39def99a755b041c13cba1fe0d594ddc /Software/Visual_Studio/PPC/Tango.PPC.Common/Web
parent1bdcaa9f51303bbff682507f31fb3b4414692ca4 (diff)
downloadTango-d33c19b3ac6803de4b5c8d475832efef131c1a45.tar.gz
Tango-d33c19b3ac6803de4b5c8d475832efef131c1a45.zip
Revert "Hope it is fine"
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/Web')
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs16
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateResponse.cs10
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadMachineDataRequest.cs24
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadMachineDataResponse.cs27
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateRequest.cs2
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateResponse.cs6
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LatestVersionResponse.cs1
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LoginRequest.cs1
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupRequest.cs1
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupResponse.cs7
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineUpdateCompletedRequest.cs19
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineUpdateCompletedResponse.cs15
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/NotifyMachineDataDownloadCompletedRequest.cs27
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/NotifyMachineDataDownloadCompletedResponse.cs16
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClient.cs5
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClientBase.cs45
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/SynchronizationFailedEntity.cs14
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs3
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBResponse.cs1
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdatedEntity.cs31
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadMachineDataRequest.cs31
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadMachineDataResponse.cs31
22 files changed, 329 insertions, 4 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs
index b98848e4f..8e13ea7c4 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs
@@ -9,7 +9,21 @@ namespace Tango.PPC.Common.Web
{
public class CheckForUpdateRequest : WebRequestMessage
{
- public String SerialNumber { get; set; }
public String Version { get; set; }
+ public String FirmwareVersion { get; set; }
+
+ public List<UpdatedEntity> Rmls { get; set; }
+ public List<UpdatedEntity> HardwareVersions { get; set; }
+ public List<UpdatedEntity> Catalogs { get; set; }
+ public DateTime MachineLastUpdated { get; set; }
+ public List<String> UsedRmlsGuids { get; set; }
+
+ public CheckForUpdateRequest()
+ {
+ Rmls = new List<UpdatedEntity>();
+ HardwareVersions = new List<UpdatedEntity>();
+ Catalogs = new List<UpdatedEntity>();
+ UsedRmlsGuids = new List<string>();
+ }
}
}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateResponse.cs
index 370c0f5ea..2fb33ebdc 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateResponse.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateResponse.cs
@@ -10,8 +10,18 @@ namespace Tango.PPC.Common.Web
public class CheckForUpdateResponse : WebResponseMessage
{
public bool IsUpdateAvailable { get; set; }
+ public bool IsDatabaseUpdateAvailable { get; set; }
public String Version { get; set; }
+ public String FirmwareVersion { get; set; }
public bool SetupFirmware { get; set; }
public bool SetupFPGA { get; set; }
+ public UpdateDBResponse UpdateDBResponse { get; set; }
+ public List<String> UsedNotExistingRmlsGuids { get; set; }
+
+ public CheckForUpdateResponse()
+ {
+ UpdateDBResponse = new UpdateDBResponse();
+ UsedNotExistingRmlsGuids = new List<string>();
+ }
}
}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadMachineDataRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadMachineDataRequest.cs
new file mode 100644
index 000000000..bbb0e883b
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadMachineDataRequest.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.DTO;
+using Tango.Transport.Web;
+
+namespace Tango.PPC.Common.Web
+{
+ public class DownloadMachineDataRequest : WebRequestMessage
+ {
+ 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
new file mode 100644
index 000000000..e90c7c2ac
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadMachineDataResponse.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.DTO;
+using Tango.Transport.Web;
+
+namespace Tango.PPC.Common.Web
+{
+ public class DownloadMachineDataResponse : WebResponseMessage
+ {
+ 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/DownloadUpdateRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateRequest.cs
index a32d3d497..db4080dff 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateRequest.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateRequest.cs
@@ -9,6 +9,6 @@ namespace Tango.PPC.Common.Web
{
public class DownloadUpdateRequest : WebRequestMessage
{
- public String SerialNumber { get; set; }
+
}
}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateResponse.cs
index 3b09c1525..2fc7e4810 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateResponse.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateResponse.cs
@@ -10,10 +10,16 @@ namespace Tango.PPC.Common.Web
{
public class DownloadUpdateResponse : WebResponseMessage
{
+ public String NotifyCompletedToken { get; set; }
+
public String Version { get; set; }
+ public String FirmwareVersion { get; set; }
+
public String BlobAddress { get; set; }
+ public String CdnAddress { get; set; }
+
public DataSource DataSource { get; set; }
}
}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LatestVersionResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LatestVersionResponse.cs
index d2ed08f7d..eb5ef7f5a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LatestVersionResponse.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LatestVersionResponse.cs
@@ -11,5 +11,6 @@ namespace Tango.PPC.Common.Web
public class LatestVersionResponse : WebResponseMessage
{
public String Version { get; set; }
+ public String FirmwareVersion { get; set; }
}
}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LoginRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LoginRequest.cs
index f8588f6b0..9ae0d65ae 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LoginRequest.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LoginRequest.cs
@@ -11,6 +11,7 @@ namespace Tango.PPC.Common.Web
{
public LoginMode Mode { get; set; }
public String SerialNumber { get; set; }
+ public String MachineGuid { get; set; }
public String Email { get; set; }
public String Password { get; set; }
}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupRequest.cs
index 821828a48..a9e68df36 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupRequest.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupRequest.cs
@@ -9,7 +9,6 @@ namespace Tango.PPC.Common.Web
{
public class MachineSetupRequest : WebRequestMessage
{
- public String SerialNumber { get; set; }
public String DeviceID { get; set; }
public String DeviceName { get; set; }
}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupResponse.cs
index b5a4c425d..f5d03c6ce 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupResponse.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupResponse.cs
@@ -10,10 +10,16 @@ namespace Tango.PPC.Common.Web
{
public class MachineSetupResponse : WebResponseMessage
{
+ public String NotifyCompletedToken { get; set; }
+
public String Version { get; set; }
+ public String FirmwareVersion { get; set; }
+
public String BlobAddress { get; set; }
+ public String CdnAddress { get; set; }
+
public DataSource DataSource { get; set; }
public String OSKey { get; set; }
@@ -25,5 +31,6 @@ namespace Tango.PPC.Common.Web
public bool SetupFPGA { get; set; }
public bool IsDemo { get; set; }
public String DeviceComPort { get; set; }
+ public String Organization { get; set; }
}
}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineUpdateCompletedRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineUpdateCompletedRequest.cs
new file mode 100644
index 000000000..dffe1f15b
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineUpdateCompletedRequest.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Enumerations;
+using Tango.Transport.Web;
+
+namespace Tango.PPC.Common.Web
+{
+ public class MachineUpdateCompletedRequest : WebRequestMessage
+ {
+ public String Token { get; set; }
+ public TangoUpdateStatuses Status { get; set; }
+ public String FailedReason { get; set; }
+ public String FailedLog { get; set; }
+ public bool ReportsAboutDbCheckNoDifferences { get; set; }
+ }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineUpdateCompletedResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineUpdateCompletedResponse.cs
new file mode 100644
index 000000000..72517d108
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineUpdateCompletedResponse.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core;
+using Tango.Transport.Web;
+
+namespace Tango.PPC.Common.Web
+{
+ public class MachineUpdateCompletedResponse : WebResponseMessage
+ {
+
+ }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/NotifyMachineDataDownloadCompletedRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/NotifyMachineDataDownloadCompletedRequest.cs
new file mode 100644
index 000000000..fda7a4666
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/NotifyMachineDataDownloadCompletedRequest.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.DTO;
+using Tango.Transport.Web;
+
+namespace Tango.PPC.Common.Web
+{
+ public class NotifyMachineDataDownloadCompletedRequest : WebRequestMessage
+ {
+ 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/NotifyMachineDataDownloadCompletedResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/NotifyMachineDataDownloadCompletedResponse.cs
new file mode 100644
index 000000000..6d5769885
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/NotifyMachineDataDownloadCompletedResponse.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.DTO;
+using Tango.Transport.Web;
+
+namespace Tango.PPC.Common.Web
+{
+ public class NotifyMachineDataDownloadCompletedResponse : WebResponseMessage
+ {
+
+ }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClient.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClient.cs
index 52c9fdef3..318512fbb 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClient.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClient.cs
@@ -30,5 +30,10 @@ namespace Tango.PPC.Common.Web
public PPCWebClient(string address, string token) : base(address, token)
{
}
+
+ public PPCWebClient(PPCWebClient other, TimeSpan requestTimeout) : base(other)
+ {
+ RequestTimeout = requestTimeout;
+ }
}
}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClientBase.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClientBase.cs
index 2df343241..ff972acb2 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClientBase.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClientBase.cs
@@ -41,6 +41,15 @@ namespace Tango.PPC.Common.Web
}
/// <summary>
+ /// Initializes a new instance of the <see cref="PPCWebClientBase"/> class.
+ /// </summary>
+ /// <param name="cloned">Other instance.</param>
+ public PPCWebClientBase(PPCWebClientBase cloned) : base(cloned)
+ {
+
+ }
+
+ /// <summary>
/// Executes the MachineSetup action and returns Tango.PPC.Common.Web.MachineSetupResponse.
/// </summary>
/// <returns></returns>
@@ -59,6 +68,15 @@ namespace Tango.PPC.Common.Web
}
/// <summary>
+ /// Executes the NotifyUpdateCompleted action and returns Tango.PPC.Common.Web.MachineUpdateCompletedResponse.
+ /// </summary>
+ /// <returns></returns>
+ public Task<Tango.PPC.Common.Web.MachineUpdateCompletedResponse> NotifyUpdateCompleted(Tango.PPC.Common.Web.MachineUpdateCompletedRequest request)
+ {
+ return Post<Tango.PPC.Common.Web.MachineUpdateCompletedRequest, Tango.PPC.Common.Web.MachineUpdateCompletedResponse>("NotifyUpdateCompleted", request);
+ }
+
+ /// <summary>
/// Executes the CheckForUpdates action and returns Tango.PPC.Common.Web.CheckForUpdateResponse.
/// </summary>
/// <returns></returns>
@@ -77,6 +95,33 @@ namespace Tango.PPC.Common.Web
}
/// <summary>
+ /// Executes the UploadMachineData action and returns Tango.PPC.Common.Web.UploadMachineDataResponse.
+ /// </summary>
+ /// <returns></returns>
+ public Task<Tango.PPC.Common.Web.UploadMachineDataResponse> UploadMachineData(Tango.PPC.Common.Web.UploadMachineDataRequest request)
+ {
+ return Post<Tango.PPC.Common.Web.UploadMachineDataRequest, Tango.PPC.Common.Web.UploadMachineDataResponse>("UploadMachineData", request);
+ }
+
+ /// <summary>
+ /// Executes the DownloadMachineData action and returns Tango.PPC.Common.Web.DownloadMachineDataResponse.
+ /// </summary>
+ /// <returns></returns>
+ public Task<Tango.PPC.Common.Web.DownloadMachineDataResponse> DownloadMachineData(Tango.PPC.Common.Web.DownloadMachineDataRequest request)
+ {
+ return Post<Tango.PPC.Common.Web.DownloadMachineDataRequest, Tango.PPC.Common.Web.DownloadMachineDataResponse>("DownloadMachineData", request);
+ }
+
+ /// <summary>
+ /// Executes the NotifyMachineDataDownloadCompleted action and returns Tango.PPC.Common.Web.NotifyMachineDataDownloadCompletedResponse.
+ /// </summary>
+ /// <returns></returns>
+ public Task<Tango.PPC.Common.Web.NotifyMachineDataDownloadCompletedResponse> NotifyMachineDataDownloadCompleted(Tango.PPC.Common.Web.NotifyMachineDataDownloadCompletedRequest request)
+ {
+ return Post<Tango.PPC.Common.Web.NotifyMachineDataDownloadCompletedRequest, Tango.PPC.Common.Web.NotifyMachineDataDownloadCompletedResponse>("NotifyMachineDataDownloadCompleted", request);
+ }
+
+ /// <summary>
/// Executes the GetLatestVersion action and returns Tango.PPC.Common.Web.LatestVersionResponse.
/// </summary>
/// <returns></returns>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/SynchronizationFailedEntity.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/SynchronizationFailedEntity.cs
new file mode 100644
index 000000000..c50044cbe
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/SynchronizationFailedEntity.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.PPC.Common.Web
+{
+ public class SynchronizationFailedEntity
+ {
+ public String Guid { get; set; }
+ public String Reason { get; set; }
+ }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs
index f3b4ccb34..4d8433a56 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs
@@ -9,6 +9,7 @@ namespace Tango.PPC.Common.Web
{
public class UpdateDBRequest : WebRequestMessage
{
- public String SerialNumber { get; set; }
+ public String ApplicationVersion { get; set; }
+ public String FirmwareVersion { get; set; }
}
}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBResponse.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBResponse.cs
index be7c0d076..179cb7934 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBResponse.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBResponse.cs
@@ -10,6 +10,7 @@ namespace Tango.PPC.Common.Web
{
public class UpdateDBResponse : WebResponseMessage
{
+ public String NotifyCompletedToken { get; set; }
public DataSource DataSource { get; set; }
public bool PerformSchemaUpdate { get; set; }
}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdatedEntity.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdatedEntity.cs
new file mode 100644
index 000000000..faee20678
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdatedEntity.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL;
+
+namespace Tango.PPC.Common.Web
+{
+ public class UpdatedEntity
+ {
+ public UpdatedEntity()
+ {
+
+ }
+
+ public UpdatedEntity(IObservableEntity entity) : this()
+ {
+ Guid = entity.Guid;
+ LastUpdated = entity.LastUpdated;
+ }
+
+ public String Guid { get; set; }
+ public DateTime LastUpdated { get; set; }
+
+ public override string ToString()
+ {
+ return $"{Guid} | {LastUpdated}";
+ }
+ }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadMachineDataRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadMachineDataRequest.cs
new file mode 100644
index 000000000..8eee667cd
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadMachineDataRequest.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.DTO;
+using Tango.Transport.Web;
+
+namespace Tango.PPC.Common.Web
+{
+ public class UploadMachineDataRequest : WebRequestMessage
+ {
+ public List<JobDTO> Jobs { get; set; }
+ 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; }
+
+ public UploadMachineDataRequest()
+ {
+ Jobs = new List<JobDTO>();
+ 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
new file mode 100644
index 000000000..ba0b4089b
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadMachineDataResponse.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.DTO;
+using Tango.Transport.Web;
+
+namespace Tango.PPC.Common.Web
+{
+ public class UploadMachineDataResponse : WebResponseMessage
+ {
+ public List<SynchronizationFailedEntity> FailedJobs { get; set; }
+ 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()
+ {
+ FailedJobs = new List<SynchronizationFailedEntity>();
+ FailedJobRuns = new List<SynchronizationFailedEntity>();
+ FailedMachineEvents = new List<SynchronizationFailedEntity>();
+ FailedOfflineUpdates = new List<SynchronizationFailedEntity>();
+ FailedDataStoreItems = new List<SynchronizationFailedEntity>();
+ }
+ }
+}