Working on data store view.

1 files changed, 10 insertions, 1 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..0e96c14c8 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -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.
@@ -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)
                     {