Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/23/11 20:13:55 (13 years ago)
Author:
ascheibe
Message:

#1648 updated the database scheme and dto's

Location:
branches/ClientUserManagement
Files:
7 added
7 edited

Legend:

Unmodified
Added
Removed

  • branches/ClientUserManagement

    • Property svn:ignore

      •  

        old new  
        11*.suo
         2*.testsettings
         3HeuristicLab.Services.Access.vsmdi

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

    • Property svn:ignore

      •  

        old new  
        22bin
        33obj
         4HeuristicLab.Services.Access-3.3.csproj.user

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

    r6820 r6825  
    2020#endregion
    2121
     22using System;
    2223using System.Runtime.Serialization;
    2324
    … …  
    2627  public class Client : Resource {
    2728    [DataMember]
    28     public string ProcessorType { get; set; }
     29    public ClientConfiguration ClientConfiguration { get; set; }
    2930    [DataMember]
    30     public int? NumberOfCores { get; set; }
    31     [DataMember]
    32     public int? MemorySize { get; set; }
    33     [DataMember]
    34     public string OperatingSystem { get; set; }
    35     [DataMember]
    36     public string IPAddress { get; set; }
     31    public ClientType ClientType { get; set; }
    3732    [DataMember]
    3833    public string HeuristicLabVersion { get; set; }
    3934    [DataMember]
    40     public string Country { get; set; }
     35    public Country Country { get; set; }
    4136    [DataMember]
    42     public string ClientType { get; set; }
     37    public HeuristicLab.Services.Access.DataTransfer.OperatingSystem OperatingSystem { get; set; }
     38    [DataMember]
     39    public int MemorySize { get; set; }
     40    [DataMember]
     41    public DateTime Timestamp { get; set; }
     42    [DataMember]
     43    public int NumberOfCores { get; set; }
     44    [DataMember]
     45    public string ProcessorType { get; set; }
    4346  }
    4447}

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

    r6815 r6825  
    3131    [DataMember]
    3232    public string Message { get; set; }
    33     [DataMember]
    34     public string Exception { get; set; }
    3533  }
    3634}

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

    r6815 r6825  
    2121
    2222using System;
    23 using System.Collections.Generic;
    2423using System.Runtime.Serialization;
    2524
    … …  
    3332    [DataMember]
    3433    public string Description { get; set; }
    35     [DataMember]
    36     public string Type { get; set; }
    37     [DataMember]
    38     public IEnumerable<ClientGroup> ParentGroups { get; set; }
    3934  }
    4035}

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

    r6820 r6825  
    2626namespace HeuristicLab.Services.Access.DataTransfer {
    2727  [DataContract]
    28   public class User : AccessItem {
     28  public class User : UserGroupBase {
    2929    [DataMember]
    3030    public string UserName { get; set; }

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

    r6820 r6825  
    2020#endregion
    2121
    22 using System;
    2322using System.Runtime.Serialization;
    2423
    2524namespace HeuristicLab.Services.Access.DataTransfer {
    2625  [DataContract]
    27   public class UserGroup : AccessItem {
     26  public class UserGroup : UserGroupBase {
    2827    [DataMember]
    2928    public string Name { get; set; }
    30     [DataMember]
    31     public Guid ParentUserGroup { get; set; }
    3229  }
    3330}
Note: See TracChangeset for help on using the changeset viewer.