Changeset 13735 for branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Hubs

Timestamp:

03/25/16 12:47:31 (9 years ago)

Author:

jlodewyc

Message:

#2582 finish Job manager functionality. Start overhaul client connections (login, hiveclient and fileopening)

Location:

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Hubs

Files:

• JobUpdaterHub.cs (modified) (3 diffs)
• ProgressHub.cs (modified) (3 diffs)

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Hubs/JobUpdaterHub.cs

@@ -39 +39 @@
                 looperTasks(t);//starts recursive loop
             }
-            Clients.All.requestDone();//Final note from server when all tasks are checked.
+            Clients.Caller.requestDone();//Final note from server when all tasks are checked.
             //Client starts countdown and resends the updateAll when done
             GC.Collect();
@@ -47 +47 @@
         public void updateJob()
         {
-            Clients.All.processJobData(Job.Job.CalculatingCount, Job.Job.FinishedCount);
+            Clients.Caller.processJobData(Job.Job.CalculatingCount, Job.Job.FinishedCount);
         }
         /// <summary>
@@ -78 +78 @@
                     //limits loaded data 
                     var json = JsonConvert.SerializeObject(task.Task, settings);
-                    Clients.All.processData(task.Task.Id, json, task.ItemTask.Name.ToString());
+                    Clients.Caller.processData(task.Task.Id, json, task.ItemTask.Name.ToString());
                     //data sent to user
                 }

branches/WebJobManager/HeuristicLab.Clients.Hive.WebJobManager/Hubs/ProgressHub.cs

@@ -23 +23 @@
         {
 
-            Clients.All.processMessage("Connection Established");
+            Clients.Caller.processMessage("Connection Established");
             Job = FileOpeningService.Instance.Job;
             Job.Progress.StatusChanged += runHub;
@@ -31 +31 @@
         /// </summary>
         /// <param name="name">Job name</param>
-        public void ChangeName(string name)
+        public void ChangeNameResource(string name, string resource)
         {
             if (name != null)
                 FileOpeningService.Instance.Job.Job.Name = name;
+            if(resource != null && resource != "")
+            {
+                FileOpeningService.Instance.Job.Job.ResourceNames += "/" + resource;
+            }
         }
         /// <summary>
@@ -153 +157 @@
             }
             //send info to client
-            Clients.All.processMessage(Job.Progress.Status, value);
+            Clients.Caller.processMessage(Job.Progress.Status, value);
 
         }