Free cookie consent management tool by TermsFeed Policy Generator

Changeset 6820


Ignore:
Timestamp:
09/22/11 13:06:02 (13 years ago)
Author:
ascheibe
Message:

#1648 some minor fixes in the dto's, database and sql scripts

Location:
branches/ClientUserManagement
Files:
3 deleted
9 edited
6 copied

Legend:

Unmodified
Added
Removed

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

    r6815 r6820  
    1818        <Column Name="HeuristicLabVersion" Type="System.String" DbType="NVarChar(MAX)" CanBeNull="true" />
    1919        <Column Name="Country" Type="System.String" DbType="NVarChar(MAX)" CanBeNull="true" />
     20        <Column Name="ClientType" Type="System.String" DbType="NVarChar(MAX)" CanBeNull="true" />
    2021      </Type>
    2122      <Type Name="Group" InheritanceCode="Group" />

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

    r6815 r6820  
    3535      </nestedChildShapes>
    3636    </classShape>
    37     <classShape Id="93bcfe43-938e-49f8-90db-b5056196257b" absoluteBounds="2.875, 2.875, 2, 2.1554996744791666">
     37    <classShape Id="93bcfe43-938e-49f8-90db-b5056196257b" absoluteBounds="2.875, 2.875, 2, 2.3478011067708326">
    3838      <DataClassMoniker Name="/ClientManagementDataContext/Client" />
    3939      <nestedChildShapes>
    40         <elementListCompartment Id="f89c2c39-17cc-4b0e-b5e0-245107753b38" absoluteBounds="2.89, 3.335, 1.9700000000000002, 1.5954996744791665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
     40        <elementListCompartment Id="f89c2c39-17cc-4b0e-b5e0-245107753b38" absoluteBounds="2.89, 3.335, 1.9700000000000002, 1.7878011067708333" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
    4141      </nestedChildShapes>
    4242    </classShape>
    … …  
    8484      </nestedChildShapes>
    8585    </classShape>
    86     <associationConnector edgePoints="[(7.0625 : 5.31899251302083); (7.0625 : 6.125)]" fixedFrom="Algorithm" fixedTo="Algorithm">
     86    <associationConnector edgePoints="[(7.0625 : 5.31899251302083); (7.0625 : 6.125)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    8787      <AssociationMoniker Name="/ClientManagementDataContext/User/User_UserUserGroup" />
    8888      <nodes>

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

    r6815 r6820  
    368368    private string _Country;
    369369   
     370    private string _ClientType;
     371   
    370372    #region Extensibility Method Definitions
    371373    partial void OnLoaded();
    … …  
    386388    partial void OnCountryChanging(string value);
    387389    partial void OnCountryChanged();
     390    partial void OnClientTypeChanging(string value);
     391    partial void OnClientTypeChanged();
    388392    #endregion
    389393   
    … …  
    529533          this.SendPropertyChanged("Country");
    530534          this.OnCountryChanged();
     535        }
     536      }
     537    }
     538   
     539    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ClientType", DbType="NVarChar(MAX)")]
     540    public string ClientType
     541    {
     542      get
     543      {
     544        return this._ClientType;
     545      }
     546      set
     547      {
     548        if ((this._ClientType != value))
     549        {
     550          this.OnClientTypeChanging(value);
     551          this.SendPropertyChanging();
     552          this._ClientType = value;
     553          this.SendPropertyChanged("ClientType");
     554          this.OnClientTypeChanged();
    531555        }
    532556      }

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

    r6815 r6820  
    22GO
    33
    4 /****** Object:  Table [dbo].[Resource]    Script Date: 09/19/2011 13:24:05 ******/
     4/****** Object:  Table [dbo].[Resource]    Script Date: 09/22/2011 12:53:30 ******/
    55SET ANSI_NULLS ON
    66GO
    … …  
    1515  [Type] [nvarchar](max) NOT NULL,
    1616  [ProcessorType] [nvarchar](max) NULL,
    17   [NumberOfCores] [int](max) NULL,
     17  [NumberOfCores] [int] NULL,
    1818  [IPAddress] [nvarchar](max) NULL,
    19   [MemorySize] [int](max) NULL,
     19  [MemorySize] [int] NULL,
    2020  [OperatingSystem] [nvarchar](max) NULL,
    2121  [Country] [nvarchar](max) NULL,
    2222  [HeuristicLabVersion] [nvarchar](max) NULL,
     23  [ClientType] [nvarchar](max) NULL,
    2324 CONSTRAINT [PK_Resource] PRIMARY KEY CLUSTERED
    2425(
    … …  
    2829
    2930GO
    30 
    31 /****** Object:  Table [dbo].[ResourceResourceGroup]    Script Date: 09/19/2011 13:24:08 ******/
     31/****** Object:  Table [dbo].[ResourceResourceGroup]    Script Date: 09/22/2011 12:53:47 ******/
    3232SET ANSI_NULLS ON
    3333GO
    … …  
    6060
    6161ALTER TABLE [dbo].[ResourceResourceGroup] CHECK CONSTRAINT [FK_ResourceResourceGroup_ResourceId]
    62 GO
    6362
    64 /****** Object:  Table [dbo].[ClientLog]    Script Date: 09/19/2011 13:24:11 ******/
     63/****** Object:  Table [dbo].[ClientLog]    Script Date: 09/22/2011 12:54:07 ******/
    6564SET ANSI_NULLS ON
    6665GO
    … …  
    9089GO
    9190
     91/****** Object:  Table [dbo].[User]    Script Date: 09/22/2011 12:54:23 ******/
     92SET ANSI_NULLS ON
     93GO
    9294
     95SET QUOTED_IDENTIFIER ON
     96GO
    9397
     98CREATE TABLE [dbo].[User](
     99  [Id] [uniqueidentifier] NOT NULL,
     100  [FullName] [nvarchar](max) NULL,
     101 CONSTRAINT [PK_User] PRIMARY KEY CLUSTERED
     102(
     103  [Id] ASC
     104)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
     105) ON [PRIMARY]
    94106
     107GO
    95108
     109/****** Object:  Table [dbo].[UserGroup]    Script Date: 09/22/2011 12:54:35 ******/
     110SET ANSI_NULLS ON
     111GO
    96112
     113SET QUOTED_IDENTIFIER ON
     114GO
     115
     116CREATE TABLE [dbo].[UserGroup](
     117  [Id] [uniqueidentifier] NOT NULL,
     118  [Name] [nvarchar](max) NOT NULL,
     119  [ParentUserGroup] [uniqueidentifier] NULL,
     120 CONSTRAINT [PK_UserGroup] PRIMARY KEY CLUSTERED
     121(
     122  [Id] ASC
     123)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
     124) ON [PRIMARY]
     125
     126GO
     127
     128/****** Object:  Table [dbo].[UserUserGroup]    Script Date: 09/22/2011 12:54:52 ******/
     129SET ANSI_NULLS ON
     130GO
     131
     132SET QUOTED_IDENTIFIER ON
     133GO
     134
     135CREATE TABLE [dbo].[UserUserGroup](
     136  [UserId] [uniqueidentifier] NOT NULL,
     137  [UserGroupId] [uniqueidentifier] NOT NULL,
     138 CONSTRAINT [PK_UserUserGroup] PRIMARY KEY CLUSTERED
     139(
     140  [UserId] ASC,
     141  [UserGroupId] ASC
     142)WITH (PAD_INDEX  = OFF, STATISTICS_NORECOMPUTE  = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS  = ON, ALLOW_PAGE_LOCKS  = ON) ON [PRIMARY]
     143) ON [PRIMARY]
     144
     145GO
     146
     147ALTER TABLE [dbo].[UserUserGroup]  WITH CHECK ADD  CONSTRAINT [FK_UserUserGroup_User] FOREIGN KEY([UserId])
     148REFERENCES [dbo].[User] ([Id])
     149GO
     150
     151ALTER TABLE [dbo].[UserUserGroup] CHECK CONSTRAINT [FK_UserUserGroup_User]
     152GO
     153
     154ALTER TABLE [dbo].[UserUserGroup]  WITH CHECK ADD  CONSTRAINT [FK_UserUserGroup_UserGroup] FOREIGN KEY([UserGroupId])
     155REFERENCES [dbo].[UserGroup] ([Id])
     156GO
     157
     158ALTER TABLE [dbo].[UserUserGroup] CHECK CONSTRAINT [FK_UserUserGroup_UserGroup]
     159GO

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

    r6815 r6820  
    7979        NumberOfCores = source.NumberOfCores,
    8080        OperatingSystem = source.OperatingSystem,
    81         ProcessorType = source.ProcessorType
     81        ProcessorType = source.ProcessorType,
     82        ClientType = source.ClientType
    8283      };
    8384    }
    … …  
    9596        NumberOfCores = source.NumberOfCores,
    9697        OperatingSystem = source.OperatingSystem,
    97         ProcessorType = source.ProcessorType
     98        ProcessorType = source.ProcessorType,
     99        ClientType = source.ClientType
    98100      };
    99101    }

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

    r6815 r6820  
    3939    [DataMember]
    4040    public string Country { get; set; }
     41    [DataMember]
     42    public string ClientType { get; set; }
    4143  }
    4244}

  • branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/Role.cs

    r6815 r6820  
    2626  [DataContract]
    2727  public class Role : AccessItem {
    28 
    2928    [DataMember]
    30     public string RoleName { get; set; }
     29    public string Name { get; set; }
    3130  }
    3231}

  • branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/User.cs

    r6815 r6820  
    2929    [DataMember]
    3030    public string UserName { get; set; }
    31 
    3231    [DataMember]
    3332    public string FullName { get; set; }
    34 
    3533    [DataMember]
    3634    public string Comment { get; set; }
    37 
    3835    [DataMember]
    3936    public string Email { get; set; }
    40 
     37    [DataMember]
     38    public IEnumerable<UserGroup> UserGroups { get; set; }
    4139    [DataMember]
    4240    public DateTime CreationDate { get; set; }
    43 
    44     [DataMember]
    45     public IEnumerable<UserGroup> UserGroups { get; set; }
    46 
    4741    [DataMember]
    4842    public DateTime LastLoginDate { get; set; }
    49 
    5043    [DataMember]
    5144    public DateTime LastPasswordChangedDate { get; set; }
    52 
    5345    [DataMember]
    54     public DateTime LastLockoutDate { get; set; }
    55 
     46    public DateTime LastActivityDate { get; set; }
    5647    [DataMember]
    5748    public bool IsApproved { get; set; }
    58 
    59     [DataMember]
    60     public bool IsLockedOut { get; set; }
    61 
    62     [DataMember]
    63     public bool IsOnline { get; set; }
    64 
    65     [DataMember]
    66     public DateTime LastActivityDate { get; set; }
    67 
    68     [DataMember]
    69     public string PasswordQuestion { get; set; }
    70 
    71     [DataMember]
    72     public string ProviderName { get; set; }
    73 
    74     [DataMember]
    75     public object ProviderUserKey { get; set; }
    7649  }
    7750}

  • branches/ClientUserManagement/HeuristicLab.Services.Access/3.3/DataTransfer/UserGroup.cs

    r6815 r6820  
    2828    [DataMember]
    2929    public string Name { get; set; }
    30 
    3130    [DataMember]
    3231    public Guid ParentUserGroup { get; set; }
Note: See TracChangeset for help on using the changeset viewer.