Implemented team viewer join group.

Prevent multiple power up dialogs from showing.
Implement auto available dispenser assignment for machine creation.
Sorting for machines and dispensers in Machine designer.
Implemented new PPC factory reset with team viewer and device name change.
Fixed "Exit To Shell" to open real explorer.
Redesigned restarting system view.
Updated power off animation.
Updated loading animation.

1 files changed, 2 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 1bb025217..6ac2e3657 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -71,7 +71,7 @@ namespace Tango.MachineService.Controllers
             {
                 String machine_guid = RequestToken.Object.MachineGuid;
 
-                var machine = db.Machines.SingleOrDefault(x => x.Guid == machine_guid);
+                var machine = db.Machines.Include(x => x.Organization).SingleOrDefault(x => x.Guid == machine_guid);
 
                 if (machine == null)
                 {
@@ -151,6 +151,7 @@ namespace Tango.MachineService.Controllers
                 response.SetupUWF = machine.SetupUwf;
                 response.SetupFirmware = machine.SetupFirmware;
                 response.IsDemo = machine.IsDemo;
+                response.Organization = machine.Organization.Name;
 
                 TangoUpdate tangoUpdate = new TangoUpdate();
                 tangoUpdate.ApplicationVersion = latest_machine_version.Version;