Ignore:
Timestamp:
01/18/18 15:08:25 (3 years ago)
Author:
jzenisek
Message:

#2839

  • updated Heartbeat processing (regarding: checking against AssignedJobResources and handling of the updated Job deletion routine)
  • updated Job deletion routine(still in progress at GenerateStatistics)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveServiceClient.cs

    r15576 r15630  
    2727    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Plugin))]
    2828    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Project))]
     29    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.AssignedJobResource))]
    2930    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.JobPermission))]
    3031    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.PluginData))]
     
    7475       
    7576        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
    76 
     77       
    7778    }
    7879   
     
    290291        private System.Guid ProjectIdField;
    291292       
     293        [System.Runtime.Serialization.OptionalFieldAttribute()]
     294        private HeuristicLab.Clients.Hive.JobState StateField;
     295       
    292296        [System.Runtime.Serialization.DataMemberAttribute()]
    293297        public int CalculatingCount
     
    422426                    this.ProjectIdField = value;
    423427                    this.RaisePropertyChanged("ProjectId");
     428                }
     429            }
     430        }
     431       
     432        [System.Runtime.Serialization.DataMemberAttribute()]
     433        public HeuristicLab.Clients.Hive.JobState State
     434        {
     435            get
     436            {
     437                return this.StateField;
     438            }
     439            set
     440            {
     441                if ((this.StateField.Equals(value) != true))
     442                {
     443                    this.StateField = value;
     444                    this.RaisePropertyChanged("State");
    424445                }
    425446            }
     
    951972    [System.Diagnostics.DebuggerStepThroughAttribute()]
    952973    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     974    [System.Runtime.Serialization.DataContractAttribute(Name="AssignedJobResource", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
     975    [System.SerializableAttribute()]
     976    public partial class AssignedJobResource : HeuristicLab.Clients.Hive.HiveItem
     977    {
     978       
     979        [System.Runtime.Serialization.OptionalFieldAttribute()]
     980        private System.Guid JobIdField;
     981       
     982        [System.Runtime.Serialization.OptionalFieldAttribute()]
     983        private System.Guid ResourceIdField;
     984       
     985        [System.Runtime.Serialization.DataMemberAttribute()]
     986        public System.Guid JobId
     987        {
     988            get
     989            {
     990                return this.JobIdField;
     991            }
     992            set
     993            {
     994                if ((this.JobIdField.Equals(value) != true))
     995                {
     996                    this.JobIdField = value;
     997                    this.RaisePropertyChanged("JobId");
     998                }
     999            }
     1000        }
     1001       
     1002        [System.Runtime.Serialization.DataMemberAttribute()]
     1003        public System.Guid ResourceId
     1004        {
     1005            get
     1006            {
     1007                return this.ResourceIdField;
     1008            }
     1009            set
     1010            {
     1011                if ((this.ResourceIdField.Equals(value) != true))
     1012                {
     1013                    this.ResourceIdField = value;
     1014                    this.RaisePropertyChanged("ResourceId");
     1015                }
     1016            }
     1017        }
     1018    }
     1019   
     1020    [System.Diagnostics.DebuggerStepThroughAttribute()]
     1021    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    9531022    [System.Runtime.Serialization.DataContractAttribute(Name="JobPermission", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
    9541023    [System.SerializableAttribute()]
     
    17721841        [System.Runtime.Serialization.EnumMemberAttribute()]
    17731842        Full = 2,
     1843    }
     1844   
     1845    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     1846    [System.Runtime.Serialization.DataContractAttribute(Name="JobState", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
     1847    public enum JobState : int
     1848    {
     1849       
     1850        [System.Runtime.Serialization.EnumMemberAttribute()]
     1851        Online = 0,
     1852       
     1853        [System.Runtime.Serialization.EnumMemberAttribute()]
     1854        StatisticsPending = 1,
     1855       
     1856        [System.Runtime.Serialization.EnumMemberAttribute()]
     1857        DeletionPending = 2,
    17741858    }
    17751859   
     
    22602344       
    22612345        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/AddTask", ReplyAction="http://tempuri.org/IHiveService/AddTaskResponse")]
    2262         System.Guid AddTask(HeuristicLab.Clients.Hive.Task task, HeuristicLab.Clients.Hive.TaskData taskData, System.Collections.Generic.List<System.Guid> resourceIds);
     2346        System.Guid AddTask(HeuristicLab.Clients.Hive.Task task, HeuristicLab.Clients.Hive.TaskData taskData);
    22632347       
    22642348        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/AddChildTask", ReplyAction="http://tempuri.org/IHiveService/AddChildTaskResponse")]
     
    23022386       
    23032387        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/AddJob", ReplyAction="http://tempuri.org/IHiveService/AddJobResponse")]
    2304         System.Guid AddJob(HeuristicLab.Clients.Hive.Job jobDto);
     2388        System.Guid AddJob(HeuristicLab.Clients.Hive.Job jobDto, System.Collections.Generic.List<System.Guid> resourceIds);
    23052389       
    23062390        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/UpdateJob", ReplyAction="http://tempuri.org/IHiveService/UpdateJobResponse")]
    2307         void UpdateJob(HeuristicLab.Clients.Hive.Job jobDto);
    2308        
    2309         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/DeleteJob", ReplyAction="http://tempuri.org/IHiveService/DeleteJobResponse")]
    2310         void DeleteJob(System.Guid JobId);
     2391        void UpdateJob(HeuristicLab.Clients.Hive.Job jobDto, System.Collections.Generic.List<System.Guid> resourceIds);
     2392       
     2393        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/UpdateJobState", ReplyAction="http://tempuri.org/IHiveService/UpdateJobStateResponse")]
     2394        void UpdateJobState(System.Guid JobId, HeuristicLab.Clients.Hive.JobState jobState);
     2395       
     2396        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetAssignedResourcesForJob", ReplyAction="http://tempuri.org/IHiveService/GetAssignedResourcesForJobResponse")]
     2397        System.Collections.Generic.List<HeuristicLab.Clients.Hive.AssignedJobResource> GetAssignedResourcesForJob(System.Guid jobId);
    23112398       
    23122399        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GrantPermission", ReplyAction="http://tempuri.org/IHiveService/GrantPermissionResponse")]
     
    23862473        System.Collections.Generic.List<HeuristicLab.Clients.Hive.AssignedProjectResource> GetAssignedResourcesForProject(System.Guid projectId);
    23872474       
     2475        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetAssignedResourcesForProjectAdministration", ReplyAction="http://tempuri.org/IHiveService/GetAssignedResourcesForProjectAdministrationRespo" +
     2476            "nse")]
     2477        System.Collections.Generic.List<HeuristicLab.Clients.Hive.AssignedProjectResource> GetAssignedResourcesForProjectAdministration(System.Guid projectId);
     2478       
    23882479        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/AddSlave", ReplyAction="http://tempuri.org/IHiveService/AddSlaveResponse")]
    23892480        System.Guid AddSlave(HeuristicLab.Clients.Hive.Slave slave);
     
    24872578        }
    24882579       
    2489         public System.Guid AddTask(HeuristicLab.Clients.Hive.Task task, HeuristicLab.Clients.Hive.TaskData taskData, System.Collections.Generic.List<System.Guid> resourceIds)
    2490         {
    2491             return base.Channel.AddTask(task, taskData, resourceIds);
     2580        public System.Guid AddTask(HeuristicLab.Clients.Hive.Task task, HeuristicLab.Clients.Hive.TaskData taskData)
     2581        {
     2582            return base.Channel.AddTask(task, taskData);
    24922583        }
    24932584       
     
    25572648        }
    25582649       
    2559         public System.Guid AddJob(HeuristicLab.Clients.Hive.Job jobDto)
    2560         {
    2561             return base.Channel.AddJob(jobDto);
    2562         }
    2563        
    2564         public void UpdateJob(HeuristicLab.Clients.Hive.Job jobDto)
    2565         {
    2566             base.Channel.UpdateJob(jobDto);
    2567         }
    2568        
    2569         public void DeleteJob(System.Guid JobId)
    2570         {
    2571             base.Channel.DeleteJob(JobId);
     2650        public System.Guid AddJob(HeuristicLab.Clients.Hive.Job jobDto, System.Collections.Generic.List<System.Guid> resourceIds)
     2651        {
     2652            return base.Channel.AddJob(jobDto, resourceIds);
     2653        }
     2654       
     2655        public void UpdateJob(HeuristicLab.Clients.Hive.Job jobDto, System.Collections.Generic.List<System.Guid> resourceIds)
     2656        {
     2657            base.Channel.UpdateJob(jobDto, resourceIds);
     2658        }
     2659       
     2660        public void UpdateJobState(System.Guid JobId, HeuristicLab.Clients.Hive.JobState jobState)
     2661        {
     2662            base.Channel.UpdateJobState(JobId, jobState);
     2663        }
     2664       
     2665        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.AssignedJobResource> GetAssignedResourcesForJob(System.Guid jobId)
     2666        {
     2667            return base.Channel.GetAssignedResourcesForJob(jobId);
    25722668        }
    25732669       
     
    26972793        }
    26982794       
     2795        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.AssignedProjectResource> GetAssignedResourcesForProjectAdministration(System.Guid projectId)
     2796        {
     2797            return base.Channel.GetAssignedResourcesForProjectAdministration(projectId);
     2798        }
     2799       
    26992800        public System.Guid AddSlave(HeuristicLab.Clients.Hive.Slave slave)
    27002801        {
Note: See TracChangeset for help on using the changeset viewer.