Changeset 15992 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive

Timestamp:

07/10/18 23:06:00 (6 years ago)

Author:

jzenisek

Message:

#2839: fixed couple of minor issues

• changed tags in resource selector
• added project information in job list and adapted sortation
• fixed hand-down save by withdrawing additional offset-rights (permissions, resources),...

File:

• branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (7 diffs)

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -151 +151 @@
         });
 
-        UpdateResourceGenealogy();
-        UpdateProjectGenealogy();
-        UpdateDisabledParentProjects();
+        RefreshResourceGenealogy();
+        RefreshProjectGenealogy();
+        RefreshDisabledParentProjects();
       }
       catch {
@@ -186 +186 @@
         });
 
-        UpdateResourceGenealogy();
-        UpdateProjectGenealogy();
-        UpdateDisabledParentProjects();
+        RefreshResourceGenealogy();
+        RefreshProjectGenealogy();
+        RefreshDisabledParentProjects();
       } catch {
         projects = null;
@@ -214 +214 @@
     }
 
-    private void UpdateResourceGenealogy() {
+    private void RefreshResourceGenealogy() {
       resourceAncestors.Clear();
       resourceDescendants.Clear();
@@ -234 +234 @@
     }
 
-    private void UpdateProjectGenealogy() {
+    private void RefreshProjectGenealogy() {
       projectAncestors.Clear();
       projectDescendants.Clear();
@@ -254 +254 @@
     }
 
-    private void UpdateDisabledParentProjects() {
+    private void RefreshDisabledParentProjects() {
       disabledParentProjects = new HashSet<Project>();
 
@@ -414 +414 @@
 
     public static void UpdateJob(Action<Exception> exceptionCallback, RefreshableJob refreshableJob, CancellationToken cancellationToken) {
-      HiveServiceLocator.Instance.CallHiveService(service => {
-        HiveClient.StoreAsync(
-          new Action<Exception>((Exception ex) => {
-            //refreshableJob.ExecutionState = ExecutionState.Prepared;
-            exceptionCallback(ex);
-          }), refreshableJob.Job, cancellationToken);
-      });
-    }
+      refreshableJob.IsProgressing = true;
+      refreshableJob.Progress.Status = "Saving Job...";
+      HiveClient.StoreAsync(
+        new Action<Exception>((Exception ex) => {
+          exceptionCallback(ex);
+        }), refreshableJob.Job, cancellationToken);
+      refreshableJob.IsProgressing = false;
+      refreshableJob.Progress.Finish();
+    }
+
+    public static void UpdateJob(RefreshableJob refreshableJob) {
+      refreshableJob.IsProgressing = true;
+
+      try {
+        refreshableJob.Progress.Start("Saving Job...");
+        HiveClient.StoreAsync(new Action<Exception>((Exception ex) => {
+          throw new Exception("Update failed.", ex);
+        }), refreshableJob.Job, new CancellationToken());
+      } finally {
+        refreshableJob.IsProgressing = false;
+        refreshableJob.Progress.Finish();
+      }
+    }
+
+
 
     #region Upload Job
@@ -687 +704 @@
       });
     }
+
+    public string GetProjectAncestry(Guid projectId) {
+      if (projectId == null || projectId == Guid.Empty) return "";
+      var projects = projectAncestors[projectId].Reverse().ToList();
+      projects.Add(projectId);
+      return string.Join(" » ", projects.Select(x => ProjectNames[x]).ToArray());
+    }
   }
 }