Changeset 7376 for branches

Timestamp:

01/19/12 17:56:53 (12 years ago)

Author:

ascheibe

Message:

#1174 added the access service user selection control to the algorithm view of the administrator

Location:

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3

Files:

• Administration/Views/AlgorithmView.Designer.cs (modified) (12 diffs)
• Administration/Views/AlgorithmView.cs (modified) (8 diffs)
• HeuristicLab.Clients.OKB-3.3.csproj (modified) (1 diff)
• Plugin.cs.frame (modified) (1 diff)

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/AlgorithmView.Designer.cs

@@ -34 +34 @@
     /// </summary>
     private void InitializeComponent() {
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AlgorithmView));
       this.platformLabel = new System.Windows.Forms.Label();
       this.platformComboBox = new System.Windows.Forms.ComboBox();
@@ -40 +41 @@
       this.tabControl = new System.Windows.Forms.TabControl();
       this.usersTabPage = new System.Windows.Forms.TabPage();
-      this.usersListBox = new System.Windows.Forms.CheckedListBox();
       this.storeUsersButton = new System.Windows.Forms.Button();
-      this.refreshUsersButton = new System.Windows.Forms.Button();
+      this.refreshableLightweightUserView = new HeuristicLab.Clients.Access.Views.RefreshableLightweightUserView();
       this.dataTabPage = new System.Windows.Forms.TabPage();
       this.noViewAvailableLabel = new System.Windows.Forms.Label();
@@ -135 +135 @@
       // usersTabPage
       // 
-      this.usersTabPage.Controls.Add(this.usersListBox);
       this.usersTabPage.Controls.Add(this.storeUsersButton);
-      this.usersTabPage.Controls.Add(this.refreshUsersButton);
+      this.usersTabPage.Controls.Add(this.refreshableLightweightUserView);
       this.usersTabPage.Location = new System.Drawing.Point(4, 22);
       this.usersTabPage.Name = "usersTabPage";
@@ -146 +145 @@
       this.usersTabPage.UseVisualStyleBackColor = true;
       // 
-      // usersListBox
-      // 
-      this.usersListBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.usersListBox.CheckOnClick = true;
-      this.usersListBox.FormattingEnabled = true;
-      this.usersListBox.Location = new System.Drawing.Point(6, 35);
-      this.usersListBox.Name = "usersListBox";
-      this.usersListBox.Size = new System.Drawing.Size(613, 139);
-      this.usersListBox.TabIndex = 2;
-      this.usersListBox.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.usersListBox_ItemCheck);
-      // 
       // storeUsersButton
       // 
-      this.storeUsersButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
-      this.storeUsersButton.Location = new System.Drawing.Point(36, 6);
+      this.storeUsersButton.Image = ((System.Drawing.Image)(resources.GetObject("storeUsersButton.Image")));
+      this.storeUsersButton.Location = new System.Drawing.Point(37, 9);
       this.storeUsersButton.Name = "storeUsersButton";
       this.storeUsersButton.Size = new System.Drawing.Size(24, 24);
@@ -170 +156 @@
       this.storeUsersButton.Click += new System.EventHandler(this.storeUsersButton_Click);
       // 
-      // refreshUsersButton
-      // 
-      this.refreshUsersButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
-      this.refreshUsersButton.Location = new System.Drawing.Point(6, 6);
-      this.refreshUsersButton.Name = "refreshUsersButton";
-      this.refreshUsersButton.Size = new System.Drawing.Size(24, 24);
-      this.refreshUsersButton.TabIndex = 0;
-      this.toolTip.SetToolTip(this.refreshUsersButton, "Refresh Authorized Users");
-      this.refreshUsersButton.UseVisualStyleBackColor = true;
-      this.refreshUsersButton.Click += new System.EventHandler(this.refreshUsersButton_Click);
+      // refreshableLightweightUserView
+      // 
+      this.refreshableLightweightUserView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.refreshableLightweightUserView.BackColor = System.Drawing.Color.Transparent;
+      this.refreshableLightweightUserView.Caption = "RefreshableLightweightUser View";
+      this.refreshableLightweightUserView.Content = null;
+      this.refreshableLightweightUserView.FetchSelectedUsers = null;
+      this.refreshableLightweightUserView.Location = new System.Drawing.Point(6, 6);
+      this.refreshableLightweightUserView.Name = "refreshableLightweightUserView";
+      this.refreshableLightweightUserView.ReadOnly = false;
+      this.refreshableLightweightUserView.Size = new System.Drawing.Size(613, 168);
+      this.refreshableLightweightUserView.TabIndex = 3;
+      this.refreshableLightweightUserView.SelectedUsersChanged += new System.EventHandler(this.refreshableLightweightUserView_SelectedUsersChanged);
       // 
       // dataTabPage
