From 3e2c4a9ab09e6d98953bfffb25bc226797c3f5bf Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 20 Dec 2022 12:04:40 +0100 Subject: [PATCH] Fix URI Prefix error --- .../ECM.JobRunner.Common.xsd | 61 +-- .../ECM.JobRunner.Windows.xsd | 15 +- .../JobRunnerReference/Reference.vb | 400 ++++++++---------- .../Models/Jobs/StatusItem.vb | 48 ++- ECM.JobRunner.Windows/Scheduler/JobStatus.vb | 6 +- 5 files changed, 251 insertions(+), 279 deletions(-) diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.xsd b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.xsd index 126923d..2325057 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.xsd +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.xsd @@ -2,46 +2,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -51,16 +11,37 @@ + + + + + + + + + + + + + + + + + + + + + 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 05dbf53..39fa2b4 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Windows.xsd +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Windows.xsd @@ -5,8 +5,7 @@ - - + @@ -37,7 +36,7 @@ - + @@ -60,7 +59,7 @@ - + @@ -84,10 +83,10 @@ - - + + - + @@ -95,7 +94,7 @@ - + diff --git a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb index 6103a8d..b8d5dce 100644 --- a/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb +++ b/ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb @@ -249,25 +249,9 @@ Namespace JobRunnerReference Partial Public Class GetJobStatusGetJobStatusResponse Inherits JobRunnerReference.BaseBaseResponse - _ - Private HistoryItemsField() As JobRunnerReference.HistoryItem - _ Private StatusItemsField() As JobRunnerReference.StatusItem - _ - Public Property HistoryItems() As JobRunnerReference.HistoryItem() - Get - Return Me.HistoryItemsField - End Get - Set - If (Object.ReferenceEquals(Me.HistoryItemsField, value) <> true) Then - Me.HistoryItemsField = value - Me.RaisePropertyChanged("HistoryItems") - End If - End Set - End Property - _ Public Property StatusItems() As JobRunnerReference.StatusItem() Get @@ -284,9 +268,9 @@ Namespace JobRunnerReference _ - Partial Public Class HistoryItem + Partial Public Class StatusItem Inherits Object Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged @@ -294,23 +278,50 @@ Namespace JobRunnerReference Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject _ - Private CreatedAtField As Date + Private CompleteTimeField As Date _ - Private ErrorMessageField As String + Private CreationTimeField As Date + + _ + Private ExecutingField As Boolean + + _ + Private ExecutionTimeField As System.TimeSpan + + _ + Private FailureMessageField As String + + _ + Private IdField As String _ - Private JobNameField As String + Private JobIdField As String _ - Private MessageField As String + Private NameField As String _ - Private StepsField() As JobRunnerReference.HistoryItem.HistoryStep + Private ProgressCurrentField As Integer + + _ + Private ProgressTotalField As Integer + + _ + Private StartTimeField As Date + + _ + Private StepsField() As JobRunnerReference.StatusItem.HistoryStep + + _ + Private SuccessMessageField As String _ Private SuccessfulField As Boolean + _ + Private UpdateTimeField As Date + _ Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData Get @@ -322,59 +333,150 @@ Namespace JobRunnerReference End Property _ - Public Property CreatedAt() As Date + Public Property CompleteTime() As Date Get - Return Me.CreatedAtField + Return Me.CompleteTimeField End Get Set - If (Me.CreatedAtField.Equals(value) <> true) Then - Me.CreatedAtField = value - Me.RaisePropertyChanged("CreatedAt") + If (Me.CompleteTimeField.Equals(value) <> true) Then + Me.CompleteTimeField = value + Me.RaisePropertyChanged("CompleteTime") End If End Set End Property _ - Public Property ErrorMessage() As String + Public Property CreationTime() As Date Get - Return Me.ErrorMessageField + Return Me.CreationTimeField End Get Set - If (Object.ReferenceEquals(Me.ErrorMessageField, value) <> true) Then - Me.ErrorMessageField = value - Me.RaisePropertyChanged("ErrorMessage") + If (Me.CreationTimeField.Equals(value) <> true) Then + Me.CreationTimeField = value + Me.RaisePropertyChanged("CreationTime") End If End Set End Property _ - Public Property JobName() As String + Public Property Executing() As Boolean Get - Return Me.JobNameField + Return Me.ExecutingField End Get Set - If (Object.ReferenceEquals(Me.JobNameField, value) <> true) Then - Me.JobNameField = value - Me.RaisePropertyChanged("JobName") + If (Me.ExecutingField.Equals(value) <> true) Then + Me.ExecutingField = value + Me.RaisePropertyChanged("Executing") End If End Set End Property _ - Public Property Message() As String + Public Property ExecutionTime() As System.TimeSpan Get - Return Me.MessageField + Return Me.ExecutionTimeField End Get Set - If (Object.ReferenceEquals(Me.MessageField, value) <> true) Then - Me.MessageField = value - Me.RaisePropertyChanged("Message") + If (Me.ExecutionTimeField.Equals(value) <> true) Then + Me.ExecutionTimeField = value + Me.RaisePropertyChanged("ExecutionTime") End If End Set End Property _ - Public Property Steps() As JobRunnerReference.HistoryItem.HistoryStep() + Public Property FailureMessage() As String + Get + Return Me.FailureMessageField + End Get + Set + If (Object.ReferenceEquals(Me.FailureMessageField, value) <> true) Then + Me.FailureMessageField = value + Me.RaisePropertyChanged("FailureMessage") + End If + End Set + End Property + + _ + Public Property Id() As String + Get + Return Me.IdField + End Get + Set + If (Object.ReferenceEquals(Me.IdField, value) <> true) Then + Me.IdField = value + Me.RaisePropertyChanged("Id") + End If + End Set + End Property + + _ + Public Property JobId() As String + Get + Return Me.JobIdField + End Get + Set + If (Object.ReferenceEquals(Me.JobIdField, value) <> true) Then + Me.JobIdField = value + Me.RaisePropertyChanged("JobId") + End If + End Set + End Property + + _ + Public Property Name() As String + Get + Return Me.NameField + End Get + Set + If (Object.ReferenceEquals(Me.NameField, value) <> true) Then + Me.NameField = value + Me.RaisePropertyChanged("Name") + End If + End Set + End Property + + _ + Public Property ProgressCurrent() As Integer + Get + Return Me.ProgressCurrentField + End Get + Set + If (Me.ProgressCurrentField.Equals(value) <> true) Then + Me.ProgressCurrentField = value + Me.RaisePropertyChanged("ProgressCurrent") + End If + End Set + End Property + + _ + Public Property ProgressTotal() As Integer + Get + Return Me.ProgressTotalField + End Get + Set + If (Me.ProgressTotalField.Equals(value) <> true) Then + Me.ProgressTotalField = value + Me.RaisePropertyChanged("ProgressTotal") + End If + End Set + End Property + + _ + Public Property StartTime() As Date + Get + Return Me.StartTimeField + End Get + Set + If (Me.StartTimeField.Equals(value) <> true) Then + Me.StartTimeField = value + Me.RaisePropertyChanged("StartTime") + End If + End Set + End Property + + _ + Public Property Steps() As JobRunnerReference.StatusItem.HistoryStep() Get Return Me.StepsField End Get @@ -386,6 +488,19 @@ Namespace JobRunnerReference End Set End Property + _ + Public Property SuccessMessage() As String + Get + Return Me.SuccessMessageField + End Get + Set + If (Object.ReferenceEquals(Me.SuccessMessageField, value) <> true) Then + Me.SuccessMessageField = value + Me.RaisePropertyChanged("SuccessMessage") + End If + End Set + End Property + _ Public Property Successful() As Boolean Get @@ -399,6 +514,19 @@ Namespace JobRunnerReference End Set End Property + _ + Public Property UpdateTime() As Date + Get + Return Me.UpdateTimeField + End Get + Set + If (Me.UpdateTimeField.Equals(value) <> true) Then + Me.UpdateTimeField = value + Me.RaisePropertyChanged("UpdateTime") + 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) @@ -410,7 +538,7 @@ Namespace JobRunnerReference _ Partial Public Class HistoryStep Inherits Object @@ -423,7 +551,7 @@ Namespace JobRunnerReference Private CreatedField As Date _ - Private LevelField As JobRunnerReference.HistoryItem.StepLevel + Private LevelField As String _ Private MessageField As String @@ -451,12 +579,12 @@ Namespace JobRunnerReference End Property _ - Public Property Level() As JobRunnerReference.HistoryItem.StepLevel + Public Property Level() As String Get Return Me.LevelField End Get Set - If (Me.LevelField.Equals(value) <> true) Then + If (Object.ReferenceEquals(Me.LevelField, value) <> true) Then Me.LevelField = value Me.RaisePropertyChanged("Level") End If @@ -485,182 +613,6 @@ Namespace JobRunnerReference End If End Sub End Class - - _ - Public Enum StepLevel As Integer - - _ - Debug = 0 - - _ - Info = 1 - - _ - Warning = 2 - - _ - [Error] = 3 - End Enum - End Class - - _ - Partial Public Class StatusItem - Inherits Object - Implements System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged - - _ - Private extensionDataField As System.Runtime.Serialization.ExtensionDataObject - - _ - Private CompleteTimeField As Date - - _ - Private ExecutingField As Boolean - - _ - Private ExecutionTimeField As System.TimeSpan - - _ - Private IdField As String - - _ - Private NameField As String - - _ - Private ProgressCurrentField As Integer - - _ - Private ProgressTotalField As Integer - - _ - Private StartTimeField As Date - - _ - 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 CompleteTime() As Date - Get - Return Me.CompleteTimeField - End Get - Set - If (Me.CompleteTimeField.Equals(value) <> true) Then - Me.CompleteTimeField = value - Me.RaisePropertyChanged("CompleteTime") - End If - End Set - End Property - - _ - Public Property Executing() As Boolean - Get - Return Me.ExecutingField - End Get - Set - If (Me.ExecutingField.Equals(value) <> true) Then - Me.ExecutingField = value - Me.RaisePropertyChanged("Executing") - End If - End Set - End Property - - _ - Public Property ExecutionTime() As System.TimeSpan - Get - Return Me.ExecutionTimeField - End Get - Set - If (Me.ExecutionTimeField.Equals(value) <> true) Then - Me.ExecutionTimeField = value - Me.RaisePropertyChanged("ExecutionTime") - End If - End Set - End Property - - _ - Public Property Id() As String - Get - Return Me.IdField - End Get - Set - If (Object.ReferenceEquals(Me.IdField, value) <> true) Then - Me.IdField = value - Me.RaisePropertyChanged("Id") - End If - End Set - End Property - - _ - Public Property Name() As String - Get - Return Me.NameField - End Get - Set - If (Object.ReferenceEquals(Me.NameField, value) <> true) Then - Me.NameField = value - Me.RaisePropertyChanged("Name") - End If - End Set - End Property - - _ - Public Property ProgressCurrent() As Integer - Get - Return Me.ProgressCurrentField - End Get - Set - If (Me.ProgressCurrentField.Equals(value) <> true) Then - Me.ProgressCurrentField = value - Me.RaisePropertyChanged("ProgressCurrent") - End If - End Set - End Property - - _ - Public Property ProgressTotal() As Integer - Get - Return Me.ProgressTotalField - End Get - Set - If (Me.ProgressTotalField.Equals(value) <> true) Then - Me.ProgressTotalField = value - Me.RaisePropertyChanged("ProgressTotal") - End If - End Set - End Property - - _ - Public Property StartTime() As Date - Get - Return Me.StartTimeField - End Get - Set - If (Me.StartTimeField.Equals(value) <> true) Then - Me.StartTimeField = value - Me.RaisePropertyChanged("StartTime") - 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