Merge branches 'develop' and 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

Step.Model/DTOModels/DTONcGenericDataModel.cs

@@ -10,6 +10,7 @@ namespace Step.Model.DTOModels
     public class DTONcGenericDataModel
     {
         public CultureInfo Language { get; set; }
+        public string Name { get; set; }
         public string SerialNumber { get; set; }
         public string SoftwareVersion { get; set; }
         public string Model { get; set; }

Step.NC/NcHandler.cs

@@ -109,6 +109,8 @@ namespace Step.NC
 
             genericData.ProcessNumber = procNum;
 
+            genericData.Name = MachineConfig.Name;
+            
             return cmsError;
         }
 

Step/Controllers/SignalR/NcHub.cs

@@ -7,34 +7,34 @@ using Microsoft.AspNet.SignalR;
 
 namespace Step.Controllers.SignalR
 {
-  public class NcHub : Hub
-  {
-    public static List<string> ConnectedClients = new List<string>();
-    public static bool NewConnectedClients = false;
-
-    public override Task OnConnected()
+    public class NcHub : Hub
     {
-      Groups.Add(Context.ConnectionId, "ncData");
-      NewConnectedClients = true;
-      ConnectedClients.Add(Context.ConnectionId);
+        public static List<string> ConnectedClients = new List<string>();
+        public static bool NewConnectedClients = false;
 
-      return base.OnConnected();
+        public override Task OnConnected()
+        {
+            Groups.Add(Context.ConnectionId, "ncData");
+            NewConnectedClients = true;
+            ConnectedClients.Add(Context.ConnectionId);
+
+            return base.OnConnected();
+        }
+
+        public override Task OnReconnected()
+        {
+            Groups.Add(Context.ConnectionId, "ncData");
+            NewConnectedClients = true;
+            ConnectedClients.Add(Context.ConnectionId);
+            return base.OnReconnected();
+        }
+
+        public override Task OnDisconnected(bool stopCalled)
+        {
+            Groups.Remove(Context.ConnectionId, "ncData");
+            ConnectedClients.Remove(Context.ConnectionId);
+
+            return base.OnDisconnected(stopCalled);
+        }
     }
-
-    public override Task OnReconnected()
-    {
-      Groups.Add(Context.ConnectionId, "ncData");
-      NewConnectedClients = true;
-      ConnectedClients.Add(Context.ConnectionId);
-      return base.OnReconnected();
-    }
-
-    public override Task OnDisconnected(bool stopCalled)
-    {
-      Groups.Remove(Context.ConnectionId, "ncData");
-      ConnectedClients.Remove(Context.ConnectionId);
-
-      return base.OnDisconnected(stopCalled);
-    }
-  }
 }