@@ -226 +217 @@
       // saveFileButton
       // 
-      this.saveFileButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
+      this.saveFileButton.Image = ((System.Drawing.Image)(resources.GetObject("saveFileButton.Image")));
       this.saveFileButton.Location = new System.Drawing.Point(126, 6);
       this.saveFileButton.Name = "saveFileButton";
@@ -237 +228 @@
       // openFileButton
       // 
-      this.openFileButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Open;
+      this.openFileButton.Image = ((System.Drawing.Image)(resources.GetObject("openFileButton.Image")));
       this.openFileButton.Location = new System.Drawing.Point(96, 6);
       this.openFileButton.Name = "openFileButton";
@@ -248 +239 @@
       // newDataButton
       // 
-      this.newDataButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.NewDocument;
+      this.newDataButton.Image = ((System.Drawing.Image)(resources.GetObject("newDataButton.Image")));
       this.newDataButton.Location = new System.Drawing.Point(66, 6);
       this.newDataButton.Name = "newDataButton";
@@ -259 +250 @@
       // storeDataButton
       // 
-      this.storeDataButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
+      this.storeDataButton.Image = ((System.Drawing.Image)(resources.GetObject("storeDataButton.Image")));
       this.storeDataButton.Location = new System.Drawing.Point(36, 6);
       this.storeDataButton.Name = "storeDataButton";
@@ -270 +261 @@
       // refreshDataButton
       // 
-      this.refreshDataButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
+      this.refreshDataButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshDataButton.Image")));
       this.refreshDataButton.Location = new System.Drawing.Point(6, 6);
       this.refreshDataButton.Name = "refreshDataButton";
@@ -388 +379 @@
     private System.Windows.Forms.TabPage usersTabPage;
     private System.Windows.Forms.Button storeUsersButton;
-    private System.Windows.Forms.Button refreshUsersButton;
     private System.Windows.Forms.TabPage dataTabPage;
-    private System.Windows.Forms.CheckedListBox usersListBox;
     private System.Windows.Forms.Label dataTypeNameLabel;
     private System.Windows.Forms.GroupBox dataTypeGroupBox;
@@ -405 +394 @@
     private MainForm.WindowsForms.ViewHost dataViewHost;
     private System.Windows.Forms.Label noViewAvailableLabel;
+    private Access.Views.RefreshableLightweightUserView refreshableLightweightUserView;
 
   }

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Administration/Views/AlgorithmView.cs

@@ -25 +25 @@
 using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.Clients.OKB.Authentication;
 using HeuristicLab.Common;
 using HeuristicLab.Core.Views;
@@ -73 +72 @@
       algorithmClassComboBox.SelectedValueChanged += new EventHandler(algorithmClassComboBox_SelectedValueChanged);
 
-      usersListBox.DataSource = null;
       data = null;
       dataViewHost.Content = null;
@@ -81 +79 @@
         dataTypeNameTextBox.Text = string.Empty;
         dataTypeTypeNameTextBox.Text = string.Empty;
