diff --git a/app/DD-Record-Organizer/ClassControlValues.vb b/app/DD-Record-Organizer/ClassControlValues.vb index ee0656b..ea0e53c 100644 --- a/app/DD-Record-Organizer/ClassControlValues.vb +++ b/app/DD-Record-Organizer/ClassControlValues.vb @@ -194,6 +194,9 @@ Public Class ClassControlValues Dim groupbox As GroupBox = DirectCast(control, GroupBox) LoadControlValues(RecordId, ParentRecordId, FormId, groupbox.Controls, Entity_ID, True) Else + If ControlId = 439 Then + Console.WriteLine("Control 439") + End If LoadControlValue(RecordId, ParentRecordId, ControlId, control, values, Entity_ID) End If diff --git a/app/DD-Record-Organizer/ClassImport_Windream.vb b/app/DD-Record-Organizer/ClassImport_Windream.vb index 7b4719c..c570c8e 100644 --- a/app/DD-Record-Organizer/ClassImport_Windream.vb +++ b/app/DD-Record-Organizer/ClassImport_Windream.vb @@ -25,7 +25,7 @@ Public Class ClassImport_Windream If streamresult = True Then Dim sql As String = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE UPPER(FULL_FILENAME) = UPPER('{0}') AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD) CURRENT_DOC_ID = ClassDatabase.Execute_Scalar(sql) - sql = "SELECT * FROM TBDD_INDEX_AUTOM WHERE DOCTYPE_ID = " & DOCTYPE_ID + sql = $"SELECT * FROM TBDD_INDEX_AUTOM WHERE DOCTYPE_ID = {DOCTYPE_ID} AND ENTITY_ID = {CURRENT_ENTITY_ID}" Dim dt As DataTable = ClassDatabase.Return_Datatable(sql) Dim indexierung_erfolgreich As Boolean = False If dt Is Nothing = False Then @@ -124,8 +124,21 @@ Public Class ClassImport_Windream ' Den Zielordner erstellen Zielordner = DT.Rows(0).Item("ZIEL_PFAD") - sql = $"SELECT DYNAMIC_FOLDER FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE FORMVIEW_ID = {CURRENT_FORMVIEW_ID} AND DOCTYPE_ID = {DocTypeID}" - Dim DYNAMIC_FOLDER = ClassDatabase.Execute_Scalar(sql) + sql = $"SELECT * FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE FORMVIEW_ID = {CURRENT_FORMVIEW_ID} AND DOCTYPE_ID = {DocTypeID}" + Dim oDTFW_DOCTYPES As DataTable = ClassDatabase.Return_Datatable(sql) + Dim DYNAMIC_FOLDER = oDTFW_DOCTYPES.Rows(0).Item("DYNAMIC_FOLDER") + Dim oROOTWM_FOLDER + Try + oROOTWM_FOLDER = oDTFW_DOCTYPES.Rows(0).Item("DYNAMIC_FOLDER") + Catch ex As Exception + oROOTWM_FOLDER = "" + End Try + If oROOTWM_FOLDER <> String.Empty Then + If LogErrorsOnly = False Then ClassLogger.Add($">> oROOTWM_FOLDER '{oROOTWM_FOLDER}' will be used", False) + Zielordner = oROOTWM_FOLDER + End If + + 'ClassDatabase.Execute_Scalar(sql) If Not IsDBNull(DYNAMIC_FOLDER) Then If DYNAMIC_FOLDER <> String.Empty Then If CREATE_FOLDER_INDEX(DYNAMIC_FOLDER, DocTypeID) = True And CURRENT_VARIABLE_FOLDER <> "" Then diff --git a/app/DD-Record-Organizer/ClassNodeNavigation.vb b/app/DD-Record-Organizer/ClassNodeNavigation.vb index 6d0576e..e481d7c 100644 --- a/app/DD-Record-Organizer/ClassNodeNavigation.vb +++ b/app/DD-Record-Organizer/ClassNodeNavigation.vb @@ -94,17 +94,18 @@ Public Class ClassNodeNavigation Exit Sub End If Dim NODE_ID + Dim NODE_CONFIG_ID Dim staticListItems = myTreeNode.Tag.Split("#") If staticListItems(0).Contains("NODE-TYPE") Then ' NODE_ID = staticListItems(0).ToString.Replace("NODE-TYPE-", "") NODE_ID = Return_NODEID_forTag(myTreeNode.Tag) - + NODE_CONFIG_ID = Return_NODE_CONFIG_ID_forTag(myTreeNode.Tag) End If - If CURRENT_DT_NODE_CONFIGURABLE_NODES.Rows.Count > 0 And IsNumeric(NODE_ID) Then + If NODE_CONFIGURABLE_NODES_DT.Rows.Count > 0 And IsNumeric(NODE_ID) Then 'Prüfen ob es für dieses Level einen konfigurierbaren Knoten gibt - Dim table As DataTable = CURRENT_DT_NODE_CONFIGURABLE_NODES + Dim table As DataTable = NODE_CONFIGURABLE_NODES_DT ' Get rows with PARENT_ID = NODE_ID - Dim result() As DataRow = table.Select("PARENT_NODE = " & NODE_ID) + Dim result() As DataRow = table.Select("PARENT_NODE = " & NODE_CONFIG_ID) Dim count As Integer Dim ID ' Loop. @@ -116,7 +117,7 @@ Public Class ClassNodeNavigation Console.WriteLine(row(0)) Next - 'Dim result = (From form In CURRENT_DT_NODE_CONFIGURABLE_NODES.AsEnumerable() + 'Dim result = (From form In NODE_CONFIGURABLE_NODES_DT.AsEnumerable() ' Select form ' Where form.Item("PARENT_NODE") = NODE_ID).Single() @@ -128,7 +129,7 @@ Public Class ClassNodeNavigation CURRENT_NODE_CONFIGURABLE_ID = 0 End If Else - If LogErrorsOnly = False Then ClassLogger.Add("NO CURRENT_DT_NODE_CONFIGURABLE_NODES", False) + If LogErrorsOnly = False Then ClassLogger.Add("NO NODE_CONFIGURABLE_NODES_DT", False) End If Catch ex As Exception ClassNodeNavigation.NODE_CONFIGURABLE_ID = 0 @@ -374,4 +375,28 @@ Public Class ClassNodeNavigation End If End Function + Public Shared Function Return_NODE_CONFIG_ID_forTag(NodeString As String) + 'If NODE_CONFIGURABLE_ID = NODE_CONFIG_ID Then + ' vType = "CONFIG_NODE-" & NODE_CONFIG_ID.ToString + 'Else + ' vType = "NODE-TYPE-" & NODE_CONFIG_ID.ToString + 'End If + 'If Not IsDBNull(Record) Then + ' TagString = vType & "#" & Entity & "#" & "NODE_ID-" & IDNode & "#RECORD-ID" & Record.ToString + 'Else + ' TagString = vType & "#" & Entity & "#" & "NODE_ID-" & IDNode + 'End If + 'NODE-TYPE-17#5#NODE_ID-2 + If IsNumeric(NodeString) Then + Return NodeString + Else + Dim staticListItems = NodeString.Split("#") + If staticListItems(0).Contains("NODE-TYPE") Then + Return staticListItems(0).ToString.Replace("NODE-TYPE-", "") + Else + Return 0 + End If + + End If + End Function End Class diff --git a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb index d3bff9a..fb4f715 100644 --- a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb +++ b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb @@ -301,7 +301,10 @@ Public Class ClassWindreamDocGrid gridView.Columns.Item("ICON").MinWidth = 24 gridView.Columns.Item("FULLPATH").Visible = False gridView.Columns.Item("OBJECTTYPE").Visible = False - gridView.Columns.Item("DocID").Visible = False + If Not System.IO.File.Exists(LAYOUT_DOC_GRIDVIEW) Then + gridView.Columns.Item("DocID").Visible = False + End If + Dim created, changed As String If USER_LANGUAGE <> "de-DE" Then changed = "Changed" diff --git a/app/DD-Record-Organizer/DD_ECMAdmin.Designer.vb b/app/DD-Record-Organizer/DD_ECMAdmin.Designer.vb index c9011ea..9ea7b1c 100644 --- a/app/DD-Record-Organizer/DD_ECMAdmin.Designer.vb +++ b/app/DD-Record-Organizer/DD_ECMAdmin.Designer.vb @@ -51,6 +51,8 @@ Partial Public Class DD_ECMAdmin Private tableTBPMO_DOCRESULT_DROPDOWN_ITEMS As TBPMO_DOCRESULT_DROPDOWN_ITEMSDataTable + Private tableTBDD_GROUPS As TBDD_GROUPSDataTable + Private tableDT_VORSCHAU As DT_VORSCHAUDataTable Private tableTBAD_Users As TBAD_UsersDataTable @@ -131,6 +133,9 @@ Partial Public Class DD_ECMAdmin If (Not (ds.Tables("TBPMO_DOCRESULT_DROPDOWN_ITEMS")) Is Nothing) Then MyBase.Tables.Add(New TBPMO_DOCRESULT_DROPDOWN_ITEMSDataTable(ds.Tables("TBPMO_DOCRESULT_DROPDOWN_ITEMS"))) End If + If (Not (ds.Tables("TBDD_GROUPS")) Is Nothing) Then + MyBase.Tables.Add(New TBDD_GROUPSDataTable(ds.Tables("TBDD_GROUPS"))) + End If If (Not (ds.Tables("DT_VORSCHAU")) Is Nothing) Then MyBase.Tables.Add(New DT_VORSCHAUDataTable(ds.Tables("DT_VORSCHAU"))) End If @@ -290,6 +295,16 @@ Partial Public Class DD_ECMAdmin End Get End Property + _ + Public ReadOnly Property TBDD_GROUPS() As TBDD_GROUPSDataTable + Get + Return Me.tableTBDD_GROUPS + End Get + End Property + _ + Private Function ShouldSerializeTBDD_GROUPS() As Boolean + Return false + End Function + _ Private Function ShouldSerializeDT_VORSCHAU() As Boolean @@ -833,6 +865,9 @@ Partial Public Class DD_ECMAdmin _ Public Delegate Sub TBPMO_DOCRESULT_DROPDOWN_ITEMSRowChangeEventHandler(ByVal sender As Object, ByVal e As TBPMO_DOCRESULT_DROPDOWN_ITEMSRowChangeEvent) + _ + Public Delegate Sub TBDD_GROUPSRowChangeEventHandler(ByVal sender As Object, ByVal e As TBDD_GROUPSRowChangeEvent) + _ Public Delegate Sub DT_VORSCHAURowChangeEventHandler(ByVal sender As Object, ByVal e As DT_VORSCHAURowChangeEvent) @@ -6091,6 +6126,409 @@ Partial Public Class DD_ECMAdmin End Function End Class + ''' + '''Represents the strongly named DataTable class. + ''' + _ + Partial Public Class TBDD_GROUPSDataTable + Inherits Global.System.Data.TypedTableBase(Of TBDD_GROUPSRow) + + Private columnGUID As Global.System.Data.DataColumn + + Private columnNAME As Global.System.Data.DataColumn + + Private columnECM_FK_ID As Global.System.Data.DataColumn + + Private columnAD_SYNC As Global.System.Data.DataColumn + + Private columnINTERNAL As Global.System.Data.DataColumn + + Private columnACTIVE 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 = "TBDD_GROUPS" + 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 NAMEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnNAME + End Get + End Property + + _ + Public ReadOnly Property ECM_FK_IDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnECM_FK_ID + End Get + End Property + + _ + Public ReadOnly Property AD_SYNCColumn() As Global.System.Data.DataColumn + Get + Return Me.columnAD_SYNC + End Get + End Property + + _ + Public ReadOnly Property INTERNALColumn() As Global.System.Data.DataColumn + Get + Return Me.columnINTERNAL + End Get + End Property + + _ + Public ReadOnly Property ACTIVEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnACTIVE + 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 TBDD_GROUPSRow + Get + Return CType(Me.Rows(index),TBDD_GROUPSRow) + End Get + End Property + + _ + Public Event TBDD_GROUPSRowChanging As TBDD_GROUPSRowChangeEventHandler + + _ + Public Event TBDD_GROUPSRowChanged As TBDD_GROUPSRowChangeEventHandler + + _ + Public Event TBDD_GROUPSRowDeleting As TBDD_GROUPSRowChangeEventHandler + + _ + Public Event TBDD_GROUPSRowDeleted As TBDD_GROUPSRowChangeEventHandler + + _ + Public Overloads Sub AddTBDD_GROUPSRow(ByVal row As TBDD_GROUPSRow) + Me.Rows.Add(row) + End Sub + + _ + Public Overloads Function AddTBDD_GROUPSRow(ByVal NAME As String, ByVal ECM_FK_ID As Integer, ByVal AD_SYNC As Boolean, ByVal INTERNAL As Boolean, ByVal ACTIVE As Boolean, 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 TBDD_GROUPSRow + Dim rowTBDD_GROUPSRow As TBDD_GROUPSRow = CType(Me.NewRow,TBDD_GROUPSRow) + Dim columnValuesArray() As Object = New Object() {Nothing, NAME, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} + rowTBDD_GROUPSRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBDD_GROUPSRow) + Return rowTBDD_GROUPSRow + End Function + + _ + Public Function FindByGUID(ByVal GUID As Integer) As TBDD_GROUPSRow + Return CType(Me.Rows.Find(New Object() {GUID}),TBDD_GROUPSRow) + End Function + + _ + Public Overrides Function Clone() As Global.System.Data.DataTable + Dim cln As TBDD_GROUPSDataTable = CType(MyBase.Clone,TBDD_GROUPSDataTable) + cln.InitVars + Return cln + End Function + + _ + Protected Overrides Function CreateInstance() As Global.System.Data.DataTable + Return New TBDD_GROUPSDataTable() + End Function + + _ + Friend Sub InitVars() + Me.columnGUID = MyBase.Columns("GUID") + Me.columnNAME = MyBase.Columns("NAME") + Me.columnECM_FK_ID = MyBase.Columns("ECM_FK_ID") + Me.columnAD_SYNC = MyBase.Columns("AD_SYNC") + Me.columnINTERNAL = MyBase.Columns("INTERNAL") + Me.columnACTIVE = MyBase.Columns("ACTIVE") + 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.columnNAME = New Global.System.Data.DataColumn("NAME", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnNAME) + Me.columnECM_FK_ID = New Global.System.Data.DataColumn("ECM_FK_ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnECM_FK_ID) + Me.columnAD_SYNC = New Global.System.Data.DataColumn("AD_SYNC", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnAD_SYNC) + Me.columnINTERNAL = New Global.System.Data.DataColumn("INTERNAL", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnINTERNAL) + Me.columnACTIVE = New Global.System.Data.DataColumn("ACTIVE", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnACTIVE) + 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.columnNAME.MaxLength = 50 + Me.columnECM_FK_ID.AllowDBNull = false + Me.columnAD_SYNC.AllowDBNull = false + Me.columnINTERNAL.AllowDBNull = false + Me.columnACTIVE.AllowDBNull = false + Me.columnCOMMENT.MaxLength = 200 + Me.columnADDED_WHO.MaxLength = 50 + Me.columnCHANGED_WHO.MaxLength = 50 + End Sub + + _ + Public Function NewTBDD_GROUPSRow() As TBDD_GROUPSRow + Return CType(Me.NewRow,TBDD_GROUPSRow) + End Function + + _ + Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow + Return New TBDD_GROUPSRow(builder) + End Function + + _ + Protected Overrides Function GetRowType() As Global.System.Type + Return GetType(TBDD_GROUPSRow) + End Function + + _ + Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanged(e) + If (Not (Me.TBDD_GROUPSRowChangedEvent) Is Nothing) Then + RaiseEvent TBDD_GROUPSRowChanged(Me, New TBDD_GROUPSRowChangeEvent(CType(e.Row,TBDD_GROUPSRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanging(e) + If (Not (Me.TBDD_GROUPSRowChangingEvent) Is Nothing) Then + RaiseEvent TBDD_GROUPSRowChanging(Me, New TBDD_GROUPSRowChangeEvent(CType(e.Row,TBDD_GROUPSRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleted(e) + If (Not (Me.TBDD_GROUPSRowDeletedEvent) Is Nothing) Then + RaiseEvent TBDD_GROUPSRowDeleted(Me, New TBDD_GROUPSRowChangeEvent(CType(e.Row,TBDD_GROUPSRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleting(e) + If (Not (Me.TBDD_GROUPSRowDeletingEvent) Is Nothing) Then + RaiseEvent TBDD_GROUPSRowDeleting(Me, New TBDD_GROUPSRowChangeEvent(CType(e.Row,TBDD_GROUPSRow), e.Action)) + End If + End Sub + + _ + Public Sub RemoveTBDD_GROUPSRow(ByVal row As TBDD_GROUPSRow) + 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_ECMAdmin = New DD_ECMAdmin() + 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 = "TBDD_GROUPSDataTable" + 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 the strongly named DataTable class. ''' @@ -10040,6 +10478,239 @@ Partial Public Class DD_ECMAdmin End Sub End Class + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBDD_GROUPSRow + Inherits Global.System.Data.DataRow + + Private tableTBDD_GROUPS As TBDD_GROUPSDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBDD_GROUPS = CType(Me.Table,TBDD_GROUPSDataTable) + End Sub + + _ + Public Property GUID() As Integer + Get + Return CType(Me(Me.tableTBDD_GROUPS.GUIDColumn),Integer) + End Get + Set + Me(Me.tableTBDD_GROUPS.GUIDColumn) = value + End Set + End Property + + _ + Public Property NAME() As String + Get + Try + Return CType(Me(Me.tableTBDD_GROUPS.NAMEColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte NAME in Tabelle TBDD_GROUPS ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_GROUPS.NAMEColumn) = value + End Set + End Property + + _ + Public Property ECM_FK_ID() As Integer + Get + Return CType(Me(Me.tableTBDD_GROUPS.ECM_FK_IDColumn),Integer) + End Get + Set + Me(Me.tableTBDD_GROUPS.ECM_FK_IDColumn) = value + End Set + End Property + + _ + Public Property AD_SYNC() As Boolean + Get + Return CType(Me(Me.tableTBDD_GROUPS.AD_SYNCColumn),Boolean) + End Get + Set + Me(Me.tableTBDD_GROUPS.AD_SYNCColumn) = value + End Set + End Property + + _ + Public Property INTERNAL() As Boolean + Get + Return CType(Me(Me.tableTBDD_GROUPS.INTERNALColumn),Boolean) + End Get + Set + Me(Me.tableTBDD_GROUPS.INTERNALColumn) = value + End Set + End Property + + _ + Public Property ACTIVE() As Boolean + Get + Return CType(Me(Me.tableTBDD_GROUPS.ACTIVEColumn),Boolean) + End Get + Set + Me(Me.tableTBDD_GROUPS.ACTIVEColumn) = value + End Set + End Property + + _ + Public Property COMMENT() As String + Get + Try + Return CType(Me(Me.tableTBDD_GROUPS.COMMENTColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte COMMENT in Tabelle TBDD_GROUPS ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_GROUPS.COMMENTColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHO() As String + Get + Try + Return CType(Me(Me.tableTBDD_GROUPS.ADDED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHO in Tabelle TBDD_GROUPS ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_GROUPS.ADDED_WHOColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBDD_GROUPS.ADDED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBDD_GROUPS ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_GROUPS.ADDED_WHENColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHO() As String + Get + Try + Return CType(Me(Me.tableTBDD_GROUPS.CHANGED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBDD_GROUPS ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_GROUPS.CHANGED_WHOColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBDD_GROUPS.CHANGED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBDD_GROUPS ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_GROUPS.CHANGED_WHENColumn) = value + End Set + End Property + + _ + Public Function IsNAMENull() As Boolean + Return Me.IsNull(Me.tableTBDD_GROUPS.NAMEColumn) + End Function + + _ + Public Sub SetNAMENull() + Me(Me.tableTBDD_GROUPS.NAMEColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCOMMENTNull() As Boolean + Return Me.IsNull(Me.tableTBDD_GROUPS.COMMENTColumn) + End Function + + _ + Public Sub SetCOMMENTNull() + Me(Me.tableTBDD_GROUPS.COMMENTColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsADDED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBDD_GROUPS.ADDED_WHOColumn) + End Function + + _ + Public Sub SetADDED_WHONull() + Me(Me.tableTBDD_GROUPS.ADDED_WHOColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsADDED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBDD_GROUPS.ADDED_WHENColumn) + End Function + + _ + Public Sub SetADDED_WHENNull() + Me(Me.tableTBDD_GROUPS.ADDED_WHENColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBDD_GROUPS.CHANGED_WHOColumn) + End Function + + _ + Public Sub SetCHANGED_WHONull() + Me(Me.tableTBDD_GROUPS.CHANGED_WHOColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBDD_GROUPS.CHANGED_WHENColumn) + End Function + + _ + Public Sub SetCHANGED_WHENNull() + Me(Me.tableTBDD_GROUPS.CHANGED_WHENColumn) = Global.System.Convert.DBNull + End Sub + End Class + ''' '''Represents strongly named DataRow class. ''' @@ -11085,6 +11756,42 @@ Partial Public Class DD_ECMAdmin End Property End Class + ''' + '''Row event argument class + ''' + _ + Public Class TBDD_GROUPSRowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBDD_GROUPSRow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBDD_GROUPSRow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBDD_GROUPSRow + 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 + ''' '''Row event argument class ''' @@ -15754,6 +16461,587 @@ Namespace DD_ECMAdminTableAdapters End Function End Class + ''' + '''Represents the connection and commands used to retrieve and save data. + ''' + _ + Partial Public Class TBDD_GROUPSTableAdapter + 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 = "TBDD_GROUPS" + tableMapping.ColumnMappings.Add("GUID", "GUID") + tableMapping.ColumnMappings.Add("NAME", "NAME") + tableMapping.ColumnMappings.Add("ECM_FK_ID", "ECM_FK_ID") + tableMapping.ColumnMappings.Add("AD_SYNC", "AD_SYNC") + tableMapping.ColumnMappings.Add("INTERNAL", "INTERNAL") + tableMapping.ColumnMappings.Add("ACTIVE", "ACTIVE") + 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) + Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.DeleteCommand.Connection = Me.Connection + Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBDD_GROUPS] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_NAME = 1"& _ + " AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([ECM_FK_ID] = @Original_"& _ + "ECM_FK_ID) AND ([AD_SYNC] = @Original_AD_SYNC) AND ([INTERNAL] = @Original_INTER"& _ + "NAL) AND ([ACTIVE] = @Original_ACTIVE) AND ((@IsNull_COMMENT = 1 AND [COMMENT] I"& _ + "S NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_ADDED_WHO = 1 AND [ADD"& _ + "ED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND ((@IsNull_ADDED_WHE"& _ + "N = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND (("& _ + "@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original"& _ + "_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([C"& _ + "HANGED_WHEN] = @Original_CHANGED_WHEN)))" + Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_NAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ECM_FK_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ECM_FK_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_AD_SYNC", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "AD_SYNC", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_INTERNAL", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "INTERNAL", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.InsertCommand.Connection = Me.Connection + Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBDD_GROUPS] ([NAME], [ECM_FK_ID], [AD_SYNC], [INTERNAL], [ACTIVE], "& _ + "[COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@NA"& _ + "ME, @ECM_FK_ID, @AD_SYNC, @INTERNAL, @ACTIVE, @COMMENT, @ADDED_WHO, @ADDED_WHEN,"& _ + " @CHANGED_WHO, @CHANGED_WHEN);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, ECM_FK_ID, AD_SYNC, INTERNAL,"& _ + " ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_GRO"& _ + "UPS WHERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ECM_FK_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ECM_FK_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@AD_SYNC", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "AD_SYNC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INTERNAL", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "INTERNAL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.UpdateCommand.Connection = Me.Connection + Me._adapter.UpdateCommand.CommandText = "UPDATE [TBDD_GROUPS] SET [NAME] = @NAME, [ECM_FK_ID] = @ECM_FK_ID, [AD_SYNC] = @A"& _ + "D_SYNC, [INTERNAL] = @INTERNAL, [ACTIVE] = @ACTIVE, [COMMENT] = @COMMENT, [ADDED"& _ + "_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [C"& _ + "HANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ((@IsNull_NAME"& _ + " = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([ECM_FK_ID] = @Origi"& _ + "nal_ECM_FK_ID) AND ([AD_SYNC] = @Original_AD_SYNC) AND ([INTERNAL] = @Original_I"& _ + "NTERNAL) AND ([ACTIVE] = @Original_ACTIVE) AND ((@IsNull_COMMENT = 1 AND [COMMEN"& _ + "T] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_ADDED_WHO = 1 AND "& _ + "[ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND ((@IsNull_ADDED"& _ + "_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AN"& _ + "D ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Orig"& _ + "inal_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR"& _ + " ([CHANGED_WHEN] = @Original_CHANGED_WHEN)));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, ECM_FK_ID, AD_"& _ + "SYNC, INTERNAL, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHE"& _ + "N FROM TBDD_GROUPS WHERE (GUID = @GUID)" + Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ECM_FK_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ECM_FK_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@AD_SYNC", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "AD_SYNC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INTERNAL", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "INTERNAL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_NAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ECM_FK_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ECM_FK_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_AD_SYNC", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "AD_SYNC", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_INTERNAL", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "INTERNAL", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + End Sub + + _ + Private Sub InitConnection() + Me._connection = New Global.System.Data.SqlClient.SqlConnection() + Me._connection.ConnectionString = Global.DD_Record_Organizer.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, NAME, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE, COMMENT, ADDED_WH"& _ + "O, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_GROUPS" + Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text + End Sub + + _ + Public Overloads Overridable Function Fill(ByVal dataTable As DD_ECMAdmin.TBDD_GROUPSDataTable) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(0) + If (Me.ClearBeforeFill = true) Then + dataTable.Clear + End If + Dim returnValue As Integer = Me.Adapter.Fill(dataTable) + Return returnValue + End Function + + _ + Public Overloads Overridable Function GetData() As DD_ECMAdmin.TBDD_GROUPSDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Dim dataTable As DD_ECMAdmin.TBDD_GROUPSDataTable = New DD_ECMAdmin.TBDD_GROUPSDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataTable As DD_ECMAdmin.TBDD_GROUPSDataTable) As Integer + Return Me.Adapter.Update(dataTable) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataSet As DD_ECMAdmin) As Integer + Return Me.Adapter.Update(dataSet, "TBDD_GROUPS") + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(dataRows) + End Function + + _ + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_NAME As String, ByVal Original_ECM_FK_ID As Integer, ByVal Original_AD_SYNC As Boolean, ByVal Original_INTERNAL As Boolean, ByVal Original_ACTIVE As Boolean, ByVal Original_COMMENT As String, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer + Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) + If (Original_NAME Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(1).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(2).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(1).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_NAME,String) + End If + Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_ECM_FK_ID,Integer) + Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_AD_SYNC,Boolean) + Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_INTERNAL,Boolean) + Me.Adapter.DeleteCommand.Parameters(6).Value = CType(Original_ACTIVE,Boolean) + If (Original_COMMENT Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(7).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(8).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(7).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(8).Value = CType(Original_COMMENT,String) + End If + If (Original_ADDED_WHO Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(9).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(10).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(9).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(10).Value = CType(Original_ADDED_WHO,String) + End If + If (Original_ADDED_WHEN.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(11).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(12).Value = CType(Original_ADDED_WHEN.Value,Date) + Else + Me.Adapter.DeleteCommand.Parameters(11).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(12).Value = Global.System.DBNull.Value + End If + If (Original_CHANGED_WHO Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(13).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(14).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(13).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(14).Value = CType(Original_CHANGED_WHO,String) + End If + If (Original_CHANGED_WHEN.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(15).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(16).Value = CType(Original_CHANGED_WHEN.Value,Date) + Else + Me.Adapter.DeleteCommand.Parameters(15).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(16).Value = Global.System.DBNull.Value + End If + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State + If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.DeleteCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.DeleteCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.DeleteCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Insert(ByVal NAME As String, ByVal ECM_FK_ID As Integer, ByVal AD_SYNC As Boolean, ByVal INTERNAL As Boolean, ByVal ACTIVE As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer + If (NAME Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(0).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(0).Value = CType(NAME,String) + End If + Me.Adapter.InsertCommand.Parameters(1).Value = CType(ECM_FK_ID,Integer) + Me.Adapter.InsertCommand.Parameters(2).Value = CType(AD_SYNC,Boolean) + Me.Adapter.InsertCommand.Parameters(3).Value = CType(INTERNAL,Boolean) + Me.Adapter.InsertCommand.Parameters(4).Value = CType(ACTIVE,Boolean) + If (COMMENT Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(5).Value = CType(COMMENT,String) + End If + If (ADDED_WHO Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(6).Value = CType(ADDED_WHO,String) + End If + If (ADDED_WHEN.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(7).Value = CType(ADDED_WHEN.Value,Date) + Else + Me.Adapter.InsertCommand.Parameters(7).Value = Global.System.DBNull.Value + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(8).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(8).Value = CType(CHANGED_WHO,String) + End If + If (CHANGED_WHEN.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(9).Value = CType(CHANGED_WHEN.Value,Date) + Else + Me.Adapter.InsertCommand.Parameters(9).Value = Global.System.DBNull.Value + End If + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State + If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.InsertCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.InsertCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.InsertCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Update( _ + ByVal NAME As String, _ + ByVal ECM_FK_ID As Integer, _ + ByVal AD_SYNC As Boolean, _ + ByVal INTERNAL As Boolean, _ + ByVal ACTIVE As Boolean, _ + ByVal COMMENT As String, _ + ByVal ADDED_WHO As String, _ + ByVal ADDED_WHEN As Global.System.Nullable(Of Date), _ + ByVal CHANGED_WHO As String, _ + ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_GUID As Integer, _ + ByVal Original_NAME As String, _ + ByVal Original_ECM_FK_ID As Integer, _ + ByVal Original_AD_SYNC As Boolean, _ + ByVal Original_INTERNAL As Boolean, _ + ByVal Original_ACTIVE As Boolean, _ + ByVal Original_COMMENT As String, _ + ByVal Original_ADDED_WHO As String, _ + ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_CHANGED_WHO As String, _ + ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), _ + ByVal GUID As Integer) As Integer + If (NAME Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(0).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(NAME,String) + End If + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(ECM_FK_ID,Integer) + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(AD_SYNC,Boolean) + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(INTERNAL,Boolean) + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(ACTIVE,Boolean) + If (COMMENT Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(5).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(5).Value = CType(COMMENT,String) + End If + If (ADDED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(6).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(6).Value = CType(ADDED_WHO,String) + End If + If (ADDED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(7).Value = CType(ADDED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(7).Value = Global.System.DBNull.Value + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(8).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(8).Value = CType(CHANGED_WHO,String) + End If + If (CHANGED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(9).Value = CType(CHANGED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(9).Value = Global.System.DBNull.Value + End If + Me.Adapter.UpdateCommand.Parameters(10).Value = CType(Original_GUID,Integer) + If (Original_NAME Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(11).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(12).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(11).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(12).Value = CType(Original_NAME,String) + End If + Me.Adapter.UpdateCommand.Parameters(13).Value = CType(Original_ECM_FK_ID,Integer) + Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_AD_SYNC,Boolean) + Me.Adapter.UpdateCommand.Parameters(15).Value = CType(Original_INTERNAL,Boolean) + Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_ACTIVE,Boolean) + If (Original_COMMENT Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(17).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(18).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(17).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(18).Value = CType(Original_COMMENT,String) + End If + If (Original_ADDED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(19).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(20).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(19).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(20).Value = CType(Original_ADDED_WHO,String) + End If + If (Original_ADDED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(21).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(22).Value = CType(Original_ADDED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(21).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(22).Value = Global.System.DBNull.Value + End If + If (Original_CHANGED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(23).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(24).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(23).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(24).Value = CType(Original_CHANGED_WHO,String) + End If + If (Original_CHANGED_WHEN.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(25).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(26).Value = CType(Original_CHANGED_WHEN.Value,Date) + Else + Me.Adapter.UpdateCommand.Parameters(25).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(26).Value = Global.System.DBNull.Value + End If + Me.Adapter.UpdateCommand.Parameters(27).Value = CType(GUID,Integer) + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State + If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.UpdateCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.UpdateCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.UpdateCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Update( _ + ByVal NAME As String, _ + ByVal ECM_FK_ID As Integer, _ + ByVal AD_SYNC As Boolean, _ + ByVal INTERNAL As Boolean, _ + ByVal ACTIVE As Boolean, _ + ByVal COMMENT As String, _ + ByVal ADDED_WHO As String, _ + ByVal ADDED_WHEN As Global.System.Nullable(Of Date), _ + ByVal CHANGED_WHO As String, _ + ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_GUID As Integer, _ + ByVal Original_NAME As String, _ + ByVal Original_ECM_FK_ID As Integer, _ + ByVal Original_AD_SYNC As Boolean, _ + ByVal Original_INTERNAL As Boolean, _ + ByVal Original_ACTIVE As Boolean, _ + ByVal Original_COMMENT As String, _ + ByVal Original_ADDED_WHO As String, _ + ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), _ + ByVal Original_CHANGED_WHO As String, _ + ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer + Return Me.Update(NAME, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, Original_GUID, Original_NAME, Original_ECM_FK_ID, Original_AD_SYNC, Original_INTERNAL, Original_ACTIVE, Original_COMMENT, Original_ADDED_WHO, Original_ADDED_WHEN, Original_CHANGED_WHO, Original_CHANGED_WHEN, Original_GUID) + End Function + End Class + ''' '''TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios ''' @@ -15781,6 +17069,8 @@ Namespace DD_ECMAdminTableAdapters Private _tBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter As TBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter + Private _tBDD_GROUPSTableAdapter As TBDD_GROUPSTableAdapter + Private _backupDataSetBeforeUpdate As Boolean Private _connection As Global.System.Data.IDbConnection @@ -15894,6 +17184,20 @@ Namespace DD_ECMAdminTableAdapters End Set End Property + _ + Public Property TBDD_GROUPSTableAdapter() As TBDD_GROUPSTableAdapter + Get + Return Me._tBDD_GROUPSTableAdapter + End Get + Set + Me._tBDD_GROUPSTableAdapter = value + End Set + End Property + _ Public Property BackupDataSetBeforeUpdate() As Boolean @@ -15941,6 +17245,10 @@ Namespace DD_ECMAdminTableAdapters AndAlso (Not (Me._tBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter.Connection) Is Nothing)) Then Return Me._tBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter.Connection End If + If ((Not (Me._tBDD_GROUPSTableAdapter) Is Nothing) _ + AndAlso (Not (Me._tBDD_GROUPSTableAdapter.Connection) Is Nothing)) Then + Return Me._tBDD_GROUPSTableAdapter.Connection + End If Return Nothing End Get Set @@ -15975,6 +17283,9 @@ Namespace DD_ECMAdminTableAdapters If (Not (Me._tBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter) Is Nothing) Then count = (count + 1) End If + If (Not (Me._tBDD_GROUPSTableAdapter) Is Nothing) Then + count = (count + 1) + End If Return count End Get End Property @@ -16004,15 +17315,6 @@ Namespace DD_ECMAdminTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPMO_SAP_FUBATableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_SAP_FUBA.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_SAP_FUBATableAdapter.Update(updatedRows)) - allChangedRows.AddRange(updatedRows) - End If - End If If (Not (Me._tBPMO_LOG_ESSENTIALSTableAdapter) Is Nothing) Then Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_LOG_ESSENTIALS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) @@ -16022,6 +17324,15 @@ Namespace DD_ECMAdminTableAdapters allChangedRows.AddRange(updatedRows) End If End If + If (Not (Me._tBPMO_SAP_FUBATableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_SAP_FUBA.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_SAP_FUBATableAdapter.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) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) @@ -16049,6 +17360,15 @@ Namespace DD_ECMAdminTableAdapters allChangedRows.AddRange(updatedRows) End If End If + If (Not (Me._tBDD_GROUPSTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBDD_GROUPS.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_GROUPSTableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If Return result End Function @@ -16075,14 +17395,6 @@ Namespace DD_ECMAdminTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPMO_SAP_FUBATableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_SAP_FUBA.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) - If ((Not (addedRows) Is Nothing) _ - AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPMO_SAP_FUBATableAdapter.Update(addedRows)) - allAddedRows.AddRange(addedRows) - End If - End If If (Not (Me._tBPMO_LOG_ESSENTIALSTableAdapter) Is Nothing) Then Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_LOG_ESSENTIALS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ @@ -16091,6 +17403,14 @@ Namespace DD_ECMAdminTableAdapters allAddedRows.AddRange(addedRows) End If End If + If (Not (Me._tBPMO_SAP_FUBATableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_SAP_FUBA.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBPMO_SAP_FUBATableAdapter.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 (addedRows) Is Nothing) _ @@ -16115,6 +17435,14 @@ Namespace DD_ECMAdminTableAdapters allAddedRows.AddRange(addedRows) End If End If + If (Not (Me._tBDD_GROUPSTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBDD_GROUPS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBDD_GROUPSTableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If Return result End Function @@ -16125,6 +17453,14 @@ Namespace DD_ECMAdminTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As DD_ECMAdmin, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 + If (Not (Me._tBDD_GROUPSTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBDD_GROUPS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBDD_GROUPSTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If If (Not (Me._tBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_DOCRESULT_DROPDOWN_ITEMS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -16149,14 +17485,6 @@ Namespace DD_ECMAdminTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPMO_LOG_ESSENTIALSTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_LOG_ESSENTIALS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) - If ((Not (deletedRows) Is Nothing) _ - AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPMO_LOG_ESSENTIALSTableAdapter.Update(deletedRows)) - allChangedRows.AddRange(deletedRows) - End If - End If If (Not (Me._tBPMO_SAP_FUBATableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_SAP_FUBA.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -16165,6 +17493,14 @@ Namespace DD_ECMAdminTableAdapters allChangedRows.AddRange(deletedRows) End If End If + If (Not (Me._tBPMO_LOG_ESSENTIALSTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_LOG_ESSENTIALS.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBPMO_LOG_ESSENTIALSTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If If (Not (Me._tBPMO_DOCSEARCH_RESULTLIST_CONFIGTableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_DOCSEARCH_RESULTLIST_CONFIG.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -16257,6 +17593,11 @@ Namespace DD_ECMAdminTableAdapters Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ "s die gleiche Verbindungszeichenfolge verwendet werden.") End If + If ((Not (Me._tBDD_GROUPSTableAdapter) Is Nothing) _ + AndAlso (Me.MatchTableAdapterConnection(Me._tBDD_GROUPSTableAdapter.Connection) = false)) Then + Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ + "s die gleiche Verbindungszeichenfolge verwendet werden.") + End If Dim workConnection As Global.System.Data.IDbConnection = Me.Connection If (workConnection Is Nothing) Then Throw New Global.System.ApplicationException("TableAdapterManager enthält keine Verbindungsinformationen. Legen Sie jede TableA"& _ @@ -16354,6 +17695,15 @@ Namespace DD_ECMAdminTableAdapters adaptersWithAcceptChangesDuringUpdate.Add(Me._tBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter.Adapter) End If End If + If (Not (Me._tBDD_GROUPSTableAdapter) Is Nothing) Then + revertConnections.Add(Me._tBDD_GROUPSTableAdapter, Me._tBDD_GROUPSTableAdapter.Connection) + Me._tBDD_GROUPSTableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) + Me._tBDD_GROUPSTableAdapter.Transaction = CType(workTransaction,Global.System.Data.SqlClient.SqlTransaction) + If Me._tBDD_GROUPSTableAdapter.Adapter.AcceptChangesDuringUpdate Then + Me._tBDD_GROUPSTableAdapter.Adapter.AcceptChangesDuringUpdate = false + adaptersWithAcceptChangesDuringUpdate.Add(Me._tBDD_GROUPSTableAdapter.Adapter) + End If + End If ' '---- Perform updates ----------- ' @@ -16442,6 +17792,10 @@ Namespace DD_ECMAdminTableAdapters Me._tBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter.Connection = CType(revertConnections(Me._tBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter),Global.System.Data.SqlClient.SqlConnection) Me._tBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter.Transaction = Nothing End If + If (Not (Me._tBDD_GROUPSTableAdapter) Is Nothing) Then + Me._tBDD_GROUPSTableAdapter.Connection = CType(revertConnections(Me._tBDD_GROUPSTableAdapter),Global.System.Data.SqlClient.SqlConnection) + Me._tBDD_GROUPSTableAdapter.Transaction = Nothing + End If If (0 < adaptersWithAcceptChangesDuringUpdate.Count) Then Dim adapters((adaptersWithAcceptChangesDuringUpdate.Count) - 1) As Global.System.Data.Common.DataAdapter adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters) diff --git a/app/DD-Record-Organizer/DD_ECMAdmin.xsd b/app/DD-Record-Organizer/DD_ECMAdmin.xsd index b49778a..34a4add 100644 --- a/app/DD-Record-Organizer/DD_ECMAdmin.xsd +++ b/app/DD-Record-Organizer/DD_ECMAdmin.xsd @@ -822,6 +822,111 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN + + + + + + DELETE FROM [TBDD_GROUPS] WHERE (([GUID] = @Original_GUID) AND ((@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([ECM_FK_ID] = @Original_ECM_FK_ID) AND ([AD_SYNC] = @Original_AD_SYNC) AND ([INTERNAL] = @Original_INTERNAL) AND ([ACTIVE] = @Original_ACTIVE) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_ADDED_WHO = 1 AND [ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN))) + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO [TBDD_GROUPS] ([NAME], [ECM_FK_ID], [AD_SYNC], [INTERNAL], [ACTIVE], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@NAME, @ECM_FK_ID, @AD_SYNC, @INTERNAL, @ACTIVE, @COMMENT, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN); +SELECT GUID, NAME, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_GROUPS WHERE (GUID = SCOPE_IDENTITY()) + + + + + + + + + + + + + + + + + SELECT GUID, NAME, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN +FROM TBDD_GROUPS + + + + + + UPDATE [TBDD_GROUPS] SET [NAME] = @NAME, [ECM_FK_ID] = @ECM_FK_ID, [AD_SYNC] = @AD_SYNC, [INTERNAL] = @INTERNAL, [ACTIVE] = @ACTIVE, [COMMENT] = @COMMENT, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN WHERE (([GUID] = @Original_GUID) AND ((@IsNull_NAME = 1 AND [NAME] IS NULL) OR ([NAME] = @Original_NAME)) AND ([ECM_FK_ID] = @Original_ECM_FK_ID) AND ([AD_SYNC] = @Original_AD_SYNC) AND ([INTERNAL] = @Original_INTERNAL) AND ([ACTIVE] = @Original_ACTIVE) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_ADDED_WHO = 1 AND [ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN))); +SELECT GUID, NAME, ECM_FK_ID, AD_SYNC, INTERNAL, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_GROUPS WHERE (GUID = @GUID) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -830,7 +935,7 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN - + @@ -876,7 +981,7 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN - + @@ -998,7 +1103,7 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN - + @@ -1071,14 +1176,14 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN - + - + @@ -1107,7 +1212,7 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN - + @@ -1119,7 +1224,7 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN - + @@ -1140,7 +1245,7 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN - + @@ -1154,7 +1259,7 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN - + @@ -1166,7 +1271,7 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN - + @@ -1178,7 +1283,7 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN - + @@ -1293,7 +1398,7 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN - + @@ -1337,7 +1442,7 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN - + @@ -1388,7 +1493,7 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN - + @@ -1448,7 +1553,7 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN - + @@ -1462,7 +1567,7 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN - + @@ -1493,7 +1598,7 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN - + @@ -1533,6 +1638,47 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1579,11 +1725,15 @@ SELECT GUID, CONFIG_ID, VALUE, SEQUENCE, [DEFAULT], COLOR, ADDED_WHO, ADDED_WHEN + + + + - - + + \ No newline at end of file diff --git a/app/DD-Record-Organizer/DD_ECMAdmin.xss b/app/DD-Record-Organizer/DD_ECMAdmin.xss index 46eaac4..26f60b5 100644 --- a/app/DD-Record-Organizer/DD_ECMAdmin.xss +++ b/app/DD-Record-Organizer/DD_ECMAdmin.xss @@ -4,28 +4,29 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + 291 @@ -37,7 +38,7 @@ - + 1048 diff --git a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb index 8aa62ec..13c7d60 100644 --- a/app/DD-Record-Organizer/ModuleRuntimeVariables.vb +++ b/app/DD-Record-Organizer/ModuleRuntimeVariables.vb @@ -116,7 +116,7 @@ Public CURRENT_TBPMO_INDEX_MAN As DataTable Public CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS As DataTable Public CURRENT_DT_DOC_ENTITY_SEARCH As DataTable - Public CURRENT_DT_NODE_CONFIGURABLE_NODES As DataTable + Public NODE_CONFIGURABLE_NODES_DT As DataTable Public CURRENT_DOC_RESULTS As DataTable Public CURRENT_DOC_DROPDOWN As DataTable Public CURRENT_PARENT_DT As DataTable @@ -179,5 +179,5 @@ Public INSERT_IN_ACTION As Boolean = False Public CURRENT_CONTROL_VALUE_COUNT As Integer = 1 - + Public LAYOUT_DOC_GRIDVIEW As String End Module diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index 55cd830..6b7fb20 100644 --- a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb index 87334eb..5acefcd 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb @@ -186,15 +186,14 @@ Partial Class frmConstructor_Main Me.ToolStripSeparator10 = New System.Windows.Forms.ToolStripSeparator() Me.docCMEntityWideSearch = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator20 = New System.Windows.Forms.ToolStripSeparator() + Me.docCM_InWork = New System.Windows.Forms.ToolStripMenuItem() + Me.docCM_linkRecord = New System.Windows.Forms.ToolStripMenuItem() Me.docCM_RenameMain = New System.Windows.Forms.ToolStripMenuItem() Me.NeuToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CMDoc_TextBoxRenameFile = New System.Windows.Forms.ToolStripTextBox() Me.DisplaynameUmbenennenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CMDoc_TextBoxRenameDisplay = New System.Windows.Forms.ToolStripTextBox() - Me.docCM_InWork = New System.Windows.Forms.ToolStripMenuItem() - Me.docCM_linkRecord = New System.Windows.Forms.ToolStripMenuItem() - Me.AusDieserEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.AusAndererEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator22 = New System.Windows.Forms.ToolStripSeparator() Me.WindreamToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateiVersionierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DokumentartÄndernToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -202,12 +201,14 @@ Partial Class frmConstructor_Main Me.docCM_CheckRights = New System.Windows.Forms.ToolStripMenuItem() Me.docCM_GetRights = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator8 = New System.Windows.Forms.ToolStripSeparator() - Me.docCM_DeleteFile = New System.Windows.Forms.ToolStripMenuItem() Me.docCM_RemoveLink = New System.Windows.Forms.ToolStripMenuItem() + Me.docCM_DeleteFile = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator() Me.docCM_showGridSearch = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator16 = New System.Windows.Forms.ToolStripSeparator() Me.docCM_PropertiesFile = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator25 = New System.Windows.Forms.ToolStripSeparator() + Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() Me.docCM_ResetView = New System.Windows.Forms.ToolStripMenuItem() Me.StatusStrip_Main = New System.Windows.Forms.StatusStrip() Me.ContextMenuStripClipboard = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -1322,7 +1323,7 @@ Partial Class frmConstructor_Main 'ContextMenuStripResultFiles ' Me.ContextMenuStripResultFiles.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.docCM_Open, Me.OrdnerÖffnenToolStripMenuItem, Me.docCM_Copy, Me.ToolStripSeparator10, Me.docCMEntityWideSearch, Me.ToolStripSeparator20, Me.docCM_RenameMain, Me.docCM_InWork, Me.docCM_linkRecord, Me.WindreamToolStripMenuItem, Me.ToolStripSeparator7, Me.docCM_CheckRights, Me.docCM_GetRights, Me.ToolStripSeparator8, Me.docCM_DeleteFile, Me.docCM_RemoveLink, Me.ToolStripSeparator9, Me.docCM_showGridSearch, Me.ToolStripSeparator16, Me.docCM_PropertiesFile, Me.docCM_ResetView}) + Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.docCM_Open, Me.OrdnerÖffnenToolStripMenuItem, Me.docCM_Copy, Me.ToolStripSeparator10, Me.docCMEntityWideSearch, Me.ToolStripSeparator20, Me.docCM_InWork, Me.docCM_linkRecord, Me.docCM_RenameMain, Me.ToolStripSeparator22, Me.WindreamToolStripMenuItem, Me.ToolStripSeparator7, Me.docCM_CheckRights, Me.docCM_GetRights, Me.ToolStripSeparator8, Me.docCM_RemoveLink, Me.docCM_DeleteFile, Me.ToolStripSeparator9, Me.docCM_showGridSearch, Me.ToolStripSeparator16, Me.docCM_PropertiesFile, Me.ToolStripSeparator25, Me.ToolStripMenuItem1, Me.docCM_ResetView}) Me.ContextMenuStripResultFiles.Name = "ContextMenuStripResultFiles" resources.ApplyResources(Me.ContextMenuStripResultFiles, "ContextMenuStripResultFiles") ' @@ -1357,6 +1358,18 @@ Partial Class frmConstructor_Main Me.ToolStripSeparator20.Name = "ToolStripSeparator20" resources.ApplyResources(Me.ToolStripSeparator20, "ToolStripSeparator20") ' + 'docCM_InWork + ' + Me.docCM_InWork.Image = Global.DD_Record_Organizer.My.Resources.Resources.FileSystemEditor_5852 + Me.docCM_InWork.Name = "docCM_InWork" + resources.ApplyResources(Me.docCM_InWork, "docCM_InWork") + ' + 'docCM_linkRecord + ' + Me.docCM_linkRecord.Image = Global.DD_Record_Organizer.My.Resources.Resources.Link + Me.docCM_linkRecord.Name = "docCM_linkRecord" + resources.ApplyResources(Me.docCM_linkRecord, "docCM_linkRecord") + ' 'docCM_RenameMain ' Me.docCM_RenameMain.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.NeuToolStripMenuItem, Me.DisplaynameUmbenennenToolStripMenuItem}) @@ -1387,28 +1400,10 @@ Partial Class frmConstructor_Main Me.CMDoc_TextBoxRenameDisplay.Name = "CMDoc_TextBoxRenameDisplay" resources.ApplyResources(Me.CMDoc_TextBoxRenameDisplay, "CMDoc_TextBoxRenameDisplay") ' - 'docCM_InWork + 'ToolStripSeparator22 ' - Me.docCM_InWork.Image = Global.DD_Record_Organizer.My.Resources.Resources.FileSystemEditor_5852 - Me.docCM_InWork.Name = "docCM_InWork" - resources.ApplyResources(Me.docCM_InWork, "docCM_InWork") - ' - 'docCM_linkRecord - ' - Me.docCM_linkRecord.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AusDieserEntitätToolStripMenuItem, Me.AusAndererEntitätToolStripMenuItem}) - Me.docCM_linkRecord.Image = Global.DD_Record_Organizer.My.Resources.Resources.Link - Me.docCM_linkRecord.Name = "docCM_linkRecord" - resources.ApplyResources(Me.docCM_linkRecord, "docCM_linkRecord") - ' - 'AusDieserEntitätToolStripMenuItem - ' - Me.AusDieserEntitätToolStripMenuItem.Name = "AusDieserEntitätToolStripMenuItem" - resources.ApplyResources(Me.AusDieserEntitätToolStripMenuItem, "AusDieserEntitätToolStripMenuItem") - ' - 'AusAndererEntitätToolStripMenuItem - ' - Me.AusAndererEntitätToolStripMenuItem.Name = "AusAndererEntitätToolStripMenuItem" - resources.ApplyResources(Me.AusAndererEntitätToolStripMenuItem, "AusAndererEntitätToolStripMenuItem") + Me.ToolStripSeparator22.Name = "ToolStripSeparator22" + resources.ApplyResources(Me.ToolStripSeparator22, "ToolStripSeparator22") ' 'WindreamToolStripMenuItem ' @@ -1447,18 +1442,18 @@ Partial Class frmConstructor_Main Me.ToolStripSeparator8.Name = "ToolStripSeparator8" resources.ApplyResources(Me.ToolStripSeparator8, "ToolStripSeparator8") ' - 'docCM_DeleteFile - ' - Me.docCM_DeleteFile.Image = Global.DD_Record_Organizer.My.Resources.Resources.delete - Me.docCM_DeleteFile.Name = "docCM_DeleteFile" - resources.ApplyResources(Me.docCM_DeleteFile, "docCM_DeleteFile") - ' 'docCM_RemoveLink ' Me.docCM_RemoveLink.Image = Global.DD_Record_Organizer.My.Resources.Resources.RemoveLink_9938 Me.docCM_RemoveLink.Name = "docCM_RemoveLink" resources.ApplyResources(Me.docCM_RemoveLink, "docCM_RemoveLink") ' + 'docCM_DeleteFile + ' + Me.docCM_DeleteFile.Image = Global.DD_Record_Organizer.My.Resources.Resources.delete + Me.docCM_DeleteFile.Name = "docCM_DeleteFile" + resources.ApplyResources(Me.docCM_DeleteFile, "docCM_DeleteFile") + ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" @@ -1480,6 +1475,16 @@ Partial Class frmConstructor_Main Me.docCM_PropertiesFile.Name = "docCM_PropertiesFile" resources.ApplyResources(Me.docCM_PropertiesFile, "docCM_PropertiesFile") ' + 'ToolStripSeparator25 + ' + Me.ToolStripSeparator25.Name = "ToolStripSeparator25" + resources.ApplyResources(Me.ToolStripSeparator25, "ToolStripSeparator25") + ' + 'ToolStripMenuItem1 + ' + Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1" + resources.ApplyResources(Me.ToolStripMenuItem1, "ToolStripMenuItem1") + ' 'docCM_ResetView ' Me.docCM_ResetView.Name = "docCM_ResetView" @@ -1623,6 +1628,7 @@ Partial Class frmConstructor_Main ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.BackColor = System.Drawing.SystemColors.ControlLightLight Me.Controls.Add(Me.SplitContainerFORM) Me.Controls.Add(Me.StatusStrip_Main) Me.KeyPreview = True @@ -1890,8 +1896,9 @@ Partial Class frmConstructor_Main Friend WithEvents BW_LoadTreeView As System.ComponentModel.BackgroundWorker Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage Friend WithEvents TreeList1 As DevExpress.XtraTreeList.TreeList - Friend WithEvents AusDieserEntitätToolStripMenuItem As ToolStripMenuItem - Friend WithEvents AusAndererEntitätToolStripMenuItem As ToolStripMenuItem Friend WithEvents tsmiNodeRename As ToolStripMenuItem Friend WithEvents tstxtRenameNode As ToolStripTextBox + Friend WithEvents ToolStripSeparator22 As ToolStripSeparator + Friend WithEvents ToolStripMenuItem1 As ToolStripMenuItem + Friend WithEvents ToolStripSeparator25 As ToolStripSeparator End Class diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx index af02422..989f0c3 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.resx +++ b/app/DD-Record-Organizer/frmConstructor_Main.resx @@ -296,7 +296,7 @@ Knoten umbenennen - 216, 26 + 212, 22 Knotentext: @@ -305,7 +305,7 @@ 152, 23 - 213, 6 + 209, 6 @@ -316,7 +316,7 @@ - 216, 26 + 212, 22 Auf dieser Ebene @@ -331,7 +331,7 @@ - 216, 26 + 212, 22 Unterhalb @@ -550,7 +550,7 @@ 0, 27 - 988, 210 + 981, 210 2 @@ -693,7 +693,7 @@ 0, 0 - 988, 27 + 981, 27 1 @@ -777,7 +777,7 @@ 0, 0 - 699, 381 + 699, 374 4 @@ -807,7 +807,7 @@ 0, 26 - 562, 330 + 555, 323 5 @@ -854,10 +854,10 @@ Ansicht eingeschränkt - Klick Bearbeiten für Entsperren - 0, 356 + 0, 349 - 562, 25 + 555, 25 0 @@ -884,7 +884,7 @@ 0, 0 - 562, 26 + 555, 26 0 @@ -905,7 +905,7 @@ Panel2 - 1270, 385 + 1270, 378 1 @@ -1081,7 +1081,7 @@ 1 - 1270, 412 + 1270, 405 Detailansicht @@ -1099,7 +1099,7 @@ 0 - 1276, 443 + 1276, 436 3 @@ -2342,6 +2342,18 @@ 252, 6 + + 255, 26 + + + Datei in Bearbeitung nehmen + + + 255, 26 + + + Datei mit Datensatz verknüpfen + 152, 23 @@ -2372,29 +2384,8 @@ Umbenennen - - 255, 26 - - - Datei in Bearbeitung nehmen - - - 174, 22 - - - Aus dieser Entität - - - 174, 22 - - - Aus anderer Entität - - - 255, 26 - - - Datei mit Datensatz verknüpfen + + 252, 6 @@ -2461,18 +2452,18 @@ 252, 6 - - 255, 26 - - - Datei löschen - 255, 26 Entferne Datei Link + + 255, 26 + + + Datei löschen + 252, 6 @@ -2508,7 +2499,16 @@ 255, 26 - Eigenschaften + Eigenschaften Datei + + + 252, 6 + + + 255, 26 + + + Layout speichern 255, 26 @@ -2517,7 +2517,7 @@ Ansicht zurücksetzen - 256, 430 + 256, 468 ContextMenuStripResultFiles @@ -3811,6 +3811,18 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + docCM_InWork + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + docCM_linkRecord + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + docCM_RenameMain @@ -3841,29 +3853,11 @@ System.Windows.Forms.ToolStripTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - docCM_InWork + + ToolStripSeparator22 - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - docCM_linkRecord - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - AusDieserEntitätToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - AusAndererEntitätToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 WindreamToolStripMenuItem @@ -3907,18 +3901,18 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - docCM_DeleteFile - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - docCM_RemoveLink System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + docCM_DeleteFile + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ToolStripSeparator9 @@ -3943,6 +3937,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ToolStripSeparator25 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripMenuItem1 + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + docCM_ResetView diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index 0eeca47..9e85483 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -344,7 +344,7 @@ Public Class frmConstructor_Main SQL = String.Format("SELECT * FROM TBPMO_ENTITY_USERRIGHT_ADDING where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID) DT_ADDING_USERS = ClassDatabase.Return_Datatable(SQL, False) SQL = String.Format("SELECT * FROM TBPMO_STRUCTURE_NODES_CONFIGURATION where TYPE_NODE = 1000 AND ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID) - CURRENT_DT_NODE_CONFIGURABLE_NODES = ClassDatabase.Return_Datatable(SQL, False) + NODE_CONFIGURABLE_NODES_DT = ClassDatabase.Return_Datatable(SQL, False) Catch ex As System.Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Loading Form part 2") End Try @@ -688,11 +688,12 @@ Public Class frmConstructor_Main Dim EntityRegex As New RegularExpressions.Regex("\s+\(\d+\)") Dim EntityName As String = EntityRegex.Replace(ACT_EBENE_STRING, "") Dim Filename As String = String.Format("GridViewDoc_Search-{0}-{1}-UserLayout.xml", GetSafeFilename(EntityName), CONSTRUCTOR_DETAIL_ID) - Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename) + LAYOUT_DOC_GRIDVIEW = System.IO.Path.Combine(Application.UserAppDataPath(), Filename) + Return LAYOUT_DOC_GRIDVIEW End Function #End Region - Sub Refresh_Entity_Data() + Sub Refresh_Entity_Data(pManually As Boolean) If TrySave_Automatic() = True Then Save_Grid_Layout() ' Setzt die RECORD_ID auf Null @@ -705,7 +706,7 @@ Public Class frmConstructor_Main If CtrlCommandUI.IsInsert Then ActivateAllTabs() End If - Load_Datafor_Entity() + Load_Datafor_Entity(pManually) End If End Sub @@ -1283,7 +1284,7 @@ Public Class frmConstructor_Main firstORFOLLWOWIN = False End If sw.Done() - Load_Datafor_Entity() + Load_Datafor_Entity(False) sw = New SW("TreeViewMain_AfterSelect2") @@ -1541,7 +1542,7 @@ Public Class frmConstructor_Main Sub Create_variable_node() End Sub - Sub Load_Datafor_Entity() + Sub Load_Datafor_Entity(pManually As Boolean) 'If ClassProxy.IS_PROXY_BUSY = True Then ' MsgBox("Proxy-Server is actually synchronizing! Please wait until synchronisation is finished!" & vbNewLine & "This might take up to 3 minutes!", MsgBoxStyle.Information) ' Exit Sub @@ -1554,7 +1555,10 @@ Public Class frmConstructor_Main ENTITY_ID = _TagENT_ID CURRENT_ENTITY_ID = ENTITY_ID Else - Exit Sub + If pManually = False Then + Exit Sub + End If + End If @@ -2667,7 +2671,9 @@ Public Class frmConstructor_Main _ENTITYSTRING = ACT_EBENE_STRING CURRENT_PARENT_RECORD_ID = PARENT_RECORDID + DT_TBPMO_FORM_VIEW = ClassHelper.FILTER_DATATABLE(CURRENT_TBPMO_FORM_VIEW, "FORM_ID = " & ENTITY_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID, "") + CURRENT_ENTITYSTRING = DT_TBPMO_FORM_VIEW.Rows(0).Item("FORM_TITLE") 'ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & ENTITY_ID & " AND SCREEN_ID = " & CURRENT_SCREEN_ID, True) act_FormViewID = DT_TBPMO_FORM_VIEW.Rows(0).Item("GUID") @@ -3467,7 +3473,7 @@ Public Class frmConstructor_Main End If result = MessageBox.Show(stg, "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result = MsgBoxResult.Yes Then - Load_Datafor_Entity() + Load_Datafor_Entity(False) Else Me.Close() End If @@ -4203,7 +4209,7 @@ Public Class frmConstructor_Main grvwCarousel.OptionsView.ViewMode = DevExpress.XtraGrid.Views.Layout.LayoutViewMode.Carousel GridControlMain.MainView = grvwCarousel - Load_Datafor_Entity() + Load_Datafor_Entity(True) End Sub Private Sub ButtonQuickViewTiles_Click(sender As Object, e As EventArgs) Handles ButtonQuickViewTiles.Click @@ -4212,7 +4218,7 @@ Public Class frmConstructor_Main GRID_TYPE_ID = 1 GridControlMain.MainView = grvwTiles - Load_Datafor_Entity() + Load_Datafor_Entity(True) End Sub Private Sub ButtonDetailView_Click(sender As Object, e As EventArgs) Handles ButtonDetailView.Click @@ -4221,7 +4227,7 @@ Public Class frmConstructor_Main GRID_TYPE_ID = 3 GridControlMain.MainView = grvwGrid - Load_Datafor_Entity() + Load_Datafor_Entity(True) End Sub Private Sub ButtonSetViewAsDefault_Click(sender As Object, e As EventArgs) Handles ButtonSetViewAsDefault.Click @@ -5231,7 +5237,7 @@ Public Class frmConstructor_Main End If End Sub Private Sub DatenNeuLadenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DatenNeuLadenToolStripMenuItem.Click - Load_Datafor_Entity() + Load_Datafor_Entity(True) End Sub Private Sub grvwGrid_ColumnFilterChanged(sender As Object, e As EventArgs) Handles grvwGrid.ColumnFilterChanged SET_ROWCOUNT_STRING() @@ -5657,7 +5663,7 @@ Public Class frmConstructor_Main frmMass_Change.ShowDialog() If SUCCESSFULL = True Then Cursor = Cursors.WaitCursor - Load_Datafor_Entity() + Load_Datafor_Entity(True) Cursor = Cursors.Default End If Catch ex As Exception @@ -5665,12 +5671,7 @@ Public Class frmConstructor_Main End Try End Sub Private Sub GridViewDoc_Search_ColumnWidthChanged(sender As Object, e As ColumnEventArgs) Handles GridViewDoc_Search.ColumnWidthChanged - Try - - Catch ex As Exception - ClassLogger.Add(">> Unexpected Error in ColumnWidth-Change DocResult: " & ex.Message, False) - End Try - + Save_DocGrid_Layout() End Sub Private Sub UmbenennenToolStripMenuItem_MouseHover(sender As Object, e As EventArgs) Display_Filename() @@ -5702,7 +5703,18 @@ Public Class frmConstructor_Main End Sub Private Sub DateiMitDatensatzVerknüpfenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles docCM_linkRecord.Click - + Try + ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) + If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then + MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation) + Exit Sub + End If + Refresh_Selected_Table() + Dim frm As New frmDocRecordLink ' frmDocLink_Record_Entities() 'fileName, ClassWindreamDocGrid.RESULT_OBJECTTYPE) + frm.Show() + Catch ex As Exception + MsgBox("Unexpected Error in Linking Record: " & ex.Message, MsgBoxStyle.Critical) + End Try End Sub Private Sub DetailAnsichtDatensatzToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DetailAnsichtDatensatzToolStripMenuItem.Click @@ -6215,7 +6227,7 @@ Public Class frmConstructor_Main End If MsgBox(msg, MessageBoxIcon.Information) End If - Load_Datafor_Entity() + Load_Datafor_Entity(True) End If End If End If @@ -6385,7 +6397,7 @@ Public Class frmConstructor_Main ClassProxy.PRPROXY_SYNC_DETAIL_OBJECT("TBPMO_RECORD_VARIANT") ClassProxy.PRPROXY_SYNC_DETAIL_OBJECT("TBPMO_RECORD") Me.Cursor = Cursors.Default - Load_Datafor_Entity() + Load_Datafor_Entity(True) LocateRecordinGridById(CURRENT_RECORD_ID) End If Else @@ -6399,7 +6411,7 @@ Public Class frmConstructor_Main End Sub Private Sub tsbtnRefresh_Entity_Click(sender As Object, e As EventArgs) Handles tsbtnRefresh_Entity.Click - Refresh_Entity_Data() + Refresh_Entity_Data(True) End Sub Private Sub RecordDeleteToolStripMenuItem_Click(sender As Object, e As EventArgs) @@ -6490,7 +6502,7 @@ Public Class frmConstructor_Main tsbtnPanel1Collapse.Image = My.Resources.arrow_left End If End Sub - Private Sub CMSEntity_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles cmsTreeView.Opening + Private Sub cmsTreeView_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles cmsTreeView.Opening tsmiNodeDelete.Visible = False Dim control = Me.ActiveControl If Not IsNothing(control) Then @@ -6673,7 +6685,7 @@ Public Class frmConstructor_Main expression = "ENTITY_ID = " & ENTITY_ID & " AND GUID = " & CURRENT_NODE_CONFIGURABLE_ID Dim foundRowsLevel0() As DataRow ' Use the Select method to find all rows matching the filter. - foundRowsLevel0 = CURRENT_DT_NODE_CONFIGURABLE_NODES.Select(expression) + foundRowsLevel0 = NODE_CONFIGURABLE_NODES_DT.Select(expression) Dim i As Integer Dim RECORD_CREATE As Boolean ' For each row create a Node @@ -6763,7 +6775,7 @@ Public Class frmConstructor_Main Dim oDelete = String.Format("EXEC PRPMO_DELETE_NODE {0},'{1}'", NODE_GUID, USER_USERNAME) If ClassDatabase.Execute_non_Query(oDelete) Then TreeViewMain.Nodes.Remove(TreeViewMain.SelectedNode) - Refresh_Entity_Data() + Refresh_Entity_Data(True) End If End If End If @@ -7002,7 +7014,7 @@ Public Class frmConstructor_Main Private Sub frmConstructor_Main_KeyUp(sender As Object, e As KeyEventArgs) Handles MyBase.KeyUp If e.KeyCode = Keys.Control And e.KeyCode = Keys.R Then - Refresh_Entity_Data() + Refresh_Entity_Data(True) ElseIf e.KeyCode = Keys.Control And e.KeyCode = Keys.S Then Save_Record() If ERROR_WHILE_SAVING = True Then @@ -7110,36 +7122,9 @@ Public Class frmConstructor_Main End Sub End Class - Private Sub AusDieserEntitätToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AusDieserEntitätToolStripMenuItem.Click - Try - ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) - If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then - MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation) - Exit Sub - End If - Refresh_Selected_Table() - Dim frm As New frmDocRecordLink ' frmDocLink_Record_Entities() 'fileName, ClassWindreamDocGrid.RESULT_OBJECTTYPE) - frm.Show() - Catch ex As Exception - MsgBox("Unexpected Error in Linking Record: " & ex.Message, MsgBoxStyle.Critical) - End Try - End Sub + Private Sub AusDieserEntitätToolStripMenuItem_Click(sender As Object, e As EventArgs) - Private Sub AusAndererEntitätToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AusAndererEntitätToolStripMenuItem.Click - Try - ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search) - If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then - MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation) - Exit Sub - End If - Refresh_Selected_Table() - Dim frm As New frmDocLink_Record_Entities() 'fileName, ClassWindreamDocGrid.RESULT_OBJECTTYPE) - frm.Show() - Catch ex As Exception - MsgBox("Unexpected Error in Linking Record: " & ex.Message, MsgBoxStyle.Critical) - End Try End Sub - Private Sub tstxtRenameNode_KeyUp(sender As Object, e As KeyEventArgs) Handles tstxtRenameNode.KeyUp If e.KeyCode = Keys.Return Then Try @@ -7174,4 +7159,9 @@ Public Class frmConstructor_Main Me.tstxtRenameNode.Text = TreeViewMain.SelectedNode.Text End If End Sub + + Private Sub ToolStripMenuItem1_Click_1(sender As Object, e As EventArgs) Handles ToolStripMenuItem1.Click + Save_DocGrid_Layout() + End Sub + End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmDocRecordLink.Designer.vb b/app/DD-Record-Organizer/frmDocRecordLink.Designer.vb index a928caf..0437b9c 100644 --- a/app/DD-Record-Organizer/frmDocRecordLink.Designer.vb +++ b/app/DD-Record-Organizer/frmDocRecordLink.Designer.vb @@ -30,7 +30,11 @@ Partial Class frmDocRecordLink Me.grvwGrid = New DevExpress.XtraGrid.Views.Grid.GridView() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tsslbl = New System.Windows.Forms.ToolStripStatusLabel() - Me.Button1 = New System.Windows.Forms.Button() + Me.cmbConstructorForms = New System.Windows.Forms.ComboBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.btnloadData2Entity = New System.Windows.Forms.Button() + Me.Label2 = New System.Windows.Forms.Label() + Me.txtEntity = New System.Windows.Forms.TextBox() CType(Me.dgEntityRecords, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).BeginInit() Me.StatusStrip1.SuspendLayout() @@ -95,17 +99,46 @@ Partial Class frmDocRecordLink Me.tsslbl.Name = "tsslbl" resources.ApplyResources(Me.tsslbl, "tsslbl") ' - 'Button1 + 'cmbConstructorForms ' - resources.ApplyResources(Me.Button1, "Button1") - Me.Button1.Name = "Button1" - Me.Button1.UseVisualStyleBackColor = True + resources.ApplyResources(Me.cmbConstructorForms, "cmbConstructorForms") + Me.cmbConstructorForms.FormattingEnabled = True + Me.cmbConstructorForms.Name = "cmbConstructorForms" + ' + 'Label1 + ' + resources.ApplyResources(Me.Label1, "Label1") + Me.Label1.Name = "Label1" + ' + 'btnloadData2Entity + ' + resources.ApplyResources(Me.btnloadData2Entity, "btnloadData2Entity") + Me.btnloadData2Entity.Image = Global.DD_Record_Organizer.My.Resources.Resources.refresh_16xLG + Me.btnloadData2Entity.Name = "btnloadData2Entity" + Me.btnloadData2Entity.UseVisualStyleBackColor = True + ' + 'Label2 + ' + resources.ApplyResources(Me.Label2, "Label2") + Me.Label2.Name = "Label2" + ' + 'txtEntity + ' + Me.txtEntity.BackColor = System.Drawing.SystemColors.Control + resources.ApplyResources(Me.txtEntity, "txtEntity") + Me.txtEntity.Name = "txtEntity" + Me.txtEntity.ReadOnly = True ' 'frmDocRecordLink ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.Button1) + Me.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.Controls.Add(Me.txtEntity) + Me.Controls.Add(Me.Label2) + Me.Controls.Add(Me.btnloadData2Entity) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.cmbConstructorForms) Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.dgEntityRecords) Me.Controls.Add(Me.txtFileInfo) @@ -127,5 +160,9 @@ Partial Class frmDocRecordLink Friend WithEvents grvwGrid As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents StatusStrip1 As StatusStrip Friend WithEvents tsslbl As ToolStripStatusLabel - Friend WithEvents Button1 As Button + Friend WithEvents cmbConstructorForms As ComboBox + Friend WithEvents Label1 As Label + Friend WithEvents btnloadData2Entity As Button + Friend WithEvents Label2 As Label + Friend WithEvents txtEntity As TextBox End Class diff --git a/app/DD-Record-Organizer/frmDocRecordLink.resx b/app/DD-Record-Organizer/frmDocRecordLink.resx index 5b57f2c..6281b69 100644 --- a/app/DD-Record-Organizer/frmDocRecordLink.resx +++ b/app/DD-Record-Organizer/frmDocRecordLink.resx @@ -123,10 +123,10 @@ - 125, 6 + 142, 6 - 515, 21 + 537, 21 @@ -142,7 +142,7 @@ $this - 3 + 7 True @@ -175,7 +175,7 @@ $this - 4 + 8 Top, Right @@ -190,7 +190,7 @@ NoControl - 646, 3 + 685, 3 155, 23 @@ -214,13 +214,13 @@ $this - 5 + 9 Top, Bottom, Left, Right - 12, 33 + 12, 59 Aqua @@ -235,7 +235,7 @@ Yellow - 791, 377 + 830, 377 15 @@ -250,7 +250,7 @@ $this - 2 + 6 17, 17 @@ -262,10 +262,10 @@ Waiting for record-Selection..... - 0, 442 + 0, 480 - 815, 22 + 854, 22 16 @@ -283,30 +283,153 @@ $this - 1 + 5 - - 726, 416 + + Bottom, Left - - 75, 23 + + 144, 451 - + + 234, 21 + + 17 - - aus anderer Entität: + + cmbConstructorForms - - Button1 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + $this - + + 4 + + + Bottom, Left + + + True + + + Segoe UI, 8.25pt + + + NoControl + + + 9, 454 + + + 124, 13 + + + 18 + + + andere Entität wählen: + + + Label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + Bottom, Left + + + MiddleLeft + + + 384, 449 + + + 122, 23 + + + 19 + + + Datensätze laden + + + MiddleRight + + + btnloadData2Entity + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + True + + + Tahoma, 8.25pt, style=Bold, Italic + + + 12, 32 + + + 124, 13 + + + 20 + + + Ausgewählte Entität: + + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Tahoma, 8.25pt, style=Bold, Italic + + + 142, 29 + + + 259, 21 + + + 21 + + + txtEntity + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 @@ -316,7 +439,7 @@ 6, 13 - 815, 464 + 854, 502 Tahoma, 8.25pt @@ -1556,7 +1679,7 @@ - Datei mit Datensatz aus aktueller Entität verknüpfen + Datei mit Datensatz aus Entität verknüpfen grvwGrid diff --git a/app/DD-Record-Organizer/frmDocRecordLink.vb b/app/DD-Record-Organizer/frmDocRecordLink.vb index 0f65e6c..b1a6435 100644 --- a/app/DD-Record-Organizer/frmDocRecordLink.vb +++ b/app/DD-Record-Organizer/frmDocRecordLink.vb @@ -2,8 +2,59 @@ Imports System.Text Imports DD_LIB_Standards Public Class frmDocRecordLink + Dim ENTITY_LOAD_ACTIVE As Boolean = False + Private Class ClassEntity + Public title As String + Public id As Integer + Public Overrides Function ToString() As String + Return Me.title + End Function + End Class + Private Function GET_CURRENT_ENTITY_DATA() + Dim oDatatabel As DataTable = CURRENT_DT_ENTITY_RECORDS.Copy + Return oDatatabel + End Function + Sub Refresh_Grid_Data(current As Boolean, ENTITY_DATATABLE As DataTable, ENTITY_ID As Integer) + Dim DT_RECORDS As DataTable + If current = True Then + DT_RECORDS = GET_CURRENT_ENTITY_DATA() + Else + DT_RECORDS = ENTITY_DATATABLE + End If + + + Try + DT_RECORDS.Columns.Add("already linked", Type.GetType("System.Boolean")).SetOrdinal(0) + DT_RECORDS.Columns("already linked").DefaultValue = False + Catch ex As Exception + + End Try + + Try + For Each row As DataRow In CURRENT_DT_SELECTED_FILES.Rows + Dim DOC_ID = row.Item("DOC_ID") + Dim sel = String.Format("select T.RECORD_ID FROM TBPMO_DOC_RECORD_LINK T, TBPMO_RECORD T1 WHERE T.RECORD_ID = T1.GUID AND T1.FORM_ID = {0} AND T.DOC_ID = {1}", ENTITY_ID, DOC_ID) + Dim DTRECS_LINKED As DataTable = clsDatabase.Return_Datatable(sel) + For Each recrow As DataRow In DTRECS_LINKED.Rows + For Each rowrecsdisplay As DataRow In DT_RECORDS.Rows + If rowrecsdisplay.Item("Record-ID") = recrow.Item("RECORD_ID") Then + rowrecsdisplay.Item("already linked") = True + End If + Next + Next + Next + Catch ex As Exception + ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in displaying already linked", ex.Message, ex.StackTrace) + End Try + grvwGrid.Columns.Clear() + dgEntityRecords.DataSource = DT_RECORDS + grvwGrid.Columns.Item("already linked").Fixed = True + grvwGrid.PopulateColumns() + dgEntityRecords.RefreshDataSource() + End Sub Private Sub frmDocRecordLink_Load(sender As Object, e As EventArgs) Handles Me.Load + Me.txtEntity.Text = CURRENT_ENTITYSTRING If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then txtFileInfo.Text = ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DOC_PATH") Else @@ -13,38 +64,30 @@ Public Class frmDocRecordLink If IsNothing(CURRENT_DT_ENTITY_RECORDS) Then Me.Close() End If - Dim DT_RECORDS As DataTable = CURRENT_DT_ENTITY_RECORDS.Copy - Try - DT_RECORDS.Columns.Add("already linked", Type.GetType("System.Boolean")).SetOrdinal(0) - DT_RECORDS.Columns("already linked").DefaultValue = False - Catch ex As Exception + Refresh_Grid_Data(True, Nothing, CURRENT_ENTITY_ID) - End Try + Dim DT_ENTITIES As DataTable = GetENTITIES() + Dim selected As Integer = 0 - Try - For Each row As DataRow In CURRENT_DT_SELECTED_FILES.Rows - Dim DOC_ID = row.Item("DOC_ID") - Dim sel = String.Format("select T.RECORD_ID FROM TBPMO_DOC_RECORD_LINK T, TBPMO_RECORD T1 WHERE T.RECORD_ID = T1.GUID AND T1.FORM_ID = {0} AND T.DOC_ID = {1}", CURRENT_ENTITY_ID, DOC_ID) - Dim DTRECS_LINKED As DataTable = clsDatabase.Return_Datatable(sel) - For Each recrow As DataRow In DTRECS_LINKED.Rows - For Each rowrecsdisplay As DataRow In DT_RECORDS.Rows - If rowrecsdisplay.Item("Record-ID") = recrow.Item("RECORD_ID") Then - rowrecsdisplay.Item("already linked") = True - End If - Next - Next - Next - Catch ex As Exception - ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in displaying already linked", ex.Message, ex.StackTrace) - End Try + If DT_ENTITIES.Rows.Count = 0 Then + Exit Sub + End If - dgEntityRecords.DataSource = DT_RECORDS - grvwGrid.Columns.Item("already linked").Fixed = True - grvwGrid.PopulateColumns() + For Each row As DataRow In DT_ENTITIES.Rows + Dim entity As New ClassEntity + entity.title = row.Item("FORM_TITLE") + entity.id = row.Item("FORM_ID") + cmbConstructorForms.Items.Add(entity) + Next + If USER_LANGUAGE = "de-DE" Then + Me.Text = CURRENT_DT_SELECTED_FILES.Rows.Count.ToString & " Datei(en) mit Datensatz verknüpfen:" + Else + Me.Text = "Link " & CURRENT_DT_SELECTED_FILES.Rows.Count.ToString & " files with record:" + End If + ' Den index der aktuell geöffneten ConstructorForm setzen + cmbConstructorForms.SelectedIndex = selected - - dgEntityRecords.RefreshDataSource() Catch ex As Exception ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in frmDocRecordLink_Load", ex.Message, ex.StackTrace) End Try @@ -53,6 +96,17 @@ Public Class frmDocRecordLink tsslbl.Text = "Waiting for record-Selection....." tsslbl.BackColor = Color.Transparent End Sub + Private Function GetENTITIES() As DataTable + Try + Dim SQL As String = String.Format("SELECT DISTINCT FORM_ID,FORM_TITLE,SEQUENCE FROM VWPMO_CONSTRUCTOR_FORMS where CONSTRUCT_ID in " & +"(SELECT CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE USER_ID = {0}) ORDER BY SEQUENCE", USER_GUID) + Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL) + Return dt + Catch ex As Exception + MsgBox("Entities could not be loaded in LinkToRecord: " & vbNewLine & ex.Message) + Return Nothing + End Try + End Function Private Sub btnLink_Click(sender As Object, e As EventArgs) Handles btnLink.Click If clsWindream.Create_Session = False Then @@ -163,6 +217,26 @@ Public Class frmDocRecordLink Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename) End Function Private Sub frmDocRecordLink_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing - Save_DocGrid_Layout() + If ENTITY_LOAD_ACTIVE = False Then Save_DocGrid_Layout() + End Sub + + Private Sub btnloadData2Entity_Click(sender As Object, e As EventArgs) Handles btnloadData2Entity.Click + Dim entity As ClassEntity = DirectCast(cmbConstructorForms.SelectedItem, ClassEntity) + If cmbConstructorForms.SelectedIndex <> -1 Then + ENTITY_LOAD_ACTIVE = True + Save_DocGrid_Layout() + Dim ResultSQL, ResultViewName As String + If LogErrorsOnly = False Then ClassLogger.Add(" >> GridType = Grid", False) + ResultViewName = $"VWPMO_ENTITY_TABLE{entity.id}" + ResultSQL = $"SELECT T.* FROM {ResultViewName} T" + txtEntity.Text = cmbConstructorForms.Text + + Me.Cursor = Cursors.WaitCursor + Dim DT_RESULT = clsDatabase.Return_Datatable(ResultSQL, True) + If Not IsNothing(DT_RESULT) Then + Refresh_Grid_Data(False, DT_RESULT, entity.id) + End If + Me.Cursor = Cursors.Default + End If End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmMain.vb b/app/DD-Record-Organizer/frmMain.vb index 87ff8fe..71548a8 100644 --- a/app/DD-Record-Organizer/frmMain.vb +++ b/app/DD-Record-Organizer/frmMain.vb @@ -1017,35 +1017,35 @@ Public Class frmMain Dim drActive As DataRow() = dt2.Select("ACTIVE = 1") Dim drInActive As DataRow() = dt2.Select("ACTIVE = 0") Dim name = "" - Dim sqlcon = "" - Dim sqlcon_Proxy = "" - Dim WM_ALIAS = "" - Dim INACTIVE_GUID - Dim ACTIVE_GUID + Dim oSqlcon = "" + Dim oSqlcon_Proxy = "" + Dim oWM_ALIAS = "" + Dim oINACTIVE_GUID + Dim oACTIVE_GUID For Each row As DataRow In drInActive - INACTIVE_GUID = row.Item("GUID") + oINACTIVE_GUID = row.Item("GUID") name = row.Item("DESCRIPTION") - sqlcon = row.Item("SQL_CONNECTION") - sqlcon_Proxy = row.Item("SQL_CONNECTION_PROXY") - WM_ALIAS = row.Item("WM_ALIAS") + oSqlcon = row.Item("SQL_CONNECTION") + oSqlcon_Proxy = row.Item("SQL_CONNECTION_PROXY") + oWM_ALIAS = row.Item("WM_ALIAS") Next For Each row As DataRow In drActive - ACTIVE_GUID = row.Item("GUID") + oACTIVE_GUID = row.Item("GUID") Next If name <> "" Then - Dim result As MsgBoxResult + Dim oresult As MsgBoxResult Dim msg = "Wollen Sie die Verbindungs-Konfiguration nun auf '" & name & "' ändern?" If USER_LANGUAGE <> "de-DE" Then msg = "Would You like to change the Connection-configuration to '" & name & "'?" End If - result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) - If result = MsgBoxResult.Yes Then + oresult = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + If oresult = MsgBoxResult.Yes Then BarButtonItemSwitchCon.Caption = "Switch Connection to: " & name Try - My.Computer.Registry.SetValue("HKEY_CURRENT_USER\Software\A.I.S. GmbH\windream\3.6\ServerShareSelector", "CurrentAlias", WM_ALIAS) - My.Computer.Registry.SetValue("HKEY_CURRENT_USER\Software\A.I.S. GmbH\windream\3.6\ServerShareSelector", "VFSAlias", WM_ALIAS) + My.Computer.Registry.SetValue("HKEY_CURRENT_USER\Software\A.I.S. GmbH\windream\3.6\ServerShareSelector", "CurrentAlias", oWM_ALIAS) + My.Computer.Registry.SetValue("HKEY_CURRENT_USER\Software\A.I.S. GmbH\windream\3.6\ServerShareSelector", "VFSAlias", oWM_ALIAS) Catch ex As Exception ClassLogger.Add("Unexpected error in Changing WMAlias: " & ex.Message, True) Exit Sub @@ -1067,12 +1067,15 @@ Public Class frmMain Exit Sub End Try - SaveMySettingsValue("MyConnectionString", sqlcon, "ConfigMain") + SaveMySettingsValue("MyConnectionString", oSqlcon, "ConfigMain") + MyConnectionString = oSqlcon + Display_ConString() - If sqlcon_Proxy <> String.Empty Then - SaveMySettingsValue("MyProxyConnectionString", sqlcon_Proxy, "ConfigMain") + If oSqlcon_Proxy <> String.Empty Then + SaveMySettingsValue("MyProxyConnectionString", oSqlcon_Proxy, "ConfigMain") + ClassProxy.MyPROXYConnectionString = oSqlcon_Proxy End If - Dim sql = String.Format("UPDATE TBPMO_CLIENT_CONN_SWITCH_USER SET ACTIVE = 1 WHERE GUID = {0}", INACTIVE_GUID) + Dim sql = String.Format("UPDATE TBPMO_CLIENT_CONN_SWITCH_USER SET ACTIVE = 1 WHERE GUID = {0}", oINACTIVE_GUID) ClassDatabase.Execute_Scalar(sql) If ClassInit.InitDatabase = True Then ClassInit.InitUserLogin() diff --git a/app/DD-Record-Organizer/frmRight_Management.Designer.vb b/app/DD-Record-Organizer/frmRight_Management.Designer.vb index 7aef3aa..05caab9 100644 --- a/app/DD-Record-Organizer/frmRight_Management.Designer.vb +++ b/app/DD-Record-Organizer/frmRight_Management.Designer.vb @@ -42,22 +42,9 @@ Partial Class frmRight_Management Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton() Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton() Me.TBPMO_RIGHT_GROUPDataGridView = New System.Windows.Forms.DataGridView() - Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewComboBoxColumn() Me.TBWH_ENTITIESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DD_ECMAdmin = New DD_Record_Organizer.DD_ECMAdmin() - Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewComboBoxColumn() Me.TBDD_USER_GROUPSBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.DataGridViewCheckBoxColumn1 = New System.Windows.Forms.DataGridViewCheckBoxColumn() - Me.DataGridViewCheckBoxColumn2 = New System.Windows.Forms.DataGridViewCheckBoxColumn() - Me.DataGridViewCheckBoxColumn3 = New System.Windows.Forms.DataGridViewCheckBoxColumn() - Me.DataGridViewCheckBoxColumn4 = New System.Windows.Forms.DataGridViewCheckBoxColumn() - Me.DataGridViewCheckBoxColumn5 = New System.Windows.Forms.DataGridViewCheckBoxColumn() - Me.DataGridViewCheckBoxColumn6 = New System.Windows.Forms.DataGridViewCheckBoxColumn() - Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn6 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn7 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tschangedlabel = New System.Windows.Forms.ToolStripStatusLabel() Me.statelbl = New System.Windows.Forms.ToolStripStatusLabel() @@ -116,6 +103,21 @@ Partial Class frmRight_Management Me.TBPMO_RIGHT_GROUPTableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_RIGHT_GROUPTableAdapter() Me.TBDD_USERTableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBDD_USERTableAdapter() Me.USER_RIGHTSTableAdapter = New DD_Record_Organizer.DD_ECMAdminTableAdapters.USER_RIGHTSTableAdapter() + Me.TBDD_GROUPSBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TBDD_GROUPSTableAdapter = New DD_Record_Organizer.DD_ECMAdminTableAdapters.TBDD_GROUPSTableAdapter() + Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewComboBoxColumn() + Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewComboBoxColumn() + Me.DataGridViewCheckBoxColumn1 = New System.Windows.Forms.DataGridViewCheckBoxColumn() + Me.DataGridViewCheckBoxColumn2 = New System.Windows.Forms.DataGridViewCheckBoxColumn() + Me.DataGridViewCheckBoxColumn3 = New System.Windows.Forms.DataGridViewCheckBoxColumn() + Me.DataGridViewCheckBoxColumn4 = New System.Windows.Forms.DataGridViewCheckBoxColumn() + Me.DataGridViewCheckBoxColumn5 = New System.Windows.Forms.DataGridViewCheckBoxColumn() + Me.DataGridViewCheckBoxColumn6 = New System.Windows.Forms.DataGridViewCheckBoxColumn() + Me.DataGridViewTextBoxColumn4 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn5 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn6 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn7 = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).BeginInit() Me.BindingNavigator1.SuspendLayout() CType(Me.TBPMO_RIGHT_GROUPBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -138,6 +140,7 @@ Partial Class frmRight_Management CType(Me.USER_RIGHTSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBWH_USER_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TBDD_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'BindingNavigator1 @@ -252,24 +255,6 @@ Partial Class frmRight_Management Me.TBPMO_RIGHT_GROUPDataGridView.DataSource = Me.TBPMO_RIGHT_GROUPBindingSource Me.TBPMO_RIGHT_GROUPDataGridView.Name = "TBPMO_RIGHT_GROUPDataGridView" ' - 'DataGridViewTextBoxColumn1 - ' - Me.DataGridViewTextBoxColumn1.DataPropertyName = "GUID" - resources.ApplyResources(Me.DataGridViewTextBoxColumn1, "DataGridViewTextBoxColumn1") - Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" - Me.DataGridViewTextBoxColumn1.ReadOnly = True - ' - 'DataGridViewTextBoxColumn2 - ' - Me.DataGridViewTextBoxColumn2.DataPropertyName = "ENTITY_ID" - Me.DataGridViewTextBoxColumn2.DataSource = Me.TBWH_ENTITIESBindingSource - Me.DataGridViewTextBoxColumn2.DisplayMember = "CAPTION" - resources.ApplyResources(Me.DataGridViewTextBoxColumn2, "DataGridViewTextBoxColumn2") - Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" - Me.DataGridViewTextBoxColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic - Me.DataGridViewTextBoxColumn2.ValueMember = "GUID" - ' 'TBWH_ENTITIESBindingSource ' Me.TBWH_ENTITIESBindingSource.DataMember = "TBWH_ENTITIES" @@ -280,82 +265,11 @@ Partial Class frmRight_Management Me.DD_ECMAdmin.DataSetName = "DD_ECMAdmin" Me.DD_ECMAdmin.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' - 'DataGridViewTextBoxColumn3 - ' - Me.DataGridViewTextBoxColumn3.DataPropertyName = "GROUP_ID" - Me.DataGridViewTextBoxColumn3.DataSource = Me.TBDD_USER_GROUPSBindingSource - Me.DataGridViewTextBoxColumn3.DisplayMember = "NAME" - resources.ApplyResources(Me.DataGridViewTextBoxColumn3, "DataGridViewTextBoxColumn3") - Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3" - Me.DataGridViewTextBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic - Me.DataGridViewTextBoxColumn3.ValueMember = "GUID" - ' 'TBDD_USER_GROUPSBindingSource ' Me.TBDD_USER_GROUPSBindingSource.DataMember = "TBDD_USER_GROUPS" Me.TBDD_USER_GROUPSBindingSource.DataSource = Me.DD_DMSDataSet ' - 'DataGridViewCheckBoxColumn1 - ' - Me.DataGridViewCheckBoxColumn1.DataPropertyName = "EDIT_REC" - resources.ApplyResources(Me.DataGridViewCheckBoxColumn1, "DataGridViewCheckBoxColumn1") - Me.DataGridViewCheckBoxColumn1.Name = "DataGridViewCheckBoxColumn1" - ' - 'DataGridViewCheckBoxColumn2 - ' - Me.DataGridViewCheckBoxColumn2.DataPropertyName = "ADD_REC" - resources.ApplyResources(Me.DataGridViewCheckBoxColumn2, "DataGridViewCheckBoxColumn2") - Me.DataGridViewCheckBoxColumn2.Name = "DataGridViewCheckBoxColumn2" - ' - 'DataGridViewCheckBoxColumn3 - ' - Me.DataGridViewCheckBoxColumn3.DataPropertyName = "DELETE_REC" - resources.ApplyResources(Me.DataGridViewCheckBoxColumn3, "DataGridViewCheckBoxColumn3") - Me.DataGridViewCheckBoxColumn3.Name = "DataGridViewCheckBoxColumn3" - ' - 'DataGridViewCheckBoxColumn4 - ' - Me.DataGridViewCheckBoxColumn4.DataPropertyName = "ADD_DOC" - resources.ApplyResources(Me.DataGridViewCheckBoxColumn4, "DataGridViewCheckBoxColumn4") - Me.DataGridViewCheckBoxColumn4.Name = "DataGridViewCheckBoxColumn4" - ' - 'DataGridViewCheckBoxColumn5 - ' - Me.DataGridViewCheckBoxColumn5.DataPropertyName = "VIEW_DOC" - resources.ApplyResources(Me.DataGridViewCheckBoxColumn5, "DataGridViewCheckBoxColumn5") - Me.DataGridViewCheckBoxColumn5.Name = "DataGridViewCheckBoxColumn5" - ' - 'DataGridViewCheckBoxColumn6 - ' - Me.DataGridViewCheckBoxColumn6.DataPropertyName = "DELETE_DOC" - resources.ApplyResources(Me.DataGridViewCheckBoxColumn6, "DataGridViewCheckBoxColumn6") - Me.DataGridViewCheckBoxColumn6.Name = "DataGridViewCheckBoxColumn6" - ' - 'DataGridViewTextBoxColumn4 - ' - Me.DataGridViewTextBoxColumn4.DataPropertyName = "ADDED_WHO" - resources.ApplyResources(Me.DataGridViewTextBoxColumn4, "DataGridViewTextBoxColumn4") - Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4" - ' - 'DataGridViewTextBoxColumn5 - ' - Me.DataGridViewTextBoxColumn5.DataPropertyName = "ADDED_WHEN" - resources.ApplyResources(Me.DataGridViewTextBoxColumn5, "DataGridViewTextBoxColumn5") - Me.DataGridViewTextBoxColumn5.Name = "DataGridViewTextBoxColumn5" - ' - 'DataGridViewTextBoxColumn6 - ' - Me.DataGridViewTextBoxColumn6.DataPropertyName = "CHANGED_WHO" - resources.ApplyResources(Me.DataGridViewTextBoxColumn6, "DataGridViewTextBoxColumn6") - Me.DataGridViewTextBoxColumn6.Name = "DataGridViewTextBoxColumn6" - ' - 'DataGridViewTextBoxColumn7 - ' - Me.DataGridViewTextBoxColumn7.DataPropertyName = "CHANGED_WHEN" - resources.ApplyResources(Me.DataGridViewTextBoxColumn7, "DataGridViewTextBoxColumn7") - Me.DataGridViewTextBoxColumn7.Name = "DataGridViewTextBoxColumn7" - ' 'StatusStrip1 ' Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tschangedlabel, Me.statelbl}) @@ -705,9 +619,12 @@ Partial Class frmRight_Management Me.TableAdapterManager1.BackupDataSetBeforeUpdate = False Me.TableAdapterManager1.Connection = Nothing Me.TableAdapterManager1.TBDD_CONNECTIONTableAdapter = Nothing + Me.TableAdapterManager1.TBDD_GROUPSTableAdapter = Nothing + Me.TableAdapterManager1.TBPMO_DOCRESULT_DROPDOWN_ITEMSTableAdapter = Nothing Me.TableAdapterManager1.TBPMO_DOCSEARCH_RESULTLIST_CONFIGTableAdapter = Nothing Me.TableAdapterManager1.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = Nothing Me.TableAdapterManager1.TBPMO_FORM_CONSTRUCTORTableAdapter = Nothing + Me.TableAdapterManager1.TBPMO_LOG_ESSENTIALSTableAdapter = Nothing Me.TableAdapterManager1.TBPMO_SAP_FUBATableAdapter = Nothing Me.TableAdapterManager1.UpdateOrder = DD_Record_Organizer.DD_ECMAdminTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' @@ -777,6 +694,104 @@ Partial Class frmRight_Management ' Me.USER_RIGHTSTableAdapter.ClearBeforeFill = True ' + 'TBDD_GROUPSBindingSource + ' + Me.TBDD_GROUPSBindingSource.DataMember = "TBDD_GROUPS" + Me.TBDD_GROUPSBindingSource.DataSource = Me.DD_ECMAdmin + ' + 'TBDD_GROUPSTableAdapter + ' + Me.TBDD_GROUPSTableAdapter.ClearBeforeFill = True + ' + 'DataGridViewTextBoxColumn1 + ' + Me.DataGridViewTextBoxColumn1.DataPropertyName = "GUID" + resources.ApplyResources(Me.DataGridViewTextBoxColumn1, "DataGridViewTextBoxColumn1") + Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" + Me.DataGridViewTextBoxColumn1.ReadOnly = True + ' + 'DataGridViewTextBoxColumn2 + ' + Me.DataGridViewTextBoxColumn2.DataPropertyName = "ENTITY_ID" + Me.DataGridViewTextBoxColumn2.DataSource = Me.TBWH_ENTITIESBindingSource + Me.DataGridViewTextBoxColumn2.DisplayMember = "CAPTION" + resources.ApplyResources(Me.DataGridViewTextBoxColumn2, "DataGridViewTextBoxColumn2") + Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" + Me.DataGridViewTextBoxColumn2.Resizable = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic + Me.DataGridViewTextBoxColumn2.ValueMember = "GUID" + ' + 'DataGridViewTextBoxColumn3 + ' + Me.DataGridViewTextBoxColumn3.DataPropertyName = "GROUP_ID" + Me.DataGridViewTextBoxColumn3.DataSource = Me.TBDD_GROUPSBindingSource + Me.DataGridViewTextBoxColumn3.DisplayMember = "NAME" + resources.ApplyResources(Me.DataGridViewTextBoxColumn3, "DataGridViewTextBoxColumn3") + Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3" + Me.DataGridViewTextBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic + Me.DataGridViewTextBoxColumn3.ValueMember = "GUID" + ' + 'DataGridViewCheckBoxColumn1 + ' + Me.DataGridViewCheckBoxColumn1.DataPropertyName = "EDIT_REC" + resources.ApplyResources(Me.DataGridViewCheckBoxColumn1, "DataGridViewCheckBoxColumn1") + Me.DataGridViewCheckBoxColumn1.Name = "DataGridViewCheckBoxColumn1" + ' + 'DataGridViewCheckBoxColumn2 + ' + Me.DataGridViewCheckBoxColumn2.DataPropertyName = "ADD_REC" + resources.ApplyResources(Me.DataGridViewCheckBoxColumn2, "DataGridViewCheckBoxColumn2") + Me.DataGridViewCheckBoxColumn2.Name = "DataGridViewCheckBoxColumn2" + ' + 'DataGridViewCheckBoxColumn3 + ' + Me.DataGridViewCheckBoxColumn3.DataPropertyName = "DELETE_REC" + resources.ApplyResources(Me.DataGridViewCheckBoxColumn3, "DataGridViewCheckBoxColumn3") + Me.DataGridViewCheckBoxColumn3.Name = "DataGridViewCheckBoxColumn3" + ' + 'DataGridViewCheckBoxColumn4 + ' + Me.DataGridViewCheckBoxColumn4.DataPropertyName = "ADD_DOC" + resources.ApplyResources(Me.DataGridViewCheckBoxColumn4, "DataGridViewCheckBoxColumn4") + Me.DataGridViewCheckBoxColumn4.Name = "DataGridViewCheckBoxColumn4" + ' + 'DataGridViewCheckBoxColumn5 + ' + Me.DataGridViewCheckBoxColumn5.DataPropertyName = "VIEW_DOC" + resources.ApplyResources(Me.DataGridViewCheckBoxColumn5, "DataGridViewCheckBoxColumn5") + Me.DataGridViewCheckBoxColumn5.Name = "DataGridViewCheckBoxColumn5" + ' + 'DataGridViewCheckBoxColumn6 + ' + Me.DataGridViewCheckBoxColumn6.DataPropertyName = "DELETE_DOC" + resources.ApplyResources(Me.DataGridViewCheckBoxColumn6, "DataGridViewCheckBoxColumn6") + Me.DataGridViewCheckBoxColumn6.Name = "DataGridViewCheckBoxColumn6" + ' + 'DataGridViewTextBoxColumn4 + ' + Me.DataGridViewTextBoxColumn4.DataPropertyName = "ADDED_WHO" + resources.ApplyResources(Me.DataGridViewTextBoxColumn4, "DataGridViewTextBoxColumn4") + Me.DataGridViewTextBoxColumn4.Name = "DataGridViewTextBoxColumn4" + ' + 'DataGridViewTextBoxColumn5 + ' + Me.DataGridViewTextBoxColumn5.DataPropertyName = "ADDED_WHEN" + resources.ApplyResources(Me.DataGridViewTextBoxColumn5, "DataGridViewTextBoxColumn5") + Me.DataGridViewTextBoxColumn5.Name = "DataGridViewTextBoxColumn5" + ' + 'DataGridViewTextBoxColumn6 + ' + Me.DataGridViewTextBoxColumn6.DataPropertyName = "CHANGED_WHO" + resources.ApplyResources(Me.DataGridViewTextBoxColumn6, "DataGridViewTextBoxColumn6") + Me.DataGridViewTextBoxColumn6.Name = "DataGridViewTextBoxColumn6" + ' + 'DataGridViewTextBoxColumn7 + ' + Me.DataGridViewTextBoxColumn7.DataPropertyName = "CHANGED_WHEN" + resources.ApplyResources(Me.DataGridViewTextBoxColumn7, "DataGridViewTextBoxColumn7") + Me.DataGridViewTextBoxColumn7.Name = "DataGridViewTextBoxColumn7" + ' 'frmRight_Management ' resources.ApplyResources(Me, "$this") @@ -811,6 +826,7 @@ Partial Class frmRight_Management CType(Me.USER_RIGHTSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBWH_USER_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TBDD_GROUPSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -847,19 +863,6 @@ Partial Class frmRight_Management Friend WithEvents TabPage2 As System.Windows.Forms.TabPage Friend WithEvents tschangedlabel As System.Windows.Forms.ToolStripStatusLabel Friend WithEvents ToolStripButton2 As System.Windows.Forms.ToolStripButton - Friend WithEvents DataGridViewTextBoxColumn1 As System.Windows.Forms.DataGridViewTextBoxColumn - Friend WithEvents DataGridViewTextBoxColumn2 As System.Windows.Forms.DataGridViewComboBoxColumn - Friend WithEvents DataGridViewTextBoxColumn3 As System.Windows.Forms.DataGridViewComboBoxColumn - Friend WithEvents DataGridViewCheckBoxColumn1 As System.Windows.Forms.DataGridViewCheckBoxColumn - Friend WithEvents DataGridViewCheckBoxColumn2 As System.Windows.Forms.DataGridViewCheckBoxColumn - Friend WithEvents DataGridViewCheckBoxColumn3 As System.Windows.Forms.DataGridViewCheckBoxColumn - Friend WithEvents DataGridViewCheckBoxColumn4 As System.Windows.Forms.DataGridViewCheckBoxColumn - Friend WithEvents DataGridViewCheckBoxColumn5 As System.Windows.Forms.DataGridViewCheckBoxColumn - Friend WithEvents DataGridViewCheckBoxColumn6 As System.Windows.Forms.DataGridViewCheckBoxColumn - Friend WithEvents DataGridViewTextBoxColumn4 As System.Windows.Forms.DataGridViewTextBoxColumn - Friend WithEvents DataGridViewTextBoxColumn5 As System.Windows.Forms.DataGridViewTextBoxColumn - Friend WithEvents DataGridViewTextBoxColumn6 As System.Windows.Forms.DataGridViewTextBoxColumn - Friend WithEvents DataGridViewTextBoxColumn7 As System.Windows.Forms.DataGridViewTextBoxColumn Friend WithEvents BindingNavigator2 As System.Windows.Forms.BindingNavigator Friend WithEvents BindingNavigatorCountItem1 As System.Windows.Forms.ToolStripLabel Friend WithEvents BindingNavigatorMoveFirstItem1 As System.Windows.Forms.ToolStripButton @@ -907,4 +910,19 @@ Partial Class frmRight_Management Friend WithEvents Label2 As System.Windows.Forms.Label Friend WithEvents btndeleteUserRight As System.Windows.Forms.Button Friend WithEvents statelbl As System.Windows.Forms.ToolStripStatusLabel + Friend WithEvents TBDD_GROUPSBindingSource As BindingSource + Friend WithEvents TBDD_GROUPSTableAdapter As DD_ECMAdminTableAdapters.TBDD_GROUPSTableAdapter + Friend WithEvents DataGridViewTextBoxColumn1 As DataGridViewTextBoxColumn + Friend WithEvents DataGridViewTextBoxColumn2 As DataGridViewComboBoxColumn + Friend WithEvents DataGridViewTextBoxColumn3 As DataGridViewComboBoxColumn + Friend WithEvents DataGridViewCheckBoxColumn1 As DataGridViewCheckBoxColumn + Friend WithEvents DataGridViewCheckBoxColumn2 As DataGridViewCheckBoxColumn + Friend WithEvents DataGridViewCheckBoxColumn3 As DataGridViewCheckBoxColumn + Friend WithEvents DataGridViewCheckBoxColumn4 As DataGridViewCheckBoxColumn + Friend WithEvents DataGridViewCheckBoxColumn5 As DataGridViewCheckBoxColumn + Friend WithEvents DataGridViewCheckBoxColumn6 As DataGridViewCheckBoxColumn + Friend WithEvents DataGridViewTextBoxColumn4 As DataGridViewTextBoxColumn + Friend WithEvents DataGridViewTextBoxColumn5 As DataGridViewTextBoxColumn + Friend WithEvents DataGridViewTextBoxColumn6 As DataGridViewTextBoxColumn + Friend WithEvents DataGridViewTextBoxColumn7 As DataGridViewTextBoxColumn End Class diff --git a/app/DD-Record-Organizer/frmRight_Management.resx b/app/DD-Record-Organizer/frmRight_Management.resx index 6e55ea2..8b1b892 100644 --- a/app/DD-Record-Organizer/frmRight_Management.resx +++ b/app/DD-Record-Organizer/frmRight_Management.resx @@ -343,8 +343,8 @@ 150 - - 160, 17 + + 1155, 95 Gruppe @@ -421,6 +421,9 @@ 1 + + 160, 17 + 1256, 56 @@ -726,7 +729,7 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende GridControlUsers2Menue - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TabPage2 @@ -954,7 +957,7 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende GridControl1 - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a TabPage2 @@ -1194,6 +1197,9 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende 955, 95 + + 17, 134 + True @@ -1261,7 +1267,7 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende DD_DMSDataSet - DD_Record_Organizer.DD_DMSDataSet, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSet, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null BindingNavigatorCountItem @@ -1335,18 +1341,6 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - DataGridViewTextBoxColumn1 - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewTextBoxColumn2 - - - System.Windows.Forms.DataGridViewComboBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TBWH_ENTITIESBindingSource @@ -1357,13 +1351,7 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende DD_ECMAdmin - DD_Record_Organizer.DD_ECMAdmin, DD_ECMAdmin.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - DataGridViewTextBoxColumn3 - - - System.Windows.Forms.DataGridViewComboBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + DD_Record_Organizer.DD_ECMAdmin, DD_ECMAdmin.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_USER_GROUPSBindingSource @@ -1371,66 +1359,6 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - DataGridViewCheckBoxColumn1 - - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewCheckBoxColumn2 - - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewCheckBoxColumn3 - - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewCheckBoxColumn4 - - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewCheckBoxColumn5 - - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewCheckBoxColumn6 - - - System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewTextBoxColumn4 - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewTextBoxColumn5 - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewTextBoxColumn6 - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - DataGridViewTextBoxColumn7 - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - tschangedlabel @@ -1453,127 +1381,127 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende GridViewlUsers2Menue - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colSelect - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colSurname - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn2 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn3 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colID - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridView1 - DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colGUID - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colFORM_TITLE - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colUSERNAME - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colNAME - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colPRENAME - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colEDIT_REC - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colADD_REC - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colDELETE_REC - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colADD_DOC - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colREAD_ONLY_DOC - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colDELETE_DOC - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a GridColumn1 - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colADDED_WHEN - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colCHANGED_WHEN - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a USER_RIGHTSBindingSource @@ -1651,13 +1579,13 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende TBWH_ENTITIESTableAdapter - DD_Record_Organizer.DD_ECMAdminTableAdapters.TBWH_ENTITIESTableAdapter, DD_ECMAdmin.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_ECMAdminTableAdapters.TBWH_ENTITIESTableAdapter, DD_ECMAdmin.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TableAdapterManager1 - DD_Record_Organizer.DD_ECMAdminTableAdapters.TableAdapterManager, DD_ECMAdmin.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_ECMAdminTableAdapters.TableAdapterManager, DD_ECMAdmin.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBWH_USER_GROUPSBindingSource @@ -1669,37 +1597,127 @@ Des Weiteren werden die Rechte für die Zugriffsrechte auf die Dateien angewende TBWH_USER_GROUPSTableAdapter - DD_Record_Organizer.DD_ECMAdminTableAdapters.TBWH_USER_GROUPSTableAdapter, DD_ECMAdmin.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_ECMAdminTableAdapters.TBWH_USER_GROUPSTableAdapter, DD_ECMAdmin.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_USER_GROUPSTableAdapter - DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBDD_USER_GROUPSTableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBDD_USER_GROUPSTableAdapter, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TableAdapterManager - DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBPMO_RIGHT_GROUPTableAdapter - DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_RIGHT_GROUPTableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_RIGHT_GROUPTableAdapter, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null TBDD_USERTableAdapter - DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBDD_USERTableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBDD_USERTableAdapter, DD_DMSDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null USER_RIGHTSTableAdapter - DD_Record_Organizer.DD_ECMAdminTableAdapters.USER_RIGHTSTableAdapter, DD_ECMAdmin.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + DD_Record_Organizer.DD_ECMAdminTableAdapters.USER_RIGHTSTableAdapter, DD_ECMAdmin.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + + TBDD_GROUPSBindingSource + + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + TBDD_GROUPSTableAdapter + + + DD_Record_Organizer.DD_ECMAdminTableAdapters.TBDD_GROUPSTableAdapter, DD_ECMAdmin.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + + DataGridViewTextBoxColumn1 + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewTextBoxColumn2 + + + System.Windows.Forms.DataGridViewComboBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewTextBoxColumn3 + + + System.Windows.Forms.DataGridViewComboBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewCheckBoxColumn1 + + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewCheckBoxColumn2 + + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewCheckBoxColumn3 + + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewCheckBoxColumn4 + + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewCheckBoxColumn5 + + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewCheckBoxColumn6 + + + System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewTextBoxColumn4 + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewTextBoxColumn5 + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewTextBoxColumn6 + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DataGridViewTextBoxColumn7 + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 frmRight_Management diff --git a/app/DD-Record-Organizer/frmRight_Management.vb b/app/DD-Record-Organizer/frmRight_Management.vb index 2968397..bd32717 100644 --- a/app/DD-Record-Organizer/frmRight_Management.vb +++ b/app/DD-Record-Organizer/frmRight_Management.vb @@ -86,12 +86,16 @@ 'Save_Datagrid(TBPMO_RIGHT_USERDataGridView, "TBPMO_RIGHT_USERDataGridView") End Sub Private Sub frmGroup_Rights_Load(sender As Object, e As EventArgs) Handles MyBase.Load + 'TODO: Diese Codezeile lädt Daten in die Tabelle "DD_ECMAdmin.TBDD_GROUPS". Sie können sie bei Bedarf verschieben oder entfernen. + Refresh_Entities() Try Me.TBWH_USER_GROUPSTableAdapter.Connection.ConnectionString = MyConnectionString Me.TBWH_USER_GROUPSTableAdapter.Fill(Me.DD_ECMAdmin.TBWH_USER_GROUPS) Me.TBDD_USER_GROUPSTableAdapter.Connection.ConnectionString = MyConnectionString Me.TBDD_USER_GROUPSTableAdapter.Fill(Me.DD_DMSDataSet.TBDD_USER_GROUPS) + Me.TBDD_GROUPSTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBDD_GROUPSTableAdapter.Fill(Me.DD_ECMAdmin.TBDD_GROUPS) Me.TBDD_USERTableAdapter.Connection.ConnectionString = MyConnectionString Me.TBDD_USERTableAdapter.Fill(Me.DD_DMSDataSet.TBDD_USER) Catch ex As Exception diff --git a/app/DD-Record-Organizer/frmWM_ChangeDoctype.vb b/app/DD-Record-Organizer/frmWM_ChangeDoctype.vb index 11ab304..1aef8eb 100644 --- a/app/DD-Record-Organizer/frmWM_ChangeDoctype.vb +++ b/app/DD-Record-Organizer/frmWM_ChangeDoctype.vb @@ -32,7 +32,7 @@ Public Class frmWM_ChangeDoctype End If Me.DialogResult = System.Windows.Forms.DialogResult.OK For Each row As DataRow In CURRENT_DT_SELECTED_FILES.Rows - sql = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Doctype = '{0}',Change_DateTime = GETDATE(), WHERE DocID = {1}", NewDoctype, row.Item("DOC_ID")) + sql = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Doctype = '{0}',Change_DateTime = GETDATE() WHERE DocID = {1}", NewDoctype, row.Item("DOC_ID")) If clsDatabase.Execute_non_Query(sql) = True Then If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then clsDatabase.Execute_non_Query(sql, True) @@ -135,7 +135,7 @@ Public Class frmWM_ChangeDoctype Case "DATE" AddDateTimePicker(DR.Item("GUID"), DR.Item("NAME"), y) Case Else - MsgBox("Bitte überprüfen Sie den Datentyp des hinterlegten Indexwertes!", MsgBoxStyle.Critical, "Achtung:") + MsgBox($"Please check the datatype of manual index ({ DR.Item("NAME")} - {type} - Refresh_Indices_Manual", MsgBoxStyle.Critical, "Achtung:") ClassLogger.Add(" - Datentyp nicht hinterlegt - LoadIndexe_Man") End Select diff --git a/app/DD-Record-Organizer/frmWM_DoctypeConfig.resx b/app/DD-Record-Organizer/frmWM_DoctypeConfig.resx index bcaf128..b5bb716 100644 --- a/app/DD-Record-Organizer/frmWM_DoctypeConfig.resx +++ b/app/DD-Record-Organizer/frmWM_DoctypeConfig.resx @@ -2025,7 +2025,7 @@ 0, 27 - 305, 205 + 305, 225 2 @@ -2213,7 +2213,7 @@ 0, 0 - 1347, 27 + 1265, 27 1 @@ -2234,7 +2234,7 @@ 22 - 1261, 249 + 1265, 252 Automatische Indexe @@ -2270,7 +2270,7 @@ 0, 27 - 305, 222 + 305, 225 3 @@ -2458,7 +2458,7 @@ 0, 0 - 1261, 27 + 1265, 27 2 @@ -2479,7 +2479,7 @@ 1 - 1261, 249 + 1265, 252 Manuelle Indexe @@ -2817,7 +2817,7 @@ 0, 0 - 1261, 27 + 1265, 27 2 @@ -2838,7 +2838,7 @@ 5 - 1261, 249 + 1265, 252 Zurodnung Dokumentart - Entität @@ -3273,7 +3273,7 @@ 6 - 1261, 249 + 1265, 252 Variabler Ordnerpfad diff --git a/app/DD-Record-Organizer/frmWM_IndexFile.vb b/app/DD-Record-Organizer/frmWM_IndexFile.vb index 09ba0af..d1570f5 100644 --- a/app/DD-Record-Organizer/frmWM_IndexFile.vb +++ b/app/DD-Record-Organizer/frmWM_IndexFile.vb @@ -65,6 +65,7 @@ Public Class frmWM_IndexFile Else CURRENT_NEWFILENAME = ClassHelper.Versionierung_Datei(CURRENT_NEWFILENAME) End If + Else If clsWD_GET.WDFile_exists(CURRENT_NEWFILENAME.Substring(2), clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer, True) = True Then ClassHelper.InsertEssential_Log(CURRENT_RECORD_ID, "RECORD-ID", "FILE ALREADY EXISTED WITH NON-USER RIGHTS: " & CURRENT_NEWFILENAME) @@ -614,7 +615,7 @@ Public Class frmWM_IndexFile Case "DATE" AddDateTimePicker(DR.Item("GUID"), DR.Item("NAME"), y) Case Else - MsgBox("Bitte überprüfen Sie den Datentyp des hinterlegten Indexwertes!", MsgBoxStyle.Critical, "Achtung:") + MsgBox($"Please check the datatype of manual index ({ DR.Item("NAME")} - {type} - Refresh_Indices_Manual (frmWMIndexFile)", MsgBoxStyle.Critical, "Achtung:") ClassLogger.Add(" - Datentyp nicht hinterlegt - LoadIndexe_Man") End Select @@ -746,6 +747,8 @@ Public Class frmWM_IndexFile If (result = DialogResult.OK) Then ClassFileResult.SET_CURRENT_TBPMO_INDEX_MAN_VALUE(btn.Tag, folderBrowserDialog1.SelectedPath) + PATHTextBox.Text = folderBrowserDialog1.SelectedPath + txtSubfolder.Text = folderBrowserDialog1.SelectedPath End If