From 8f457040bb5a1a05f188e579494d8baff752296c Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Wed, 23 Nov 2016 17:04:30 +0100 Subject: [PATCH] MS --- .../DD-Record-Organiser.vbproj | 14 +- .../DD_DMSDataSet.Designer.vb | 1280 ++++++++++++++--- app/DD-Record-Organiser/DD_DMSDataSet.xsd | 77 + app/DD-Record-Organiser/DD_DMSDataSet.xss | 159 +- .../ModuleHelperMethods.vb | 4 +- app/DD-Record-Organiser/frmAbout.Designer.vb | 19 +- app/DD-Record-Organiser/frmAbout.resx | 66 +- app/DD-Record-Organiser/frmAbout.vb | 13 +- .../frmConstructor_Main.Designer.vb | 539 ++++--- .../frmConstructor_Main.resx | 272 +++- .../frmConstructor_Main.vb | 89 +- ...esigner.vb => frmGlobalSearch.Designer.vb} | 4 +- ....en-US.resx => frmGlobalSearch.en-US.resx} | 0 ...earchAllOVer.resx => frmGlobalSearch.resx} | 0 ...frmSearchAllOver.vb => frmGlobalSearch.vb} | 2 +- .../frmNewVariant.Designer.vb | 6 +- app/DD-Record-Organiser/frmNewVariant.vb | 32 +- app/SetupWiX/Product.wxs | 5 +- 18 files changed, 1971 insertions(+), 610 deletions(-) rename app/DD-Record-Organiser/{frmSearchAllOVer.Designer.vb => frmGlobalSearch.Designer.vb} (99%) rename app/DD-Record-Organiser/{frmSearchAllOver.en-US.resx => frmGlobalSearch.en-US.resx} (100%) rename app/DD-Record-Organiser/{frmSearchAllOVer.resx => frmGlobalSearch.resx} (100%) rename app/DD-Record-Organiser/{frmSearchAllOver.vb => frmGlobalSearch.vb} (99%) diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index ad3f9ed..44fe966 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -346,10 +346,10 @@ Form - - frmSearchAllOver.vb + + frmGlobalSearch.vb - + Form @@ -768,11 +768,11 @@ frmSAP_FuBa.vb - - frmSearchAllOver.vb + + frmGlobalSearch.vb - - frmSearchAllOver.vb + + frmGlobalSearch.vb frmStaticListEditor.vb diff --git a/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb b/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb index 25fe607..2424cae 100644 --- a/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb +++ b/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb @@ -125,6 +125,8 @@ Partial Public Class DD_DMSDataSet Private tableTBPMO_RIGHT_USER As TBPMO_RIGHT_USERDataTable + Private tableTBPMO_RECORD_VARIANT As TBPMO_RECORD_VARIANTDataTable + Private relationFK_TBPMO_FORM_VIEW_FORM_ID As Global.System.Data.DataRelation Private relationFK_TBDD_DOKUMENTART_EINGID As Global.System.Data.DataRelation @@ -165,6 +167,8 @@ Partial Public Class DD_DMSDataSet Private relationFK_TBPMO_FORM_VIEW_FORM_ID1 As Global.System.Data.DataRelation + Private relationFK_TBPMO_RECORD_VARIANT_RECORD_ID As Global.System.Data.DataRelation + Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ + Public ReadOnly Property TBPMO_RECORD_VARIANT() As TBPMO_RECORD_VARIANTDataTable + Get + Return Me.tableTBPMO_RECORD_VARIANT + End Get + End Property + _ + Private Function ShouldSerializeTBPMO_RECORD_VARIANT() As Boolean + Return false + End Function + _ Private Sub SchemaChanged(ByVal sender As Object, ByVal e As Global.System.ComponentModel.CollectionChangeEventArgs) @@ -2090,6 +2127,9 @@ Partial Public Class DD_DMSDataSet _ Public Delegate Sub TBPMO_RIGHT_USERRowChangeEventHandler(ByVal sender As Object, ByVal e As TBPMO_RIGHT_USERRowChangeEvent) + _ + Public Delegate Sub TBPMO_RECORD_VARIANTRowChangeEventHandler(ByVal sender As Object, ByVal e As TBPMO_RECORD_VARIANTRowChangeEvent) + ''' '''Represents the strongly named DataTable class. ''' @@ -22467,12 +22507,19 @@ Partial Public Class DD_DMSDataSet Me.columnUSER_ID.AllowDBNull = false Me.columnENTITY_ID.AllowDBNull = false Me.columnEDIT_REC.AllowDBNull = false + Me.columnEDIT_REC.DefaultValue = CType(true,Boolean) Me.columnADD_REC.AllowDBNull = false + Me.columnADD_REC.DefaultValue = CType(false,Boolean) Me.columnDELETE_REC.AllowDBNull = false + Me.columnDELETE_REC.DefaultValue = CType(false,Boolean) Me.columnADD_DOC.AllowDBNull = false + Me.columnADD_DOC.DefaultValue = CType(false,Boolean) Me.columnREAD_ONLY_DOC.AllowDBNull = false + Me.columnREAD_ONLY_DOC.DefaultValue = CType(false,Boolean) Me.columnDELETE_DOC.AllowDBNull = false + Me.columnDELETE_DOC.DefaultValue = CType(false,Boolean) Me.columnFILES_VISIBLE.AllowDBNull = false + Me.columnFILES_VISIBLE.DefaultValue = CType(false,Boolean) End Sub + '''Represents the strongly named DataTable class. + ''' + _ + Partial Public Class TBPMO_RECORD_VARIANTDataTable + Inherits Global.System.Data.TypedTableBase(Of TBPMO_RECORD_VARIANTRow) + + Private columnGUID As Global.System.Data.DataColumn + + Private columnRECORD_ID As Global.System.Data.DataColumn + + Private columnREASON_CODE As Global.System.Data.DataColumn + + Private columnCOMMENT As Global.System.Data.DataColumn + + Private columnADDED_WHO As Global.System.Data.DataColumn + + Private columnADDED_WHEN As Global.System.Data.DataColumn + + Private columnCHANGED_WHO As Global.System.Data.DataColumn + + Private columnCHANGED_WHEN As Global.System.Data.DataColumn + + _ + Public Sub New() + MyBase.New + Me.TableName = "TBPMO_RECORD_VARIANT" + Me.BeginInit + Me.InitClass + Me.EndInit + End Sub + + _ + Friend Sub New(ByVal table As Global.System.Data.DataTable) + MyBase.New + Me.TableName = table.TableName + If (table.CaseSensitive <> table.DataSet.CaseSensitive) Then + Me.CaseSensitive = table.CaseSensitive + End If + If (table.Locale.ToString <> table.DataSet.Locale.ToString) Then + Me.Locale = table.Locale + End If + If (table.Namespace <> table.DataSet.Namespace) Then + Me.Namespace = table.Namespace + End If + Me.Prefix = table.Prefix + Me.MinimumCapacity = table.MinimumCapacity + End Sub + + _ + Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) + MyBase.New(info, context) + Me.InitVars + End Sub + + _ + Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnGUID + End Get + End Property + + _ + Public ReadOnly Property RECORD_IDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnRECORD_ID + End Get + End Property + + _ + Public ReadOnly Property REASON_CODEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnREASON_CODE + End Get + End Property + + _ + Public ReadOnly Property COMMENTColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCOMMENT + End Get + End Property + + _ + Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn + Get + Return Me.columnADDED_WHO + End Get + End Property + + _ + Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn + Get + Return Me.columnADDED_WHEN + End Get + End Property + + _ + Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCHANGED_WHO + End Get + End Property + + _ + Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCHANGED_WHEN + End Get + End Property + + _ + Public ReadOnly Property Count() As Integer + Get + Return Me.Rows.Count + End Get + End Property + + _ + Public Default ReadOnly Property Item(ByVal index As Integer) As TBPMO_RECORD_VARIANTRow + Get + Return CType(Me.Rows(index),TBPMO_RECORD_VARIANTRow) + End Get + End Property + + _ + Public Event TBPMO_RECORD_VARIANTRowChanging As TBPMO_RECORD_VARIANTRowChangeEventHandler + + _ + Public Event TBPMO_RECORD_VARIANTRowChanged As TBPMO_RECORD_VARIANTRowChangeEventHandler + + _ + Public Event TBPMO_RECORD_VARIANTRowDeleting As TBPMO_RECORD_VARIANTRowChangeEventHandler + + _ + Public Event TBPMO_RECORD_VARIANTRowDeleted As TBPMO_RECORD_VARIANTRowChangeEventHandler + + _ + Public Overloads Sub AddTBPMO_RECORD_VARIANTRow(ByVal row As TBPMO_RECORD_VARIANTRow) + Me.Rows.Add(row) + End Sub + + _ + Public Overloads Function AddTBPMO_RECORD_VARIANTRow(ByVal parentTBPMO_RECORDRowByFK_TBPMO_RECORD_VARIANT_RECORD_ID As TBPMO_RECORDRow, ByVal REASON_CODE As String, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBPMO_RECORD_VARIANTRow + Dim rowTBPMO_RECORD_VARIANTRow As TBPMO_RECORD_VARIANTRow = CType(Me.NewRow,TBPMO_RECORD_VARIANTRow) + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, REASON_CODE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} + If (Not (parentTBPMO_RECORDRowByFK_TBPMO_RECORD_VARIANT_RECORD_ID) Is Nothing) Then + columnValuesArray(1) = parentTBPMO_RECORDRowByFK_TBPMO_RECORD_VARIANT_RECORD_ID(0) + End If + rowTBPMO_RECORD_VARIANTRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBPMO_RECORD_VARIANTRow) + Return rowTBPMO_RECORD_VARIANTRow + End Function + + _ + Public Function FindByGUID(ByVal GUID As Integer) As TBPMO_RECORD_VARIANTRow + Return CType(Me.Rows.Find(New Object() {GUID}),TBPMO_RECORD_VARIANTRow) + End Function + + _ + Public Overrides Function Clone() As Global.System.Data.DataTable + Dim cln As TBPMO_RECORD_VARIANTDataTable = CType(MyBase.Clone,TBPMO_RECORD_VARIANTDataTable) + cln.InitVars + Return cln + End Function + + _ + Protected Overrides Function CreateInstance() As Global.System.Data.DataTable + Return New TBPMO_RECORD_VARIANTDataTable() + End Function + + _ + Friend Sub InitVars() + Me.columnGUID = MyBase.Columns("GUID") + Me.columnRECORD_ID = MyBase.Columns("RECORD_ID") + Me.columnREASON_CODE = MyBase.Columns("REASON_CODE") + Me.columnCOMMENT = MyBase.Columns("COMMENT") + Me.columnADDED_WHO = MyBase.Columns("ADDED_WHO") + Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN") + Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") + Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") + End Sub + + _ + Private Sub InitClass() + Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnGUID) + Me.columnRECORD_ID = New Global.System.Data.DataColumn("RECORD_ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnRECORD_ID) + Me.columnREASON_CODE = New Global.System.Data.DataColumn("REASON_CODE", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnREASON_CODE) + Me.columnCOMMENT = New Global.System.Data.DataColumn("COMMENT", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCOMMENT) + Me.columnADDED_WHO = New Global.System.Data.DataColumn("ADDED_WHO", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnADDED_WHO) + Me.columnADDED_WHEN = New Global.System.Data.DataColumn("ADDED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnADDED_WHEN) + Me.columnCHANGED_WHO = New Global.System.Data.DataColumn("CHANGED_WHO", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCHANGED_WHO) + Me.columnCHANGED_WHEN = New Global.System.Data.DataColumn("CHANGED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCHANGED_WHEN) + Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true)) + Me.columnGUID.AutoIncrement = true + Me.columnGUID.AutoIncrementSeed = -1 + Me.columnGUID.AutoIncrementStep = -1 + Me.columnGUID.AllowDBNull = false + Me.columnGUID.ReadOnly = true + Me.columnGUID.Unique = true + Me.columnRECORD_ID.AllowDBNull = false + Me.columnREASON_CODE.AllowDBNull = false + Me.columnREASON_CODE.MaxLength = 100 + Me.columnCOMMENT.MaxLength = 500 + Me.columnADDED_WHO.AllowDBNull = false + Me.columnADDED_WHO.MaxLength = 50 + Me.columnCHANGED_WHO.MaxLength = 50 + End Sub + + _ + Public Function NewTBPMO_RECORD_VARIANTRow() As TBPMO_RECORD_VARIANTRow + Return CType(Me.NewRow,TBPMO_RECORD_VARIANTRow) + End Function + + _ + Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow + Return New TBPMO_RECORD_VARIANTRow(builder) + End Function + + _ + Protected Overrides Function GetRowType() As Global.System.Type + Return GetType(TBPMO_RECORD_VARIANTRow) + End Function + + _ + Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanged(e) + If (Not (Me.TBPMO_RECORD_VARIANTRowChangedEvent) Is Nothing) Then + RaiseEvent TBPMO_RECORD_VARIANTRowChanged(Me, New TBPMO_RECORD_VARIANTRowChangeEvent(CType(e.Row,TBPMO_RECORD_VARIANTRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanging(e) + If (Not (Me.TBPMO_RECORD_VARIANTRowChangingEvent) Is Nothing) Then + RaiseEvent TBPMO_RECORD_VARIANTRowChanging(Me, New TBPMO_RECORD_VARIANTRowChangeEvent(CType(e.Row,TBPMO_RECORD_VARIANTRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleted(e) + If (Not (Me.TBPMO_RECORD_VARIANTRowDeletedEvent) Is Nothing) Then + RaiseEvent TBPMO_RECORD_VARIANTRowDeleted(Me, New TBPMO_RECORD_VARIANTRowChangeEvent(CType(e.Row,TBPMO_RECORD_VARIANTRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleting(e) + If (Not (Me.TBPMO_RECORD_VARIANTRowDeletingEvent) Is Nothing) Then + RaiseEvent TBPMO_RECORD_VARIANTRowDeleting(Me, New TBPMO_RECORD_VARIANTRowChangeEvent(CType(e.Row,TBPMO_RECORD_VARIANTRow), e.Action)) + End If + End Sub + + _ + Public Sub RemoveTBPMO_RECORD_VARIANTRow(ByVal row As TBPMO_RECORD_VARIANTRow) + Me.Rows.Remove(row) + End Sub + + _ + Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType + Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() + Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() + Dim ds As DD_DMSDataSet = New DD_DMSDataSet() + Dim any1 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any1.Namespace = "http://www.w3.org/2001/XMLSchema" + any1.MinOccurs = New Decimal(0) + any1.MaxOccurs = Decimal.MaxValue + any1.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any1) + Dim any2 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1" + any2.MinOccurs = New Decimal(1) + any2.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any2) + Dim attribute1 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute1.Name = "namespace" + attribute1.FixedValue = ds.Namespace + type.Attributes.Add(attribute1) + Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute2.Name = "tableTypeName" + attribute2.FixedValue = "TBPMO_RECORD_VARIANTDataTable" + type.Attributes.Add(attribute2) + type.Particle = sequence + Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable + If xs.Contains(dsSchema.TargetNamespace) Then + Dim s1 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Dim s2 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Try + Dim schema As Global.System.Xml.Schema.XmlSchema = Nothing + dsSchema.Write(s1) + Dim schemas As Global.System.Collections.IEnumerator = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator + Do While schemas.MoveNext + schema = CType(schemas.Current,Global.System.Xml.Schema.XmlSchema) + s2.SetLength(0) + schema.Write(s2) + If (s1.Length = s2.Length) Then + s1.Position = 0 + s2.Position = 0 + + Do While ((s1.Position <> s1.Length) _ + AndAlso (s1.ReadByte = s2.ReadByte)) + + + Loop + If (s1.Position = s1.Length) Then + Return type + End If + End If + + Loop + Finally + If (Not (s1) Is Nothing) Then + s1.Close + End If + If (Not (s2) Is Nothing) Then + s2.Close + End If + End Try + End If + xs.Add(dsSchema) + Return type + End Function + End Class + ''' '''Represents strongly named DataRow class. ''' @@ -23890,6 +24303,16 @@ Partial Public Class DD_DMSDataSet Public Sub SetCHANGED_WHENNull() Me(Me.tableTBPMO_RECORD.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub + + _ + Public Function GetTBPMO_RECORD_VARIANTRows() As TBPMO_RECORD_VARIANTRow() + If (Me.Table.ChildRelations("FK_TBPMO_RECORD_VARIANT_RECORD_ID") Is Nothing) Then + Return New TBPMO_RECORD_VARIANTRow(-1) {} + Else + Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBPMO_RECORD_VARIANT_RECORD_ID")),TBPMO_RECORD_VARIANTRow()) + End If + End Function End Class ''' @@ -33770,6 +34193,185 @@ Partial Public Class DD_DMSDataSet End Sub End Class + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBPMO_RECORD_VARIANTRow + Inherits Global.System.Data.DataRow + + Private tableTBPMO_RECORD_VARIANT As TBPMO_RECORD_VARIANTDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBPMO_RECORD_VARIANT = CType(Me.Table,TBPMO_RECORD_VARIANTDataTable) + End Sub + + _ + Public Property GUID() As Integer + Get + Return CType(Me(Me.tableTBPMO_RECORD_VARIANT.GUIDColumn),Integer) + End Get + Set + Me(Me.tableTBPMO_RECORD_VARIANT.GUIDColumn) = value + End Set + End Property + + _ + Public Property RECORD_ID() As Integer + Get + Return CType(Me(Me.tableTBPMO_RECORD_VARIANT.RECORD_IDColumn),Integer) + End Get + Set + Me(Me.tableTBPMO_RECORD_VARIANT.RECORD_IDColumn) = value + End Set + End Property + + _ + Public Property REASON_CODE() As String + Get + Return CType(Me(Me.tableTBPMO_RECORD_VARIANT.REASON_CODEColumn),String) + End Get + Set + Me(Me.tableTBPMO_RECORD_VARIANT.REASON_CODEColumn) = value + End Set + End Property + + _ + Public Property COMMENT() As String + Get + Try + Return CType(Me(Me.tableTBPMO_RECORD_VARIANT.COMMENTColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COMMENT in Tabelle TBPMO_RECORD_VARIANT ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBPMO_RECORD_VARIANT.COMMENTColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHO() As String + Get + Return CType(Me(Me.tableTBPMO_RECORD_VARIANT.ADDED_WHOColumn),String) + End Get + Set + Me(Me.tableTBPMO_RECORD_VARIANT.ADDED_WHOColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBPMO_RECORD_VARIANT.ADDED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBPMO_RECORD_VARIANT ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBPMO_RECORD_VARIANT.ADDED_WHENColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHO() As String + Get + Try + Return CType(Me(Me.tableTBPMO_RECORD_VARIANT.CHANGED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBPMO_RECORD_VARIANT ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBPMO_RECORD_VARIANT.CHANGED_WHOColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBPMO_RECORD_VARIANT.CHANGED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBPMO_RECORD_VARIANT ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBPMO_RECORD_VARIANT.CHANGED_WHENColumn) = value + End Set + End Property + + _ + Public Property TBPMO_RECORDRow() As TBPMO_RECORDRow + Get + Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBPMO_RECORD_VARIANT_RECORD_ID")),TBPMO_RECORDRow) + End Get + Set + Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBPMO_RECORD_VARIANT_RECORD_ID")) + End Set + End Property + + _ + Public Function IsCOMMENTNull() As Boolean + Return Me.IsNull(Me.tableTBPMO_RECORD_VARIANT.COMMENTColumn) + End Function + + _ + Public Sub SetCOMMENTNull() + Me(Me.tableTBPMO_RECORD_VARIANT.COMMENTColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsADDED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBPMO_RECORD_VARIANT.ADDED_WHENColumn) + End Function + + _ + Public Sub SetADDED_WHENNull() + Me(Me.tableTBPMO_RECORD_VARIANT.ADDED_WHENColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBPMO_RECORD_VARIANT.CHANGED_WHOColumn) + End Function + + _ + Public Sub SetCHANGED_WHONull() + Me(Me.tableTBPMO_RECORD_VARIANT.CHANGED_WHOColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBPMO_RECORD_VARIANT.CHANGED_WHENColumn) + End Function + + _ + Public Sub SetCHANGED_WHENNull() + Me(Me.tableTBPMO_RECORD_VARIANT.CHANGED_WHENColumn) = Global.System.Convert.DBNull + End Sub + End Class + ''' '''Row event argument class ''' @@ -35569,6 +36171,42 @@ Partial Public Class DD_DMSDataSet End Get End Property End Class + + ''' + '''Row event argument class + ''' + _ + Public Class TBPMO_RECORD_VARIANTRowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBPMO_RECORD_VARIANTRow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBPMO_RECORD_VARIANTRow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBPMO_RECORD_VARIANTRow + Get + Return Me.eventRow + End Get + End Property + + _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class End Class Namespace DD_DMSDataSetTableAdapters @@ -53193,6 +53831,200 @@ Namespace DD_DMSDataSetTableAdapters End Function End Class + ''' + '''Represents the connection and commands used to retrieve and save data. + ''' + _ + Partial Public Class TBPMO_RECORD_VARIANTTableAdapter + Inherits Global.System.ComponentModel.Component + + Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter + + Private _connection As Global.System.Data.SqlClient.SqlConnection + + Private _transaction As Global.System.Data.SqlClient.SqlTransaction + + Private _commandCollection() As Global.System.Data.SqlClient.SqlCommand + + Private _clearBeforeFill As Boolean + + _ + Public Sub New() + MyBase.New + Me.ClearBeforeFill = true + End Sub + + _ + Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter + Get + If (Me._adapter Is Nothing) Then + Me.InitAdapter + End If + Return Me._adapter + End Get + End Property + + _ + Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection + Get + If (Me._connection Is Nothing) Then + Me.InitConnection + End If + Return Me._connection + End Get + Set + Me._connection = value + If (Not (Me.Adapter.InsertCommand) Is Nothing) Then + Me.Adapter.InsertCommand.Connection = value + End If + If (Not (Me.Adapter.DeleteCommand) Is Nothing) Then + Me.Adapter.DeleteCommand.Connection = value + End If + If (Not (Me.Adapter.UpdateCommand) Is Nothing) Then + Me.Adapter.UpdateCommand.Connection = value + End If + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + If (Not (Me.CommandCollection(i)) Is Nothing) Then + CType(Me.CommandCollection(i),Global.System.Data.SqlClient.SqlCommand).Connection = value + End If + i = (i + 1) + Loop + End Set + End Property + + _ + Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction + Get + Return Me._transaction + End Get + Set + Me._transaction = value + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + Me.CommandCollection(i).Transaction = Me._transaction + i = (i + 1) + Loop + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.DeleteCommand) Is Nothing)) Then + Me.Adapter.DeleteCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.InsertCommand) Is Nothing)) Then + Me.Adapter.InsertCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.UpdateCommand) Is Nothing)) Then + Me.Adapter.UpdateCommand.Transaction = Me._transaction + End If + End Set + End Property + + _ + Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() + Get + If (Me._commandCollection Is Nothing) Then + Me.InitCommandCollection + End If + Return Me._commandCollection + End Get + End Property + + _ + Public Property ClearBeforeFill() As Boolean + Get + Return Me._clearBeforeFill + End Get + Set + Me._clearBeforeFill = value + End Set + End Property + + _ + Private Sub InitAdapter() + Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() + Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() + tableMapping.SourceTable = "Table" + tableMapping.DataSetTable = "TBPMO_RECORD_VARIANT" + tableMapping.ColumnMappings.Add("GUID", "GUID") + tableMapping.ColumnMappings.Add("RECORD_ID", "RECORD_ID") + tableMapping.ColumnMappings.Add("REASON_CODE", "REASON_CODE") + tableMapping.ColumnMappings.Add("COMMENT", "COMMENT") + tableMapping.ColumnMappings.Add("ADDED_WHO", "ADDED_WHO") + tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") + tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") + tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") + Me._adapter.TableMappings.Add(tableMapping) + End Sub + + _ + Private Sub InitConnection() + Me._connection = New Global.System.Data.SqlClient.SqlConnection() + Me._connection.ConnectionString = Global.DD_Record_Organiser.My.MySettings.Default.DD_DMSConnectionString + End Sub + + _ + Private Sub InitCommandCollection() + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} + Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(0).Connection = Me.Connection + Me._commandCollection(0).CommandText = "SELECT GUID, RECORD_ID, REASON_CODE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANG" & _ + "ED_WHO, CHANGED_WHEN" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "FROM TBPMO_RECORD_VARIANT" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE (RECORD" & _ + "_ID IN" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " (SELECT GUID" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " " & _ + " FROM TBPMO_RECORD" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " WHERE " & _ + " (RECORD_ENTITY_ID =" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " " & _ + " (SELECT RECORD_ENTITY_ID" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " " & _ + " FROM TBPMO_RECORD AS TBPMO_RECORD_1" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " " & _ + " WHERE (GUID = @RECORD" & _ + "_ID))) AND (FORM_ID = @ENTITY_ID) AND (GUID <> @RECORD_ID)))" + Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text + Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) + Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@RECORD_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) + End Sub + + _ + Public Overridable Overloads Function Fill(ByVal dataTable As DD_DMSDataSet.TBPMO_RECORD_VARIANTDataTable, ByVal ENTITY_ID As Integer, ByVal RECORD_ID As Integer) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Me.Adapter.SelectCommand.Parameters(0).Value = CType(ENTITY_ID, Integer) + Me.Adapter.SelectCommand.Parameters(1).Value = CType(RECORD_ID, Integer) + If (Me.ClearBeforeFill = True) Then + dataTable.Clear() + End If + Dim returnValue As Integer = Me.Adapter.Fill(dataTable) + Return returnValue + End Function + + _ + Public Overridable Overloads Function GetData(ByVal ENTITY_ID As Integer, ByVal RECORD_ID As Integer) As DD_DMSDataSet.TBPMO_RECORD_VARIANTDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Me.Adapter.SelectCommand.Parameters(0).Value = CType(ENTITY_ID, Integer) + Me.Adapter.SelectCommand.Parameters(1).Value = CType(RECORD_ID, Integer) + Dim dataTable As DD_DMSDataSet.TBPMO_RECORD_VARIANTDataTable = New DD_DMSDataSet.TBPMO_RECORD_VARIANTDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function + End Class + ''' '''TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios ''' @@ -54128,15 +54960,6 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPMO_FORM_CONSTRUCTORTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FORM_CONSTRUCTOR.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) - updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) - If ((Not (updatedRows) Is Nothing) _ - AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPMO_FORM_CONSTRUCTORTableAdapter.Update(updatedRows)) - allChangedRows.AddRange(updatedRows) - End If - End If If (Not (Me._tBPMO_TEMPLATE_ENTITYTableAdapter) Is Nothing) Then Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_TEMPLATE_ENTITY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) @@ -54146,12 +54969,12 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPMO_WD_IMPORT_PROFILETableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_IMPORT_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBPMO_FORM_CONSTRUCTORTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FORM_CONSTRUCTOR.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPMO_WD_IMPORT_PROFILETableAdapter.Update(updatedRows)) + result = (result + Me._tBPMO_FORM_CONSTRUCTORTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -54164,6 +54987,15 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If + If (Not (Me._tBDD_USERTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) + If ((Not (updatedRows) Is Nothing) _ + AndAlso (0 < updatedRows.Length)) Then + result = (result + Me._tBDD_USERTableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If If (Not (Me._tBDD_DOKUMENTARTTableAdapter) Is Nothing) Then Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_DOKUMENTART.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) @@ -54173,21 +55005,30 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBDD_USERTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBPMO_RECORDTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RECORD.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBDD_USERTableAdapter.Update(updatedRows)) + result = (result + Me._tBPMO_RECORDTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBPMO_WD_IMPORT_PROFILETableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_IMPORT_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBDD_CONNECTIONTableAdapter.Update(updatedRows)) + result = (result + Me._tBPMO_WD_IMPORT_PROFILETableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If + If (Not (Me._tBPMO_WD_IMPORT_PROFILE_IDXTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_IMPORT_PROFILE_IDX.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) + If ((Not (updatedRows) Is Nothing) _ + AndAlso (0 < updatedRows.Length)) Then + result = (result + Me._tBPMO_WD_IMPORT_PROFILE_IDXTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -54200,6 +55041,15 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If + If (Not (Me._tBPMO_WORKFLOW_TASK_HISTORYTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WORKFLOW_TASK_HISTORY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) + If ((Not (updatedRows) Is Nothing) _ + AndAlso (0 < updatedRows.Length)) Then + result = (result + Me._tBPMO_WORKFLOW_TASK_HISTORYTableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If If (Not (Me._tBPMO_TEMPLATE_PATTERNTableAdapter) Is Nothing) Then Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_TEMPLATE_PATTERN.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) @@ -54218,48 +55068,48 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBDD_CLIENTTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_CLIENT.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBPMO_WD_NAMECONVENTION_FORMATTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_NAMECONVENTION_FORMAT.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBDD_CLIENTTableAdapter.Update(updatedRows)) + result = (result + Me._tBPMO_WD_NAMECONVENTION_FORMATTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPMO_CONSTRUCTOR_USER_SQLTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_CONSTRUCTOR_USER_SQL.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBPMO_RIGHT_GROUPTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RIGHT_GROUP.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPMO_CONSTRUCTOR_USER_SQLTableAdapter.Update(updatedRows)) + result = (result + Me._tBPMO_RIGHT_GROUPTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPMO_WD_IMPORT_PROFILE_IDXTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_IMPORT_PROFILE_IDX.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBDD_CLIENTTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_CLIENT.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPMO_WD_IMPORT_PROFILE_IDXTableAdapter.Update(updatedRows)) + result = (result + Me._tBDD_CLIENTTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPMO_RIGHT_GROUPTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RIGHT_GROUP.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPMO_RIGHT_GROUPTableAdapter.Update(updatedRows)) + result = (result + Me._tBDD_CONNECTIONTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPMO_WD_NAMECONVENTION_FORMATTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_NAMECONVENTION_FORMAT.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBPMO_CONSTRUCTOR_USER_SQLTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_CONSTRUCTOR_USER_SQL.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPMO_WD_NAMECONVENTION_FORMATTableAdapter.Update(updatedRows)) + result = (result + Me._tBPMO_CONSTRUCTOR_USER_SQLTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -54272,15 +55122,6 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPMO_WORKFLOW_TASK_HISTORYTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WORKFLOW_TASK_HISTORY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) - updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) - If ((Not (updatedRows) Is Nothing) _ - AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPMO_WORKFLOW_TASK_HISTORYTableAdapter.Update(updatedRows)) - allChangedRows.AddRange(updatedRows) - End If - End If If (Not (Me._tBDD_EMAIL_ACCOUNTTableAdapter) Is Nothing) Then Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_EMAIL_ACCOUNT.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) @@ -54290,21 +55131,21 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPMO_FILES_USERTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FILES_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBPMO_FOLLOW_UP_EMAILTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FOLLOW_UP_EMAIL.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPMO_FILES_USERTableAdapter.Update(updatedRows)) + result = (result + Me._tBPMO_FOLLOW_UP_EMAILTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPMO_FOLLUPEMAIL_USERTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FOLLUPEMAIL_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBPMO_RECORD_LOG_CONFIGTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RECORD_LOG_CONFIG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPMO_FOLLUPEMAIL_USERTableAdapter.Update(updatedRows)) + result = (result + Me._tBPMO_RECORD_LOG_CONFIGTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -54317,15 +55158,6 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPMO_RECORDTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RECORD.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) - updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) - If ((Not (updatedRows) Is Nothing) _ - AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPMO_RECORDTableAdapter.Update(updatedRows)) - allChangedRows.AddRange(updatedRows) - End If - End If If (Not (Me._tBPMO_WD_FVIEW_DT_INDEXTableAdapter) Is Nothing) Then Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_FVIEW_DT_INDEX.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) @@ -54344,15 +55176,6 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPMO_RECORD_LOG_CONFIGTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RECORD_LOG_CONFIG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) - updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) - If ((Not (updatedRows) Is Nothing) _ - AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPMO_RECORD_LOG_CONFIGTableAdapter.Update(updatedRows)) - allChangedRows.AddRange(updatedRows) - End If - End If If (Not (Me._tBPMO_WORKFLOWTableAdapter) Is Nothing) Then Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WORKFLOW.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) @@ -54362,15 +55185,6 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBDD_INDEX_AUTOMTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_INDEX_AUTOM.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) - updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) - If ((Not (updatedRows) Is Nothing) _ - AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBDD_INDEX_AUTOMTableAdapter.Update(updatedRows)) - allChangedRows.AddRange(updatedRows) - End If - End If If (Not (Me._tBPMO_KONFIGURATIONTableAdapter) Is Nothing) Then Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_KONFIGURATION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) @@ -54398,12 +55212,12 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPMO_FOLLOW_UP_EMAILTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FOLLOW_UP_EMAIL.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBPMO_FILES_USERTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FILES_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPMO_FOLLOW_UP_EMAILTableAdapter.Update(updatedRows)) + result = (result + Me._tBPMO_FILES_USERTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -54416,6 +55230,24 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If + If (Not (Me._tBPMO_FOLLUPEMAIL_USERTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FOLLUPEMAIL_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) + If ((Not (updatedRows) Is Nothing) _ + AndAlso (0 < updatedRows.Length)) Then + result = (result + Me._tBPMO_FOLLUPEMAIL_USERTableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If + If (Not (Me._tBDD_INDEX_AUTOMTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_INDEX_AUTOM.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) + If ((Not (updatedRows) Is Nothing) _ + AndAlso (0 < updatedRows.Length)) Then + result = (result + Me._tBDD_INDEX_AUTOMTableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If Return result End Function @@ -54458,14 +55290,6 @@ Namespace DD_DMSDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPMO_FORM_CONSTRUCTORTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FORM_CONSTRUCTOR.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) - If ((Not (addedRows) Is Nothing) _ - AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPMO_FORM_CONSTRUCTORTableAdapter.Update(addedRows)) - allAddedRows.AddRange(addedRows) - End If - End If If (Not (Me._tBPMO_TEMPLATE_ENTITYTableAdapter) Is Nothing) Then Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_TEMPLATE_ENTITY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ @@ -54474,11 +55298,11 @@ Namespace DD_DMSDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPMO_WD_IMPORT_PROFILETableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_IMPORT_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBPMO_FORM_CONSTRUCTORTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FORM_CONSTRUCTOR.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPMO_WD_IMPORT_PROFILETableAdapter.Update(addedRows)) + result = (result + Me._tBPMO_FORM_CONSTRUCTORTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -54490,6 +55314,14 @@ Namespace DD_DMSDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If + If (Not (Me._tBDD_USERTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBDD_USERTableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If If (Not (Me._tBDD_DOKUMENTARTTableAdapter) Is Nothing) Then Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_DOKUMENTART.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ @@ -54498,19 +55330,27 @@ Namespace DD_DMSDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBDD_USERTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBPMO_RECORDTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RECORD.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBDD_USERTableAdapter.Update(addedRows)) + result = (result + Me._tBPMO_RECORDTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBPMO_WD_IMPORT_PROFILETableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_IMPORT_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBDD_CONNECTIONTableAdapter.Update(addedRows)) + result = (result + Me._tBPMO_WD_IMPORT_PROFILETableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If + If (Not (Me._tBPMO_WD_IMPORT_PROFILE_IDXTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_IMPORT_PROFILE_IDX.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBPMO_WD_IMPORT_PROFILE_IDXTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -54522,6 +55362,14 @@ Namespace DD_DMSDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If + If (Not (Me._tBPMO_WORKFLOW_TASK_HISTORYTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WORKFLOW_TASK_HISTORY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBPMO_WORKFLOW_TASK_HISTORYTableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If If (Not (Me._tBPMO_TEMPLATE_PATTERNTableAdapter) Is Nothing) Then Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_TEMPLATE_PATTERN.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ @@ -54538,43 +55386,43 @@ Namespace DD_DMSDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBDD_CLIENTTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_CLIENT.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBPMO_WD_NAMECONVENTION_FORMATTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_NAMECONVENTION_FORMAT.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBDD_CLIENTTableAdapter.Update(addedRows)) + result = (result + Me._tBPMO_WD_NAMECONVENTION_FORMATTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPMO_CONSTRUCTOR_USER_SQLTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_CONSTRUCTOR_USER_SQL.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBPMO_RIGHT_GROUPTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RIGHT_GROUP.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPMO_CONSTRUCTOR_USER_SQLTableAdapter.Update(addedRows)) + result = (result + Me._tBPMO_RIGHT_GROUPTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPMO_WD_IMPORT_PROFILE_IDXTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_IMPORT_PROFILE_IDX.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBDD_CLIENTTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_CLIENT.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPMO_WD_IMPORT_PROFILE_IDXTableAdapter.Update(addedRows)) + result = (result + Me._tBDD_CLIENTTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPMO_RIGHT_GROUPTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RIGHT_GROUP.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPMO_RIGHT_GROUPTableAdapter.Update(addedRows)) + result = (result + Me._tBDD_CONNECTIONTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPMO_WD_NAMECONVENTION_FORMATTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_NAMECONVENTION_FORMAT.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBPMO_CONSTRUCTOR_USER_SQLTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_CONSTRUCTOR_USER_SQL.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPMO_WD_NAMECONVENTION_FORMATTableAdapter.Update(addedRows)) + result = (result + Me._tBPMO_CONSTRUCTOR_USER_SQLTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -54586,14 +55434,6 @@ Namespace DD_DMSDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPMO_WORKFLOW_TASK_HISTORYTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WORKFLOW_TASK_HISTORY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) - If ((Not (addedRows) Is Nothing) _ - AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPMO_WORKFLOW_TASK_HISTORYTableAdapter.Update(addedRows)) - allAddedRows.AddRange(addedRows) - End If - End If If (Not (Me._tBDD_EMAIL_ACCOUNTTableAdapter) Is Nothing) Then Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_EMAIL_ACCOUNT.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ @@ -54602,19 +55442,19 @@ Namespace DD_DMSDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPMO_FILES_USERTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FILES_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBPMO_FOLLOW_UP_EMAILTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FOLLOW_UP_EMAIL.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPMO_FILES_USERTableAdapter.Update(addedRows)) + result = (result + Me._tBPMO_FOLLOW_UP_EMAILTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPMO_FOLLUPEMAIL_USERTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FOLLUPEMAIL_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBPMO_RECORD_LOG_CONFIGTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RECORD_LOG_CONFIG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPMO_FOLLUPEMAIL_USERTableAdapter.Update(addedRows)) + result = (result + Me._tBPMO_RECORD_LOG_CONFIGTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -54626,14 +55466,6 @@ Namespace DD_DMSDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPMO_RECORDTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RECORD.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) - If ((Not (addedRows) Is Nothing) _ - AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPMO_RECORDTableAdapter.Update(addedRows)) - allAddedRows.AddRange(addedRows) - End If - End If If (Not (Me._tBPMO_WD_FVIEW_DT_INDEXTableAdapter) Is Nothing) Then Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_FVIEW_DT_INDEX.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ @@ -54650,14 +55482,6 @@ Namespace DD_DMSDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPMO_RECORD_LOG_CONFIGTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RECORD_LOG_CONFIG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) - If ((Not (addedRows) Is Nothing) _ - AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPMO_RECORD_LOG_CONFIGTableAdapter.Update(addedRows)) - allAddedRows.AddRange(addedRows) - End If - End If If (Not (Me._tBPMO_WORKFLOWTableAdapter) Is Nothing) Then Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WORKFLOW.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ @@ -54666,14 +55490,6 @@ Namespace DD_DMSDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBDD_INDEX_AUTOMTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_INDEX_AUTOM.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) - If ((Not (addedRows) Is Nothing) _ - AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBDD_INDEX_AUTOMTableAdapter.Update(addedRows)) - allAddedRows.AddRange(addedRows) - End If - End If If (Not (Me._tBPMO_KONFIGURATIONTableAdapter) Is Nothing) Then Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_KONFIGURATION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ @@ -54698,11 +55514,11 @@ Namespace DD_DMSDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPMO_FOLLOW_UP_EMAILTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FOLLOW_UP_EMAIL.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBPMO_FILES_USERTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FILES_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPMO_FOLLOW_UP_EMAILTableAdapter.Update(addedRows)) + result = (result + Me._tBPMO_FILES_USERTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -54714,6 +55530,22 @@ Namespace DD_DMSDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If + If (Not (Me._tBPMO_FOLLUPEMAIL_USERTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FOLLUPEMAIL_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBPMO_FOLLUPEMAIL_USERTableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If + If (Not (Me._tBDD_INDEX_AUTOMTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_INDEX_AUTOM.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBDD_INDEX_AUTOMTableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If Return result End Function @@ -54724,6 +55556,22 @@ Namespace DD_DMSDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As DD_DMSDataSet, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 + If (Not (Me._tBDD_INDEX_AUTOMTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_INDEX_AUTOM.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBDD_INDEX_AUTOMTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If + If (Not (Me._tBPMO_FOLLUPEMAIL_USERTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FOLLUPEMAIL_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBPMO_FOLLUPEMAIL_USERTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If If (Not (Me._tBPMO_RIGHT_USERTableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RIGHT_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -54732,11 +55580,11 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPMO_FOLLOW_UP_EMAILTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FOLLOW_UP_EMAIL.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBPMO_FILES_USERTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FILES_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPMO_FOLLOW_UP_EMAILTableAdapter.Update(deletedRows)) + result = (result + Me._tBPMO_FILES_USERTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If @@ -54764,14 +55612,6 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBDD_INDEX_AUTOMTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_INDEX_AUTOM.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) - If ((Not (deletedRows) Is Nothing) _ - AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBDD_INDEX_AUTOMTableAdapter.Update(deletedRows)) - allChangedRows.AddRange(deletedRows) - End If - End If If (Not (Me._tBPMO_WORKFLOWTableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WORKFLOW.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -54780,14 +55620,6 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPMO_RECORD_LOG_CONFIGTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RECORD_LOG_CONFIG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) - If ((Not (deletedRows) Is Nothing) _ - AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPMO_RECORD_LOG_CONFIGTableAdapter.Update(deletedRows)) - allChangedRows.AddRange(deletedRows) - End If - End If If (Not (Me._tBPMO_WORKFLOW_TASK_STATETableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WORKFLOW_TASK_STATE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -54804,14 +55636,6 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPMO_RECORDTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RECORD.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) - If ((Not (deletedRows) Is Nothing) _ - AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPMO_RECORDTableAdapter.Update(deletedRows)) - allChangedRows.AddRange(deletedRows) - End If - End If If (Not (Me._tBPMO_FORM_VIEWTableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FORM_VIEW.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -54820,19 +55644,19 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPMO_FOLLUPEMAIL_USERTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FOLLUPEMAIL_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBPMO_RECORD_LOG_CONFIGTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RECORD_LOG_CONFIG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPMO_FOLLUPEMAIL_USERTableAdapter.Update(deletedRows)) + result = (result + Me._tBPMO_RECORD_LOG_CONFIGTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPMO_FILES_USERTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FILES_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBPMO_FOLLOW_UP_EMAILTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FOLLOW_UP_EMAIL.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPMO_FILES_USERTableAdapter.Update(deletedRows)) + result = (result + Me._tBPMO_FOLLOW_UP_EMAILTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If @@ -54844,14 +55668,6 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPMO_WORKFLOW_TASK_HISTORYTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WORKFLOW_TASK_HISTORY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) - If ((Not (deletedRows) Is Nothing) _ - AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPMO_WORKFLOW_TASK_HISTORYTableAdapter.Update(deletedRows)) - allChangedRows.AddRange(deletedRows) - End If - End If If (Not (Me._tBPMO_STRUCTURE_NODES_CONFIGURATIONTableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_STRUCTURE_NODES_CONFIGURATION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -54860,43 +55676,43 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPMO_WD_NAMECONVENTION_FORMATTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_NAMECONVENTION_FORMAT.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBPMO_CONSTRUCTOR_USER_SQLTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_CONSTRUCTOR_USER_SQL.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPMO_WD_NAMECONVENTION_FORMATTableAdapter.Update(deletedRows)) + result = (result + Me._tBPMO_CONSTRUCTOR_USER_SQLTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPMO_RIGHT_GROUPTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RIGHT_GROUP.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPMO_RIGHT_GROUPTableAdapter.Update(deletedRows)) + result = (result + Me._tBDD_CONNECTIONTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPMO_WD_IMPORT_PROFILE_IDXTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_IMPORT_PROFILE_IDX.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBDD_CLIENTTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_CLIENT.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPMO_WD_IMPORT_PROFILE_IDXTableAdapter.Update(deletedRows)) + result = (result + Me._tBDD_CLIENTTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPMO_CONSTRUCTOR_USER_SQLTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_CONSTRUCTOR_USER_SQL.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBPMO_RIGHT_GROUPTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RIGHT_GROUP.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPMO_CONSTRUCTOR_USER_SQLTableAdapter.Update(deletedRows)) + result = (result + Me._tBPMO_RIGHT_GROUPTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBDD_CLIENTTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_CLIENT.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBPMO_WD_NAMECONVENTION_FORMATTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_NAMECONVENTION_FORMAT.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBDD_CLIENTTableAdapter.Update(deletedRows)) + result = (result + Me._tBPMO_WD_NAMECONVENTION_FORMATTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If @@ -54916,6 +55732,14 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If + If (Not (Me._tBPMO_WORKFLOW_TASK_HISTORYTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WORKFLOW_TASK_HISTORY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBPMO_WORKFLOW_TASK_HISTORYTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If If (Not (Me._tBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FORM_CONSTRUCTOR_DETAIL.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -54924,19 +55748,27 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBDD_CONNECTIONTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_CONNECTION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBPMO_WD_IMPORT_PROFILE_IDXTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_IMPORT_PROFILE_IDX.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBDD_CONNECTIONTableAdapter.Update(deletedRows)) + result = (result + Me._tBPMO_WD_IMPORT_PROFILE_IDXTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBDD_USERTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBPMO_WD_IMPORT_PROFILETableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_IMPORT_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBDD_USERTableAdapter.Update(deletedRows)) + result = (result + Me._tBPMO_WD_IMPORT_PROFILETableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If + If (Not (Me._tBPMO_RECORDTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_RECORD.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBPMO_RECORDTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If @@ -54948,6 +55780,14 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If + If (Not (Me._tBDD_USERTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_USER.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBDD_USERTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If If (Not (Me._tBDD_USER_GROUPSTableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_USER_GROUPS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -54956,11 +55796,11 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPMO_WD_IMPORT_PROFILETableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_WD_IMPORT_PROFILE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBPMO_FORM_CONSTRUCTORTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FORM_CONSTRUCTOR.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPMO_WD_IMPORT_PROFILETableAdapter.Update(deletedRows)) + result = (result + Me._tBPMO_FORM_CONSTRUCTORTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If @@ -54972,14 +55812,6 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPMO_FORM_CONSTRUCTORTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_FORM_CONSTRUCTOR.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) - If ((Not (deletedRows) Is Nothing) _ - AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPMO_FORM_CONSTRUCTORTableAdapter.Update(deletedRows)) - allChangedRows.AddRange(deletedRows) - End If - End If If (Not (Me._tBDD_EINGANGSARTENTableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_EINGANGSARTEN.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ diff --git a/app/DD-Record-Organiser/DD_DMSDataSet.xsd b/app/DD-Record-Organiser/DD_DMSDataSet.xsd index a085eb1..4cafe60 100644 --- a/app/DD-Record-Organiser/DD_DMSDataSet.xsd +++ b/app/DD-Record-Organiser/DD_DMSDataSet.xsd @@ -3555,6 +3555,40 @@ SELECT GUID, USER_ID, ENTITY_ID, EDIT_REC, ADD_REC, DELETE_REC, ADD_DOC, READ_ON + + + + + + SELECT GUID, RECORD_ID, REASON_CODE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN +FROM TBPMO_RECORD_VARIANT +WHERE (RECORD_ID IN + (SELECT GUID + FROM TBPMO_RECORD + WHERE (RECORD_ENTITY_ID = + (SELECT RECORD_ENTITY_ID + FROM TBPMO_RECORD AS TBPMO_RECORD_1 + WHERE (GUID = @RECORD_ID))) AND (FORM_ID = @ENTITY_ID) AND (GUID <> @RECORD_ID))) + + + + + + + + + + + + + + + + + + + + @@ -6036,6 +6070,44 @@ SELECT GUID, USER_ID, ENTITY_ID, EDIT_REC, ADD_REC, DELETE_REC, ADD_DOC, READ_ON + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6210,6 +6282,10 @@ SELECT GUID, USER_ID, ENTITY_ID, EDIT_REC, ADD_REC, DELETE_REC, ADD_DOC, READ_ON + + + + @@ -6233,6 +6309,7 @@ SELECT GUID, USER_ID, ENTITY_ID, EDIT_REC, ADD_REC, DELETE_REC, ADD_DOC, READ_ON + \ No newline at end of file diff --git a/app/DD-Record-Organiser/DD_DMSDataSet.xss b/app/DD-Record-Organiser/DD_DMSDataSet.xss index cbe2bf8..0571353 100644 --- a/app/DD-Record-Organiser/DD_DMSDataSet.xss +++ b/app/DD-Record-Organiser/DD_DMSDataSet.xss @@ -4,61 +4,62 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + 437 @@ -74,7 +75,7 @@ - + 1701 @@ -86,7 +87,7 @@ - + 1627 @@ -98,7 +99,7 @@ - + 710 @@ -114,7 +115,7 @@ - + 1374 @@ -130,7 +131,7 @@ - + 842 @@ -142,7 +143,7 @@ - + 107 @@ -162,7 +163,7 @@ - + 1632 @@ -174,7 +175,7 @@ - + 1358 @@ -186,7 +187,7 @@ - + 601 @@ -202,7 +203,7 @@ - + 618 @@ -214,7 +215,7 @@ - + 2461 @@ -230,7 +231,7 @@ - + 2358 @@ -242,7 +243,7 @@ - + 2134 @@ -258,7 +259,7 @@ - + 2142 @@ -274,7 +275,7 @@ - + 141 @@ -290,7 +291,7 @@ - + 22 @@ -310,7 +311,7 @@ - + 14 @@ -330,7 +331,7 @@ - + 389 @@ -346,7 +347,7 @@ - + 158 @@ -366,5 +367,21 @@ + + + + 961 + 580 + + + 961 + 1157 + + + 953 + 1157 + + + \ No newline at end of file diff --git a/app/DD-Record-Organiser/ModuleHelperMethods.vb b/app/DD-Record-Organiser/ModuleHelperMethods.vb index a798803..fef974e 100644 --- a/app/DD-Record-Organiser/ModuleHelperMethods.vb +++ b/app/DD-Record-Organiser/ModuleHelperMethods.vb @@ -193,8 +193,8 @@ frm.Show() End Sub Public Sub OpenSearchAllOVer() - Dim frm As New frmSearchAllOVer - frm = frmSearchAllOVer + Dim frm As New frmGlobalSearch + frm = frmGlobalSearch frm.MdiParent = MAIN_FORM frm.Show() End Sub diff --git a/app/DD-Record-Organiser/frmAbout.Designer.vb b/app/DD-Record-Organiser/frmAbout.Designer.vb index 0c9c4ac..525865f 100644 --- a/app/DD-Record-Organiser/frmAbout.Designer.vb +++ b/app/DD-Record-Organiser/frmAbout.Designer.vb @@ -29,13 +29,13 @@ Partial Class frmAbout Me.lblProduktname = New System.Windows.Forms.Label() Me.lblVersion = New System.Windows.Forms.Label() Me.lblCompanyName = New System.Windows.Forms.Label() - Me.txtDescription = New System.Windows.Forms.TextBox() Me.LinkLabel1 = New System.Windows.Forms.LinkLabel() Me.LinkLabel2 = New System.Windows.Forms.LinkLabel() Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.Label1 = New System.Windows.Forms.Label() Me.PictureBox2 = New System.Windows.Forms.PictureBox() Me.lbldatabase = New System.Windows.Forms.Label() + Me.LinkLabel3 = New System.Windows.Forms.LinkLabel() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -61,13 +61,6 @@ Partial Class frmAbout resources.ApplyResources(Me.lblCompanyName, "lblCompanyName") Me.lblCompanyName.Name = "lblCompanyName" ' - 'txtDescription - ' - Me.txtDescription.BackColor = System.Drawing.SystemColors.Control - Me.txtDescription.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - resources.ApplyResources(Me.txtDescription, "txtDescription") - Me.txtDescription.Name = "txtDescription" - ' 'LinkLabel1 ' resources.ApplyResources(Me.LinkLabel1, "LinkLabel1") @@ -104,17 +97,23 @@ Partial Class frmAbout resources.ApplyResources(Me.lbldatabase, "lbldatabase") Me.lbldatabase.Name = "lbldatabase" ' + 'LinkLabel3 + ' + resources.ApplyResources(Me.LinkLabel3, "LinkLabel3") + Me.LinkLabel3.Name = "LinkLabel3" + Me.LinkLabel3.TabStop = True + ' 'frmAbout ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.CancelButton = Me.OKButton + Me.Controls.Add(Me.LinkLabel3) Me.Controls.Add(Me.lbldatabase) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.PictureBox2) Me.Controls.Add(Me.LinkLabel2) Me.Controls.Add(Me.LinkLabel1) - Me.Controls.Add(Me.txtDescription) Me.Controls.Add(Me.lblCompanyName) Me.Controls.Add(Me.lblVersion) Me.Controls.Add(Me.lblProduktname) @@ -136,11 +135,11 @@ Partial Class frmAbout Friend WithEvents lblProduktname As System.Windows.Forms.Label Friend WithEvents lblVersion As System.Windows.Forms.Label Friend WithEvents lblCompanyName As System.Windows.Forms.Label - Friend WithEvents txtDescription As System.Windows.Forms.TextBox Friend WithEvents LinkLabel1 As System.Windows.Forms.LinkLabel Friend WithEvents LinkLabel2 As System.Windows.Forms.LinkLabel Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents PictureBox2 As System.Windows.Forms.PictureBox Friend WithEvents lbldatabase As System.Windows.Forms.Label + Friend WithEvents LinkLabel3 As System.Windows.Forms.LinkLabel End Class diff --git a/app/DD-Record-Organiser/frmAbout.resx b/app/DD-Record-Organiser/frmAbout.resx index 6ae15a5..d5305a7 100644 --- a/app/DD-Record-Organiser/frmAbout.resx +++ b/app/DD-Record-Organiser/frmAbout.resx @@ -227,34 +227,6 @@ 6 - - 281, 104 - - - True - - - - Vertical - - - 260, 84 - - - 5 - - - txtDescription - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - True @@ -280,7 +252,7 @@ $this - 4 + 5 True @@ -307,8 +279,9 @@ $this - 3 + 4 + Zoom @@ -364,7 +337,7 @@ $this - 1 + 2 NoControl @@ -391,7 +364,7 @@ $this - 2 + 3 True @@ -421,6 +394,33 @@ $this + 1 + + + True + + + 280, 99 + + + 79, 13 + + + 11 + + + Release Notes + + + LinkLabel3 + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 @@ -433,7 +433,7 @@ Zoom - 544, 311 + 545, 316 Segoe UI, 8.25pt diff --git a/app/DD-Record-Organiser/frmAbout.vb b/app/DD-Record-Organiser/frmAbout.vb index 09a4843..715d2cb 100644 --- a/app/DD-Record-Organiser/frmAbout.vb +++ b/app/DD-Record-Organiser/frmAbout.vb @@ -15,7 +15,7 @@ lblProduktname.Text = My.Application.Info.ProductName Me.lblVersion.Text = String.Format("Version {0}", My.Application.Info.Version.ToString) Me.lblCompanyName.Text = My.Application.Info.CompanyName - Me.txtDescription.Text = My.Application.Info.Description + ' Me.txtDescription.Text = My.Application.Info.Description Dim version = ClassDatabase.Execute_Scalar("SELECT PRODUCT_VERSION FROM TBDD_MODULES WHERE UPPER(NAME) = UPPER('Record-Organizer')") If Not IsNothing(version) Then Me.lbldatabase.Text = String.Format("Database-Version: {0}", version.ToString) @@ -39,4 +39,15 @@ Private Sub Label2_Click(sender As Object, e As EventArgs) Handles lbldatabase.Click End Sub + + Private Sub LinkLabel3_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel3.LinkClicked + Dim _filename = Application.StartupPath & "\ChangeLog.txt" + If System.IO.File.Exists(_filename) Then + System.Diagnostics.Process.Start(_filename) + LinkLabel3.LinkVisited = True + Else + MsgBox("Could not find the changelog file!", MsgBoxStyle.Exclamation) + End If + + End Sub End Class diff --git a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb index 9ab6a47..c5b00c8 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb @@ -166,7 +166,22 @@ Partial Class frmConstructor_Main Me.BindingNavigatorMoveNextItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator() - Me.XtraTabPageVariant = New DevExpress.XtraTab.XtraTabPage() + Me.TabPageVariant = New DevExpress.XtraTab.XtraTabPage() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.TBPMO_RECORD_VARIANTBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() + Me.GridViewVariants = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colREASON_CODE = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colCOMMENT = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colADDED_WHO = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colADDED_WHEN = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colRECORD_ID = New DevExpress.XtraGrid.Columns.GridColumn() + Me.tsVariants = New System.Windows.Forms.ToolStrip() + Me.tslblVariantsCount = New System.Windows.Forms.ToolStripLabel() + Me.ToolStripSeparator23 = New System.Windows.Forms.ToolStripSeparator() + Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() + Me.tsbtnVariantDetailView = New System.Windows.Forms.ToolStripButton() Me.SplitContainerFORM = New DevExpress.XtraEditors.SplitContainerControl() Me.NavPane = New DevExpress.XtraBars.Navigation.TileNavPane() Me.NavButtonHome = New DevExpress.XtraBars.Navigation.NavButton() @@ -182,7 +197,6 @@ Partial Class frmConstructor_Main Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components) Me.ttToolTip = New System.Windows.Forms.ToolTip(Me.components) Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip(Me.components) - Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.VWPMO_WF_USER_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter() Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() @@ -192,55 +206,61 @@ Partial Class frmConstructor_Main Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.ToolTipController = New DevExpress.Utils.ToolTipController(Me.components) Me.RealTimeSource1 = New DevExpress.Data.RealTimeSource() - CType(Me.SplitContainerMain,System.ComponentModel.ISupportInitialize).BeginInit - Me.SplitContainerMain.SuspendLayout - CType(Me.SplitContainerTop,System.ComponentModel.ISupportInitialize).BeginInit - Me.SplitContainerTop.SuspendLayout - Me.CMSEntity.SuspendLayout - CType(Me.GridControlMain,System.ComponentModel.ISupportInitialize).BeginInit - Me.ContextMenuGrid.SuspendLayout - CType(Me.grvwGrid,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.grvwCarousel,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.grvwTiles,System.ComponentModel.ISupportInitialize).BeginInit - Me.ToolStripRecords.SuspendLayout - CType(Me.TCDetails,System.ComponentModel.ISupportInitialize).BeginInit - Me.TCDetails.SuspendLayout - Me.TabDetails.SuspendLayout - CType(Me.SplitContainerDetails,System.ComponentModel.ISupportInitialize).BeginInit - Me.SplitContainerDetails.SuspendLayout - Me.pnlDocFill.SuspendLayout - Me.statStripDoc.SuspendLayout - Me.ToolStripEdit.SuspendLayout - Me.TabWindream.SuspendLayout - CType(Me.GridControlDocSearch,System.ComponentModel.ISupportInitialize).BeginInit - Me.ContextMenuStripResultFiles.SuspendLayout - CType(Me.GridViewDoc_Search,System.ComponentModel.ISupportInitialize).BeginInit - Me.ToolStripDokumente.SuspendLayout - Me.TabFollowUp.SuspendLayout - Me.grpbxFU_Profile.SuspendLayout - Me.GroupBox4.SuspendLayout - Me.TabPos.SuspendLayout - Me.Panel1.SuspendLayout - CType(Me.GridControlPos,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.grvwGridPos,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.BindingNavigatorPOS,System.ComponentModel.ISupportInitialize).BeginInit - Me.BindingNavigatorPOS.SuspendLayout - CType(Me.SplitContainerFORM,System.ComponentModel.ISupportInitialize).BeginInit - Me.SplitContainerFORM.SuspendLayout - Me.StatusStrip_Main.SuspendLayout - CType(Me.DD_ECMAdmin,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.ImageCollection1,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.DD_DMSDataSet,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.VWPMO_WF_USER_ACTIVEBindingSource,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.VWPMO_WF_ACTIVEBindingSource,System.ComponentModel.ISupportInitialize).BeginInit - CType(Me.TBPMO_FILES_USERBindingSource,System.ComponentModel.ISupportInitialize).BeginInit - Me.SuspendLayout + Me.TBPMO_RECORD_VARIANTTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_RECORD_VARIANTTableAdapter() + CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerMain.SuspendLayout() + CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerTop.SuspendLayout() + Me.CMSEntity.SuspendLayout() + CType(Me.GridControlMain, System.ComponentModel.ISupportInitialize).BeginInit() + Me.ContextMenuGrid.SuspendLayout() + CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.grvwCarousel, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.grvwTiles, System.ComponentModel.ISupportInitialize).BeginInit() + Me.ToolStripRecords.SuspendLayout() + CType(Me.TCDetails, System.ComponentModel.ISupportInitialize).BeginInit() + Me.TCDetails.SuspendLayout() + Me.TabDetails.SuspendLayout() + CType(Me.SplitContainerDetails, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerDetails.SuspendLayout() + Me.pnlDocFill.SuspendLayout() + Me.statStripDoc.SuspendLayout() + Me.ToolStripEdit.SuspendLayout() + Me.TabWindream.SuspendLayout() + CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit() + Me.ContextMenuStripResultFiles.SuspendLayout() + CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit() + Me.ToolStripDokumente.SuspendLayout() + Me.TabFollowUp.SuspendLayout() + Me.grpbxFU_Profile.SuspendLayout() + Me.GroupBox4.SuspendLayout() + Me.TabPos.SuspendLayout() + Me.Panel1.SuspendLayout() + CType(Me.GridControlPos, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.grvwGridPos, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.BindingNavigatorPOS, System.ComponentModel.ISupportInitialize).BeginInit() + Me.BindingNavigatorPOS.SuspendLayout() + Me.TabPageVariant.SuspendLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBPMO_RECORD_VARIANTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridViewVariants, System.ComponentModel.ISupportInitialize).BeginInit() + Me.tsVariants.SuspendLayout() + CType(Me.SplitContainerFORM, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerFORM.SuspendLayout() + Me.StatusStrip_Main.SuspendLayout() + CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() ' 'SplitContainerMain ' Me.SplitContainerMain.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1 resources.ApplyResources(Me.SplitContainerMain, "SplitContainerMain") - Me.SplitContainerMain.Horizontal = false + Me.SplitContainerMain.Horizontal = False Me.SplitContainerMain.Name = "SplitContainerMain" Me.SplitContainerMain.Panel1.Controls.Add(Me.SplitContainerTop) resources.ApplyResources(Me.SplitContainerMain.Panel1, "SplitContainerMain.Panel1") @@ -262,14 +282,14 @@ Partial Class frmConstructor_Main ' 'TreeViewMain ' - Me.TreeViewMain.AllowDrop = true + Me.TreeViewMain.AllowDrop = True Me.TreeViewMain.BackColor = System.Drawing.SystemColors.GradientInactiveCaption Me.TreeViewMain.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.TreeViewMain.ContextMenuStrip = Me.CMSEntity resources.ApplyResources(Me.TreeViewMain, "TreeViewMain") - Me.TreeViewMain.FullRowSelect = true + Me.TreeViewMain.FullRowSelect = True Me.TreeViewMain.Name = "TreeViewMain" - Me.TreeViewMain.ShowLines = false + Me.TreeViewMain.ShowLines = False ' 'CMSEntity ' @@ -327,7 +347,7 @@ Partial Class frmConstructor_Main ' 'GridControlMain ' - Me.GridControlMain.AllowDrop = true + Me.GridControlMain.AllowDrop = True Me.GridControlMain.ContextMenuStrip = Me.ContextMenuGrid resources.ApplyResources(Me.GridControlMain, "GridControlMain") GridLevelNode1.LevelTemplate = Me.grvwGrid @@ -449,25 +469,25 @@ Partial Class frmConstructor_Main ' 'grvwGrid ' - Me.grvwGrid.Appearance.EvenRow.BackColor = CType(resources.GetObject("grvwGrid.Appearance.EvenRow.BackColor"),System.Drawing.Color) - Me.grvwGrid.Appearance.EvenRow.Options.UseBackColor = true + Me.grvwGrid.Appearance.EvenRow.BackColor = CType(resources.GetObject("grvwGrid.Appearance.EvenRow.BackColor"), System.Drawing.Color) + Me.grvwGrid.Appearance.EvenRow.Options.UseBackColor = True Me.grvwGrid.GridControl = Me.GridControlMain resources.ApplyResources(Me.grvwGrid, "grvwGrid") Me.grvwGrid.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always Me.grvwGrid.Name = "grvwGrid" Me.grvwGrid.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] Me.grvwGrid.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] - Me.grvwGrid.OptionsBehavior.Editable = false - Me.grvwGrid.OptionsBehavior.ReadOnly = true + Me.grvwGrid.OptionsBehavior.Editable = False + Me.grvwGrid.OptionsBehavior.ReadOnly = True Me.grvwGrid.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] - Me.grvwGrid.OptionsSelection.EnableAppearanceFocusedCell = false - Me.grvwGrid.OptionsSelection.EnableAppearanceFocusedRow = false - Me.grvwGrid.OptionsSelection.EnableAppearanceHideSelection = false - Me.grvwGrid.OptionsSelection.MultiSelect = true + Me.grvwGrid.OptionsSelection.EnableAppearanceFocusedCell = False + Me.grvwGrid.OptionsSelection.EnableAppearanceFocusedRow = False + Me.grvwGrid.OptionsSelection.EnableAppearanceHideSelection = False + Me.grvwGrid.OptionsSelection.MultiSelect = True Me.grvwGrid.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CellSelect - Me.grvwGrid.OptionsView.ColumnAutoWidth = false - Me.grvwGrid.OptionsView.EnableAppearanceEvenRow = true - Me.grvwGrid.OptionsView.ShowAutoFilterRow = true + Me.grvwGrid.OptionsView.ColumnAutoWidth = False + Me.grvwGrid.OptionsView.EnableAppearanceEvenRow = True + Me.grvwGrid.OptionsView.ShowAutoFilterRow = True Me.grvwGrid.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True] Me.grvwGrid.VertScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always ' @@ -480,11 +500,11 @@ Partial Class frmConstructor_Main 'grvwTiles ' Me.grvwTiles.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat - Me.grvwTiles.FocusBorderColor = System.Drawing.Color.FromArgb(CType(CType(255,Byte),Integer), CType(CType(128,Byte),Integer), CType(CType(255,Byte),Integer)) + Me.grvwTiles.FocusBorderColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(255, Byte), Integer)) Me.grvwTiles.GridControl = Me.GridControlMain Me.grvwTiles.Name = "grvwTiles" - Me.grvwTiles.OptionsBehavior.ReadOnly = true - Me.grvwTiles.OptionsFind.AlwaysVisible = true + Me.grvwTiles.OptionsBehavior.ReadOnly = True + Me.grvwTiles.OptionsFind.AlwaysVisible = True Me.grvwTiles.OptionsTiles.HorizontalContentAlignment = DevExpress.Utils.HorzAlignment.Near Me.grvwTiles.OptionsTiles.ItemSize = New System.Drawing.Size(240, 116) Me.grvwTiles.OptionsTiles.RowCount = 2 @@ -579,16 +599,16 @@ Partial Class frmConstructor_Main ' 'TCDetails ' - Me.TCDetails.AppearancePage.HeaderHotTracked.BackColor = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.BackColor"),System.Drawing.Color) - Me.TCDetails.AppearancePage.HeaderHotTracked.BackColor2 = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.BackColor2"),System.Drawing.Color) - Me.TCDetails.AppearancePage.HeaderHotTracked.Font = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.Font"),System.Drawing.Font) - Me.TCDetails.AppearancePage.HeaderHotTracked.Options.UseBackColor = true - Me.TCDetails.AppearancePage.HeaderHotTracked.Options.UseFont = true + Me.TCDetails.AppearancePage.HeaderHotTracked.BackColor = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.BackColor"), System.Drawing.Color) + Me.TCDetails.AppearancePage.HeaderHotTracked.BackColor2 = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.BackColor2"), System.Drawing.Color) + Me.TCDetails.AppearancePage.HeaderHotTracked.Font = CType(resources.GetObject("TCDetails.AppearancePage.HeaderHotTracked.Font"), System.Drawing.Font) + Me.TCDetails.AppearancePage.HeaderHotTracked.Options.UseBackColor = True + Me.TCDetails.AppearancePage.HeaderHotTracked.Options.UseFont = True resources.ApplyResources(Me.TCDetails, "TCDetails") - Me.TCDetails.LookAndFeel.UseDefaultLookAndFeel = false + Me.TCDetails.LookAndFeel.UseDefaultLookAndFeel = False Me.TCDetails.Name = "TCDetails" Me.TCDetails.SelectedTabPage = Me.TabDetails - Me.TCDetails.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabDetails, Me.TabWindream, Me.TabFollowUp, Me.TabPos, Me.XtraTabPageVariant}) + Me.TCDetails.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabDetails, Me.TabWindream, Me.TabFollowUp, Me.TabPos, Me.TabPageVariant}) ' 'TabDetails ' @@ -600,8 +620,8 @@ Partial Class frmConstructor_Main ' 'SplitContainerDetails ' - Me.SplitContainerDetails.Appearance.BackColor = CType(resources.GetObject("SplitContainerDetails.Appearance.BackColor"),System.Drawing.Color) - Me.SplitContainerDetails.Appearance.Options.UseBackColor = true + Me.SplitContainerDetails.Appearance.BackColor = CType(resources.GetObject("SplitContainerDetails.Appearance.BackColor"), System.Drawing.Color) + Me.SplitContainerDetails.Appearance.Options.UseBackColor = True Me.SplitContainerDetails.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Style3D Me.SplitContainerDetails.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 resources.ApplyResources(Me.SplitContainerDetails, "SplitContainerDetails") @@ -615,7 +635,7 @@ Partial Class frmConstructor_Main ' 'pnlDetails ' - Me.pnlDetails.AllowDrop = true + Me.pnlDetails.AllowDrop = True resources.ApplyResources(Me.pnlDetails, "pnlDetails") Me.pnlDetails.Name = "pnlDetails" ' @@ -633,9 +653,9 @@ Partial Class frmConstructor_Main ' 'tslblDocIDTab1 ' - Me.tslblDocIDTab1.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _ - Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _ - Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom),System.Windows.Forms.ToolStripStatusLabelBorderSides) + Me.tslblDocIDTab1.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _ + Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _ + Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides) Me.tslblDocIDTab1.Name = "tslblDocIDTab1" resources.ApplyResources(Me.tslblDocIDTab1, "tslblDocIDTab1") ' @@ -713,7 +733,7 @@ Partial Class frmConstructor_Main ' 'TabWindream ' - Me.TabWindream.AllowDrop = true + Me.TabWindream.AllowDrop = True Me.TabWindream.Controls.Add(Me.GridControlDocSearch) Me.TabWindream.Controls.Add(Me.ToolStripDokumente) Me.TabWindream.Image = Global.DD_Record_Organiser.My.Resources.Resources.Files_7954 @@ -722,7 +742,7 @@ Partial Class frmConstructor_Main ' 'GridControlDocSearch ' - Me.GridControlDocSearch.AllowDrop = true + Me.GridControlDocSearch.AllowDrop = True Me.GridControlDocSearch.ContextMenuStrip = Me.ContextMenuStripResultFiles resources.ApplyResources(Me.GridControlDocSearch, "GridControlDocSearch") Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search @@ -861,29 +881,29 @@ Partial Class frmConstructor_Main ' 'GridViewDoc_Search ' - Me.GridViewDoc_Search.Appearance.OddRow.BackColor = CType(resources.GetObject("GridViewDoc_Search.Appearance.OddRow.BackColor"),System.Drawing.Color) - Me.GridViewDoc_Search.Appearance.OddRow.BackColor2 = CType(resources.GetObject("GridViewDoc_Search.Appearance.OddRow.BackColor2"),System.Drawing.Color) - Me.GridViewDoc_Search.Appearance.OddRow.Options.UseBackColor = true + Me.GridViewDoc_Search.Appearance.OddRow.BackColor = CType(resources.GetObject("GridViewDoc_Search.Appearance.OddRow.BackColor"), System.Drawing.Color) + Me.GridViewDoc_Search.Appearance.OddRow.BackColor2 = CType(resources.GetObject("GridViewDoc_Search.Appearance.OddRow.BackColor2"), System.Drawing.Color) + Me.GridViewDoc_Search.Appearance.OddRow.Options.UseBackColor = True Me.GridViewDoc_Search.DetailVerticalIndent = 10 Me.GridViewDoc_Search.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFullFocus Me.GridViewDoc_Search.GridControl = Me.GridControlDocSearch Me.GridViewDoc_Search.LevelIndent = 10 Me.GridViewDoc_Search.Name = "GridViewDoc_Search" Me.GridViewDoc_Search.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] - Me.GridViewDoc_Search.OptionsDetail.ShowDetailTabs = false - Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceFocusedCell = false - Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceFocusedRow = false - Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceHideSelection = false - Me.GridViewDoc_Search.OptionsSelection.MultiSelect = true + Me.GridViewDoc_Search.OptionsDetail.ShowDetailTabs = False + Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceFocusedCell = False + Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceFocusedRow = False + Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceHideSelection = False + Me.GridViewDoc_Search.OptionsSelection.MultiSelect = True Me.GridViewDoc_Search.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CellSelect - Me.GridViewDoc_Search.OptionsView.ColumnAutoWidth = false - Me.GridViewDoc_Search.OptionsView.EnableAppearanceOddRow = true - Me.GridViewDoc_Search.OptionsView.ShowAutoFilterRow = true + Me.GridViewDoc_Search.OptionsView.ColumnAutoWidth = False + Me.GridViewDoc_Search.OptionsView.EnableAppearanceOddRow = True + Me.GridViewDoc_Search.OptionsView.ShowAutoFilterRow = True Me.GridViewDoc_Search.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True] ' 'ToolStripDokumente ' - Me.ToolStripDokumente.AllowDrop = true + Me.ToolStripDokumente.AllowDrop = True resources.ApplyResources(Me.ToolStripDokumente, "ToolStripDokumente") Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblWindreamView, Me.tsdrdowbtnDocSearch, Me.ToolStripSeparator17, Me.tsTextboxFulltext, Me.ToolStripLabel1, Me.ToolStripSeparator18, Me.ToolStripSeparator3, Me.tsbtnDoc_Refresh}) Me.ToolStripDokumente.Name = "ToolStripDokumente" @@ -954,10 +974,10 @@ Partial Class frmConstructor_Main ' resources.ApplyResources(Me.ListViewFollowUps, "ListViewFollowUps") Me.ListViewFollowUps.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ColumnHeader1, Me.ColumnHeader2}) - Me.ListViewFollowUps.FullRowSelect = true - Me.ListViewFollowUps.HideSelection = false + Me.ListViewFollowUps.FullRowSelect = True + Me.ListViewFollowUps.HideSelection = False Me.ListViewFollowUps.Name = "ListViewFollowUps" - Me.ListViewFollowUps.UseCompatibleStateImageBehavior = false + Me.ListViewFollowUps.UseCompatibleStateImageBehavior = False Me.ListViewFollowUps.View = System.Windows.Forms.View.Details ' 'ColumnHeader1 @@ -977,7 +997,7 @@ Partial Class frmConstructor_Main Me.grpbxFU_Profile.Controls.Add(Me.dtpFollowUp) Me.grpbxFU_Profile.Controls.Add(Me.lblWiedervorlage_Control) Me.grpbxFU_Profile.Name = "grpbxFU_Profile" - Me.grpbxFU_Profile.TabStop = false + Me.grpbxFU_Profile.TabStop = False ' 'GroupBox4 ' @@ -989,25 +1009,25 @@ Partial Class frmConstructor_Main Me.GroupBox4.Controls.Add(Me.ListBoxUser2Profile) Me.GroupBox4.Controls.Add(Me.Label7) Me.GroupBox4.Name = "GroupBox4" - Me.GroupBox4.TabStop = false + Me.GroupBox4.TabStop = False ' 'btnRemoveUser_FollowUp ' resources.ApplyResources(Me.btnRemoveUser_FollowUp, "btnRemoveUser_FollowUp") Me.btnRemoveUser_FollowUp.Name = "btnRemoveUser_FollowUp" - Me.btnRemoveUser_FollowUp.UseVisualStyleBackColor = true + Me.btnRemoveUser_FollowUp.UseVisualStyleBackColor = True ' 'btnAddUser_FollowUp ' resources.ApplyResources(Me.btnAddUser_FollowUp, "btnAddUser_FollowUp") Me.btnAddUser_FollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.AddMark_10580 Me.btnAddUser_FollowUp.Name = "btnAddUser_FollowUp" - Me.btnAddUser_FollowUp.UseVisualStyleBackColor = true + Me.btnAddUser_FollowUp.UseVisualStyleBackColor = True ' 'cmbFollowUpUser ' resources.ApplyResources(Me.cmbFollowUpUser, "cmbFollowUpUser") - Me.cmbFollowUpUser.FormattingEnabled = true + Me.cmbFollowUpUser.FormattingEnabled = True Me.cmbFollowUpUser.Name = "cmbFollowUpUser" ' 'Label6 @@ -1018,7 +1038,7 @@ Partial Class frmConstructor_Main 'ListBoxUser2Profile ' resources.ApplyResources(Me.ListBoxUser2Profile, "ListBoxUser2Profile") - Me.ListBoxUser2Profile.FormattingEnabled = true + Me.ListBoxUser2Profile.FormattingEnabled = True Me.ListBoxUser2Profile.Name = "ListBoxUser2Profile" ' 'Label7 @@ -1036,7 +1056,7 @@ Partial Class frmConstructor_Main ' resources.ApplyResources(Me.chkFollowUp, "chkFollowUp") Me.chkFollowUp.Name = "chkFollowUp" - Me.chkFollowUp.UseVisualStyleBackColor = true + Me.chkFollowUp.UseVisualStyleBackColor = True ' 'dtpFollowUp ' @@ -1058,9 +1078,9 @@ Partial Class frmConstructor_Main ' Me.TabPos.Controls.Add(Me.Panel1) Me.TabPos.Controls.Add(Me.BindingNavigatorPOS) - Me.TabPos.Image = CType(resources.GetObject("TabPos.Image"),System.Drawing.Image) + Me.TabPos.Image = CType(resources.GetObject("TabPos.Image"), System.Drawing.Image) Me.TabPos.Name = "TabPos" - Me.TabPos.PageVisible = false + Me.TabPos.PageVisible = False resources.ApplyResources(Me.TabPos, "TabPos") ' 'Panel1 @@ -1078,12 +1098,12 @@ Partial Class frmConstructor_Main ' 'grvwGridPos ' - Me.grvwGridPos.Appearance.EvenRow.BackColor = CType(resources.GetObject("grvwGridPos.Appearance.EvenRow.BackColor"),System.Drawing.Color) - Me.grvwGridPos.Appearance.EvenRow.Options.UseBackColor = true + Me.grvwGridPos.Appearance.EvenRow.BackColor = CType(resources.GetObject("grvwGridPos.Appearance.EvenRow.BackColor"), System.Drawing.Color) + Me.grvwGridPos.Appearance.EvenRow.Options.UseBackColor = True Me.grvwGridPos.GridControl = Me.GridControlPos Me.grvwGridPos.Name = "grvwGridPos" - Me.grvwGridPos.OptionsView.EnableAppearanceEvenRow = true - Me.grvwGridPos.OptionsView.ShowAutoFilterRow = true + Me.grvwGridPos.OptionsView.EnableAppearanceEvenRow = True + Me.grvwGridPos.OptionsView.ShowAutoFilterRow = True ' 'BindingNavigatorPOS ' @@ -1161,21 +1181,123 @@ Partial Class frmConstructor_Main Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2" resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2") ' - 'XtraTabPageVariant + 'TabPageVariant + ' + Me.TabPageVariant.Appearance.Header.BackColor = CType(resources.GetObject("TabPageVariant.Appearance.Header.BackColor"), System.Drawing.Color) + Me.TabPageVariant.Appearance.Header.Font = CType(resources.GetObject("TabPageVariant.Appearance.Header.Font"), System.Drawing.Font) + Me.TabPageVariant.Appearance.Header.ForeColor = CType(resources.GetObject("TabPageVariant.Appearance.Header.ForeColor"), System.Drawing.Color) + Me.TabPageVariant.Appearance.Header.Options.UseBackColor = True + Me.TabPageVariant.Appearance.Header.Options.UseFont = True + Me.TabPageVariant.Appearance.Header.Options.UseForeColor = True + Me.TabPageVariant.Controls.Add(Me.GridControl1) + Me.TabPageVariant.Controls.Add(Me.tsVariants) + Me.TabPageVariant.Name = "TabPageVariant" + Me.TabPageVariant.PageVisible = False + resources.ApplyResources(Me.TabPageVariant, "TabPageVariant") + ' + 'GridControl1 + ' + Me.GridControl1.DataSource = Me.TBPMO_RECORD_VARIANTBindingSource + resources.ApplyResources(Me.GridControl1, "GridControl1") + Me.GridControl1.MainView = Me.GridViewVariants + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.ShowOnlyPredefinedDetails = True + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewVariants}) + ' + 'TBPMO_RECORD_VARIANTBindingSource + ' + Me.TBPMO_RECORD_VARIANTBindingSource.DataMember = "TBPMO_RECORD_VARIANT" + Me.TBPMO_RECORD_VARIANTBindingSource.DataSource = Me.DD_DMSDataSet + ' + 'DD_DMSDataSet + ' + Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet" + Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema + ' + 'GridViewVariants + ' + Me.GridViewVariants.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewVariants.Appearance.EvenRow.BackColor"), System.Drawing.Color) + Me.GridViewVariants.Appearance.EvenRow.Options.UseBackColor = True + Me.GridViewVariants.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn1, Me.colREASON_CODE, Me.colCOMMENT, Me.colADDED_WHO, Me.colADDED_WHEN, Me.colRECORD_ID}) + Me.GridViewVariants.GridControl = Me.GridControl1 + Me.GridViewVariants.Name = "GridViewVariants" + Me.GridViewVariants.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridViewVariants.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridViewVariants.OptionsBehavior.Editable = False + Me.GridViewVariants.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] + Me.GridViewVariants.OptionsSelection.EnableAppearanceFocusedCell = False + Me.GridViewVariants.OptionsView.ColumnAutoWidth = False + Me.GridViewVariants.OptionsView.EnableAppearanceEvenRow = True + Me.GridViewVariants.OptionsView.ShowAutoFilterRow = True + Me.GridViewVariants.OptionsView.ShowGroupPanel = False + ' + 'GridColumn1 + ' + resources.ApplyResources(Me.GridColumn1, "GridColumn1") + Me.GridColumn1.FieldName = "GUID" + Me.GridColumn1.Name = "GridColumn1" + ' + 'colREASON_CODE + ' + resources.ApplyResources(Me.colREASON_CODE, "colREASON_CODE") + Me.colREASON_CODE.FieldName = "REASON_CODE" + Me.colREASON_CODE.Name = "colREASON_CODE" + ' + 'colCOMMENT + ' + resources.ApplyResources(Me.colCOMMENT, "colCOMMENT") + Me.colCOMMENT.FieldName = "COMMENT" + Me.colCOMMENT.Name = "colCOMMENT" + ' + 'colADDED_WHO ' - Me.XtraTabPageVariant.Appearance.Header.BackColor = CType(resources.GetObject("XtraTabPageVariant.Appearance.Header.BackColor"),System.Drawing.Color) - Me.XtraTabPageVariant.Appearance.Header.Font = CType(resources.GetObject("XtraTabPageVariant.Appearance.Header.Font"),System.Drawing.Font) - Me.XtraTabPageVariant.Appearance.Header.ForeColor = CType(resources.GetObject("XtraTabPageVariant.Appearance.Header.ForeColor"),System.Drawing.Color) - Me.XtraTabPageVariant.Appearance.Header.Options.UseBackColor = true - Me.XtraTabPageVariant.Appearance.Header.Options.UseFont = true - Me.XtraTabPageVariant.Appearance.Header.Options.UseForeColor = true - Me.XtraTabPageVariant.Name = "XtraTabPageVariant" - Me.XtraTabPageVariant.PageVisible = false - resources.ApplyResources(Me.XtraTabPageVariant, "XtraTabPageVariant") + resources.ApplyResources(Me.colADDED_WHO, "colADDED_WHO") + Me.colADDED_WHO.FieldName = "ADDED_WHO" + Me.colADDED_WHO.Name = "colADDED_WHO" + ' + 'colADDED_WHEN + ' + resources.ApplyResources(Me.colADDED_WHEN, "colADDED_WHEN") + Me.colADDED_WHEN.FieldName = "ADDED_WHEN" + Me.colADDED_WHEN.Name = "colADDED_WHEN" + ' + 'colRECORD_ID + ' + resources.ApplyResources(Me.colRECORD_ID, "colRECORD_ID") + Me.colRECORD_ID.FieldName = "RECORD_ID" + Me.colRECORD_ID.Name = "colRECORD_ID" + ' + 'tsVariants + ' + Me.tsVariants.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblVariantsCount, Me.ToolStripSeparator23, Me.ToolStripButton1, Me.tsbtnVariantDetailView}) + resources.ApplyResources(Me.tsVariants, "tsVariants") + Me.tsVariants.Name = "tsVariants" + ' + 'tslblVariantsCount + ' + resources.ApplyResources(Me.tslblVariantsCount, "tslblVariantsCount") + Me.tslblVariantsCount.Name = "tslblVariantsCount" + ' + 'ToolStripSeparator23 + ' + Me.ToolStripSeparator23.Name = "ToolStripSeparator23" + resources.ApplyResources(Me.ToolStripSeparator23, "ToolStripSeparator23") + ' + 'ToolStripButton1 + ' + Me.ToolStripButton1.Image = Global.DD_Record_Organiser.My.Resources.Resources.refresh_16xLG + resources.ApplyResources(Me.ToolStripButton1, "ToolStripButton1") + Me.ToolStripButton1.Name = "ToolStripButton1" + ' + 'tsbtnVariantDetailView + ' + Me.tsbtnVariantDetailView.Image = Global.DD_Record_Organiser.My.Resources.Resources.Task_16xMD + resources.ApplyResources(Me.tsbtnVariantDetailView, "tsbtnVariantDetailView") + Me.tsbtnVariantDetailView.Name = "tsbtnVariantDetailView" ' 'SplitContainerFORM ' - Me.SplitContainerFORM.Collapsed = true + Me.SplitContainerFORM.Collapsed = True Me.SplitContainerFORM.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 resources.ApplyResources(Me.SplitContainerFORM, "SplitContainerFORM") Me.SplitContainerFORM.Name = "SplitContainerFORM" @@ -1210,8 +1332,8 @@ Partial Class frmConstructor_Main ' Me.NavButtonHome.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.[True] Me.NavButtonHome.Caption = "" - Me.NavButtonHome.Glyph = CType(resources.GetObject("NavButtonHome.Glyph"),System.Drawing.Image) - Me.NavButtonHome.IsMain = true + Me.NavButtonHome.Glyph = CType(resources.GetObject("NavButtonHome.Glyph"), System.Drawing.Image) + Me.NavButtonHome.IsMain = True Me.NavButtonHome.Name = "NavButtonHome" ' 'NavButtonRefresh @@ -1219,7 +1341,7 @@ Partial Class frmConstructor_Main Me.NavButtonRefresh.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right Me.NavButtonRefresh.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.[True] Me.NavButtonRefresh.Caption = "" - Me.NavButtonRefresh.Glyph = CType(resources.GetObject("NavButtonRefresh.Glyph"),System.Drawing.Image) + Me.NavButtonRefresh.Glyph = CType(resources.GetObject("NavButtonRefresh.Glyph"), System.Drawing.Image) Me.NavButtonRefresh.Name = "NavButtonRefresh" ' 'StatusStrip_Main @@ -1230,9 +1352,9 @@ Partial Class frmConstructor_Main ' 'tsslblStatus ' - Me.tsslblStatus.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _ - Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _ - Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom),System.Windows.Forms.ToolStripStatusLabelBorderSides) + Me.tsslblStatus.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _ + Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _ + Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides) Me.tsslblStatus.BorderStyle = System.Windows.Forms.Border3DStyle.Etched Me.tsslblStatus.Name = "tsslblStatus" resources.ApplyResources(Me.tsslblStatus, "tsslblStatus") @@ -1240,17 +1362,17 @@ Partial Class frmConstructor_Main 'tsslblRecord ' Me.tsslblRecord.BackColor = System.Drawing.SystemColors.ControlLight - Me.tsslblRecord.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _ - Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _ - Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom),System.Windows.Forms.ToolStripStatusLabelBorderSides) + Me.tsslblRecord.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _ + Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _ + Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides) Me.tsslblRecord.Name = "tsslblRecord" resources.ApplyResources(Me.tsslblRecord, "tsslblRecord") ' 'tslblDocIDMain ' - Me.tslblDocIDMain.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _ - Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _ - Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom),System.Windows.Forms.ToolStripStatusLabelBorderSides) + Me.tslblDocIDMain.BorderSides = CType((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) _ + Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _ + Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides) Me.tslblDocIDMain.Name = "tslblDocIDMain" resources.ApplyResources(Me.tslblDocIDMain, "tslblDocIDMain") ' @@ -1278,25 +1400,20 @@ Partial Class frmConstructor_Main ' 'ImageCollection1 ' - Me.ImageCollection1.ImageStream = CType(resources.GetObject("ImageCollection1.ImageStream"),DevExpress.Utils.ImageCollectionStreamer) + Me.ImageCollection1.ImageStream = CType(resources.GetObject("ImageCollection1.ImageStream"), DevExpress.Utils.ImageCollectionStreamer) ' 'ContextMenuDetails ' Me.ContextMenuDetails.Name = "ContextMenuDetails" resources.ApplyResources(Me.ContextMenuDetails, "ContextMenuDetails") ' - 'DD_DMSDataSet - ' - Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet" - Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema - ' 'VWPMO_WF_USER_ACTIVETableAdapter ' - Me.VWPMO_WF_USER_ACTIVETableAdapter.ClearBeforeFill = true + Me.VWPMO_WF_USER_ACTIVETableAdapter.ClearBeforeFill = True ' 'TableAdapterManager ' - Me.TableAdapterManager.BackupDataSetBeforeUpdate = false + Me.TableAdapterManager.BackupDataSetBeforeUpdate = False Me.TableAdapterManager.TBDD_CLIENTTableAdapter = Nothing Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Nothing @@ -1337,7 +1454,7 @@ Partial Class frmConstructor_Main ' 'TBPMO_FILES_USERTableAdapter ' - Me.TBPMO_FILES_USERTableAdapter.ClearBeforeFill = true + Me.TBPMO_FILES_USERTableAdapter.ClearBeforeFill = True ' 'VWPMO_WF_ACTIVEBindingSource ' @@ -1346,7 +1463,7 @@ Partial Class frmConstructor_Main ' 'VWPMO_WF_ACTIVETableAdapter ' - Me.VWPMO_WF_ACTIVETableAdapter.ClearBeforeFill = true + Me.VWPMO_WF_ACTIVETableAdapter.ClearBeforeFill = True ' 'TBPMO_FILES_USERBindingSource ' @@ -1356,7 +1473,11 @@ Partial Class frmConstructor_Main 'RealTimeSource1 ' Me.RealTimeSource1.DisplayableProperties = Nothing - Me.RealTimeSource1.UseWeakEventHandler = true + Me.RealTimeSource1.UseWeakEventHandler = True + ' + 'TBPMO_RECORD_VARIANTTableAdapter + ' + Me.TBPMO_RECORD_VARIANTTableAdapter.ClearBeforeFill = True ' 'frmConstructor_Main ' @@ -1366,62 +1487,69 @@ Partial Class frmConstructor_Main Me.Controls.Add(Me.StatusStrip_Main) Me.Controls.Add(Me.NavPane) Me.Name = "frmConstructor_Main" - CType(Me.SplitContainerMain,System.ComponentModel.ISupportInitialize).EndInit - Me.SplitContainerMain.ResumeLayout(false) - CType(Me.SplitContainerTop,System.ComponentModel.ISupportInitialize).EndInit - Me.SplitContainerTop.ResumeLayout(false) - Me.CMSEntity.ResumeLayout(false) - CType(Me.GridControlMain,System.ComponentModel.ISupportInitialize).EndInit - Me.ContextMenuGrid.ResumeLayout(false) - CType(Me.grvwGrid,System.ComponentModel.ISupportInitialize).EndInit - CType(Me.grvwCarousel,System.ComponentModel.ISupportInitialize).EndInit - CType(Me.grvwTiles,System.ComponentModel.ISupportInitialize).EndInit - Me.ToolStripRecords.ResumeLayout(false) - Me.ToolStripRecords.PerformLayout - CType(Me.TCDetails,System.ComponentModel.ISupportInitialize).EndInit - Me.TCDetails.ResumeLayout(false) - Me.TabDetails.ResumeLayout(false) - Me.TabDetails.PerformLayout - CType(Me.SplitContainerDetails,System.ComponentModel.ISupportInitialize).EndInit - Me.SplitContainerDetails.ResumeLayout(false) - Me.pnlDocFill.ResumeLayout(false) - Me.pnlDocFill.PerformLayout - Me.statStripDoc.ResumeLayout(false) - Me.statStripDoc.PerformLayout - Me.ToolStripEdit.ResumeLayout(false) - Me.ToolStripEdit.PerformLayout - Me.TabWindream.ResumeLayout(false) - Me.TabWindream.PerformLayout - CType(Me.GridControlDocSearch,System.ComponentModel.ISupportInitialize).EndInit - Me.ContextMenuStripResultFiles.ResumeLayout(false) - CType(Me.GridViewDoc_Search,System.ComponentModel.ISupportInitialize).EndInit - Me.ToolStripDokumente.ResumeLayout(false) - Me.ToolStripDokumente.PerformLayout - Me.TabFollowUp.ResumeLayout(false) - Me.TabFollowUp.PerformLayout - Me.grpbxFU_Profile.ResumeLayout(false) - Me.grpbxFU_Profile.PerformLayout - Me.GroupBox4.ResumeLayout(false) - Me.GroupBox4.PerformLayout - Me.TabPos.ResumeLayout(false) - Me.TabPos.PerformLayout - Me.Panel1.ResumeLayout(false) - CType(Me.GridControlPos,System.ComponentModel.ISupportInitialize).EndInit - CType(Me.grvwGridPos,System.ComponentModel.ISupportInitialize).EndInit - CType(Me.BindingNavigatorPOS,System.ComponentModel.ISupportInitialize).EndInit - Me.BindingNavigatorPOS.ResumeLayout(false) - Me.BindingNavigatorPOS.PerformLayout - CType(Me.SplitContainerFORM,System.ComponentModel.ISupportInitialize).EndInit - Me.SplitContainerFORM.ResumeLayout(false) - Me.StatusStrip_Main.ResumeLayout(false) - Me.StatusStrip_Main.PerformLayout - CType(Me.DD_ECMAdmin,System.ComponentModel.ISupportInitialize).EndInit - CType(Me.ImageCollection1,System.ComponentModel.ISupportInitialize).EndInit - CType(Me.DD_DMSDataSet,System.ComponentModel.ISupportInitialize).EndInit - CType(Me.VWPMO_WF_USER_ACTIVEBindingSource,System.ComponentModel.ISupportInitialize).EndInit - CType(Me.VWPMO_WF_ACTIVEBindingSource,System.ComponentModel.ISupportInitialize).EndInit - CType(Me.TBPMO_FILES_USERBindingSource,System.ComponentModel.ISupportInitialize).EndInit - Me.ResumeLayout(false) + CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerMain.ResumeLayout(False) + CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerTop.ResumeLayout(False) + Me.CMSEntity.ResumeLayout(False) + CType(Me.GridControlMain, System.ComponentModel.ISupportInitialize).EndInit() + Me.ContextMenuGrid.ResumeLayout(False) + CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.grvwCarousel, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.grvwTiles, System.ComponentModel.ISupportInitialize).EndInit() + Me.ToolStripRecords.ResumeLayout(False) + Me.ToolStripRecords.PerformLayout() + CType(Me.TCDetails, System.ComponentModel.ISupportInitialize).EndInit() + Me.TCDetails.ResumeLayout(False) + Me.TabDetails.ResumeLayout(False) + Me.TabDetails.PerformLayout() + CType(Me.SplitContainerDetails, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerDetails.ResumeLayout(False) + Me.pnlDocFill.ResumeLayout(False) + Me.pnlDocFill.PerformLayout() + Me.statStripDoc.ResumeLayout(False) + Me.statStripDoc.PerformLayout() + Me.ToolStripEdit.ResumeLayout(False) + Me.ToolStripEdit.PerformLayout() + Me.TabWindream.ResumeLayout(False) + Me.TabWindream.PerformLayout() + CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).EndInit() + Me.ContextMenuStripResultFiles.ResumeLayout(False) + CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit() + Me.ToolStripDokumente.ResumeLayout(False) + Me.ToolStripDokumente.PerformLayout() + Me.TabFollowUp.ResumeLayout(False) + Me.TabFollowUp.PerformLayout() + Me.grpbxFU_Profile.ResumeLayout(False) + Me.grpbxFU_Profile.PerformLayout() + Me.GroupBox4.ResumeLayout(False) + Me.GroupBox4.PerformLayout() + Me.TabPos.ResumeLayout(False) + Me.TabPos.PerformLayout() + Me.Panel1.ResumeLayout(False) + CType(Me.GridControlPos, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.grvwGridPos, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.BindingNavigatorPOS, System.ComponentModel.ISupportInitialize).EndInit() + Me.BindingNavigatorPOS.ResumeLayout(False) + Me.BindingNavigatorPOS.PerformLayout() + Me.TabPageVariant.ResumeLayout(False) + Me.TabPageVariant.PerformLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBPMO_RECORD_VARIANTBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridViewVariants, System.ComponentModel.ISupportInitialize).EndInit() + Me.tsVariants.ResumeLayout(False) + Me.tsVariants.PerformLayout() + CType(Me.SplitContainerFORM, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerFORM.ResumeLayout(False) + Me.StatusStrip_Main.ResumeLayout(False) + Me.StatusStrip_Main.PerformLayout() + CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) Me.PerformLayout End Sub @@ -1575,7 +1703,7 @@ End Sub Friend WithEvents ToolStripSeparator5 As System.Windows.Forms.ToolStripSeparator Friend WithEvents ToolStripSeparator4 As System.Windows.Forms.ToolStripSeparator Friend WithEvents ToolStripSeparator3 As System.Windows.Forms.ToolStripSeparator - Friend WithEvents XtraTabPageVariant As DevExpress.XtraTab.XtraTabPage + Friend WithEvents TabPageVariant As DevExpress.XtraTab.XtraTabPage Friend WithEvents SplitContainerDetails As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents tsbtnRefresh_Entity As System.Windows.Forms.ToolStripButton Friend WithEvents ToolStripSeparator19 As System.Windows.Forms.ToolStripSeparator @@ -1590,4 +1718,19 @@ End Sub Friend WithEvents tslblDocIDTab1 As System.Windows.Forms.ToolStripStatusLabel Friend WithEvents tslblDocViewLocked As System.Windows.Forms.ToolStripStatusLabel Friend WithEvents tslblDocIDMain As System.Windows.Forms.ToolStripStatusLabel + Friend WithEvents tsVariants As System.Windows.Forms.ToolStrip + Friend WithEvents tslblVariantsCount As System.Windows.Forms.ToolStripLabel + Friend WithEvents ToolStripSeparator23 As System.Windows.Forms.ToolStripSeparator + Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton + Friend WithEvents TBPMO_RECORD_VARIANTBindingSource As System.Windows.Forms.BindingSource + Friend WithEvents TBPMO_RECORD_VARIANTTableAdapter As DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_RECORD_VARIANTTableAdapter + Friend WithEvents tsbtnVariantDetailView As System.Windows.Forms.ToolStripButton + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridViewVariants As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colREASON_CODE As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colCOMMENT As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colADDED_WHO As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colADDED_WHEN As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents colRECORD_ID As DevExpress.XtraGrid.Columns.GridColumn End Class diff --git a/app/DD-Record-Organiser/frmConstructor_Main.resx b/app/DD-Record-Organiser/frmConstructor_Main.resx index 0bc5298..8616920 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.resx +++ b/app/DD-Record-Organiser/frmConstructor_Main.resx @@ -1796,31 +1796,187 @@ 3 - + Crimson - + Tahoma, 8.25pt, style=Bold, Italic - + Black - + + 1210, 95 + + + 1140, 17 + + + Fill + + + 0, 25 + + + Cyan + + + ID + + + True + + + 0 + + + 39 + + + Reason for Variant + + + True + + + 1 + + + 229 + + + Comment + + + True + + + 2 + + + 438 + + + Added who + + + True + + + 3 + + + 157 + + + Added when + + + True + + + 4 + + + 129 + + + Old Record-ID + + + True + + + 5 + + + 1356, 340 + + + 90 + + + GridControl1 + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + TabPageVariant + + + 0 + + + 1105, 95 + + + Segoe UI Semibold, 9pt, style=Bold, Italic + + + 0, 22 + + + 6, 25 + + + Magenta + + + 81, 22 + + + Neu laden + + + Magenta + + + 85, 22 + + + Detail View + + + 0, 0 + + + 1356, 25 + + + 1 + + + ToolStrip1 + + + tsVariants + + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TabPageVariant + + + 1 + + 1356, 365 - + Vorgängervarianten - - XtraTabPageVariant + + TabPageVariant - + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + TCDetails - + 4 @@ -2038,9 +2194,6 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1140, 17 - 17, 56 @@ -2068,6 +2221,9 @@ 842, 95 + + 17, 134 + True @@ -3141,6 +3297,84 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + TBPMO_RECORD_VARIANTBindingSource + + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DD_DMSDataSet + + + DD_Record_Organiser.DD_DMSDataSet, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + + GridViewVariants + + + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GridColumn1 + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colREASON_CODE + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colCOMMENT + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colADDED_WHO + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colADDED_WHEN + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + colRECORD_ID + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + tslblVariantsCount + + + System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripSeparator23 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripButton1 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tsbtnVariantDetailView + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + TileNavCategory1 @@ -3213,12 +3447,6 @@ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - DD_DMSDataSet - - - DD_Record_Organiser.DD_DMSDataSet, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - VWPMO_WF_USER_ACTIVEBindingSource @@ -3273,6 +3501,12 @@ DevExpress.Data.RealTimeSource, DevExpress.Data.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + TBPMO_RECORD_VARIANTTableAdapter + + + DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_RECORD_VARIANTTableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + frmConstructor_Main diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index dde8e9a..8735279 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -1131,6 +1131,7 @@ Public Class frmConstructor_Main If RIGHT_WINDREAM_FORBIDDEN = True Then ' Hinzufügen sollte auch bei RIGHT_ONLY_READ verfügbar sein tslblFileslocked.Visible = True + Doc_Controls_EditMode(False) 'TabWindream.PageEnabled = False tsbtnDoc_Refresh.Enabled = False EntitätssucheStartenToolStripMenuItem.Enabled = False @@ -1226,10 +1227,12 @@ Public Class frmConstructor_Main If SelectedNode.Tag.ToString.Contains("RECORD-ID") Then Dim Record = Return_RECORD_forTag(SelectedNode.Tag) If Record <> 0 Then - Doc_Controls_EditMode(True) + If RIGHT_WINDREAM_FORBIDDEN = False Then + Doc_Controls_EditMode(True) + End If Column_Row_Handler(Record, True) LocateRecordById(RECORD_ID) - If DOC_SEARCH_TAB1 = True Then + If DOC_SEARCH_TAB1 = True And RIGHT_WINDREAM_FORBIDDEN = False Then Doc_Controls_EditMode(True) End If End If @@ -2095,7 +2098,7 @@ Public Class frmConstructor_Main RECORD_ENABLED = True CURRENT_RECORD_ENABLED = True - If DOC_SEARCH_TAB1 = True Then + If DOC_SEARCH_TAB1 = True And RIGHT_WINDREAM_FORBIDDEN = False Then Doc_Controls_EditMode(True) End If pnlDetails.Focus() @@ -2655,7 +2658,10 @@ Public Class frmConstructor_Main If ACTIVATE_DOC_SEARCH_ON_EDIT = False Then Doc_Controls_EditMode(False) Else - Doc_Controls_EditMode(True) + If RIGHT_WINDREAM_FORBIDDEN = False Then + Doc_Controls_EditMode(True) + End If + End If Load_DocGrid_Layout() @@ -2669,7 +2675,10 @@ Public Class frmConstructor_Main TabWindream.Controls.Add(GridControlDocSearch) 'GridControlDocSearch.Dock = DockStyle.Top TabWindream.PageVisible = True - Doc_Controls_EditMode(True) + If RIGHT_WINDREAM_FORBIDDEN = False Then + Doc_Controls_EditMode(True) + End If + End If End If @@ -3285,14 +3294,15 @@ Public Class frmConstructor_Main Dim sel = String.Format("SELECT * FROM TBPMO_RECORD WHERE RECORD_ENTITY_ID = (SELECT RECORD_ENTITY_ID FROM TBPMO_RECORD WHERE GUID = {0}) AND FORM_ID = {1} AND GUID <> {2}", SELECTED_RECORD_ID, ENTITY_ID, SELECTED_RECORD_ID) Dim DT_VARIANT As DataTable = ClassDatabase.Return_Datatable(sel) If DT_VARIANT.Rows.Count > 0 Then - XtraTabPageVariant.PageVisible = True + TabPageVariant.PageVisible = True Dim msg = "Vorgängervarianten" If USER_LANGUAGE <> "de-DE" Then msg = "Pre variants" End If - XtraTabPageVariant.Text = String.Format(msg & " ({0})", DT_VARIANT.Rows.Count) + + TabPageVariant.Text = String.Format(msg & " ({0})", DT_VARIANT.Rows.Count) Else - XtraTabPageVariant.PageVisible = False + TabPageVariant.PageVisible = False End If If DOC_SEARCH_TAB1 = True Then DocSearch_Decision() @@ -4211,6 +4221,8 @@ Public Class frmConstructor_Main BACKGROUND_HELPER.PictureAlignment = ContentAlignment.BottomRight Case "TabFollowUp" 'Refresh_FollowUps() + Case "TabPageVariant" + Load_Variants End Select End Sub Sub XtraTabPageVariant_Open() @@ -4939,23 +4951,23 @@ Public Class frmConstructor_Main Else If GRID_TYPE = GridType.Grid Then - 'Try - ' Dim rowCellValue = grvwGrid.GetRowCellValue(e.RowHandle, "ROW_COLOR") - ' If rowCellValue <> "" Then - ' Dim ColorRow As Color - ' Try - ' ColorRow = Color.FromName(rowCellValue) - ' Catch ex As Exception - ' ClassLogger.Add(">> RowBackColor '" & rowCellValue & "'could not be converted from name!", False) - ' Exit Sub - ' End Try - ' 'Dim c As Color = DirectCast(rowCellValue, Color) - ' e.Appearance.BackColor = ColorRow - ' e.HighPriority = True - ' End If - 'Catch ex As Exception - ' ClassLogger.Add(">> Unexpected Error in RowStyle: " & ex.Message, False) - 'End Try + Try + Dim rowCellValue = grvwGrid.GetRowCellValue(e.RowHandle, "ROW_COLOR") + If rowCellValue <> "" Then + Dim ColorRow As Color + Try + ColorRow = Color.FromName(rowCellValue) + Catch ex As Exception + ClassLogger.Add(">> RowBackColor '" & rowCellValue & "'could not be converted from name!", False) + Exit Sub + End Try + 'Dim c As Color = DirectCast(rowCellValue, Color) + e.Appearance.BackColor = ColorRow + e.HighPriority = True + End If + Catch ex As Exception + ClassLogger.Add(">> Unexpected Error in RowStyle: " & ex.Message, False) + End Try End If End If End Sub @@ -6248,4 +6260,31 @@ Public Class frmConstructor_Main Private Sub tsbtnDoc_Refresh_Click(sender As Object, e As EventArgs) Handles tsbtnDoc_Refresh.Click RUN_WDSEARCH_GRID("RECORD") End Sub + + Private Sub Load_Variants() + Try + Me.TBPMO_RECORD_VARIANTTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBPMO_RECORD_VARIANTTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_RECORD_VARIANT, ENTITY_ID, RECORD_ID) + Catch ex As System.Exception + MsgBox("Error while loading variants: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + + End Sub + + Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButton1.Click + Load_Variants() + End Sub + + Private Sub tsbtnVariantDetailView_Click(sender As Object, e As EventArgs) Handles tsbtnVariantDetailView.Click + + Try + Dim RECORD_ID = GridViewVariants.GetFocusedRowCellValue(GridViewVariants.Columns("RECORD_ID")) + If Not IsNothing(RECORD_ID) Then + ClassJumpRecord.JumpToRecord(0, RECORD_ID) + End If + Catch ex As Exception + MsgBox("Unexpected Error in Show_Detail_Record:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + End Try + JUMP_RECORD_ID = 0 + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmSearchAllOVer.Designer.vb b/app/DD-Record-Organiser/frmGlobalSearch.Designer.vb similarity index 99% rename from app/DD-Record-Organiser/frmSearchAllOVer.Designer.vb rename to app/DD-Record-Organiser/frmGlobalSearch.Designer.vb index 03253e0..adeddc0 100644 --- a/app/DD-Record-Organiser/frmSearchAllOVer.Designer.vb +++ b/app/DD-Record-Organiser/frmGlobalSearch.Designer.vb @@ -1,5 +1,5 @@  _ -Partial Class frmSearchAllOVer +Partial Class frmGlobalSearch Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -23,7 +23,7 @@ Partial Class frmSearchAllOVer _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSearchAllOVer)) + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGlobalSearch)) Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl() Me.GridControlRecords = New DevExpress.XtraGrid.GridControl() Me.cmsRecords = New System.Windows.Forms.ContextMenuStrip(Me.components) diff --git a/app/DD-Record-Organiser/frmSearchAllOver.en-US.resx b/app/DD-Record-Organiser/frmGlobalSearch.en-US.resx similarity index 100% rename from app/DD-Record-Organiser/frmSearchAllOver.en-US.resx rename to app/DD-Record-Organiser/frmGlobalSearch.en-US.resx diff --git a/app/DD-Record-Organiser/frmSearchAllOVer.resx b/app/DD-Record-Organiser/frmGlobalSearch.resx similarity index 100% rename from app/DD-Record-Organiser/frmSearchAllOVer.resx rename to app/DD-Record-Organiser/frmGlobalSearch.resx diff --git a/app/DD-Record-Organiser/frmSearchAllOver.vb b/app/DD-Record-Organiser/frmGlobalSearch.vb similarity index 99% rename from app/DD-Record-Organiser/frmSearchAllOver.vb rename to app/DD-Record-Organiser/frmGlobalSearch.vb index e470adf..fb85d84 100644 --- a/app/DD-Record-Organiser/frmSearchAllOver.vb +++ b/app/DD-Record-Organiser/frmGlobalSearch.vb @@ -2,7 +2,7 @@ Imports System.Text Imports System.IO -Public Class frmSearchAllOVer +Public Class frmGlobalSearch Inherits Form Dim sel_Records, sel_FT As String Private Sub tsbtnRefresh_Click(sender As Object, e As EventArgs) Handles tsbtnRefresh.Click diff --git a/app/DD-Record-Organiser/frmNewVariant.Designer.vb b/app/DD-Record-Organiser/frmNewVariant.Designer.vb index 7096809..0b9f3e2 100644 --- a/app/DD-Record-Organiser/frmNewVariant.Designer.vb +++ b/app/DD-Record-Organiser/frmNewVariant.Designer.vb @@ -96,7 +96,7 @@ Partial Class frmNewVariant 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(12, 88) + Me.Label3.Location = New System.Drawing.Point(12, 80) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(114, 13) Me.Label3.TabIndex = 4 @@ -104,10 +104,10 @@ Partial Class frmNewVariant ' 'txtComment ' - Me.txtComment.Location = New System.Drawing.Point(15, 104) + Me.txtComment.Location = New System.Drawing.Point(15, 96) Me.txtComment.Multiline = True Me.txtComment.Name = "txtComment" - Me.txtComment.Size = New System.Drawing.Size(361, 65) + Me.txtComment.Size = New System.Drawing.Size(361, 83) Me.txtComment.TabIndex = 5 ' 'frmNewVariant diff --git a/app/DD-Record-Organiser/frmNewVariant.vb b/app/DD-Record-Organiser/frmNewVariant.vb index 462dbce..86125d2 100644 --- a/app/DD-Record-Organiser/frmNewVariant.vb +++ b/app/DD-Record-Organiser/frmNewVariant.vb @@ -12,22 +12,28 @@ Public Class frmNewVariant End If result = MessageBox.Show(msg, "Create variant:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then - Dim SQL = String.Format("EXEC PRDD_COPY_RECORD {0}, '{1}'", CURRENT_RECORD_ID, USER_USERNAME) + msg = "Wollen Sie die der Vorgängerversion zugeordenten Dateien mit der neuen Variante verlinken?" + If USER_LANGUAGE <> "de-DE" Then + msg = "Would You like to link the files of the 'old' varaint with the new variant?" + End If + Dim RelinkFiles As Integer = 0 + result = MessageBox.Show(msg, "Create variant:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If result = MsgBoxResult.Yes Then + RelinkFiles = 1 + End If + Dim SQL = String.Format("PRPMO_CREATE_VARIANT {0},'{1}','{2}','{3}','{4}'", CURRENT_RECORD_ID, USER_USERNAME, cmbReason.Text, txtComment.Text, RelinkFiles) If ClassDatabase.Execute_non_Query_withConn(SQL, 1) = True Then Dim sel = String.Format("SELECT MAX(GUID) FROM TBPMO_RECORD WHERE UPPER(ADDED_WHO) = '{0}'", USER_USERNAME.ToUpper) - Dim REC_ID = ClassDatabase.Execute_Scalar(sel) - Dim Upd = String.Format("UPDATE TBPMO_RECORD SET PARENT_RECORD = {0},CHANGED_WHO = '{1}' WHERE GUID = {2}", REC_ID, USER_USERNAME, CURRENT_RECORD_ID) - If ClassDatabase.Execute_non_Query(Upd) = True Then - Dim ins = String.Format("INSERT INTO TBPMO_RECORD_VARIANT (RECORD_ID,REASON_CODE,COMMENT,ADDED_WHO) VALUES ({0},'{1}','{2}','{3}')", CURRENT_RECORD_ID, cmbReason.SelectedText, txtComment.Text, USER_USERNAME) - If ClassDatabase.Execute_non_Query(ins) = True Then - Upd = String.Format("UPDATE TBPMO_RECORD SET RECORD_ENTITY_ID = (SELECT RECORD_ENTITY_ID FROM TBPMO_RECORD WHERE GUID = {0}),CHANGED_WHO = '{1}' WHERE GUID = {2}", CURRENT_RECORD_ID, USER_USERNAME, REC_ID) - If ClassDatabase.Execute_non_Query(Upd) = True Then - CURRENT_RECORD_ID = REC_ID - Me.DialogResult = System.Windows.Forms.DialogResult.OK - Me.Close() - End If - End If + CURRENT_RECORD_ID = ClassDatabase.Execute_Scalar(sel) + msg = "Die neue Variante wurde erzeugt?" + If USER_LANGUAGE <> "de-DE" Then + msg = "The new variant was created successfully?" End If + MsgBox(msg, MsgBoxStyle.Information) + Me.DialogResult = System.Windows.Forms.DialogResult.OK + Me.Close() + Else + MsgBox("Unexpected Error in Creating Variant. Please check the log!", MsgBoxStyle.Critical) End If End If Else diff --git a/app/SetupWiX/Product.wxs b/app/SetupWiX/Product.wxs index 42d2b2d..358e4c8 100644 --- a/app/SetupWiX/Product.wxs +++ b/app/SetupWiX/Product.wxs @@ -34,7 +34,7 @@ @@ -98,6 +98,9 @@ + + +