From bab4910c444b266e0ab6e90df45a8851f9262506 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Wed, 21 Oct 2015 11:58:58 +0200 Subject: [PATCH] MS_21.10.2015 --- .../ClassImport_Windream.vb | 45 +- .../DD-Record-Organiser.vbproj | 1 + .../DD_DMSDataSet.Designer.vb | 1830 +++++++++-------- app/DD-Record-Organiser/DD_DMSDataSet.xsc | 33 - app/DD-Record-Organiser/DD_DMSDataSet.xsd | 341 ++- app/DD-Record-Organiser/DD_DMSDataSet.xss | 54 +- .../My Project/Resources.Designer.vb | 10 + .../My Project/Resources.resx | 133 +- .../Resources/FileSystemEditor_5852.png | Bin 0 -> 239 bytes .../frmDokumentart_Konfig.Designer.vb | 34 +- .../frmDokumentart_Konfig.resx | 3 - .../frmDokumentart_Konfig.vb | 15 +- .../frmDokumentart_NameConvention.designer.vb | 134 +- .../frmDokumentart_NameConvention.vb | 27 +- .../frmTemplates.Designer.vb | 280 ++- app/DD-Record-Organiser/frmTemplates.resx | 36 +- app/DD-Record-Organiser/frmTemplates.vb | 14 +- app/DD-Record-Organiser/frmWD_Index_Dokart.vb | 12 +- 18 files changed, 1553 insertions(+), 1449 deletions(-) create mode 100644 app/DD-Record-Organiser/Resources/FileSystemEditor_5852.png diff --git a/app/DD-Record-Organiser/ClassImport_Windream.vb b/app/DD-Record-Organiser/ClassImport_Windream.vb index 3c202b9..44fddff 100644 --- a/app/DD-Record-Organiser/ClassImport_Windream.vb +++ b/app/DD-Record-Organiser/ClassImport_Windream.vb @@ -37,7 +37,7 @@ Public Class ClassImport_Windream idxvalue = idxvalue.ToString.Replace("@Dokart", Dokart) End Select End If - If LogErrorsOnly = False Then ClassLogger.Add(" - Indexvalue: " & idxvalue.ToString, False) + If LogErrorsOnly = False Then ClassLogger.Add(">> Indexvalue: " & idxvalue.ToString, False) Count += 1 indexierung_erfolgreich = ClassWindream.DateiIndexieren(CURRENT_FILEIN_WD, indexname, idxvalue) If indexierung_erfolgreich = False Then @@ -57,7 +57,7 @@ Public Class ClassImport_Windream If dt.Rows.Count = 1 Then Dim indexname = dt.Rows(0).Item("IDXNAME_ENTITYID").ToString Dim idxvalue = CURRENT_FORM_ID - If LogErrorsOnly = False Then ClassLogger.Add(" - Entity-ID: " & idxvalue.ToString, False) + If LogErrorsOnly = False Then ClassLogger.Add(">> Entity-ID: " & idxvalue.ToString, False) indexierung_erfolgreich = ClassWindream.DateiIndexieren(CURRENT_FILEIN_WD, indexname, idxvalue) If indexierung_erfolgreich = False Then err = True @@ -126,14 +126,18 @@ Public Class ClassImport_Windream '#### ' Regulären Ausdruck zum Auslesen der Indexe definieren Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" - If IsDBNull(DT.Rows(0).Item("NAMENKONVENTION")) Then - DT.Rows(0).Item("NAMENKONVENTION") = Path.GetFileNameWithoutExtension(CURRENT_FILENAME) - ElseIf DT.Rows(0).Item("NAMENKONVENTION") = String.Empty Then - DT.Rows(0).Item("NAMENKONVENTION") = Path.GetFileNameWithoutExtension(CURRENT_FILENAME) + 'Namenkonvention laden + Dim NameConv = ClassDatabase.Execute_Scalar("SELECT TOP 1 NAME_CONVENTION FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = " & DocTypeID & " AND FORMVIEW_ID = " & CURRENT_FORMVIEW_ID, True) + If IsDBNull(NameConv) Then + ClassLogger.Add(">> Achtung: Namenskonvention is DBNull", False) + NameConv = Path.GetFileNameWithoutExtension(CURRENT_FILENAME) + ElseIf NameConv = String.Empty Then + ClassLogger.Add(">> Achtung: Namenskonvention is String empty", False) + NameConv = Path.GetFileNameWithoutExtension(CURRENT_FILENAME) End If - 'schonmal den gesamten Pfad laden - Dim DATEINAME As String = Zielordner & "\" & DT.Rows(0).Item("NAMENKONVENTION") + Dim DATEINAME As String = Zielordner & "\" & NameConv + If LogErrorsOnly = False Then ClassLogger.Add(">> DATEINAME: " & DATEINAME, False) ' einen Regulären Ausdruck laden Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg) @@ -142,6 +146,7 @@ Public Class ClassImport_Windream '#### ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen For Each element As System.Text.RegularExpressions.Match In elemente + If LogErrorsOnly = False Then ClassLogger.Add(">> element in RegeX: " & element.Value, False) Select Case element.Value.Substring(2, 1).ToUpper ''Manueller Indexwert 'Case "M" @@ -188,11 +193,35 @@ Public Class ClassImport_Windream value = CURRENT_RECORD_ID Case "DOKART" value = CURRENT_DOKARTSTRING + Case Else + If APattern.Contains("#") Then + If LogErrorsOnly = False Then ClassLogger.Add(">> element filled with Record-Data.......: ", False) + Dim split() As String = APattern.Split("#") + If split.Length = 2 Then + Dim CONTROL_ID = split(1) + If IsNumeric(CONTROL_ID) Then + Dim CONTROLVALUE = ClassControlValues.Get_Control_Value_for_ID(CONTROL_ID, CURRENT_RECORD_ID) + If IsNothing(CONTROLVALUE) Then + If LogErrorsOnly = False Then ClassLogger.Add(">> unexpected: CONTROLVALUE is nothing!!", False) + value = "" + Else + If IsDBNull(CONTROLVALUE) Then + value = "" + Else + value = CONTROLVALUE + End If + End If + + End If + End If + + End If End Select If value <> String.Empty Then DATEINAME = DATEINAME.Replace(element.Value, value) _NewFileString = DATEINAME + If LogErrorsOnly = False Then ClassLogger.Add(">> Actual NEWFILESTRING: " & _NewFileString, False) ' sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString AnzahlIndexe += 1 ' sql_history_Index_Values = sql_history_Index_Values & ", '" & value & "'" diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj index ed83f46..36a006c 100644 --- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj +++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj @@ -970,6 +970,7 @@ + diff --git a/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb b/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb index 35e4588..d225904 100644 --- a/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb +++ b/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb @@ -103,10 +103,10 @@ Partial Public Class DD_DMSDataSet Private tableTBPMO_TEMPLATE As TBPMO_TEMPLATEDataTable - Private tableTBPMO_TEMPLATE_ENTITY_PATTERN As TBPMO_TEMPLATE_ENTITY_PATTERNDataTable - Private tableTBPMO_TEMPLATE_ENTITY As TBPMO_TEMPLATE_ENTITYDataTable + Private tableTBPMO_TEMPLATE_ENTITY_PATTERN As TBPMO_TEMPLATE_ENTITY_PATTERNDataTable + Private relationFK_TBPMO_FORM_VIEW_FORM_ID As Global.System.Data.DataRelation Private relationFK_TBPMO_WORKFLOW_FORM_FV_ID As Global.System.Data.DataRelation @@ -139,12 +139,12 @@ Partial Public Class DD_DMSDataSet Private relationFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_FORMID As Global.System.Data.DataRelation - Private relationFK_TBPMO_TEMPLATE_ENTITY_DOCTYPE_ID As Global.System.Data.DataRelation - Private relationFK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID As Global.System.Data.DataRelation Private relationFK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID As Global.System.Data.DataRelation + Private relationFK_TBPMO_TEMPLATE_ENTITY_PATTERN_TEMPLATE_ID As Global.System.Data.DataRelation + Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ - Public ReadOnly Property TBPMO_TEMPLATE_ENTITY_PATTERN() As TBPMO_TEMPLATE_ENTITY_PATTERNDataTable + Public ReadOnly Property TBPMO_TEMPLATE_ENTITY() As TBPMO_TEMPLATE_ENTITYDataTable Get - Return Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN + Return Me.tableTBPMO_TEMPLATE_ENTITY End Get End Property @@ -718,9 +718,9 @@ Partial Public Class DD_DMSDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _ Global.System.ComponentModel.Browsable(false), _ Global.System.ComponentModel.DesignerSerializationVisibility(Global.System.ComponentModel.DesignerSerializationVisibility.Content)> _ - Public ReadOnly Property TBPMO_TEMPLATE_ENTITY() As TBPMO_TEMPLATE_ENTITYDataTable + Public ReadOnly Property TBPMO_TEMPLATE_ENTITY_PATTERN() As TBPMO_TEMPLATE_ENTITY_PATTERNDataTable Get - Return Me.tableTBPMO_TEMPLATE_ENTITY + Return Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN End Get End Property @@ -908,12 +908,12 @@ Partial Public Class DD_DMSDataSet If (Not (ds.Tables("TBPMO_TEMPLATE")) Is Nothing) Then MyBase.Tables.Add(New TBPMO_TEMPLATEDataTable(ds.Tables("TBPMO_TEMPLATE"))) End If - If (Not (ds.Tables("TBPMO_TEMPLATE_ENTITY_PATTERN")) Is Nothing) Then - MyBase.Tables.Add(New TBPMO_TEMPLATE_ENTITY_PATTERNDataTable(ds.Tables("TBPMO_TEMPLATE_ENTITY_PATTERN"))) - End If If (Not (ds.Tables("TBPMO_TEMPLATE_ENTITY")) Is Nothing) Then MyBase.Tables.Add(New TBPMO_TEMPLATE_ENTITYDataTable(ds.Tables("TBPMO_TEMPLATE_ENTITY"))) End If + If (Not (ds.Tables("TBPMO_TEMPLATE_ENTITY_PATTERN")) Is Nothing) Then + MyBase.Tables.Add(New TBPMO_TEMPLATE_ENTITY_PATTERNDataTable(ds.Tables("TBPMO_TEMPLATE_ENTITY_PATTERN"))) + End If Me.DataSetName = ds.DataSetName Me.Prefix = ds.Prefix Me.Namespace = ds.Namespace @@ -1180,18 +1180,18 @@ Partial Public Class DD_DMSDataSet Me.tableTBPMO_TEMPLATE.InitVars End If End If - Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN = CType(MyBase.Tables("TBPMO_TEMPLATE_ENTITY_PATTERN"),TBPMO_TEMPLATE_ENTITY_PATTERNDataTable) - If (initTable = true) Then - If (Not (Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN) Is Nothing) Then - Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.InitVars - End If - End If Me.tableTBPMO_TEMPLATE_ENTITY = CType(MyBase.Tables("TBPMO_TEMPLATE_ENTITY"),TBPMO_TEMPLATE_ENTITYDataTable) If (initTable = true) Then If (Not (Me.tableTBPMO_TEMPLATE_ENTITY) Is Nothing) Then Me.tableTBPMO_TEMPLATE_ENTITY.InitVars End If End If + Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN = CType(MyBase.Tables("TBPMO_TEMPLATE_ENTITY_PATTERN"),TBPMO_TEMPLATE_ENTITY_PATTERNDataTable) + If (initTable = true) Then + If (Not (Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN) Is Nothing) Then + Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.InitVars + End If + End If Me.relationFK_TBPMO_FORM_VIEW_FORM_ID = Me.Relations("FK_TBPMO_FORM_VIEW_FORM_ID") Me.relationFK_TBPMO_WORKFLOW_FORM_FV_ID = Me.Relations("FK_TBPMO_WORKFLOW_FORM_FV_ID") Me.relationFK_TTBPMO_WORKFLOW_FORM_WF_ID = Me.Relations("FK_TTBPMO_WORKFLOW_FORM_WF_ID") @@ -1208,9 +1208,9 @@ Partial Public Class DD_DMSDataSet Me.relationFK_TBPMO_FOLLUPEMAIL_USER_FOLLUP_ID = Me.Relations("FK_TBPMO_FOLLUPEMAIL_USER_FOLLUP_ID") Me.relationFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID = Me.Relations("FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID") Me.relationFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_FORMID = Me.Relations("FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_FORMID") - Me.relationFK_TBPMO_TEMPLATE_ENTITY_DOCTYPE_ID = Me.Relations("FK_TBPMO_TEMPLATE_ENTITY_DOCTYPE_ID") Me.relationFK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID = Me.Relations("FK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID") Me.relationFK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID = Me.Relations("FK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID") + Me.relationFK_TBPMO_TEMPLATE_ENTITY_PATTERN_TEMPLATE_ID = Me.Relations("FK_TBPMO_TEMPLATE_ENTITY_PATTERN_TEMPLATE_ID") End Sub _ - Private Function ShouldSerializeTBPMO_TEMPLATE_ENTITY_PATTERN() As Boolean + Private Function ShouldSerializeTBPMO_TEMPLATE_ENTITY() As Boolean Return false End Function _ - Private Function ShouldSerializeTBPMO_TEMPLATE_ENTITY() As Boolean + Private Function ShouldSerializeTBPMO_TEMPLATE_ENTITY_PATTERN() As Boolean Return false End Function @@ -1765,10 +1765,10 @@ Partial Public Class DD_DMSDataSet Public Delegate Sub TBPMO_TEMPLATERowChangeEventHandler(ByVal sender As Object, ByVal e As TBPMO_TEMPLATERowChangeEvent) _ - Public Delegate Sub TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEventHandler(ByVal sender As Object, ByVal e As TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEvent) + Public Delegate Sub TBPMO_TEMPLATE_ENTITYRowChangeEventHandler(ByVal sender As Object, ByVal e As TBPMO_TEMPLATE_ENTITYRowChangeEvent) _ - Public Delegate Sub TBPMO_TEMPLATE_ENTITYRowChangeEventHandler(ByVal sender As Object, ByVal e As TBPMO_TEMPLATE_ENTITYRowChangeEvent) + Public Delegate Sub TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEventHandler(ByVal sender As Object, ByVal e As TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEvent) ''' '''Represents the strongly named DataTable class. @@ -17418,6 +17418,8 @@ Partial Public Class DD_DMSDataSet Private columnCHANGED_WHEN As Global.System.Data.DataColumn + Private columnDOCTYPE_ID As Global.System.Data.DataColumn + _ Public Sub New() @@ -17517,6 +17519,14 @@ Partial Public Class DD_DMSDataSet End Get End Property + _ + Public ReadOnly Property DOCTYPE_IDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnDOCTYPE_ID + End Get + End Property + _ @@ -17554,9 +17564,9 @@ Partial Public Class DD_DMSDataSet _ - Public Overloads Function AddTBPMO_TEMPLATERow(ByVal NAME As String, ByVal TEMPLATE_PATH As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBPMO_TEMPLATERow + Public Overloads Function AddTBPMO_TEMPLATERow(ByVal NAME As String, ByVal TEMPLATE_PATH As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal DOCTYPE_ID As Integer) As TBPMO_TEMPLATERow Dim rowTBPMO_TEMPLATERow As TBPMO_TEMPLATERow = CType(Me.NewRow,TBPMO_TEMPLATERow) - Dim columnValuesArray() As Object = New Object() {Nothing, NAME, TEMPLATE_PATH, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} + Dim columnValuesArray() As Object = New Object() {Nothing, NAME, TEMPLATE_PATH, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, DOCTYPE_ID} rowTBPMO_TEMPLATERow.ItemArray = columnValuesArray Me.Rows.Add(rowTBPMO_TEMPLATERow) Return rowTBPMO_TEMPLATERow @@ -17593,6 +17603,7 @@ Partial Public Class DD_DMSDataSet Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN") Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") + Me.columnDOCTYPE_ID = MyBase.Columns("DOCTYPE_ID") End Sub _ - Partial Public Class TBPMO_TEMPLATE_ENTITY_PATTERNDataTable - Inherits Global.System.Data.TypedTableBase(Of TBPMO_TEMPLATE_ENTITY_PATTERNRow) + Partial Public Class TBPMO_TEMPLATE_ENTITYDataTable + Inherits Global.System.Data.TypedTableBase(Of TBPMO_TEMPLATE_ENTITYRow) Private columnGUID As Global.System.Data.DataColumn - Private columnTEMPL_ENT_ID As Global.System.Data.DataColumn - - Private columnNAME_PATTERN As Global.System.Data.DataColumn - - Private columnFIXED_VALUE As Global.System.Data.DataColumn - - Private columnCONNECTION_ID As Global.System.Data.DataColumn + Private columnTEMPLATE_ID As Global.System.Data.DataColumn - Private columnSQL_COMMAND As Global.System.Data.DataColumn + Private columnENTITY_ID As Global.System.Data.DataColumn Private columnADDED_WHO As Global.System.Data.DataColumn Private columnADDED_WHEN As Global.System.Data.DataColumn - Private columnCHANGED_WHO As Global.System.Data.DataColumn - Private columnCHANGED_WHEN As Global.System.Data.DataColumn _ Public Sub New() MyBase.New - Me.TableName = "TBPMO_TEMPLATE_ENTITY_PATTERN" + Me.TableName = "TBPMO_TEMPLATE_ENTITY" Me.BeginInit Me.InitClass Me.EndInit @@ -17829,41 +17835,17 @@ Partial Public Class DD_DMSDataSet _ - Public ReadOnly Property TEMPL_ENT_IDColumn() As Global.System.Data.DataColumn - Get - Return Me.columnTEMPL_ENT_ID - End Get - End Property - - _ - Public ReadOnly Property NAME_PATTERNColumn() As Global.System.Data.DataColumn - Get - Return Me.columnNAME_PATTERN - End Get - End Property - - _ - Public ReadOnly Property FIXED_VALUEColumn() As Global.System.Data.DataColumn - Get - Return Me.columnFIXED_VALUE - End Get - End Property - - _ - Public ReadOnly Property CONNECTION_IDColumn() As Global.System.Data.DataColumn + Public ReadOnly Property TEMPLATE_IDColumn() As Global.System.Data.DataColumn Get - Return Me.columnCONNECTION_ID + Return Me.columnTEMPLATE_ID End Get End Property _ - Public ReadOnly Property SQL_COMMANDColumn() As Global.System.Data.DataColumn + Public ReadOnly Property ENTITY_IDColumn() As Global.System.Data.DataColumn Get - Return Me.columnSQL_COMMAND + Return Me.columnENTITY_ID End Get End Property @@ -17883,14 +17865,6 @@ Partial Public Class DD_DMSDataSet 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 @@ -17910,50 +17884,56 @@ Partial Public Class DD_DMSDataSet _ - Public Default ReadOnly Property Item(ByVal index As Integer) As TBPMO_TEMPLATE_ENTITY_PATTERNRow + Public Default ReadOnly Property Item(ByVal index As Integer) As TBPMO_TEMPLATE_ENTITYRow Get - Return CType(Me.Rows(index),TBPMO_TEMPLATE_ENTITY_PATTERNRow) + Return CType(Me.Rows(index),TBPMO_TEMPLATE_ENTITYRow) End Get End Property _ - Public Event TBPMO_TEMPLATE_ENTITY_PATTERNRowChanging As TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEventHandler + Public Event TBPMO_TEMPLATE_ENTITYRowChanging As TBPMO_TEMPLATE_ENTITYRowChangeEventHandler _ - Public Event TBPMO_TEMPLATE_ENTITY_PATTERNRowChanged As TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEventHandler + Public Event TBPMO_TEMPLATE_ENTITYRowChanged As TBPMO_TEMPLATE_ENTITYRowChangeEventHandler _ - Public Event TBPMO_TEMPLATE_ENTITY_PATTERNRowDeleting As TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEventHandler + Public Event TBPMO_TEMPLATE_ENTITYRowDeleting As TBPMO_TEMPLATE_ENTITYRowChangeEventHandler _ - Public Event TBPMO_TEMPLATE_ENTITY_PATTERNRowDeleted As TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEventHandler + Public Event TBPMO_TEMPLATE_ENTITYRowDeleted As TBPMO_TEMPLATE_ENTITYRowChangeEventHandler _ - Public Overloads Sub AddTBPMO_TEMPLATE_ENTITY_PATTERNRow(ByVal row As TBPMO_TEMPLATE_ENTITY_PATTERNRow) + Public Overloads Sub AddTBPMO_TEMPLATE_ENTITYRow(ByVal row As TBPMO_TEMPLATE_ENTITYRow) Me.Rows.Add(row) End Sub _ - Public Overloads Function AddTBPMO_TEMPLATE_ENTITY_PATTERNRow(ByVal TEMPL_ENT_ID As Integer, ByVal NAME_PATTERN As String, ByVal FIXED_VALUE As String, ByVal CONNECTION_ID As Integer, ByVal SQL_COMMAND As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBPMO_TEMPLATE_ENTITY_PATTERNRow - Dim rowTBPMO_TEMPLATE_ENTITY_PATTERNRow As TBPMO_TEMPLATE_ENTITY_PATTERNRow = CType(Me.NewRow,TBPMO_TEMPLATE_ENTITY_PATTERNRow) - Dim columnValuesArray() As Object = New Object() {Nothing, TEMPL_ENT_ID, NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} - rowTBPMO_TEMPLATE_ENTITY_PATTERNRow.ItemArray = columnValuesArray - Me.Rows.Add(rowTBPMO_TEMPLATE_ENTITY_PATTERNRow) - Return rowTBPMO_TEMPLATE_ENTITY_PATTERNRow + Public Overloads Function AddTBPMO_TEMPLATE_ENTITYRow(ByVal parentTBPMO_TEMPLATERowByFK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID As TBPMO_TEMPLATERow, ByVal parentTBPMO_FORMRowByFK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID As TBPMO_FORMRow, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHEN As Date) As TBPMO_TEMPLATE_ENTITYRow + Dim rowTBPMO_TEMPLATE_ENTITYRow As TBPMO_TEMPLATE_ENTITYRow = CType(Me.NewRow,TBPMO_TEMPLATE_ENTITYRow) + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, Nothing, ADDED_WHO, ADDED_WHEN, CHANGED_WHEN} + If (Not (parentTBPMO_TEMPLATERowByFK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID) Is Nothing) Then + columnValuesArray(1) = parentTBPMO_TEMPLATERowByFK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID(0) + End If + If (Not (parentTBPMO_FORMRowByFK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID) Is Nothing) Then + columnValuesArray(2) = parentTBPMO_FORMRowByFK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID(0) + End If + rowTBPMO_TEMPLATE_ENTITYRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBPMO_TEMPLATE_ENTITYRow) + Return rowTBPMO_TEMPLATE_ENTITYRow End Function _ - Public Function FindByGUID(ByVal GUID As Integer) As TBPMO_TEMPLATE_ENTITY_PATTERNRow - Return CType(Me.Rows.Find(New Object() {GUID}),TBPMO_TEMPLATE_ENTITY_PATTERNRow) + Public Function FindByGUID(ByVal GUID As Integer) As TBPMO_TEMPLATE_ENTITYRow + Return CType(Me.Rows.Find(New Object() {GUID}),TBPMO_TEMPLATE_ENTITYRow) End Function _ Public Overrides Function Clone() As Global.System.Data.DataTable - Dim cln As TBPMO_TEMPLATE_ENTITY_PATTERNDataTable = CType(MyBase.Clone,TBPMO_TEMPLATE_ENTITY_PATTERNDataTable) + Dim cln As TBPMO_TEMPLATE_ENTITYDataTable = CType(MyBase.Clone,TBPMO_TEMPLATE_ENTITYDataTable) cln.InitVars Return cln End Function @@ -17961,21 +17941,17 @@ Partial Public Class DD_DMSDataSet _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable - Return New TBPMO_TEMPLATE_ENTITY_PATTERNDataTable() + Return New TBPMO_TEMPLATE_ENTITYDataTable() End Function _ Friend Sub InitVars() Me.columnGUID = MyBase.Columns("GUID") - Me.columnTEMPL_ENT_ID = MyBase.Columns("TEMPL_ENT_ID") - Me.columnNAME_PATTERN = MyBase.Columns("NAME_PATTERN") - Me.columnFIXED_VALUE = MyBase.Columns("FIXED_VALUE") - Me.columnCONNECTION_ID = MyBase.Columns("CONNECTION_ID") - Me.columnSQL_COMMAND = MyBase.Columns("SQL_COMMAND") + Me.columnTEMPLATE_ID = MyBase.Columns("TEMPLATE_ID") + Me.columnENTITY_ID = MyBase.Columns("ENTITY_ID") 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 @@ -17984,22 +17960,14 @@ Partial Public Class DD_DMSDataSet 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.columnTEMPL_ENT_ID = New Global.System.Data.DataColumn("TEMPL_ENT_ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnTEMPL_ENT_ID) - Me.columnNAME_PATTERN = New Global.System.Data.DataColumn("NAME_PATTERN", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnNAME_PATTERN) - Me.columnFIXED_VALUE = New Global.System.Data.DataColumn("FIXED_VALUE", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnFIXED_VALUE) - Me.columnCONNECTION_ID = New Global.System.Data.DataColumn("CONNECTION_ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnCONNECTION_ID) - Me.columnSQL_COMMAND = New Global.System.Data.DataColumn("SQL_COMMAND", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnSQL_COMMAND) + Me.columnTEMPLATE_ID = New Global.System.Data.DataColumn("TEMPLATE_ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnTEMPLATE_ID) + Me.columnENTITY_ID = New Global.System.Data.DataColumn("ENTITY_ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnENTITY_ID) 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)) @@ -18007,39 +17975,35 @@ Partial Public Class DD_DMSDataSet Me.columnGUID.AllowDBNull = false Me.columnGUID.ReadOnly = true Me.columnGUID.Unique = true - Me.columnTEMPL_ENT_ID.AllowDBNull = false - Me.columnNAME_PATTERN.AllowDBNull = false - Me.columnNAME_PATTERN.MaxLength = 100 - Me.columnFIXED_VALUE.MaxLength = 100 - Me.columnSQL_COMMAND.MaxLength = 2000 + Me.columnTEMPLATE_ID.AllowDBNull = false + Me.columnENTITY_ID.AllowDBNull = false Me.columnADDED_WHO.MaxLength = 50 - Me.columnCHANGED_WHO.MaxLength = 50 End Sub _ - Public Function NewTBPMO_TEMPLATE_ENTITY_PATTERNRow() As TBPMO_TEMPLATE_ENTITY_PATTERNRow - Return CType(Me.NewRow,TBPMO_TEMPLATE_ENTITY_PATTERNRow) + Public Function NewTBPMO_TEMPLATE_ENTITYRow() As TBPMO_TEMPLATE_ENTITYRow + Return CType(Me.NewRow,TBPMO_TEMPLATE_ENTITYRow) End Function _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow - Return New TBPMO_TEMPLATE_ENTITY_PATTERNRow(builder) + Return New TBPMO_TEMPLATE_ENTITYRow(builder) End Function _ Protected Overrides Function GetRowType() As Global.System.Type - Return GetType(TBPMO_TEMPLATE_ENTITY_PATTERNRow) + Return GetType(TBPMO_TEMPLATE_ENTITYRow) End Function _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) - If (Not (Me.TBPMO_TEMPLATE_ENTITY_PATTERNRowChangedEvent) Is Nothing) Then - RaiseEvent TBPMO_TEMPLATE_ENTITY_PATTERNRowChanged(Me, New TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEvent(CType(e.Row,TBPMO_TEMPLATE_ENTITY_PATTERNRow), e.Action)) + If (Not (Me.TBPMO_TEMPLATE_ENTITYRowChangedEvent) Is Nothing) Then + RaiseEvent TBPMO_TEMPLATE_ENTITYRowChanged(Me, New TBPMO_TEMPLATE_ENTITYRowChangeEvent(CType(e.Row,TBPMO_TEMPLATE_ENTITYRow), e.Action)) End If End Sub @@ -18047,8 +18011,8 @@ Partial Public Class DD_DMSDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) - If (Not (Me.TBPMO_TEMPLATE_ENTITY_PATTERNRowChangingEvent) Is Nothing) Then - RaiseEvent TBPMO_TEMPLATE_ENTITY_PATTERNRowChanging(Me, New TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEvent(CType(e.Row,TBPMO_TEMPLATE_ENTITY_PATTERNRow), e.Action)) + If (Not (Me.TBPMO_TEMPLATE_ENTITYRowChangingEvent) Is Nothing) Then + RaiseEvent TBPMO_TEMPLATE_ENTITYRowChanging(Me, New TBPMO_TEMPLATE_ENTITYRowChangeEvent(CType(e.Row,TBPMO_TEMPLATE_ENTITYRow), e.Action)) End If End Sub @@ -18056,8 +18020,8 @@ Partial Public Class DD_DMSDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) - If (Not (Me.TBPMO_TEMPLATE_ENTITY_PATTERNRowDeletedEvent) Is Nothing) Then - RaiseEvent TBPMO_TEMPLATE_ENTITY_PATTERNRowDeleted(Me, New TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEvent(CType(e.Row,TBPMO_TEMPLATE_ENTITY_PATTERNRow), e.Action)) + If (Not (Me.TBPMO_TEMPLATE_ENTITYRowDeletedEvent) Is Nothing) Then + RaiseEvent TBPMO_TEMPLATE_ENTITYRowDeleted(Me, New TBPMO_TEMPLATE_ENTITYRowChangeEvent(CType(e.Row,TBPMO_TEMPLATE_ENTITYRow), e.Action)) End If End Sub @@ -18065,14 +18029,14 @@ Partial Public Class DD_DMSDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) - If (Not (Me.TBPMO_TEMPLATE_ENTITY_PATTERNRowDeletingEvent) Is Nothing) Then - RaiseEvent TBPMO_TEMPLATE_ENTITY_PATTERNRowDeleting(Me, New TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEvent(CType(e.Row,TBPMO_TEMPLATE_ENTITY_PATTERNRow), e.Action)) + If (Not (Me.TBPMO_TEMPLATE_ENTITYRowDeletingEvent) Is Nothing) Then + RaiseEvent TBPMO_TEMPLATE_ENTITYRowDeleting(Me, New TBPMO_TEMPLATE_ENTITYRowChangeEvent(CType(e.Row,TBPMO_TEMPLATE_ENTITYRow), e.Action)) End If End Sub _ - Public Sub RemoveTBPMO_TEMPLATE_ENTITY_PATTERNRow(ByVal row As TBPMO_TEMPLATE_ENTITY_PATTERNRow) + Public Sub RemoveTBPMO_TEMPLATE_ENTITYRow(ByVal row As TBPMO_TEMPLATE_ENTITYRow) Me.Rows.Remove(row) End Sub @@ -18099,7 +18063,7 @@ Partial Public Class DD_DMSDataSet type.Attributes.Add(attribute1) Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() attribute2.Name = "tableTypeName" - attribute2.FixedValue = "TBPMO_TEMPLATE_ENTITY_PATTERNDataTable" + attribute2.FixedValue = "TBPMO_TEMPLATE_ENTITYDataTable" type.Attributes.Add(attribute2) type.Particle = sequence Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable @@ -18148,32 +18112,34 @@ Partial Public Class DD_DMSDataSet ''' _ - Partial Public Class TBPMO_TEMPLATE_ENTITYDataTable - Inherits Global.System.Data.TypedTableBase(Of TBPMO_TEMPLATE_ENTITYRow) + Partial Public Class TBPMO_TEMPLATE_ENTITY_PATTERNDataTable + Inherits Global.System.Data.TypedTableBase(Of TBPMO_TEMPLATE_ENTITY_PATTERNRow) Private columnGUID As Global.System.Data.DataColumn Private columnTEMPLATE_ID As Global.System.Data.DataColumn - Private columnENTITY_ID As Global.System.Data.DataColumn + Private columnNAME_PATTERN As Global.System.Data.DataColumn - Private columnDOCTYPE_ID As Global.System.Data.DataColumn + Private columnFIXED_VALUE As Global.System.Data.DataColumn + + Private columnCONNECTION_ID As Global.System.Data.DataColumn + + Private columnSQL_COMMAND As Global.System.Data.DataColumn Private columnADDED_WHO As Global.System.Data.DataColumn Private columnADDED_WHEN As Global.System.Data.DataColumn - Private columnCHANGED_WHEN As Global.System.Data.DataColumn - - Private columnEntityString As Global.System.Data.DataColumn + Private columnCHANGED_WHO As Global.System.Data.DataColumn - Private columnDocType As Global.System.Data.DataColumn + Private columnCHANGED_WHEN As Global.System.Data.DataColumn _ Public Sub New() MyBase.New - Me.TableName = "TBPMO_TEMPLATE_ENTITY" + Me.TableName = "TBPMO_TEMPLATE_ENTITY_PATTERN" Me.BeginInit Me.InitClass Me.EndInit @@ -18222,57 +18188,65 @@ Partial Public Class DD_DMSDataSet _ - Public ReadOnly Property ENTITY_IDColumn() As Global.System.Data.DataColumn + Public ReadOnly Property NAME_PATTERNColumn() As Global.System.Data.DataColumn Get - Return Me.columnENTITY_ID + Return Me.columnNAME_PATTERN End Get End Property _ - Public ReadOnly Property DOCTYPE_IDColumn() As Global.System.Data.DataColumn + Public ReadOnly Property FIXED_VALUEColumn() As Global.System.Data.DataColumn Get - Return Me.columnDOCTYPE_ID + Return Me.columnFIXED_VALUE End Get End Property _ - Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn + Public ReadOnly Property CONNECTION_IDColumn() As Global.System.Data.DataColumn Get - Return Me.columnADDED_WHO + Return Me.columnCONNECTION_ID End Get End Property _ - Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn + Public ReadOnly Property SQL_COMMANDColumn() As Global.System.Data.DataColumn Get - Return Me.columnADDED_WHEN + Return Me.columnSQL_COMMAND End Get End Property _ - Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn + Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn Get - Return Me.columnCHANGED_WHEN + 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 EntityStringColumn() As Global.System.Data.DataColumn + Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn Get - Return Me.columnEntityString + Return Me.columnCHANGED_WHO End Get End Property _ - Public ReadOnly Property DocTypeColumn() As Global.System.Data.DataColumn + Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn Get - Return Me.columnDocType + Return Me.columnCHANGED_WHEN End Get End Property @@ -18287,59 +18261,53 @@ Partial Public Class DD_DMSDataSet _ - Public Default ReadOnly Property Item(ByVal index As Integer) As TBPMO_TEMPLATE_ENTITYRow + Public Default ReadOnly Property Item(ByVal index As Integer) As TBPMO_TEMPLATE_ENTITY_PATTERNRow Get - Return CType(Me.Rows(index),TBPMO_TEMPLATE_ENTITYRow) + Return CType(Me.Rows(index),TBPMO_TEMPLATE_ENTITY_PATTERNRow) End Get End Property _ - Public Event TBPMO_TEMPLATE_ENTITYRowChanging As TBPMO_TEMPLATE_ENTITYRowChangeEventHandler + Public Event TBPMO_TEMPLATE_ENTITY_PATTERNRowChanging As TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEventHandler _ - Public Event TBPMO_TEMPLATE_ENTITYRowChanged As TBPMO_TEMPLATE_ENTITYRowChangeEventHandler + Public Event TBPMO_TEMPLATE_ENTITY_PATTERNRowChanged As TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEventHandler _ - Public Event TBPMO_TEMPLATE_ENTITYRowDeleting As TBPMO_TEMPLATE_ENTITYRowChangeEventHandler + Public Event TBPMO_TEMPLATE_ENTITY_PATTERNRowDeleting As TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEventHandler _ - Public Event TBPMO_TEMPLATE_ENTITYRowDeleted As TBPMO_TEMPLATE_ENTITYRowChangeEventHandler + Public Event TBPMO_TEMPLATE_ENTITY_PATTERNRowDeleted As TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEventHandler _ - Public Overloads Sub AddTBPMO_TEMPLATE_ENTITYRow(ByVal row As TBPMO_TEMPLATE_ENTITYRow) + Public Overloads Sub AddTBPMO_TEMPLATE_ENTITY_PATTERNRow(ByVal row As TBPMO_TEMPLATE_ENTITY_PATTERNRow) Me.Rows.Add(row) End Sub _ - Public Overloads Function AddTBPMO_TEMPLATE_ENTITYRow(ByVal parentTBPMO_TEMPLATERowByFK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID As TBPMO_TEMPLATERow, ByVal parentTBPMO_FORMRowByFK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID As TBPMO_FORMRow, ByVal parentTBDD_DOKUMENTARTRowByFK_TBPMO_TEMPLATE_ENTITY_DOCTYPE_ID As TBDD_DOKUMENTARTRow, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHEN As Date, ByVal EntityString As String, ByVal DocType As String) As TBPMO_TEMPLATE_ENTITYRow - Dim rowTBPMO_TEMPLATE_ENTITYRow As TBPMO_TEMPLATE_ENTITYRow = CType(Me.NewRow,TBPMO_TEMPLATE_ENTITYRow) - Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, Nothing, Nothing, ADDED_WHO, ADDED_WHEN, CHANGED_WHEN, EntityString, DocType} - If (Not (parentTBPMO_TEMPLATERowByFK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID) Is Nothing) Then - columnValuesArray(1) = parentTBPMO_TEMPLATERowByFK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID(0) - End If - If (Not (parentTBPMO_FORMRowByFK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID) Is Nothing) Then - columnValuesArray(2) = parentTBPMO_FORMRowByFK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID(0) - End If - If (Not (parentTBDD_DOKUMENTARTRowByFK_TBPMO_TEMPLATE_ENTITY_DOCTYPE_ID) Is Nothing) Then - columnValuesArray(3) = parentTBDD_DOKUMENTARTRowByFK_TBPMO_TEMPLATE_ENTITY_DOCTYPE_ID(0) + Public Overloads Function AddTBPMO_TEMPLATE_ENTITY_PATTERNRow(ByVal parentTBPMO_TEMPLATERowByFK_TBPMO_TEMPLATE_ENTITY_PATTERN_TEMPLATE_ID As TBPMO_TEMPLATERow, ByVal NAME_PATTERN As String, ByVal FIXED_VALUE As String, ByVal CONNECTION_ID As Integer, ByVal SQL_COMMAND As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBPMO_TEMPLATE_ENTITY_PATTERNRow + Dim rowTBPMO_TEMPLATE_ENTITY_PATTERNRow As TBPMO_TEMPLATE_ENTITY_PATTERNRow = CType(Me.NewRow,TBPMO_TEMPLATE_ENTITY_PATTERNRow) + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} + If (Not (parentTBPMO_TEMPLATERowByFK_TBPMO_TEMPLATE_ENTITY_PATTERN_TEMPLATE_ID) Is Nothing) Then + columnValuesArray(1) = parentTBPMO_TEMPLATERowByFK_TBPMO_TEMPLATE_ENTITY_PATTERN_TEMPLATE_ID(0) End If - rowTBPMO_TEMPLATE_ENTITYRow.ItemArray = columnValuesArray - Me.Rows.Add(rowTBPMO_TEMPLATE_ENTITYRow) - Return rowTBPMO_TEMPLATE_ENTITYRow + rowTBPMO_TEMPLATE_ENTITY_PATTERNRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBPMO_TEMPLATE_ENTITY_PATTERNRow) + Return rowTBPMO_TEMPLATE_ENTITY_PATTERNRow End Function _ - Public Function FindByGUID(ByVal GUID As Integer) As TBPMO_TEMPLATE_ENTITYRow - Return CType(Me.Rows.Find(New Object() {GUID}),TBPMO_TEMPLATE_ENTITYRow) + Public Function FindByGUID(ByVal GUID As Integer) As TBPMO_TEMPLATE_ENTITY_PATTERNRow + Return CType(Me.Rows.Find(New Object() {GUID}),TBPMO_TEMPLATE_ENTITY_PATTERNRow) End Function _ Public Overrides Function Clone() As Global.System.Data.DataTable - Dim cln As TBPMO_TEMPLATE_ENTITYDataTable = CType(MyBase.Clone,TBPMO_TEMPLATE_ENTITYDataTable) + Dim cln As TBPMO_TEMPLATE_ENTITY_PATTERNDataTable = CType(MyBase.Clone,TBPMO_TEMPLATE_ENTITY_PATTERNDataTable) cln.InitVars Return cln End Function @@ -18347,7 +18315,7 @@ Partial Public Class DD_DMSDataSet _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable - Return New TBPMO_TEMPLATE_ENTITYDataTable() + Return New TBPMO_TEMPLATE_ENTITY_PATTERNDataTable() End Function _ - Public Function NewTBPMO_TEMPLATE_ENTITYRow() As TBPMO_TEMPLATE_ENTITYRow - Return CType(Me.NewRow,TBPMO_TEMPLATE_ENTITYRow) + Public Function NewTBPMO_TEMPLATE_ENTITY_PATTERNRow() As TBPMO_TEMPLATE_ENTITY_PATTERNRow + Return CType(Me.NewRow,TBPMO_TEMPLATE_ENTITY_PATTERNRow) End Function _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow - Return New TBPMO_TEMPLATE_ENTITYRow(builder) + Return New TBPMO_TEMPLATE_ENTITY_PATTERNRow(builder) End Function _ Protected Overrides Function GetRowType() As Global.System.Type - Return GetType(TBPMO_TEMPLATE_ENTITYRow) + Return GetType(TBPMO_TEMPLATE_ENTITY_PATTERNRow) End Function _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) - If (Not (Me.TBPMO_TEMPLATE_ENTITYRowChangedEvent) Is Nothing) Then - RaiseEvent TBPMO_TEMPLATE_ENTITYRowChanged(Me, New TBPMO_TEMPLATE_ENTITYRowChangeEvent(CType(e.Row,TBPMO_TEMPLATE_ENTITYRow), e.Action)) + If (Not (Me.TBPMO_TEMPLATE_ENTITY_PATTERNRowChangedEvent) Is Nothing) Then + RaiseEvent TBPMO_TEMPLATE_ENTITY_PATTERNRowChanged(Me, New TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEvent(CType(e.Row,TBPMO_TEMPLATE_ENTITY_PATTERNRow), e.Action)) End If End Sub @@ -18431,8 +18401,8 @@ Partial Public Class DD_DMSDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) - If (Not (Me.TBPMO_TEMPLATE_ENTITYRowChangingEvent) Is Nothing) Then - RaiseEvent TBPMO_TEMPLATE_ENTITYRowChanging(Me, New TBPMO_TEMPLATE_ENTITYRowChangeEvent(CType(e.Row,TBPMO_TEMPLATE_ENTITYRow), e.Action)) + If (Not (Me.TBPMO_TEMPLATE_ENTITY_PATTERNRowChangingEvent) Is Nothing) Then + RaiseEvent TBPMO_TEMPLATE_ENTITY_PATTERNRowChanging(Me, New TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEvent(CType(e.Row,TBPMO_TEMPLATE_ENTITY_PATTERNRow), e.Action)) End If End Sub @@ -18440,8 +18410,8 @@ Partial Public Class DD_DMSDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) - If (Not (Me.TBPMO_TEMPLATE_ENTITYRowDeletedEvent) Is Nothing) Then - RaiseEvent TBPMO_TEMPLATE_ENTITYRowDeleted(Me, New TBPMO_TEMPLATE_ENTITYRowChangeEvent(CType(e.Row,TBPMO_TEMPLATE_ENTITYRow), e.Action)) + If (Not (Me.TBPMO_TEMPLATE_ENTITY_PATTERNRowDeletedEvent) Is Nothing) Then + RaiseEvent TBPMO_TEMPLATE_ENTITY_PATTERNRowDeleted(Me, New TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEvent(CType(e.Row,TBPMO_TEMPLATE_ENTITY_PATTERNRow), e.Action)) End If End Sub @@ -18449,14 +18419,14 @@ Partial Public Class DD_DMSDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) - If (Not (Me.TBPMO_TEMPLATE_ENTITYRowDeletingEvent) Is Nothing) Then - RaiseEvent TBPMO_TEMPLATE_ENTITYRowDeleting(Me, New TBPMO_TEMPLATE_ENTITYRowChangeEvent(CType(e.Row,TBPMO_TEMPLATE_ENTITYRow), e.Action)) + If (Not (Me.TBPMO_TEMPLATE_ENTITY_PATTERNRowDeletingEvent) Is Nothing) Then + RaiseEvent TBPMO_TEMPLATE_ENTITY_PATTERNRowDeleting(Me, New TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEvent(CType(e.Row,TBPMO_TEMPLATE_ENTITY_PATTERNRow), e.Action)) End If End Sub _ - Public Sub RemoveTBPMO_TEMPLATE_ENTITYRow(ByVal row As TBPMO_TEMPLATE_ENTITYRow) + Public Sub RemoveTBPMO_TEMPLATE_ENTITY_PATTERNRow(ByVal row As TBPMO_TEMPLATE_ENTITY_PATTERNRow) Me.Rows.Remove(row) End Sub @@ -18483,7 +18453,7 @@ Partial Public Class DD_DMSDataSet type.Attributes.Add(attribute1) Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() attribute2.Name = "tableTypeName" - attribute2.FixedValue = "TBPMO_TEMPLATE_ENTITYDataTable" + attribute2.FixedValue = "TBPMO_TEMPLATE_ENTITY_PATTERNDataTable" type.Attributes.Add(attribute2) type.Particle = sequence Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable @@ -21818,16 +21788,6 @@ Partial Public Class DD_DMSDataSet Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBDD_INDEX_AUTOM_DOCID")),TBDD_INDEX_AUTOMRow()) End If End Function - - _ - Public Function GetTBPMO_TEMPLATE_ENTITYRows() As TBPMO_TEMPLATE_ENTITYRow() - If (Me.Table.ChildRelations("FK_TBPMO_TEMPLATE_ENTITY_DOCTYPE_ID") Is Nothing) Then - Return New TBPMO_TEMPLATE_ENTITYRow(-1) {} - Else - Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBPMO_TEMPLATE_ENTITY_DOCTYPE_ID")),TBPMO_TEMPLATE_ENTITYRow()) - End If - End Function End Class ''' @@ -27085,6 +27045,17 @@ Partial Public Class DD_DMSDataSet End Set End Property + _ + Public Property DOCTYPE_ID() As Integer + Get + Return CType(Me(Me.tableTBPMO_TEMPLATE.DOCTYPE_IDColumn),Integer) + End Get + Set + Me(Me.tableTBPMO_TEMPLATE.DOCTYPE_IDColumn) = value + End Set + End Property + _ Public Function IsADDED_WHONull() As Boolean @@ -27142,251 +27113,16 @@ Partial Public Class DD_DMSDataSet Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID")),TBPMO_TEMPLATE_ENTITYRow()) End If End Function - End Class - - ''' - '''Represents strongly named DataRow class. - ''' - Partial Public Class TBPMO_TEMPLATE_ENTITY_PATTERNRow - Inherits Global.System.Data.DataRow - - Private tableTBPMO_TEMPLATE_ENTITY_PATTERN As TBPMO_TEMPLATE_ENTITY_PATTERNDataTable - - _ - Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) - MyBase.New(rb) - Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN = CType(Me.Table,TBPMO_TEMPLATE_ENTITY_PATTERNDataTable) - End Sub - - _ - Public Property GUID() As Integer - Get - Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.GUIDColumn),Integer) - End Get - Set - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.GUIDColumn) = value - End Set - End Property - - _ - Public Property TEMPL_ENT_ID() As Integer - Get - Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.TEMPL_ENT_IDColumn),Integer) - End Get - Set - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.TEMPL_ENT_IDColumn) = value - End Set - End Property - - _ - Public Property NAME_PATTERN() As String - Get - Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.NAME_PATTERNColumn),String) - End Get - Set - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.NAME_PATTERNColumn) = value - End Set - End Property _ - Public Property FIXED_VALUE() As String - Get - Try - Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.FIXED_VALUEColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte FIXED_VALUE in Tabelle TBPMO_TEMPLATE_ENTITY_PATTERN ist DBNu"& _ - "ll.", e) - End Try - End Get - Set - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.FIXED_VALUEColumn) = value - End Set - End Property - - _ - Public Property CONNECTION_ID() As Integer - Get - Try - Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CONNECTION_IDColumn),Integer) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CONNECTION_ID in Tabelle TBPMO_TEMPLATE_ENTITY_PATTERN ist DB"& _ - "Null.", e) - End Try - End Get - Set - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CONNECTION_IDColumn) = value - End Set - End Property - - _ - Public Property SQL_COMMAND() As String - Get - Try - Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.SQL_COMMANDColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte SQL_COMMAND in Tabelle TBPMO_TEMPLATE_ENTITY_PATTERN ist DBNu"& _ - "ll.", e) - End Try - End Get - Set - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.SQL_COMMANDColumn) = value - End Set - End Property - - _ - Public Property ADDED_WHO() As String - Get - Try - Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.ADDED_WHOColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHO in Tabelle TBPMO_TEMPLATE_ENTITY_PATTERN ist DBNull"& _ - ".", e) - End Try - End Get - Set - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.ADDED_WHOColumn) = value - End Set - End Property - - _ - Public Property ADDED_WHEN() As Date - Get - Try - Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.ADDED_WHENColumn),Date) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBPMO_TEMPLATE_ENTITY_PATTERN ist DBNul"& _ - "l.", e) - End Try - End Get - Set - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.ADDED_WHENColumn) = value - End Set - End Property - - _ - Public Property CHANGED_WHO() As String - Get - Try - Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CHANGED_WHOColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBPMO_TEMPLATE_ENTITY_PATTERN ist DBNu"& _ - "ll.", e) - End Try - End Get - Set - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CHANGED_WHOColumn) = value - End Set - End Property - - _ - Public Property CHANGED_WHEN() As Date - Get - Try - Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CHANGED_WHENColumn),Date) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBPMO_TEMPLATE_ENTITY_PATTERN ist DBN"& _ - "ull.", e) - End Try - End Get - Set - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CHANGED_WHENColumn) = value - End Set - End Property - - _ - Public Function IsFIXED_VALUENull() As Boolean - Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.FIXED_VALUEColumn) - End Function - - _ - Public Sub SetFIXED_VALUENull() - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.FIXED_VALUEColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsCONNECTION_IDNull() As Boolean - Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CONNECTION_IDColumn) - End Function - - _ - Public Sub SetCONNECTION_IDNull() - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CONNECTION_IDColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsSQL_COMMANDNull() As Boolean - Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.SQL_COMMANDColumn) - End Function - - _ - Public Sub SetSQL_COMMANDNull() - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.SQL_COMMANDColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsADDED_WHONull() As Boolean - Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.ADDED_WHOColumn) - End Function - - _ - Public Sub SetADDED_WHONull() - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.ADDED_WHOColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsADDED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.ADDED_WHENColumn) - End Function - - _ - Public Sub SetADDED_WHENNull() - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.ADDED_WHENColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsCHANGED_WHONull() As Boolean - Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CHANGED_WHOColumn) - End Function - - _ - Public Sub SetCHANGED_WHONull() - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CHANGED_WHOColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsCHANGED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CHANGED_WHENColumn) + Public Function GetTBPMO_TEMPLATE_ENTITY_PATTERNRows() As TBPMO_TEMPLATE_ENTITY_PATTERNRow() + If (Me.Table.ChildRelations("FK_TBPMO_TEMPLATE_ENTITY_PATTERN_TEMPLATE_ID") Is Nothing) Then + Return New TBPMO_TEMPLATE_ENTITY_PATTERNRow(-1) {} + Else + Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBPMO_TEMPLATE_ENTITY_PATTERN_TEMPLATE_ID")),TBPMO_TEMPLATE_ENTITY_PATTERNRow()) + End If End Function - - _ - Public Sub SetCHANGED_WHENNull() - Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CHANGED_WHENColumn) = Global.System.Convert.DBNull - End Sub End Class ''' @@ -27437,17 +27173,6 @@ Partial Public Class DD_DMSDataSet End Set End Property - _ - Public Property DOCTYPE_ID() As Integer - Get - Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY.DOCTYPE_IDColumn),Integer) - End Get - Set - Me(Me.tableTBPMO_TEMPLATE_ENTITY.DOCTYPE_IDColumn) = value - End Set - End Property - _ Public Property ADDED_WHO() As String @@ -27495,45 +27220,220 @@ Partial Public Class DD_DMSDataSet _ - Public Property EntityString() As String + Public Property TBPMO_FORMRow() As TBPMO_FORMRow Get - Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY.EntityStringColumn),String) + Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID")),TBPMO_FORMRow) End Get Set - Me(Me.tableTBPMO_TEMPLATE_ENTITY.EntityStringColumn) = value + Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID")) End Set End Property _ - Public Property DocType() As String + Public Property TBPMO_TEMPLATERow() As TBPMO_TEMPLATERow Get - Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY.DocTypeColumn),String) + Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID")),TBPMO_TEMPLATERow) End Get Set - Me(Me.tableTBPMO_TEMPLATE_ENTITY.DocTypeColumn) = value + Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID")) End Set End Property _ - Public Property TBDD_DOKUMENTARTRow() As TBDD_DOKUMENTARTRow + Public Function IsADDED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY.ADDED_WHOColumn) + End Function + + _ + Public Sub SetADDED_WHONull() + Me(Me.tableTBPMO_TEMPLATE_ENTITY.ADDED_WHOColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsADDED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY.ADDED_WHENColumn) + End Function + + _ + Public Sub SetADDED_WHENNull() + Me(Me.tableTBPMO_TEMPLATE_ENTITY.ADDED_WHENColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY.CHANGED_WHENColumn) + End Function + + _ + Public Sub SetCHANGED_WHENNull() + Me(Me.tableTBPMO_TEMPLATE_ENTITY.CHANGED_WHENColumn) = Global.System.Convert.DBNull + End Sub + End Class + + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBPMO_TEMPLATE_ENTITY_PATTERNRow + Inherits Global.System.Data.DataRow + + Private tableTBPMO_TEMPLATE_ENTITY_PATTERN As TBPMO_TEMPLATE_ENTITY_PATTERNDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN = CType(Me.Table,TBPMO_TEMPLATE_ENTITY_PATTERNDataTable) + End Sub + + _ + Public Property GUID() As Integer Get - Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBPMO_TEMPLATE_ENTITY_DOCTYPE_ID")),TBDD_DOKUMENTARTRow) + Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.GUIDColumn),Integer) End Get Set - Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBPMO_TEMPLATE_ENTITY_DOCTYPE_ID")) + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.GUIDColumn) = value End Set End Property _ - Public Property TBPMO_FORMRow() As TBPMO_FORMRow + Public Property TEMPLATE_ID() As Integer Get - Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID")),TBPMO_FORMRow) + Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.TEMPLATE_IDColumn),Integer) End Get Set - Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBPMO_TEMPLATE_ENTITY_ENTITY_ID")) + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.TEMPLATE_IDColumn) = value + End Set + End Property + + _ + Public Property NAME_PATTERN() As String + Get + Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.NAME_PATTERNColumn),String) + End Get + Set + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.NAME_PATTERNColumn) = value + End Set + End Property + + _ + Public Property FIXED_VALUE() As String + Get + Try + Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.FIXED_VALUEColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte FIXED_VALUE in Tabelle TBPMO_TEMPLATE_ENTITY_PATTERN ist DBNu"& _ + "ll.", e) + End Try + End Get + Set + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.FIXED_VALUEColumn) = value + End Set + End Property + + _ + Public Property CONNECTION_ID() As Integer + Get + Try + Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CONNECTION_IDColumn),Integer) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CONNECTION_ID in Tabelle TBPMO_TEMPLATE_ENTITY_PATTERN ist DB"& _ + "Null.", e) + End Try + End Get + Set + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CONNECTION_IDColumn) = value + End Set + End Property + + _ + Public Property SQL_COMMAND() As String + Get + Try + Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.SQL_COMMANDColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte SQL_COMMAND in Tabelle TBPMO_TEMPLATE_ENTITY_PATTERN ist DBNu"& _ + "ll.", e) + End Try + End Get + Set + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.SQL_COMMANDColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHO() As String + Get + Try + Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.ADDED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHO in Tabelle TBPMO_TEMPLATE_ENTITY_PATTERN ist DBNull"& _ + ".", e) + End Try + End Get + Set + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.ADDED_WHOColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.ADDED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBPMO_TEMPLATE_ENTITY_PATTERN ist DBNul"& _ + "l.", e) + End Try + End Get + Set + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.ADDED_WHENColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHO() As String + Get + Try + Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CHANGED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBPMO_TEMPLATE_ENTITY_PATTERN ist DBNu"& _ + "ll.", e) + End Try + End Get + Set + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CHANGED_WHOColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CHANGED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBPMO_TEMPLATE_ENTITY_PATTERN ist DBN"& _ + "ull.", e) + End Try + End Get + Set + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CHANGED_WHENColumn) = value End Set End Property @@ -27541,47 +27441,95 @@ Partial Public Class DD_DMSDataSet Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _ Public Property TBPMO_TEMPLATERow() As TBPMO_TEMPLATERow Get - Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID")),TBPMO_TEMPLATERow) + Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBPMO_TEMPLATE_ENTITY_PATTERN_TEMPLATE_ID")),TBPMO_TEMPLATERow) End Get Set - Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBPMO_TEMPLATE_ENTITY_TEMPLATE_ID")) + Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBPMO_TEMPLATE_ENTITY_PATTERN_TEMPLATE_ID")) End Set End Property + _ + Public Function IsFIXED_VALUENull() As Boolean + Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.FIXED_VALUEColumn) + End Function + + _ + Public Sub SetFIXED_VALUENull() + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.FIXED_VALUEColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCONNECTION_IDNull() As Boolean + Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CONNECTION_IDColumn) + End Function + + _ + Public Sub SetCONNECTION_IDNull() + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CONNECTION_IDColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsSQL_COMMANDNull() As Boolean + Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.SQL_COMMANDColumn) + End Function + + _ + Public Sub SetSQL_COMMANDNull() + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.SQL_COMMANDColumn) = Global.System.Convert.DBNull + End Sub + _ Public Function IsADDED_WHONull() As Boolean - Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY.ADDED_WHOColumn) + Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.ADDED_WHOColumn) End Function _ Public Sub SetADDED_WHONull() - Me(Me.tableTBPMO_TEMPLATE_ENTITY.ADDED_WHOColumn) = Global.System.Convert.DBNull + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.ADDED_WHOColumn) = Global.System.Convert.DBNull End Sub _ Public Function IsADDED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY.ADDED_WHENColumn) + Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.ADDED_WHENColumn) End Function _ Public Sub SetADDED_WHENNull() - Me(Me.tableTBPMO_TEMPLATE_ENTITY.ADDED_WHENColumn) = Global.System.Convert.DBNull + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.ADDED_WHENColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CHANGED_WHOColumn) + End Function + + _ + Public Sub SetCHANGED_WHONull() + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CHANGED_WHOColumn) = Global.System.Convert.DBNull End Sub _ Public Function IsCHANGED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY.CHANGED_WHENColumn) + Return Me.IsNull(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CHANGED_WHENColumn) End Function _ Public Sub SetCHANGED_WHENNull() - Me(Me.tableTBPMO_TEMPLATE_ENTITY.CHANGED_WHENColumn) = Global.System.Convert.DBNull + Me(Me.tableTBPMO_TEMPLATE_ENTITY_PATTERN.CHANGED_WHENColumn) = Global.System.Convert.DBNull End Sub End Class @@ -28993,16 +28941,16 @@ Partial Public Class DD_DMSDataSet '''Row event argument class ''' _ - Public Class TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEvent + Public Class TBPMO_TEMPLATE_ENTITYRowChangeEvent Inherits Global.System.EventArgs - Private eventRow As TBPMO_TEMPLATE_ENTITY_PATTERNRow + Private eventRow As TBPMO_TEMPLATE_ENTITYRow Private eventAction As Global.System.Data.DataRowAction _ - Public Sub New(ByVal row As TBPMO_TEMPLATE_ENTITY_PATTERNRow, ByVal action As Global.System.Data.DataRowAction) + Public Sub New(ByVal row As TBPMO_TEMPLATE_ENTITYRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row Me.eventAction = action @@ -29010,7 +28958,7 @@ Partial Public Class DD_DMSDataSet _ - Public ReadOnly Property Row() As TBPMO_TEMPLATE_ENTITY_PATTERNRow + Public ReadOnly Property Row() As TBPMO_TEMPLATE_ENTITYRow Get Return Me.eventRow End Get @@ -29029,16 +28977,16 @@ Partial Public Class DD_DMSDataSet '''Row event argument class ''' _ - Public Class TBPMO_TEMPLATE_ENTITYRowChangeEvent + Public Class TBPMO_TEMPLATE_ENTITY_PATTERNRowChangeEvent Inherits Global.System.EventArgs - Private eventRow As TBPMO_TEMPLATE_ENTITYRow + Private eventRow As TBPMO_TEMPLATE_ENTITY_PATTERNRow Private eventAction As Global.System.Data.DataRowAction _ - Public Sub New(ByVal row As TBPMO_TEMPLATE_ENTITYRow, ByVal action As Global.System.Data.DataRowAction) + Public Sub New(ByVal row As TBPMO_TEMPLATE_ENTITY_PATTERNRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row Me.eventAction = action @@ -29046,7 +28994,7 @@ Partial Public Class DD_DMSDataSet _ - Public ReadOnly Property Row() As TBPMO_TEMPLATE_ENTITYRow + Public ReadOnly Property Row() As TBPMO_TEMPLATE_ENTITY_PATTERNRow Get Return Me.eventRow End Get @@ -42440,6 +42388,7 @@ Namespace DD_DMSDataSetTableAdapters tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") + tableMapping.ColumnMappings.Add("DOCTYPE_ID", "DOCTYPE_ID") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -42448,24 +42397,28 @@ Namespace DD_DMSDataSetTableAdapters Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", 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 TBPMO_TEMPLATE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (NAME, TEMPLATE_PATH, ACTIVE"& _ - ", ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@NAME,@TEMPLATE_PATH,@ACTIVE,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT "& _ - "GUID, NAME, TEMPLATE_PATH, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_W"& _ - "HEN FROM TBPMO_TEMPLATE WHERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandText = "INSERT INTO TBPMO_TEMPLATE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (NAME, TEMPLATE_PATH, DOCTYP"& _ + "E_ID, ACTIVE, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@NAME,@TEMPLATE_PATH,@DOCTYPE_ID,@ACTIV"& _ + "E,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, TEMPLATE_PATH, DOCTYPE_ID, ACTIVE, ADDED_WHO"& _ + ", ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_TEMPLATE 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, 100, 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("@TEMPLATE_PATH", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPLATE_PATH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, 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("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", 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 TBPMO_TEMPLATE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET NAME = @NAME, TEMPLATE_PATH = @TE"& _ - "MPLATE_PATH, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = "& _ - "@Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, TEMPLATE_PATH, ACTIVE, ADDED_WHO, ADDED_WH"& _ - "EN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_TEMPLATE WHERE (GUID = @GUID)" + "MPLATE_PATH, DOCTYPE_ID = @DOCTYPE_ID, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_"& _ + "WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, NAME, TEMPLATE_PATH, D"& _ + "OCTYPE_ID, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_T"& _ + "EMPLATE 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, 100, 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("@TEMPLATE_PATH", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPLATE_PATH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, 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("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, 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("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) @@ -42485,7 +42438,8 @@ Namespace DD_DMSDataSetTableAdapters 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 TBPMO_TEMPLATE.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPMO_TEMPLATE" + Me._commandCollection(0).CommandText = "SELECT GUID, NAME, TEMPLATE_PATH, DOCTYPE_ID, ACTIVE, ADDED_WHO, ADDED_WHE"& _ + "N, CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPMO_TEMPLATE" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text End Sub @@ -42566,7 +42520,7 @@ Namespace DD_DMSDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)> _ - Public Overloads Overridable Function Insert(ByVal NAME As String, ByVal TEMPLATE_PATH As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String) As Integer + Public Overloads Overridable Function Insert(ByVal NAME As String, ByVal TEMPLATE_PATH As String, ByVal DOCTYPE_ID As Integer, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String) As Integer If (NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("NAME") Else @@ -42577,11 +42531,12 @@ Namespace DD_DMSDataSetTableAdapters Else Me.Adapter.InsertCommand.Parameters(1).Value = CType(TEMPLATE_PATH,String) End If - Me.Adapter.InsertCommand.Parameters(2).Value = CType(ACTIVE,Boolean) + Me.Adapter.InsertCommand.Parameters(2).Value = CType(DOCTYPE_ID,Integer) + Me.Adapter.InsertCommand.Parameters(3).Value = CType(ACTIVE,Boolean) If (ADDED_WHO Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(3).Value = Global.System.DBNull.Value + Me.Adapter.InsertCommand.Parameters(4).Value = Global.System.DBNull.Value Else - Me.Adapter.InsertCommand.Parameters(3).Value = CType(ADDED_WHO,String) + Me.Adapter.InsertCommand.Parameters(4).Value = CType(ADDED_WHO,String) 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) _ @@ -42602,7 +42557,7 @@ Namespace DD_DMSDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)> _ - Public Overloads Overridable Function Update(ByVal NAME As String, ByVal TEMPLATE_PATH As String, ByVal ACTIVE As Boolean, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + Public Overloads Overridable Function Update(ByVal NAME As String, ByVal TEMPLATE_PATH As String, ByVal DOCTYPE_ID As Integer, ByVal ACTIVE As Boolean, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer If (NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("NAME") Else @@ -42613,14 +42568,15 @@ Namespace DD_DMSDataSetTableAdapters Else Me.Adapter.UpdateCommand.Parameters(1).Value = CType(TEMPLATE_PATH,String) End If - Me.Adapter.UpdateCommand.Parameters(2).Value = CType(ACTIVE,Boolean) + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(DOCTYPE_ID,Integer) + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(ACTIVE,Boolean) If (CHANGED_WHO Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(3).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(3).Value = CType(CHANGED_WHO,String) + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(CHANGED_WHO,String) End If - Me.Adapter.UpdateCommand.Parameters(4).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(5).Value = CType(GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(5).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(6).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 @@ -42646,7 +42602,7 @@ Namespace DD_DMSDataSetTableAdapters Global.System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner"& _ ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ - Partial Public Class TBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter + Partial Public Class TBPMO_TEMPLATE_ENTITYTableAdapter Inherits Global.System.ComponentModel.Component Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter @@ -42763,54 +42719,38 @@ Namespace DD_DMSDataSetTableAdapters Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() tableMapping.SourceTable = "Table" - tableMapping.DataSetTable = "TBPMO_TEMPLATE_ENTITY_PATTERN" + tableMapping.DataSetTable = "TBPMO_TEMPLATE_ENTITY" tableMapping.ColumnMappings.Add("GUID", "GUID") - tableMapping.ColumnMappings.Add("TEMPL_ENT_ID", "TEMPL_ENT_ID") - tableMapping.ColumnMappings.Add("NAME_PATTERN", "NAME_PATTERN") - tableMapping.ColumnMappings.Add("FIXED_VALUE", "FIXED_VALUE") - tableMapping.ColumnMappings.Add("CONNECTION_ID", "CONNECTION_ID") - tableMapping.ColumnMappings.Add("SQL_COMMAND", "SQL_COMMAND") + tableMapping.ColumnMappings.Add("TEMPLATE_ID", "TEMPLATE_ID") + tableMapping.ColumnMappings.Add("ENTITY_ID", "ENTITY_ID") 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 TBPMO_TEMPLATE_ENTITY_PATTERN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBPMO_TEMPLATE_ENTITY"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" 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, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", 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 TBPMO_TEMPLATE_ENTITY_PATTERN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (TEMPL_ENT_ID"& _ - ", NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL_COMMAND, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES "& _ - " (@TEMPL_ENT_ID,@NAME_PATTERN,@FIXED_VALUE,@CONNECTION_ID,@SQL_COMMAND,@ADDED_"& _ - "WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, TEMPL_ENT_ID, NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL"& _ - "_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_TEMPLATE_E"& _ - "NTITY_PATTERN WHERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandText = "INSERT INTO TBPMO_TEMPLATE_ENTITY"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (TEMPLATE_ID, ENTITY_"& _ + "ID, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@TEMPLATE_ID,@ENTITY_ID,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUI"& _ + "D, TEMPLATE_ID, ENTITY_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHEN FROM TBPMO_TEMPLA"& _ + "TE_ENTITY WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEMPL_ENT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPL_ENT_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME_PATTERN", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME_PATTERN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FIXED_VALUE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "FIXED_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_COMMAND", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEMPLATE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPLATE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", 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, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", 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 TBPMO_TEMPLATE_ENTITY_PATTERN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET TEMPL_ENT_ID = @TE"& _ - "MPL_ENT_ID, NAME_PATTERN = @NAME_PATTERN, FIXED_VALUE = @FIXED_VALUE, CONNECTION"& _ - "_ID = @CONNECTION_ID, SQL_COMMAND = @SQL_COMMAND, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHA"& _ - "NGED_WHO = @CHANGED_WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, TE"& _ - "MPL_ENT_ID, NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL_COMMAND, ADDED_WHO, AD"& _ - "DED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_TEMPLATE_ENTITY_PATTERN WHERE (GU"& _ - "ID = @GUID)" + Me._adapter.UpdateCommand.CommandText = "UPDATE TBPMO_TEMPLATE_ENTITY"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET TEMPLATE_ID = @TEMPLATE_ID"& _ + ", ENTITY_ID = @ENTITY_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, T"& _ + "EMPLATE_ID, ENTITY_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHEN FROM TBPMO_TEMPLATE_E"& _ + "NTITY WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEMPL_ENT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPL_ENT_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME_PATTERN", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME_PATTERN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FIXED_VALUE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "FIXED_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_COMMAND", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", 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, 50, 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("@TEMPLATE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPLATE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", 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, 4, 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("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub @@ -42828,233 +42768,189 @@ Namespace DD_DMSDataSetTableAdapters 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, TEMPL_ENT_ID, NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL_C"& _ - "OMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPMO_"& _ - "TEMPLATE_ENTITY_PATTERN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (TEMPL_ENT_ID = @TEMPL_ENT_ID)" + Me._commandCollection(0).CommandText = "SELECT GUID, TEMPLATE_ID, ENTITY_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHEN" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & _ + "FROM TBPMO_TEMPLATE_ENTITY" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE (TEMPLATE_ID = @TEMPL_ID)" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEMPL_ENT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPL_ENT_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEMPL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPLATE_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) End Sub - - _ - Public Overloads Overridable Function Fill(ByVal dataTable As DD_DMSDataSet.TBPMO_TEMPLATE_ENTITY_PATTERNDataTable, ByVal TEMPL_ENT_ID As Integer) As Integer + + _ + Public Overridable Overloads Function Fill(ByVal dataTable As DD_DMSDataSet.TBPMO_TEMPLATE_ENTITYDataTable, ByVal TEMPL_ID As Integer) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(0) - Me.Adapter.SelectCommand.Parameters(0).Value = CType(TEMPL_ENT_ID,Integer) - If (Me.ClearBeforeFill = true) Then - dataTable.Clear + Me.Adapter.SelectCommand.Parameters(0).Value = CType(TEMPL_ID, Integer) + 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(ByVal TEMPL_ENT_ID As Integer) As DD_DMSDataSet.TBPMO_TEMPLATE_ENTITY_PATTERNDataTable + + _ + Public Overridable Overloads Function GetData(ByVal TEMPL_ID As Integer) As DD_DMSDataSet.TBPMO_TEMPLATE_ENTITYDataTable Me.Adapter.SelectCommand = Me.CommandCollection(0) - Me.Adapter.SelectCommand.Parameters(0).Value = CType(TEMPL_ENT_ID,Integer) - Dim dataTable As DD_DMSDataSet.TBPMO_TEMPLATE_ENTITY_PATTERNDataTable = New DD_DMSDataSet.TBPMO_TEMPLATE_ENTITY_PATTERNDataTable() + Me.Adapter.SelectCommand.Parameters(0).Value = CType(TEMPL_ID, Integer) + Dim dataTable As DD_DMSDataSet.TBPMO_TEMPLATE_ENTITYDataTable = New DD_DMSDataSet.TBPMO_TEMPLATE_ENTITYDataTable() Me.Adapter.Fill(dataTable) Return dataTable End Function - - _ - Public Overloads Overridable Function Update(ByVal dataTable As DD_DMSDataSet.TBPMO_TEMPLATE_ENTITY_PATTERNDataTable) As Integer + + _ + Public Overridable Overloads Function Update(ByVal dataTable As DD_DMSDataSet.TBPMO_TEMPLATE_ENTITYDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function - - _ - Public Overloads Overridable Function Update(ByVal dataSet As DD_DMSDataSet) As Integer - Return Me.Adapter.Update(dataSet, "TBPMO_TEMPLATE_ENTITY_PATTERN") + + _ + Public Overridable Overloads Function Update(ByVal dataSet As DD_DMSDataSet) As Integer + Return Me.Adapter.Update(dataSet, "TBPMO_TEMPLATE_ENTITY") End Function - - _ - Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer + + _ + Public Overridable Overloads 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 + + _ + Public Overridable Overloads 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) As Integer - Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) + + _ + Public Overridable Overloads Function Delete(ByVal Original_GUID As Integer) As Integer + Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID, Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State - If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then - Me.Adapter.DeleteCommand.Connection.Open + Me.Adapter.DeleteCommand.Connection.Open() End If - Try + 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 + Me.Adapter.DeleteCommand.Connection.Close() End If End Try End Function - - _ - Public Overloads Overridable Function Insert(ByVal TEMPL_ENT_ID As Integer, ByVal NAME_PATTERN As String, ByVal FIXED_VALUE As String, ByVal CONNECTION_ID As Global.System.Nullable(Of Integer), ByVal SQL_COMMAND As String, ByVal ADDED_WHO As String) As Integer - Me.Adapter.InsertCommand.Parameters(0).Value = CType(TEMPL_ENT_ID,Integer) - If (NAME_PATTERN Is Nothing) Then - Throw New Global.System.ArgumentNullException("NAME_PATTERN") - Else - Me.Adapter.InsertCommand.Parameters(1).Value = CType(NAME_PATTERN,String) - End If - If (FIXED_VALUE Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(2).Value = Global.System.DBNull.Value - Else - Me.Adapter.InsertCommand.Parameters(2).Value = CType(FIXED_VALUE,String) - End If - If (CONNECTION_ID.HasValue = true) Then - Me.Adapter.InsertCommand.Parameters(3).Value = CType(CONNECTION_ID.Value,Integer) - Else - Me.Adapter.InsertCommand.Parameters(3).Value = Global.System.DBNull.Value - End If - If (SQL_COMMAND Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(4).Value = Global.System.DBNull.Value - Else - Me.Adapter.InsertCommand.Parameters(4).Value = CType(SQL_COMMAND,String) - End If + + _ + Public Overridable Overloads Function Insert(ByVal TEMPLATE_ID As Integer, ByVal ENTITY_ID As Integer, ByVal ADDED_WHO As String) As Integer + Me.Adapter.InsertCommand.Parameters(0).Value = CType(TEMPLATE_ID, Integer) + Me.Adapter.InsertCommand.Parameters(1).Value = CType(ENTITY_ID, Integer) If (ADDED_WHO Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value + Me.Adapter.InsertCommand.Parameters(2).Value = Global.System.DBNull.Value Else - Me.Adapter.InsertCommand.Parameters(5).Value = CType(ADDED_WHO,String) + Me.Adapter.InsertCommand.Parameters(2).Value = CType(ADDED_WHO, String) 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) _ + If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then - Me.Adapter.InsertCommand.Connection.Open + Me.Adapter.InsertCommand.Connection.Open() End If - Try + 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 + Me.Adapter.InsertCommand.Connection.Close() End If End Try End Function - - _ - Public Overloads Overridable Function Update(ByVal TEMPL_ENT_ID As Integer, ByVal NAME_PATTERN As String, ByVal FIXED_VALUE As String, ByVal CONNECTION_ID As Global.System.Nullable(Of Integer), ByVal SQL_COMMAND As String, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer - Me.Adapter.UpdateCommand.Parameters(0).Value = CType(TEMPL_ENT_ID,Integer) - If (NAME_PATTERN Is Nothing) Then - Throw New Global.System.ArgumentNullException("NAME_PATTERN") - Else - Me.Adapter.UpdateCommand.Parameters(1).Value = CType(NAME_PATTERN,String) - End If - If (FIXED_VALUE Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(2).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(2).Value = CType(FIXED_VALUE,String) - End If - If (CONNECTION_ID.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(3).Value = CType(CONNECTION_ID.Value,Integer) - Else - Me.Adapter.UpdateCommand.Parameters(3).Value = Global.System.DBNull.Value - End If - If (SQL_COMMAND Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(4).Value = CType(SQL_COMMAND,String) - End If - If (CHANGED_WHO Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(5).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(5).Value = CType(CHANGED_WHO,String) - End If - Me.Adapter.UpdateCommand.Parameters(6).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(7).Value = CType(GUID,Integer) + + _ + Public Overridable Overloads Function Update(ByVal TEMPLATE_ID As Integer, ByVal ENTITY_ID As Integer, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(TEMPLATE_ID, Integer) + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(ENTITY_ID, Integer) + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(Original_GUID, Integer) + Me.Adapter.UpdateCommand.Parameters(3).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) _ + If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then - Me.Adapter.UpdateCommand.Connection.Open + Me.Adapter.UpdateCommand.Connection.Open() End If - Try + 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 + Me.Adapter.UpdateCommand.Connection.Close() End If End Try End Function End Class - + ''' '''Represents the connection and commands used to retrieve and save data. ''' - _ - Partial Public Class TBPMO_TEMPLATE_ENTITYTableAdapter + _ + Partial Public Class TBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter 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 + 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 + 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 + Me.InitConnection() End If Return Me._connection End Get - Set + Set(value As Global.System.Data.SqlClient.SqlConnection) Me._connection = value If (Not (Me.Adapter.InsertCommand) Is Nothing) Then Me.Adapter.InsertCommand.Connection = value @@ -43068,260 +42964,406 @@ Namespace DD_DMSDataSetTableAdapters 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 + 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 + Set(value As Global.System.Data.SqlClient.SqlTransaction) 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) _ + 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) _ + 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) _ + 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 + Me.InitCommandCollection() End If Return Me._commandCollection End Get End Property - - _ + + _ Public Property ClearBeforeFill() As Boolean Get Return Me._clearBeforeFill End Get - Set + Set(value As Boolean) Me._clearBeforeFill = value End Set End Property - - _ + + _ Private Sub InitAdapter() Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() tableMapping.SourceTable = "Table" - tableMapping.DataSetTable = "TBPMO_TEMPLATE_ENTITY" + tableMapping.DataSetTable = "TBPMO_TEMPLATE_ENTITY_PATTERN" tableMapping.ColumnMappings.Add("GUID", "GUID") tableMapping.ColumnMappings.Add("TEMPLATE_ID", "TEMPLATE_ID") - tableMapping.ColumnMappings.Add("ENTITY_ID", "ENTITY_ID") - tableMapping.ColumnMappings.Add("DOCTYPE_ID", "DOCTYPE_ID") + tableMapping.ColumnMappings.Add("NAME_PATTERN", "NAME_PATTERN") + tableMapping.ColumnMappings.Add("FIXED_VALUE", "FIXED_VALUE") + tableMapping.ColumnMappings.Add("CONNECTION_ID", "CONNECTION_ID") + tableMapping.ColumnMappings.Add("SQL_COMMAND", "SQL_COMMAND") 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") - tableMapping.ColumnMappings.Add("EntityString", "EntityString") - tableMapping.ColumnMappings.Add("DocType", "DocType") 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 TBPMO_TEMPLATE_ENTITY"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBPMO_TEMPLATE_ENTITY_PATTERN] WHERE (([GUID] = @Original_GUID) AND " & _ + "([TEMPLATE_ID] = @Original_TEMPLATE_ID) AND ([NAME_PATTERN] = @Original_NAME_PAT" & _ + "TERN) AND ((@IsNull_FIXED_VALUE = 1 AND [FIXED_VALUE] IS NULL) OR ([FIXED_VALUE]" & _ + " = @Original_FIXED_VALUE)) AND ((@IsNull_CONNECTION_ID = 1 AND [CONNECTION_ID] I" & _ + "S NULL) OR ([CONNECTION_ID] = @Original_CONNECTION_ID)) AND ((@IsNull_SQL_COMMAN" & _ + "D = 1 AND [SQL_COMMAND] IS NULL) OR ([SQL_COMMAND] = @Original_SQL_COMMAND)) AND" & _ + " ((@IsNull_ADDED_WHO = 1 AND [ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_AD" & _ + "DED_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 NU" & _ + "LL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 A" & _ + "ND [CHANGED_WHEN] IS NULL) OR ([CHANGED_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, 4, 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("@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("@Original_TEMPLATE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPLATE_ID", Global.System.Data.DataRowVersion.Original, False, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_NAME_PATTERN", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME_PATTERN", Global.System.Data.DataRowVersion.Original, False, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_FIXED_VALUE", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FIXED_VALUE", Global.System.Data.DataRowVersion.Original, True, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FIXED_VALUE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FIXED_VALUE", Global.System.Data.DataRowVersion.Original, False, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CONNECTION_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Original, True, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CONNECTION_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Original, False, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_SQL_COMMAND", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", Global.System.Data.DataRowVersion.Original, True, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SQL_COMMAND", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", 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 TBPMO_TEMPLATE_ENTITY"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (TEMPLATE_ID, ENTITY_"& _ - "ID, DOCTYPE_ID, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@TEMPLATE_ID,@ENTITY_ID,@DOCTYPE_ID,@"& _ - "ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_"& _ - "WHEN, CHANGED_WHEN FROM TBPMO_TEMPLATE_ENTITY WHERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBPMO_TEMPLATE_ENTITY_PATTERN] ([TEMPLATE_ID], [NAME_PATTERN], [FIXE" & _ + "D_VALUE], [CONNECTION_ID], [SQL_COMMAND], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WH" & _ + "O], [CHANGED_WHEN]) VALUES (@TEMPLATE_ID, @NAME_PATTERN, @FIXED_VALUE, @CONNECTI" & _ + "ON_ID, @SQL_COMMAND, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN);" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SEL" & _ + "ECT GUID, TEMPLATE_ID, NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL_COMMAND, AD" & _ + "DED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_TEMPLATE_ENTITY_PATTER" & _ + "N WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEMPLATE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPLATE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", 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, 50, 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("@TEMPLATE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPLATE_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME_PATTERN", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME_PATTERN", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FIXED_VALUE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FIXED_VALUE", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_COMMAND", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", 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 TBPMO_TEMPLATE_ENTITY"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET TEMPLATE_ID = @TEMPLATE_ID"& _ - ", ENTITY_ID = @ENTITY_ID, DOCTYPE_ID = @DOCTYPE_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Origin"& _ - "al_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WH"& _ - "EN, CHANGED_WHEN FROM TBPMO_TEMPLATE_ENTITY WHERE (GUID = @GUID)" + Me._adapter.UpdateCommand.CommandText = "UPDATE TBPMO_TEMPLATE_ENTITY_PATTERN" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SET TEMPLATE_ID = @TEM" & _ + "PLATE_ID, NAME_PATTERN = @NAME_PATTERN, FIXED_VALUE = @FIXED_VALUE, CONNECTION_I" & _ + "D = @CONNECTION_ID, SQL_COMMAND = @SQL_COMMAND, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " CHANG" & _ + "ED_WHO = @CHANGED_WHO" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE (GUID = @Original_GUID); " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "SELECT GUID, TEMP" & _ + "LATE_ID, NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL_COMMAND, ADDED_WHO, ADDED" & _ + "_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_TEMPLATE_ENTITY_PATTERN WHERE (GUID " & _ + "= @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEMPLATE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPLATE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ENTITY_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "ENTITY_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", 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, 4, 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("@GUID", Global.System.Data.SqlDbType.Int, 4, 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("@TEMPLATE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPLATE_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME_PATTERN", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME_PATTERN", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FIXED_VALUE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "FIXED_VALUE", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_COMMAND", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", 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, 50, 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("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, 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("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, False, Nothing, "", "", "")) End Sub - - _ + + _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() Me._connection.ConnectionString = Global.DD_Record_Organiser.My.MySettings.Default.DD_DMSConnectionString End Sub - - _ + + _ Private Sub InitCommandCollection() Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection - Me._commandCollection(0).CommandText = "SELECT TBPMO_TEMPLATE_ENTITY.GUID, TBPMO_TEMPLATE_ENTITY.TEMPLATE_ID, TBPM"& _ - "O_TEMPLATE_ENTITY.ENTITY_ID, TBPMO_TEMPLATE_ENTITY.DOCTYPE_ID, TBPMO_TEMPLATE_EN"& _ - "TITY.ADDED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBPMO_TEMPLATE_ENTITY.ADDED_WHEN, TBP"& _ - "MO_TEMPLATE_ENTITY.CHANGED_WHEN, TBPMO_FORM.NAME AS EntityString, TBDD_DOKUMENTA"& _ - "RT.BEZEICHNUNG AS DocType"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPMO_TEMPLATE_ENTITY INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ - " TBDD_DOKUMENTART ON TBPMO_TEMPLATE_ENTITY.DOCTYPE_ID = TBD"& _ - "D_DOKUMENTART.GUID INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBPMO_FORM ON TBPMO_TEMP"& _ - "LATE_ENTITY.ENTITY_ID = TBPMO_FORM.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (TBPMO_TEMPLATE_ENTITY.TEM"& _ - "PLATE_ID = @TEMPLATE_ID)" + Me._commandCollection(0).CommandText = "SELECT GUID, TEMPLATE_ID, NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL_CO" & _ + "MMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "FROM TBPMO_T" & _ + "EMPLATE_ENTITY_PATTERN" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "WHERE (TEMPLATE_ID = @TEMPL_ID)" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEMPLATE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPLATE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEMPL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "TEMPLATE_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) End Sub - - _ - Public Overloads Overridable Function Fill(ByVal dataTable As DD_DMSDataSet.TBPMO_TEMPLATE_ENTITYDataTable, ByVal TEMPLATE_ID As Integer) As Integer + + _ + Public Overridable Overloads Function Fill(ByVal dataTable As DD_DMSDataSet.TBPMO_TEMPLATE_ENTITY_PATTERNDataTable, ByVal TEMPL_ID As Integer) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(0) - Me.Adapter.SelectCommand.Parameters(0).Value = CType(TEMPLATE_ID,Integer) - If (Me.ClearBeforeFill = true) Then - dataTable.Clear + Me.Adapter.SelectCommand.Parameters(0).Value = CType(TEMPL_ID, Integer) + 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(ByVal TEMPLATE_ID As Integer) As DD_DMSDataSet.TBPMO_TEMPLATE_ENTITYDataTable + + _ + Public Overridable Overloads Function GetData(ByVal TEMPL_ID As Integer) As DD_DMSDataSet.TBPMO_TEMPLATE_ENTITY_PATTERNDataTable Me.Adapter.SelectCommand = Me.CommandCollection(0) - Me.Adapter.SelectCommand.Parameters(0).Value = CType(TEMPLATE_ID,Integer) - Dim dataTable As DD_DMSDataSet.TBPMO_TEMPLATE_ENTITYDataTable = New DD_DMSDataSet.TBPMO_TEMPLATE_ENTITYDataTable() + Me.Adapter.SelectCommand.Parameters(0).Value = CType(TEMPL_ID, Integer) + Dim dataTable As DD_DMSDataSet.TBPMO_TEMPLATE_ENTITY_PATTERNDataTable = New DD_DMSDataSet.TBPMO_TEMPLATE_ENTITY_PATTERNDataTable() Me.Adapter.Fill(dataTable) Return dataTable End Function - - _ - Public Overloads Overridable Function Update(ByVal dataTable As DD_DMSDataSet.TBPMO_TEMPLATE_ENTITYDataTable) As Integer + + _ + Public Overridable Overloads Function Update(ByVal dataTable As DD_DMSDataSet.TBPMO_TEMPLATE_ENTITY_PATTERNDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function - - _ - Public Overloads Overridable Function Update(ByVal dataSet As DD_DMSDataSet) As Integer - Return Me.Adapter.Update(dataSet, "TBPMO_TEMPLATE_ENTITY") + + _ + Public Overridable Overloads Function Update(ByVal dataSet As DD_DMSDataSet) As Integer + Return Me.Adapter.Update(dataSet, "TBPMO_TEMPLATE_ENTITY_PATTERN") End Function - - _ - Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer + + _ + Public Overridable Overloads 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 + + _ + Public Overridable Overloads 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) As Integer - Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) + + _ + Public Overridable Overloads Function Delete(ByVal Original_GUID As Integer, ByVal Original_TEMPLATE_ID As Integer, ByVal Original_NAME_PATTERN As String, ByVal Original_FIXED_VALUE As String, ByVal Original_CONNECTION_ID As Global.System.Nullable(Of Integer), ByVal Original_SQL_COMMAND 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) + Me.Adapter.DeleteCommand.Parameters(1).Value = CType(Original_TEMPLATE_ID, Integer) + If (Original_NAME_PATTERN Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_NAME_PATTERN") + Else + Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_NAME_PATTERN, String) + End If + If (Original_FIXED_VALUE Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(3).Value = CType(1, Object) + Me.Adapter.DeleteCommand.Parameters(4).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(3).Value = CType(0, Object) + Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_FIXED_VALUE, String) + End If + If (Original_CONNECTION_ID.HasValue = True) Then + Me.Adapter.DeleteCommand.Parameters(5).Value = CType(0, Object) + Me.Adapter.DeleteCommand.Parameters(6).Value = CType(Original_CONNECTION_ID.Value, Integer) + Else + Me.Adapter.DeleteCommand.Parameters(5).Value = CType(1, Object) + Me.Adapter.DeleteCommand.Parameters(6).Value = Global.System.DBNull.Value + End If + If (Original_SQL_COMMAND 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_SQL_COMMAND, 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) _ + If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then - Me.Adapter.DeleteCommand.Connection.Open + Me.Adapter.DeleteCommand.Connection.Open() End If - Try + 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 + Me.Adapter.DeleteCommand.Connection.Close() End If End Try End Function - - _ - Public Overloads Overridable Function Insert(ByVal TEMPLATE_ID As Integer, ByVal ENTITY_ID As Integer, ByVal DOCTYPE_ID As Integer, ByVal ADDED_WHO As String) As Integer - Me.Adapter.InsertCommand.Parameters(0).Value = CType(TEMPLATE_ID,Integer) - Me.Adapter.InsertCommand.Parameters(1).Value = CType(ENTITY_ID,Integer) - Me.Adapter.InsertCommand.Parameters(2).Value = CType(DOCTYPE_ID,Integer) - If (ADDED_WHO Is Nothing) Then + + _ + Public Overridable Overloads Function Insert(ByVal TEMPLATE_ID As Integer, ByVal NAME_PATTERN As String, ByVal FIXED_VALUE As String, ByVal CONNECTION_ID As Global.System.Nullable(Of Integer), ByVal SQL_COMMAND 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 + Me.Adapter.InsertCommand.Parameters(0).Value = CType(TEMPLATE_ID, Integer) + If (NAME_PATTERN Is Nothing) Then + Throw New Global.System.ArgumentNullException("NAME_PATTERN") + Else + Me.Adapter.InsertCommand.Parameters(1).Value = CType(NAME_PATTERN, String) + End If + If (FIXED_VALUE Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(2).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(2).Value = CType(FIXED_VALUE, String) + End If + If (CONNECTION_ID.HasValue = True) Then + Me.Adapter.InsertCommand.Parameters(3).Value = CType(CONNECTION_ID.Value, Integer) + Else Me.Adapter.InsertCommand.Parameters(3).Value = Global.System.DBNull.Value + End If + If (SQL_COMMAND Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(4).Value = Global.System.DBNull.Value Else - Me.Adapter.InsertCommand.Parameters(3).Value = CType(ADDED_WHO,String) + Me.Adapter.InsertCommand.Parameters(4).Value = CType(SQL_COMMAND, String) + End If + If (ADDED_WHO Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(5).Value = CType(ADDED_WHO, String) + End If + If (ADDED_WHEN.HasValue = True) Then + Me.Adapter.InsertCommand.Parameters(6).Value = CType(ADDED_WHEN.Value, Date) + Else + Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(7).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(7).Value = CType(CHANGED_WHO, String) + End If + If (CHANGED_WHEN.HasValue = True) Then + Me.Adapter.InsertCommand.Parameters(8).Value = CType(CHANGED_WHEN.Value, Date) + Else + Me.Adapter.InsertCommand.Parameters(8).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) _ + If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then - Me.Adapter.InsertCommand.Connection.Open + Me.Adapter.InsertCommand.Connection.Open() End If - Try + 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 + Me.Adapter.InsertCommand.Connection.Close() End If End Try End Function - - _ - Public Overloads Overridable Function Update(ByVal TEMPLATE_ID As Integer, ByVal ENTITY_ID As Integer, ByVal DOCTYPE_ID As Integer, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer - Me.Adapter.UpdateCommand.Parameters(0).Value = CType(TEMPLATE_ID,Integer) - Me.Adapter.UpdateCommand.Parameters(1).Value = CType(ENTITY_ID,Integer) - Me.Adapter.UpdateCommand.Parameters(2).Value = CType(DOCTYPE_ID,Integer) - Me.Adapter.UpdateCommand.Parameters(3).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(4).Value = CType(GUID,Integer) + + _ + Public Overridable Overloads Function Update(ByVal TEMPLATE_ID As Integer, ByVal NAME_PATTERN As String, ByVal FIXED_VALUE As String, ByVal CONNECTION_ID As Global.System.Nullable(Of Integer), ByVal SQL_COMMAND As String, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(TEMPLATE_ID, Integer) + If (NAME_PATTERN Is Nothing) Then + Throw New Global.System.ArgumentNullException("NAME_PATTERN") + Else + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(NAME_PATTERN, String) + End If + If (FIXED_VALUE Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(2).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(FIXED_VALUE, String) + End If + If (CONNECTION_ID.HasValue = True) Then + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(CONNECTION_ID.Value, Integer) + Else + Me.Adapter.UpdateCommand.Parameters(3).Value = Global.System.DBNull.Value + End If + If (SQL_COMMAND Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(SQL_COMMAND, String) + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(5).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(5).Value = CType(CHANGED_WHO, String) + End If + Me.Adapter.UpdateCommand.Parameters(6).Value = CType(Original_GUID, Integer) + Me.Adapter.UpdateCommand.Parameters(7).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) _ + If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then - Me.Adapter.UpdateCommand.Connection.Open + Me.Adapter.UpdateCommand.Connection.Open() End If - Try + 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 + Me.Adapter.UpdateCommand.Connection.Close() End If End Try End Function @@ -43390,10 +43432,10 @@ Namespace DD_DMSDataSetTableAdapters Private _tBPMO_TEMPLATETableAdapter As TBPMO_TEMPLATETableAdapter - Private _tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter As TBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter - Private _tBPMO_TEMPLATE_ENTITYTableAdapter As TBPMO_TEMPLATE_ENTITYTableAdapter + Private _tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter As TBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter + Private _backupDataSetBeforeUpdate As Boolean Private _connection As Global.System.Data.IDbConnection @@ -43764,12 +43806,12 @@ Namespace DD_DMSDataSetTableAdapters Global.System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso"& _ "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3"& _ "a", "System.Drawing.Design.UITypeEditor")> _ - Public Property TBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter() As TBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter + Public Property TBPMO_TEMPLATE_ENTITYTableAdapter() As TBPMO_TEMPLATE_ENTITYTableAdapter Get - Return Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter + Return Me._tBPMO_TEMPLATE_ENTITYTableAdapter End Get Set - Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter = value + Me._tBPMO_TEMPLATE_ENTITYTableAdapter = value End Set End Property @@ -43778,12 +43820,12 @@ Namespace DD_DMSDataSetTableAdapters Global.System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso"& _ "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3"& _ "a", "System.Drawing.Design.UITypeEditor")> _ - Public Property TBPMO_TEMPLATE_ENTITYTableAdapter() As TBPMO_TEMPLATE_ENTITYTableAdapter + Public Property TBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter() As TBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter Get - Return Me._tBPMO_TEMPLATE_ENTITYTableAdapter + Return Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter End Get Set - Me._tBPMO_TEMPLATE_ENTITYTableAdapter = value + Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter = value End Set End Property @@ -43906,14 +43948,14 @@ Namespace DD_DMSDataSetTableAdapters AndAlso (Not (Me._tBPMO_TEMPLATETableAdapter.Connection) Is Nothing)) Then Return Me._tBPMO_TEMPLATETableAdapter.Connection End If - If ((Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter) Is Nothing) _ - AndAlso (Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Connection) Is Nothing)) Then - Return Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Connection - End If If ((Not (Me._tBPMO_TEMPLATE_ENTITYTableAdapter) Is Nothing) _ AndAlso (Not (Me._tBPMO_TEMPLATE_ENTITYTableAdapter.Connection) Is Nothing)) Then Return Me._tBPMO_TEMPLATE_ENTITYTableAdapter.Connection End If + If ((Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter) Is Nothing) _ + AndAlso (Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Connection) Is Nothing)) Then + Return Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Connection + End If Return Nothing End Get Set @@ -44002,10 +44044,10 @@ Namespace DD_DMSDataSetTableAdapters If (Not (Me._tBPMO_TEMPLATETableAdapter) Is Nothing) Then count = (count + 1) End If - If (Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter) Is Nothing) Then + If (Not (Me._tBPMO_TEMPLATE_ENTITYTableAdapter) Is Nothing) Then count = (count + 1) End If - If (Not (Me._tBPMO_TEMPLATE_ENTITYTableAdapter) Is Nothing) Then + If (Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter) Is Nothing) Then count = (count + 1) End If Return count @@ -44217,12 +44259,12 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_TEMPLATE_ENTITY_PATTERN.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBPMO_TEMPLATE_ENTITYTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_TEMPLATE_ENTITY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) If ((Not (updatedRows) Is Nothing) _ AndAlso (0 < updatedRows.Length)) Then - result = (result + Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Update(updatedRows)) + result = (result + Me._tBPMO_TEMPLATE_ENTITYTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -44253,12 +44295,12 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(updatedRows) End If End If - If (Not (Me._tBPMO_TEMPLATE_ENTITYTableAdapter) Is Nothing) Then - Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_TEMPLATE_ENTITY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + If (Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBPMO_TEMPLATE_ENTITY_PATTERN.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_TEMPLATE_ENTITYTableAdapter.Update(updatedRows)) + result = (result + Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Update(updatedRows)) allChangedRows.AddRange(updatedRows) End If End If @@ -44448,11 +44490,11 @@ Namespace DD_DMSDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_TEMPLATE_ENTITY_PATTERN.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBPMO_TEMPLATE_ENTITYTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_TEMPLATE_ENTITY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Update(addedRows)) + result = (result + Me._tBPMO_TEMPLATE_ENTITYTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -44480,11 +44522,11 @@ Namespace DD_DMSDataSetTableAdapters allAddedRows.AddRange(addedRows) End If End If - If (Not (Me._tBPMO_TEMPLATE_ENTITYTableAdapter) Is Nothing) Then - Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_TEMPLATE_ENTITY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If (Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBPMO_TEMPLATE_ENTITY_PATTERN.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) If ((Not (addedRows) Is Nothing) _ AndAlso (0 < addedRows.Length)) Then - result = (result + Me._tBPMO_TEMPLATE_ENTITYTableAdapter.Update(addedRows)) + result = (result + Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Update(addedRows)) allAddedRows.AddRange(addedRows) End If End If @@ -44498,11 +44540,11 @@ Namespace DD_DMSDataSetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As DD_DMSDataSet, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 - If (Not (Me._tBPMO_TEMPLATE_ENTITYTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_TEMPLATE_ENTITY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_TEMPLATE_ENTITY_PATTERN.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPMO_TEMPLATE_ENTITYTableAdapter.Update(deletedRows)) + result = (result + Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If @@ -44530,11 +44572,11 @@ Namespace DD_DMSDataSetTableAdapters allChangedRows.AddRange(deletedRows) End If End If - If (Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter) Is Nothing) Then - Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_TEMPLATE_ENTITY_PATTERN.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If (Not (Me._tBPMO_TEMPLATE_ENTITYTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBPMO_TEMPLATE_ENTITY.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ AndAlso (0 < deletedRows.Length)) Then - result = (result + Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Update(deletedRows)) + result = (result + Me._tBPMO_TEMPLATE_ENTITYTableAdapter.Update(deletedRows)) allChangedRows.AddRange(deletedRows) End If End If @@ -44880,13 +44922,13 @@ Namespace DD_DMSDataSetTableAdapters 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._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter) Is Nothing) _ - AndAlso (Me.MatchTableAdapterConnection(Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Connection) = false)) Then + If ((Not (Me._tBPMO_TEMPLATE_ENTITYTableAdapter) Is Nothing) _ + AndAlso (Me.MatchTableAdapterConnection(Me._tBPMO_TEMPLATE_ENTITYTableAdapter.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 - If ((Not (Me._tBPMO_TEMPLATE_ENTITYTableAdapter) Is Nothing) _ - AndAlso (Me.MatchTableAdapterConnection(Me._tBPMO_TEMPLATE_ENTITYTableAdapter.Connection) = false)) Then + If ((Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter) Is Nothing) _ + AndAlso (Me.MatchTableAdapterConnection(Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.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 @@ -45149,15 +45191,6 @@ Namespace DD_DMSDataSetTableAdapters adaptersWithAcceptChangesDuringUpdate.Add(Me._tBPMO_TEMPLATETableAdapter.Adapter) End If End If - If (Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter) Is Nothing) Then - revertConnections.Add(Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter, Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Connection) - Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) - Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Transaction = CType(workTransaction,Global.System.Data.SqlClient.SqlTransaction) - If Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Adapter.AcceptChangesDuringUpdate Then - Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Adapter.AcceptChangesDuringUpdate = false - adaptersWithAcceptChangesDuringUpdate.Add(Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Adapter) - End If - End If If (Not (Me._tBPMO_TEMPLATE_ENTITYTableAdapter) Is Nothing) Then revertConnections.Add(Me._tBPMO_TEMPLATE_ENTITYTableAdapter, Me._tBPMO_TEMPLATE_ENTITYTableAdapter.Connection) Me._tBPMO_TEMPLATE_ENTITYTableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) @@ -45167,6 +45200,15 @@ Namespace DD_DMSDataSetTableAdapters adaptersWithAcceptChangesDuringUpdate.Add(Me._tBPMO_TEMPLATE_ENTITYTableAdapter.Adapter) End If End If + If (Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter) Is Nothing) Then + revertConnections.Add(Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter, Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Connection) + Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) + Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Transaction = CType(workTransaction,Global.System.Data.SqlClient.SqlTransaction) + If Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Adapter.AcceptChangesDuringUpdate Then + Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Adapter.AcceptChangesDuringUpdate = false + adaptersWithAcceptChangesDuringUpdate.Add(Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Adapter) + End If + End If ' '---- Perform updates ----------- ' @@ -45327,14 +45369,14 @@ Namespace DD_DMSDataSetTableAdapters Me._tBPMO_TEMPLATETableAdapter.Connection = CType(revertConnections(Me._tBPMO_TEMPLATETableAdapter),Global.System.Data.SqlClient.SqlConnection) Me._tBPMO_TEMPLATETableAdapter.Transaction = Nothing End If - If (Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter) Is Nothing) Then - Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Connection = CType(revertConnections(Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter),Global.System.Data.SqlClient.SqlConnection) - Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Transaction = Nothing - End If If (Not (Me._tBPMO_TEMPLATE_ENTITYTableAdapter) Is Nothing) Then Me._tBPMO_TEMPLATE_ENTITYTableAdapter.Connection = CType(revertConnections(Me._tBPMO_TEMPLATE_ENTITYTableAdapter),Global.System.Data.SqlClient.SqlConnection) Me._tBPMO_TEMPLATE_ENTITYTableAdapter.Transaction = Nothing End If + If (Not (Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter) Is Nothing) Then + Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.Connection = CType(revertConnections(Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter),Global.System.Data.SqlClient.SqlConnection) + Me._tBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter.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-Organiser/DD_DMSDataSet.xsc b/app/DD-Record-Organiser/DD_DMSDataSet.xsc index 0ca307e..b2d23c4 100644 --- a/app/DD-Record-Organiser/DD_DMSDataSet.xsc +++ b/app/DD-Record-Organiser/DD_DMSDataSet.xsc @@ -277,38 +277,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/DD-Record-Organiser/DD_DMSDataSet.xsd b/app/DD-Record-Organiser/DD_DMSDataSet.xsd index a322382..3ae6814 100644 --- a/app/DD-Record-Organiser/DD_DMSDataSet.xsd +++ b/app/DD-Record-Organiser/DD_DMSDataSet.xsd @@ -2615,20 +2615,21 @@ WHERE (GUID = @Original_GUID) INSERT INTO TBPMO_TEMPLATE - (NAME, TEMPLATE_PATH, ACTIVE, ADDED_WHO) -VALUES (@NAME,@TEMPLATE_PATH,@ACTIVE,@ADDED_WHO); -SELECT GUID, NAME, TEMPLATE_PATH, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_TEMPLATE WHERE (GUID = SCOPE_IDENTITY()) + (NAME, TEMPLATE_PATH, DOCTYPE_ID, ACTIVE, ADDED_WHO) +VALUES (@NAME,@TEMPLATE_PATH,@DOCTYPE_ID,@ACTIVE,@ADDED_WHO); +SELECT GUID, NAME, TEMPLATE_PATH, DOCTYPE_ID, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_TEMPLATE WHERE (GUID = SCOPE_IDENTITY()) + - - SELECT TBPMO_TEMPLATE.* + + SELECT GUID, NAME, TEMPLATE_PATH, DOCTYPE_ID, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_TEMPLATE @@ -2636,12 +2637,13 @@ FROM TBPMO_TEMPLATE UPDATE TBPMO_TEMPLATE -SET NAME = @NAME, TEMPLATE_PATH = @TEMPLATE_PATH, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_WHO +SET NAME = @NAME, TEMPLATE_PATH = @TEMPLATE_PATH, DOCTYPE_ID = @DOCTYPE_ID, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_WHO WHERE (GUID = @Original_GUID); -SELECT GUID, NAME, TEMPLATE_PATH, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_TEMPLATE WHERE (GUID = @GUID) +SELECT GUID, NAME, TEMPLATE_PATH, DOCTYPE_ID, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_TEMPLATE WHERE (GUID = @GUID) + @@ -2660,63 +2662,56 @@ SELECT GUID, NAME, TEMPLATE_PATH, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CH + - + - + - - DELETE FROM TBPMO_TEMPLATE_ENTITY_PATTERN + + DELETE FROM TBPMO_TEMPLATE_ENTITY WHERE (GUID = @Original_GUID) - + - - INSERT INTO TBPMO_TEMPLATE_ENTITY_PATTERN - (TEMPL_ENT_ID, NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL_COMMAND, ADDED_WHO) -VALUES (@TEMPL_ENT_ID,@NAME_PATTERN,@FIXED_VALUE,@CONNECTION_ID,@SQL_COMMAND,@ADDED_WHO); -SELECT GUID, TEMPL_ENT_ID, NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_TEMPLATE_ENTITY_PATTERN WHERE (GUID = SCOPE_IDENTITY()) + + INSERT INTO TBPMO_TEMPLATE_ENTITY + (TEMPLATE_ID, ENTITY_ID, ADDED_WHO) +VALUES (@TEMPLATE_ID,@ENTITY_ID,@ADDED_WHO); +SELECT GUID, TEMPLATE_ID, ENTITY_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHEN FROM TBPMO_TEMPLATE_ENTITY WHERE (GUID = SCOPE_IDENTITY()) - - - - - - + + + - SELECT GUID, TEMPL_ENT_ID, NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN -FROM TBPMO_TEMPLATE_ENTITY_PATTERN -WHERE (TEMPL_ENT_ID = @TEMPL_ENT_ID) + SELECT GUID, TEMPLATE_ID, ENTITY_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHEN +FROM TBPMO_TEMPLATE_ENTITY +WHERE (TEMPLATE_ID = @TEMPL_ID) - + - - UPDATE TBPMO_TEMPLATE_ENTITY_PATTERN -SET TEMPL_ENT_ID = @TEMPL_ENT_ID, NAME_PATTERN = @NAME_PATTERN, FIXED_VALUE = @FIXED_VALUE, CONNECTION_ID = @CONNECTION_ID, SQL_COMMAND = @SQL_COMMAND, - CHANGED_WHO = @CHANGED_WHO + + UPDATE TBPMO_TEMPLATE_ENTITY +SET TEMPLATE_ID = @TEMPLATE_ID, ENTITY_ID = @ENTITY_ID WHERE (GUID = @Original_GUID); -SELECT GUID, TEMPL_ENT_ID, NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_TEMPLATE_ENTITY_PATTERN WHERE (GUID = @GUID) +SELECT GUID, TEMPLATE_ID, ENTITY_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHEN FROM TBPMO_TEMPLATE_ENTITY WHERE (GUID = @GUID) - - - - - - - - + + + + @@ -2724,67 +2719,82 @@ SELECT GUID, TEMPL_ENT_ID, NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL_COMMAND - - - - - + + - - + - + - DELETE FROM TBPMO_TEMPLATE_ENTITY -WHERE (GUID = @Original_GUID) + DELETE FROM [TBPMO_TEMPLATE_ENTITY_PATTERN] WHERE (([GUID] = @Original_GUID) AND ([TEMPLATE_ID] = @Original_TEMPLATE_ID) AND ([NAME_PATTERN] = @Original_NAME_PATTERN) AND ((@IsNull_FIXED_VALUE = 1 AND [FIXED_VALUE] IS NULL) OR ([FIXED_VALUE] = @Original_FIXED_VALUE)) AND ((@IsNull_CONNECTION_ID = 1 AND [CONNECTION_ID] IS NULL) OR ([CONNECTION_ID] = @Original_CONNECTION_ID)) AND ((@IsNull_SQL_COMMAND = 1 AND [SQL_COMMAND] IS NULL) OR ([SQL_COMMAND] = @Original_SQL_COMMAND)) 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 TBPMO_TEMPLATE_ENTITY - (TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO) -VALUES (@TEMPLATE_ID,@ENTITY_ID,@DOCTYPE_ID,@ADDED_WHO); -SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHEN FROM TBPMO_TEMPLATE_ENTITY WHERE (GUID = SCOPE_IDENTITY()) + INSERT INTO [TBPMO_TEMPLATE_ENTITY_PATTERN] ([TEMPLATE_ID], [NAME_PATTERN], [FIXED_VALUE], [CONNECTION_ID], [SQL_COMMAND], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@TEMPLATE_ID, @NAME_PATTERN, @FIXED_VALUE, @CONNECTION_ID, @SQL_COMMAND, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN); +SELECT GUID, TEMPLATE_ID, NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_TEMPLATE_ENTITY_PATTERN WHERE (GUID = SCOPE_IDENTITY()) - - - - + + + + + + + + + - SELECT TBPMO_TEMPLATE_ENTITY.GUID, TBPMO_TEMPLATE_ENTITY.TEMPLATE_ID, TBPMO_TEMPLATE_ENTITY.ENTITY_ID, TBPMO_TEMPLATE_ENTITY.DOCTYPE_ID, TBPMO_TEMPLATE_ENTITY.ADDED_WHO, - TBPMO_TEMPLATE_ENTITY.ADDED_WHEN, TBPMO_TEMPLATE_ENTITY.CHANGED_WHEN, TBPMO_FORM.NAME AS EntityString, TBDD_DOKUMENTART.BEZEICHNUNG AS DocType -FROM TBPMO_TEMPLATE_ENTITY INNER JOIN - TBDD_DOKUMENTART ON TBPMO_TEMPLATE_ENTITY.DOCTYPE_ID = TBDD_DOKUMENTART.GUID INNER JOIN - TBPMO_FORM ON TBPMO_TEMPLATE_ENTITY.ENTITY_ID = TBPMO_FORM.GUID -WHERE (TBPMO_TEMPLATE_ENTITY.TEMPLATE_ID = @TEMPLATE_ID) + SELECT GUID, TEMPLATE_ID, NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN +FROM TBPMO_TEMPLATE_ENTITY_PATTERN +WHERE (TEMPLATE_ID = @TEMPL_ID) - + - UPDATE TBPMO_TEMPLATE_ENTITY -SET TEMPLATE_ID = @TEMPLATE_ID, ENTITY_ID = @ENTITY_ID, DOCTYPE_ID = @DOCTYPE_ID + UPDATE TBPMO_TEMPLATE_ENTITY_PATTERN +SET TEMPLATE_ID = @TEMPLATE_ID, NAME_PATTERN = @NAME_PATTERN, FIXED_VALUE = @FIXED_VALUE, CONNECTION_ID = @CONNECTION_ID, SQL_COMMAND = @SQL_COMMAND, + CHANGED_WHO = @CHANGED_WHO WHERE (GUID = @Original_GUID); -SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHEN FROM TBPMO_TEMPLATE_ENTITY WHERE (GUID = @GUID) +SELECT GUID, TEMPLATE_ID, NAME_PATTERN, FIXED_VALUE, CONNECTION_ID, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBPMO_TEMPLATE_ENTITY_PATTERN WHERE (GUID = @GUID) - - + + + + + @@ -2795,13 +2805,14 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - - + + + + + - - @@ -2813,7 +2824,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -2854,7 +2865,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -2932,7 +2943,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3027,7 +3038,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3050,7 +3061,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3095,7 +3106,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3133,7 +3144,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3168,7 +3179,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3205,7 +3216,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3226,7 +3237,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3263,7 +3274,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3289,7 +3300,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3330,7 +3341,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3377,7 +3388,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3422,7 +3433,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3489,7 +3500,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3526,7 +3537,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3581,7 +3592,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3620,7 +3631,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3744,7 +3755,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3806,7 +3817,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3836,7 +3847,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3866,7 +3877,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3903,7 +3914,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3928,7 +3939,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3948,7 +3959,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -3987,7 +3998,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -4031,7 +4042,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -4061,7 +4072,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -4108,7 +4119,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -4262,7 +4273,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -4287,7 +4298,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -4322,7 +4333,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -4351,7 +4362,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -4406,7 +4417,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -4465,7 +4476,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -4538,7 +4549,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -4636,7 +4647,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -4730,7 +4741,7 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - + @@ -4765,14 +4776,33 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ + - + - + + + + + + + + + + + + + + + + + + + @@ -4814,39 +4844,6 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4985,36 +4982,36 @@ SELECT GUID, TEMPLATE_ID, ENTITY_ID, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_ - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/DD-Record-Organiser/DD_DMSDataSet.xss b/app/DD-Record-Organiser/DD_DMSDataSet.xss index c302187..d42a202 100644 --- a/app/DD-Record-Organiser/DD_DMSDataSet.xss +++ b/app/DD-Record-Organiser/DD_DMSDataSet.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -44,9 +44,9 @@ - - - + + + @@ -281,51 +281,43 @@ - + - 1610 - 450 - - - 1610 - 376 + 299 + 348 - 2116 - 376 + 2068 + 348 - + - 299 - 264 + 2461 + 272 + + + 2461 + 317 - 2116 - 264 + 2368 + 317 - + - 2452 - 43 - - - 2452 - 13 - - - 2138 - 13 + 2501 + 272 - 2138 - 231 + 2501 + 522 diff --git a/app/DD-Record-Organiser/My Project/Resources.Designer.vb b/app/DD-Record-Organiser/My Project/Resources.Designer.vb index 276a7e7..9b1b58d 100644 --- a/app/DD-Record-Organiser/My Project/Resources.Designer.vb +++ b/app/DD-Record-Organiser/My Project/Resources.Designer.vb @@ -780,6 +780,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property FileSystemEditor_5852() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("FileSystemEditor_5852", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/app/DD-Record-Organiser/My Project/Resources.resx b/app/DD-Record-Organiser/My Project/Resources.resx index 9387468..41d9763 100644 --- a/app/DD-Record-Organiser/My Project/Resources.resx +++ b/app/DD-Record-Organiser/My Project/Resources.resx @@ -127,20 +127,20 @@ ..\Resources\note_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\1532_Flag_Blue.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\flag_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Einstellungen3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\database_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Men2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\PropertyGridEditorPart_6041.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\save.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -160,6 +160,9 @@ ..\Resources\database_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\dtp1.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\folder_Open_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,9 +181,6 @@ ..\Resources\database_table.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Monitor_Screen_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\table_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -193,18 +193,12 @@ ..\Resources\table.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\lbl.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\database.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Label_684.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\user_suit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\table_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -220,9 +214,6 @@ ..\Resources\handdrawn_arrow_right_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\color_wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -235,21 +226,18 @@ ..\Resources\Close_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\database_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\UserInterfaceEditor_5845.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\f2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\page_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ListBox_686_24.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\ico6078.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -262,18 +250,24 @@ ..\Resources\TextBox_708.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\calendar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\add1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\save1.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bug_edit1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\module_32xSM.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\folder_Open_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -289,8 +283,8 @@ ..\Resources\database_key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\005_Task_32x42_72.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_gear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\138_PushPin_32x42_721.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -301,12 +295,18 @@ ..\Resources\brainpool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\GroupBox_680.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Men6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\UserInterfaceEditor_5845_32x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\cancel1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\f6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -340,8 +340,8 @@ ..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\PropertyGridEditorPart_6041.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\shield_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -355,8 +355,8 @@ ..\Resources\folder_Open_32xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\bug_edit1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Men2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\lightbulb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -364,8 +364,8 @@ ..\Resources\Go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\1532_Flag_Blue.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\database_connect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -382,8 +382,8 @@ ..\Resources\ImageListControl_683.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\userAccounts.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -391,6 +391,9 @@ ..\Resources\folder_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ComboBox_672.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -406,11 +409,14 @@ ..\Resources\module_32xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\calendar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_gear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\grid_Data_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\lbl.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Home_5699_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -439,14 +445,14 @@ ..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\flag_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Einstellungen3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\CheckBox_669.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\grid_Data_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Monitor_Screen_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Property_501.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -454,20 +460,20 @@ ..\Resources\page_excel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\HomeHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Excel_25ixel.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\database_error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Table_748.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\GroupBox_680.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\f2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bricks.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -484,11 +490,11 @@ ..\Resources\user_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dtp1.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ComboBox_672.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\005_Task_32x42_72.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\AddressEnvelope_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -496,8 +502,8 @@ ..\Resources\cmb.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\HomeHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\user_suit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\FilteredObject_13400_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -511,16 +517,13 @@ ..\Resources\Checkbox.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ListBox_686_24.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\action_Cancel_16xLG1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\cancel1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\FileSystemEditor_5852.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/app/DD-Record-Organiser/Resources/FileSystemEditor_5852.png b/app/DD-Record-Organiser/Resources/FileSystemEditor_5852.png new file mode 100644 index 0000000000000000000000000000000000000000..4f0f0c76afb339a3cca02072086e853373c8c499 GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!4^*!#}Etut-+3b2NXCy=i2qX&nxZ>7x#$} zXxw;oX2FGwXm3x?HBs5!(`s&i|6%d`PejFe)*IUwN4BykGWc>fwJ}c9Qg~J`l98+Z zbdHr{{4ARZYndC~88v0t&0v_*=#Ziw!tcSDt~|}3%c6VgDMgQYO!<26G@^f+KmL`* fbhR3HZEuzV-NWGN>gTe~DWM4fp_)>P literal 0 HcmV?d00001 diff --git a/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb b/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb index 933a2d6..dacef2c 100644 --- a/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb +++ b/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb @@ -28,7 +28,6 @@ Partial Class frmDokumentart_Konfig Dim KURZNAMELabel As System.Windows.Forms.Label Dim ZIEL_PFADLabel As System.Windows.Forms.Label Dim BESCHREIBUNGLabel As System.Windows.Forms.Label - Dim NAMENKONVENTIONLabel As System.Windows.Forms.Label Dim ERSTELLTWERLabel As System.Windows.Forms.Label Dim ERSTELLTWANNLabel As System.Windows.Forms.Label Dim GEANDERTWERLabel As System.Windows.Forms.Label @@ -76,7 +75,6 @@ Partial Class frmDokumentart_Konfig Me.ZIEL_PFADTextBox = New System.Windows.Forms.TextBox() Me.BESCHREIBUNGTextBox = New System.Windows.Forms.TextBox() Me.AKTIVCheckBox = New System.Windows.Forms.CheckBox() - Me.NAMENKONVENTIONTextBox = New System.Windows.Forms.TextBox() Me.ERSTELLTWERTextBox = New System.Windows.Forms.TextBox() Me.ERSTELLTWANNTextBox = New System.Windows.Forms.TextBox() Me.GEANDERTWERTextBox = New System.Windows.Forms.TextBox() @@ -155,7 +153,6 @@ Partial Class frmDokumentart_Konfig KURZNAMELabel = New System.Windows.Forms.Label() ZIEL_PFADLabel = New System.Windows.Forms.Label() BESCHREIBUNGLabel = New System.Windows.Forms.Label() - NAMENKONVENTIONLabel = New System.Windows.Forms.Label() ERSTELLTWERLabel = New System.Windows.Forms.Label() ERSTELLTWANNLabel = New System.Windows.Forms.Label() GEANDERTWERLabel = New System.Windows.Forms.Label() @@ -241,16 +238,6 @@ Partial Class frmDokumentart_Konfig BESCHREIBUNGLabel.TabIndex = 12 BESCHREIBUNGLabel.Text = "Beschreibung:" ' - 'NAMENKONVENTIONLabel - ' - NAMENKONVENTIONLabel.AutoSize = True - NAMENKONVENTIONLabel.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - NAMENKONVENTIONLabel.Location = New System.Drawing.Point(436, 103) - NAMENKONVENTIONLabel.Name = "NAMENKONVENTIONLabel" - NAMENKONVENTIONLabel.Size = New System.Drawing.Size(114, 15) - NAMENKONVENTIONLabel.TabIndex = 16 - NAMENKONVENTIONLabel.Text = "Namenskonvention:" - ' 'ERSTELLTWERLabel ' ERSTELLTWERLabel.AutoSize = True @@ -534,8 +521,6 @@ Partial Class frmDokumentart_Konfig Me.GroupBox1.Controls.Add(BESCHREIBUNGLabel) Me.GroupBox1.Controls.Add(Me.BESCHREIBUNGTextBox) Me.GroupBox1.Controls.Add(Me.AKTIVCheckBox) - Me.GroupBox1.Controls.Add(NAMENKONVENTIONLabel) - Me.GroupBox1.Controls.Add(Me.NAMENKONVENTIONTextBox) Me.GroupBox1.Controls.Add(ERSTELLTWERLabel) Me.GroupBox1.Controls.Add(Me.ERSTELLTWERTextBox) Me.GroupBox1.Controls.Add(ERSTELLTWANNLabel) @@ -610,10 +595,13 @@ Partial Class frmDokumentart_Konfig ' 'btnNamenkonvention ' - Me.btnNamenkonvention.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.btnNamenkonvention.Location = New System.Drawing.Point(781, 120) + Me.btnNamenkonvention.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.btnNamenkonvention.ForeColor = System.Drawing.Color.Crimson + Me.btnNamenkonvention.Image = Global.DD_Record_Organiser.My.Resources.Resources.FileSystemEditor_5852 + Me.btnNamenkonvention.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnNamenkonvention.Location = New System.Drawing.Point(781, 106) Me.btnNamenkonvention.Name = "btnNamenkonvention" - Me.btnNamenkonvention.Size = New System.Drawing.Size(176, 23) + Me.btnNamenkonvention.Size = New System.Drawing.Size(245, 37) Me.btnNamenkonvention.TabIndex = 27 Me.btnNamenkonvention.TabStop = False Me.btnNamenkonvention.Text = "Namenkonvention bearbeiten" @@ -698,15 +686,6 @@ Partial Class frmDokumentart_Konfig Me.AKTIVCheckBox.Text = "Aktiv" Me.AKTIVCheckBox.UseVisualStyleBackColor = True ' - 'NAMENKONVENTIONTextBox - ' - Me.NAMENKONVENTIONTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "NAMENKONVENTION", True)) - Me.NAMENKONVENTIONTextBox.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.NAMENKONVENTIONTextBox.Location = New System.Drawing.Point(441, 121) - Me.NAMENKONVENTIONTextBox.Name = "NAMENKONVENTIONTextBox" - Me.NAMENKONVENTIONTextBox.Size = New System.Drawing.Size(331, 23) - Me.NAMENKONVENTIONTextBox.TabIndex = 3 - ' 'ERSTELLTWERTextBox ' Me.ERSTELLTWERTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "ERSTELLTWER", True)) @@ -1458,7 +1437,6 @@ Partial Class frmDokumentart_Konfig Friend WithEvents ZIEL_PFADTextBox As System.Windows.Forms.TextBox Friend WithEvents BESCHREIBUNGTextBox As System.Windows.Forms.TextBox Friend WithEvents AKTIVCheckBox As System.Windows.Forms.CheckBox - Friend WithEvents NAMENKONVENTIONTextBox As System.Windows.Forms.TextBox Friend WithEvents ERSTELLTWERTextBox As System.Windows.Forms.TextBox Friend WithEvents ERSTELLTWANNTextBox As System.Windows.Forms.TextBox Friend WithEvents GEANDERTWERTextBox As System.Windows.Forms.TextBox diff --git a/app/DD-Record-Organiser/frmDokumentart_Konfig.resx b/app/DD-Record-Organiser/frmDokumentart_Konfig.resx index bb80478..019b78d 100644 --- a/app/DD-Record-Organiser/frmDokumentart_Konfig.resx +++ b/app/DD-Record-Organiser/frmDokumentart_Konfig.resx @@ -132,9 +132,6 @@ False - - False - False diff --git a/app/DD-Record-Organiser/frmDokumentart_Konfig.vb b/app/DD-Record-Organiser/frmDokumentart_Konfig.vb index af6d110..3e9b2de 100644 --- a/app/DD-Record-Organiser/frmDokumentart_Konfig.vb +++ b/app/DD-Record-Organiser/frmDokumentart_Konfig.vb @@ -2,7 +2,6 @@ Private Shared _Instance As frmDokumentart_Konfig = Nothing Private insert As Boolean = False Public Shared akt_DokartID As Integer - Public Shared akt_Namenkonvention As String Private IsInsert As Boolean = False Public Shared Function Instance() As frmDokumentart_Konfig If _Instance Is Nothing OrElse _Instance.IsDisposed = True Then @@ -37,7 +36,6 @@ Refresh_DokartModule(GUIDTextBox.Text) Refresh_Indexe_Auto(GUIDTextBox.Text) akt_DokartID = GUIDTextBox.Text - akt_Namenkonvention = Me.NAMENKONVENTIONTextBox.Text Refresh_DokartModule(GUIDTextBox.Text) End If @@ -160,7 +158,6 @@ If ListBox1.SelectedIndex <> -1 Then Refresh_Indexe_Auto(GUIDTextBox.Text) akt_DokartID = GUIDTextBox.Text - akt_Namenkonvention = Me.NAMENKONVENTIONTextBox.Text Refresh_DokID_FORM_VIEW() Refresh_DokartModule(GUIDTextBox.Text) End If @@ -219,14 +216,14 @@ Private Sub btnNamenkonvention_Click(sender As Object, e As EventArgs) Handles btnNamenkonvention.Click Save_Dokart() Dim _temp As String - _temp = Me.NAMENKONVENTIONTextBox.Text - akt_Namenkonvention = _temp + '_temp = Me.NAMENKONVENTIONTextBox.Text + 'akt_Namenkonvention = _temp akt_DokartID = GUIDTextBox.Text frmDokumentart_NameConvention.ShowDialog() - Me.NAMENKONVENTIONTextBox.Text = akt_Namenkonvention - If _temp <> NAMENKONVENTIONTextBox.Text Then - Save_Dokart() - End If + 'Me.NAMENKONVENTIONTextBox.Text = akt_Namenkonvention + 'If _temp <> NAMENKONVENTIONTextBox.Text Then + ' Save_Dokart() + 'End If End Sub Private Sub ToolStripButton14_Click(sender As Object, e As EventArgs) Handles ToolStripButton14.Click diff --git a/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb b/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb index 696c9d0..0c30280 100644 --- a/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb +++ b/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb @@ -27,13 +27,13 @@ Partial Class frmDokumentart_NameConvention Me.txtnamenKonv = New System.Windows.Forms.TextBox() Me.GroupBox1 = New System.Windows.Forms.GroupBox() Me.btnAddIndexM = New System.Windows.Forms.Button() - Me.cmbIndex_m = New System.Windows.Forms.ComboBox() + Me.cmbIndex_AUTO = New System.Windows.Forms.ComboBox() + Me.TBDD_INDEX_AUTOMBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() Me.Label4 = New System.Windows.Forms.Label() Me.cmbEntity = New System.Windows.Forms.ComboBox() Me.btnAddIndexA = New System.Windows.Forms.Button() - Me.cmbIndex_A = New System.Windows.Forms.ComboBox() - Me.TBDD_INDEX_AUTOMBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() + Me.cmbIndex_Controls = New System.Windows.Forms.ComboBox() Me.Label3 = New System.Windows.Forms.Label() Me.GroupBox2 = New System.Windows.Forms.GroupBox() Me.Button1 = New System.Windows.Forms.Button() @@ -50,8 +50,9 @@ Partial Class frmDokumentart_NameConvention Me.VERSION_DELIMITERTextBox = New System.Windows.Forms.TextBox() Me.FILE_DELIMITERTextBox = New System.Windows.Forms.TextBox() Me.GroupBox3 = New System.Windows.Forms.GroupBox() - Me.Label5 = New System.Windows.Forms.Label() Me.Label6 = New System.Windows.Forms.Label() + Me.Label5 = New System.Windows.Forms.Label() + Me.Label2 = New System.Windows.Forms.Label() Me.GroupBox1.SuspendLayout() CType(Me.TBDD_INDEX_AUTOMBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() @@ -82,35 +83,47 @@ Partial Class frmDokumentart_NameConvention ' 'GroupBox1 ' + Me.GroupBox1.Controls.Add(Me.Label2) Me.GroupBox1.Controls.Add(Me.btnAddIndexM) - Me.GroupBox1.Controls.Add(Me.cmbIndex_m) + Me.GroupBox1.Controls.Add(Me.cmbIndex_AUTO) Me.GroupBox1.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.GroupBox1.Location = New System.Drawing.Point(12, 124) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(237, 56) + Me.GroupBox1.Size = New System.Drawing.Size(237, 104) Me.GroupBox1.TabIndex = 2 Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "Globale automatische Indexe:" + Me.GroupBox1.Text = "Automatische Indexe:" ' 'btnAddIndexM ' Me.btnAddIndexM.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD - Me.btnAddIndexM.Location = New System.Drawing.Point(197, 24) + Me.btnAddIndexM.Location = New System.Drawing.Point(197, 70) Me.btnAddIndexM.Name = "btnAddIndexM" Me.btnAddIndexM.Size = New System.Drawing.Size(30, 23) Me.btnAddIndexM.TabIndex = 4 Me.btnAddIndexM.UseVisualStyleBackColor = True ' - 'cmbIndex_m + 'cmbIndex_AUTO ' - Me.cmbIndex_m.DisplayMember = "DOKUMENTART_ID" - Me.cmbIndex_m.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cmbIndex_m.FormattingEnabled = True - Me.cmbIndex_m.Location = New System.Drawing.Point(9, 24) - Me.cmbIndex_m.Name = "cmbIndex_m" - Me.cmbIndex_m.Size = New System.Drawing.Size(182, 25) - Me.cmbIndex_m.TabIndex = 2 - Me.cmbIndex_m.ValueMember = "DOKUMENTART_ID" + Me.cmbIndex_AUTO.DataSource = Me.TBDD_INDEX_AUTOMBindingSource + Me.cmbIndex_AUTO.DisplayMember = "VALUE" + Me.cmbIndex_AUTO.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbIndex_AUTO.FormattingEnabled = True + Me.cmbIndex_AUTO.Location = New System.Drawing.Point(9, 70) + Me.cmbIndex_AUTO.Name = "cmbIndex_AUTO" + Me.cmbIndex_AUTO.Size = New System.Drawing.Size(182, 25) + Me.cmbIndex_AUTO.TabIndex = 2 + Me.cmbIndex_AUTO.ValueMember = "DOCTYPE_ID" + ' + 'TBDD_INDEX_AUTOMBindingSource + ' + Me.TBDD_INDEX_AUTOMBindingSource.DataMember = "TBDD_INDEX_AUTOM" + Me.TBDD_INDEX_AUTOMBindingSource.DataSource = Me.DD_DMSDataSet + ' + 'DD_DMSDataSet + ' + Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet" + Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' 'Label4 ' @@ -127,7 +140,7 @@ Partial Class frmDokumentart_NameConvention Me.cmbEntity.DisplayMember = "GUID" Me.cmbEntity.Font = New System.Drawing.Font("Segoe UI Semibold", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.cmbEntity.FormattingEnabled = True - Me.cmbEntity.Location = New System.Drawing.Point(9, 74) + Me.cmbEntity.Location = New System.Drawing.Point(9, 76) Me.cmbEntity.Name = "cmbEntity" Me.cmbEntity.Size = New System.Drawing.Size(218, 23) Me.cmbEntity.TabIndex = 6 @@ -137,40 +150,30 @@ Partial Class frmDokumentart_NameConvention ' Me.btnAddIndexA.Enabled = False Me.btnAddIndexA.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD - Me.btnAddIndexA.Location = New System.Drawing.Point(197, 120) + Me.btnAddIndexA.Location = New System.Drawing.Point(423, 74) Me.btnAddIndexA.Name = "btnAddIndexA" Me.btnAddIndexA.Size = New System.Drawing.Size(30, 23) Me.btnAddIndexA.TabIndex = 5 Me.btnAddIndexA.UseVisualStyleBackColor = True ' - 'cmbIndex_A - ' - Me.cmbIndex_A.DataSource = Me.TBDD_INDEX_AUTOMBindingSource - Me.cmbIndex_A.DisplayMember = "INDEXNAME" - Me.cmbIndex_A.Enabled = False - Me.cmbIndex_A.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.cmbIndex_A.FormattingEnabled = True - Me.cmbIndex_A.Location = New System.Drawing.Point(9, 120) - Me.cmbIndex_A.Name = "cmbIndex_A" - Me.cmbIndex_A.Size = New System.Drawing.Size(182, 25) - Me.cmbIndex_A.TabIndex = 3 - Me.cmbIndex_A.ValueMember = "DOCTYPE_ID" - ' - 'TBDD_INDEX_AUTOMBindingSource - ' - Me.TBDD_INDEX_AUTOMBindingSource.DataMember = "TBDD_INDEX_AUTOM" - Me.TBDD_INDEX_AUTOMBindingSource.DataSource = Me.DD_DMSDataSet - ' - 'DD_DMSDataSet + 'cmbIndex_Controls ' - Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet" - Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema + Me.cmbIndex_Controls.DataSource = Me.TBDD_INDEX_AUTOMBindingSource + Me.cmbIndex_Controls.DisplayMember = "INDEXNAME" + Me.cmbIndex_Controls.Enabled = False + Me.cmbIndex_Controls.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbIndex_Controls.FormattingEnabled = True + Me.cmbIndex_Controls.Location = New System.Drawing.Point(236, 76) + Me.cmbIndex_Controls.Name = "cmbIndex_Controls" + Me.cmbIndex_Controls.Size = New System.Drawing.Size(182, 25) + Me.cmbIndex_Controls.TabIndex = 3 + Me.cmbIndex_Controls.ValueMember = "DOCTYPE_ID" ' 'Label3 ' Me.Label3.AutoSize = True Me.Label3.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label3.Location = New System.Drawing.Point(6, 100) + Me.Label3.Location = New System.Drawing.Point(233, 56) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(158, 17) Me.Label3.TabIndex = 1 @@ -242,7 +245,7 @@ Partial Class frmDokumentart_NameConvention ' Me.btnOK.Image = Global.DD_Record_Organiser.My.Resources.Resources.save_16xLG Me.btnOK.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnOK.Location = New System.Drawing.Point(258, 306) + Me.btnOK.Location = New System.Drawing.Point(248, 355) Me.btnOK.Name = "btnOK" Me.btnOK.Size = New System.Drawing.Size(110, 26) Me.btnOK.TabIndex = 5 @@ -254,7 +257,7 @@ Partial Class frmDokumentart_NameConvention ' Me.btnclose.Image = Global.DD_Record_Organiser.My.Resources.Resources.cancel1 Me.btnclose.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnclose.Location = New System.Drawing.Point(374, 306) + Me.btnclose.Location = New System.Drawing.Point(369, 355) Me.btnclose.Name = "btnclose" Me.btnclose.Size = New System.Drawing.Size(94, 26) Me.btnclose.TabIndex = 6 @@ -335,16 +338,26 @@ Partial Class frmDokumentart_NameConvention Me.GroupBox3.Controls.Add(Me.btnAddIndexA) Me.GroupBox3.Controls.Add(Me.Label4) Me.GroupBox3.Controls.Add(Me.cmbEntity) - Me.GroupBox3.Controls.Add(Me.cmbIndex_A) + Me.GroupBox3.Controls.Add(Me.cmbIndex_Controls) Me.GroupBox3.Controls.Add(Me.Label3) Me.GroupBox3.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GroupBox3.Location = New System.Drawing.Point(15, 186) + Me.GroupBox3.Location = New System.Drawing.Point(12, 234) Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(237, 153) + Me.GroupBox3.Size = New System.Drawing.Size(459, 115) Me.GroupBox3.TabIndex = 11 Me.GroupBox3.TabStop = False Me.GroupBox3.Text = "Entitäts-abhängige Indexe:" ' + 'Label6 + ' + Me.Label6.AutoSize = True + Me.Label6.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label6.Location = New System.Drawing.Point(12, 73) + Me.Label6.Name = "Label6" + Me.Label6.Size = New System.Drawing.Size(177, 17) + Me.Label6.TabIndex = 12 + Me.Label6.Text = "Aktuelle Namenkonvention:" + ' 'Label5 ' Me.Label5.AutoSize = True @@ -356,21 +369,22 @@ Partial Class frmDokumentart_NameConvention Me.Label5.Text = "Zur Dateibenennung können Sie auch Werte aus " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "dem zur Laufzeit aktuellen Datensa" & _ "tzes nutzen." ' - 'Label6 + 'Label2 ' - Me.Label6.AutoSize = True - Me.Label6.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label6.Location = New System.Drawing.Point(12, 73) - Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(177, 17) - Me.Label6.TabIndex = 12 - Me.Label6.Text = "Aktuelle Namenkonvention:" + Me.Label2.AutoSize = True + Me.Label2.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label2.Location = New System.Drawing.Point(6, 21) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(202, 39) + Me.Label2.TabIndex = 9 + Me.Label2.Text = "Diese Indexe werden automatisch gesetzt," & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "können aber auch zur Dateibenennung" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "ge" & _ + "nutzt werden." ' 'frmDokumentart_NameConvention ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 17.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(478, 349) + Me.ClientSize = New System.Drawing.Size(478, 388) Me.ControlBox = False Me.Controls.Add(Me.Label6) Me.Controls.Add(Me.GroupBox3) @@ -390,6 +404,7 @@ Partial Class frmDokumentart_NameConvention Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Assistent zur Namenskonvention/Dateibenennung:" Me.GroupBox1.ResumeLayout(False) + Me.GroupBox1.PerformLayout() CType(Me.TBDD_INDEX_AUTOMBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox2.ResumeLayout(False) @@ -408,8 +423,8 @@ Partial Class frmDokumentart_NameConvention Friend WithEvents btnAddIndexM As System.Windows.Forms.Button - Friend WithEvents cmbIndex_A As System.Windows.Forms.ComboBox - Friend WithEvents cmbIndex_m As System.Windows.Forms.ComboBox + Friend WithEvents cmbIndex_Controls As System.Windows.Forms.ComboBox + Friend WithEvents cmbIndex_AUTO As System.Windows.Forms.ComboBox Friend WithEvents Label3 As System.Windows.Forms.Label Friend WithEvents btnAddIndexA As System.Windows.Forms.Button Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox @@ -432,6 +447,7 @@ Partial Class frmDokumentart_NameConvention Friend WithEvents Label4 As System.Windows.Forms.Label Friend WithEvents cmbEntity As System.Windows.Forms.ComboBox Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox - Friend WithEvents Label5 As System.Windows.Forms.Label Friend WithEvents Label6 As System.Windows.Forms.Label + Friend WithEvents Label2 As System.Windows.Forms.Label + Friend WithEvents Label5 As System.Windows.Forms.Label End Class diff --git a/app/DD-Record-Organiser/frmDokumentart_NameConvention.vb b/app/DD-Record-Organiser/frmDokumentart_NameConvention.vb index ae70b89..74bd1e4 100644 --- a/app/DD-Record-Organiser/frmDokumentart_NameConvention.vb +++ b/app/DD-Record-Organiser/frmDokumentart_NameConvention.vb @@ -6,9 +6,9 @@ Private loaded As Boolean = False Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnAddIndexM.Click - If Not Me.cmbIndex_m.Text = "" Then + If Not Me.cmbIndex_AUTO.Text = "" Then 'AREANLAGE-[%mARENR]-[%aKurzname]-I[%Version] - Dim text As String = "[%m" & Me.cmbIndex_m.Text.ToString.ToUpper & "]" + Dim text As String = "[%a" & Me.cmbIndex_AUTO.Text.ToString.ToUpper & "]" Dim altePosition As Integer = Me.txtnamenKonv.SelectionStart() Me.txtnamenKonv.Text = Me.txtnamenKonv.Text.Insert(altePosition, text) Me.txtnamenKonv.SelectionStart = altePosition + text.Length @@ -16,9 +16,9 @@ End Sub Private Sub btnAddIndexA_Click(sender As Object, e As EventArgs) Handles btnAddIndexA.Click - If Not Me.cmbIndex_A.Text = "" Then + If Not Me.cmbIndex_Controls.Text = "" Then 'AREANLAGE-[%mARENR]-[%aKurzname]-I[%Version] - Dim text As String = "[%a" & Me.cmbIndex_A.Text.ToString.ToUpper & "|" & cmbIndex_A.SelectedValue & "]" + Dim text As String = "[%a" & Me.cmbIndex_Controls.Text.ToString.ToUpper & "#" & cmbIndex_Controls.SelectedValue & "]" Dim altePosition As Integer = Me.txtnamenKonv.SelectionStart() Me.txtnamenKonv.Text = Me.txtnamenKonv.Text.Insert(altePosition, text) Me.txtnamenKonv.SelectionStart = altePosition + text.Length @@ -59,8 +59,9 @@ Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click Dim sql = "UPDATE TBPMO_WD_FORMVIEW_DOKTYPES SET NAME_CONVENTION = '" & txtnamenKonv.Text & "', CHANGED_WHO = '" & Environment.UserName & "' WHERE GUID = " & TBPMO_WD_FORMVIEW_DOKTYPES_GUID If ClassDatabase.Execute_non_Query(sql, True) = True Then - frmDokumentart_Konfig.akt_Namenkonvention = txtnamenKonv.Text Me.Close() + Else + MsgBox("Unexpected Error in Save NameConvention - Check logfile", MsgBoxStyle.Exclamation) End If End Sub @@ -85,6 +86,9 @@ End Sub Private Sub cmbEntity_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbEntity.SelectedIndexChanged + Load_EntityData() + End Sub + Sub Load_EntityData() Try If cmbEntity.SelectedIndex <> -1 Then TBPMO_WD_FORMVIEW_DOKTYPES_GUID = Me.cmbEntity.SelectedValue @@ -104,16 +108,14 @@ Try Dim DT1 As DataTable = ClassDatabase.Return_Datatable("SELECT [CONTROL_ID] , [CONTROL_COL_NAME] AS DISPLAY FROM [VWPMO_CONTROL_SCREEN] WHERE CTRLTYPE_ID in (2,3,4) and FORM_ID = (SELECT FORM_ID FROM TBPMO_FORM_VIEW WHERE GUID = " & FORM_VIEW_ID & ")", "LoadControlsForEntity - NameConvention") If DT1.Rows.Count >= 1 Then - cmbIndex_A.DataSource = DT1 - cmbIndex_A.DisplayMember = DT1.Columns(1).ColumnName - cmbIndex_A.ValueMember = DT1.Columns(0).ColumnName - cmbIndex_A.DroppedDown = True - cmbIndex_A.Enabled = True + cmbIndex_Controls.DataSource = DT1 + cmbIndex_Controls.DisplayMember = DT1.Columns(1).ColumnName + cmbIndex_Controls.ValueMember = DT1.Columns(0).ColumnName + cmbIndex_Controls.Enabled = True btnAddIndexA.Enabled = True Else - cmbIndex_A.Enabled = False + cmbIndex_Controls.Enabled = False btnAddIndexA.Enabled = False - cmbIndex_A.DroppedDown = False End If Catch ex As Exception @@ -125,6 +127,7 @@ loaded = True If DT_ENTITIES.Rows.Count = 1 Then Load_Controls() + Load_EntityData() End If End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmTemplates.Designer.vb b/app/DD-Record-Organiser/frmTemplates.Designer.vb index 919838d..c9f8920 100644 --- a/app/DD-Record-Organiser/frmTemplates.Designer.vb +++ b/app/DD-Record-Organiser/frmTemplates.Designer.vb @@ -35,12 +35,12 @@ Partial Class frmTemplates Dim ADDED_WHOLabel1 As System.Windows.Forms.Label Dim ADDED_WHENLabel1 As System.Windows.Forms.Label Dim CHANGED_WHENLabel1 As System.Windows.Forms.Label - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmTemplates)) Dim GUIDLabel2 As System.Windows.Forms.Label Dim NAME_PATTERNLabel As System.Windows.Forms.Label Dim FIXED_VALUELabel As System.Windows.Forms.Label Dim CONNECTION_IDLabel As System.Windows.Forms.Label Dim SQL_COMMANDLabel As System.Windows.Forms.Label + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmTemplates)) Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() Me.TBPMO_TEMPLATEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPMO_TEMPLATETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_TEMPLATETableAdapter() @@ -117,6 +117,10 @@ Partial Class frmTemplates Me.ListBox3 = New System.Windows.Forms.ListBox() Me.Label1 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.ToolStripLabel3 = New System.Windows.Forms.ToolStripLabel() + Me.Label3 = New System.Windows.Forms.Label() + Me.Label4 = New System.Windows.Forms.Label() GUIDLabel = New System.Windows.Forms.Label() NAMELabel = New System.Windows.Forms.Label() TEMPLATE_PATHLabel = New System.Windows.Forms.Label() @@ -146,70 +150,71 @@ Partial Class frmTemplates CType(Me.VWPMO_DOKUMENTTYPESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.BindingNavigator2, System.ComponentModel.ISupportInitialize).BeginInit() Me.BindingNavigator2.SuspendLayout() + Me.Panel1.SuspendLayout() Me.SuspendLayout() ' 'GUIDLabel ' GUIDLabel.AutoSize = True - GUIDLabel.Location = New System.Drawing.Point(326, 48) + GUIDLabel.Location = New System.Drawing.Point(186, 28) GUIDLabel.Name = "GUIDLabel" - GUIDLabel.Size = New System.Drawing.Size(37, 15) + GUIDLabel.Size = New System.Drawing.Size(21, 15) GUIDLabel.TabIndex = 1 - GUIDLabel.Text = "GUID:" + GUIDLabel.Text = "ID:" ' 'NAMELabel ' NAMELabel.AutoSize = True - NAMELabel.Location = New System.Drawing.Point(378, 48) + NAMELabel.Location = New System.Drawing.Point(238, 28) NAMELabel.Name = "NAMELabel" - NAMELabel.Size = New System.Drawing.Size(44, 15) + NAMELabel.Size = New System.Drawing.Size(86, 15) NAMELabel.TabIndex = 8 - NAMELabel.Text = "NAME:" + NAMELabel.Text = "Interner Name:" ' 'TEMPLATE_PATHLabel ' TEMPLATE_PATHLabel.AutoSize = True - TEMPLATE_PATHLabel.Location = New System.Drawing.Point(378, 92) + TEMPLATE_PATHLabel.Location = New System.Drawing.Point(186, 87) TEMPLATE_PATHLabel.Name = "TEMPLATE_PATHLabel" - TEMPLATE_PATHLabel.Size = New System.Drawing.Size(102, 15) + TEMPLATE_PATHLabel.Size = New System.Drawing.Size(159, 15) TEMPLATE_PATHLabel.TabIndex = 10 - TEMPLATE_PATHLabel.Text = "TEMPLATE PATH:" + TEMPLATE_PATHLabel.Text = "Speicherort der Vorlagedatei:" ' 'ADDED_WHOLabel ' ADDED_WHOLabel.AutoSize = True - ADDED_WHOLabel.Location = New System.Drawing.Point(378, 136) + ADDED_WHOLabel.Location = New System.Drawing.Point(186, 141) ADDED_WHOLabel.Name = "ADDED_WHOLabel" - ADDED_WHOLabel.Size = New System.Drawing.Size(80, 15) + ADDED_WHOLabel.Size = New System.Drawing.Size(67, 15) ADDED_WHOLabel.TabIndex = 13 - ADDED_WHOLabel.Text = "ADDED WHO:" + ADDED_WHOLabel.Text = "Erstellt wer:" ' 'ADDED_WHENLabel ' ADDED_WHENLabel.AutoSize = True - ADDED_WHENLabel.Location = New System.Drawing.Point(539, 136) + ADDED_WHENLabel.Location = New System.Drawing.Point(347, 141) ADDED_WHENLabel.Name = "ADDED_WHENLabel" - ADDED_WHENLabel.Size = New System.Drawing.Size(86, 15) + ADDED_WHENLabel.Size = New System.Drawing.Size(77, 15) ADDED_WHENLabel.TabIndex = 15 - ADDED_WHENLabel.Text = "ADDED WHEN:" + ADDED_WHENLabel.Text = "Erstellt wann:" ' 'CHANGED_WHOLabel ' CHANGED_WHOLabel.AutoSize = True - CHANGED_WHOLabel.Location = New System.Drawing.Point(685, 136) + CHANGED_WHOLabel.Location = New System.Drawing.Point(493, 141) CHANGED_WHOLabel.Name = "CHANGED_WHOLabel" - CHANGED_WHOLabel.Size = New System.Drawing.Size(98, 15) + CHANGED_WHOLabel.Size = New System.Drawing.Size(80, 15) CHANGED_WHOLabel.TabIndex = 17 - CHANGED_WHOLabel.Text = "CHANGED WHO:" + CHANGED_WHOLabel.Text = "Geändert wer:" ' 'CHANGED_WHENLabel ' CHANGED_WHENLabel.AutoSize = True - CHANGED_WHENLabel.Location = New System.Drawing.Point(855, 136) + CHANGED_WHENLabel.Location = New System.Drawing.Point(663, 141) CHANGED_WHENLabel.Name = "CHANGED_WHENLabel" - CHANGED_WHENLabel.Size = New System.Drawing.Size(104, 15) + CHANGED_WHENLabel.Size = New System.Drawing.Size(90, 15) CHANGED_WHENLabel.TabIndex = 19 - CHANGED_WHENLabel.Text = "CHANGED WHEN:" + CHANGED_WHENLabel.Text = "Geändert wann:" ' 'ENTITY_IDLabel ' @@ -223,11 +228,11 @@ Partial Class frmTemplates 'DOCTYPE_IDLabel ' DOCTYPE_IDLabel.AutoSize = True - DOCTYPE_IDLabel.Location = New System.Drawing.Point(389, 299) + DOCTYPE_IDLabel.Location = New System.Drawing.Point(583, 28) DOCTYPE_IDLabel.Name = "DOCTYPE_IDLabel" - DOCTYPE_IDLabel.Size = New System.Drawing.Size(76, 15) + DOCTYPE_IDLabel.Size = New System.Drawing.Size(80, 15) DOCTYPE_IDLabel.TabIndex = 23 - DOCTYPE_IDLabel.Text = "DOCTYPE ID:" + DOCTYPE_IDLabel.Text = "Dokumentart:" ' 'ADDED_WHOLabel1 ' @@ -256,6 +261,51 @@ Partial Class frmTemplates CHANGED_WHENLabel1.TabIndex = 29 CHANGED_WHENLabel1.Text = "CHANGED WHEN:" ' + 'GUIDLabel2 + ' + GUIDLabel2.AutoSize = True + GUIDLabel2.Location = New System.Drawing.Point(451, 494) + GUIDLabel2.Name = "GUIDLabel2" + GUIDLabel2.Size = New System.Drawing.Size(37, 15) + GUIDLabel2.TabIndex = 32 + GUIDLabel2.Text = "GUID:" + ' + 'NAME_PATTERNLabel + ' + NAME_PATTERNLabel.AutoSize = True + NAME_PATTERNLabel.Location = New System.Drawing.Point(482, 529) + NAME_PATTERNLabel.Name = "NAME_PATTERNLabel" + NAME_PATTERNLabel.Size = New System.Drawing.Size(98, 15) + NAME_PATTERNLabel.TabIndex = 34 + NAME_PATTERNLabel.Text = "NAME PATTERN:" + ' + 'FIXED_VALUELabel + ' + FIXED_VALUELabel.AutoSize = True + FIXED_VALUELabel.Location = New System.Drawing.Point(539, 560) + FIXED_VALUELabel.Name = "FIXED_VALUELabel" + FIXED_VALUELabel.Size = New System.Drawing.Size(78, 15) + FIXED_VALUELabel.TabIndex = 36 + FIXED_VALUELabel.Text = "FIXED VALUE:" + ' + 'CONNECTION_IDLabel + ' + CONNECTION_IDLabel.AutoSize = True + CONNECTION_IDLabel.Location = New System.Drawing.Point(796, 555) + CONNECTION_IDLabel.Name = "CONNECTION_IDLabel" + CONNECTION_IDLabel.Size = New System.Drawing.Size(101, 15) + CONNECTION_IDLabel.TabIndex = 38 + CONNECTION_IDLabel.Text = "CONNECTION ID:" + ' + 'SQL_COMMANDLabel + ' + SQL_COMMANDLabel.AutoSize = True + SQL_COMMANDLabel.Location = New System.Drawing.Point(1051, 547) + SQL_COMMANDLabel.Name = "SQL_COMMANDLabel" + SQL_COMMANDLabel.Size = New System.Drawing.Size(98, 15) + SQL_COMMANDLabel.TabIndex = 40 + SQL_COMMANDLabel.Text = "SQL COMMAND:" + ' 'DD_DMSDataSet ' Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet" @@ -273,6 +323,7 @@ Partial Class frmTemplates 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False + Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Nothing Me.TableAdapterManager.TBDD_EINGANGSARTENTableAdapter = Nothing Me.TableAdapterManager.TBDD_EMAIL_ACCOUNTTableAdapter = Nothing @@ -280,7 +331,6 @@ Partial Class frmTemplates Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Nothing Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing - Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FILES_USERTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing @@ -308,16 +358,15 @@ Partial Class frmTemplates Me.TBPMO_TEMPLATEBindingNavigator.BindingSource = Me.TBPMO_TEMPLATEBindingSource Me.TBPMO_TEMPLATEBindingNavigator.CountItem = Me.BindingNavigatorCountItem Me.TBPMO_TEMPLATEBindingNavigator.DeleteItem = Me.BindingNavigatorDeleteItem - Me.TBPMO_TEMPLATEBindingNavigator.Dock = System.Windows.Forms.DockStyle.None - Me.TBPMO_TEMPLATEBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem, Me.TBPMO_TEMPLATEBindingNavigatorSaveItem}) - Me.TBPMO_TEMPLATEBindingNavigator.Location = New System.Drawing.Point(329, 23) + Me.TBPMO_TEMPLATEBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabel3, Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem, Me.TBPMO_TEMPLATEBindingNavigatorSaveItem}) + Me.TBPMO_TEMPLATEBindingNavigator.Location = New System.Drawing.Point(0, 0) Me.TBPMO_TEMPLATEBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem Me.TBPMO_TEMPLATEBindingNavigator.MoveLastItem = Me.BindingNavigatorMoveLastItem Me.TBPMO_TEMPLATEBindingNavigator.MoveNextItem = Me.BindingNavigatorMoveNextItem Me.TBPMO_TEMPLATEBindingNavigator.MovePreviousItem = Me.BindingNavigatorMovePreviousItem Me.TBPMO_TEMPLATEBindingNavigator.Name = "TBPMO_TEMPLATEBindingNavigator" Me.TBPMO_TEMPLATEBindingNavigator.PositionItem = Me.BindingNavigatorPositionItem - Me.TBPMO_TEMPLATEBindingNavigator.Size = New System.Drawing.Size(287, 25) + Me.TBPMO_TEMPLATEBindingNavigator.Size = New System.Drawing.Size(1426, 25) Me.TBPMO_TEMPLATEBindingNavigator.TabIndex = 0 Me.TBPMO_TEMPLATEBindingNavigator.Text = "BindingNavigator1" ' @@ -416,21 +465,25 @@ Partial Class frmTemplates ' 'GUIDTextBox ' + Me.GUIDTextBox.BackColor = System.Drawing.Color.WhiteSmoke Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATEBindingSource, "GUID", True)) - Me.GUIDTextBox.Location = New System.Drawing.Point(329, 66) + Me.GUIDTextBox.Enabled = False + Me.GUIDTextBox.Location = New System.Drawing.Point(189, 61) Me.GUIDTextBox.Name = "GUIDTextBox" Me.GUIDTextBox.Size = New System.Drawing.Size(43, 23) Me.GUIDTextBox.TabIndex = 2 ' 'ListBox1 ' + Me.ListBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) Me.ListBox1.DataSource = Me.TBPMO_TEMPLATEBindingSource Me.ListBox1.DisplayMember = "NAME" Me.ListBox1.FormattingEnabled = True Me.ListBox1.ItemHeight = 15 - Me.ListBox1.Location = New System.Drawing.Point(12, 23) + Me.ListBox1.Location = New System.Drawing.Point(3, 28) Me.ListBox1.Name = "ListBox1" - Me.ListBox1.Size = New System.Drawing.Size(301, 169) + Me.ListBox1.Size = New System.Drawing.Size(177, 154) Me.ListBox1.TabIndex = 3 Me.ListBox1.ValueMember = "GUID" ' @@ -455,15 +508,15 @@ Partial Class frmTemplates 'NAMETextBox ' Me.NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATEBindingSource, "NAME", True)) - Me.NAMETextBox.Location = New System.Drawing.Point(381, 66) + Me.NAMETextBox.Location = New System.Drawing.Point(241, 61) Me.NAMETextBox.Name = "NAMETextBox" - Me.NAMETextBox.Size = New System.Drawing.Size(468, 23) + Me.NAMETextBox.Size = New System.Drawing.Size(339, 23) Me.NAMETextBox.TabIndex = 9 ' 'TEMPLATE_PATHTextBox ' Me.TEMPLATE_PATHTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATEBindingSource, "TEMPLATE_PATH", True)) - Me.TEMPLATE_PATHTextBox.Location = New System.Drawing.Point(381, 110) + Me.TEMPLATE_PATHTextBox.Location = New System.Drawing.Point(189, 105) Me.TEMPLATE_PATHTextBox.Name = "TEMPLATE_PATHTextBox" Me.TEMPLATE_PATHTextBox.Size = New System.Drawing.Size(617, 23) Me.TEMPLATE_PATHTextBox.TabIndex = 11 @@ -471,7 +524,7 @@ Partial Class frmTemplates 'ACTIVECheckBox ' Me.ACTIVECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPMO_TEMPLATEBindingSource, "ACTIVE", True)) - Me.ACTIVECheckBox.Location = New System.Drawing.Point(939, 65) + Me.ACTIVECheckBox.Location = New System.Drawing.Point(857, 104) Me.ACTIVECheckBox.Name = "ACTIVECheckBox" Me.ACTIVECheckBox.Size = New System.Drawing.Size(59, 24) Me.ACTIVECheckBox.TabIndex = 13 @@ -480,32 +533,40 @@ Partial Class frmTemplates ' 'ADDED_WHOTextBox ' + Me.ADDED_WHOTextBox.BackColor = System.Drawing.Color.WhiteSmoke Me.ADDED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATEBindingSource, "ADDED_WHO", True)) - Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(381, 154) + Me.ADDED_WHOTextBox.Enabled = False + Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(189, 159) Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox" Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(155, 23) Me.ADDED_WHOTextBox.TabIndex = 14 ' 'ADDED_WHENTextBox ' + Me.ADDED_WHENTextBox.BackColor = System.Drawing.Color.WhiteSmoke Me.ADDED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATEBindingSource, "ADDED_WHEN", True)) - Me.ADDED_WHENTextBox.Location = New System.Drawing.Point(542, 154) + Me.ADDED_WHENTextBox.Enabled = False + Me.ADDED_WHENTextBox.Location = New System.Drawing.Point(350, 159) Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox" Me.ADDED_WHENTextBox.Size = New System.Drawing.Size(140, 23) Me.ADDED_WHENTextBox.TabIndex = 16 ' 'CHANGED_WHOTextBox ' + Me.CHANGED_WHOTextBox.BackColor = System.Drawing.Color.WhiteSmoke Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATEBindingSource, "CHANGED_WHO", True)) - Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(688, 154) + Me.CHANGED_WHOTextBox.Enabled = False + Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(496, 159) Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(161, 23) Me.CHANGED_WHOTextBox.TabIndex = 18 ' 'CHANGED_WHENTextBox ' + Me.CHANGED_WHENTextBox.BackColor = System.Drawing.Color.WhiteSmoke Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATEBindingSource, "CHANGED_WHEN", True)) - Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(858, 154) + Me.CHANGED_WHENTextBox.Enabled = False + Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(666, 159) Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(140, 23) Me.CHANGED_WHENTextBox.TabIndex = 20 @@ -651,13 +712,13 @@ Partial Class frmTemplates ' 'DOCTYPE_IDComboBox ' - Me.DOCTYPE_IDComboBox.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPMO_TEMPLATE_ENTITYBindingSource, "DOCTYPE_ID", True)) + Me.DOCTYPE_IDComboBox.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPMO_TEMPLATEBindingSource, "DOCTYPE_ID", True)) Me.DOCTYPE_IDComboBox.DataSource = Me.VWPMO_DOKUMENTTYPESBindingSource Me.DOCTYPE_IDComboBox.DisplayMember = "DOKUMENTTYPE" Me.DOCTYPE_IDComboBox.FormattingEnabled = True - Me.DOCTYPE_IDComboBox.Location = New System.Drawing.Point(471, 296) + Me.DOCTYPE_IDComboBox.Location = New System.Drawing.Point(586, 61) Me.DOCTYPE_IDComboBox.Name = "DOCTYPE_IDComboBox" - Me.DOCTYPE_IDComboBox.Size = New System.Drawing.Size(261, 23) + Me.DOCTYPE_IDComboBox.Size = New System.Drawing.Size(330, 23) Me.DOCTYPE_IDComboBox.TabIndex = 24 Me.DOCTYPE_IDComboBox.ValueMember = "DOKUMENTTYPE_ID" ' @@ -832,15 +893,6 @@ Partial Class frmTemplates Me.ToolStripButton16.Size = New System.Drawing.Size(23, 22) Me.ToolStripButton16.Text = "ToolStripButton8" ' - 'GUIDLabel2 - ' - GUIDLabel2.AutoSize = True - GUIDLabel2.Location = New System.Drawing.Point(451, 494) - GUIDLabel2.Name = "GUIDLabel2" - GUIDLabel2.Size = New System.Drawing.Size(37, 15) - GUIDLabel2.TabIndex = 32 - GUIDLabel2.Text = "GUID:" - ' 'GUIDTextBox2 ' Me.GUIDTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATE_ENTITY_PATTERNBindingSource, "GUID", True)) @@ -849,15 +901,6 @@ Partial Class frmTemplates Me.GUIDTextBox2.Size = New System.Drawing.Size(100, 23) Me.GUIDTextBox2.TabIndex = 33 ' - 'NAME_PATTERNLabel - ' - NAME_PATTERNLabel.AutoSize = True - NAME_PATTERNLabel.Location = New System.Drawing.Point(482, 529) - NAME_PATTERNLabel.Name = "NAME_PATTERNLabel" - NAME_PATTERNLabel.Size = New System.Drawing.Size(98, 15) - NAME_PATTERNLabel.TabIndex = 34 - NAME_PATTERNLabel.Text = "NAME PATTERN:" - ' 'NAME_PATTERNTextBox ' Me.NAME_PATTERNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATE_ENTITY_PATTERNBindingSource, "NAME_PATTERN", True)) @@ -866,15 +909,6 @@ Partial Class frmTemplates Me.NAME_PATTERNTextBox.Size = New System.Drawing.Size(100, 23) Me.NAME_PATTERNTextBox.TabIndex = 35 ' - 'FIXED_VALUELabel - ' - FIXED_VALUELabel.AutoSize = True - FIXED_VALUELabel.Location = New System.Drawing.Point(539, 560) - FIXED_VALUELabel.Name = "FIXED_VALUELabel" - FIXED_VALUELabel.Size = New System.Drawing.Size(78, 15) - FIXED_VALUELabel.TabIndex = 36 - FIXED_VALUELabel.Text = "FIXED VALUE:" - ' 'FIXED_VALUETextBox ' Me.FIXED_VALUETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATE_ENTITY_PATTERNBindingSource, "FIXED_VALUE", True)) @@ -883,15 +917,6 @@ Partial Class frmTemplates Me.FIXED_VALUETextBox.Size = New System.Drawing.Size(100, 23) Me.FIXED_VALUETextBox.TabIndex = 37 ' - 'CONNECTION_IDLabel - ' - CONNECTION_IDLabel.AutoSize = True - CONNECTION_IDLabel.Location = New System.Drawing.Point(796, 555) - CONNECTION_IDLabel.Name = "CONNECTION_IDLabel" - CONNECTION_IDLabel.Size = New System.Drawing.Size(101, 15) - CONNECTION_IDLabel.TabIndex = 38 - CONNECTION_IDLabel.Text = "CONNECTION ID:" - ' 'CONNECTION_IDComboBox ' Me.CONNECTION_IDComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATE_ENTITY_PATTERNBindingSource, "CONNECTION_ID", True)) @@ -901,15 +926,6 @@ Partial Class frmTemplates Me.CONNECTION_IDComboBox.Size = New System.Drawing.Size(121, 23) Me.CONNECTION_IDComboBox.TabIndex = 39 ' - 'SQL_COMMANDLabel - ' - SQL_COMMANDLabel.AutoSize = True - SQL_COMMANDLabel.Location = New System.Drawing.Point(1051, 547) - SQL_COMMANDLabel.Name = "SQL_COMMANDLabel" - SQL_COMMANDLabel.Size = New System.Drawing.Size(98, 15) - SQL_COMMANDLabel.TabIndex = 40 - SQL_COMMANDLabel.Text = "SQL COMMAND:" - ' 'SQL_COMMANDTextBox ' Me.SQL_COMMANDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATE_ENTITY_PATTERNBindingSource, "SQL_COMMAND", True)) @@ -922,7 +938,7 @@ Partial Class frmTemplates ' Me.ListBox3.FormattingEnabled = True Me.ListBox3.ItemHeight = 15 - Me.ListBox3.Location = New System.Drawing.Point(848, 251) + Me.ListBox3.Location = New System.Drawing.Point(848, 269) Me.ListBox3.Name = "ListBox3" Me.ListBox3.Size = New System.Drawing.Size(301, 124) Me.ListBox3.TabIndex = 42 @@ -947,11 +963,70 @@ Partial Class frmTemplates Me.Label2.TabIndex = 44 Me.Label2.Text = "Entitäts-/Dokumentart-Zuordnung:" ' + 'Panel1 + ' + Me.Panel1.Controls.Add(Me.Label4) + Me.Panel1.Controls.Add(Me.Label3) + Me.Panel1.Controls.Add(Me.ListBox1) + Me.Panel1.Controls.Add(Me.TBPMO_TEMPLATEBindingNavigator) + Me.Panel1.Controls.Add(GUIDLabel) + Me.Panel1.Controls.Add(Me.GUIDTextBox) + Me.Panel1.Controls.Add(NAMELabel) + Me.Panel1.Controls.Add(Me.NAMETextBox) + Me.Panel1.Controls.Add(TEMPLATE_PATHLabel) + Me.Panel1.Controls.Add(Me.TEMPLATE_PATHTextBox) + Me.Panel1.Controls.Add(Me.ACTIVECheckBox) + Me.Panel1.Controls.Add(Me.ADDED_WHOTextBox) + Me.Panel1.Controls.Add(ADDED_WHOLabel) + Me.Panel1.Controls.Add(Me.ADDED_WHENTextBox) + Me.Panel1.Controls.Add(ADDED_WHENLabel) + Me.Panel1.Controls.Add(Me.CHANGED_WHOTextBox) + Me.Panel1.Controls.Add(CHANGED_WHOLabel) + Me.Panel1.Controls.Add(Me.CHANGED_WHENTextBox) + Me.Panel1.Controls.Add(CHANGED_WHENLabel) + Me.Panel1.Controls.Add(Me.DOCTYPE_IDComboBox) + Me.Panel1.Controls.Add(DOCTYPE_IDLabel) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel1.Location = New System.Drawing.Point(0, 0) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(1426, 199) + Me.Panel1.TabIndex = 45 + ' + 'ToolStripLabel3 + ' + Me.ToolStripLabel3.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ToolStripLabel3.Name = "ToolStripLabel3" + Me.ToolStripLabel3.Size = New System.Drawing.Size(137, 22) + Me.ToolStripLabel3.Text = "Hinterlegte Vorlagen" + Me.ToolStripLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label3.Location = New System.Drawing.Point(583, 43) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(424, 13) + Me.Label3.TabIndex = 25 + Me.Label3.Text = "(Die Dokumentart definiert den Ablageort, die Indexierung und die Benennung der D" & _ + "atei)" + ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.Label4.Location = New System.Drawing.Point(238, 43) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(173, 13) + Me.Label4.TabIndex = 26 + Me.Label4.Text = "(Verweis für Menüzuordnungen etc)" + ' 'frmTemplates ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 15.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1426, 698) + Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.ListBox3) @@ -973,28 +1048,9 @@ Partial Class frmTemplates Me.Controls.Add(Me.ADDED_WHENTextBox1) Me.Controls.Add(ADDED_WHOLabel1) Me.Controls.Add(Me.ADDED_WHOTextBox1) - Me.Controls.Add(DOCTYPE_IDLabel) - Me.Controls.Add(Me.DOCTYPE_IDComboBox) Me.Controls.Add(ENTITY_IDLabel) Me.Controls.Add(Me.ENTITY_IDComboBox) Me.Controls.Add(Me.BindingNavigator1) - Me.Controls.Add(CHANGED_WHENLabel) - Me.Controls.Add(Me.CHANGED_WHENTextBox) - Me.Controls.Add(CHANGED_WHOLabel) - Me.Controls.Add(Me.CHANGED_WHOTextBox) - Me.Controls.Add(ADDED_WHENLabel) - Me.Controls.Add(Me.ADDED_WHENTextBox) - Me.Controls.Add(ADDED_WHOLabel) - Me.Controls.Add(Me.ADDED_WHOTextBox) - Me.Controls.Add(Me.ACTIVECheckBox) - Me.Controls.Add(TEMPLATE_PATHLabel) - Me.Controls.Add(Me.TEMPLATE_PATHTextBox) - Me.Controls.Add(NAMELabel) - Me.Controls.Add(Me.NAMETextBox) - Me.Controls.Add(Me.ListBox1) - Me.Controls.Add(GUIDLabel) - Me.Controls.Add(Me.GUIDTextBox) - Me.Controls.Add(Me.TBPMO_TEMPLATEBindingNavigator) Me.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Name = "frmTemplates" Me.Text = "Vorlagenverwaltung Office" @@ -1013,6 +1069,8 @@ Partial Class frmTemplates CType(Me.BindingNavigator2, System.ComponentModel.ISupportInitialize).EndInit() Me.BindingNavigator2.ResumeLayout(False) Me.BindingNavigator2.PerformLayout() + Me.Panel1.ResumeLayout(False) + Me.Panel1.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -1093,4 +1151,8 @@ Partial Class frmTemplates Friend WithEvents ListBox3 As System.Windows.Forms.ListBox Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents Label2 As System.Windows.Forms.Label + Friend WithEvents ToolStripLabel3 As System.Windows.Forms.ToolStripLabel + Friend WithEvents Panel1 As System.Windows.Forms.Panel + Friend WithEvents Label4 As System.Windows.Forms.Label + Friend WithEvents Label3 As System.Windows.Forms.Label End Class diff --git a/app/DD-Record-Organiser/frmTemplates.resx b/app/DD-Record-Organiser/frmTemplates.resx index ce9b6f1..58bf2be 100644 --- a/app/DD-Record-Organiser/frmTemplates.resx +++ b/app/DD-Record-Organiser/frmTemplates.resx @@ -153,6 +153,21 @@ False + + False + + + False + + + False + + + False + + + False + 17, 17 @@ -329,12 +344,6 @@ 17, 95 - - 17, 95 - - - 832, 56 - 832, 56 @@ -418,19 +427,4 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - False - - - False - - - False - - - False - - - False - \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmTemplates.vb b/app/DD-Record-Organiser/frmTemplates.vb index 0ae5c64..1e55d0a 100644 --- a/app/DD-Record-Organiser/frmTemplates.vb +++ b/app/DD-Record-Organiser/frmTemplates.vb @@ -1,6 +1,7 @@ Public Class frmTemplates Dim _TEMPLATEID As Integer Dim _TEMPLATE_ENTITY_ID As Integer + Dim loaded As Boolean = False Private Sub TBPMO_TEMPLATEBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Handles TBPMO_TEMPLATEBindingNavigatorSaveItem.Click Me.Validate() @@ -72,15 +73,20 @@ End Sub Private Sub TBPMO_TEMPLATE_ENTITYBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBPMO_TEMPLATE_ENTITYBindingSource.CurrentChanged - If TBPMO_TEMPLATE_ENTITYBindingSource.Position <> -1 Then - If DD_DMSDataSet.TBPMO_TEMPLATE_ENTITY.Rows(TBPMO_TEMPLATE_ENTITYBindingSource.Position).Item("TEMPLATE_ID") = _TEMPLATEID Then - _TEMPLATE_ENTITY_ID = DD_DMSDataSet.TBPMO_TEMPLATE_ENTITY.Rows(TBPMO_TEMPLATE_ENTITYBindingSource.Position).Item("GUID") + If loaded = True Then + If TBPMO_TEMPLATE_ENTITYBindingSource.Position <> -1 Then + If DD_DMSDataSet.TBPMO_TEMPLATE_ENTITY.Rows(TBPMO_TEMPLATE_ENTITYBindingSource.Position).Item("TEMPLATE_ID") = _TEMPLATEID Then + _TEMPLATE_ENTITY_ID = DD_DMSDataSet.TBPMO_TEMPLATE_ENTITY.Rows(TBPMO_TEMPLATE_ENTITYBindingSource.Position).Item("GUID") + End If End If + Load_Patterns() End If - + + End Sub Private Sub frmTemplates_Shown(sender As Object, e As EventArgs) Handles Me.Shown + loaded = True Load_entity() Load_Patterns() End Sub diff --git a/app/DD-Record-Organiser/frmWD_Index_Dokart.vb b/app/DD-Record-Organiser/frmWD_Index_Dokart.vb index c99cb98..e6c451f 100644 --- a/app/DD-Record-Organiser/frmWD_Index_Dokart.vb +++ b/app/DD-Record-Organiser/frmWD_Index_Dokart.vb @@ -265,6 +265,7 @@ Public Class frmWD_Index_Dokart CURRENT_DOKARTID = 0 If cmbDokumentart.SelectedIndex <> -1 Then CURRENT_DOKARTID = cmbDokumentart.SelectedValue + CURRENT_DOKARTSTRING = cmbDokumentart.Text Refresh_indices() End If @@ -285,7 +286,16 @@ Public Class frmWD_Index_Dokart lvwIndices.Items.Clear() For Each row As DataRow In dt.Rows lvwIndices.Items.Add(row.Item("INDEXNAME").ToString) - lvwIndices.Items(Count).SubItems.Add(row.Item("VALUE")) + + Dim Value As String + Dim _case = row.Item("VALUE").ToString.ToUpper + Select Case row.Item("VALUE").ToString.ToUpper + Case "@DOKART" + Value = CURRENT_DOKARTSTRING + Case "@RECORD-ID" + Value = CURRENT_RECORD_ID + End Select + lvwIndices.Items(Count).SubItems.Add(Value) Count += 1 Next End If