AppStd/ECMJobRunner
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

15-12-2022 ~ 2

Browse Source
This commit is contained in:
Jonathan Jenne 2022-12-15 15:59:38 +01:00
parent e4c5658c13
commit 63edd9e542
30 changed files with 331 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ECM.JobRunner.Common/Connected Services/JobRunnerReference/DigitalData.Services.EDMIService.wsdl
View File

@ -5,6 +5,7 @@
<xsd:import namespace="http://DigitalData.Services.EDMIService" /> <xsd:import namespace="http://DigitalData.Services.EDMIService" />
<xsd:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" /> <xsd:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
<xsd:import namespace="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows" /> <xsd:import namespace="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows" />
<xsd:import namespace="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" />
<xsd:import namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" /> <xsd:import namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
</xsd:schema> </xsd:schema>
</wsdl:types> </wsdl:types>

153
ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Common.xsd Normal file
View File

@ -0,0 +1,153 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" xmlns:ser="http://schemas.microsoft.com/2003/10/Serialization/" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
<xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
<xs:complexType name="ArrayOfHistoryItem">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="HistoryItem" nillable="true" type="tns:HistoryItem" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfHistoryItem" nillable="true" type="tns:ArrayOfHistoryItem" />
<xs:complexType name="HistoryItem">
<xs:sequence>
<xs:element minOccurs="0" name="CreatedAt" type="xs:dateTime" />
<xs:element minOccurs="0" name="ErrorMessage" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="JobName" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Message" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Steps" nillable="true" type="tns:ArrayOfHistoryItem.HistoryStep" />
<xs:element minOccurs="0" name="Successful" type="xs:boolean" />
</xs:sequence>
</xs:complexType>
<xs:element name="HistoryItem" nillable="true" type="tns:HistoryItem" />
<xs:complexType name="ArrayOfHistoryItem.HistoryStep">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="HistoryItem.HistoryStep" nillable="true" type="tns:HistoryItem.HistoryStep" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfHistoryItem.HistoryStep" nillable="true" type="tns:ArrayOfHistoryItem.HistoryStep" />
<xs:complexType name="HistoryItem.HistoryStep">
<xs:sequence>
<xs:element minOccurs="0" name="Created" type="xs:dateTime" />
<xs:element minOccurs="0" name="Level" type="tns:HistoryItem.StepLevel" />
<xs:element minOccurs="0" name="Message" nillable="true" type="xs:string" />
</xs:sequence>
</xs:complexType>
<xs:element name="HistoryItem.HistoryStep" nillable="true" type="tns:HistoryItem.HistoryStep" />
<xs:simpleType name="HistoryItem.StepLevel">
<xs:restriction base="xs:string">
<xs:enumeration value="Debug" />
<xs:enumeration value="Info" />
<xs:enumeration value="Warning" />
<xs:enumeration value="Error" />
</xs:restriction>
</xs:simpleType>
<xs:element name="HistoryItem.StepLevel" nillable="true" type="tns:HistoryItem.StepLevel" />
<xs:complexType name="ArrayOfStatusItem">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="StatusItem" nillable="true" type="tns:StatusItem" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfStatusItem" nillable="true" type="tns:ArrayOfStatusItem" />
<xs:complexType name="StatusItem">
<xs:sequence>
<xs:element minOccurs="0" name="CompleteTime" type="xs:dateTime" />
<xs:element minOccurs="0" name="Executing" type="xs:boolean" />
<xs:element minOccurs="0" name="ExecutionTime" type="ser:duration" />
<xs:element minOccurs="0" name="Id" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="ProgressCurrent" type="xs:int" />
<xs:element minOccurs="0" name="ProgressTotal" type="xs:int" />
<xs:element minOccurs="0" name="StartTime" type="xs:dateTime" />
</xs:sequence>
</xs:complexType>
<xs:element name="StatusItem" nillable="true" type="tns:StatusItem" />
<xs:complexType name="JobDefinition">
<xs:sequence>
<xs:element minOccurs="0" name="Active" type="xs:boolean" />
<xs:element minOccurs="0" name="CronSchedule" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Id" type="xs:int" />
<xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Type" nillable="true" type="tns:JobType" />
<xs:element minOccurs="0" name="TypeId" type="xs:int" />
</xs:sequence>
</xs:complexType>
<xs:element name="JobDefinition" nillable="true" type="tns:JobDefinition" />
<xs:complexType name="JobType">
<xs:sequence>
<xs:element minOccurs="0" name="Active" type="xs:boolean" />
<xs:element minOccurs="0" name="Id" type="xs:int" />
<xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
</xs:sequence>
</xs:complexType>
<xs:element name="JobType" nillable="true" type="tns:JobType" />
<xs:complexType name="ImportProfile">
<xs:sequence>
<xs:element minOccurs="0" name="Active" type="xs:boolean" />
<xs:element minOccurs="0" name="BackupFolder" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="DeleteFiles" type="xs:boolean" />
<xs:element minOccurs="0" name="FileExcludeRegex" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Id" type="xs:int" />
<xs:element minOccurs="0" name="IncludeSubfolders" type="xs:boolean" />
<xs:element minOccurs="0" name="Job" nillable="true" type="tns:JobDefinition" />
<xs:element minOccurs="0" name="JobId" type="xs:int" />
<xs:element minOccurs="0" name="ObjectType" nillable="true" type="tns:ObjectType" />
<xs:element minOccurs="0" name="ObjectTypeName" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="SourceFolder" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Steps" nillable="true" type="tns:ArrayOfImportProfileStep" />
<xs:element minOccurs="0" name="SubfolderDateFormat" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="TargetFolder" nillable="true" type="xs:string" />
</xs:sequence>
</xs:complexType>
<xs:element name="ImportProfile" nillable="true" type="tns:ImportProfile" />
<xs:complexType name="ObjectType">
<xs:sequence>
<xs:element xmlns:q1="http://schemas.microsoft.com/2003/10/Serialization/Arrays" minOccurs="0" name="Indexes" nillable="true" type="q1:ArrayOfstring" />
<xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
</xs:sequence>
</xs:complexType>
<xs:element name="ObjectType" nillable="true" type="tns:ObjectType" />
<xs:complexType name="ArrayOfImportProfileStep">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="ImportProfileStep" nillable="true" type="tns:ImportProfileStep" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfImportProfileStep" nillable="true" type="tns:ArrayOfImportProfileStep" />
<xs:complexType name="ImportProfileStep">
<xs:sequence>
<xs:element minOccurs="0" name="Active" type="xs:boolean" />
<xs:element minOccurs="0" name="Argument1" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Argument2" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Argument3" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Id" type="xs:int" />
<xs:element minOccurs="0" name="IndexName" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Method" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="ProfileId" type="xs:int" />
<xs:element minOccurs="0" name="Scope" nillable="true" type="xs:string" />
</xs:sequence>
</xs:complexType>
<xs:element name="ImportProfileStep" nillable="true" type="tns:ImportProfileStep" />
<xs:complexType name="ArrayOfJobDefinition">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="JobDefinition" nillable="true" type="tns:JobDefinition" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfJobDefinition" nillable="true" type="tns:ArrayOfJobDefinition" />
<xs:complexType name="ArrayOfJobType">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="JobType" nillable="true" type="tns:JobType" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfJobType" nillable="true" type="tns:ArrayOfJobType" />
<xs:complexType name="ArrayOfImportProfile">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="ImportProfile" nillable="true" type="tns:ImportProfile" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfImportProfile" nillable="true" type="tns:ArrayOfImportProfile" />
<xs:complexType name="ArrayOfObjectType">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="ObjectType" nillable="true" type="tns:ObjectType" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfObjectType" nillable="true" type="tns:ArrayOfObjectType" />
</xs:schema>

