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

Timestamp:

06/16/11 16:01:39 (13 years ago)

Author:

ascheibe

Message:

#1233
Admin UI:

• some bugfixes
• removed dummy stuff

File:

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

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

@@ -24 +24 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Clients.Hive.Views;
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
-using HeuristicLab.Clients.Hive.Views;
 
 namespace HeuristicLab.Clients.Hive.Administration.Views {
@@ -122 +122 @@
       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) {
         slaveView.Content.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(SlaveViewContent_PropertyChanged);
@@ -149 +152 @@
       if (treeSlaveGroup.SelectedNode != null && treeSlaveGroup.SelectedNode.Tag != null) {
         Resource res = (Resource)treeSlaveGroup.SelectedNode.Tag;
-        Content.Remove(res);
 
         if (res is Slave) {
+          Content.Remove(res);
           ServiceLocator.Instance.CallHiveService(service => service.DeleteSlave(res.Id));
         } else if (res is SlaveGroup) {
           //only delete empty groups
-          if (Content.Where(s => s.ParentResourceId == res.Id).Count() < 0) {
+          if (Content.Where(s => s.ParentResourceId == res.Id).Count() < 1) {
+            Content.Remove(res);
             ServiceLocator.Instance.CallHiveService(service => service.DeleteSlaveGroup(res.Id));
           } else {
-            MessageBox.Show("Only empty groups can be deleted.");
+            MessageBox.Show("Only empty groups can be deleted.", "HeuristicLab Hive Administration", MessageBoxButtons.OK, MessageBoxIcon.Error);
           }
         }
@@ -168 +172 @@
         if (res is SlaveGroup && res.Id == Guid.Empty) {
           SlaveGroup slaveGroup = (SlaveGroup)res;
-          ServiceLocator.Instance.CallHiveService(service => service.AddSlaveGroup(slaveGroup));
+          ServiceLocator.Instance.CallHiveService(service => slaveGroup.Id = service.AddSlaveGroup(slaveGroup));
         }
         if (res.Id != Guid.Empty && res.Modified) {
@@ -198 +202 @@
             if (newNode.Tag != null && newNode.Tag is Slave) {
               Slave slave = (Slave)newNode.Tag;
-              if (slave.ParentResourceId != sgrp.Id) {
+
+              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();
@@ -257 +266 @@
       }
     }
+
+    private void tabSlaveGroup_SelectedIndexChanged(object sender, EventArgs e) {
+      if (tabSlaveGroup.SelectedIndex == 1) {
+        UpdateSchedule();
+      }
+    }
   }
 }