Changeset 6465

Timestamp:

06/21/11 17:54:32 (13 years ago)

Author:

cneumuel

Message:

#1233

• show owner of experimens in listview

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/HiveExperimentPermissionView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/RefreshableHiveExperimentListView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveExperimentPermission.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveServiceClient.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive.Common/3.4/DataTransfer/HiveExperiment.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.4/HiveService.cs (modified) (4 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/HiveExperimentPermissionView.cs

@@ -34 +34 @@
     public HiveExperimentPermissionView() {
       InitializeComponent();
-      permissionComboBox.Items.Add(Permission.ReadOnly);
+      permissionComboBox.Items.Add(Permission.Read);
       permissionComboBox.Items.Add(Permission.Full);
-      permissionComboBox.SelectedItem = Permission.ReadOnly;
+      permissionComboBox.SelectedItem = Permission.Read;
     }
 

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.ExperimentManager/3.4/Views/RefreshableHiveExperimentListView.cs

@@ -33 +33 @@
     public RefreshableHiveExperimentListView() {
       InitializeComponent();
+      this.itemsListView.View = View.Details;
+      this.itemsListView.Columns.Clear();
+      this.itemsListView.Columns.Add(new ColumnHeader("Date") { Text = "Date" });
+      this.itemsListView.Columns.Add(new ColumnHeader("Name") { Text = "Name" });
+      this.itemsListView.HeaderStyle = ColumnHeaderStyle.Clickable;
+      this.itemsListView.FullRowSelect = true;
     }
 
@@ -45 +51 @@
       }
     }
+
+    protected override ListViewItem CreateListViewItem(RefreshableHiveExperiment item) {
+      ListViewItem listViewItem = base.CreateListViewItem(item);
+      listViewItem.SubItems.Clear();
+      listViewItem.SubItems.Insert(0, new ListViewItem.ListViewSubItem(listViewItem, item.HiveExperiment.DateCreated.ToString("dd.MM.yyyy HH:mm")));
+      listViewItem.SubItems.Insert(1, new ListViewItem.ListViewSubItem(listViewItem, item.HiveExperiment.Name));
+      listViewItem.Group = GetListViewGroup(item.HiveExperiment.OwnerUsername);
+      return listViewItem;
+    }
+
+    private ListViewGroup GetListViewGroup(string groupName) {
+      foreach (ListViewGroup group in itemsListView.Groups) {
+        if (group.Name == groupName)
+          return group;
+      }
+      var newGroup = new ListViewGroup(string.Format("Owner ({0})", groupName), HorizontalAlignment.Left) { Name = groupName };
+      itemsListView.Groups.Add(newGroup);
+      return newGroup;
+    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveExperimentPermission.cs

@@ -28 +28 @@
     private string grantedUserName;
     public string GrantedUserName {
-      get { return grantedUserName; }
-      set { grantedUserName = value; OnPropertyChanged(new PropertyChangedEventArgs("GrantedUserName")); }
+      get { return this.grantedUserName; }
+      set { 
+        this.grantedUserName = value; 
+        this.OnPropertyChanged(new PropertyChangedEventArgs("GrantedUserName"));
+      }
     }
 
     #region Constructors and Cloning
     public HiveExperimentPermission() {
-      this.Permission = Hive.Permission.ReadOnly;
+      this.Permission = Hive.Permission.Read;
       this.PropertyChanged += new PropertyChangedEventHandler(HiveExperimentPermission_PropertyChanged);
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceClients/HiveServiceClient.cs

@@ -607 +607 @@
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
+        private string OwnerUsernameField;
+        
+        [System.Runtime.Serialization.OptionalFieldAttribute()]
         private HeuristicLab.Clients.Hive.Permission PermissionField;
         
@@ -710 +713 @@
                     this.OwnerUserIdField = value;
                     this.RaisePropertyChanged("OwnerUserId");
+                }
+            }
+        }
+        
+        [System.Runtime.Serialization.DataMemberAttribute()]
+        public string OwnerUsername
+        {
+            get
+            {
+                return this.OwnerUsernameField;
+            }
+            set
+            {
+                if ((object.ReferenceEquals(this.OwnerUsernameField, value) != true))
+                {
+                    this.OwnerUsernameField = value;
+                    this.RaisePropertyChanged("OwnerUsername");
                 }
             }
@@ -1452 +1472 @@
         
         [System.Runtime.Serialization.EnumMemberAttribute()]
-        ReadOnly = 1,
+        Read = 1,
         
         [System.Runtime.Serialization.EnumMemberAttribute()]

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Common/3.4/DataTransfer/HiveExperiment.cs

@@ -37 +37 @@
     [DataMember]
     public Permission Permission { get; set; } // the permission for the currently logged in user
+    [DataMember]
+    public string OwnerUsername { get; set; }
 
     /* ==== some computed statistics ==== */

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive/3.4/HiveService.cs

@@ -244 +244 @@
             && (x.OwnerUserId == userManager.CurrentUserId || x.HiveExperimentPermissions.Count(hep => hep.Permission != Permission.NotAllowed && hep.GrantedUserId == userManager.CurrentUserId) > 0)
           ).FirstOrDefault();
-      if (hiveExperiment != null) hiveExperiment.Permission = dao.GetPermissionForExperiment(hiveExperiment.Id, userManager.CurrentUserId);
+      if (hiveExperiment != null) {
+        hiveExperiment.Permission = dao.GetPermissionForExperiment(hiveExperiment.Id, userManager.CurrentUserId);
+        hiveExperiment.OwnerUsername = userManager.GetUserById(hiveExperiment.OwnerUserId).UserName;
+      }
       return hiveExperiment;
     }
@@ -254 +257 @@
         author.AuthorizeForExperiment(he.Id, Permission.Read);
         he.Permission = dao.GetPermissionForExperiment(he.Id, userManager.CurrentUserId);
+        he.OwnerUsername = userManager.GetUserById(he.OwnerUserId).UserName;
       }
       return hiveExperiments;
@@ -261 +265 @@
       authen.AuthenticateForAnyRole(HiveRoles.Administrator);
       var hiveExperiments = dao.GetHiveExperiments(x => true);
-      foreach (var he in hiveExperiments) // no authorization here, since this method is admin-only! (admin is allowed to read all jobs)
+      foreach (var he in hiveExperiments) { // no authorization here, since this method is admin-only! (admin is allowed to read all jobs)
         he.Permission = dao.GetPermissionForExperiment(he.Id, userManager.CurrentUserId);
+        he.OwnerUsername = userManager.GetUserById(he.OwnerUserId).UserName;
+      }
       return hiveExperiments;
     }
@@ -287 +293 @@
       author.AuthorizeForExperiment(hiveExperimentId, Permission.Full);
       trans.UseTransaction(() => {
-        HiveExperiment he = dao.GetHiveExperiment(hiveExperimentId);
         dao.DeleteHiveExperiment(hiveExperimentId); // child jobs will be deleted by db-trigger
       });