From 9695aef4cf1ac2d85d6905e73c4f4aa079cc7c1d Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 16 Jan 2018 18:23:59 +0200 Subject: Removed Dispensers & Cartridges! Only Dispenser Type & CartridgeType now. --- .../Tango.Synchronization/Remote/RemoteDBComparer.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'Software/Visual_Studio/Tango.Synchronization/Remote') diff --git a/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs b/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs index 3d9667676..0b4731ddf 100644 --- a/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs +++ b/Software/Visual_Studio/Tango.Synchronization/Remote/RemoteDBComparer.cs @@ -56,8 +56,6 @@ namespace Tango.Synchronization.Remote var local_ids_packs = _localDB.IDS_PACKS.ToList(); LogManager.Log("Querying all local contacts..."); var local_contacts = _localDB.CONTACTS.ToList(); - LogManager.Log("Querying all local dispensers..."); - var local_dispensers = _localDB.DISPENSERS.ToList(); LogManager.Log("Querying all local machines..."); var local_machines = _localDB.MACHINES.Where(x => x.SERIAL_NUMBER == _machineSerial).ToList(); LogManager.Log("Querying all local machines configurations..."); @@ -115,13 +113,13 @@ namespace Tango.Synchronization.Remote remote_contacts.AddRange(remote_machines.Select(x => x.ORGANIZATION).Select(x => x.CONTACT)); remote_contacts = remote_contacts.Distinct().ToList(); - LogManager.Log("Querying all remote configurations dispensers..."); + LogManager.Log("Querying all remote IDS Packs..."); guids = remote_configurations.Select(x => x.GUID).ToList(); var remote_ids_packs = _remoteDB.IDS_PACKS.Where(x => guids.Contains(x.CONFIGURATION_GUID)).ToList(); - LogManager.Log("Querying all remote dispensers..."); - guids = remote_ids_packs.Select(x => x.DISPENSER_GUID).ToList(); - var remote_dispensers = _remoteDB.DISPENSERS.Where(x => guids.Contains(x.GUID)).ToList(); + LogManager.Log("Querying all remote dispenser types..."); + guids = remote_ids_packs.Select(x => x.DISPENSER_TYPE_GUID).ToList(); + var remote_dispensers_types = _remoteDB.DISPENSER_TYPES.Where(x => guids.Contains(x.GUID)).ToList(); LogManager.Log("Querying all remote cartridge types..."); guids = remote_ids_packs.Select(x => x.CARTRIDGE_TYPE_GUID).ToList(); @@ -150,9 +148,6 @@ namespace Tango.Synchronization.Remote LogManager.Log("Comparing contacts"); CompareCollections(remote_contacts, local_contacts, _remoteDB.CONTACTS, _localDB.CONTACTS); - LogManager.Log("Comparing dispensers"); - CompareCollections(remote_dispensers, local_dispensers, _remoteDB.DISPENSERS, _localDB.DISPENSERS); - LogManager.Log("Comparing machines"); CompareCollections(remote_machines, local_machines, _remoteDB.MACHINES, _localDB.MACHINES); -- cgit v1.3.1