diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.wsdl b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.wsdl index 63c5aa9..e98d2fb 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.wsdl +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.wsdl @@ -5,7 +5,6 @@ - @@ -27,6 +26,12 @@ + + + + + + @@ -46,6 +51,10 @@ + + + + diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.xsd b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.xsd index e0b3476..0ee9529 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.xsd +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.xsd @@ -39,6 +39,20 @@ + + + + + + + + + + + + + + @@ -47,7 +61,7 @@ - + diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.JobRunnerReference.UpdateProfileUpdateProfileResponse.datasource b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.JobRunnerReference.UpdateProfileUpdateProfileResponse.datasource new file mode 100644 index 0000000..ee5c3b6 --- /dev/null +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.JobRunnerReference.UpdateProfileUpdateProfileResponse.datasource @@ -0,0 +1,10 @@ + + + + ECM.JobRunner.Common.JobRunnerReference.UpdateProfileUpdateProfileResponse, Connected Services.JobRunnerReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.xsd b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.xsd deleted file mode 100644 index e364ff2..0000000 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.xsd +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Windows.xsd b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Windows.xsd index 871d11f..358e5fc 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Windows.xsd +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Windows.xsd @@ -1,12 +1,13 @@  - - + + + - - + + @@ -20,10 +21,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -35,6 +71,25 @@ + + + + + + + + + + + + + + + + + + + @@ -43,16 +98,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.svcmap b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.svcmap index 4263f48..f9a0519 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.svcmap +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.svcmap @@ -27,7 +27,6 @@ - diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb index b4df94d..62b4fdc 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb @@ -21,6 +21,7 @@ Namespace JobRunnerReference System.Runtime.Serialization.DataContractAttribute(Name:="Base.BaseResponse", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows"), _ System.SerializableAttribute(), _ System.Runtime.Serialization.KnownTypeAttribute(GetType(JobRunnerReference.UpdateJobUpdateJobResponse)), _ + System.Runtime.Serialization.KnownTypeAttribute(GetType(JobRunnerReference.UpdateProfileUpdateProfileResponse)), _ System.Runtime.Serialization.KnownTypeAttribute(GetType(JobRunnerReference.GetJobConfigGetJobConfigResponse)), _ System.Runtime.Serialization.KnownTypeAttribute(GetType(JobRunnerReference.GetJobStatusGetJobStatusResponse))> _ Partial Public Class BaseBaseResponse @@ -106,6 +107,14 @@ Namespace JobRunnerReference Inherits JobRunnerReference.BaseBaseResponse End Class + _ + Partial Public Class UpdateProfileUpdateProfileResponse + Inherits JobRunnerReference.BaseBaseResponse + End Class + _ Private JobTypesField() As JobRunnerReference.JobType + _ + Private ProfileDefinitionsField As JobRunnerReference.GetJobConfigGetJobConfigResponse.ProfileDefinitionConfig + _ Private WindreamObjectTypesField() As JobRunnerReference.ObjectType @@ -148,6 +160,19 @@ Namespace JobRunnerReference End Set End Property + _ + Public Property ProfileDefinitions() As JobRunnerReference.GetJobConfigGetJobConfigResponse.ProfileDefinitionConfig + Get + Return Me.ProfileDefinitionsField + End Get + Set + If (Object.ReferenceEquals(Me.ProfileDefinitionsField, value) <> true) Then + Me.ProfileDefinitionsField = value + Me.RaisePropertyChanged("ProfileDefinitions") + End If + End Set + End Property + _ Public Property WindreamObjectTypes() As JobRunnerReference.ObjectType() Get @@ -160,6 +185,52 @@ Namespace JobRunnerReference End If End Set End Property + + _ + Partial Public Class ProfileDefinitionConfig + Inherits Object + Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged + + _ + Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject + + _ + Private ImportProfilesField() As JobRunnerReference.ImportProfile + + Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData + Get + Return Me.extensionDataField + End Get + Set + Me.extensionDataField = value + End Set + End Property + + _ + Public Property ImportProfiles() As JobRunnerReference.ImportProfile() + Get + Return Me.ImportProfilesField + End Get + Set + If (Object.ReferenceEquals(Me.ImportProfilesField, value) <> true) Then + Me.ImportProfilesField = value + Me.RaisePropertyChanged("ImportProfiles") + End If + End Set + End Property + + Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged + + Protected Sub RaisePropertyChanged(ByVal propertyName As String) + Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent + If (Not (propertyChanged) Is Nothing) Then + propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) + End If + End Sub + End Class End Class _ Partial Public Class HistoryItem Inherits Object @@ -315,7 +386,7 @@ Namespace JobRunnerReference _ Partial Public Class StatusItem Inherits Object @@ -474,7 +545,7 @@ Namespace JobRunnerReference _ Partial Public Class JobDefinition Inherits Object @@ -601,7 +672,7 @@ Namespace JobRunnerReference _ Partial Public Class JobType Inherits Object @@ -680,7 +751,7 @@ Namespace JobRunnerReference _ Partial Public Class ObjectType Inherits Object @@ -741,6 +812,460 @@ Namespace JobRunnerReference End Sub End Class + _ + Partial Public Class ImportProfile + Inherits JobRunnerReference.BaseProfile + + _ + Private ActiveField As Boolean + + _ + Private BackupFolderField As String + + _ + Private DeleteFilesField As Boolean + + _ + Private FileExcludeRegexField As String + + _ + Private IdField As Integer + + _ + Private IncludeSubfoldersField As Boolean + + _ + Private JobIdField As Integer + + _ + Private ObjectTypeNameField As String + + _ + Private SourceFolderField As String + + _ + Private StepsField() As JobRunnerReference.ImportProfileStep + + _ + Private SubfolderDateFormatField As String + + _ + Private TargetFolderField As String + + _ + Public Property Active() As Boolean + Get + Return Me.ActiveField + End Get + Set + If (Me.ActiveField.Equals(value) <> true) Then + Me.ActiveField = value + Me.RaisePropertyChanged("Active") + End If + End Set + End Property + + _ + Public Property BackupFolder() As String + Get + Return Me.BackupFolderField + End Get + Set + If (Object.ReferenceEquals(Me.BackupFolderField, value) <> true) Then + Me.BackupFolderField = value + Me.RaisePropertyChanged("BackupFolder") + End If + End Set + End Property + + _ + Public Property DeleteFiles() As Boolean + Get + Return Me.DeleteFilesField + End Get + Set + If (Me.DeleteFilesField.Equals(value) <> true) Then + Me.DeleteFilesField = value + Me.RaisePropertyChanged("DeleteFiles") + End If + End Set + End Property + + _ + Public Property FileExcludeRegex() As String + Get + Return Me.FileExcludeRegexField + End Get + Set + If (Object.ReferenceEquals(Me.FileExcludeRegexField, value) <> true) Then + Me.FileExcludeRegexField = value + Me.RaisePropertyChanged("FileExcludeRegex") + End If + End Set + End Property + + _ + Public Property Id() As Integer + Get + Return Me.IdField + End Get + Set + If (Me.IdField.Equals(value) <> true) Then + Me.IdField = value + Me.RaisePropertyChanged("Id") + End If + End Set + End Property + + _ + Public Property IncludeSubfolders() As Boolean + Get + Return Me.IncludeSubfoldersField + End Get + Set + If (Me.IncludeSubfoldersField.Equals(value) <> true) Then + Me.IncludeSubfoldersField = value + Me.RaisePropertyChanged("IncludeSubfolders") + End If + End Set + End Property + + _ + Public Property JobId() As Integer + Get + Return Me.JobIdField + End Get + Set + If (Me.JobIdField.Equals(value) <> true) Then + Me.JobIdField = value + Me.RaisePropertyChanged("JobId") + End If + End Set + End Property + + _ + Public Property ObjectTypeName() As String + Get + Return Me.ObjectTypeNameField + End Get + Set + If (Object.ReferenceEquals(Me.ObjectTypeNameField, value) <> true) Then + Me.ObjectTypeNameField = value + Me.RaisePropertyChanged("ObjectTypeName") + End If + End Set + End Property + + _ + Public Property SourceFolder() As String + Get + Return Me.SourceFolderField + End Get + Set + If (Object.ReferenceEquals(Me.SourceFolderField, value) <> true) Then + Me.SourceFolderField = value + Me.RaisePropertyChanged("SourceFolder") + End If + End Set + End Property + + _ + Public Property Steps() As JobRunnerReference.ImportProfileStep() + Get + Return Me.StepsField + End Get + Set + If (Object.ReferenceEquals(Me.StepsField, value) <> true) Then + Me.StepsField = value + Me.RaisePropertyChanged("Steps") + End If + End Set + End Property + + _ + Public Property SubfolderDateFormat() As String + Get + Return Me.SubfolderDateFormatField + End Get + Set + If (Object.ReferenceEquals(Me.SubfolderDateFormatField, value) <> true) Then + Me.SubfolderDateFormatField = value + Me.RaisePropertyChanged("SubfolderDateFormat") + End If + End Set + End Property + + _ + Public Property TargetFolder() As String + Get + Return Me.TargetFolderField + End Get + Set + If (Object.ReferenceEquals(Me.TargetFolderField, value) <> true) Then + Me.TargetFolderField = value + Me.RaisePropertyChanged("TargetFolder") + End If + End Set + End Property + End Class + + _ + Partial Public Class BaseProfile + Inherits Object + Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged + + _ + Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject + + _ + Private JobField As JobRunnerReference.JobDefinition + + _ + Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData + Get + Return Me.extensionDataField + End Get + Set + Me.extensionDataField = value + End Set + End Property + + _ + Public Property Job() As JobRunnerReference.JobDefinition + Get + Return Me.JobField + End Get + Set + If (Object.ReferenceEquals(Me.JobField, value) <> true) Then + Me.JobField = value + Me.RaisePropertyChanged("Job") + End If + End Set + End Property + + Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged + + Protected Sub RaisePropertyChanged(ByVal propertyName As String) + Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent + If (Not (propertyChanged) Is Nothing) Then + propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) + End If + End Sub + End Class + + _ + Partial Public Class ImportProfileStep + Inherits Object + Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged + + _ + Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject + + _ + Private ActiveField As Boolean + + _ + Private Argument1Field As String + + _ + Private Argument2Field As String + + _ + Private Argument3Field As String + + _ + Private IdField As Integer + + _ + Private IndexNameField As String + + _ + Private MethodField As JobRunnerReference.ImportProfileStep.StepMethod + + _ + Private ProfileIdField As Integer + + _ + Private ScopeField As JobRunnerReference.ImportProfileStep.StepScope + + _ + Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData + Get + Return Me.extensionDataField + End Get + Set + Me.extensionDataField = value + End Set + End Property + + _ + Public Property Active() As Boolean + Get + Return Me.ActiveField + End Get + Set + If (Me.ActiveField.Equals(value) <> true) Then + Me.ActiveField = value + Me.RaisePropertyChanged("Active") + End If + End Set + End Property + + _ + Public Property Argument1() As String + Get + Return Me.Argument1Field + End Get + Set + If (Object.ReferenceEquals(Me.Argument1Field, value) <> true) Then + Me.Argument1Field = value + Me.RaisePropertyChanged("Argument1") + End If + End Set + End Property + + _ + Public Property Argument2() As String + Get + Return Me.Argument2Field + End Get + Set + If (Object.ReferenceEquals(Me.Argument2Field, value) <> true) Then + Me.Argument2Field = value + Me.RaisePropertyChanged("Argument2") + End If + End Set + End Property + + _ + Public Property Argument3() As String + Get + Return Me.Argument3Field + End Get + Set + If (Object.ReferenceEquals(Me.Argument3Field, value) <> true) Then + Me.Argument3Field = value + Me.RaisePropertyChanged("Argument3") + End If + End Set + End Property + + _ + Public Property Id() As Integer + Get + Return Me.IdField + End Get + Set + If (Me.IdField.Equals(value) <> true) Then + Me.IdField = value + Me.RaisePropertyChanged("Id") + End If + End Set + End Property + + _ + Public Property IndexName() As String + Get + Return Me.IndexNameField + End Get + Set + If (Object.ReferenceEquals(Me.IndexNameField, value) <> true) Then + Me.IndexNameField = value + Me.RaisePropertyChanged("IndexName") + End If + End Set + End Property + + _ + Public Property Method() As JobRunnerReference.ImportProfileStep.StepMethod + Get + Return Me.MethodField + End Get + Set + If (Me.MethodField.Equals(value) <> true) Then + Me.MethodField = value + Me.RaisePropertyChanged("Method") + End If + End Set + End Property + + _ + Public Property ProfileId() As Integer + Get + Return Me.ProfileIdField + End Get + Set + If (Me.ProfileIdField.Equals(value) <> true) Then + Me.ProfileIdField = value + Me.RaisePropertyChanged("ProfileId") + End If + End Set + End Property + + _ + Public Property Scope() As JobRunnerReference.ImportProfileStep.StepScope + Get + Return Me.ScopeField + End Get + Set + If (Me.ScopeField.Equals(value) <> true) Then + Me.ScopeField = value + Me.RaisePropertyChanged("Scope") + End If + End Set + End Property + + Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged + + Protected Sub RaisePropertyChanged(ByVal propertyName As String) + Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent + If (Not (propertyChanged) Is Nothing) Then + propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) + End If + End Sub + + _ + Public Enum StepMethod As Integer + + _ + SUBSTRING = 0 + + _ + REGEX = 1 + + _ + SPLIT = 2 + + _ + ALL = 3 + + _ + VALUE = 4 + End Enum + + _ + Public Enum StepScope As Integer + + _ + FILE = 0 + + _ + FOLDER = 1 + End Enum + End Class + _ + Partial Public Class UpdateProfileUpdateProfileRequest + Inherits Object + Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged + + _ + Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject + + _ + Private ActionField As JobRunnerReference.UpdateProfileUpdateProfileRequest.UpdateProfileAction + + _ + Private ImportProfileField As JobRunnerReference.ImportProfile + + _ + Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData + Get + Return Me.extensionDataField + End Get + Set + Me.extensionDataField = value + End Set + End Property + + _ + Public Property Action() As JobRunnerReference.UpdateProfileUpdateProfileRequest.UpdateProfileAction + Get + Return Me.ActionField + End Get + Set + If (Me.ActionField.Equals(value) <> true) Then + Me.ActionField = value + Me.RaisePropertyChanged("Action") + End If + End Set + End Property + + _ + Public Property ImportProfile() As JobRunnerReference.ImportProfile + Get + Return Me.ImportProfileField + End Get + Set + If (Object.ReferenceEquals(Me.ImportProfileField, value) <> true) Then + Me.ImportProfileField = value + Me.RaisePropertyChanged("ImportProfile") + End If + End Set + End Property + + Public Event PropertyChanged As System.ComponentModel.PropertyChangedEventHandler Implements System.ComponentModel.INotifyPropertyChanged.PropertyChanged + + Protected Sub RaisePropertyChanged(ByVal propertyName As String) + Dim propertyChanged As System.ComponentModel.PropertyChangedEventHandler = Me.PropertyChangedEvent + If (Not (propertyChanged) Is Nothing) Then + propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) + End If + End Sub + + _ + Public Enum UpdateProfileAction As Integer + + _ + Create = 0 + + _ + Update = 1 + + _ + Delete = 2 + End Enum + End Class + _ Public Interface IEDMIService @@ -840,6 +1442,12 @@ Namespace JobRunnerReference _ Function UpdateJobAsync(ByVal pData As JobRunnerReference.UpdateJobUpdateJobRequest) As System.Threading.Tasks.Task(Of JobRunnerReference.UpdateJobUpdateJobResponse) + _ + Function UpdateProfile(ByVal pData As JobRunnerReference.UpdateProfileUpdateProfileRequest) As JobRunnerReference.UpdateProfileUpdateProfileResponse + + _ + Function UpdateProfileAsync(ByVal pData As JobRunnerReference.UpdateProfileUpdateProfileRequest) As System.Threading.Tasks.Task(Of JobRunnerReference.UpdateProfileUpdateProfileResponse) + _ Function GetJobConfig() As JobRunnerReference.GetJobConfigGetJobConfigResponse @@ -902,6 +1510,14 @@ Namespace JobRunnerReference Return MyBase.Channel.UpdateJobAsync(pData) End Function + Public Function UpdateProfile(ByVal pData As JobRunnerReference.UpdateProfileUpdateProfileRequest) As JobRunnerReference.UpdateProfileUpdateProfileResponse Implements JobRunnerReference.IEDMIService.UpdateProfile + Return MyBase.Channel.UpdateProfile(pData) + End Function + + Public Function UpdateProfileAsync(ByVal pData As JobRunnerReference.UpdateProfileUpdateProfileRequest) As System.Threading.Tasks.Task(Of JobRunnerReference.UpdateProfileUpdateProfileResponse) Implements JobRunnerReference.IEDMIService.UpdateProfileAsync + Return MyBase.Channel.UpdateProfileAsync(pData) + End Function + Public Function GetJobConfig() As JobRunnerReference.GetJobConfigGetJobConfigResponse Implements JobRunnerReference.IEDMIService.GetJobConfig Return MyBase.Channel.GetJobConfig End Function diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/configuration.svcinfo b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/configuration.svcinfo index dc9f80d..0584ed4 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/configuration.svcinfo +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/configuration.svcinfo @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/configuration91.svcinfo b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/configuration91.svcinfo index bd846f0..49b08fa 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/configuration91.svcinfo +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/configuration91.svcinfo @@ -1,5 +1,5 @@ - + @@ -150,14 +150,14 @@ System.ServiceModel.Configuration.UserPrincipalNameElement - - + + Administrator@dd-san01.dd-gan.local.digitaldata.works System.ServiceModel.Configuration.ServicePrincipalNameElement - - host/sDD-VMP03-VM09.dd-san01.dd-gan.local.digitaldata.works + + System.ServiceModel.Configuration.DnsElement diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/service.wsdl b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/service.wsdl index b4d0d27..e527ae0 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/service.wsdl +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/service.wsdl @@ -68,6 +68,15 @@ + + + + + + + + + @@ -84,7 +93,7 @@ net.tcp://localhost:9001/DigitalData/Services/JobRunner - host/sDD-VMP03-VM09.dd-san01.dd-gan.local.digitaldata.works + Administrator@dd-san01.dd-gan.local.digitaldata.works diff --git a/ECM.JobRunner.Common/ECM.JobRunner.Common.vbproj b/ECM.JobRunner.Common/ECM.JobRunner.Common.vbproj index 85831db..23fd6f7 100644 --- a/ECM.JobRunner.Common/ECM.JobRunner.Common.vbproj +++ b/ECM.JobRunner.Common/ECM.JobRunner.Common.vbproj @@ -71,11 +71,6 @@ True Reference.svcmap - - - - - True @@ -91,7 +86,6 @@ Settings.settings True - @@ -119,8 +113,8 @@ Reference.svcmap - - Designer + + Reference.svcmap Designer diff --git a/ECM.JobRunner.Common/JobConfig/JobDefinition.vb b/ECM.JobRunner.Common/JobConfig/JobDefinition.vb deleted file mode 100644 index d759dd7..0000000 --- a/ECM.JobRunner.Common/JobConfig/JobDefinition.vb +++ /dev/null @@ -1,8 +0,0 @@ -Public Class JobDefinition - Public Id As Integer - Public TypeId As Integer - Public Type As JobType - Public Name As String - Public CronSchedule As String - Public Active As Boolean -End Class diff --git a/ECM.JobRunner.Common/app.config b/ECM.JobRunner.Common/app.config index b9c2d02..7757495 100644 --- a/ECM.JobRunner.Common/app.config +++ b/ECM.JobRunner.Common/app.config @@ -39,7 +39,7 @@ binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IEDMIService" contract="JobRunnerReference.IEDMIService" name="NetTcpBinding_IEDMIService"> - + diff --git a/ECM.JobRunner.Web/Components/Job/JobForm.razor b/ECM.JobRunner.Web/Components/Job/JobForm.razor deleted file mode 100644 index b25f541..0000000 --- a/ECM.JobRunner.Web/Components/Job/JobForm.razor +++ /dev/null @@ -1,95 +0,0 @@ -@using ECM.JobRunner.Common.JobRunnerReference; -@using ECM.JobRunner.Web.Data; -@inject JobService Jobs; - -@if (job == null) -{ -

Form loading..

-} -else -{ - - - - -
- - -
Die Datenbank Id des Jobs.
-
-
- - -
Der Name des Jobs. Wird in der Übersicht angezeigt.
-
-
- - -
Die Zeitplan des Jobs. Erwartet eine Quartz.NET Cron Expression.
-
- -
- - -
Der Typ des Jobs.
-
- -
- - -
- -
- - - - - Back - - -
- -} - -@code { - [Parameter] - public int JobId { get; set; } - - [Parameter] - public EventCallback OnValidSubmit { get; set; } - - private JobDefinition? job = new(); - private List? types; - - protected string GetBackUrl() - { - return JobId == Constants.ENTITY_ID_NEW ? "jobs" : $"jobs/{JobId}"; - } - - protected override async Task OnInitializedAsync() - { - types = await Jobs.GetJobTypes(); - - if (JobId == Constants.ENTITY_ID_NEW) - { - job = new JobDefinition() { Id = Constants.ENTITY_ID_NEW }; - } - else - { - job = await Jobs.GetJob(JobId); - } - } -} diff --git a/ECM.JobRunner.Web/Data/ImportService.cs b/ECM.JobRunner.Web/Data/ImportService.cs new file mode 100644 index 0000000..4751993 --- /dev/null +++ b/ECM.JobRunner.Web/Data/ImportService.cs @@ -0,0 +1,67 @@ +using DigitalData.Modules.Logging; +using ECM.JobRunner.Common.JobRunnerReference; + + +namespace ECM.JobRunner.Web.Data +{ + public class ImportService + { + private readonly Logger logger; + private readonly IEDMIServiceChannel channel; + + public ImportService(LoggingService Logging, WcfService Wcf) + { + logger = Logging.LogConfig.GetLogger(); + channel = Wcf.Channel; + } + + public async Task> GetProfiles() + { + var resp = await channel.GetJobConfigAsync(); + + if (resp == null) return new(); + if (resp.OK == false) return new(); + + var profiles = resp.ProfileDefinitions.ImportProfiles.ToList(); + return profiles; + } + + public async Task GetProfile(int pProfileId) + { + var resp = await channel.GetJobConfigAsync(); + + if (resp == null) return new(); + if (resp.OK == false) return new(); + + var jobs = resp.JobDefinitions.ToList(); + var profiles = resp.ProfileDefinitions.ImportProfiles.ToList(); + + return profiles. + Where(p => p.Id == pProfileId). + SingleOrDefault(); + } + + public async Task CreateProfile(ImportProfile profile) => + await DoUpdateProfile(profile, UpdateProfileUpdateProfileRequest.UpdateProfileAction.Create); + + public async Task UpdateProfile(ImportProfile profile) => + await DoUpdateProfile(profile, UpdateProfileUpdateProfileRequest.UpdateProfileAction.Update); + + public async Task DeleteProfile(ImportProfile profile) => + await DoUpdateProfile(profile, UpdateProfileUpdateProfileRequest.UpdateProfileAction.Delete); + + private async Task DoUpdateProfile(ImportProfile profile, UpdateProfileUpdateProfileRequest.UpdateProfileAction action) + { + var req = new UpdateProfileUpdateProfileRequest() + { + ImportProfile = profile, + Action = action + }; + var resp = await channel.UpdateProfileAsync(req); + + if (resp == null) return false; + if (resp.OK == false) return false; + return true; + } + } +} diff --git a/ECM.JobRunner.Web/Data/JobService.cs b/ECM.JobRunner.Web/Data/JobService.cs index ed51e47..f72fc96 100644 --- a/ECM.JobRunner.Web/Data/JobService.cs +++ b/ECM.JobRunner.Web/Data/JobService.cs @@ -1,13 +1,12 @@ using DigitalData.Modules.Logging; using ECM.JobRunner.Common.JobRunnerReference; -using System.Threading.Channels; namespace ECM.JobRunner.Web.Data { public class JobService { private readonly Logger logger; - private readonly Common.JobRunnerReference.IEDMIServiceChannel channel; + private readonly IEDMIServiceChannel channel; public JobService(LoggingService Logging, WcfService Wcf) { @@ -15,48 +14,46 @@ namespace ECM.JobRunner.Web.Data channel = Wcf.Channel; } - public async Task> GetJobs() + public async Task> GetJobs() { var resp = await channel.GetJobConfigAsync(); - if (resp != null && resp.OK) - { - return resp.JobDefinitions.ToList(); - } - else - { - return new(); - } + if (resp == null) return new(); + if (resp.OK == false) return new(); + + return resp.JobDefinitions.ToList(); } - public async Task> GetJobTypes() + public async Task> GetObjectTypes() { var resp = await channel.GetJobConfigAsync(); - if (resp != null && resp.OK) - { - return resp.JobTypes.ToList(); - } - else - { - return new(); - } + if (resp == null) return new(); + if (resp.OK == false) return new(); + + return resp.WindreamObjectTypes.ToList(); } - public async Task GetJob(int pJobId) + public async Task> GetJobTypes() { var resp = await channel.GetJobConfigAsync(); - if (resp != null && resp.OK) - { - return resp.JobDefinitions. + if (resp == null) return new(); + if (resp.OK == false) return new(); + + return resp.JobTypes.ToList(); + } + + public async Task GetJob(int pJobId) + { + var resp = await channel.GetJobConfigAsync(); + + if (resp == null) return null; + if (resp.OK == false) return null; + + return resp.JobDefinitions. Where(j => j.Id == pJobId). FirstOrDefault(); - } - else - { - return null; - } } public async Task UpdateJob(JobDefinition job) @@ -66,14 +63,10 @@ namespace ECM.JobRunner.Web.Data Action = UpdateJobUpdateJobRequest.UpdateJobAction.Update }); - if (resp != null && resp.OK) - { - return true; - } - else - { - return false; - } + if (resp == null) return false; + if (resp.OK == false) return false; + return true; + } public async Task CreateJob(JobDefinition job) diff --git a/ECM.JobRunner.Web/ECM.JobRunner.Web.csproj b/ECM.JobRunner.Web/ECM.JobRunner.Web.csproj index f7cb108..846afe9 100644 --- a/ECM.JobRunner.Web/ECM.JobRunner.Web.csproj +++ b/ECM.JobRunner.Web/ECM.JobRunner.Web.csproj @@ -38,4 +38,8 @@ + + + + diff --git a/ECM.JobRunner.Web/Pages/Import/Edit.razor b/ECM.JobRunner.Web/Pages/Import/Edit.razor new file mode 100644 index 0000000..cf197a6 --- /dev/null +++ b/ECM.JobRunner.Web/Pages/Import/Edit.razor @@ -0,0 +1,27 @@ +@page "/profiles/import/{profileId:int}/edit" +@using ECM.JobRunner.Common.JobRunnerReference; +@using ECM.JobRunner.Web.Data; +@inject NavigationManager Navigation; +@inject ImportService Profile; + +Job bearbeiten + +

