Changeset 5638 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/Administration/HiveAdministrationView.cs

Timestamp:

03/08/11 17:58:42 (13 years ago)

Author:

ascheibe

Message:

#1233 worked on Administration UI

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/Administration/HiveAdministrationView.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Views/3.4/Administration/HiveAdministrationView.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Windows.Forms;
 using HeuristicLab.Clients.Hive.Administration;
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -50 +50 @@
     #endregion
 
+    private void UpdateResources() {
+      IItemList<Resource> resources = new ItemList<Resource>();
+
+      foreach (SlaveGroup g in Content.SlaveGroups) {
+        resources.Add(g);
+      }
+      foreach (Slave g in Content.Slaves) {
+        resources.Add(g);
+      }
+      resourcesView.Content = resources;
+    }
 
     protected override void OnContentChanged() {
       base.OnContentChanged();
       if (Content == null) {
-        // TODO: Put code here when content is null
+        resourcesView.Content = null;
+
       } else {
-        updateSlaveGroups.UpdateAction = new Action(Content.UpdateSlaveGroups);
-        treeSlaveGroup.ImageList.Images.Add(HiveImageLibrary.Slave);
-        treeSlaveGroup.ImageList.Images.Add(HiveImageLibrary.SlaveGroup);
-
-        foreach (SlaveGroup g in Content.SlaveGroups) {
-          TreeNode tn = new TreeNode();
-          tn.ImageIndex = treeSlaveGroup.ImageList.Images.Count - 1;
-          tn.SelectedImageIndex = tn.ImageIndex;
-
-          tn.Tag = g;
-          tn.Text = g.Name;
-          foreach (Slave s in Content.Slaves.FindAll(s => s.ParentResourceId != null && s.ParentResourceId == g.Id)) {
-            var stn = new TreeNode(s.Name);
-            stn.ImageIndex = 0;
-            stn.SelectedImageIndex = stn.ImageIndex;
-            stn.Tag = s;
-            tn.Nodes.Add(stn);
-          }
-          treeSlaveGroup.Nodes.Add(tn);
-        }
-
-        TreeNode ungrp = new TreeNode("UNGROUPED");
-        ungrp.ImageIndex = treeSlaveGroup.ImageList.Images.Count - 1;
-        ungrp.SelectedImageIndex = ungrp.ImageIndex;
-        var newGroup = new SlaveGroup();
-        newGroup.Name = "UNGROUPED";
-        newGroup.Id = Guid.NewGuid();
-        newGroup.Description = "Contains slaves which are in no group";
-        ungrp.Tag = newGroup;
-
-        foreach (Slave s in Content.Slaves.FindAll(s => s.ParentResourceId == null)) {
-          var stn = new TreeNode(s.Name);
-          stn.ImageIndex = 0;
-          stn.SelectedImageIndex = stn.ImageIndex;
-          stn.Tag = s;
-          ungrp.Nodes.Add(stn);
-        }
-        treeSlaveGroup.Nodes.Add(ungrp);
+        //updateSlaveGroups.UpdateAction = new Action(Content.UpdateSlaveGroups);  //??
+        UpdateResources();
 
         ShowUsers();
@@ -122 +98 @@
     }
 
-    private void treeSlaveGroup_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e) {
-      if (e.Node != null) {
-        if (e.Node.Tag.GetType() == typeof(Slave)) {
-          Slave s = e.Node.Tag as Slave;
-          txtName.Text = s.Name;
-          txtDetailsDescription.Text = s.Description;
-          txtCPU.Text = s.CpuArchitecture + ", " + s.Cores + " Cores @ " + s.CpuSpeed.ToString();
-          txtMemory.Text = s.Memory.ToString();
-          txtDetailsCalculatedJobs.Clear();
-          txtOS.Text = s.OperatingSystem;
-          txtSlaveState.Text = s.SlaveState.ToString();
-        } else if (e.Node.Tag.GetType() == typeof(SlaveGroup)) {
-          SlaveGroup s = e.Node.Tag as SlaveGroup;
-          txtName.Text = s.Name;
-          txtDetailsDescription.Text = s.Description;
-          txtCPU.Clear();
-          txtMemory.Clear();
-          txtDetailsCalculatedJobs.Clear();
-          txtOS.Clear();
-          txtSlaveState.Clear();
-        }
-      }
-    }
-
-
     #region Event Handlers
     // TODO: Put event handlers here