169
ECM.JobRunner.Common/Connected Services/JobRunnerReference/ECM.JobRunner.Windows.xsd
View File

@ -1,13 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows" xmlns:ser="http://schemas.microsoft.com/2003/10/Serialization/" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" /> <xs:import namespace="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" />
<xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
<xs:complexType name="GetJobStatus.GetJobStatusResponse"> <xs:complexType name="GetJobStatus.GetJobStatusResponse">
<xs:complexContent mixed="false"> <xs:complexContent mixed="false">
<xs:extension base="tns:Base.BaseResponse"> <xs:extension base="tns:Base.BaseResponse">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="0" name="HistoryItems" nillable="true" type="tns:ArrayOfHistoryItem" /> <xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="HistoryItems" nillable="true" type="q1:ArrayOfHistoryItem" />
<xs:element minOccurs="0" name="StatusItems" nillable="true" type="tns:ArrayOfStatusItem" /> <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="StatusItems" nillable="true" type="q2:ArrayOfStatusItem" />
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
@ -21,65 +20,6 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:element name="Base.BaseResponse" nillable="true" type="tns:Base.BaseResponse" /> <xs:element name="Base.BaseResponse" nillable="true" type="tns:Base.BaseResponse" />
<xs:complexType name="ArrayOfHistoryItem">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="HistoryItem" nillable="true" type="tns:HistoryItem" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfHistoryItem" nillable="true" type="tns:ArrayOfHistoryItem" />
<xs:complexType name="HistoryItem">
<xs:sequence>
<xs:element minOccurs="0" name="CreatedAt" type="xs:dateTime" />
<xs:element minOccurs="0" name="ErrorMessage" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="JobName" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Message" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Steps" nillable="true" type="tns:ArrayOfHistoryItem.HistoryStep" />
<xs:element minOccurs="0" name="Successful" type="xs:boolean" />
</xs:sequence>
</xs:complexType>
<xs:element name="HistoryItem" nillable="true" type="tns:HistoryItem" />
<xs:complexType name="ArrayOfHistoryItem.HistoryStep">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="HistoryItem.HistoryStep" nillable="true" type="tns:HistoryItem.HistoryStep" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfHistoryItem.HistoryStep" nillable="true" type="tns:ArrayOfHistoryItem.HistoryStep" />
<xs:complexType name="HistoryItem.HistoryStep">
<xs:sequence>
<xs:element minOccurs="0" name="Created" type="xs:dateTime" />
<xs:element minOccurs="0" name="Level" type="tns:HistoryItem.StepLevel" />
<xs:element minOccurs="0" name="Message" nillable="true" type="xs:string" />
</xs:sequence>
</xs:complexType>
<xs:element name="HistoryItem.HistoryStep" nillable="true" type="tns:HistoryItem.HistoryStep" />
<xs:simpleType name="HistoryItem.StepLevel">
<xs:restriction base="xs:string">
<xs:enumeration value="Debug" />
<xs:enumeration value="Info" />
<xs:enumeration value="Warning" />
<xs:enumeration value="Error" />
</xs:restriction>
</xs:simpleType>
<xs:element name="HistoryItem.StepLevel" nillable="true" type="tns:HistoryItem.StepLevel" />
<xs:complexType name="ArrayOfStatusItem">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="StatusItem" nillable="true" type="tns:StatusItem" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfStatusItem" nillable="true" type="tns:ArrayOfStatusItem" />
<xs:complexType name="StatusItem">
<xs:sequence>
<xs:element minOccurs="0" name="CompleteTime" type="xs:dateTime" />
<xs:element minOccurs="0" name="Executing" type="xs:boolean" />
<xs:element minOccurs="0" name="ExecutionTime" type="ser:duration" />
<xs:element minOccurs="0" name="Id" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="ProgressCurrent" type="xs:int" />
<xs:element minOccurs="0" name="ProgressTotal" type="xs:int" />
<xs:element minOccurs="0" name="StartTime" type="xs:dateTime" />
</xs:sequence>
</xs:complexType>
<xs:element name="StatusItem" nillable="true" type="tns:StatusItem" />
<xs:complexType name="RunJob.RunJobRequest"> <xs:complexType name="RunJob.RunJobRequest">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="0" name="JobId" type="xs:int" /> <xs:element minOccurs="0" name="JobId" type="xs:int" />
@ -97,7 +37,7 @@
<xs:complexType name="UpdateJob.UpdateJobRequest"> <xs:complexType name="UpdateJob.UpdateJobRequest">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="0" name="Action" type="tns:UpdateJob.UpdateJobRequest.UpdateJobAction" /> <xs:element minOccurs="0" name="Action" type="tns:UpdateJob.UpdateJobRequest.UpdateJobAction" />
<xs:element minOccurs="0" name="Job" nillable="true" type="tns:JobDefinition" /> <xs:element xmlns:q3="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="Job" nillable="true" type="q3:JobDefinition" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:element name="UpdateJob.UpdateJobRequest" nillable="true" type="tns:UpdateJob.UpdateJobRequest" /> <xs:element name="UpdateJob.UpdateJobRequest" nillable="true" type="tns:UpdateJob.UpdateJobRequest" />
@ -109,25 +49,6 @@
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:element name="UpdateJob.UpdateJobRequest.UpdateJobAction" nillable="true" type="tns:UpdateJob.UpdateJobRequest.UpdateJobAction" /> <xs:element name="UpdateJob.UpdateJobRequest.UpdateJobAction" nillable="true" type="tns:UpdateJob.UpdateJobRequest.UpdateJobAction" />
<xs:complexType name="JobDefinition">
<xs:sequence>
<xs:element minOccurs="0" name="Active" type="xs:boolean" />
<xs:element minOccurs="0" name="CronSchedule" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Id" type="xs:int" />
<xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Type" nillable="true" type="tns:JobType" />
<xs:element minOccurs="0" name="TypeId" type="xs:int" />
</xs:sequence>
</xs:complexType>
<xs:element name="JobDefinition" nillable="true" type="tns:JobDefinition" />
<xs:complexType name="JobType">
<xs:sequence>
<xs:element minOccurs="0" name="Active" type="xs:boolean" />
<xs:element minOccurs="0" name="Id" type="xs:int" />
<xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
</xs:sequence>
</xs:complexType>
<xs:element name="JobType" nillable="true" type="tns:JobType" />
<xs:complexType name="UpdateJob.UpdateJobResponse"> <xs:complexType name="UpdateJob.UpdateJobResponse">
<xs:complexContent mixed="false"> <xs:complexContent mixed="false">
<xs:extension base="tns:Base.BaseResponse"> <xs:extension base="tns:Base.BaseResponse">
@ -139,7 +60,7 @@
<xs:complexType name="UpdateProfile.UpdateProfileRequest"> <xs:complexType name="UpdateProfile.UpdateProfileRequest">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="0" name="Action" type="tns:UpdateProfile.UpdateProfileRequest.UpdateProfileAction" /> <xs:element minOccurs="0" name="Action" type="tns:UpdateProfile.UpdateProfileRequest.UpdateProfileAction" />
<xs:element minOccurs="0" name="ImportProfile" nillable="true" type="tns:ImportProfile" /> <xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="ImportProfile" nillable="true" type="q4:ImportProfile" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:element name="UpdateProfile.UpdateProfileRequest" nillable="true" type="tns:UpdateProfile.UpdateProfileRequest" /> <xs:element name="UpdateProfile.UpdateProfileRequest" nillable="true" type="tns:UpdateProfile.UpdateProfileRequest" />
@ -151,52 +72,6 @@
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:element name="UpdateProfile.UpdateProfileRequest.UpdateProfileAction" nillable="true" type="tns:UpdateProfile.UpdateProfileRequest.UpdateProfileAction" /> <xs:element name="UpdateProfile.UpdateProfileRequest.UpdateProfileAction" nillable="true" type="tns:UpdateProfile.UpdateProfileRequest.UpdateProfileAction" />
<xs:complexType name="ImportProfile">
<xs:sequence>
<xs:element minOccurs="0" name="Active" type="xs:boolean" />
<xs:element minOccurs="0" name="BackupFolder" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="DeleteFiles" type="xs:boolean" />
<xs:element minOccurs="0" name="FileExcludeRegex" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Id" type="xs:int" />
<xs:element minOccurs="0" name="IncludeSubfolders" type="xs:boolean" />
<xs:element minOccurs="0" name="Job" nillable="true" type="tns:JobDefinition" />
<xs:element minOccurs="0" name="JobId" type="xs:int" />
<xs:element minOccurs="0" name="ObjectType" nillable="true" type="tns:ObjectType" />
<xs:element minOccurs="0" name="ObjectTypeName" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="SourceFolder" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Steps" nillable="true" type="tns:ArrayOfImportProfileStep" />
<xs:element minOccurs="0" name="SubfolderDateFormat" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="TargetFolder" nillable="true" type="xs:string" />
</xs:sequence>
</xs:complexType>
<xs:element name="ImportProfile" nillable="true" type="tns:ImportProfile" />
<xs:complexType name="ObjectType">
<xs:sequence>
<xs:element xmlns:q1="http://schemas.microsoft.com/2003/10/Serialization/Arrays" minOccurs="0" name="Indexes" nillable="true" type="q1:ArrayOfstring" />
<xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
</xs:sequence>
</xs:complexType>
<xs:element name="ObjectType" nillable="true" type="tns:ObjectType" />
<xs:complexType name="ArrayOfImportProfileStep">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="ImportProfileStep" nillable="true" type="tns:ImportProfileStep" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfImportProfileStep" nillable="true" type="tns:ArrayOfImportProfileStep" />
<xs:complexType name="ImportProfileStep">
<xs:sequence>
<xs:element minOccurs="0" name="Active" type="xs:boolean" />
<xs:element minOccurs="0" name="Argument1" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Argument2" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Argument3" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Id" type="xs:int" />
<xs:element minOccurs="0" name="IndexName" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="Method" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="ProfileId" type="xs:int" />
<xs:element minOccurs="0" name="Scope" nillable="true" type="xs:string" />
</xs:sequence>
</xs:complexType>
<xs:element name="ImportProfileStep" nillable="true" type="tns:ImportProfileStep" />
<xs:complexType name="UpdateProfile.UpdateProfileResponse"> <xs:complexType name="UpdateProfile.UpdateProfileResponse">
<xs:complexContent mixed="false"> <xs:complexContent mixed="false">
<xs:extension base="tns:Base.BaseResponse"> <xs:extension base="tns:Base.BaseResponse">
@ -209,43 +84,19 @@
<xs:complexContent mixed="false"> <xs:complexContent mixed="false">
<xs:extension base="tns:Base.BaseResponse"> <xs:extension base="tns:Base.BaseResponse">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="0" name="JobDefinitions" nillable="true" type="tns:ArrayOfJobDefinition" /> <xs:element xmlns:q5="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="JobDefinitions" nillable="true" type="q5:ArrayOfJobDefinition" />
<xs:element minOccurs="0" name="JobTypes" nillable="true" type="tns:ArrayOfJobType" /> <xs:element xmlns:q6="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="JobTypes" nillable="true" type="q6:ArrayOfJobType" />
<xs:element minOccurs="0" name="ProfileDefinitions" nillable="true" type="tns:GetJobConfig.GetJobConfigResponse.ProfileDefinitionConfig" /> <xs:element minOccurs="0" name="ProfileDefinitions" nillable="true" type="tns:GetJobConfig.GetJobConfigResponse.ProfileDefinitionConfig" />
<xs:element minOccurs="0" name="WindreamObjectTypes" nillable="true" type="tns:ArrayOfObjectType" /> <xs:element xmlns:q7="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="WindreamObjectTypes" nillable="true" type="q7:ArrayOfObjectType" />
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
<xs:element name="GetJobConfig.GetJobConfigResponse" nillable="true" type="tns:GetJobConfig.GetJobConfigResponse" /> <xs:element name="GetJobConfig.GetJobConfigResponse" nillable="true" type="tns:GetJobConfig.GetJobConfigResponse" />
<xs:complexType name="ArrayOfJobDefinition">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="JobDefinition" nillable="true" type="tns:JobDefinition" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfJobDefinition" nillable="true" type="tns:ArrayOfJobDefinition" />
<xs:complexType name="ArrayOfJobType">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="JobType" nillable="true" type="tns:JobType" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfJobType" nillable="true" type="tns:ArrayOfJobType" />
<xs:complexType name="GetJobConfig.GetJobConfigResponse.ProfileDefinitionConfig"> <xs:complexType name="GetJobConfig.GetJobConfigResponse.ProfileDefinitionConfig">
<xs:sequence> <xs:sequence>
<xs:element minOccurs="0" name="ImportProfiles" nillable="true" type="tns:ArrayOfImportProfile" /> <xs:element xmlns:q8="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common" minOccurs="0" name="ImportProfiles" nillable="true" type="q8:ArrayOfImportProfile" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:element name="GetJobConfig.GetJobConfigResponse.ProfileDefinitionConfig" nillable="true" type="tns:GetJobConfig.GetJobConfigResponse.ProfileDefinitionConfig" /> <xs:element name="GetJobConfig.GetJobConfigResponse.ProfileDefinitionConfig" nillable="true" type="tns:GetJobConfig.GetJobConfigResponse.ProfileDefinitionConfig" />
<xs:complexType name="ArrayOfImportProfile">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="ImportProfile" nillable="true" type="tns:ImportProfile" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfImportProfile" nillable="true" type="tns:ArrayOfImportProfile" />
<xs:complexType name="ArrayOfObjectType">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="ObjectType" nillable="true" type="tns:ObjectType" />
</xs:sequence>
</xs:complexType>
<xs:element name="ArrayOfObjectType" nillable="true" type="tns:ArrayOfObjectType" />
</xs:schema> </xs:schema>

