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 e98d2fb..0ec7fa1 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.wsdl +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.wsdl @@ -20,6 +20,12 @@ + + + + + + @@ -47,6 +53,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 0ee9529..2097fa8 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.xsd +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.xsd @@ -25,31 +25,45 @@ + + + + + + + + + + + + + + - + - + - + - + @@ -61,7 +75,7 @@ - + diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.JobRunnerReference.RunJobRunJobResponse.datasource b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.JobRunnerReference.RunJobRunJobResponse.datasource new file mode 100644 index 0000000..92bf766 --- /dev/null +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.JobRunnerReference.RunJobRunJobResponse.datasource @@ -0,0 +1,10 @@ + + + + ECM.JobRunner.Common.JobRunnerReference.RunJobRunJobResponse, 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.Windows.xsd b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Windows.xsd index 5a209a4..4fcf647 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Windows.xsd +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Windows.xsd @@ -80,6 +80,20 @@ + + + + + + + + + + + + + + @@ -138,32 +152,31 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + + + + + + + + @@ -178,29 +191,12 @@ - + - + - - - - - - - - - - - - - - - - - @@ -252,11 +248,4 @@ - - - - - - - \ No newline at end of file diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb index 11f2775..d33d843 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb @@ -20,6 +20,7 @@ Namespace JobRunnerReference System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _ 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.RunJobRunJobResponse)), _ System.Runtime.Serialization.KnownTypeAttribute(GetType(JobRunnerReference.UpdateJobUpdateJobResponse)), _ System.Runtime.Serialization.KnownTypeAttribute(GetType(JobRunnerReference.UpdateProfileUpdateProfileResponse)), _ System.Runtime.Serialization.KnownTypeAttribute(GetType(JobRunnerReference.GetJobConfigGetJobConfigResponse)), _ @@ -99,6 +100,14 @@ Namespace JobRunnerReference End Sub End Class + _ + Partial Public Class RunJobRunJobResponse + Inherits JobRunnerReference.BaseBaseResponse + End Class + _ Partial Public Class ImportProfile - Inherits JobRunnerReference.BaseProfile + Inherits Object + Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged + + _ + Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject _ Private ActiveField As Boolean @@ -948,9 +961,15 @@ Namespace JobRunnerReference _ Private IncludeSubfoldersField As Boolean + _ + Private JobField As JobRunnerReference.JobDefinition + _ Private JobIdField As Integer + _ + Private ObjectTypeField As JobRunnerReference.ObjectType + _ Private ObjectTypeNameField As String @@ -966,6 +985,16 @@ Namespace JobRunnerReference _ Private TargetFolderField As String + _ + 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 @@ -1044,6 +1073,19 @@ Namespace JobRunnerReference 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 Property JobId() As Integer Get @@ -1057,6 +1099,19 @@ Namespace JobRunnerReference End Set End Property + _ + Public Property ObjectType() As JobRunnerReference.ObjectType + Get + Return Me.ObjectTypeField + End Get + Set + If (Object.ReferenceEquals(Me.ObjectTypeField, value) <> true) Then + Me.ObjectTypeField = value + Me.RaisePropertyChanged("ObjectType") + End If + End Set + End Property + _ Public Property ObjectTypeName() As String Get @@ -1121,45 +1176,6 @@ Namespace JobRunnerReference 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 @@ -1201,13 +1217,13 @@ Namespace JobRunnerReference Private IndexNameField As String _ - Private MethodField As JobRunnerReference.ImportProfileStep.StepMethod + Private MethodField As String _ Private ProfileIdField As Integer _ - Private ScopeField As JobRunnerReference.ImportProfileStep.StepScope + Private ScopeField As String _ Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData @@ -1298,12 +1314,12 @@ Namespace JobRunnerReference End Property _ - Public Property Method() As JobRunnerReference.ImportProfileStep.StepMethod + Public Property Method() As String Get Return Me.MethodField End Get Set - If (Me.MethodField.Equals(value) <> true) Then + If (Object.ReferenceEquals(Me.MethodField, value) <> true) Then Me.MethodField = value Me.RaisePropertyChanged("Method") End If @@ -1324,12 +1340,12 @@ Namespace JobRunnerReference End Property _ - Public Property Scope() As JobRunnerReference.ImportProfileStep.StepScope + Public Property Scope() As String Get Return Me.ScopeField End Get Set - If (Me.ScopeField.Equals(value) <> true) Then + If (Object.ReferenceEquals(Me.ScopeField, value) <> true) Then Me.ScopeField = value Me.RaisePropertyChanged("Scope") End If @@ -1344,37 +1360,53 @@ Namespace JobRunnerReference propertyChanged(Me, New System.ComponentModel.PropertyChangedEventArgs(propertyName)) End If End Sub + End Class + + _ + Partial Public Class RunJobRunJobRequest + Inherits Object + Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged - _ - Public Enum StepMethod As Integer - - _ - SUBSTRING = 0 - - _ - REGEX = 1 - - _ - SPLIT = 2 - - _ - ALL = 3 - - _ - VALUE = 4 - End Enum + _ + Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject - _ - Public Enum StepScope As Integer - - _ - FILE = 0 - - _ - FOLDER = 1 - End Enum + _ + Private JobIdField As Integer + + _ + 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 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 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 _ Function GetJobStatusAsync() As System.Threading.Tasks.Task(Of JobRunnerReference.GetJobStatusGetJobStatusResponse) + _ + Function RunJob(ByVal pdata As JobRunnerReference.RunJobRunJobRequest) As JobRunnerReference.RunJobRunJobResponse + + _ + Function RunJobAsync(ByVal pdata As JobRunnerReference.RunJobRunJobRequest) As System.Threading.Tasks.Task(Of JobRunnerReference.RunJobRunJobResponse) + _ Function UpdateJob(ByVal pData As JobRunnerReference.UpdateJobUpdateJobRequest) As JobRunnerReference.UpdateJobUpdateJobResponse @@ -1613,6 +1651,14 @@ Namespace JobRunnerReference Return MyBase.Channel.GetJobStatusAsync End Function + Public Function RunJob(ByVal pdata As JobRunnerReference.RunJobRunJobRequest) As JobRunnerReference.RunJobRunJobResponse Implements JobRunnerReference.IEDMIService.RunJob + Return MyBase.Channel.RunJob(pdata) + End Function + + Public Function RunJobAsync(ByVal pdata As JobRunnerReference.RunJobRunJobRequest) As System.Threading.Tasks.Task(Of JobRunnerReference.RunJobRunJobResponse) Implements JobRunnerReference.IEDMIService.RunJobAsync + Return MyBase.Channel.RunJobAsync(pdata) + End Function + Public Function UpdateJob(ByVal pData As JobRunnerReference.UpdateJobUpdateJobRequest) As JobRunnerReference.UpdateJobUpdateJobResponse Implements JobRunnerReference.IEDMIService.UpdateJob Return MyBase.Channel.UpdateJob(pData) End Function diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/service.wsdl b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/service.wsdl index 53ec278..3bf5a85 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/service.wsdl +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/service.wsdl @@ -59,6 +59,15 @@ + + + + + + + + + diff --git a/ECM.JobRunner.Common/Constants.vb b/ECM.JobRunner.Common/Constants.vb new file mode 100644 index 0000000..f3ad250 --- /dev/null +++ b/ECM.JobRunner.Common/Constants.vb @@ -0,0 +1,10 @@ +Public Class Constants + Public Const SCOPE_FILE = "FILE" + Public Const SCOPE_FOLDER = "FOLDER" + + Public Const METHOD_SUBSTRING = "SUBSTRING" + Public Const METHOD_REGEX = "REGEX" + Public Const METHOD_SPLIT = "SPLIT" + Public Const METHOD_VALUE = "VALUE" + Public Const METHOD_ALL = "ALL" +End Class diff --git a/ECM.JobRunner.Common/ECM.JobRunner.Common.vbproj b/ECM.JobRunner.Common/ECM.JobRunner.Common.vbproj index 23fd6f7..5b7e1f0 100644 --- a/ECM.JobRunner.Common/ECM.JobRunner.Common.vbproj +++ b/ECM.JobRunner.Common/ECM.JobRunner.Common.vbproj @@ -71,6 +71,7 @@ True Reference.svcmap + True @@ -110,6 +111,9 @@ Reference.svcmap + + Reference.svcmap + Reference.svcmap diff --git a/ECM.JobRunner.Web/Pages/Import/Edit.razor b/ECM.JobRunner.Web/Pages/ImportProfile/EditProfile.razor similarity index 87% rename from ECM.JobRunner.Web/Pages/Import/Edit.razor rename to ECM.JobRunner.Web/Pages/ImportProfile/EditProfile.razor index cf197a6..47a2975 100644 --- a/ECM.JobRunner.Web/Pages/Import/Edit.razor +++ b/ECM.JobRunner.Web/Pages/ImportProfile/EditProfile.razor @@ -1,6 +1,7 @@ @page "/profiles/import/{profileId:int}/edit" @using ECM.JobRunner.Common.JobRunnerReference; @using ECM.JobRunner.Web.Data; +@using ECM.JobRunner.Web.Pages.ImportStep; @inject NavigationManager Navigation; @inject ImportService Profile; @@ -14,6 +15,9 @@ [Parameter] public int ProfileId { get; set; } + [Parameter] + public int StepId { get; set; } + private async void OnFormSubmit(EditContext ctx) { ImportProfile profile = (ImportProfile)ctx.Model; diff --git a/ECM.JobRunner.Web/Pages/Import/New.razor b/ECM.JobRunner.Web/Pages/ImportProfile/NewProfile.razor similarity index 84% rename from ECM.JobRunner.Web/Pages/Import/New.razor rename to ECM.JobRunner.Web/Pages/ImportProfile/NewProfile.razor index dae7c8e..682e1dc 100644 --- a/ECM.JobRunner.Web/Pages/Import/New.razor +++ b/ECM.JobRunner.Web/Pages/ImportProfile/NewProfile.razor @@ -8,10 +8,10 @@

Job erstellen

- + @code { - public int JobId = -1; + public int ProfileId = -1; private async void OnFormSubmit(EditContext ctx) { diff --git a/ECM.JobRunner.Web/Pages/Import/ProfileForm.razor b/ECM.JobRunner.Web/Pages/ImportProfile/ProfileForm.razor similarity index 99% rename from ECM.JobRunner.Web/Pages/Import/ProfileForm.razor rename to ECM.JobRunner.Web/Pages/ImportProfile/ProfileForm.razor index 770d366..303bde9 100644 --- a/ECM.JobRunner.Web/Pages/Import/ProfileForm.razor +++ b/ECM.JobRunner.Web/Pages/ImportProfile/ProfileForm.razor @@ -125,8 +125,6 @@ else
Die Zeitplan des Jobs. Erwartet eine Quartz.NET Cron Expression.
- -