Changeset 7534 for branches/ClientUserManagement

Timestamp:

02/28/12 15:46:53 (12 years ago)

Author:

ascheibe

Message:

#1648 worked on user and client information singletons

Location:

branches/ClientUserManagement

Files:

• HeuristicLab.Clients.Access/3.3/ClientInformation.cs (added)
• HeuristicLab.Clients.Access/3.3/ClientInformationUtils.cs (added)
• HeuristicLab.Clients.Access/3.3/ClientViews (added)
• HeuristicLab.Clients.Access/3.3/ClientViews/ClientView.Designer.cs (added)
• HeuristicLab.Clients.Access/3.3/ClientViews/ClientView.cs (added)
• HeuristicLab.Clients.Access/3.3/HeuristicLab.Clients.Access-3.3.csproj (modified) (5 diffs)
• HeuristicLab.Clients.Access/3.3/MenuItems (added)
• HeuristicLab.Clients.Access/3.3/MenuItems/ClientInfoMenuItem.cs (added)
• HeuristicLab.Clients.Access/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Clients.Access/3.3/ServiceClients/AccessServiceClient.cs (modified) (8 diffs)
• HeuristicLab.Clients.Access/3.3/ServiceClients/Client.cs (added)
• HeuristicLab.Clients.Access/3.3/ServiceClients/ClientGroup.cs (added)
• HeuristicLab.Clients.Access/3.3/ServiceClients/Resource.cs (added)
• HeuristicLab.Clients.Access/3.3/UserInformation.cs (modified) (3 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) (4 diffs)
• HeuristicLab.Services.Access.DataAccess/3.3/SQL Scripts/Initialize ClientManagement.sql (modified) (1 diff)
• HeuristicLab.Services.Access/3.3/Convert.cs (modified) (2 diffs)
• HeuristicLab.Services.Access/3.3/DataTransfer/Client.cs (modified) (1 diff)

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

@@ -38 +38 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Algorithms.Benchmarks-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Clients.Common-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Clients.Common-3.3.dll</HintPath>
@@ -74 +75 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Optimizer-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Persistence-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
@@ -85 +88 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
@@ -96 +100 @@
   <ItemGroup>
     <Compile Include="AccessClient.cs" />
+    <Compile Include="ClientInformation.cs" />
+    <Compile Include="ClientInformationUtils.cs" />
+    <Compile Include="ClientViews\ClientView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ClientViews\ClientView.Designer.cs">
+      <DependentUpon>ClientView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="MenuItems\ClientInfoMenuItem.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ServiceClients\AccessServiceClient.cs" />
     <Compile Include="ServiceClients\AccessItem.cs" />
+    <Compile Include="ServiceClients\ClientGroup.cs" />
+    <Compile Include="ServiceClients\Client.cs" />
+    <Compile Include="ServiceClients\Resource.cs" />
     <Compile Include="ServiceClients\IAccessItem.cs" />
     <Compile Include="ServiceClients\LightweightUser.cs" />
@@ -146 +162 @@
     <None Include="UpdateLocalInstallation.cmd" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/ClientUserManagement/HeuristicLab.Clients.Access/3.3/Plugin.cs.frame

@@ -29 +29 @@
   [PluginFile("HeuristicLab.Clients.Access-3.3.dll", PluginFileType.Assembly)]  
   [PluginDependency("HeuristicLab.Clients.Common", "3.3")]
+  [PluginDependency("HeuristicLab.Algorithms.Benchmarks", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
+  [PluginDependency("HeuristicLab.Optimizer", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]

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

@@ -2 +2 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.239
+//     Runtime Version:4.0.30319.261
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -18 +18 @@
   [System.SerializableAttribute()]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Access.User))]
+  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Access.UserGroup))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Access.LightweightUser))]
-  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Access.UserGroup))]
   public partial class UserGroupBase : HeuristicLab.Clients.Access.AccessItem {
 
@@ -56 +56 @@
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Access.UserGroupBase))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Access.User))]
+  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Access.UserGroup))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Access.LightweightUser))]
-  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Access.UserGroup))]
   public partial class AccessItem : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
 
@@ -73 +73 @@
 
     public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
+
+
   }
 
@@ -306 +308 @@
 
     [System.Runtime.Serialization.OptionalFieldAttribute()]
+    private double PerformanceValueField;
+
+    [System.Runtime.Serialization.OptionalFieldAttribute()]
     private string ProcessorTypeField;
 
@@ -403 +408 @@
 
     [System.Runtime.Serialization.DataMemberAttribute()]
