1 files changed, 44 insertions, 16 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 1bd790eb6..bd08e3e7c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -298,7 +298,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                 {
                     Task.Factory.StartNew(() =>
                     {
-                        ActiveMachineAdapter.Dispensers = ActiveMachineAdapter.Context.Dispensers.Where(x => x.SerialNumber.ToLower().StartsWith(DispensersFilter.ToLower())).ToSynchronizedObservableCollection();
+                        ActiveMachineAdapter.Dispensers = ActiveMachineAdapter.Context.Dispensers.Where(x => x.SerialNumber.ToLower().StartsWith(DispensersFilter.ToLower())).OrderBy(x => x.SerialNumber).ToSynchronizedObservableCollection();
                     });
                 });
             }
@@ -545,32 +545,60 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     {
                         for (int i = 0; i < 8; i++)
                         {
-                            Dispenser dispenser = new Dispenser();
-                            dispenser.SerialNumber = machineCreationDialogVM.SerialNumber + "-" + (i + 1);
+                            var serial = machineCreationDialogVM.SerialNumber + "-" + (i + 1);
+
+                            var existingDispenser = await ActiveMachineAdapter.Context.Dispensers.Include(x => x.IdsPacks).SingleAsync(x => x.SerialNumber == serial);
 
-                            if (newMachine)
+                            if (existingDispenser != null)
                             {
-                                dispenser.NlPerPulse = machineCreationDialogVM.DispenserFactor;
-                                dispenser.DispenserTypeGuid = ActiveMachineAdapter.DispenserTypes.First().Guid;
+                                if (existingDispenser.IsInstalled)
+                                {
+                                    _notification.ShowError($"Dispenser '{serial}' already exists. Cannot create machine.");
+                                    return;
+                                }
+                                else
+                                {
+                                    if (!_notification.ShowErrorQuestion($"Dispenser '{serial}' already exists and is not installed. Do you wish to assign the existing dispenser to this machine?"))
+                                    {
+                                        return;
+                                    }
+                                }
                             }
-                            else
+
+                            Dispenser dispenser = new Dispenser();
+
+                            if (existingDispenser == null)
                             {
-                                var packBefore = machineConfigBeforeClone.NoneEmptyIdsPacks.SingleOrDefault(x => x.PackIndex == i);
+                                dispenser.SerialNumber = serial;
 
-                                if (packBefore != null)
+                                if (newMachine)
                                 {
-                                    dispenser.NlPerPulse = packBefore.Dispenser.NlPerPulse;
-                                    dispenser.DispenserTypeGuid = packBefore.Dispenser.DispenserType.Guid;
+                                    dispenser.NlPerPulse = machineCreationDialogVM.DispenserFactor;
+                                    dispenser.DispenserTypeGuid = ActiveMachineAdapter.DispenserTypes.First().Guid;
                                 }
                                 else
                                 {
-                                    continue;
+                                    var packBefore = machineConfigBeforeClone.NoneEmptyIdsPacks.SingleOrDefault(x => x.PackIndex == i);
+
+                                    if (packBefore != null)
+                                    {
+                                        dispenser.NlPerPulse = packBefore.Dispenser.NlPerPulse;
+                                        dispenser.DispenserTypeGuid = packBefore.Dispenser.DispenserType.Guid;
+                                    }
+                                    else
+                                    {
+                                        continue;
+                                    }
                                 }
-                            }
 
-                            dispenser.ProductionDate = DateTime.UtcNow;
+                                dispenser.ProductionDate = DateTime.UtcNow;
 
-                            ActiveMachineAdapter.Context.Dispensers.Add(dispenser);
+                                ActiveMachineAdapter.Context.Dispensers.Add(dispenser);
+                            }
+                            else
+                            {
+                                dispenser = existingDispenser;
+                            }
 
                             var idsPack = ActiveMachine.Configuration.NoneEmptyIdsPacks.SingleOrDefault(x => x.PackIndex == i);
 
@@ -950,7 +978,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                         try
                         {
                             IsFree = false;
-                            MachinesAdapter.Machines = MachinesAdapter.Context.Machines.Where(x => x.SerialNumber.StartsWith(Filter)).Include(x => x.Organization).Include(x => x.MachineVersion).ToSynchronizedObservableCollection();
+                            MachinesAdapter.Machines = MachinesAdapter.Context.Machines.Where(x => x.SerialNumber.StartsWith(Filter)).Include(x => x.Organization).Include(x => x.MachineVersion).OrderBy(x => x.SerialNumber).ToSynchronizedObservableCollection();
                         }
                         catch
                         {