1
ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.svcmap
View File

@ -27,6 +27,7 @@
<MetadataFile FileName="DigitalData.Services.EDMIService.xsd" MetadataType="Schema" ID="d9797fa8-53bb-4228-a77d-4f795d7e7595" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9001/DigitalData/Services/JobRunner/mex" /> <MetadataFile FileName="DigitalData.Services.EDMIService.xsd" MetadataType="Schema" ID="d9797fa8-53bb-4228-a77d-4f795d7e7595" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9001/DigitalData/Services/JobRunner/mex" />
<MetadataFile FileName="service.xsd" MetadataType="Schema" ID="82f08b96-e901-43fd-b34f-8c5660ef7b9d" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9001/DigitalData/Services/JobRunner/mex" /> <MetadataFile FileName="service.xsd" MetadataType="Schema" ID="82f08b96-e901-43fd-b34f-8c5660ef7b9d" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9001/DigitalData/Services/JobRunner/mex" />
<MetadataFile FileName="ECM.JobRunner.Windows.xsd" MetadataType="Schema" ID="767808c0-aa74-46cc-af21-73a1ccedb8e9" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9001/DigitalData/Services/JobRunner/mex" /> <MetadataFile FileName="ECM.JobRunner.Windows.xsd" MetadataType="Schema" ID="767808c0-aa74-46cc-af21-73a1ccedb8e9" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9001/DigitalData/Services/JobRunner/mex" />
<MetadataFile FileName="ECM.JobRunner.Common.xsd" MetadataType="Schema" ID="f51feb28-2b0c-4ae5-9256-e872a8513346" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9001/DigitalData/Services/JobRunner/mex" />
<MetadataFile FileName="Arrays.xsd" MetadataType="Schema" ID="908086d3-61bf-4869-9efb-ca4e72ed984a" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9001/DigitalData/Services/JobRunner/mex" /> <MetadataFile FileName="Arrays.xsd" MetadataType="Schema" ID="908086d3-61bf-4869-9efb-ca4e72ed984a" SourceId="1" SourceUrl="net.tcp://172.24.12.39:9001/DigitalData/Services/JobRunner/mex" />
</Metadata> </Metadata>
<Extensions> <Extensions>

