Added DISABLED for TANGO_VERSIONS.

Added ACTIVATION_KEY for MACHINE.
Added activation key generation for ms designer.

1 files changed, 4 insertions, 4 deletions

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index 0e96c14c8..161caaf23 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -105,7 +105,7 @@ namespace Tango.MachineService.Controllers
 
                 var machine_version = db.MachineVersions.SingleOrDefault(x => x.Guid == machine.MachineVersionGuid);
 
-                var latest_machine_version = db.TangoVersions.Where(x => x.MachineVersionGuid == machine_version.Guid).ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
+                var latest_machine_version = db.TangoVersions.Where(x => x.MachineVersionGuid == machine_version.Guid && !x.Disabled).ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
 
                 response.Version = latest_machine_version.Version;
                 response.FirmwareVersion = latest_machine_version.FirmwareVersion;
@@ -227,7 +227,7 @@ namespace Tango.MachineService.Controllers
 
                 var machine_version = db.MachineVersions.SingleOrDefault(x => x.Guid == machine.MachineVersionGuid);
 
-                var latest_machine_version = db.TangoVersions.Where(x => x.MachineVersionGuid == machine_version.Guid).ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
+                var latest_machine_version = db.TangoVersions.Where(x => x.MachineVersionGuid == machine_version.Guid && !x.Disabled).ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
 
                 response.Version = latest_machine_version.Version;
                 response.FirmwareVersion = latest_machine_version.FirmwareVersion;
@@ -346,9 +346,9 @@ namespace Tango.MachineService.Controllers
                 {
                     var machine_version = db.MachineVersions.SingleOrDefault(x => x.Guid == machine.MachineVersionGuid);
 
-                    var latest_machine_version = db.TangoVersions.Where(x => x.MachineVersionGuid == machine_version.Guid).ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
+                    var latest_machine_version = db.TangoVersions.Where(x => x.MachineVersionGuid == machine_version.Guid && !x.Disabled).ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
 
-                    if (Version.Parse(latest_machine_version.Version) != Version.Parse(request.Version))
+                    if (Version.Parse(latest_machine_version.Version) > Version.Parse(request.Version))
                     {
                         response.IsUpdateAvailable = true;
                     }