Job bearbeiten

+ + + +@code { + [Parameter] + public int ProfileId { get; set; } + + private async void OnFormSubmit(EditContext ctx) + { + ImportProfile profile = (ImportProfile)ctx.Model; + bool result = await Profile.UpdateProfile(profile); + + if (result == true) + { + Navigation.NavigateTo($"/profiles/import/{profile.Id}"); + } + } +} diff --git a/ECM.JobRunner.Web/Pages/Job/JobList.razor b/ECM.JobRunner.Web/Pages/Import/Index.razor similarity index 73% rename from ECM.JobRunner.Web/Pages/Job/JobList.razor rename to ECM.JobRunner.Web/Pages/Import/Index.razor index 42d2d0a..799c916 100644 --- a/ECM.JobRunner.Web/Pages/Job/JobList.razor +++ b/ECM.JobRunner.Web/Pages/Import/Index.razor @@ -1,16 +1,17 @@ -@page "/jobs" +@page "/profiles/import" @using ECM.JobRunner.Common.JobRunnerReference; @using ECM.JobRunner.Web.Data; @inject JobService Jobs +@inject ImportService Import; -Jobs +Import Profiles -

Jobs

+

Import Profiles

-@if (filteredJobs == null) +@if (filteredProfiles == null) {
    -
  • Loading Jobs..
    • +
  • Loading Profiles..
} else @@ -20,7 +21,7 @@ else
- @if (filteredJobs.Count() == 0) + @if (filteredProfiles.Count() == 0) {
@@ -30,13 +31,13 @@ else } - @foreach (var job in filteredJobs) + @foreach (var profile in filteredProfiles) { - +
- @if (job.Active) + @if (profile.Active) { @@ -51,12 +52,12 @@ else } - @job.Name + @profile.Job.Name
- @job.Type.Name + @profile.Job.Name
- @if (job.Active) + @if (profile.Active) { Running } @@ -70,7 +71,7 @@ else
- + @@ -80,8 +81,8 @@ else } @code { - private IEnumerable? jobs; - private IEnumerable? filteredJobs; + private List? profiles; + private List? filteredProfiles; private string filterQuery = ""; private string FilterQuery { @@ -94,21 +95,23 @@ else protected async override void OnInitialized() { - jobs = await Jobs.GetJobs(); - filteredJobs = jobs; + profiles = await Import.GetProfiles(); + filteredProfiles = profiles; StateHasChanged(); } protected void OnFilterChanged() { - if (jobs != null) + if (profiles != null) { - filteredJobs = jobs.Where(j => j.Name.Contains(FilterQuery, StringComparison.OrdinalIgnoreCase)); + filteredProfiles = profiles. + Where(j => j.Job.Name.Contains(FilterQuery, StringComparison.OrdinalIgnoreCase)). + ToList(); } else { - filteredJobs = null; + filteredProfiles = null; } } diff --git a/ECM.JobRunner.Web/Pages/Job/NewJob.razor b/ECM.JobRunner.Web/Pages/Import/New.razor similarity index 60% rename from ECM.JobRunner.Web/Pages/Job/NewJob.razor rename to ECM.JobRunner.Web/Pages/Import/New.razor index 680ed98..dae7c8e 100644 --- a/ECM.JobRunner.Web/Pages/Job/NewJob.razor +++ b/ECM.JobRunner.Web/Pages/Import/New.razor @@ -1,24 +1,23 @@ -@page "/jobs/new" +@page "/profiles/import/new" @using ECM.JobRunner.Common.JobRunnerReference; @using ECM.JobRunner.Web.Data; -@using ECM.JobRunner.Web.Components.Job; @inject NavigationManager Navigation; -@inject JobService Jobs; +@inject ImportService Import; Job erstellen

Job erstellen

- + @code { public int JobId = -1; private async void OnFormSubmit(EditContext ctx) { - JobDefinition job = (JobDefinition)ctx.Model; + ImportProfile profile = (ImportProfile)ctx.Model; - bool result = await Jobs.CreateJob(job); + bool result = await Import.CreateProfile(profile); if (result == true) { diff --git a/ECM.JobRunner.Web/Pages/Import/ProfileForm.razor b/ECM.JobRunner.Web/Pages/Import/ProfileForm.razor new file mode 100644 index 0000000..770d366 --- /dev/null +++ b/ECM.JobRunner.Web/Pages/Import/ProfileForm.razor @@ -0,0 +1,214 @@ +@using ECM.JobRunner.Common.JobRunnerReference; +@using ECM.JobRunner.Web.Data; +@inject ImportService Import; +@inject JobService Jobs; + +@if (profile == null) +{ +

Form loading..

+} +else +{ + + + + +
+
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+ + +
+
+
+ + +
Der Name des Jobs. Wird in der Übersicht angezeigt.
+
+ +
+ + +
Der Windream Objekttyp, dem das Profil zugeordnet wird. Bestimmt u.a., welche Indexe zur Verfügung stehen.
+
+ + @*
+ + +
Der Typ des Jobs.
+
*@ + +
+ + +
Lokales Verzeichnis, aus dem Dateien zur Verarbeitung gelesen werden.
+
+ +
+ + +
Windream Verzeichnis, in das die verarbeiteten Dateien geschrieben werden.
+
+ +
+
+
+ + +
Die Zeitplan des Jobs. Erwartet eine Quartz.NET Cron Expression.
+
+ + + +
+ + +
Lokales Verzeichnis, in das die zu verarbeiteten Dateien als Sicherheitskopie geschrieben werden.
+
+ +
+ + +
Der Windream Objekttyp, dem das Profil zugeordnet wird. Bestimmt u.a., welche Indexe zur Verfügung stehen.
+
+ +
+ +