18
ECM.JobRunner.Common/Connected Services/JobRunnerReference/Reference.vb
View File

@ -284,7 +284,7 @@ Namespace JobRunnerReference
<System.Diagnostics.DebuggerStepThroughAttribute(), _ <System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _ System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="HistoryItem", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows"), _ System.Runtime.Serialization.DataContractAttribute(Name:="HistoryItem", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common"), _
System.SerializableAttribute()> _ System.SerializableAttribute()> _
Partial Public Class HistoryItem Partial Public Class HistoryItem
Inherits Object Inherits Object
@ -410,7 +410,7 @@ Namespace JobRunnerReference
<System.Diagnostics.DebuggerStepThroughAttribute(), _ <System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _ System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="HistoryItem.HistoryStep", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows"), _ System.Runtime.Serialization.DataContractAttribute(Name:="HistoryItem.HistoryStep", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common"), _
System.SerializableAttribute()> _ System.SerializableAttribute()> _
Partial Public Class HistoryStep Partial Public Class HistoryStep
Inherits Object Inherits Object
@ -487,7 +487,7 @@ Namespace JobRunnerReference
End Class End Class
<System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _ <System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="HistoryItem.StepLevel", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows")> _ System.Runtime.Serialization.DataContractAttribute(Name:="HistoryItem.StepLevel", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common")> _
Public Enum StepLevel As Integer Public Enum StepLevel As Integer
<System.Runtime.Serialization.EnumMemberAttribute()> _ <System.Runtime.Serialization.EnumMemberAttribute()> _
@ -506,7 +506,7 @@ Namespace JobRunnerReference
<System.Diagnostics.DebuggerStepThroughAttribute(), _ <System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _ System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="StatusItem", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows"), _ System.Runtime.Serialization.DataContractAttribute(Name:="StatusItem", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common"), _
System.SerializableAttribute()> _ System.SerializableAttribute()> _
Partial Public Class StatusItem Partial Public Class StatusItem
Inherits Object Inherits Object
@ -665,7 +665,7 @@ Namespace JobRunnerReference
<System.Diagnostics.DebuggerStepThroughAttribute(), _ <System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _ System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="JobDefinition", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows"), _ System.Runtime.Serialization.DataContractAttribute(Name:="JobDefinition", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common"), _
System.SerializableAttribute()> _ System.SerializableAttribute()> _
Partial Public Class JobDefinition Partial Public Class JobDefinition
Inherits Object Inherits Object
@ -792,7 +792,7 @@ Namespace JobRunnerReference
<System.Diagnostics.DebuggerStepThroughAttribute(), _ <System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _ System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="JobType", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows"), _ System.Runtime.Serialization.DataContractAttribute(Name:="JobType", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common"), _
System.SerializableAttribute()> _ System.SerializableAttribute()> _
Partial Public Class JobType Partial Public Class JobType
Inherits Object Inherits Object
@ -871,7 +871,7 @@ Namespace JobRunnerReference
<System.Diagnostics.DebuggerStepThroughAttribute(), _ <System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _ System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="ObjectType", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows"), _ System.Runtime.Serialization.DataContractAttribute(Name:="ObjectType", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common"), _
System.SerializableAttribute()> _ System.SerializableAttribute()> _
Partial Public Class ObjectType Partial Public Class ObjectType
Inherits Object Inherits Object
@ -934,7 +934,7 @@ Namespace JobRunnerReference
<System.Diagnostics.DebuggerStepThroughAttribute(), _ <System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _ System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="ImportProfile", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows"), _ System.Runtime.Serialization.DataContractAttribute(Name:="ImportProfile", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common"), _
System.SerializableAttribute()> _ System.SerializableAttribute()> _
Partial Public Class ImportProfile Partial Public Class ImportProfile
Inherits Object Inherits Object
@ -1189,7 +1189,7 @@ Namespace JobRunnerReference
<System.Diagnostics.DebuggerStepThroughAttribute(), _ <System.Diagnostics.DebuggerStepThroughAttribute(), _
System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _ System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0"), _
System.Runtime.Serialization.DataContractAttribute(Name:="ImportProfileStep", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Windows"), _ System.Runtime.Serialization.DataContractAttribute(Name:="ImportProfileStep", [Namespace]:="http://schemas.datacontract.org/2004/07/ECM.JobRunner.Common"), _
System.SerializableAttribute()> _ System.SerializableAttribute()> _
Partial Public Class ImportProfileStep Partial Public Class ImportProfileStep
Inherits Object Inherits Object

12
ECM.JobRunner.Common/ECM.JobRunner.Common.vbproj
View File

@ -45,6 +45,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
@ -72,6 +73,14 @@
<DependentUpon>Reference.svcmap</DependentUpon> <DependentUpon>Reference.svcmap</DependentUpon>
</Compile> </Compile>
<Compile Include="Constants.vb" /> <Compile Include="Constants.vb" />
<Compile Include="Models\Jobs\HistoryItem.vb" />
<Compile Include="Models\Jobs\JobDefinition.vb" />
<Compile Include="Models\Jobs\JobType.vb" />
<Compile Include="Models\Jobs\StatusItem.vb" />
<Compile Include="Models\Profiles\ImportFile.vb" />
<Compile Include="Models\Profiles\ImportProfile.vb" />
<Compile Include="Models\Profiles\ImportProfileStep.vb" />
<Compile Include="Models\Windream\ObjectType.vb" />
<Compile Include="My Project\AssemblyInfo.vb" /> <Compile Include="My Project\AssemblyInfo.vb" />
<Compile Include="My Project\Application.Designer.vb"> <Compile Include="My Project\Application.Designer.vb">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
@ -120,6 +129,9 @@
<None Include="Connected Services\JobRunnerReference\ECM.JobRunner.Common.JobRunnerReference.UpdateProfileUpdateProfileResponse.datasource"> <None Include="Connected Services\JobRunnerReference\ECM.JobRunner.Common.JobRunnerReference.UpdateProfileUpdateProfileResponse.datasource">
<DependentUpon>Reference.svcmap</DependentUpon> <DependentUpon>Reference.svcmap</DependentUpon>
</None> </None>
<None Include="Connected Services\JobRunnerReference\ECM.JobRunner.Common.xsd">
<SubType>Designer</SubType>
</None>
<None Include="Connected Services\JobRunnerReference\ECM.JobRunner.Windows.xsd"> <None Include="Connected Services\JobRunnerReference\ECM.JobRunner.Windows.xsd">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</None> </None>

0
ECM.JobRunner.Windows/Models/Jobs/HistoryItem.vb → ECM.JobRunner.Common/Models/Jobs/HistoryItem.vb
View File

0
ECM.JobRunner.Windows/Models/Jobs/JobDefinition.vb → ECM.JobRunner.Common/Models/Jobs/JobDefinition.vb
View File

0
ECM.JobRunner.Windows/Models/Jobs/JobType.vb → ECM.JobRunner.Common/Models/Jobs/JobType.vb
View File

0
ECM.JobRunner.Windows/Models/Jobs/StatusItem.vb → ECM.JobRunner.Common/Models/Jobs/StatusItem.vb
View File

0
ECM.JobRunner.Windows/Models/Profiles/ImportFile.vb → ECM.JobRunner.Common/Models/Profiles/ImportFile.vb
View File

0
ECM.JobRunner.Windows/Models/Profiles/ImportProfile.vb → ECM.JobRunner.Common/Models/Profiles/ImportProfile.vb
View File

4
ECM.JobRunner.Windows/Models/Profiles/ImportProfileStep.vb → ECM.JobRunner.Common/Models/Profiles/ImportProfileStep.vb
View File

@ -1,6 +1,4 @@
Imports System.Runtime.Serialization Public Class ImportProfileStep
Public Class ImportProfileStep
Public Property Active As Boolean Public Property Active As Boolean
Public Property Id As Integer Public Property Id As Integer
Public Property ProfileId As Integer Public Property ProfileId As Integer

0
ECM.JobRunner.Windows/Models/Windream/ObjectType.vb → ECM.JobRunner.Common/Models/Windream/ObjectType.vb
View File

11
ECM.JobRunner.Web/Components/NewButton.razor Normal file
View File

@ -0,0 +1,11 @@
<a class="btn btn-primary" href="@linkUrl">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-plus-circle" viewBox="0 0 16 16">
<path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
<path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z" />
</svg> New
</a>
@code {
[Parameter]
public string? linkUrl { get; set; }
}

1
ECM.JobRunner.Web/ECM.JobRunner.Web.csproj
View File

@ -7,6 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoMapper" Version="12.0.0" />
<PackageReference Include="NLog" Version="5.1.0" /> <PackageReference Include="NLog" Version="5.1.0" />
<PackageReference Include="Quartz" Version="3.5.0" /> <PackageReference Include="Quartz" Version="3.5.0" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.10.*" /> <PackageReference Include="System.ServiceModel.Duplex" Version="4.10.*" />

2
ECM.JobRunner.Web/Pages/ImportProfile/ProfileIndex.razor
View File

@ -71,7 +71,7 @@ else
</div> </div>
<div class="btn-group mt-3" role="group" aria-label="Basic example"> <div class="btn-group mt-3" role="group" aria-label="Basic example">
<a class="btn btn-primary" href="profiles/import/new"> <a class="btn btn-primary" href="/profiles/import/new">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-plus-circle" viewBox="0 0 16 16"> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-plus-circle" viewBox="0 0 16 16">
<path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" /> <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
<path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z" /> <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z" />

14
ECM.JobRunner.Web/Pages/ImportProfile/ShowProfile.razor
View File

@ -72,10 +72,6 @@ else
</li> </li>
</ul> </ul>
<h3>Profilschritte</h3>
<ECM.JobRunner.Web.Pages.ImportStep.ListSteps Profile="profile" />
<div class="btn-toolbar mt-3" role="toolbar" aria-label="Toolbar with button groups"> <div class="btn-toolbar mt-3" role="toolbar" aria-label="Toolbar with button groups">
<div class="btn-group me-2" role="group" aria-label="First group"> <div class="btn-group me-2" role="group" aria-label="First group">
<a class="btn btn-secondary" href="profiles/import"> <a class="btn btn-secondary" href="profiles/import">
@ -97,7 +93,7 @@ else
</div> </div>
<div class="flex-column flex-fill"></div> <div class="flex-column flex-fill"></div>
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<a class="btn btn-secondary" href="profiles/import/@profile.Id/steps">Profilschritte bearbeiten</a> <a class="btn btn-secondary" href="profiles/import/@profile.Id/steps">Profilschritte bearbeiten (@profile.Steps.Length)</a>
</div> </div>
</div> </div>
} }
@ -127,10 +123,10 @@ else
bool confirmed = await JsRuntime.InvokeAsync<bool>("confirm", "Are you sure?"); bool confirmed = await JsRuntime.InvokeAsync<bool>("confirm", "Are you sure?");
if (confirmed) if (confirmed)
{ {
//if (await Jobs.DeleteJob(profile) == true) if (await Import.DeleteProfile(profile) == true)
//{ {
// Navigation.NavigateTo($"/jobs"); Navigation.NavigateTo($"/jobs");
//}; };
} }
} }
} }

