Changeset 6451 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/ResourcesView.cs

Timestamp:

06/20/11 14:06:33 (13 years ago)

Author:

ascheibe

Message:

#1233
Admin UI:

• added subgroups
• groups can now have calendars
• calendar bugfixes

File:

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

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

@@ -79 +79 @@
         foreach (Resource g in Content) {
           if (g.GetType() == typeof(SlaveGroup)) {
-            TreeNode tn = new TreeNode();
-            tn.ImageIndex = treeSlaveGroup.ImageList.Images.Count - 1;
-            tn.SelectedImageIndex = tn.ImageIndex;
-
-            tn.Tag = g;
-            tn.Text = g.Name;
-            foreach (Resource r in Content.Where(s => s.ParentResourceId != null && s.ParentResourceId == g.Id)) {
-              var stn = new TreeNode(r.Name);
-              stn.ImageIndex = 0;
-              stn.SelectedImageIndex = stn.ImageIndex;
-              stn.Tag = r;
-              tn.Nodes.Add(stn);
-            }
-            treeSlaveGroup.Nodes.Add(tn);
-
+            //root node
+            if (g.ParentResourceId == null) {
+              TreeNode tn = new TreeNode();
+              tn.ImageIndex = treeSlaveGroup.ImageList.Images.Count - 1;
+              tn.SelectedImageIndex = tn.ImageIndex;
+
+              tn.Tag = g;
+              tn.Text = g.Name;
+
+              BuildSlaveGroupTree(g, tn);
+              treeSlaveGroup.Nodes.Add(tn);
+            }
           } else if (g.GetType() == typeof(Slave)) {
             if (g.ParentResourceId == null) {
@@ -108 +105 @@
     }
 
+    private void BuildSlaveGroupTree(Resource g, TreeNode tn) {
+      foreach (Resource r in Content.Where(s => s.ParentResourceId != null && s.ParentResourceId == g.Id)) {
+        TreeNode stn = new TreeNode(r.Name);
+        if (r is Slave) {
+          stn.ImageIndex = 0;
+        } else if (r is SlaveGroup) {
+          stn.ImageIndex = treeSlaveGroup.ImageList.Images.Count - 1;
+        }
+        stn.SelectedImageIndex = stn.ImageIndex;
+        stn.Tag = r;
+        tn.Nodes.Add(stn);
+
+        BuildSlaveGroupTree(r, stn);
+      }
+    }
+
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
@@ -119 +132 @@
 
       slaveView.Content = (Resource)e.Node.Tag;
-
-      if (e.Node.Tag.GetType() == typeof(Slave)) {
-        scheduleView.ResourceId = ((Slave)e.Node.Tag).Id;
-        if (tabSlaveGroup.SelectedIndex == 1) {
-          UpdateSchedule();
-        }
-      } else if (e.Node.Tag is SlaveGroup) {
+      scheduleView.ResourceId = ((Resource)e.Node.Tag).Id;
+
+      if (e.Node.Tag is SlaveGroup) {
         slaveView.Content.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(SlaveViewContent_PropertyChanged);
+      }
+
+      if (tabSlaveGroup.SelectedIndex == 1) {
+        UpdateSchedule();
       }
     }
@@ -194 +207 @@
           if (destNode.Tag != null && destNode.Tag is SlaveGroup) {
             sgrp = (SlaveGroup)destNode.Tag;
-          }
-          if (destNode.Parent != null && destNode.Parent.Tag is SlaveGroup) {
+          } else if (destNode.Parent != null && destNode.Parent.Tag is SlaveGroup) {
             sgrp = (SlaveGroup)destNode.Parent.Tag;
           }
 
-          if (sgrp != null) {
-            if (newNode.Tag != null && newNode.Tag is Slave) {
+          if (sgrp != null && newNode.Tag != null) {
+            //save parent group to get an id
+            if (sgrp.Id == Guid.Empty) {
+              ServiceLocator.Instance.CallHiveService(service => sgrp.Id = service.AddSlaveGroup(sgrp));
+            }
+
+            if (newNode.Tag is Slave) {
               Slave slave = (Slave)newNode.Tag;
-
-              if (sgrp.Id == Guid.Empty) {
-                ServiceLocator.Instance.CallHiveService(service => sgrp.Id = service.AddSlaveGroup(sgrp));
-              }
-
               if (slave.ParentResourceId == null || (slave.ParentResourceId != null && slave.ParentResourceId != sgrp.Id)) {
                 slave.ParentResourceId = sgrp.Id;
-                OnContentChanged();
               }
-            }
+            } else if (newNode.Tag is SlaveGroup) {
+              SlaveGroup slaveGroup = (SlaveGroup)newNode.Tag;
+              if (slaveGroup.ParentResourceId == null || (slaveGroup.ParentResourceId != null && slaveGroup.ParentResourceId != sgrp.Id)) {
+                slaveGroup.ParentResourceId = sgrp.Id;
+              }
+            }
+            OnContentChanged();
           }
         }