Changeset 1723

Timestamp:

04/30/09 14:44:00 (16 years ago)

Author:

aleitner

Message:

update process with jobs and users are now with correct pictures and problems with update fixed (#600)

Location:

trunk/sources/HeuristicLab.Hive.Server.Console/3.2

Files:

• HiveServerConsole.cs (modified) (1 diff)
• HiveServerManagementConsole.cs (modified) (7 diffs)
• ServiceLocator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerConsole.cs

@@ -117 +117 @@
       if (cf) {
         this.Visible = true;
+        ServiceLocator.ShutDownFacade();
         if (error == true) {
           lblError.Text = "Something went wrong with the server";

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/HiveServerManagementConsole.cs

@@ -57 +57 @@
     private Job currentJob = null;
     private ClientInfo currentClient = null;
+    TreeNode currentNode = null;
 
     //TODO delete
@@ -62 +63 @@
     private string nameCurrentClient = "";
     private bool flagJob = false;
-    private bool flagClient = false;
 
     private List<Changes> changes = new List<Changes>();
@@ -248 +248 @@
       }
 
+      if (currentNode != null) {
+        lvClientControl.Items.Clear();
+        lvClientControl.Groups.Clear();
+        AddGroupsToListView(currentNode);
+      }
       tvClientControl.ExpandAll();
     }
@@ -263 +268 @@
       foreach (Resource resource in clientGroup.Resources) {
         if (resource is ClientInfo) {
-          ListViewItem lvi = new ListViewItem(resource.Name, 0, lvg);
+          int percentageUsage = CapacityRam(((ClientInfo)resource).NrOfCores, ((ClientInfo)resource).NrOfFreeCores);
+          int usage = 3;
+          if ((((ClientInfo)resource).State != State.offline) &&
+            (((ClientInfo)resource).State != State.nullState)) {
+            if ((percentageUsage >= 0) && (percentageUsage <= 25)) {
+              usage = 0;
+            } else if ((percentageUsage > 25) && (percentageUsage <= 75)) {
+              usage = 1;
+            } else if ((percentageUsage > 75) && (percentageUsage <= 100)) {
+              usage = 2;
+            }
+          }
+          ListViewItem lvi = new ListViewItem(resource.Name, usage, lvg);
           lvi.Tag = resource as ClientInfo;
           clientGroupList.Add(lvi);
@@ -457 +474 @@
               JobClicked();
             }
+            foreach (Job job in jobs.List) {
+              if (job.Id == change.ID) {
+                lvJobControl.Items[i].Tag = job;
+                break;
+              }
+            }
             State state = jobs.List[change.Position].State;
             System.Diagnostics.Debug.WriteLine(lvJobControl.Items[i].Text.ToString());
@@ -579 +602 @@
     private void OnLVClientClicked(object sender, EventArgs e) {
       nameCurrentClient = lvClientControl.SelectedItems[0].Tag.ToString();
-      flagClient = true;
       ClientClicked();
     }
@@ -864 +886 @@
       lvClientControl.Items.Clear();
       lvClientControl.Groups.Clear();
+      currentNode = e.Node;
       AddGroupsToListView(e.Node);
     }

trunk/sources/HeuristicLab.Hive.Server.Console/3.2/ServiceLocator.cs

@@ -40 +40 @@
       return serverConsoleFacade;
     }
+
+    internal static void ShutDownFacade() {
+      serverConsoleFacade = null;
+    }
   }
 }