2
ECM.JobRunner.Web/Pages/ImportStep/EditStep.razor
View File

@ -32,7 +32,7 @@
if (result == true) if (result == true)
{ {
Navigation.NavigateTo($"/profiles/import/{profile.Id}"); Navigation.NavigateTo($"/profiles/import/{profile.Id}/steps");
} }
} }
} }

4
ECM.JobRunner.Web/Pages/ImportStep/ListSteps.razor
View File

@ -1,7 +1,5 @@
@using ECM.JobRunner.Common.JobRunnerReference; @using ECM.JobRunner.Common.JobRunnerReference;
@using ECM.JobRunner.Web.Data; @using ECM.JobRunner.Web.Data;
@inject JobService Jobs
@inject ImportService Import;
@if (Profile == null) @if (Profile == null)
{ {
@ -45,7 +43,7 @@ else
</span> </span>
<span>@step.IndexName</span> <span>@step.IndexName</span>
</div> </div>
@step.Method Process @step.Scope with Method @step.Method
</div> </div>
</a> </a>
} }

40
ECM.JobRunner.Web/Pages/ImportStep/NewStep.razor Normal file
View File

@ -0,0 +1,40 @@
@page "/profiles/import/{profileId:int}/steps/new"
@using ECM.JobRunner.Common.JobRunnerReference;
@using ECM.JobRunner.Web.Data;
@inject NavigationManager Navigation;
@inject ImportService Profile;
<PageTitle>Schritt bearbeiten</PageTitle>
<h3>Schritt bearbeiten</h3>
<StepForm ProfileId="ProfileId" StepId="-1" OnValidSubmit="OnFormSubmit" />
@code {
[Parameter]
public int ProfileId { get; set; }
[Parameter]
public int StepId { get; set; }
public ImportProfile? profile;
private async void OnFormSubmit(EditContext ctx)
{
ImportProfile profile = await Profile.GetProfile(ProfileId);
ImportProfileStep step = (ImportProfileStep)ctx.Model;
// TODO: This is ugly and manual and needs to be abstracted.
var steps = profile.Steps.ToList();
steps.Add(step);
profile.Steps = steps.ToArray();
bool result = await Profile.UpdateProfile(profile);
if (result == true)
{
Navigation.NavigateTo($"/profiles/import/{profile.Id}");
}
}
}

