Changeset 7536

Timestamp:

02/29/12 17:41:18 (13 years ago)

Author:

ascheibe

Message:

#1648 added client registration ui

Location:

branches/ClientUserManagement

Files:

• HeuristicLab.Clients.Access/3.3/AccessClient.cs (modified) (3 diffs)
• HeuristicLab.Clients.Access/3.3/ClientInformation.cs (modified) (1 diff)
• HeuristicLab.Clients.Access/3.3/ClientInformationUtils.cs (modified) (4 diffs)
• HeuristicLab.Clients.Access/3.3/ClientViews/AdminClientView.Designer.cs (added)
• HeuristicLab.Clients.Access/3.3/ClientViews/AdminClientView.cs (added)
• HeuristicLab.Clients.Access/3.3/ClientViews/ClientInformationDialog.Designer.cs (added)
• HeuristicLab.Clients.Access/3.3/ClientViews/ClientInformationDialog.cs (added)
• HeuristicLab.Clients.Access/3.3/ClientViews/ClientRegistrationDialog.Designer.cs (added)
• HeuristicLab.Clients.Access/3.3/ClientViews/ClientRegistrationDialog.cs (added)
• HeuristicLab.Clients.Access/3.3/ClientViews/ClientView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Clients.Access/3.3/ClientViews/ClientView.cs (modified) (1 diff)
• HeuristicLab.Clients.Access/3.3/HeuristicLab.Clients.Access-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Clients.Access/3.3/MenuItems/ClientInfoMenuItem.cs (modified) (1 diff)
• HeuristicLab.Clients.Access/3.3/ServiceClients/AccessServiceClient.cs (modified) (2 diffs)
• HeuristicLab.Clients.Access/3.3/UserInformation.cs (modified) (1 diff)
• HeuristicLab.Services.Access-3.3.Tests/UnitTest.cs (modified) (4 diffs)
• HeuristicLab.Services.Access.DataAccess/3.3/ClientManagement.dbml (modified) (1 diff)
• HeuristicLab.Services.Access.DataAccess/3.3/ClientManagement.dbml.layout (modified) (7 diffs)
• HeuristicLab.Services.Access.DataAccess/3.3/ClientManagement.designer.cs (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/AccessService.cs (modified) (5 diffs)
• HeuristicLab.Services.Access/3.3/IAccessService.cs (modified) (1 diff)

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/AccessClient.cs

@@ -48 +48 @@
     public void Refresh() {
       usersAndGroups = new ItemList<UserGroupBase>();
-      usersAndGroups.AddRange(CallRunCreationService<ItemList<UserGroupBase>>(s => new ItemList<UserGroupBase>(s.GetAllLeightweightUsersAndGroups())));
+      usersAndGroups.AddRange(CallAccessService<ItemList<UserGroupBase>>(s => new ItemList<UserGroupBase>(s.GetAllLeightweightUsersAndGroups())));
     }
     public void RefreshAsync(Action<Exception> exceptionCallback) {
@@ -108 +108 @@
 
     #region Helpers
-    public static void CallRunCreationService(Action<IAccessService> call) {
+    public static void CallAccessService(Action<IAccessService> call) {
       AccessServiceClient client = ClientFactory.CreateClient<AccessServiceClient, IAccessService>();
       try {
@@ -122 +122 @@
       }
     }
-    public static T CallRunCreationService<T>(Func<IAccessService, T> call) {
+    public static T CallAccessService<T>(Func<IAccessService, T> call) {
       AccessServiceClient client = ClientFactory.CreateClient<AccessServiceClient, IAccessService>();
       try {

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/ClientInformation.cs

@@ -61 +61 @@
 
       try {
-        AccessClient.CallRunCreationService(x => clientInfo = x.GetClient(clientId));
+        AccessClient.CallAccessService(x => clientInfo = x.GetClient(clientId));
         if (clientInfo != null)
           clientExists = true;

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/ClientInformationUtils.cs

@@ -21 +21 @@
 
 using System;
+using System.Diagnostics;
 using System.Management;
+using System.Reflection;
 using HeuristicLab.Algorithms.Benchmarks;
 using HeuristicLab.Data;
@@ -28 +30 @@
 namespace HeuristicLab.Clients.Access {
   public static class ClientInformationUtils {
+
+    public static Client CollectClientInformation() {
+      Client client = new Client();
+      OperatingSystem os = new OperatingSystem();
+      ClientType cType = new ClientType();
+      cType.Name = "HLClient";
+
+      client.Id = GetUniqueMachineId();
+      client.HeuristicLabVersion = GetHLVersion();
+      client.Name = GetMachineName();
+      client.MemorySize = GetPhysicalMemory().GetValueOrDefault();
+      client.NumberOfCores = GetNumberOfCores();
+      os.Name = GetOperatingSystem();
+      client.OperatingSystem = os;
+      client.ProcessorType = GetCpuInfo();
+      client.ClientType = cType;
+      //client.ClientConfiguration = GetClientConfiguration();
+      client.Timestamp = DateTime.Now;
+      client.PerformanceValue = RunBenchmark();
+
+      return client;
+    }
+
+    public static string GetClientConfiguration() {
+      //TODO: does it make sense to send the client configuration to the server? for what do we need this?
+      return string.Empty;
+    }
+
+    public static string GetHLVersion() {
+      FileVersionInfo versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
+      return versionInfo.FileVersion;
+    }
 
     public static int GetNumberOfCores() {
@@ -67 +101 @@
     /// returns CPU frequence of the machine in Mhz
     /// </summary>
-    public static int? GetCpuSpeed() {
-      return (int)GetWMIValue("Win32_Processor", "MaxClockSpeed");
+    public static string GetCpuInfo() {
+      string name = GetWMIString("Win32_Processor", "Name");
+      string manufacturer = GetWMIString("Win32_Processor", "Manufacturer");
+      return manufacturer + " " + name;
     }
 
@@ -153 +189 @@
     }
 
+    private static string GetWMIString(string clazz, string property) {
+      ManagementClass mgtClass = new ManagementClass(clazz);
+      ManagementObjectCollection mgtCol = mgtClass.GetInstances();
+
+      foreach (ManagementObject mgtObj in mgtCol) {
+        foreach (var prop in mgtObj.Properties) {
+          if (prop.Value != null && prop.Name == property) {
+            try {
+              return prop.Value.ToString();
+            }
+            catch {
+              return string.Empty;
+            }
+          }
+        }
+      }
+      return string.Empty;
+    }
+
     public static double RunBenchmark() {
       Linpack linpack = new Linpack();

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/ClientViews/ClientView.Designer.cs

@@ -1 @@
-namespace HeuristicLab.Clients.Access.ClientViews {
+namespace HeuristicLab.Clients.Access {
   partial class ClientView {
     /// <summary> 
@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
-      components = new System.ComponentModel.Container();
+      this.label1 = new System.Windows.Forms.Label();
+      this.label2 = new System.Windows.Forms.Label();
+      this.label3 = new System.Windows.Forms.Label();
+      this.label4 = new System.Windows.Forms.Label();
+      this.label5 = new System.Windows.Forms.Label();
+      this.label6 = new System.Windows.Forms.Label();
+      this.label7 = new System.Windows.Forms.Label();
+      this.label8 = new System.Windows.Forms.Label();
+      this.label9 = new System.Windows.Forms.Label();
+      this.label10 = new System.Windows.Forms.Label();
+      this.label11 = new System.Windows.Forms.Label();
+      this.txtName = new System.Windows.Forms.TextBox();
+      this.txtDescription = new System.Windows.Forms.TextBox();
+      this.txtVersion = new System.Windows.Forms.TextBox();
+      this.txtTimestamp = new System.Windows.Forms.TextBox();
+      this.txtMemory = new System.Windows.Forms.TextBox();
+      this.txtNumberOfCores = new System.Windows.Forms.TextBox();
+      this.txtClientType = new System.Windows.Forms.TextBox();
+      this.txtClientConfiguration = new System.Windows.Forms.TextBox();
+      this.txtProcessor = new System.Windows.Forms.TextBox();
+      this.txtOS = new System.Windows.Forms.TextBox();
+      this.txtPerformanceValue = new System.Windows.Forms.TextBox();
+      this.label13 = new System.Windows.Forms.Label();
+      this.txtId = new System.Windows.Forms.TextBox();
+      this.SuspendLayout();
+      // 
+      // label1
+      // 
+      this.label1.AutoSize = true;
+      this.label1.Location = new System.Drawing.Point(3, 6);
+      this.label1.Name = "label1";
+      this.label1.Size = new System.Drawing.Size(38, 13);
+      this.label1.TabIndex = 0;
+      this.label1.Text = "Name:";
+      // 
+      // label2
+      // 
+      this.label2.AutoSize = true;
+      this.label2.Location = new System.Drawing.Point(3, 32);
+      this.label2.Name = "label2";
+      this.label2.Size = new System.Drawing.Size(63, 13);
+      this.label2.TabIndex = 1;
+      this.label2.Text = "Description:";
+      // 
+      // label3
+      // 
+      this.label3.AutoSize = true;
+      this.label3.Location = new System.Drawing.Point(3, 58);
+      this.label3.Name = "label3";
+      this.label3.Size = new System.Drawing.Size(62, 13);
+      this.label3.TabIndex = 2;
+      this.label3.Text = "HL Version:";
+      // 
+      // label4
+      // 
+      this.label4.AutoSize = true;
+      this.label4.Location = new System.Drawing.Point(3, 84);
+      this.label4.Name = "label4";
+      this.label4.Size = new System.Drawing.Size(47, 13);
+      this.label4.TabIndex = 3;
+      this.label4.Text = "Memory:";
+      // 
+      // label5
+      // 
+      this.label5.AutoSize = true;
+      this.label5.Location = new System.Drawing.Point(3, 110);
+      this.label5.Name = "label5";
+      this.label5.Size = new System.Drawing.Size(61, 13);
+      this.label5.TabIndex = 4;
+      this.label5.Text = "Timestamp:";
+      // 
+      // label6
+      // 
+      this.label6.AutoSize = true;
+      this.label6.Location = new System.Drawing.Point(3, 136);
+      this.label6.Name = "label6";
+      this.label6.Size = new System.Drawing.Size(62, 13);
+      this.label6.TabIndex = 5;
+      this.label6.Text = "CPU Cores:";
+      // 
+      // label7
+      // 
+      this.label7.AutoSize = true;
+      this.label7.Location = new System.Drawing.Point(3, 162);
+      this.label7.Name = "label7";
+      this.label7.Size = new System.Drawing.Size(57, 13);
+      this.label7.TabIndex = 6;
+      this.label7.Text = "Processor:";
+      // 
+      // label8
+      // 
+      this.label8.AutoSize = true;
+      this.label8.Location = new System.Drawing.Point(3, 188);
+      this.label8.Name = "label8";
+      this.label8.Size = new System.Drawing.Size(36, 13);
+      this.label8.TabIndex = 7;
+      this.label8.Text = "Client:";
+      // 
+      // label9
+      // 
+      this.label9.AutoSize = true;
+      this.label9.Location = new System.Drawing.Point(3, 214);
+      this.label9.Name = "label9";
+      this.label9.Size = new System.Drawing.Size(63, 13);
+      this.label9.TabIndex = 8;
+      this.label9.Text = "OS Version:";
+      // 
+      // label10
+      // 
+      this.label10.AutoSize = true;
+      this.label10.Location = new System.Drawing.Point(3, 240);
+      this.label10.Name = "label10";
+      this.label10.Size = new System.Drawing.Size(101, 13);
+      this.label10.TabIndex = 9;
+      this.label10.Text = "Client Configuration:";
+      // 
+      // label11
+      // 
+      this.label11.AutoSize = true;
+      this.label11.Location = new System.Drawing.Point(3, 266);
+      this.label11.Name = "label11";
+      this.label11.Size = new System.Drawing.Size(100, 13);
+      this.label11.TabIndex = 10;
+      this.label11.Text = "Performance Value:";
+      // 
+      // txtName
+      // 
+      this.txtName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtName.Location = new System.Drawing.Point(110, 3);
+      this.txtName.Name = "txtName";
+      this.txtName.Size = new System.Drawing.Size(265, 20);
+      this.txtName.TabIndex = 12;
+      // 
+      // txtDescription
+      // 
+      this.txtDescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtDescription.Location = new System.Drawing.Point(111, 29);
+      this.txtDescription.Name = "txtDescription";
+      this.txtDescription.Size = new System.Drawing.Size(264, 20);
+      this.txtDescription.TabIndex = 13;
+      // 
+      // txtVersion
+      // 
+      this.txtVersion.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtVersion.Location = new System.Drawing.Point(111, 55);
+      this.txtVersion.Name = "txtVersion";
+      this.txtVersion.Size = new System.Drawing.Size(264, 20);
+      this.txtVersion.TabIndex = 14;
+      // 
+      // txtTimestamp
+      // 
+      this.txtTimestamp.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtTimestamp.Location = new System.Drawing.Point(110, 107);
+      this.txtTimestamp.Name = "txtTimestamp";
+      this.txtTimestamp.Size = new System.Drawing.Size(265, 20);
+      this.txtTimestamp.TabIndex = 15;
+      // 
+      // txtMemory
+      // 
+      this.txtMemory.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtMemory.Location = new System.Drawing.Point(110, 81);
+      this.txtMemory.Name = "txtMemory";
+      this.txtMemory.Size = new System.Drawing.Size(265, 20);
+      this.txtMemory.TabIndex = 16;
+      // 
+      // txtNumberOfCores
+      // 
+      this.txtNumberOfCores.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtNumberOfCores.Location = new System.Drawing.Point(110, 133);
+      this.txtNumberOfCores.Name = "txtNumberOfCores";
+      this.txtNumberOfCores.Size = new System.Drawing.Size(265, 20);
+      this.txtNumberOfCores.TabIndex = 17;
+      // 
+      // txtClientType
+      // 
+      this.txtClientType.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtClientType.Location = new System.Drawing.Point(111, 185);
+      this.txtClientType.Name = "txtClientType";
+      this.txtClientType.Size = new System.Drawing.Size(264, 20);
+      this.txtClientType.TabIndex = 18;
+      // 
+      // txtClientConfiguration
+      // 
+      this.txtClientConfiguration.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtClientConfiguration.Location = new System.Drawing.Point(110, 237);
+      this.txtClientConfiguration.Name = "txtClientConfiguration";
+      this.txtClientConfiguration.Size = new System.Drawing.Size(265, 20);
+      this.txtClientConfiguration.TabIndex = 19;
+      // 
+      // txtProcessor
+      // 
+      this.txtProcessor.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtProcessor.Location = new System.Drawing.Point(111, 159);
+      this.txtProcessor.Name = "txtProcessor";
+      this.txtProcessor.Size = new System.Drawing.Size(264, 20);
+      this.txtProcessor.TabIndex = 20;
+      // 
+      // txtOS
+      // 
+      this.txtOS.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtOS.Location = new System.Drawing.Point(111, 211);
+      this.txtOS.Name = "txtOS";
+      this.txtOS.Size = new System.Drawing.Size(264, 20);
+      this.txtOS.TabIndex = 21;
+      // 
+      // txtPerformanceValue
+      // 
+      this.txtPerformanceValue.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtPerformanceValue.Location = new System.Drawing.Point(110, 263);
+      this.txtPerformanceValue.Name = "txtPerformanceValue";
+      this.txtPerformanceValue.Size = new System.Drawing.Size(265, 20);
+      this.txtPerformanceValue.TabIndex = 23;
+      // 
+      // label13
+      // 
+      this.label13.AutoSize = true;
+      this.label13.Location = new System.Drawing.Point(3, 292);
+      this.label13.Name = "label13";
+      this.label13.Size = new System.Drawing.Size(48, 13);
+      this.label13.TabIndex = 24;
+      this.label13.Text = "Client Id:";
+      // 
+      // txtId
+      // 
+      this.txtId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.txtId.Location = new System.Drawing.Point(111, 289);
+      this.txtId.Name = "txtId";
+      this.txtId.Size = new System.Drawing.Size(264, 20);
+      this.txtId.TabIndex = 25;
+      // 
+      // ClientView
+      // 
+      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.txtId);
+      this.Controls.Add(this.label13);
+      this.Controls.Add(this.txtPerformanceValue);
+      this.Controls.Add(this.txtOS);
+      this.Controls.Add(this.txtProcessor);
+      this.Controls.Add(this.txtClientConfiguration);
+      this.Controls.Add(this.txtClientType);
+      this.Controls.Add(this.txtNumberOfCores);
+      this.Controls.Add(this.txtMemory);
+      this.Controls.Add(this.txtTimestamp);
+      this.Controls.Add(this.txtVersion);
+      this.Controls.Add(this.txtDescription);
+      this.Controls.Add(this.txtName);
+      this.Controls.Add(this.label11);
+      this.Controls.Add(this.label10);
+      this.Controls.Add(this.label9);
+      this.Controls.Add(this.label8);
+      this.Controls.Add(this.label7);
+      this.Controls.Add(this.label6);
+      this.Controls.Add(this.label5);
+      this.Controls.Add(this.label4);
+      this.Controls.Add(this.label3);
+      this.Controls.Add(this.label2);
+      this.Controls.Add(this.label1);
+      this.Name = "ClientView";
+      this.Size = new System.Drawing.Size(378, 315);
+      this.ResumeLayout(false);
+      this.PerformLayout();
+
     }
 
     #endregion
+
+    protected System.Windows.Forms.Label label1;
+    protected System.Windows.Forms.Label label2;
+    protected System.Windows.Forms.Label label3;
+    protected System.Windows.Forms.Label label4;
+    protected System.Windows.Forms.Label label5;
+    protected System.Windows.Forms.Label label6;
+    protected System.Windows.Forms.Label label7;
+    protected System.Windows.Forms.Label label8;
+    protected System.Windows.Forms.Label label9;
+    protected System.Windows.Forms.Label label10;
+    protected System.Windows.Forms.Label label11;
+    protected System.Windows.Forms.TextBox txtName;
+    protected System.Windows.Forms.TextBox txtDescription;
+    protected System.Windows.Forms.TextBox txtVersion;
+    protected System.Windows.Forms.TextBox txtTimestamp;
+    protected System.Windows.Forms.TextBox txtMemory;
+    protected System.Windows.Forms.TextBox txtNumberOfCores;
+    protected System.Windows.Forms.TextBox txtClientType;
+    protected System.Windows.Forms.TextBox txtClientConfiguration;
+    protected System.Windows.Forms.TextBox txtProcessor;
+    protected System.Windows.Forms.TextBox txtOS;
+    protected System.Windows.Forms.TextBox txtPerformanceValue;
+    protected System.Windows.Forms.Label label13;
+    protected System.Windows.Forms.TextBox txtId;
+
   }
 }

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/ClientViews/ClientView.cs

@@ -23 +23 @@
 using HeuristicLab.MainForm;
 
-namespace HeuristicLab.Clients.Access.ClientViews {
+namespace HeuristicLab.Clients.Access {
   [View("Client View")]
   [Content(typeof(Client), true)]
   public partial class ClientView : ItemView {
+    public new Client Content {
+      get { return (Client)base.Content; }
+      set { base.Content = value; }
+    }
+
     public ClientView() {
       InitializeComponent();
     }
+
+    protected override void OnContentChanged() {
+      base.OnContentChanged();
+
+      if (Content == null) {
+        txtClientConfiguration.Text = string.Empty;
+        txtClientType.Text = string.Empty;
+        txtDescription.Text = string.Empty;
+        txtMemory.Text = string.Empty;
+        txtName.Text = string.Empty;
+        txtNumberOfCores.Text = string.Empty;
+        txtPerformanceValue.Text = string.Empty;
+        txtProcessor.Text = string.Empty;
+        txtTimestamp.Text = string.Empty;
+        txtVersion.Text = string.Empty;
+        txtId.Text = string.Empty;
+        txtOS.Text = string.Empty;
+      } else {
+        if (Content.ClientConfiguration != null) {
+          txtClientConfiguration.Text = Content.ClientConfiguration.Description; //??
+        }
+        if (Content.ClientType != null) {
+          txtClientType.Text = Content.ClientType.Name;
+        }
+        if (Content.OperatingSystem != null) {
+          txtOS.Text = Content.OperatingSystem.Name;
+        }
+        txtDescription.Text = Content.Description;
+        txtMemory.Text = Content.MemorySize.ToString();
+        txtName.Text = Content.Name;
+        txtNumberOfCores.Text = Content.NumberOfCores.ToString();
+        txtPerformanceValue.Text = Content.PerformanceValue.ToString();
+        txtProcessor.Text = Content.ProcessorType;
+        txtTimestamp.Text = Content.Timestamp.ToShortDateString();
+        txtVersion.Text = Content.HeuristicLabVersion;
+        txtId.Text = Content.Id.ToString();
+      }
+    }
   }
 }

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/HeuristicLab.Clients.Access-3.3.csproj

@@ -102 +102 @@
     <Compile Include="ClientInformation.cs" />
     <Compile Include="ClientInformationUtils.cs" />
+    <Compile Include="ClientViews\ClientInformationDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ClientViews\ClientInformationDialog.Designer.cs">
+      <DependentUpon>ClientInformationDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ClientViews\ClientRegistrationDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ClientViews\ClientRegistrationDialog.Designer.cs">
+      <DependentUpon>ClientRegistrationDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="ClientViews\ClientView.cs">
       <SubType>UserControl</SubType>
@@ -107 +119 @@
     <Compile Include="ClientViews\ClientView.Designer.cs">
       <DependentUpon>ClientView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="ClientViews\AdminClientView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ClientViews\AdminClientView.Designer.cs">
+      <DependentUpon>AdminClientView.cs</DependentUpon>
     </Compile>
     <Compile Include="MenuItems\ClientInfoMenuItem.cs" />
@@ -162 +180 @@
     <None Include="UpdateLocalInstallation.cmd" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/MenuItems/ClientInfoMenuItem.cs

@@ -32 +32 @@
     }
     public override void Execute() {
-      //    MainFormManager.MainForm.ShowContent(HiveClient.Instance);
+      if (ClientInformation.Instance.ClientExists) {
+        using (ClientInformationDialog dialog = new ClientInformationDialog()) {
+          dialog.ShowDialog();
+        }
+      } else {
+        using (ClientRegistrationDialog regDialog = new ClientRegistrationDialog()) {
+          regDialog.ShowDialog();
+        }
+      }
     }
     public override int Position {

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/ServiceClients/AccessServiceClient.cs

@@ -1084 +1084 @@
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAccessService/AddClient", ReplyAction = "http://tempuri.org/IAccessService/AddClientResponse")]
-    System.Guid AddClient(HeuristicLab.Clients.Access.Client client);
+    void AddClient(HeuristicLab.Clients.Access.Client client);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IAccessService/UpdateClient", ReplyAction = "http://tempuri.org/IAccessService/UpdateClientResponse")]
@@ -1297 +1297 @@
     }
 
-    public System.Guid AddClient(HeuristicLab.Clients.Access.Client client) {
-      return base.Channel.AddClient(client);
+    public void AddClient(HeuristicLab.Clients.Access.Client client) {
+      base.Channel.AddClient(client);
     }
 

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/UserInformation.cs

@@ -83 +83 @@
 
       try {
-        AccessClient.CallRunCreationService(x => user = x.Login());
-        AccessClient.CallRunCreationService(x => groups = x.GetGroupsOfCurrentUser());
-        AccessClient.CallRunCreationService(x => roles = x.GetRolesOfCurrentUser());
+        AccessClient.CallAccessService(x => user = x.Login());
+        AccessClient.CallAccessService(x => groups = x.GetGroupsOfCurrentUser());
+        AccessClient.CallAccessService(x => roles = x.GetRolesOfCurrentUser());
         errorOccured = false;
         userExists = true;

branches/ClientUserManagement/HeuristicLab.Services.Access-3.3.Tests/UnitTest.cs

@@ -57 +57 @@
       DT.ClientType clientType = new DT.ClientType() { Name = "Client" };
       DT.OperatingSystem os = new DT.OperatingSystem() { Name = "Windows 7" };
+      Guid id = Guid.NewGuid();
 
       DT.Client client = new DT.Client() {
@@ -69 +70 @@
         OperatingSystem = os,
         ProcessorType = "Intel i7",
-        Timestamp = DateTime.Now
+        Timestamp = DateTime.Now,
+        Id = id
       };
 
-      Guid id = service.AddClient(client);
+      service.AddClient(client);
       Assert.IsTrue(service.ClientExists(id));
       Assert.AreEqual(1, service.GetAllClients().Count());
@@ -118 +120 @@
       ClearDB();
       AccessService service = new AccessService();
+      Guid id = Guid.NewGuid();
 
       DT.Client client = new DT.Client() {
@@ -126 +129 @@
         Name = "testClient",
         ProcessorType = "Intel i7",
-        Timestamp = DateTime.Now
+        Timestamp = DateTime.Now,
+        Id = id
       };
 
-      client.Id = service.AddClient(client);
+      service.AddClient(client);
       Assert.IsTrue(service.ClientExists(client.Id));
 

branches/ClientUserManagement/HeuristicLab.Services.Access.DataAccess/3.3/ClientManagement.dbml

@@ -3 +3 @@
   <Table Name="dbo.Resource" Member="Resources">
     <Type Name="Resource" InheritanceCode="Resource" IsInheritanceDefault="true">
-      <Column Name="Id" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
+      <Column Name="Id" AutoSync="OnInsert" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
       <Column Name="Name" Type="System.String" DbType="NVarChar(MAX) NOT NULL" CanBeNull="false" />
       <Column Name="Description" Type="System.String" DbType="NVarChar(MAX)" CanBeNull="false" />

branches/ClientUserManagement/HeuristicLab.Services.Access.DataAccess/3.3/ClientManagement.dbml.layout

@@ -47 +47 @@
       </nodes>
     </inheritanceConnector>
-    <inheritanceConnector edgePoints="[(5.625 : 2.07859537760417); (5.625 : 2.26); (5.79166666666667 : 2.26 : JumpStart); (5.98958333333333 : 2.26 : JumpEnd); (7 : 2.26); (7 : 2.5)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="7a7fe09e-e9ef-4b01-9ff3-bde95e827b62">
+    <inheritanceConnector edgePoints="[(5.625 : 2.07859537760417); (5.625 : 2.26); (5.79166666666667 : 2.26 : JumpStart); (5.95833333333333 : 2.26 : JumpEnd); (7 : 2.26); (7 : 2.5)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="7a7fe09e-e9ef-4b01-9ff3-bde95e827b62">
       <nodes>
         <classShapeMoniker Id="20c6e07e-aa12-43dc-87d6-dae5bf173da4" />
@@ -59 +59 @@
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(5.875 : 2.07859537760417); (5.875 : 2.34875); (8.125 : 2.34875)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(5.875 : 2.07859537760417); (5.875 : 2.34875); (8.125 : 2.34875)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/ClientManagementDataContext/Resource/Resource_ClientLog" />
       <nodes>
@@ -121 +121 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(5.90625 : 2.07859537760417); (5.90625 : 6.22199625651042); (5.625 : 6.22199625651042)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(5.90625 : 2.07859537760417); (5.90625 : 6.22199625651042); (5.625 : 6.22199625651042)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/ClientManagementDataContext/Resource/Resource_ResourcePlugin" />
       <nodes>
@@ -172 +172 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(2.5 : 1.69399251302083); (2.875 : 2.06899251302083); (2.875 : 4.12102376302084); (3.75 : 4.12102376302084)]" fixedFrom="NotFixed" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(2.5 : 1.69399251302083); (2.875 : 2.06899251302083); (2.875 : 4.12102376302084); (3.75 : 4.12102376302084)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/ClientManagementDataContext/ClientType/ClientType_Client" />
       <nodes>
@@ -179 +179 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(2.5 : 2.72199625651042); (2.79166666666667 : 2.72199625651042 : JumpStart); (2.95833333333333 : 2.72199625651042 : JumpEnd); (3.75 : 2.72199625651042)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(2.5 : 2.72199625651042); (3.75 : 2.72199625651042)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/ClientManagementDataContext/OperatingSystem/OperatingSystem_Client" />
       <nodes>
@@ -186 +186 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(2.5 : 3.49801188151042); (2.79166666666667 : 3.49801188151042 : JumpStart); (2.95833333333333 : 3.49801188151042 : JumpEnd); (3.75 : 3.49801188151042)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(2.5 : 3.49801188151042); (3.75 : 3.49801188151042)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/ClientManagementDataContext/Country/Country_Client" />
       <nodes>
@@ -193 +193 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(2.5 : 4.74120198567708); (3.75 : 4.74120198567708)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(2.5 : 4.74120198567708); (3.75 : 4.74120198567708)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/ClientManagementDataContext/ClientConfiguration/ClientConfiguration_Client" />
       <nodes>

branches/ClientUserManagement/HeuristicLab.Services.Access.DataAccess/3.3/ClientManagement.designer.cs

@@ -244 +244 @@
     }
     
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", AutoSync=AutoSync.OnInsert, DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true, IsDbGenerated=true)]
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", AutoSync=AutoSync.OnInsert, DbType="UniqueIdentifier NOT NULL", IsPrimaryKey=true)]
     public System.Guid Id
     {

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/AccessService.cs

@@ -64 +64 @@
                     where c.Id == id
                     select c;
-
-        return Convert.ToDto(query.FirstOrDefault());
+        if (query.Count() > 0) {
+          return Convert.ToDto(query.FirstOrDefault());
+        } else {
+          return null;
+        }
       }
     }
@@ -86 +89 @@
     }
 
-    public Guid AddClient(DT.Client client) {
+    public void AddClient(DT.Client client) {
       string country = string.Empty;
 
@@ -105 +108 @@
                       where c.Name == country
                       select c;
-
           if (query.Count() > 0) {
             entity.CountryId = query.First().Id;
@@ -111 +113 @@
         }
 
+        if (entity.OperatingSystem != null) {
+          string osversion = entity.OperatingSystem.Name;
+          var query = from os in context.GetTable<DA.OperatingSystem>()
+                      where os.Name == osversion
+                      select os;
+          if (query.Count() > 0) {
+            entity.OperatingSystem = query.First();
+          }
+        }
+
+        if (entity.ClientType != null) {
+          string cType = entity.ClientType.Name;
+          var query = from t in context.GetTable<DA.ClientType>()
+                      where t.Name == cType
+                      select t;
+          if (query.Count() > 0) {
+            entity.ClientType = query.First();
+          }
+        }
+
         context.Resources.InsertOnSubmit(entity);
         context.SubmitChanges();
-        return entity.Id;
       }
     }
@@ -162 +183 @@
     public Guid AddClientGroup(DT.ClientGroup group) {
       using (DA.ClientManagementDataContext context = new DA.ClientManagementDataContext()) {
+        if (group.Id == Guid.Empty)
+          group.Id = Guid.NewGuid();
+
         var entity = Convert.ToEntity(group);
         context.Resources.InsertOnSubmit(entity);

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/IAccessService.cs

@@ -44 +44 @@
 
     [OperationContract]
-    Guid AddClient(Client client);
+    void AddClient(Client client);
 
     [OperationContract]