+        refreshableLightweightUserView.Content = null;
+        refreshableLightweightUserView.FetchSelectedUsers = null;
       } else {
         platformComboBox.SelectedItem = platformComboBoxValues.FirstOrDefault(p => p.Id == Content.PlatformId);
@@ -86 +86 @@
         dataTypeNameTextBox.Text = Content.DataTypeName;
         dataTypeTypeNameTextBox.Text = Content.DataTypeTypeName;
+        refreshableLightweightUserView.Content = Access.AccessClient.Instance;
+        refreshableLightweightUserView.FetchSelectedUsers = new Func<List<Guid>>(delegate { return AdministrationClient.GetAlgorithmUsers(Content.Id); });
       }
     }
@@ -94 +96 @@
       algorithmClassComboBox.Enabled = (Content != null) && !ReadOnly;
       dataTypeGroupBox.Enabled = (Content != null) && !ReadOnly;
-      refreshUsersButton.Enabled = (Content != null) && (Content.Id != 0);
-      storeUsersButton.Enabled = (usersListBox.DataSource != null) && !ReadOnly;
-      usersListBox.Enabled = (usersListBox.DataSource != null) && !ReadOnly;
+      storeUsersButton.Enabled = (refreshableLightweightUserView.GetCheckedUsers() != null) && !ReadOnly;
+      refreshableLightweightUserView.Enabled = (refreshableLightweightUserView.Content != null) && !ReadOnly;
       refreshDataButton.Enabled = (Content != null) && (Content.Id != 0);
       storeDataButton.Enabled = ((data != null) || (dataViewHost.Content != null)) && !ReadOnly;
@@ -155 +156 @@
     }
 
-    private void refreshUsersButton_Click(object sender, System.EventArgs e) {
-      try {
-        List<Guid> ids = AdministrationClient.GetAlgorithmUsers(Content.Id);
-        if (ids != null) {
-          if (AuthenticationClient.Instance.Users == null) AuthenticationClient.Instance.Refresh();
-          List<User> users = AuthenticationClient.Instance.Users.ToList();
-          usersListBox.DataSource = users;
-          usersListBox.DisplayMember = "Name";
-          for (int i = 0; i < users.Count; i++)
-            usersListBox.SetItemChecked(i, ids.Contains(users[i].Id));
-          usersListBox.Enabled = !ReadOnly;
-          storeUsersButton.Enabled = false;
-        }
-      }
-      catch (Exception ex) {
-        ErrorHandling.ShowErrorDialog(this, "Refresh authorized users and groups failed.", ex);
-      }
-    }
     private void storeUsersButton_Click(object sender, System.EventArgs e) {
       try {
-        AdministrationClient.UpdateAlgorithmUsers(Content.Id, usersListBox.SelectedItems.Cast<User>().Select(u => u.Id).ToList());
+        AdministrationClient.UpdateAlgorithmUsers(Content.Id, refreshableLightweightUserView.GetCheckedUsers().CheckedItems.Select(x => x.Value.Id).ToList());
         storeUsersButton.Enabled = false;
       }
@@ -181 +164 @@
         ErrorHandling.ShowErrorDialog(this, "Store authorized users and groups failed.", ex);
       }
-    }
-    private void usersListBox_ItemCheck(object sender, ItemCheckEventArgs e) {
-      storeUsersButton.Enabled = !ReadOnly;
     }
 
@@ -325 +305 @@
     }
     #endregion
+
+    private void refreshableLightweightUserView_SelectedUsersChanged(object sender, EventArgs e) {
+      storeUsersButton.Enabled = !ReadOnly;
+    }
   }
 }

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/HeuristicLab.Clients.OKB-3.3.csproj

@@ -39 +39 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Clients.Access-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Clients.Access-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Clients.Common-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Clients.Common-3.3.dll</HintPath>

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Plugin.cs.frame

@@ -29 +29 @@
   [PluginFile("HeuristicLab.Clients.OKB-3.3.dll", PluginFileType.Assembly)]  
   [PluginDependency("HeuristicLab.Clients.Common", "3.3")]
+  [PluginDependency("HeuristicLab.Clients.Access", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]