+    public double PerformanceValue {
+      get {
+        return this.PerformanceValueField;
+      }
+      set {
+        if ((this.PerformanceValueField.Equals(value) != true)) {
+          this.PerformanceValueField = value;
+          this.RaisePropertyChanged("PerformanceValue");
+        }
+      }
+    }
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
     public string ProcessorType {
       get {
@@ -823 +841 @@
   [System.Diagnostics.DebuggerStepThroughAttribute()]
   [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
+  [System.Runtime.Serialization.DataContractAttribute(Name = "UserGroup", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Access.DataTransfer" +
+      "")]
+  [System.SerializableAttribute()]
+  public partial class UserGroup : HeuristicLab.Clients.Access.UserGroupBase {
+
+    [System.Runtime.Serialization.OptionalFieldAttribute()]
+    private string NameField;
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
+    public string Name {
+      get {
+        return this.NameField;
+      }
+      set {
+        if ((object.ReferenceEquals(this.NameField, value) != true)) {
+          this.NameField = value;
+          this.RaisePropertyChanged("Name");
+        }
+      }
+    }
+  }
+
+  [System.Diagnostics.DebuggerStepThroughAttribute()]
+  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
   [System.Runtime.Serialization.DataContractAttribute(Name = "LightweightUser", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Access.DataTransfer" +
       "")]
@@ -856 +898 @@
           this.UserNameField = value;
           this.RaisePropertyChanged("UserName");
-        }
-      }
-    }
-  }
-
-  [System.Diagnostics.DebuggerStepThroughAttribute()]
-  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
-  [System.Runtime.Serialization.DataContractAttribute(Name = "UserGroup", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Access.DataTransfer" +
-      "")]
-  [System.SerializableAttribute()]
-  public partial class UserGroup : HeuristicLab.Clients.Access.UserGroupBase {
-
-    [System.Runtime.Serialization.OptionalFieldAttribute()]
-    private string NameField;
-
-    [System.Runtime.Serialization.DataMemberAttribute()]
-    public string Name {
-      get {
-        return this.NameField;
-      }
-      set {
-        if ((object.ReferenceEquals(this.NameField, value) != true)) {
-          this.NameField = value;
-          this.RaisePropertyChanged("Name");
         }
       }

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

@@ -72 +72 @@
     }
 
-    private bool isInitialized = false;
-
-    public static void Initialize() {
-      if (!Instance.isInitialized) {
-        FetchUserInformationFromServerAsync();
-      }
-    }
-
     private UserInformation() {
-      if (!Instance.isInitialized) {
-        //this blocks, so there should be anywhere in the Optimizer startup process
-        //a call to FetchUserInformationFromServerAsync which is non-blocking
-        FetchUserInformationFromServer();
-      }
+      //this blocks, so there should be anywhere in the Optimizer startup process
+      //a call to FetchUserInformationFromServerAsync which is non-blocking
+      FetchUserInformationFromServer();
     }
 
@@ -96 +86 @@
         AccessClient.CallRunCreationService(x => groups = x.GetGroupsOfCurrentUser());
         AccessClient.CallRunCreationService(x => roles = x.GetRolesOfCurrentUser());
+        errorOccured = false;
+        userExists = true;
+        occuredException = null;
       }
       catch (MessageSecurityException e) {
@@ -101 +94 @@
         errorOccured = false;
         userExists = false;
-        isInitialized = true;
         occuredException = e;
-        return;
       }
       catch (Exception e) {
         errorOccured = true;
         userExists = false;
-        isInitialized = false;
         occuredException = e;
-        return;
       }
-
-      errorOccured = false;
-      userExists = true;
-      isInitialized = true;
-      occuredException = null;
-    }
-
-    private static void FetchUserInformationFromServerAsync() {
-      throw new NotImplementedException();
     }
 

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

@@ -21 +21 @@
         <Column Name="ClientConfigurationId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
         <Column Name="CountryId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
+        <Column Name="PerformanceValue" Type="System.Double" DbType="real" CanBeNull="true" />
         <Association Name="ClientType_Client" Member="ClientType" ThisKey="ClientTypeId" OtherKey="Id" Type="ClientType" IsForeignKey="true" />
         <Association Name="OperatingSystem_Client" Member="OperatingSystem" ThisKey="OperatingSystemId" OtherKey="Id" Type="OperatingSystem" IsForeignKey="true" />

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

@@ -29 +29 @@
       </nodes>
     </associationConnector>
-    <classShape Id="c964402f-99b7-4355-b9ad-279a2a7cf692" absoluteBounds="3.75, 2.5, 2, 2.5401025390624996">
+    <classShape Id="c964402f-99b7-4355-b9ad-279a2a7cf692" absoluteBounds="3.75, 2.5, 2, 2.7324039713541666">
       <DataClassMoniker Name="/ClientManagementDataContext/Client" />
       <nestedChildShapes>
-        <elementListCompartment Id="8d16a96c-4ba3-4e2b-b267-0cfe5bb174f1" absoluteBounds="3.7650000000000006, 2.96, 1.9700000000000002, 1.9801025390625" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
+        <elementListCompartment Id="8d16a96c-4ba3-4e2b-b267-0cfe5bb174f1" absoluteBounds="3.7650000000000006, 2.96, 1.9700000000000002, 2.1724039713541665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
       </nestedChildShapes>
     </classShape>
