Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 14 insertions, 5 deletions

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index fbc4f8a0a..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;
@@ -186,6 +186,15 @@ namespace Tango.MachineService.Controllers
                             LogManager.Log(ex, $"Error resetting synchronized job runs for machine '{machine.SerialNumber}'.");
                         }
 
+                        try
+                        {
+                            b.DataStoreItems.Where(x => x.MachineGuid == machine.Guid).Update(x => new DataStoreItem() { IsSynchronized = false });
+                        }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, $"Error resetting synchronized data store items for machine '{machine.SerialNumber}'.");
+                        }
+
                         //Reset Events.
                         //b.MachinesEvents.Where(x => x.MachineGuid == machine.Guid).Update(x => new MachinesEvent() { IsSynchronized = false });
                         //Reset Jobs.
@@ -218,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;
@@ -337,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;
                     }
@@ -755,7 +764,7 @@ namespace Tango.MachineService.Controllers
                 //Send DataStore Items
                 if (request.RequestDataStoreItems)
                 {
-                    var dataStoreItems = db.DataStoreItems.Where(x => x.MachineGuid == machine.Guid && !x.IsSynchronized).Take(request.MaxDataStoreItems).OrderByDescending(x => x.LastUpdated).ToList();
+                    var dataStoreItems = db.DataStoreItems.Where(x => x.MachineGuid == machine.Guid && !x.IsSynchronized & !x.IsDeleted).Take(request.MaxDataStoreItems).OrderByDescending(x => x.LastUpdated).ToList();
 
                     foreach (var item in dataStoreItems)
                     {