13
ECM.JobRunner.Web/Pages/ImportStep/ShowStep.razor
View File

@ -114,7 +114,7 @@ else
</ul> </ul>
<div class="btn-group mt-3" role="group" aria-label="Basic example"> <div class="btn-group mt-3" role="group" aria-label="Basic example">
<a class="btn btn-secondary" href="profiles/import/@profile.Id"> <a class="btn btn-secondary" href="profiles/import/@profile.Id/steps">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-left" viewBox="0 0 16 16"> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-left" viewBox="0 0 16 16">
<path fill-rule="evenodd" d="M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8z" /> <path fill-rule="evenodd" d="M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8z" />
</svg> Back </svg> Back
@ -125,7 +125,7 @@ else
<path fill-rule="evenodd" d="M1 13.5A1.5 1.5 0 0 0 2.5 15h11a1.5 1.5 0 0 0 1.5-1.5v-6a.5.5 0 0 0-1 0v6a.5.5 0 0 1-.5.5h-11a.5.5 0 0 1-.5-.5v-11a.5.5 0 0 1 .5-.5H9a.5.5 0 0 0 0-1H2.5A1.5 1.5 0 0 0 1 2.5v11z" /> <path fill-rule="evenodd" d="M1 13.5A1.5 1.5 0 0 0 2.5 15h11a1.5 1.5 0 0 0 1.5-1.5v-6a.5.5 0 0 0-1 0v6a.5.5 0 0 1-.5.5h-11a.5.5 0 0 1-.5-.5v-11a.5.5 0 0 1 .5-.5H9a.5.5 0 0 0 0-1H2.5A1.5 1.5 0 0 0 1 2.5v11z" />
</svg> Edit </svg> Edit
</a> </a>
<a class="btn btn-danger" @onclick="DeleteJob"> <a class="btn btn-danger" @onclick="DeleteStep">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash3" viewBox="0 0 16 16"> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash3" viewBox="0 0 16 16">
<path d="M6.5 1h3a.5.5 0 0 1 .5.5v1H6v-1a.5.5 0 0 1 .5-.5ZM11 2.5v-1A1.5 1.5 0 0 0 9.5 0h-3A1.5 1.5 0 0 0 5 1.5v1H2.506a.58.58 0 0 0-.01 0H1.5a.5.5 0 0 0 0 1h.538l.853 10.66A2 2 0 0 0 4.885 16h6.23a2 2 0 0 0 1.994-1.84l.853-10.66h.538a.5.5 0 0 0 0-1h-.995a.59.59 0 0 0-.01 0H11Zm1.958 1-.846 10.58a1 1 0 0 1-.997.92h-6.23a1 1 0 0 1-.997-.92L3.042 3.5h9.916Zm-7.487 1a.5.5 0 0 1 .528.47l.5 8.5a.5.5 0 0 1-.998.06L5 5.03a.5.5 0 0 1 .47-.53Zm5.058 0a.5.5 0 0 1 .47.53l-.5 8.5a.5.5 0 1 1-.998-.06l.5-8.5a.5.5 0 0 1 .528-.47ZM8 4.5a.5.5 0 0 1 .5.5v8.5a.5.5 0 0 1-1 0V5a.5.5 0 0 1 .5-.5Z" /> <path d="M6.5 1h3a.5.5 0 0 1 .5.5v1H6v-1a.5.5 0 0 1 .5-.5ZM11 2.5v-1A1.5 1.5 0 0 0 9.5 0h-3A1.5 1.5 0 0 0 5 1.5v1H2.506a.58.58 0 0 0-.01 0H1.5a.5.5 0 0 0 0 1h.538l.853 10.66A2 2 0 0 0 4.885 16h6.23a2 2 0 0 0 1.994-1.84l.853-10.66h.538a.5.5 0 0 0 0-1h-.995a.59.59 0 0 0-.01 0H11Zm1.958 1-.846 10.58a1 1 0 0 1-.997.92h-6.23a1 1 0 0 1-.997-.92L3.042 3.5h9.916Zm-7.487 1a.5.5 0 0 1 .528.47l.5 8.5a.5.5 0 0 1-.998.06L5 5.03a.5.5 0 0 1 .47-.53Zm5.058 0a.5.5 0 0 1 .47.53l-.5 8.5a.5.5 0 1 1-.998-.06l.5-8.5a.5.5 0 0 1 .528-.47ZM8 4.5a.5.5 0 0 1 .5.5v8.5a.5.5 0 0 1-1 0V5a.5.5 0 0 1 .5-.5Z" />
</svg> Delete </svg> Delete
@ -156,19 +156,22 @@ else
} }
} }
protected async void DeleteJob() protected async void DeleteStep()
{ {
if (profile != null) if (profile != null)
{ {
bool confirmed = await JsRuntime.InvokeAsync<bool>("confirm", "Are you sure?"); bool confirmed = await JsRuntime.InvokeAsync<bool>("confirm", "Are you sure?");
if (confirmed) if (confirmed)
{ {
var steps = profile.Steps.Where(s => s.Id != StepId).ToArray(); var steps = profile.Steps.
ToList().
Where<ImportProfileStep>(s => s.Id != StepId).
ToArray();
profile.Steps = steps; profile.Steps = steps;
if (await Import.UpdateProfile(profile) == true) if (await Import.UpdateProfile(profile) == true)
{ {
Navigation.NavigateTo($"/profiles/import/{ProfileId}"); Navigation.NavigateTo($"/profiles/import/{ProfileId}/steps");
}; };
} }
} }

2
ECM.JobRunner.Web/Pages/ImportStep/StepForm.razor
View File

@ -161,7 +161,7 @@ else
if (StepId == Constants.ENTITY_ID_NEW) if (StepId == Constants.ENTITY_ID_NEW)
{ {
step = new ImportProfileStep() { Id = Constants.ENTITY_ID_NEW }; step = new ImportProfileStep() { Id = Constants.ENTITY_ID_NEW, ProfileId = ProfileId };
} }
else else
{ {

51
ECM.JobRunner.Web/Pages/ImportStep/StepIndex.razor Normal file
View File

@ -0,0 +1,51 @@
@page "/profiles/import/{profileId:int}/steps"
@using ECM.JobRunner.Common.JobRunnerReference
@using ECM.JobRunner.Web.Data
@using ECM.JobRunner.Web.Pages.ImportStep
@inject ImportService Import
<h3>Profilschritte</h3>
@if (profile == null)
{
<ul class="list-group">
<li class="list-group-item">Loading Steps..</li>
</ul>
}
else
{
<ListSteps Profile="profile" />
<div class="btn-toolbar mt-3" role="toolbar" aria-label="Toolbar with button groups">
<div class="btn-group me-2" role="group" aria-label="First group">
<a class="btn btn-secondary" href="profiles/import/@profile.Id">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-left" viewBox="0 0 16 16">
<path fill-rule="evenodd" d="M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8z" />
</svg> Back
</a>
<a class="btn btn-primary" href="/profiles/import/@profile.Id/steps/new">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-plus-circle" viewBox="0 0 16 16">
<path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
<path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z" />
</svg> New
</a>
</div>
</div>
}
@code {
[Parameter]
public int ProfileId { get; set; }
private ImportProfile? profile;
protected async override void OnInitialized()
{
profile = await Import.GetProfile(ProfileId);
StateHasChanged();
}
}

8
ECM.JobRunner.Windows/ECM.JobRunner.Windows.vbproj
View File

@ -122,14 +122,6 @@
<Compile Include="Config.vb" /> <Compile Include="Config.vb" />
<Compile Include="Constants.vb" /> <Compile Include="Constants.vb" />
<Compile Include="LogProvider.vb" /> <Compile Include="LogProvider.vb" />
<Compile Include="Models\Jobs\JobDefinition.vb" />
<Compile Include="Models\Jobs\JobType.vb" />
<Compile Include="Models\Jobs\HistoryItem.vb" />
<Compile Include="Models\Jobs\StatusItem.vb" />
<Compile Include="Models\Profiles\ImportFile.vb" />
<Compile Include="Models\Profiles\ImportProfile.vb" />
<Compile Include="Models\Profiles\ImportProfileStep.vb" />
<Compile Include="Models\Windream\ObjectType.vb" />
<Compile Include="My Project\Application.Designer.vb"> <Compile Include="My Project\Application.Designer.vb">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DependentUpon>Application.myapp</DependentUpon> <DependentUpon>Application.myapp</DependentUpon>

1
ECM.JobRunner.Windows/Scheduler/JobListener.vb
View File

@ -2,6 +2,7 @@
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports Quartz Imports Quartz
Imports Quartz.Listener Imports Quartz.Listener
Imports ECM.JobRunner.Common
Namespace Scheduler Namespace Scheduler
Public Class JobListener Public Class JobListener

4
ECM.JobRunner.Windows/Scheduler/JobResult.vb
View File

@ -1,4 +1,6 @@
Public Class JobResult Imports ECM.JobRunner.Common
Public Class JobResult
Public Property Successful As Boolean Public Property Successful As Boolean
Public Property Description As String Public Property Description As String
Public Property Steps As List(Of HistoryItem.HistoryStep) Public Property Steps As List(Of HistoryItem.HistoryStep)

1
ECM.JobRunner.Windows/Scheduler/Jobs/FileImportJob.vb
View File

@ -2,6 +2,7 @@
Imports Quartz Imports Quartz
Imports System.Text.RegularExpressions Imports System.Text.RegularExpressions
Imports DigitalData.Modules.Filesystem Imports DigitalData.Modules.Filesystem
Imports ECM.JobRunner.Common
Namespace Scheduler.Jobs Namespace Scheduler.Jobs

1
ECM.JobRunner.Windows/State.vb
View File

@ -4,6 +4,7 @@ Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Language Imports DigitalData.Modules.Language
Imports ECM.JobRunner.Windows.Scheduler Imports ECM.JobRunner.Windows.Scheduler
Imports DigitalData.Modules.Windream Imports DigitalData.Modules.Windream
Imports ECM.JobRunner.Common
Public Class State Public Class State
Inherits BaseClass Inherits BaseClass

32
ECM.JobRunner.Windows/WCF/Methods/UpdateProfile.vb
View File

@ -1,5 +1,6 @@
Imports DigitalData.Modules.Database Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Language
Imports ECM.JobRunner.Common Imports ECM.JobRunner.Common
Imports ECM.JobRunner.Windows.Scheduler Imports ECM.JobRunner.Windows.Scheduler
@ -121,9 +122,9 @@ Public Class UpdateProfile
oCommand.Parameters.Add("WM_OBJECTTYPE", SqlDbType.NVarChar, 100).Value = oProfile.ObjectTypeName oCommand.Parameters.Add("WM_OBJECTTYPE", SqlDbType.NVarChar, 100).Value = oProfile.ObjectTypeName
oCommand.Parameters.Add("SOURCE_FOLDER", SqlDbType.NVarChar, 500).Value = oProfile.SourceFolder oCommand.Parameters.Add("SOURCE_FOLDER", SqlDbType.NVarChar, 500).Value = oProfile.SourceFolder
oCommand.Parameters.Add("TARGET_FOLDER", SqlDbType.NVarChar, 500).Value = oProfile.TargetFolder oCommand.Parameters.Add("TARGET_FOLDER", SqlDbType.NVarChar, 500).Value = oProfile.TargetFolder
oCommand.Parameters.Add("BACKUP_FOLDER", SqlDbType.NVarChar, 500).Value = oProfile.BackupFolder oCommand.Parameters.Add("BACKUP_FOLDER", SqlDbType.NVarChar, 500).Value = Utils.NotNull(oProfile.BackupFolder, String.Empty)
oCommand.Parameters.Add("EXCLUDE_REGEX", SqlDbType.NVarChar, 5000).Value = oProfile.FileExcludeRegex oCommand.Parameters.Add("EXCLUDE_REGEX", SqlDbType.NVarChar, 5000).Value = Utils.NotNull(oProfile.FileExcludeRegex, String.Empty)
oCommand.Parameters.Add("SF_DATE_FORMAT", SqlDbType.NVarChar, 50).Value = oProfile.SubfolderDateFormat oCommand.Parameters.Add("SF_DATE_FORMAT", SqlDbType.NVarChar, 50).Value = Utils.NotNull(oProfile.SubfolderDateFormat, String.Empty)
oCommand.Parameters.Add("DEL_FILE_SUCCESS", SqlDbType.Bit).Value = oProfile.DeleteFiles oCommand.Parameters.Add("DEL_FILE_SUCCESS", SqlDbType.Bit).Value = oProfile.DeleteFiles
oCommand.Parameters.Add("INCL_SUBFOLDER", SqlDbType.Bit).Value = oProfile.IncludeSubfolders oCommand.Parameters.Add("INCL_SUBFOLDER", SqlDbType.Bit).Value = oProfile.IncludeSubfolders
oCommand.Parameters.Add("ACTIVE", SqlDbType.Bit).Value = oProfile.Active oCommand.Parameters.Add("ACTIVE", SqlDbType.Bit).Value = oProfile.Active
@ -213,9 +214,9 @@ Public Class UpdateProfile
oCommand.Parameters.Add("IDX_NAME", SqlDbType.NVarChar, 100).Value = oStep.IndexName oCommand.Parameters.Add("IDX_NAME", SqlDbType.NVarChar, 100).Value = oStep.IndexName
oCommand.Parameters.Add("METHOD", SqlDbType.NVarChar, 100).Value = oStep.Method oCommand.Parameters.Add("METHOD", SqlDbType.NVarChar, 100).Value = oStep.Method
oCommand.Parameters.Add("ARGUMENT1", SqlDbType.NVarChar, 500).Value = oStep.Argument1 oCommand.Parameters.Add("ARGUMENT1", SqlDbType.NVarChar, 500).Value = Utils.NotNull(oStep.Argument1, String.Empty)
oCommand.Parameters.Add("ARGUMENT2", SqlDbType.NVarChar, 500).Value = oStep.Argument2 oCommand.Parameters.Add("ARGUMENT2", SqlDbType.NVarChar, 500).Value = Utils.NotNull(oStep.Argument2, String.Empty)
oCommand.Parameters.Add("ARGUMENT3", SqlDbType.NVarChar, 500).Value = oStep.Argument3 oCommand.Parameters.Add("ARGUMENT3", SqlDbType.NVarChar, 500).Value = Utils.NotNull(oStep.Argument3, String.Empty)
oCommand.Parameters.Add("SCOPE", SqlDbType.NVarChar, 50).Value = oStep.Scope oCommand.Parameters.Add("SCOPE", SqlDbType.NVarChar, 50).Value = oStep.Scope
oCommand.Parameters.Add("ACTIVE", SqlDbType.Bit).Value = oStep.Active oCommand.Parameters.Add("ACTIVE", SqlDbType.Bit).Value = oStep.Active
oCommand.Parameters.Add("GUID", SqlDbType.Int).Value = oStep.Id oCommand.Parameters.Add("GUID", SqlDbType.Int).Value = oStep.Id
@ -232,9 +233,11 @@ Public Class UpdateProfile
Private Function DoCreateImportProfileSteps(pData As UpdateProfileRequest, pIdList As List(Of Integer)) As Boolean Private Function DoCreateImportProfileSteps(pData As UpdateProfileRequest, pIdList As List(Of Integer)) As Boolean
Dim oProfile = pData.ImportProfile Dim oProfile = pData.ImportProfile
Dim oSQL As String = "INSERT INTO TBECM_JR_FIW_STEP Dim oSQL As String = "INSERT INTO TBECM_JR_FIW_STEP (
(PROFILE_ID, IDX_NAME, METHOD, ARGUMENT1, ARGUMENT2, ARGUMENT3, SCOPE, ACTIVE) VALUES PROFILE_ID, IDX_NAME, METHOD, ARGUMENT1, ARGUMENT2, ARGUMENT3, SCOPE, ACTIVE
(@PROFILE_ID, @IDX_NAME, @METHOD, @ARGUMENT1, @ARGUMENT2, @ARGUMENT3, @SCOPE, @ACTIVE)" ) VALUES (
@PROFILE_ID, @IDX_NAME, @METHOD, @ARGUMENT1, @ARGUMENT2, @ARGUMENT3, @SCOPE, @ACTIVE
)"
Dim oResults As New List(Of Boolean) Dim oResults As New List(Of Boolean)
@ -246,9 +249,9 @@ Public Class UpdateProfile
oCommand.Parameters.Add("PROFILE_ID", SqlDbType.Int).Value = oStep.ProfileId oCommand.Parameters.Add("PROFILE_ID", SqlDbType.Int).Value = oStep.ProfileId
oCommand.Parameters.Add("IDX_NAME", SqlDbType.NVarChar, 100).Value = oStep.IndexName oCommand.Parameters.Add("IDX_NAME", SqlDbType.NVarChar, 100).Value = oStep.IndexName
oCommand.Parameters.Add("METHOD", SqlDbType.NVarChar, 100).Value = oStep.Method oCommand.Parameters.Add("METHOD", SqlDbType.NVarChar, 100).Value = oStep.Method
oCommand.Parameters.Add("ARGUMENT1", SqlDbType.NVarChar, 500).Value = oStep.Argument1 oCommand.Parameters.Add("ARGUMENT1", SqlDbType.NVarChar, 500).Value = Utils.NotNull(oStep.Argument1, String.Empty)
oCommand.Parameters.Add("ARGUMENT2", SqlDbType.NVarChar, 500).Value = oStep.Argument2 oCommand.Parameters.Add("ARGUMENT2", SqlDbType.NVarChar, 500).Value = Utils.NotNull(oStep.Argument2, String.Empty)
oCommand.Parameters.Add("ARGUMENT3", SqlDbType.NVarChar, 500).Value = oStep.Argument3 oCommand.Parameters.Add("ARGUMENT3", SqlDbType.NVarChar, 500).Value = Utils.NotNull(oStep.Argument3, String.Empty)
oCommand.Parameters.Add("SCOPE", SqlDbType.NVarChar, 50).Value = oStep.Scope oCommand.Parameters.Add("SCOPE", SqlDbType.NVarChar, 50).Value = oStep.Scope
oCommand.Parameters.Add("ACTIVE", SqlDbType.Bit).Value = oStep.Active oCommand.Parameters.Add("ACTIVE", SqlDbType.Bit).Value = oStep.Active
@ -270,11 +273,12 @@ Public Class UpdateProfile
For Each oId In pIdList For Each oId In pIdList
Try Try
Dim oStep = pData.ImportProfile.Steps.Where(Function(s) s.Id = oId).SingleOrDefault() Logger.Debug("Preparing to delete Step [{0}]", oId)
Dim oCommand As New SqlClient.SqlCommand(oSQL) Dim oCommand As New SqlClient.SqlCommand(oSQL)
oCommand.Parameters.Add("GUID", SqlDbType.Int).Value = oStep.Id oCommand.Parameters.Add("GUID", SqlDbType.Int).Value = oId
Logger.Debug("Deleting Step [{0}]..", oId)
oResults.Add(Database.ExecuteNonQuery(oCommand)) oResults.Add(Database.ExecuteNonQuery(oCommand))
Catch ex As Exception Catch ex As Exception
oResults.Add(False) oResults.Add(False)