@@ -59 +59 @@
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(5.875 : 2.07859537760417); (5.875 : 2.34875); (8.125 : 2.34875)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(5.875 : 2.07859537760417); (5.875 : 2.34875); (8.125 : 2.34875)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <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="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(5.90625 : 2.07859537760417); (5.90625 : 6.22199625651042); (5.625 : 6.22199625651042)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/ClientManagementDataContext/Resource/Resource_ResourcePlugin" />
       <nodes>
@@ -172 +172 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(2.5 : 1.09699625651042); (4.46848483471003 : 1.09699625651042); (4.46848483471003 : 2.5)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(2.5 : 1.69399251302083); (2.875 : 2.06899251302083); (2.875 : 4.12102376302084); (3.75 : 4.12102376302084)]" fixedFrom="NotFixed" fixedTo="Algorithm">
       <AssociationMoniker Name="/ClientManagementDataContext/ClientType/ClientType_Client" />
       <nodes>
@@ -179 +179 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(2.5 : 2.72199625651042); (3.75 : 2.72199625651042)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(2.5 : 2.72199625651042); (2.79166666666667 : 2.72199625651042 : JumpStart); (2.95833333333333 : 2.72199625651042 : JumpEnd); (3.75 : 2.72199625651042)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/ClientManagementDataContext/OperatingSystem/OperatingSystem_Client" />
       <nodes>
@@ -186 +186 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(2.5 : 3.59699625651042); (3.75 : 3.59699625651042)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(2.5 : 3.49801188151042); (2.79166666666667 : 3.49801188151042 : JumpStart); (2.95833333333333 : 3.49801188151042 : JumpEnd); (3.75 : 3.49801188151042)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/ClientManagementDataContext/Country/Country_Client" />
       <nodes>
@@ -193 +193 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(2.5 : 4.64505126953125); (3.75 : 4.64505126953125)]" fixedFrom="NotFixed" fixedTo="NotFixed">
+    <associationConnector edgePoints="[(2.5 : 4.74120198567708); (3.75 : 4.74120198567708)]" fixedFrom="Algorithm" fixedTo="Algorithm">
       <AssociationMoniker Name="/ClientManagementDataContext/ClientConfiguration/ClientConfiguration_Client" />
       <nodes>

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

@@ -3 +3 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.237
+//     Runtime Version:4.0.30319.261
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -466 +466 @@
     private System.Nullable<System.Guid> _CountryId;
     
+    private System.Nullable<double> _PerformanceValue;
+    
     private EntityRef<ClientType> _ClientType;
     
@@ -496 +498 @@
     partial void OnCountryIdChanging(System.Nullable<System.Guid> value);
     partial void OnCountryIdChanged();
+    partial void OnPerformanceValueChanging(System.Nullable<double> value);
+    partial void OnPerformanceValueChanged();
     #endregion
     
@@ -699 +703 @@
           this.SendPropertyChanged("CountryId");
           this.OnCountryIdChanged();
+        }
+      }
+    }
+    
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PerformanceValue", DbType="real")]
+    public System.Nullable<double> PerformanceValue
+    {
+      get
+      {
+        return this._PerformanceValue;
+      }
+      set
+      {
+        if ((this._PerformanceValue != value))
+        {
+          this.OnPerformanceValueChanging(value);
+          this.SendPropertyChanging();
+          this._PerformanceValue = value;
+          this.SendPropertyChanged("PerformanceValue");
+          this.OnPerformanceValueChanged();
         }
       }

branches/ClientUserManagement/HeuristicLab.Services.Access.DataAccess/3.3/SQL Scripts/Initialize ClientManagement.sql

@@ -294 +294 @@
   [ClientConfigurationId] [uniqueidentifier] NULL,
   [Timestamp] [datetime] NULL,
+  [PerformanceValue] [real] NULL,
  CONSTRAINT [PK_Resource] PRIMARY KEY CLUSTERED 
 (

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

@@ -200 +200 @@
         NumberOfCores = source.NumberOfCores.GetValueOrDefault(),
         ProcessorType = source.ProcessorType,
+        PerformanceValue = source.PerformanceValue.GetValueOrDefault(),
         ClientType = ToDto(source.ClientType)
       };
@@ -217 +218 @@
         NumberOfCores = source.NumberOfCores,
         ProcessorType = source.ProcessorType,
+        PerformanceValue = source.PerformanceValue,
         ClientType = ToEntity(source.ClientType)
       };

branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/Client.cs

@@ -44 +44 @@
     [DataMember]
     public string ProcessorType { get; set; }
+    [DataMember]
+    public double PerformanceValue { get; set; }
   }
 }