Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/15/18 12:36:08 (6 years ago)
Author:
gkronber
Message:

#2892: Merging r15750:16382 (HEAD) from trunk to branch, resolving conflicts

Location:
branches/2892_LR-prediction-intervals
Files:
5 edited
3 copied

Legend:

Unmodified
Added
Removed

  • branches/2892_LR-prediction-intervals

  • branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Hive

  • branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveServiceClient.cs

    r14738 r16388  
    2626    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.SlaveGroup))]
    2727    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Plugin))]
     28    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Project))]
     29    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.AssignedJobResource))]
    2830    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.JobPermission))]
    2931    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.PluginData))]
    30     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.ResourcePermission))]
     32    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.ProjectPermission))]
     33    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.AssignedProjectResource))]
    3134    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Downtime))]
    3235    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.UserPriority))]
    … …  
    211214    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.SlaveGroup))]
    212215    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Plugin))]
     216    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Project))]
    213217    public partial class NamedHiveItem : HeuristicLab.Clients.Hive.HiveItem
    214218    {
    … …  
    284288       
    285289        [System.Runtime.Serialization.OptionalFieldAttribute()]
    286         private string ResourceNamesField;
     290        private System.Guid ProjectIdField;
     291       
     292        [System.Runtime.Serialization.OptionalFieldAttribute()]
     293        private HeuristicLab.Clients.Hive.JobState StateField;
    287294       
    288295        [System.Runtime.Serialization.DataMemberAttribute()]
    … …  
    406413       
    407414        [System.Runtime.Serialization.DataMemberAttribute()]
    408         public string ResourceNames
    409         {
    410             get
    411             {
    412                 return this.ResourceNamesField;
    413             }
    414             set
    415             {
    416                 if ((object.ReferenceEquals(this.ResourceNamesField, value) != true))
    417                 {
    418                     this.ResourceNamesField = value;
    419                     this.RaisePropertyChanged("ResourceNames");
     415        public System.Guid ProjectId
     416        {
     417            get
     418            {
     419                return this.ProjectIdField;
     420            }
     421            set
     422            {
     423                if ((this.ProjectIdField.Equals(value) != true))
     424                {
     425                    this.ProjectIdField = value;
     426                    this.RaisePropertyChanged("ProjectId");
     427                }
     428            }
     429        }
     430       
     431        [System.Runtime.Serialization.DataMemberAttribute()]
     432        public HeuristicLab.Clients.Hive.JobState State
     433        {
     434            get
     435            {
     436                return this.StateField;
     437            }
     438            set
     439            {
     440                if ((this.StateField.Equals(value) != true))
     441                {
     442                    this.StateField = value;
     443                    this.RaisePropertyChanged("State");
    420444                }
    421445            }
    … …  
    839863    [System.Diagnostics.DebuggerStepThroughAttribute()]
    840864    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     865    [System.Runtime.Serialization.DataContractAttribute(Name="Project", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
     866    [System.SerializableAttribute()]
     867    public partial class Project : HeuristicLab.Clients.Hive.NamedHiveItem
     868    {
     869       
     870        [System.Runtime.Serialization.OptionalFieldAttribute()]
     871        private System.DateTime DateCreatedField;
     872       
     873        [System.Runtime.Serialization.OptionalFieldAttribute()]
     874        private System.Nullable<System.DateTime> EndDateField;
     875       
     876        [System.Runtime.Serialization.OptionalFieldAttribute()]
     877        private System.Guid OwnerUserIdField;
     878       
     879        [System.Runtime.Serialization.OptionalFieldAttribute()]
     880        private System.Nullable<System.Guid> ParentProjectIdField;
     881       
     882        [System.Runtime.Serialization.OptionalFieldAttribute()]
     883        private System.DateTime StartDateField;
     884       
     885        [System.Runtime.Serialization.DataMemberAttribute()]
     886        public System.DateTime DateCreated
     887        {
     888            get
     889            {
     890                return this.DateCreatedField;
     891            }
     892            set
     893            {
     894                if ((this.DateCreatedField.Equals(value) != true))
     895                {
     896                    this.DateCreatedField = value;
     897                    this.RaisePropertyChanged("DateCreated");
     898                }
     899            }
     900        }
     901       
     902        [System.Runtime.Serialization.DataMemberAttribute()]
     903        public System.Nullable<System.DateTime> EndDate
     904        {
     905            get
     906            {
     907                return this.EndDateField;
     908            }
     909            set
     910            {
     911                if ((this.EndDateField.Equals(value) != true))
     912                {
     913                    this.EndDateField = value;
     914                    this.RaisePropertyChanged("EndDate");
     915                }
     916            }
     917        }
     918       
     919        [System.Runtime.Serialization.DataMemberAttribute()]
     920        public System.Guid OwnerUserId
     921        {
     922            get
     923            {
     924                return this.OwnerUserIdField;
     925            }
     926            set
     927            {
     928                if ((this.OwnerUserIdField.Equals(value) != true))
     929                {
     930                    this.OwnerUserIdField = value;
     931                    this.RaisePropertyChanged("OwnerUserId");
     932                }
     933            }
     934        }
     935       
     936        [System.Runtime.Serialization.DataMemberAttribute()]
     937        public System.Nullable<System.Guid> ParentProjectId
     938        {
     939            get
     940            {
     941                return this.ParentProjectIdField;
     942            }
     943            set
     944            {
     945                if ((this.ParentProjectIdField.Equals(value) != true))
     946                {
     947                    this.ParentProjectIdField = value;
     948                    this.RaisePropertyChanged("ParentProjectId");
     949                }
     950            }
     951        }
     952       
     953        [System.Runtime.Serialization.DataMemberAttribute()]
     954        public System.DateTime StartDate
     955        {
     956            get
     957            {
     958                return this.StartDateField;
     959            }
     960            set
     961            {
     962                if ((this.StartDateField.Equals(value) != true))
     963                {
     964                    this.StartDateField = value;
     965                    this.RaisePropertyChanged("StartDate");
     966                }
     967            }
     968        }
     969    }
     970   
     971    [System.Diagnostics.DebuggerStepThroughAttribute()]
     972    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     973    [System.Runtime.Serialization.DataContractAttribute(Name="AssignedJobResource", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
     974    [System.SerializableAttribute()]
     975    public partial class AssignedJobResource : HeuristicLab.Clients.Hive.HiveItem
     976    {
     977       
     978        [System.Runtime.Serialization.OptionalFieldAttribute()]
     979        private System.Guid JobIdField;
     980       
     981        [System.Runtime.Serialization.OptionalFieldAttribute()]
     982        private System.Guid ResourceIdField;
     983       
     984        [System.Runtime.Serialization.DataMemberAttribute()]
     985        public System.Guid JobId
     986        {
     987            get
     988            {
     989                return this.JobIdField;
     990            }
     991            set
     992            {
     993                if ((this.JobIdField.Equals(value) != true))
     994                {
     995                    this.JobIdField = value;
     996                    this.RaisePropertyChanged("JobId");
     997                }
     998            }
     999        }
     1000       
     1001        [System.Runtime.Serialization.DataMemberAttribute()]
     1002        public System.Guid ResourceId
     1003        {
     1004            get
     1005            {
     1006                return this.ResourceIdField;
     1007            }
     1008            set
     1009            {
     1010                if ((this.ResourceIdField.Equals(value) != true))
     1011                {
     1012                    this.ResourceIdField = value;
     1013                    this.RaisePropertyChanged("ResourceId");
     1014                }
     1015            }
     1016        }
     1017    }
     1018   
     1019    [System.Diagnostics.DebuggerStepThroughAttribute()]
     1020    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    8411021    [System.Runtime.Serialization.DataContractAttribute(Name="JobPermission", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
    8421022    [System.SerializableAttribute()]
    … …  
    9951175    [System.Diagnostics.DebuggerStepThroughAttribute()]
    9961176    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    997     [System.Runtime.Serialization.DataContractAttribute(Name="ResourcePermission", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
     1177    [System.Runtime.Serialization.DataContractAttribute(Name="ProjectPermission", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
    9981178    [System.SerializableAttribute()]
    999     public partial class ResourcePermission : HeuristicLab.Clients.Hive.HiveItem
     1179    public partial class ProjectPermission : HeuristicLab.Clients.Hive.HiveItem
    10001180    {
    10011181       
    … …  
    10071187       
    10081188        [System.Runtime.Serialization.OptionalFieldAttribute()]
    1009         private System.Guid ResourceIdField;
     1189        private System.Guid ProjectIdField;
    10101190       
    10111191        [System.Runtime.Serialization.DataMemberAttribute()]
    … …  
    10391219                    this.GrantedUserIdField = value;
    10401220                    this.RaisePropertyChanged("GrantedUserId");
     1221                }
     1222            }
     1223        }
     1224       
     1225        [System.Runtime.Serialization.DataMemberAttribute()]
     1226        public System.Guid ProjectId
     1227        {
     1228            get
     1229            {
     1230                return this.ProjectIdField;
     1231            }
     1232            set
     1233            {
     1234                if ((this.ProjectIdField.Equals(value) != true))
     1235                {
     1236                    this.ProjectIdField = value;
     1237                    this.RaisePropertyChanged("ProjectId");
     1238                }
     1239            }
     1240        }
     1241    }
     1242   
     1243    [System.Diagnostics.DebuggerStepThroughAttribute()]
     1244    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     1245    [System.Runtime.Serialization.DataContractAttribute(Name="AssignedProjectResource", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
     1246    [System.SerializableAttribute()]
     1247    public partial class AssignedProjectResource : HeuristicLab.Clients.Hive.HiveItem
     1248    {
     1249       
     1250        [System.Runtime.Serialization.OptionalFieldAttribute()]
     1251        private System.Guid ProjectIdField;
     1252       
     1253        [System.Runtime.Serialization.OptionalFieldAttribute()]
     1254        private System.Guid ResourceIdField;
     1255       
     1256        [System.Runtime.Serialization.DataMemberAttribute()]
     1257        public System.Guid ProjectId
     1258        {
     1259            get
     1260            {
     1261                return this.ProjectIdField;
     1262            }
     1263            set
     1264            {
     1265                if ((this.ProjectIdField.Equals(value) != true))
     1266                {
     1267                    this.ProjectIdField = value;
     1268                    this.RaisePropertyChanged("ProjectId");
    10411269                }
    10421270            }
    … …  
    16121840        [System.Runtime.Serialization.EnumMemberAttribute()]
    16131841        Full = 2,
     1842    }
     1843   
     1844    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     1845    [System.Runtime.Serialization.DataContractAttribute(Name="JobState", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
     1846    public enum JobState : int
     1847    {
     1848       
     1849        [System.Runtime.Serialization.EnumMemberAttribute()]
     1850        Online = 0,
     1851       
     1852        [System.Runtime.Serialization.EnumMemberAttribute()]
     1853        StatisticsPending = 1,
     1854       
     1855        [System.Runtime.Serialization.EnumMemberAttribute()]
     1856        DeletionPending = 2,
    16141857    }
    16151858   
    … …  
    21002343       
    21012344        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/AddTask", ReplyAction="http://tempuri.org/IHiveService/AddTaskResponse")]
    2102         System.Guid AddTask(HeuristicLab.Clients.Hive.Task task, HeuristicLab.Clients.Hive.TaskData taskData, System.Collections.Generic.List<System.Guid> resourceIds);
     2345        System.Guid AddTask(HeuristicLab.Clients.Hive.Task task, HeuristicLab.Clients.Hive.TaskData taskData);
    21032346       
    21042347        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/AddChildTask", ReplyAction="http://tempuri.org/IHiveService/AddChildTaskResponse")]
    … …  
    21412384        System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetJobs();
    21422385       
     2386        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetJobsByProjectId", ReplyAction="http://tempuri.org/IHiveService/GetJobsByProjectIdResponse")]
     2387        System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetJobsByProjectId(System.Guid projectId);
     2388       
     2389        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetJobsByProjectIds", ReplyAction="http://tempuri.org/IHiveService/GetJobsByProjectIdsResponse")]
     2390        System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetJobsByProjectIds(System.Collections.Generic.List<System.Guid> projectIds);
     2391       
    21432392        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/AddJob", ReplyAction="http://tempuri.org/IHiveService/AddJobResponse")]
    2144         System.Guid AddJob(HeuristicLab.Clients.Hive.Job jobDto);
     2393        System.Guid AddJob(HeuristicLab.Clients.Hive.Job jobDto, System.Collections.Generic.List<System.Guid> resourceIds);
    21452394       
    21462395        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/UpdateJob", ReplyAction="http://tempuri.org/IHiveService/UpdateJobResponse")]
    2147         void UpdateJob(HeuristicLab.Clients.Hive.Job jobDto);
    2148        
    2149         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/DeleteJob", ReplyAction="http://tempuri.org/IHiveService/DeleteJobResponse")]
    2150         void DeleteJob(System.Guid JobId);
     2396        void UpdateJob(HeuristicLab.Clients.Hive.Job jobDto, System.Collections.Generic.List<System.Guid> resourceIds);
     2397       
     2398        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/UpdateJobState", ReplyAction="http://tempuri.org/IHiveService/UpdateJobStateResponse")]
     2399        void UpdateJobState(System.Guid JobId, HeuristicLab.Clients.Hive.JobState jobState);
     2400       
     2401        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/UpdateJobStates", ReplyAction="http://tempuri.org/IHiveService/UpdateJobStatesResponse")]
     2402        void UpdateJobStates(System.Collections.Generic.List<System.Guid> jobIds, HeuristicLab.Clients.Hive.JobState jobState);
     2403       
     2404        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetAssignedResourcesForJob", ReplyAction="http://tempuri.org/IHiveService/GetAssignedResourcesForJobResponse")]
     2405        System.Collections.Generic.List<HeuristicLab.Clients.Hive.AssignedJobResource> GetAssignedResourcesForJob(System.Guid jobId);
    21512406       
    21522407        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GrantPermission", ReplyAction="http://tempuri.org/IHiveService/GrantPermissionResponse")]
    … …  
    21842439        System.Collections.Generic.List<HeuristicLab.Clients.Hive.PluginData> GetPluginDatas(System.Collections.Generic.List<System.Guid> pluginIds);
    21852440       
    2186         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GrantResourcePermissions", ReplyAction="http://tempuri.org/IHiveService/GrantResourcePermissionsResponse")]
    2187         void GrantResourcePermissions(System.Guid resourceId, System.Collections.Generic.List<System.Guid> grantedUserIds);
    2188        
    2189         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/RevokeResourcePermissions", ReplyAction="http://tempuri.org/IHiveService/RevokeResourcePermissionsResponse")]
    2190         void RevokeResourcePermissions(System.Guid resourceId, System.Collections.Generic.List<System.Guid> grantedUserIds);
    2191        
    2192         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetResourcePermissions", ReplyAction="http://tempuri.org/IHiveService/GetResourcePermissionsResponse")]
    2193         System.Collections.Generic.List<HeuristicLab.Clients.Hive.ResourcePermission> GetResourcePermissions(System.Guid resourceId);
     2441        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/AddProject", ReplyAction="http://tempuri.org/IHiveService/AddProjectResponse")]
     2442        System.Guid AddProject(HeuristicLab.Clients.Hive.Project projectDto);
     2443       
     2444        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/UpdateProject", ReplyAction="http://tempuri.org/IHiveService/UpdateProjectResponse")]
     2445        void UpdateProject(HeuristicLab.Clients.Hive.Project projectDto);
     2446       
     2447        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/DeleteProject", ReplyAction="http://tempuri.org/IHiveService/DeleteProjectResponse")]
     2448        void DeleteProject(System.Guid projectId);
     2449       
     2450        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetProject", ReplyAction="http://tempuri.org/IHiveService/GetProjectResponse")]
     2451        HeuristicLab.Clients.Hive.Project GetProject(System.Guid projectId);
     2452       
     2453        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetProjects", ReplyAction="http://tempuri.org/IHiveService/GetProjectsResponse")]
     2454        System.Collections.Generic.List<HeuristicLab.Clients.Hive.Project> GetProjects();
     2455       
     2456        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetProjectsForAdministration", ReplyAction="http://tempuri.org/IHiveService/GetProjectsForAdministrationResponse")]
     2457        System.Collections.Generic.List<HeuristicLab.Clients.Hive.Project> GetProjectsForAdministration();
     2458       
     2459        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetProjectGenealogy", ReplyAction="http://tempuri.org/IHiveService/GetProjectGenealogyResponse")]
     2460        System.Collections.Generic.Dictionary<System.Guid, System.Collections.Generic.List<System.Guid>> GetProjectGenealogy();
     2461       
     2462        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetProjectNames", ReplyAction="http://tempuri.org/IHiveService/GetProjectNamesResponse")]
     2463        System.Collections.Generic.Dictionary<System.Guid, string> GetProjectNames();
     2464       
     2465        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/SaveProjectPermissions", ReplyAction="http://tempuri.org/IHiveService/SaveProjectPermissionsResponse")]
     2466        void SaveProjectPermissions(System.Guid projectId, System.Collections.Generic.List<System.Guid> grantedUserIds, bool reassign, bool cascading, bool reassignCascading);
     2467       
     2468        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetProjectPermissions", ReplyAction="http://tempuri.org/IHiveService/GetProjectPermissionsResponse")]
     2469        System.Collections.Generic.List<HeuristicLab.Clients.Hive.ProjectPermission> GetProjectPermissions(System.Guid projectId);
     2470       
     2471        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/SaveProjectResourceAssignments", ReplyAction="http://tempuri.org/IHiveService/SaveProjectResourceAssignmentsResponse")]
     2472        void SaveProjectResourceAssignments(System.Guid projectId, System.Collections.Generic.List<System.Guid> resourceIds, bool reassign, bool cascading, bool reassignCascading);
     2473       
     2474        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetAssignedResourcesForProject", ReplyAction="http://tempuri.org/IHiveService/GetAssignedResourcesForProjectResponse")]
     2475        System.Collections.Generic.List<HeuristicLab.Clients.Hive.AssignedProjectResource> GetAssignedResourcesForProject(System.Guid projectId);
     2476       
     2477        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetAssignedResourcesForProjectAdministration", ReplyAction="http://tempuri.org/IHiveService/GetAssignedResourcesForProjectAdministrationRespo" +
     2478            "nse")]
     2479        System.Collections.Generic.List<HeuristicLab.Clients.Hive.AssignedProjectResource> GetAssignedResourcesForProjectAdministration(System.Guid projectId);
     2480       
     2481        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetAssignedResourcesForProjectsAdministration", ReplyAction="http://tempuri.org/IHiveService/GetAssignedResourcesForProjectsAdministrationResp" +
     2482            "onse")]
     2483        System.Collections.Generic.List<HeuristicLab.Clients.Hive.AssignedProjectResource> GetAssignedResourcesForProjectsAdministration(System.Collections.Generic.List<System.Guid> projectIds);
    21942484       
    21952485        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/AddSlave", ReplyAction="http://tempuri.org/IHiveService/AddSlaveResponse")]
    … …  
    22082498        System.Collections.Generic.List<HeuristicLab.Clients.Hive.SlaveGroup> GetSlaveGroups();
    22092499       
     2500        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetSlavesForAdministration", ReplyAction="http://tempuri.org/IHiveService/GetSlavesForAdministrationResponse")]
     2501        System.Collections.Generic.List<HeuristicLab.Clients.Hive.Slave> GetSlavesForAdministration();
     2502       
     2503        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetSlaveGroupsForAdministration", ReplyAction="http://tempuri.org/IHiveService/GetSlaveGroupsForAdministrationResponse")]
     2504        System.Collections.Generic.List<HeuristicLab.Clients.Hive.SlaveGroup> GetSlaveGroupsForAdministration();
     2505       
     2506        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetResourceGenealogy", ReplyAction="http://tempuri.org/IHiveService/GetResourceGenealogyResponse")]
     2507        System.Collections.Generic.Dictionary<System.Guid, System.Collections.Generic.List<System.Guid>> GetResourceGenealogy();
     2508       
     2509        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetResourceNames", ReplyAction="http://tempuri.org/IHiveService/GetResourceNamesResponse")]
     2510        System.Collections.Generic.Dictionary<System.Guid, string> GetResourceNames();
     2511       
    22102512        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/UpdateSlave", ReplyAction="http://tempuri.org/IHiveService/UpdateSlaveResponse")]
    22112513        void UpdateSlave(HeuristicLab.Clients.Hive.Slave slave);
    … …  
    22522554        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetUserIdByUsername", ReplyAction="http://tempuri.org/IHiveService/GetUserIdByUsernameResponse")]
    22532555        System.Guid GetUserIdByUsername(string username);
     2556       
     2557        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetUserGroupTree", ReplyAction="http://tempuri.org/IHiveService/GetUserGroupTreeResponse")]
     2558        System.Collections.Generic.Dictionary<System.Guid, System.Collections.Generic.List<System.Guid>> GetUserGroupTree();
     2559       
     2560        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/CheckAccessToAdminAreaGranted", ReplyAction="http://tempuri.org/IHiveService/CheckAccessToAdminAreaGrantedResponse")]
     2561        bool CheckAccessToAdminAreaGranted();
    22542562       
    22552563        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetUserPriorities", ReplyAction="http://tempuri.org/IHiveService/GetUserPrioritiesResponse")]
    … …  
    22912599        }
    22922600       
    2293         public System.Guid AddTask(HeuristicLab.Clients.Hive.Task task, HeuristicLab.Clients.Hive.TaskData taskData, System.Collections.Generic.List<System.Guid> resourceIds)
    2294         {
    2295             return base.Channel.AddTask(task, taskData, resourceIds);
     2601        public System.Guid AddTask(HeuristicLab.Clients.Hive.Task task, HeuristicLab.Clients.Hive.TaskData taskData)
     2602        {
     2603            return base.Channel.AddTask(task, taskData);
    22962604        }
    22972605       
    … …  
    23612669        }
    23622670       
    2363         public System.Guid AddJob(HeuristicLab.Clients.Hive.Job jobDto)
    2364         {
    2365             return base.Channel.AddJob(jobDto);
    2366         }
    2367        
    2368         public void UpdateJob(HeuristicLab.Clients.Hive.Job jobDto)
    2369         {
    2370             base.Channel.UpdateJob(jobDto);
    2371         }
    2372        
    2373         public void DeleteJob(System.Guid JobId)
    2374         {
    2375             base.Channel.DeleteJob(JobId);
     2671        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetJobsByProjectId(System.Guid projectId)
     2672        {
     2673            return base.Channel.GetJobsByProjectId(projectId);
     2674        }
     2675       
     2676        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetJobsByProjectIds(System.Collections.Generic.List<System.Guid> projectIds)
     2677        {
     2678            return base.Channel.GetJobsByProjectIds(projectIds);
     2679        }
     2680       
     2681        public System.Guid AddJob(HeuristicLab.Clients.Hive.Job jobDto, System.Collections.Generic.List<System.Guid> resourceIds)
     2682        {
     2683            return base.Channel.AddJob(jobDto, resourceIds);
     2684        }
     2685       
     2686        public void UpdateJob(HeuristicLab.Clients.Hive.Job jobDto, System.Collections.Generic.List<System.Guid> resourceIds)
     2687        {
     2688            base.Channel.UpdateJob(jobDto, resourceIds);
     2689        }
     2690       
     2691        public void UpdateJobState(System.Guid JobId, HeuristicLab.Clients.Hive.JobState jobState)
     2692        {
     2693            base.Channel.UpdateJobState(JobId, jobState);
     2694        }
     2695       
     2696        public void UpdateJobStates(System.Collections.Generic.List<System.Guid> jobIds, HeuristicLab.Clients.Hive.JobState jobState)
     2697        {
     2698            base.Channel.UpdateJobStates(jobIds, jobState);
     2699        }
     2700       
     2701        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.AssignedJobResource> GetAssignedResourcesForJob(System.Guid jobId)
     2702        {
     2703            return base.Channel.GetAssignedResourcesForJob(jobId);
    23762704        }
    23772705       
    … …  
    24312759        }
    24322760       
    2433         public void GrantResourcePermissions(System.Guid resourceId, System.Collections.Generic.List<System.Guid> grantedUserIds)
    2434         {
    2435             base.Channel.GrantResourcePermissions(resourceId, grantedUserIds);
    2436         }
    2437        
    2438         public void RevokeResourcePermissions(System.Guid resourceId, System.Collections.Generic.List<System.Guid> grantedUserIds)
    2439         {
    2440             base.Channel.RevokeResourcePermissions(resourceId, grantedUserIds);
    2441         }
    2442        
    2443         public System.Collections.Generic.List<HeuristicLab.Clients.Hive.ResourcePermission> GetResourcePermissions(System.Guid resourceId)
    2444         {
    2445             return base.Channel.GetResourcePermissions(resourceId);
     2761        public System.Guid AddProject(HeuristicLab.Clients.Hive.Project projectDto)
     2762        {
     2763            return base.Channel.AddProject(projectDto);
     2764        }
     2765       
     2766        public void UpdateProject(HeuristicLab.Clients.Hive.Project projectDto)
     2767        {
     2768            base.Channel.UpdateProject(projectDto);
     2769        }
     2770       
     2771        public void DeleteProject(System.Guid projectId)
     2772        {
     2773            base.Channel.DeleteProject(projectId);
     2774        }
     2775       
     2776        public HeuristicLab.Clients.Hive.Project GetProject(System.Guid projectId)
     2777        {
     2778            return base.Channel.GetProject(projectId);
     2779        }
     2780       
     2781        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Project> GetProjects()
     2782        {
     2783            return base.Channel.GetProjects();
     2784        }
     2785       
     2786        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Project> GetProjectsForAdministration()
     2787        {
     2788            return base.Channel.GetProjectsForAdministration();
     2789        }
     2790       
     2791        public System.Collections.Generic.Dictionary<System.Guid, System.Collections.Generic.List<System.Guid>> GetProjectGenealogy()
     2792        {
     2793            return base.Channel.GetProjectGenealogy();
     2794        }
     2795       
     2796        public System.Collections.Generic.Dictionary<System.Guid, string> GetProjectNames()
     2797        {
     2798            return base.Channel.GetProjectNames();
     2799        }
     2800       
     2801        public void SaveProjectPermissions(System.Guid projectId, System.Collections.Generic.List<System.Guid> grantedUserIds, bool reassign, bool cascading, bool reassignCascading)
     2802        {
     2803            base.Channel.SaveProjectPermissions(projectId, grantedUserIds, reassign, cascading, reassignCascading);
     2804        }
     2805       
     2806        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.ProjectPermission> GetProjectPermissions(System.Guid projectId)
     2807        {
     2808            return base.Channel.GetProjectPermissions(projectId);
     2809        }
     2810       
     2811        public void SaveProjectResourceAssignments(System.Guid projectId, System.Collections.Generic.List<System.Guid> resourceIds, bool reassign, bool cascading, bool reassignCascading)
     2812        {
     2813            base.Channel.SaveProjectResourceAssignments(projectId, resourceIds, reassign, cascading, reassignCascading);
     2814        }
     2815       
     2816        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.AssignedProjectResource> GetAssignedResourcesForProject(System.Guid projectId)
     2817        {
     2818            return base.Channel.GetAssignedResourcesForProject(projectId);
     2819        }
     2820       
     2821        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.AssignedProjectResource> GetAssignedResourcesForProjectAdministration(System.Guid projectId)
     2822        {
     2823            return base.Channel.GetAssignedResourcesForProjectAdministration(projectId);
     2824        }
     2825       
     2826        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.AssignedProjectResource> GetAssignedResourcesForProjectsAdministration(System.Collections.Generic.List<System.Guid> projectIds)
     2827        {
     2828            return base.Channel.GetAssignedResourcesForProjectsAdministration(projectIds);
    24462829        }
    24472830       
    … …  
    24712854        }
    24722855       
     2856        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Slave> GetSlavesForAdministration()
     2857        {
     2858            return base.Channel.GetSlavesForAdministration();
     2859        }
     2860       
     2861        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.SlaveGroup> GetSlaveGroupsForAdministration()
     2862        {
     2863            return base.Channel.GetSlaveGroupsForAdministration();
     2864        }
     2865       
     2866        public System.Collections.Generic.Dictionary<System.Guid, System.Collections.Generic.List<System.Guid>> GetResourceGenealogy()
     2867        {
     2868            return base.Channel.GetResourceGenealogy();
     2869        }
     2870       
     2871        public System.Collections.Generic.Dictionary<System.Guid, string> GetResourceNames()
     2872        {
     2873            return base.Channel.GetResourceNames();
     2874        }
     2875       
    24732876        public void UpdateSlave(HeuristicLab.Clients.Hive.Slave slave)
    24742877        {
    … …  
    25462949        }
    25472950       
     2951        public System.Collections.Generic.Dictionary<System.Guid, System.Collections.Generic.List<System.Guid>> GetUserGroupTree()
     2952        {
     2953            return base.Channel.GetUserGroupTree();
     2954        }
     2955       
     2956        public bool CheckAccessToAdminAreaGranted()
     2957        {
     2958            return base.Channel.CheckAccessToAdminAreaGranted();
     2959        }
     2960       
    25482961        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.UserPriority> GetUserPriorities()
    25492962        {

  • branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Hive/3.3/ServiceClients/Job.cs

    r15583 r16388  
    2121
    2222using System;
     23using System.Collections.Generic;
    2324using System.ComponentModel;
    2425using HeuristicLab.Common;
    … …  
    2627namespace HeuristicLab.Clients.Hive {
    2728  public partial class Job : IDeepCloneable, IContent {
     29    public List<Guid> ResourceIds { get; set; }
    2830
    2931    #region Constructors and Cloning
    3032    public Job() {
    31       ResourceNames = "HEAL";
     33      ProjectId = Guid.Empty;
    3234      DateCreated = DateTime.Now;
    3335      Permission = Permission.Full;
    … …  
    3840      this.OwnerUserId = original.OwnerUserId;
    3941      this.DateCreated = original.DateCreated;
    40       this.ResourceNames = original.ResourceNames;
     42      this.ProjectId = original.ProjectId;
    4143      this.Name = original.Name;
    4244      this.Description = original.Description;
    4345      this.Id = original.Id;
    4446      this.Permission = original.Permission;
     47      this.ResourceIds = original.ResourceIds;
    4548    }
    4649    public override IDeepCloneable Clone(Cloner cloner) {

  • branches/2892_LR-prediction-intervals/HeuristicLab.Clients.Hive/3.3/ServiceClients/ResourcePermission.cs

    r15583 r16388  
    2424
    2525namespace HeuristicLab.Clients.Hive {
    26   public partial class ResourcePermission : IDeepCloneable, IContent {
     26  public partial class ProjectPermission : IDeepCloneable, IContent {
    2727
    2828    private string grantedUserName;
    … …  
    4141    }
    4242
    43     public ResourcePermission() { }
     43    public ProjectPermission() { }
    4444
    4545    protected override void OnPropertyChanged(PropertyChangedEventArgs e) {
    … …  
    5050    }
    5151
    52     protected ResourcePermission(ResourcePermission original, Cloner cloner)
     52    protected ProjectPermission(ProjectPermission original, Cloner cloner)
    5353      : base(original, cloner) {
    5454      this.GrantedByUserId = original.GrantedByUserId;
    5555      this.GrantedUserId = original.GrantedUserId;
    56       this.ResourceId = original.ResourceId;
     56      this.ProjectId = original.ProjectId;
    5757    }
    5858
    5959    public override IDeepCloneable Clone(Cloner cloner) {
    60       return new ResourcePermission(this, cloner);
     60      return new ProjectPermission(this, cloner);
    6161    }
    6262
Note: See TracChangeset for help on using the changeset viewer.