diff options
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/Web')
22 files changed, 4 insertions, 329 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 8e13ea7c4..b98848e4f 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs @@ -9,21 +9,7 @@ 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 2fb33ebdc..370c0f5ea 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateResponse.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateResponse.cs @@ -10,18 +10,8 @@ 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 deleted file mode 100644 index bbb0e883b..000000000 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadMachineDataRequest.cs +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index e90c7c2ac..000000000 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadMachineDataResponse.cs +++ /dev/null @@ -1,27 +0,0 @@ -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 db4080dff..a32d3d497 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 2fc7e4810..3b09c1525 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateResponse.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateResponse.cs @@ -10,16 +10,10 @@ 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 eb5ef7f5a..d2ed08f7d 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LatestVersionResponse.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LatestVersionResponse.cs @@ -11,6 +11,5 @@ 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 9ae0d65ae..f8588f6b0 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LoginRequest.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LoginRequest.cs @@ -11,7 +11,6 @@ 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 a9e68df36..821828a48 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupRequest.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupRequest.cs @@ -9,6 +9,7 @@ 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 f5d03c6ce..b5a4c425d 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupResponse.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupResponse.cs @@ -10,16 +10,10 @@ 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; } @@ -31,6 +25,5 @@ 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 deleted file mode 100644 index dffe1f15b..000000000 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineUpdateCompletedRequest.cs +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 72517d108..000000000 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineUpdateCompletedResponse.cs +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index fda7a4666..000000000 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/NotifyMachineDataDownloadCompletedRequest.cs +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 6d5769885..000000000 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/NotifyMachineDataDownloadCompletedResponse.cs +++ /dev/null @@ -1,16 +0,0 @@ -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 318512fbb..52c9fdef3 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClient.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClient.cs @@ -30,10 +30,5 @@ 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 ff972acb2..2df343241 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClientBase.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/PPCWebClientBase.cs @@ -41,15 +41,6 @@ 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> @@ -68,15 +59,6 @@ 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> @@ -95,33 +77,6 @@ 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 deleted file mode 100644 index c50044cbe..000000000 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/SynchronizationFailedEntity.cs +++ /dev/null @@ -1,14 +0,0 @@ -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 4d8433a56..f3b4ccb34 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs @@ -9,7 +9,6 @@ namespace Tango.PPC.Common.Web { public class UpdateDBRequest : WebRequestMessage { - public String ApplicationVersion { get; set; } - public String FirmwareVersion { get; set; } + public String SerialNumber { 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 179cb7934..be7c0d076 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBResponse.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBResponse.cs @@ -10,7 +10,6 @@ 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 deleted file mode 100644 index faee20678..000000000 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdatedEntity.cs +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 8eee667cd..000000000 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadMachineDataRequest.cs +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index ba0b4089b..000000000 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UploadMachineDataResponse.cs +++ /dev/null @@ -1,31 +0,0 @@ -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>(); - } - } -} |