From 365e92e98b4d84b2fddf9346ab145bfacf073e0f Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Fri, 13 Nov 2015 15:51:25 +0100 Subject: [PATCH] MS_13.11_Final --- .../ClassControlCommandsUI.vb | 4 +- .../ClassOfficeTemplate.vb | 45 +++-- .../DD_DMSDataSet.Designer.vb | 91 +++++++-- app/DD-Record-Organiser/DD_DMSDataSet.xsd | 189 ++++++++++-------- app/DD-Record-Organiser/DD_DMSDataSet.xss | 40 ++-- .../DD_ECMAdmin.Designer.vb | 105 +++++++--- app/DD-Record-Organiser/DD_ECMAdmin.xsc | 42 ++-- app/DD-Record-Organiser/DD_ECMAdmin.xsd | 75 ++++--- app/DD-Record-Organiser/DD_ECMAdmin.xss | 2 +- .../My Project/AssemblyInfo.vb | 4 +- .../frmConstructorDesigner.Designer.vb | 115 ++++++----- .../frmConstructorDesigner.resx | 9 +- .../frmConstructorDesigner.vb | 4 + .../frmForm_Constructor.vb | 69 ++++--- .../frmForm_Constructor_Main.vb | 3 + .../frmLevel_Designer.Designer.vb | 2 +- .../frmTemplates.Designer.vb | 95 ++++++--- app/DD-Record-Organiser/frmTemplates.resx | 26 +-- app/DD-Record-Organiser/frmTemplates.vb | 46 +++++ .../frmWD_EntityImport.Designer.vb | 6 +- app/SetupWiX/Product.wxs | 2 +- 21 files changed, 619 insertions(+), 355 deletions(-) diff --git a/app/DD-Record-Organiser/ClassControlCommandsUI.vb b/app/DD-Record-Organiser/ClassControlCommandsUI.vb index 38decd8..db7507b 100644 --- a/app/DD-Record-Organiser/ClassControlCommandsUI.vb +++ b/app/DD-Record-Organiser/ClassControlCommandsUI.vb @@ -634,7 +634,7 @@ Public Class ClassControlCommandsUI Public Shared Function CreateRecord(FormID) Dim ADDED_WHO As String = Environment.UserName Dim SQL = "INSERT INTO TBPMO_RECORD(ADDED_WHO, FORM_ID) VALUES ('" & ADDED_WHO & "', " & FormID & ")" - Return ClassDatabase.Execute_non_Query(SQL) + Return ClassDatabase.Execute_non_Query(SQL, True) End Function Public Shared Function GetLastRecord() @@ -647,7 +647,7 @@ Public Class ClassControlCommandsUI Dim ADDED_WHO As String = Environment.UserName Dim SQL = "INSERT INTO TBPMO_RECORD_CONNECT(RECORD1_ID,RECORD2_ID,COMMENT,ADDED_WHO) VALUES (" & foreignRecordID & "," & recordID & ",'" & Comment & "','" & ADDED_WHO & "')" If LogErrorsOnly = False Then ClassLogger.Add(">> ConnectRecord SQL: " & SQL, False) - Return ClassDatabase.Execute_non_Query(SQL) + Return ClassDatabase.Execute_non_Query(SQL, True) End Function 'Function SaveRecord_OLD(RecordID As Integer, FormID As Integer, Optional foreignRecordID As Integer = 0) As String diff --git a/app/DD-Record-Organiser/ClassOfficeTemplate.vb b/app/DD-Record-Organiser/ClassOfficeTemplate.vb index 57d589d..31c2974 100644 --- a/app/DD-Record-Organiser/ClassOfficeTemplate.vb +++ b/app/DD-Record-Organiser/ClassOfficeTemplate.vb @@ -4,7 +4,7 @@ Public Class ClassOfficeTemplate Try Dim sql_Template As String = "SELECT * FROM VWPMO_TEMPLATE_ENTITY WHERE TEMPLATE_ID = " & Template_ID Dim DT_TEMPLATE As System.Data.DataTable = ClassDatabase.Return_Datatable(sql_Template) - Dim sql_patterns As String = "select * from TBPMO_TEMPLATE_PATTERN where TEMPL_ENT_ID = (SELECT GUID FROM TBPMO_TEMPLATE_ENTITY WHERE ENTITY_ID = " & CURRENT_FORM_ID & " AND TEMPLATE_ID = " & Template_ID & ")" + Dim sql_patterns As String = String.Format("select * from TBPMO_TEMPLATE_PATTERN where TEMPLATE_ENT_ID = (SELECT GUID FROM TBPMO_TEMPLATE_ENTITY WHERE ENTITY_ID = {0} AND TEMPLATE_ID = {1})", CURRENT_FORM_ID, Template_ID) Dim DT_PATTERNS As System.Data.DataTable = ClassDatabase.Return_Datatable(sql_patterns) If IsNothing(DT_PATTERNS) Then @@ -13,7 +13,7 @@ Public Class ClassOfficeTemplate End If Dim Original_Vorlage As String = DT_TEMPLATE.Rows(0).Item("TEMPLATE_PATH") - Dim DOCTYPE_ID As Integer = ClassDatabase.Execute_Scalar("SELECT DOCTYPE_ID FROM TBPMO_TEMPLATE_ENTITY WHERE ENTITY_ID = " & CURRENT_FORM_ID & " AND TEMPLATE_ID = " & Template_ID) + Dim DOCTYPE_ID As Integer = ClassDatabase.Execute_Scalar("SELECT DOCTYPE_ID FROM TBPMO_TEMPLATE WHERE GUID = " & Template_ID, True) If System.IO.File.Exists(Original_Vorlage) = False Then MsgBox("Achtung: die Vorlage " & vbNewLine & Original_Vorlage & vbNewLine & "existiert nicht!", MsgBoxStyle.Critical) @@ -48,27 +48,27 @@ Public Class ClassOfficeTemplate 'Fixed Value ist gefüllt Dim fvalue As String = patternrow.Item("FIXED_VALUE").ToString.ToUpper If fvalue <> "" Then - If fvalue.Contains("@") Then - If fvalue.Contains("CONTROLID") Then - Dim Control_ID = fvalue.Replace("@CONTROLID:", "") - Try - If CInt(Control_ID) Then - If LogErrorsOnly = False Then ClassLogger.Add(">> Get Value for Control-ID: " & Control_ID.ToString, False) - Dim value_akt = ClassDatabase.Execute_Scalar("SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = " & Control_ID & " AND RECORD_ID = " & Record_ID) - If Not IsNothing(value_akt) Then - cc.Range.Text = value_akt.ToString - Else - ClassLogger.Add("Für Control-ID '" & Control_ID & "' konnte kein Wert gelesen werden!", True) - End If - End If - Catch ex As Exception - ClassLogger.Add("Unerwarteter Fehler beim Auslesen eines Control-Wertes in Pattern-For: " & ex.Message, True) - End Try + ' If fvalue.Contains("@") Then + 'If fvalue.Contains("CONTROLID") Then + Dim Control_ID = fvalue '.Replace("@CONTROLID:", "") + Try + If CInt(Control_ID) Then + If LogErrorsOnly = False Then ClassLogger.Add(">> Get Value for Control-ID: " & Control_ID.ToString, False) + Dim value_akt = ClassDatabase.Execute_Scalar("SELECT VALUE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = " & Control_ID & " AND RECORD_ID = " & Record_ID) + If Not IsNothing(value_akt) Then + cc.Range.Text = value_akt.ToString + Else + ClassLogger.Add("Für Control-ID '" & Control_ID & "' konnte kein Wert gelesen werden!", True) + End If End If - Else - If LogErrorsOnly = False Then ClassLogger.Add(">> Pattern wird mit festem Wert '" & patternrow.Item("FIXED_VALUE") & "' gefüllt!", False) - cc.Range.Text = patternrow.Item("FIXED_VALUE").ToString - End If + Catch ex As Exception + ClassLogger.Add("Unerwarteter Fehler beim Auslesen eines Control-Wertes in Pattern-For: " & ex.Message, True) + End Try + 'End If + 'Else + ' If LogErrorsOnly = False Then ClassLogger.Add(">> Pattern wird mit festem Wert '" & patternrow.Item("FIXED_VALUE") & "' gefüllt!", False) + ' cc.Range.Text = patternrow.Item("FIXED_VALUE").ToString + 'End If End If Else 'Kein Fixed Value, also wohl eher sql-result If Not IsDBNull(patternrow.Item("CONNECTION_ID")) Then @@ -89,6 +89,7 @@ Public Class ClassOfficeTemplate 'doc.Bookmarks().Item("Produktion").Range.Text = "Testproduktion" doc.SaveAs(tempdoc) + TEMP_FILES.Add(tempdoc) 'doc.Close() 'speichern / drucken 'doc.SaveAs("c:\Proforma.doc") diff --git a/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb b/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb index 0df5b4f..4f6c855 100644 --- a/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb +++ b/app/DD-Record-Organiser/DD_DMSDataSet.Designer.vb @@ -16445,6 +16445,10 @@ Partial Public Class DD_DMSDataSet Private columnSEARCH_PATTERN5 As Global.System.Data.DataColumn + Private columnLOAD_DIRECT As Global.System.Data.DataColumn + + Private columnSQL_QUICK_VIEW As Global.System.Data.DataColumn + _ Public Sub New() @@ -16640,6 +16644,22 @@ Partial Public Class DD_DMSDataSet End Get End Property + _ + Public ReadOnly Property LOAD_DIRECTColumn() As Global.System.Data.DataColumn + Get + Return Me.columnLOAD_DIRECT + End Get + End Property + + _ + Public ReadOnly Property SQL_QUICK_VIEWColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSQL_QUICK_VIEW + End Get + End Property + _ @@ -16696,9 +16716,11 @@ Partial Public Class DD_DMSDataSet ByVal SEARCH_PATTERN2 As String, _ ByVal SEARCH_PATTERN3 As String, _ ByVal SEARCH_PATTERN4 As String, _ - ByVal SEARCH_PATTERN5 As String) As TBPMO_FORM_CONSTRUCTOR_DETAILRow + ByVal SEARCH_PATTERN5 As String, _ + ByVal LOAD_DIRECT As Boolean, _ + ByVal SQL_QUICK_VIEW As String) As TBPMO_FORM_CONSTRUCTOR_DETAILRow Dim rowTBPMO_FORM_CONSTRUCTOR_DETAILRow As TBPMO_FORM_CONSTRUCTOR_DETAILRow = CType(Me.NewRow,TBPMO_FORM_CONSTRUCTOR_DETAILRow) - Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, Nothing, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5} + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, Nothing, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, LOAD_DIRECT, SQL_QUICK_VIEW} If (Not (parentTBPMO_FORM_CONSTRUCTORRowByFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID) Is Nothing) Then columnValuesArray(1) = parentTBPMO_FORM_CONSTRUCTORRowByFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID(0) End If @@ -16753,6 +16775,8 @@ Partial Public Class DD_DMSDataSet Me.columnSEARCH_PATTERN3 = MyBase.Columns("SEARCH_PATTERN3") Me.columnSEARCH_PATTERN4 = MyBase.Columns("SEARCH_PATTERN4") Me.columnSEARCH_PATTERN5 = MyBase.Columns("SEARCH_PATTERN5") + Me.columnLOAD_DIRECT = MyBase.Columns("LOAD_DIRECT") + Me.columnSQL_QUICK_VIEW = MyBase.Columns("SQL_QUICK_VIEW") End Sub _ + Public Property LOAD_DIRECT() As Boolean + Get + Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.LOAD_DIRECTColumn),Boolean) + End Get + Set + Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.LOAD_DIRECTColumn) = value + End Set + End Property + + _ + Public Property SQL_QUICK_VIEW() As String + Get + Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.SQL_QUICK_VIEWColumn),String) + End Get + Set + Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.SQL_QUICK_VIEWColumn) = value + End Set + End Property + _ Public Property TBPMO_FORM_CONSTRUCTORRow() As TBPMO_FORM_CONSTRUCTORRow @@ -42097,6 +42150,8 @@ Namespace DD_DMSDataSetTableAdapters tableMapping.ColumnMappings.Add("SEARCH_PATTERN3", "SEARCH_PATTERN3") tableMapping.ColumnMappings.Add("SEARCH_PATTERN4", "SEARCH_PATTERN4") tableMapping.ColumnMappings.Add("SEARCH_PATTERN5", "SEARCH_PATTERN5") + tableMapping.ColumnMappings.Add("LOAD_DIRECT", "LOAD_DIRECT") + tableMapping.ColumnMappings.Add("SQL_QUICK_VIEW", "SQL_QUICK_VIEW") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -42144,11 +42199,12 @@ Namespace DD_DMSDataSetTableAdapters "LUMN_NAME2, WINDREAM_SEARCH = @WINDREAM_SEARCH, SEARCH_PATTERN1 = @SEARCH_PATTER"& _ "N1, SEARCH_PATTERN2 = @SEARCH_PATTERN2, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SEARCH_PATTER"& _ "N3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SE"& _ - "ARCH_PATTERN5"&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, CONSTRUCT_ID"& _ - ", FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBE"& _ - "NE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME"& _ - "2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PA"& _ - "TTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @GUID)" + "ARCH_PATTERN5, LOAD_DIRECT = @LOAD_DIRECT, SQL_QUICK_VIEW ="&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, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELE"& _ + "CT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANG"& _ + "ED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTER"& _ + "N1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPM"& _ + "O_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONSTRUCT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONSTRUCT_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORM_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "FORM_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -42166,6 +42222,7 @@ Namespace DD_DMSDataSetTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN3", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN3", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN4", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN4", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN5", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN5", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOAD_DIRECT", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "LOAD_DIRECT", 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 @@ -42187,16 +42244,18 @@ Namespace DD_DMSDataSetTableAdapters "L_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_"& _ "WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SE"& _ "ARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN"& _ - "5"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPMO_FORM_CONSTRUCTOR_DETAIL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @ID)" + "5, LOAD_DIRECT, SQL_QUICK_VIEW"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPMO_FORM_CONSTRUCTOR_DETAIL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"W"& _ + "HERE (GUID = @ID)" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(1).Connection = Me.Connection - Me._commandCollection(1).CommandText = "SELECT ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, COLUMN_NAME1, COLUMN_NAM"& _ - "E2, CONSTRUCT_ID, FORM_ID, GUID, LEVEL1_SELECT, PARENT_ID, SEARCH_PATTERN1, SEAR"& _ - "CH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, SEQUENCE, SQL_SE"& _ - "LECT_EBENE1, SQL_SELECT_EBENE2, WINDREAM_SEARCH FROM TBPMO_FORM_CONSTRUCTOR_DETA"& _ - "IL WHERE (GUID = @ID)" + Me._commandCollection(1).CommandText = "SELECT ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, COLUMN_NAME1, COL"& _ + "UMN_NAME2, CONSTRUCT_ID, FORM_ID, GUID, LEVEL1_SELECT, PARENT_ID, SEARCH_PATTERN"& _ + "1, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4,"& _ + " SEARCH_PATTERN5, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, WINDREAM_SEARC"& _ + "H, LOAD_DIRECT, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SQL_QUICK_VIEW"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPMO"& _ + "_FORM_CONSTRUCTOR_DETAIL"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @ID)" Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub @@ -42419,6 +42478,7 @@ Namespace DD_DMSDataSetTableAdapters ByVal SEARCH_PATTERN3 As String, _ ByVal SEARCH_PATTERN4 As String, _ ByVal SEARCH_PATTERN5 As String, _ + ByVal LOAD_DIRECT As Boolean, _ ByVal Original_GUID As Integer, _ ByVal GUID As Integer) As Integer Me.Adapter.UpdateCommand.Parameters(0).Value = CType(CONSTRUCT_ID,Integer) @@ -42481,8 +42541,9 @@ Namespace DD_DMSDataSetTableAdapters Else Me.Adapter.UpdateCommand.Parameters(15).Value = CType(SEARCH_PATTERN5,String) End If - Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(17).Value = CType(GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(16).Value = CType(LOAD_DIRECT,Boolean) + Me.Adapter.UpdateCommand.Parameters(17).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(18).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 diff --git a/app/DD-Record-Organiser/DD_DMSDataSet.xsd b/app/DD-Record-Organiser/DD_DMSDataSet.xsd index a56744c..a8ca241 100644 --- a/app/DD-Record-Organiser/DD_DMSDataSet.xsd +++ b/app/DD-Record-Organiser/DD_DMSDataSet.xsd @@ -2450,45 +2450,45 @@ SELECT GUID, DESCRIPTION, SQL_PROVIDER, SERVER, [DATABASE], USERNAME, PASSWORD, - + DELETE FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @Original_GUID) - + - + INSERT INTO TBPMO_FORM_CONSTRUCTOR_DETAIL (CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5) VALUES (@CONSTRUCT_ID,@FORM_ID,@PARENT_ID,@LEVEL1_SELECT,@SEQUENCE,@SQL_SELECT_EBENE1,@SQL_SELECT_EBENE2,@ADDED_WHO,@COLUMN_NAME1,@COLUMN_NAME2,@WINDREAM_SEARCH,@SEARCH_PATTERN1,@SEARCH_PATTERN2,@SEARCH_PATTERN3,@SEARCH_PATTERN4,@SEARCH_PATTERN5); SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = SCOPE_IDENTITY()) - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, - COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 + COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, LOAD_DIRECT, SQL_QUICK_VIEW FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @ID) @@ -2502,8 +2502,8 @@ WHERE (GUID = @ID) SET CONSTRUCT_ID = @CONSTRUCT_ID, FORM_ID = @FORM_ID, PARENT_ID = @PARENT_ID, LEVEL1_SELECT = @LEVEL1_SELECT, SEQUENCE = @SEQUENCE, SQL_SELECT_EBENE1 = @SQL_SELECT_EBENE1, SQL_SELECT_EBENE2 = @SQL_SELECT_EBENE2, CHANGED_WHO = @CHANGED_WHO, COLUMN_NAME1 = @COLUMN_NAME1, COLUMN_NAME2 = @COLUMN_NAME2, WINDREAM_SEARCH = @WINDREAM_SEARCH, SEARCH_PATTERN1 = @SEARCH_PATTERN1, SEARCH_PATTERN2 = @SEARCH_PATTERN2, - SEARCH_PATTERN3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SEARCH_PATTERN5 -WHERE (GUID = @Original_GUID); + SEARCH_PATTERN3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SEARCH_PATTERN5, LOAD_DIRECT = @LOAD_DIRECT, SQL_QUICK_VIEW = +WHERE (GUID = @Original_GUID); SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @GUID) @@ -2522,6 +2522,7 @@ SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELE + @@ -2550,12 +2551,18 @@ SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELE + + - SELECT ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, COLUMN_NAME1, COLUMN_NAME2, CONSTRUCT_ID, FORM_ID, GUID, LEVEL1_SELECT, PARENT_ID, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, WINDREAM_SEARCH FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @ID) + SELECT ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, COLUMN_NAME1, COLUMN_NAME2, CONSTRUCT_ID, FORM_ID, GUID, LEVEL1_SELECT, PARENT_ID, SEARCH_PATTERN1, + SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, WINDREAM_SEARCH, LOAD_DIRECT, + SQL_QUICK_VIEW +FROM TBPMO_FORM_CONSTRUCTOR_DETAIL +WHERE (GUID = @ID) @@ -2842,7 +2849,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -2883,7 +2890,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -2961,7 +2968,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3056,7 +3063,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3079,7 +3086,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3124,7 +3131,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3162,7 +3169,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3197,7 +3204,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3234,7 +3241,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3255,7 +3262,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3292,7 +3299,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3318,7 +3325,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3359,7 +3366,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3406,7 +3413,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3451,7 +3458,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3518,7 +3525,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3555,7 +3562,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3610,7 +3617,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3649,7 +3656,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3773,7 +3780,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3835,7 +3842,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3865,7 +3872,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3895,7 +3902,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3932,7 +3939,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3957,7 +3964,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -3977,7 +3984,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4016,7 +4023,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4060,7 +4067,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4090,7 +4097,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4137,7 +4144,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4291,7 +4298,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4316,7 +4323,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4351,7 +4358,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4380,7 +4387,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4435,7 +4442,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4494,7 +4501,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4567,7 +4574,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4662,10 +4669,18 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) + + + + + + + + - + @@ -4759,7 +4774,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4798,7 +4813,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4816,7 +4831,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -4862,7 +4877,7 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - + @@ -5029,27 +5044,27 @@ VALUES (@NAME_PATTERN,@ADDED_WHO,@TEMPLATE_ENT_ID) - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ 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 5f1430a..4871d3d 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. --> - + @@ -17,12 +17,12 @@ - - + + - + @@ -31,23 +31,23 @@ - + - + - + - - - - - - + + + + + + @@ -254,7 +254,7 @@ - + 1358 @@ -266,7 +266,7 @@ - + 282 @@ -282,7 +282,7 @@ - + 299 @@ -294,7 +294,7 @@ - + 2461 @@ -310,7 +310,7 @@ - + 2358 @@ -322,7 +322,7 @@ - + 2134 @@ -338,7 +338,7 @@ - + 2142 diff --git a/app/DD-Record-Organiser/DD_ECMAdmin.Designer.vb b/app/DD-Record-Organiser/DD_ECMAdmin.Designer.vb index 901ea08..4e1af8a 100644 --- a/app/DD-Record-Organiser/DD_ECMAdmin.Designer.vb +++ b/app/DD-Record-Organiser/DD_ECMAdmin.Designer.vb @@ -841,6 +841,10 @@ Partial Public Class DD_ECMAdmin Private columnSEARCH_PATTERN5 As Global.System.Data.DataColumn + Private columnLOAD_DIRECT As Global.System.Data.DataColumn + + Private columnSQL_QUICK_VIEW As Global.System.Data.DataColumn + _ Public Sub New() @@ -1036,6 +1040,22 @@ Partial Public Class DD_ECMAdmin End Get End Property + _ + Public ReadOnly Property LOAD_DIRECTColumn() As Global.System.Data.DataColumn + Get + Return Me.columnLOAD_DIRECT + End Get + End Property + + _ + Public ReadOnly Property SQL_QUICK_VIEWColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSQL_QUICK_VIEW + End Get + End Property + _ @@ -1092,9 +1112,11 @@ Partial Public Class DD_ECMAdmin ByVal SEARCH_PATTERN2 As String, _ ByVal SEARCH_PATTERN3 As String, _ ByVal SEARCH_PATTERN4 As String, _ - ByVal SEARCH_PATTERN5 As String) As TBPMO_FORM_CONSTRUCTOR_DETAILRow + ByVal SEARCH_PATTERN5 As String, _ + ByVal LOAD_DIRECT As Boolean, _ + ByVal SQL_QUICK_VIEW As String) As TBPMO_FORM_CONSTRUCTOR_DETAILRow Dim rowTBPMO_FORM_CONSTRUCTOR_DETAILRow As TBPMO_FORM_CONSTRUCTOR_DETAILRow = CType(Me.NewRow, TBPMO_FORM_CONSTRUCTOR_DETAILRow) - Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5} + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, LOAD_DIRECT, SQL_QUICK_VIEW} If (Not (parentTBPMO_FORM_CONSTRUCTORRowByFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID) Is Nothing) Then columnValuesArray(1) = parentTBPMO_FORM_CONSTRUCTORRowByFK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID(0) End If @@ -1146,6 +1168,8 @@ Partial Public Class DD_ECMAdmin Me.columnSEARCH_PATTERN3 = MyBase.Columns("SEARCH_PATTERN3") Me.columnSEARCH_PATTERN4 = MyBase.Columns("SEARCH_PATTERN4") Me.columnSEARCH_PATTERN5 = MyBase.Columns("SEARCH_PATTERN5") + Me.columnLOAD_DIRECT = MyBase.Columns("LOAD_DIRECT") + Me.columnSQL_QUICK_VIEW = MyBase.Columns("SQL_QUICK_VIEW") End Sub _ Public Property ADDED_WHEN() As Date Get - Try - Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.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_FORM_CONSTRUCTOR_DETAIL ist DBNul" & _ - "l.", e) - End Try + Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHENColumn), Date) End Get Set(value As Date) Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHENColumn) = value @@ -2863,6 +2890,28 @@ Partial Public Class DD_ECMAdmin End Set End Property + _ + Public Property LOAD_DIRECT() As Boolean + Get + Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.LOAD_DIRECTColumn), Boolean) + End Get + Set(value As Boolean) + Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.LOAD_DIRECTColumn) = value + End Set + End Property + + _ + Public Property SQL_QUICK_VIEW() As String + Get + Return CType(Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.SQL_QUICK_VIEWColumn), String) + End Get + Set(value As String) + Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.SQL_QUICK_VIEWColumn) = value + End Set + End Property + _ Public Property TBPMO_FORM_CONSTRUCTORRow() As TBPMO_FORM_CONSTRUCTORRow @@ -2898,18 +2947,6 @@ Partial Public Class DD_ECMAdmin Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHOColumn) = Global.System.Convert.DBNull End Sub - _ - Public Function IsADDED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHENColumn) - End Function - - _ - Public Sub SetADDED_WHENNull() - Me(Me.tableTBPMO_FORM_CONSTRUCTOR_DETAIL.ADDED_WHENColumn) = Global.System.Convert.DBNull - End Sub - _ Public Function IsCHANGED_WHONull() As Boolean @@ -4184,6 +4221,8 @@ Namespace DD_ECMAdminTableAdapters tableMapping.ColumnMappings.Add("SEARCH_PATTERN3", "SEARCH_PATTERN3") tableMapping.ColumnMappings.Add("SEARCH_PATTERN4", "SEARCH_PATTERN4") tableMapping.ColumnMappings.Add("SEARCH_PATTERN5", "SEARCH_PATTERN5") + tableMapping.ColumnMappings.Add("LOAD_DIRECT", "LOAD_DIRECT") + tableMapping.ColumnMappings.Add("SQL_QUICK_VIEW", "SQL_QUICK_VIEW") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -4231,11 +4270,12 @@ Namespace DD_ECMAdminTableAdapters "LUMN_NAME2, WINDREAM_SEARCH = @WINDREAM_SEARCH, SEARCH_PATTERN1 = @SEARCH_PATTER" & _ "N1, SEARCH_PATTERN2 = @SEARCH_PATTERN2, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " SEARCH_PATTER" & _ "N3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SE" & _ - "ARCH_PATTERN5" & 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, CONSTRUCT_ID" & _ - ", FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBE" & _ - "NE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME" & _ - "2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PA" & _ - "TTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @GUID)" + "ARCH_PATTERN5, LOAD_DIRECT = @LOAD_DIRECT" & 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, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_" & _ + "SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WH" & _ + "EN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN" & _ + "2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR" & _ + "_DETAIL WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONSTRUCT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONSTRUCT_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORM_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "FORM_ID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) @@ -4253,6 +4293,7 @@ Namespace DD_ECMAdminTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN3", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN3", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN4", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN4", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEARCH_PATTERN5", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "SEARCH_PATTERN5", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOAD_DIRECT", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "LOAD_DIRECT", 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 @@ -4270,8 +4311,12 @@ Namespace DD_ECMAdminTableAdapters 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_FORM_CONSTRUCTOR_DETAIL.*" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "FROM TBPMO_FORM_CONSTRU" & _ - "CTOR_DETAIL where GUID = @ID" + Me._commandCollection(0).CommandText = "SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQ" & _ + "L_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_" & _ + "WHEN, " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & " COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SE" & _ + "ARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN" & _ + "5, LOAD_DIRECT, SQL_QUICK_VIEW" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "FROM TBPMO_FORM_CONSTRUCTOR_DETAIL" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "W" & _ + "HERE (GUID = @ID)" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, False, Nothing, "", "", "")) End Sub @@ -4468,6 +4513,7 @@ Namespace DD_ECMAdminTableAdapters ByVal SEARCH_PATTERN3 As String, _ ByVal SEARCH_PATTERN4 As String, _ ByVal SEARCH_PATTERN5 As String, _ + ByVal LOAD_DIRECT As Boolean, _ ByVal Original_GUID As Integer, _ ByVal GUID As Integer) As Integer Me.Adapter.UpdateCommand.Parameters(0).Value = CType(CONSTRUCT_ID, Integer) @@ -4530,8 +4576,9 @@ Namespace DD_ECMAdminTableAdapters Else Me.Adapter.UpdateCommand.Parameters(15).Value = CType(SEARCH_PATTERN5, String) End If - Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_GUID, Integer) - Me.Adapter.UpdateCommand.Parameters(17).Value = CType(GUID, Integer) + Me.Adapter.UpdateCommand.Parameters(16).Value = CType(LOAD_DIRECT, Boolean) + Me.Adapter.UpdateCommand.Parameters(17).Value = CType(Original_GUID, Integer) + Me.Adapter.UpdateCommand.Parameters(18).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 diff --git a/app/DD-Record-Organiser/DD_ECMAdmin.xsc b/app/DD-Record-Organiser/DD_ECMAdmin.xsc index b2dea1c..d5d601b 100644 --- a/app/DD-Record-Organiser/DD_ECMAdmin.xsc +++ b/app/DD-Record-Organiser/DD_ECMAdmin.xsc @@ -9,39 +9,53 @@ - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + diff --git a/app/DD-Record-Organiser/DD_ECMAdmin.xsd b/app/DD-Record-Organiser/DD_ECMAdmin.xsd index 639e30a..dbfe345 100644 --- a/app/DD-Record-Organiser/DD_ECMAdmin.xsd +++ b/app/DD-Record-Organiser/DD_ECMAdmin.xsd @@ -77,45 +77,47 @@ SELECT GUID, FORM_TITLE, SEQUENCE_MENU, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHAN - + DELETE FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @Original_GUID) - + - + INSERT INTO TBPMO_FORM_CONSTRUCTOR_DETAIL (CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5) VALUES (@CONSTRUCT_ID,@FORM_ID,@PARENT_ID,@LEVEL1_SELECT,@SEQUENCE,@SQL_SELECT_EBENE1,@SQL_SELECT_EBENE2,@ADDED_WHO,@COLUMN_NAME1,@COLUMN_NAME2,@WINDREAM_SEARCH,@SEARCH_PATTERN1,@SEARCH_PATTERN2,@SEARCH_PATTERN3,@SEARCH_PATTERN4,@SEARCH_PATTERN5); SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = SCOPE_IDENTITY()) - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - SELECT TBPMO_FORM_CONSTRUCTOR_DETAIL.* -FROM TBPMO_FORM_CONSTRUCTOR_DETAIL where GUID = @ID + + SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, + COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5, LOAD_DIRECT, SQL_QUICK_VIEW +FROM TBPMO_FORM_CONSTRUCTOR_DETAIL +WHERE (GUID = @ID) @@ -127,8 +129,8 @@ FROM TBPMO_FORM_CONSTRUCTOR_DETAIL where GUID = @ID SET CONSTRUCT_ID = @CONSTRUCT_ID, FORM_ID = @FORM_ID, PARENT_ID = @PARENT_ID, LEVEL1_SELECT = @LEVEL1_SELECT, SEQUENCE = @SEQUENCE, SQL_SELECT_EBENE1 = @SQL_SELECT_EBENE1, SQL_SELECT_EBENE2 = @SQL_SELECT_EBENE2, CHANGED_WHO = @CHANGED_WHO, COLUMN_NAME1 = @COLUMN_NAME1, COLUMN_NAME2 = @COLUMN_NAME2, WINDREAM_SEARCH = @WINDREAM_SEARCH, SEARCH_PATTERN1 = @SEARCH_PATTERN1, SEARCH_PATTERN2 = @SEARCH_PATTERN2, - SEARCH_PATTERN3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SEARCH_PATTERN5 -WHERE (GUID = @Original_GUID); + SEARCH_PATTERN3 = @SEARCH_PATTERN3, SEARCH_PATTERN4 = @SEARCH_PATTERN4, SEARCH_PATTERN5 = @SEARCH_PATTERN5, LOAD_DIRECT = @LOAD_DIRECT +WHERE (GUID = @Original_GUID); SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELECT_EBENE1, SQL_SELECT_EBENE2, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, COLUMN_NAME1, COLUMN_NAME2, WINDREAM_SEARCH, SEARCH_PATTERN1, SEARCH_PATTERN2, SEARCH_PATTERN3, SEARCH_PATTERN4, SEARCH_PATTERN5 FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE (GUID = @GUID) @@ -147,6 +149,7 @@ SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELE + @@ -175,6 +178,8 @@ SELECT GUID, CONSTRUCT_ID, FORM_ID, PARENT_ID, LEVEL1_SELECT, SEQUENCE, SQL_SELE + + @@ -286,7 +291,7 @@ FROM VWTEMPQUICKVIEW - + @@ -325,7 +330,7 @@ FROM VWTEMPQUICKVIEW - + @@ -355,7 +360,7 @@ FROM VWTEMPQUICKVIEW - + @@ -420,10 +425,18 @@ FROM VWTEMPQUICKVIEW + + + + + + + + - + @@ -496,14 +509,14 @@ FROM VWTEMPQUICKVIEW - + - + @@ -553,7 +566,7 @@ FROM VWTEMPQUICKVIEW - + \ No newline at end of file diff --git a/app/DD-Record-Organiser/DD_ECMAdmin.xss b/app/DD-Record-Organiser/DD_ECMAdmin.xss index 5b0fe7d..ea01b63 100644 --- a/app/DD-Record-Organiser/DD_ECMAdmin.xss +++ b/app/DD-Record-Organiser/DD_ECMAdmin.xss @@ -9,8 +9,8 @@ - + diff --git a/app/DD-Record-Organiser/My Project/AssemblyInfo.vb b/app/DD-Record-Organiser/My Project/AssemblyInfo.vb index fefcd30..6fc7ea0 100644 --- a/app/DD-Record-Organiser/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organiser/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb index 94171b2..9441472 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb +++ b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb @@ -92,8 +92,6 @@ Partial Class frmConstructorDesigner Me.ADDED_WHOTextBox1 = New System.Windows.Forms.TextBox() Me.XtraTabPage5 = New DevExpress.XtraTab.XtraTabPage() Me.Button3 = New System.Windows.Forms.Button() - Me.GridControl1 = New DevExpress.XtraGrid.GridControl() - Me.TileView1 = New DevExpress.XtraGrid.Views.Tile.TileView() Me.Button2 = New System.Windows.Forms.Button() Me.lblQuickViewAdded = New System.Windows.Forms.Label() Me.btnSetQuickViewPicture = New System.Windows.Forms.Button() @@ -135,6 +133,8 @@ Partial Class frmConstructorDesigner Me.tslblSaveDetail = New System.Windows.Forms.ToolStripStatusLabel() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() Me.tsbtnSave = New System.Windows.Forms.ToolStripButton() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.TileView1 = New DevExpress.XtraGrid.Views.Tile.TileView() Me.TBTEMP_QUICKDISPLAYBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() Me.ListBox1 = New System.Windows.Forms.ListBox() @@ -147,6 +147,7 @@ Partial Class frmConstructorDesigner Me.TBTEMP_QUICKDISPLAYTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBTEMP_QUICKDISPLAYTableAdapter() Me.TableAdapterManager2 = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components) + Me.LOAD_DIRECTCheckBox = New System.Windows.Forms.CheckBox() GUIDLabel = New System.Windows.Forms.Label() FORM_TITLELabel = New System.Windows.Forms.Label() SEQUENCE_MENULabel = New System.Windows.Forms.Label() @@ -181,13 +182,13 @@ Partial Class frmConstructorDesigner Me.XtraTabControl2.SuspendLayout() Me.XtraTabPage3.SuspendLayout() Me.XtraTabPage5.SuspendLayout() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TileView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabPage4.SuspendLayout() Me.grpbxWD_RecordSearch.SuspendLayout() Me.GroupBox1.SuspendLayout() Me.StatusStrip1.SuspendLayout() Me.ToolStrip1.SuspendLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TileView1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBTEMP_QUICKDISPLAYBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -271,7 +272,7 @@ Partial Class frmConstructorDesigner GUIDLabel1.AutoSize = True GUIDLabel1.Location = New System.Drawing.Point(12, 11) GUIDLabel1.Name = "GUIDLabel1" - GUIDLabel1.Size = New System.Drawing.Size(21, 13) + GUIDLabel1.Size = New System.Drawing.Size(22, 13) GUIDLabel1.TabIndex = 18 GUIDLabel1.Text = "ID:" ' @@ -280,7 +281,7 @@ Partial Class frmConstructorDesigner WINDREAM_SEARCHLabel.AutoSize = True WINDREAM_SEARCHLabel.Location = New System.Drawing.Point(6, 18) WINDREAM_SEARCHLabel.Name = "WINDREAM_SEARCHLabel" - WINDREAM_SEARCHLabel.Size = New System.Drawing.Size(96, 13) + WINDREAM_SEARCHLabel.Size = New System.Drawing.Size(90, 13) WINDREAM_SEARCHLabel.TabIndex = 34 WINDREAM_SEARCHLabel.Text = "windream-Suche:" ' @@ -289,7 +290,7 @@ Partial Class frmConstructorDesigner ADDED_WHOLabel1.AutoSize = True ADDED_WHOLabel1.Location = New System.Drawing.Point(70, 183) ADDED_WHOLabel1.Name = "ADDED_WHOLabel1" - ADDED_WHOLabel1.Size = New System.Drawing.Size(67, 13) + ADDED_WHOLabel1.Size = New System.Drawing.Size(65, 13) ADDED_WHOLabel1.TabIndex = 43 ADDED_WHOLabel1.Text = "Erstellt wer:" ' @@ -298,7 +299,7 @@ Partial Class frmConstructorDesigner ADDED_WHENLabel1.AutoSize = True ADDED_WHENLabel1.Location = New System.Drawing.Point(236, 183) ADDED_WHENLabel1.Name = "ADDED_WHENLabel1" - ADDED_WHENLabel1.Size = New System.Drawing.Size(77, 13) + ADDED_WHENLabel1.Size = New System.Drawing.Size(73, 13) ADDED_WHENLabel1.TabIndex = 44 ADDED_WHENLabel1.Text = "Erstellt wann:" ' @@ -307,7 +308,7 @@ Partial Class frmConstructorDesigner CHANGED_WHOLabel1.AutoSize = True CHANGED_WHOLabel1.Location = New System.Drawing.Point(70, 224) CHANGED_WHOLabel1.Name = "CHANGED_WHOLabel1" - CHANGED_WHOLabel1.Size = New System.Drawing.Size(80, 13) + CHANGED_WHOLabel1.Size = New System.Drawing.Size(77, 13) CHANGED_WHOLabel1.TabIndex = 45 CHANGED_WHOLabel1.Text = "Geändert wer:" ' @@ -316,7 +317,7 @@ Partial Class frmConstructorDesigner CHANGED_WHENLabel1.AutoSize = True CHANGED_WHENLabel1.Location = New System.Drawing.Point(236, 224) CHANGED_WHENLabel1.Name = "CHANGED_WHENLabel1" - CHANGED_WHENLabel1.Size = New System.Drawing.Size(90, 13) + CHANGED_WHENLabel1.Size = New System.Drawing.Size(85, 13) CHANGED_WHENLabel1.TabIndex = 46 CHANGED_WHENLabel1.Text = "Geändert wann:" ' @@ -325,7 +326,7 @@ Partial Class frmConstructorDesigner SQL_SELECT_EBENE1Label.AutoSize = True SQL_SELECT_EBENE1Label.Location = New System.Drawing.Point(69, 48) SQL_SELECT_EBENE1Label.Name = "SQL_SELECT_EBENE1Label" - SQL_SELECT_EBENE1Label.Size = New System.Drawing.Size(73, 13) + SQL_SELECT_EBENE1Label.Size = New System.Drawing.Size(72, 13) SQL_SELECT_EBENE1Label.TabIndex = 34 SQL_SELECT_EBENE1Label.Text = "SQL Ebene 1:" ' @@ -334,7 +335,7 @@ Partial Class frmConstructorDesigner SQL_SELECT_EBENE2Label.AutoSize = True SQL_SELECT_EBENE2Label.Location = New System.Drawing.Point(69, 91) SQL_SELECT_EBENE2Label.Name = "SQL_SELECT_EBENE2Label" - SQL_SELECT_EBENE2Label.Size = New System.Drawing.Size(73, 13) + SQL_SELECT_EBENE2Label.Size = New System.Drawing.Size(72, 13) SQL_SELECT_EBENE2Label.TabIndex = 36 SQL_SELECT_EBENE2Label.Text = "SQL Ebene 2:" ' @@ -343,7 +344,7 @@ Partial Class frmConstructorDesigner COLUMN_NAME1Label1.AutoSize = True COLUMN_NAME1Label1.Location = New System.Drawing.Point(69, 133) COLUMN_NAME1Label1.Name = "COLUMN_NAME1Label1" - COLUMN_NAME1Label1.Size = New System.Drawing.Size(114, 13) + COLUMN_NAME1Label1.Size = New System.Drawing.Size(108, 13) COLUMN_NAME1Label1.TabIndex = 48 COLUMN_NAME1Label1.Text = "Spaltenname Entität:" ' @@ -352,7 +353,7 @@ Partial Class frmConstructorDesigner SEARCH_PATTERN1Label1.AutoSize = True SEARCH_PATTERN1Label1.Location = New System.Drawing.Point(6, 59) SEARCH_PATTERN1Label1.Name = "SEARCH_PATTERN1Label1" - SEARCH_PATTERN1Label1.Size = New System.Drawing.Size(93, 13) + SEARCH_PATTERN1Label1.Size = New System.Drawing.Size(92, 13) SEARCH_PATTERN1Label1.TabIndex = 39 SEARCH_PATTERN1Label1.Text = "Search Pattern 1:" ' @@ -361,7 +362,7 @@ Partial Class frmConstructorDesigner SEARCH_PATTERN2Label1.AutoSize = True SEARCH_PATTERN2Label1.Location = New System.Drawing.Point(181, 59) SEARCH_PATTERN2Label1.Name = "SEARCH_PATTERN2Label1" - SEARCH_PATTERN2Label1.Size = New System.Drawing.Size(93, 13) + SEARCH_PATTERN2Label1.Size = New System.Drawing.Size(92, 13) SEARCH_PATTERN2Label1.TabIndex = 40 SEARCH_PATTERN2Label1.Text = "Search Pattern 2:" ' @@ -370,7 +371,7 @@ Partial Class frmConstructorDesigner SEARCH_PATTERN3Label.AutoSize = True SEARCH_PATTERN3Label.Location = New System.Drawing.Point(6, 99) SEARCH_PATTERN3Label.Name = "SEARCH_PATTERN3Label" - SEARCH_PATTERN3Label.Size = New System.Drawing.Size(93, 13) + SEARCH_PATTERN3Label.Size = New System.Drawing.Size(92, 13) SEARCH_PATTERN3Label.TabIndex = 41 SEARCH_PATTERN3Label.Text = "Search Pattern 3:" ' @@ -379,7 +380,7 @@ Partial Class frmConstructorDesigner SEARCH_PATTERN4Label.AutoSize = True SEARCH_PATTERN4Label.Location = New System.Drawing.Point(181, 99) SEARCH_PATTERN4Label.Name = "SEARCH_PATTERN4Label" - SEARCH_PATTERN4Label.Size = New System.Drawing.Size(93, 13) + SEARCH_PATTERN4Label.Size = New System.Drawing.Size(92, 13) SEARCH_PATTERN4Label.TabIndex = 42 SEARCH_PATTERN4Label.Text = "Search Pattern 4:" ' @@ -625,7 +626,7 @@ Partial Class frmConstructorDesigner Me.GUIDTextBox1.Location = New System.Drawing.Point(15, 27) Me.GUIDTextBox1.Name = "GUIDTextBox1" Me.GUIDTextBox1.ReadOnly = True - Me.GUIDTextBox1.Size = New System.Drawing.Size(34, 22) + Me.GUIDTextBox1.Size = New System.Drawing.Size(34, 21) Me.GUIDTextBox1.TabIndex = 19 ' 'LEVEL1_SELECTCheckBox @@ -644,7 +645,7 @@ Partial Class frmConstructorDesigner Me.WINDREAM_SEARCHTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "WINDREAM_SEARCH", True)) Me.WINDREAM_SEARCHTextBox.Location = New System.Drawing.Point(9, 34) Me.WINDREAM_SEARCHTextBox.Name = "WINDREAM_SEARCHTextBox" - Me.WINDREAM_SEARCHTextBox.Size = New System.Drawing.Size(543, 22) + Me.WINDREAM_SEARCHTextBox.Size = New System.Drawing.Size(543, 21) Me.WINDREAM_SEARCHTextBox.TabIndex = 35 ' 'XtraTabControl1 @@ -682,6 +683,7 @@ Partial Class frmConstructorDesigner 'XtraTabPage3 ' Me.XtraTabPage3.AutoScroll = True + Me.XtraTabPage3.Controls.Add(Me.LOAD_DIRECTCheckBox) Me.XtraTabPage3.Controls.Add(Me.Label4) Me.XtraTabPage3.Controls.Add(COLUMN_NAME1Label1) Me.XtraTabPage3.Controls.Add(Me.COLUMN_NAME1ComboBox) @@ -702,7 +704,7 @@ Partial Class frmConstructorDesigner Me.XtraTabPage3.Controls.Add(Me.GUIDTextBox1) Me.XtraTabPage3.Controls.Add(Me.LEVEL1_SELECTCheckBox) Me.XtraTabPage3.Name = "XtraTabPage3" - Me.XtraTabPage3.Size = New System.Drawing.Size(843, 332) + Me.XtraTabPage3.Size = New System.Drawing.Size(1002, 332) Me.XtraTabPage3.Text = "Allgemein" ' 'Label4 @@ -750,7 +752,7 @@ Partial Class frmConstructorDesigner Me.CHANGED_WHENTextBox1.Location = New System.Drawing.Point(239, 240) Me.CHANGED_WHENTextBox1.Name = "CHANGED_WHENTextBox1" Me.CHANGED_WHENTextBox1.ReadOnly = True - Me.CHANGED_WHENTextBox1.Size = New System.Drawing.Size(160, 22) + Me.CHANGED_WHENTextBox1.Size = New System.Drawing.Size(160, 21) Me.CHANGED_WHENTextBox1.TabIndex = 47 ' 'CHANGED_WHOTextBox1 @@ -760,7 +762,7 @@ Partial Class frmConstructorDesigner Me.CHANGED_WHOTextBox1.Location = New System.Drawing.Point(73, 240) Me.CHANGED_WHOTextBox1.Name = "CHANGED_WHOTextBox1" Me.CHANGED_WHOTextBox1.ReadOnly = True - Me.CHANGED_WHOTextBox1.Size = New System.Drawing.Size(160, 22) + Me.CHANGED_WHOTextBox1.Size = New System.Drawing.Size(160, 21) Me.CHANGED_WHOTextBox1.TabIndex = 46 ' 'SQL_SELECT_EBENE2TextBox @@ -779,7 +781,7 @@ Partial Class frmConstructorDesigner Me.ADDED_WHENTextBox1.Location = New System.Drawing.Point(239, 199) Me.ADDED_WHENTextBox1.Name = "ADDED_WHENTextBox1" Me.ADDED_WHENTextBox1.ReadOnly = True - Me.ADDED_WHENTextBox1.Size = New System.Drawing.Size(160, 22) + Me.ADDED_WHENTextBox1.Size = New System.Drawing.Size(160, 21) Me.ADDED_WHENTextBox1.TabIndex = 45 ' 'ADDED_WHOTextBox1 @@ -789,7 +791,7 @@ Partial Class frmConstructorDesigner Me.ADDED_WHOTextBox1.Location = New System.Drawing.Point(73, 199) Me.ADDED_WHOTextBox1.Name = "ADDED_WHOTextBox1" Me.ADDED_WHOTextBox1.ReadOnly = True - Me.ADDED_WHOTextBox1.Size = New System.Drawing.Size(160, 22) + Me.ADDED_WHOTextBox1.Size = New System.Drawing.Size(160, 21) Me.ADDED_WHOTextBox1.TabIndex = 44 ' 'XtraTabPage5 @@ -823,24 +825,6 @@ Partial Class frmConstructorDesigner Me.Button3.Text = "Button3" Me.Button3.UseVisualStyleBackColor = True ' - 'GridControl1 - ' - Me.GridControl1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.GridControl1.Location = New System.Drawing.Point(789, 43) - Me.GridControl1.MainView = Me.TileView1 - Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(532, 211) - Me.GridControl1.TabIndex = 53 - Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.TileView1}) - ' - 'TileView1 - ' - Me.TileView1.AppearanceItem.Normal.ForeColor = System.Drawing.Color.Maroon - Me.TileView1.AppearanceItem.Normal.Options.UseForeColor = True - Me.TileView1.GridControl = Me.GridControl1 - Me.TileView1.Name = "TileView1" - ' 'Button2 ' Me.Button2.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete @@ -883,7 +867,7 @@ Partial Class frmConstructorDesigner Me.txtQuickViewPicture.Location = New System.Drawing.Point(299, 153) Me.txtQuickViewPicture.Name = "txtQuickViewPicture" Me.txtQuickViewPicture.ReadOnly = True - Me.txtQuickViewPicture.Size = New System.Drawing.Size(175, 22) + Me.txtQuickViewPicture.Size = New System.Drawing.Size(175, 21) Me.txtQuickViewPicture.TabIndex = 49 ' 'Label8 @@ -891,7 +875,7 @@ Partial Class frmConstructorDesigner Me.Label8.AutoSize = True Me.Label8.Location = New System.Drawing.Point(296, 137) Me.Label8.Name = "Label8" - Me.Label8.Size = New System.Drawing.Size(130, 13) + Me.Label8.Size = New System.Drawing.Size(117, 13) Me.Label8.TabIndex = 48 Me.Label8.Text = "QuickView Bild-Control:" ' @@ -954,7 +938,7 @@ Partial Class frmConstructorDesigner Me.Label6.AutoSize = True Me.Label6.Location = New System.Drawing.Point(296, 33) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(146, 13) + Me.Label6.Size = New System.Drawing.Size(135, 13) Me.Label6.TabIndex = 3 Me.Label6.Text = "Konfigurierte Feldauswahl:" ' @@ -963,7 +947,7 @@ Partial Class frmConstructorDesigner Me.Label5.AutoSize = True Me.Label5.Location = New System.Drawing.Point(5, 33) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(108, 13) + Me.Label5.Size = New System.Drawing.Size(102, 13) Me.Label5.TabIndex = 2 Me.Label5.Text = "Felder zur Auswahl:" ' @@ -980,7 +964,7 @@ Partial Class frmConstructorDesigner Me.Label3.AutoSize = True Me.Label3.Location = New System.Drawing.Point(3, 10) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(449, 13) + Me.Label3.Size = New System.Drawing.Size(416, 13) Me.Label3.TabIndex = 0 Me.Label3.Text = "Konfigurieren Sie hier die Erstansicht zur Navigation innerhalb der Eintitätsdate" & _ "nsätze" @@ -991,7 +975,7 @@ Partial Class frmConstructorDesigner Me.XtraTabPage4.Controls.Add(Me.grpbxWD_RecordSearch) Me.XtraTabPage4.Controls.Add(Me.GroupBox1) Me.XtraTabPage4.Name = "XtraTabPage4" - Me.XtraTabPage4.Size = New System.Drawing.Size(843, 332) + Me.XtraTabPage4.Size = New System.Drawing.Size(1002, 332) Me.XtraTabPage4.Text = "windream-Suche Konfiguration" ' 'chkWDSearch_Active @@ -999,7 +983,7 @@ Partial Class frmConstructorDesigner Me.chkWDSearch_Active.AutoSize = True Me.chkWDSearch_Active.Location = New System.Drawing.Point(14, 3) Me.chkWDSearch_Active.Name = "chkWDSearch_Active" - Me.chkWDSearch_Active.Size = New System.Drawing.Size(141, 17) + Me.chkWDSearch_Active.Size = New System.Drawing.Size(133, 17) Me.chkWDSearch_Active.TabIndex = 79 Me.chkWDSearch_Active.Text = "Windream-Suche aktiv" Me.chkWDSearch_Active.UseVisualStyleBackColor = True @@ -1278,6 +1262,24 @@ Partial Class frmConstructorDesigner Me.tsbtnSave.Size = New System.Drawing.Size(79, 22) Me.tsbtnSave.Text = "Speichern" ' + 'GridControl1 + ' + Me.GridControl1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.GridControl1.Location = New System.Drawing.Point(789, 43) + Me.GridControl1.MainView = Me.TileView1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(532, 211) + Me.GridControl1.TabIndex = 53 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.TileView1}) + ' + 'TileView1 + ' + Me.TileView1.AppearanceItem.Normal.ForeColor = System.Drawing.Color.Maroon + Me.TileView1.AppearanceItem.Normal.Options.UseForeColor = True + Me.TileView1.GridControl = Me.GridControl1 + Me.TileView1.Name = "TileView1" + ' 'TBTEMP_QUICKDISPLAYBindingSource ' Me.TBTEMP_QUICKDISPLAYBindingSource.DataMember = "TBTEMP_QUICKDISPLAY" @@ -1383,6 +1385,16 @@ Partial Class frmConstructorDesigner Me.ImageCollection1.Images.SetKeyName(2, "tesla_black.jpg") Me.ImageCollection1.Images.SetKeyName(3, "whitejeep.jpg") ' + 'LOAD_DIRECTCheckBox + ' + Me.LOAD_DIRECTCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "LOAD_DIRECT", True)) + Me.LOAD_DIRECTCheckBox.Location = New System.Drawing.Point(701, 25) + Me.LOAD_DIRECTCheckBox.Name = "LOAD_DIRECTCheckBox" + Me.LOAD_DIRECTCheckBox.Size = New System.Drawing.Size(128, 24) + Me.LOAD_DIRECTCheckBox.TabIndex = 52 + Me.LOAD_DIRECTCheckBox.Text = "Ersten Record laden" + Me.LOAD_DIRECTCheckBox.UseVisualStyleBackColor = True + ' 'frmConstructorDesigner ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -1431,8 +1443,6 @@ Partial Class frmConstructorDesigner Me.XtraTabPage3.PerformLayout() Me.XtraTabPage5.ResumeLayout(False) Me.XtraTabPage5.PerformLayout() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TileView1, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabPage4.ResumeLayout(False) Me.XtraTabPage4.PerformLayout() Me.grpbxWD_RecordSearch.ResumeLayout(False) @@ -1443,6 +1453,8 @@ Partial Class frmConstructorDesigner Me.StatusStrip1.PerformLayout() Me.ToolStrip1.ResumeLayout(False) Me.ToolStrip1.PerformLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TileView1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBTEMP_QUICKDISPLAYBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource1, System.ComponentModel.ISupportInitialize).EndInit() @@ -1553,4 +1565,5 @@ Partial Class frmConstructorDesigner Friend WithEvents TileView1 As DevExpress.XtraGrid.Views.Tile.TileView Friend WithEvents ImageCollection1 As DevExpress.Utils.ImageCollection Friend WithEvents Button3 As System.Windows.Forms.Button + Friend WithEvents LOAD_DIRECTCheckBox As System.Windows.Forms.CheckBox End Class diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.resx b/app/DD-Record-Organiser/frmConstructorDesigner.resx index 8f533cf..89604f0 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.resx +++ b/app/DD-Record-Organiser/frmConstructorDesigner.resx @@ -281,7 +281,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - CQAAAk1TRnQBSQFMAgEBAgEAAagBCQGoAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAgEAAbgBCQG4AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -335,6 +335,9 @@ 584, 95 + + 584, 95 + 969, 56 @@ -359,8 +362,8 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNC4yLCBWZXJzaW9uPTE0LjIu - My4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFFT + AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNS4xLCBWZXJzaW9uPTE1LjEu + Ny4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFFT eXN0ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRv a2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAAChEZXZFeHByZXNzLlV0aWxzLkltYWdlQ29sbGVjdGlvblN0 cmVhbWVyAgAAAAlJbWFnZVNpemUERGF0YQQHE1N5c3RlbS5EcmF3aW5nLlNpemUDAAAAAgIAAAAF/P// diff --git a/app/DD-Record-Organiser/frmConstructorDesigner.vb b/app/DD-Record-Organiser/frmConstructorDesigner.vb index 91c485f..746c5b3 100644 --- a/app/DD-Record-Organiser/frmConstructorDesigner.vb +++ b/app/DD-Record-Organiser/frmConstructorDesigner.vb @@ -522,4 +522,8 @@ Public Class frmConstructorDesigner Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click CreateTile() End Sub + + Private Sub LOAD_DIRECTCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles LOAD_DIRECTCheckBox.CheckedChanged + + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmForm_Constructor.vb b/app/DD-Record-Organiser/frmForm_Constructor.vb index 8bd363e..efcfac5 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor.vb @@ -52,7 +52,6 @@ Public Class frmForm_Constructor Private RECORD_CHANGED As Boolean = False Private RECORD_NEEDS_REFRESH As Boolean = False - Private PARENT_RECORDID As Integer = 0 Private act_ParentEntity_String As String Private act_PKEntity_String As String 'Private act_ParentGridView As DevExpress.XtraGrid.Views.Grid.GridView @@ -416,7 +415,7 @@ Public Class frmForm_Constructor 'Die aktuelle Ebene überprüfen und den Datensatz übergeben, ebenso den PARENT-Record setzen Select Case ACT_EBENE Case 1 - PARENT_RECORDID = 0 + CURRENT_PARENTID = 0 EBENE1_RECID = SelectedRecordID CURRENT_PARENTID = EBENE1_RECID If Not EBENE1_COLUMNNAME Is Nothing Then @@ -433,7 +432,6 @@ Public Class frmForm_Constructor End If If EBENE1_RECID > 0 Then - PARENT_RECORDID = EBENE1_RECID CURRENT_PARENTID = EBENE1_RECID Else CURRENT_PARENTID = EBENE2_RECID @@ -445,7 +443,6 @@ Public Class frmForm_Constructor 'EBENE3_GRID_RESULT = grvwSelection.GetFocusedRowCellValue(grvwSelection.Columns(EBENE3_COLUMNNAME)) End If If EBENE2_RECID > 0 Then - PARENT_RECORDID = EBENE2_RECID CURRENT_PARENTID = EBENE2_RECID End If End Select @@ -808,21 +805,33 @@ Public Class frmForm_Constructor End If If _sp2.ToString <> String.Empty Then _sp2 = Return_SearchPattern(_sp2.ToString) + If _sp2 = 0 Then + _sp2 = "" + End If fileContents = fileContents.Replace("%pattern2%", _sp2) fileContents = fileContents.Replace("471102", _sp2) End If If _sp3.ToString <> String.Empty Then _sp3 = Return_SearchPattern(_sp3.ToString) + If _sp3 = 0 Then + _sp3 = "" + End If fileContents = fileContents.Replace("%pattern3%", _sp3) fileContents = fileContents.Replace("471103", _sp3) End If If _sp4.ToString <> String.Empty Then _sp4 = Return_SearchPattern(_sp4.ToString) + If _sp4 = 0 Then + _sp4 = "" + End If fileContents = fileContents.Replace("%pattern4%", _sp4) fileContents = fileContents.Replace("471104", _sp4) End If If _sp5.ToString <> String.Empty Then _sp5 = Return_SearchPattern(_sp5.ToString) + If _sp5 = 0 Then + _sp5 = "" + End If fileContents = fileContents.Replace("%pattern5%", _sp5) fileContents = fileContents.Replace("471105", _sp5) End If @@ -971,7 +980,7 @@ Public Class frmForm_Constructor Case "@EntityID".ToUpper Return CURRENT_FORM_ID Case "@ParentID".ToUpper - Return PARENT_RECORDID + Return CURRENT_PARENTID Case Else MsgBox("Undefinierter Pattern '" & content & "' in der Windream-SuchKonfiguration. Bitte den Administrator verständigen", MsgBoxStyle.Exclamation) ClassLogger.Add(" >> Undefinierter Such-Pattern: " & content, True) @@ -993,7 +1002,7 @@ Public Class frmForm_Constructor Private Function Update_Record_OnChange() As String ' Record Speichern - Dim ResultMessage = CtrlCommandUI.SaveRecord(SelectedRecordID, CURRENT_FORM_ID, PARENT_RECORDID) + Dim ResultMessage = CtrlCommandUI.SaveRecord(SelectedRecordID, CURRENT_FORM_ID, CURRENT_PARENTID) 'Jetzt die für die Entität notwendigen Prroceduren ausführen Customer_Run_Procedures() @@ -1739,13 +1748,15 @@ Public Class frmForm_Constructor Load_Entity_Data(TreeViewEbeneSelect.SelectedNode.Tag) End If End Sub - Private Function GET_GROUP_RECORD(FORM_ID As Integer) - Dim sqlRecord As String = "select guid from TBPMO_RECORD where Form_ID = " & FORM_ID + Private Function GET_GROUP_RECORD() + Dim sqlRecord As String = "SELECT RECORD2_ID FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_PARENTID + Dim recid = ClassDatabase.Execute_Scalar(sqlRecord, True) If IsNothing(recid) Then - If ClassControlCommandsUI.CreateRecord(FORM_ID) = True Then + If ClassControlCommandsUI.CreateRecord(CURRENT_FORM_ID) = True Then recid = ClassControlCommandsUI.GetLastRecord - If IsNothing(recid) Then + If Not IsNothing(recid) Then + 'Die neue Record-ID setzen CURRENT_RECORD_ID = recid ClassControlCommandsUI.ConnectRecord(CURRENT_PARENTID, CURRENT_RECORD_ID, "Group-Entity Link") Else @@ -1764,10 +1775,10 @@ Public Class frmForm_Constructor Return False End Try End If - Dim SQL1 As String = "SELECT COUNT(*) FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & PARENT_RECORDID & " AND RECORD2_ID = " & CURRENT_RECORD_ID + Dim SQL1 As String = "SELECT COUNT(*) FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & CURRENT_PARENTID & " AND RECORD2_ID = " & CURRENT_RECORD_ID If ClassDatabase.Execute_Scalar(SQL1) = 0 Then - ClassControlCommandsUI.ConnectRecord(PARENT_RECORDID, CURRENT_RECORD_ID) + ClassControlCommandsUI.ConnectRecord(CURRENT_PARENTID, CURRENT_RECORD_ID) End If Refresh_CreatedChangedRecordByID(CURRENT_RECORD_ID) Return True @@ -1776,7 +1787,7 @@ Public Class frmForm_Constructor Sub Load_Entity_Data(FORM_ID As Integer) Try Me.Cursor = Cursors.WaitCursor - + CURRENT_RECORD_ID = 0 Dim IS_SINGLE_RECORD As Boolean Dim LOAD_DIRECT As Boolean VerknüpfungenToolStripMenuItem.Enabled = False @@ -1796,7 +1807,6 @@ Public Class frmForm_Constructor Dim _sql As String Select Case ACT_EBENE Case 1 - PARENT_RECORDID = 0 CURRENT_PARENTID = 0 EBENE1_ENTITY = TreeViewEbeneSelect.SelectedNode.Text ACT_EBENE_STRING = EBENE1_ENTITY @@ -1844,13 +1854,12 @@ Public Class frmForm_Constructor EBENE3_ENTITY = "" 'Parent-ID setzen If EBENE1_RECID > 0 Then - PARENT_RECORDID = EBENE1_RECID CURRENT_PARENTID = EBENE1_RECID End If 'tslblEntity3.Visible = False Select Case CURRENT_FORM_TYPE Case 5 - If GET_GROUP_RECORD(FORM_ID) = True Then + If GET_GROUP_RECORD() = True Then EBENE2_RECID = CURRENT_RECORD_ID End If End Select @@ -1882,9 +1891,13 @@ Public Class frmForm_Constructor End Try Case 3 + 'Parent-ID setzen + If EBENE2_RECID > 0 Then + CURRENT_PARENTID = EBENE2_RECID + End If Select Case CURRENT_FORM_TYPE Case 5 - If GET_GROUP_RECORD(FORM_ID) = True Then + If GET_GROUP_RECORD() = True Then EBENE3_RECID = CURRENT_RECORD_ID End If End Select @@ -1900,7 +1913,6 @@ Public Class frmForm_Constructor If LogErrorsOnly = False Then ClassLogger.Add(">> Ebene 3 in TreeView selektiert", False) 'Parent-ID setzen If EBENE2_RECID > 0 Then - PARENT_RECORDID = EBENE2_RECID CURRENT_PARENTID = EBENE2_RECID End If @@ -1929,7 +1941,6 @@ Public Class frmForm_Constructor CURRENT_FORM_ID = FORM_ID CURRENT_ENTITYSTRING = ACT_EBENE_STRING - CURRENT_PARENTID = PARENT_RECORDID act_FormViewID = ClassDatabase.Execute_Scalar("SELECT GUID FROM TBPMO_FORM_VIEW where FORM_ID = " & FORM_ID) If EDIT_STATE = "none" Then 'Die Controls der Entität laden @@ -1984,7 +1995,7 @@ Public Class frmForm_Constructor DTEntity.PrimaryKey = primaryKey LoadGrid_Selection(_sql, DTEntity) - If LOAD_DIRECT = True Then + If LOAD_DIRECT = True Or IS_SINGLE_RECORD = True Then Dim sql1 = CURRENT_ENTITYSQL sql1.Replace("T.*", "TOP 1 [Record-ID]") Dim id = ClassDatabase.Execute_Scalar(sql1, True) @@ -1992,9 +2003,6 @@ Public Class frmForm_Constructor If LogErrorsOnly = False Then ClassLogger.Add(">> Load Record directly - RecordID: " & CURRENT_RECORD_ID, False) Load_Record_Data() End If - Else - - End If 'Überprüfen ob es für diese Entität Wiedervorlagen gibt? Check_FOLLOWUP_IsConfigured(CURRENT_FORM_ID) @@ -2356,8 +2364,13 @@ Public Class frmForm_Constructor Refresh_CreatedChangedRecordByID(SelectedRecordID) RECORD_CHANGED = False - Case 1 'windream-Dokumente - RUN_WD_SEARCH(WD_Suche, "RECORD") + Case 1 'windream-Dokumente finden + If CURRENT_RECORD_ID = 0 Then + RUN_WD_SEARCH(WD_Suche, "ENTITY") + Else + RUN_WD_SEARCH(WD_Suche, "RECORD") + End If + Case 2 Refresh_FollowUps() End Select @@ -2550,17 +2563,17 @@ Public Class frmForm_Constructor If lblParentID.Text = "" Then Exit Sub End If - If PARENT_RECORDID > 0 Then + If CURRENT_PARENTID > 0 Then Dim result As MsgBoxResult result = MessageBox.Show("Möchten Sie den Parent-Datensatz für den aktuellen Datensatz wirklich aktualisieren?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) If result <> MsgBoxResult.Yes Then Exit Sub Else - If ClassDatabase.Execute_non_Query("DELETE FROM TBPMO_RECORD_CONNECT WHERE RECORD2_ID = " & CURRENT_RECORD_ID & " AND RECORD1_ID = " & PARENT_RECORDID, True) = False Then + If ClassDatabase.Execute_non_Query("DELETE FROM TBPMO_RECORD_CONNECT WHERE RECORD2_ID = " & CURRENT_RECORD_ID & " AND RECORD1_ID = " & CURRENT_PARENTID, True) = False Then Exit Sub End If End If - + End If If ClassControlCommandsUI.ConnectRecord(Linkparent_ID, CURRENT_RECORD_ID, "ENTITY" & CURRENT_FORM_ID.ToString) = True Then Save_GridViewParentEntityLayout() diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main.vb index ac402b1..aa50311 100644 --- a/app/DD-Record-Organiser/frmForm_Constructor_Main.vb +++ b/app/DD-Record-Organiser/frmForm_Constructor_Main.vb @@ -239,6 +239,9 @@ Public Class frmForm_Constructor_Main GridControlMain.DataSource = Nothing If GRID_TYPE = GridType.Grid Then + If grvwGrid.Columns.Count > 0 Then + + End If grvwGrid.Columns.Clear() ElseIf GRID_TYPE = GridType.Tiles Then grvwTiles.Columns.Clear() diff --git a/app/DD-Record-Organiser/frmLevel_Designer.Designer.vb b/app/DD-Record-Organiser/frmLevel_Designer.Designer.vb index 0b85daa..09ce7c1 100644 --- a/app/DD-Record-Organiser/frmLevel_Designer.Designer.vb +++ b/app/DD-Record-Organiser/frmLevel_Designer.Designer.vb @@ -134,7 +134,7 @@ Partial Class frmLevel_Designer Me.grpbxDocumentView.Controls.Add(Me.Label1) Me.grpbxDocumentView.Location = New System.Drawing.Point(0, 11) Me.grpbxDocumentView.Name = "grpbxDocumentView" - Me.grpbxDocumentView.Size = New System.Drawing.Size(1092, 181) + Me.grpbxDocumentView.Size = New System.Drawing.Size(1092, 186) Me.grpbxDocumentView.TabIndex = 4 Me.grpbxDocumentView.TabStop = False Me.grpbxDocumentView.Text = "Document View - Eigenschaften" diff --git a/app/DD-Record-Organiser/frmTemplates.Designer.vb b/app/DD-Record-Organiser/frmTemplates.Designer.vb index 8aa405c..f18e95b 100644 --- a/app/DD-Record-Organiser/frmTemplates.Designer.vb +++ b/app/DD-Record-Organiser/frmTemplates.Designer.vb @@ -94,7 +94,6 @@ Partial Class frmTemplates Me.tsbtnGetPatterns = New System.Windows.Forms.ToolStripButton() Me.GUIDTextBox2 = New System.Windows.Forms.TextBox() Me.NAME_PATTERNTextBox = New System.Windows.Forms.TextBox() - Me.FIXED_VALUETextBox = New System.Windows.Forms.TextBox() Me.CONNECTION_IDComboBox = New System.Windows.Forms.ComboBox() Me.SQL_COMMANDTextBox = New System.Windows.Forms.TextBox() Me.Label2 = New System.Windows.Forms.Label() @@ -115,6 +114,9 @@ Partial Class frmTemplates Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin() Me.DT_VORSCHAUBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.ListBoxVorschau = New System.Windows.Forms.ListBox() + Me.FIXED_VALUETextBox = New System.Windows.Forms.TextBox() + Me.btnRefreshControlPattern = New System.Windows.Forms.Button() + Me.lblSavePattern = New System.Windows.Forms.Label() GUIDLabel = New System.Windows.Forms.Label() NAMELabel = New System.Windows.Forms.Label() TEMPLATE_PATHLabel = New System.Windows.Forms.Label() @@ -240,7 +242,7 @@ Partial Class frmTemplates 'NAME_PATTERNLabel ' NAME_PATTERNLabel.AutoSize = True - NAME_PATTERNLabel.Location = New System.Drawing.Point(360, 435) + NAME_PATTERNLabel.Location = New System.Drawing.Point(348, 435) NAME_PATTERNLabel.Name = "NAME_PATTERNLabel" NAME_PATTERNLabel.Size = New System.Drawing.Size(157, 15) NAME_PATTERNLabel.TabIndex = 34 @@ -251,14 +253,14 @@ Partial Class frmTemplates FIXED_VALUELabel.AutoSize = True FIXED_VALUELabel.Location = New System.Drawing.Point(586, 435) FIXED_VALUELabel.Name = "FIXED_VALUELabel" - FIXED_VALUELabel.Size = New System.Drawing.Size(121, 15) + FIXED_VALUELabel.Size = New System.Drawing.Size(102, 15) FIXED_VALUELabel.TabIndex = 36 - FIXED_VALUELabel.Text = "Platzhalter-Ersetzung:" + FIXED_VALUELabel.Text = "Platzhalter Entität:" ' 'CONNECTION_IDLabel ' CONNECTION_IDLabel.AutoSize = True - CONNECTION_IDLabel.Location = New System.Drawing.Point(341, 503) + CONNECTION_IDLabel.Location = New System.Drawing.Point(299, 503) CONNECTION_IDLabel.Name = "CONNECTION_IDLabel" CONNECTION_IDLabel.Size = New System.Drawing.Size(101, 15) CONNECTION_IDLabel.TabIndex = 38 @@ -267,7 +269,7 @@ Partial Class frmTemplates 'SQL_COMMANDLabel ' SQL_COMMANDLabel.AutoSize = True - SQL_COMMANDLabel.Location = New System.Drawing.Point(477, 503) + SQL_COMMANDLabel.Location = New System.Drawing.Point(407, 503) SQL_COMMANDLabel.Name = "SQL_COMMANDLabel" SQL_COMMANDLabel.Size = New System.Drawing.Size(98, 15) SQL_COMMANDLabel.TabIndex = 40 @@ -277,7 +279,7 @@ Partial Class frmTemplates ' Label5.AutoSize = True Label5.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Label5.Location = New System.Drawing.Point(1083, 437) + Label5.Location = New System.Drawing.Point(1185, 436) Label5.Name = "Label5" Label5.Size = New System.Drawing.Size(90, 13) Label5.TabIndex = 87 @@ -617,7 +619,7 @@ Partial Class frmTemplates Me.BindingNavigator2.DeleteItem = Me.ToolStripButton10 Me.BindingNavigator2.Dock = System.Windows.Forms.DockStyle.None Me.BindingNavigator2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton11, Me.ToolStripButton12, Me.ToolStripSeparator4, Me.ToolStripTextBox2, Me.ToolStripLabel2, Me.ToolStripSeparator5, Me.ToolStripButton13, Me.ToolStripButton14, Me.ToolStripSeparator6, Me.ToolStripButton10, Me.ToolStripButton15, Me.ToolStripButton16, Me.ToolStripSeparator1, Me.tsbtnGetPatterns}) - Me.BindingNavigator2.Location = New System.Drawing.Point(302, 405) + Me.BindingNavigator2.Location = New System.Drawing.Point(293, 405) Me.BindingNavigator2.MoveFirstItem = Me.ToolStripButton11 Me.BindingNavigator2.MoveLastItem = Me.ToolStripButton14 Me.BindingNavigator2.MoveNextItem = Me.ToolStripButton13 @@ -743,38 +745,31 @@ Partial Class frmTemplates Me.GUIDTextBox2.ReadOnly = True Me.GUIDTextBox2.Size = New System.Drawing.Size(42, 23) Me.GUIDTextBox2.TabIndex = 33 + Me.GUIDTextBox2.TabStop = False ' 'NAME_PATTERNTextBox ' - Me.NAME_PATTERNTextBox.BackColor = System.Drawing.Color.WhiteSmoke + Me.NAME_PATTERNTextBox.BackColor = System.Drawing.Color.MistyRose Me.NAME_PATTERNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATE_PATTERNBindingSource, "NAME_PATTERN", True)) - Me.NAME_PATTERNTextBox.Location = New System.Drawing.Point(363, 453) + Me.NAME_PATTERNTextBox.Location = New System.Drawing.Point(350, 453) Me.NAME_PATTERNTextBox.Name = "NAME_PATTERNTextBox" Me.NAME_PATTERNTextBox.ReadOnly = True - Me.NAME_PATTERNTextBox.Size = New System.Drawing.Size(217, 23) + Me.NAME_PATTERNTextBox.Size = New System.Drawing.Size(230, 23) Me.NAME_PATTERNTextBox.TabIndex = 35 ' - 'FIXED_VALUETextBox - ' - Me.FIXED_VALUETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATE_PATTERNBindingSource, "FIXED_VALUE", True)) - Me.FIXED_VALUETextBox.Location = New System.Drawing.Point(586, 453) - Me.FIXED_VALUETextBox.Name = "FIXED_VALUETextBox" - Me.FIXED_VALUETextBox.Size = New System.Drawing.Size(217, 23) - Me.FIXED_VALUETextBox.TabIndex = 37 - ' 'CONNECTION_IDComboBox ' Me.CONNECTION_IDComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATE_PATTERNBindingSource, "CONNECTION_ID", True)) Me.CONNECTION_IDComboBox.FormattingEnabled = True - Me.CONNECTION_IDComboBox.Location = New System.Drawing.Point(344, 521) + Me.CONNECTION_IDComboBox.Location = New System.Drawing.Point(302, 521) Me.CONNECTION_IDComboBox.Name = "CONNECTION_IDComboBox" - Me.CONNECTION_IDComboBox.Size = New System.Drawing.Size(121, 23) + Me.CONNECTION_IDComboBox.Size = New System.Drawing.Size(98, 23) Me.CONNECTION_IDComboBox.TabIndex = 39 ' 'SQL_COMMANDTextBox ' Me.SQL_COMMANDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATE_PATTERNBindingSource, "SQL_COMMAND", True)) - Me.SQL_COMMANDTextBox.Location = New System.Drawing.Point(480, 521) + Me.SQL_COMMANDTextBox.Location = New System.Drawing.Point(410, 521) Me.SQL_COMMANDTextBox.Name = "SQL_COMMANDTextBox" Me.SQL_COMMANDTextBox.Size = New System.Drawing.Size(100, 23) Me.SQL_COMMANDTextBox.TabIndex = 41 @@ -873,7 +868,7 @@ Partial Class frmTemplates Me.GroupBox1.Controls.Add(ENTITY_IDLabel) Me.GroupBox1.Location = New System.Drawing.Point(293, 23) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(333, 100) + Me.GroupBox1.Size = New System.Drawing.Size(266, 100) Me.GroupBox1.TabIndex = 46 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Zu weiterer Entität zuordnen:" @@ -926,6 +921,7 @@ Partial Class frmTemplates ' 'Panel2 ' + Me.Panel2.BackColor = System.Drawing.SystemColors.GradientActiveCaption Me.Panel2.Controls.Add(Me.Label2) Me.Panel2.Controls.Add(Me.ListBox_Entity) Me.Panel2.Controls.Add(Me.btndeleteEntityZO) @@ -950,9 +946,9 @@ Partial Class frmTemplates 'cmbControls ' Me.cmbControls.FormattingEnabled = True - Me.cmbControls.Location = New System.Drawing.Point(812, 453) + Me.cmbControls.Location = New System.Drawing.Point(589, 453) Me.cmbControls.Name = "cmbControls" - Me.cmbControls.Size = New System.Drawing.Size(265, 23) + Me.cmbControls.Size = New System.Drawing.Size(253, 23) Me.cmbControls.TabIndex = 85 ' 'DD_ECMAdmin @@ -973,17 +969,56 @@ Partial Class frmTemplates Me.ListBoxVorschau.DisplayMember = "NAME_PATTERN" Me.ListBoxVorschau.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.ListBoxVorschau.FormattingEnabled = True - Me.ListBoxVorschau.Location = New System.Drawing.Point(1086, 453) + Me.ListBoxVorschau.Location = New System.Drawing.Point(1188, 452) Me.ListBoxVorschau.Name = "ListBoxVorschau" - Me.ListBoxVorschau.Size = New System.Drawing.Size(176, 82) + Me.ListBoxVorschau.Size = New System.Drawing.Size(176, 121) Me.ListBoxVorschau.TabIndex = 86 + Me.ListBoxVorschau.TabStop = False Me.ListBoxVorschau.ValueMember = "GUID" ' + 'FIXED_VALUETextBox + ' + Me.FIXED_VALUETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_TEMPLATE_PATTERNBindingSource, "FIXED_VALUE", True)) + Me.FIXED_VALUETextBox.Location = New System.Drawing.Point(848, 453) + Me.FIXED_VALUETextBox.Name = "FIXED_VALUETextBox" + Me.FIXED_VALUETextBox.ReadOnly = True + Me.FIXED_VALUETextBox.Size = New System.Drawing.Size(35, 23) + Me.FIXED_VALUETextBox.TabIndex = 37 + Me.FIXED_VALUETextBox.TabStop = False + ' + 'btnRefreshControlPattern + ' + Me.btnRefreshControlPattern.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xLG + Me.btnRefreshControlPattern.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft + Me.btnRefreshControlPattern.Location = New System.Drawing.Point(589, 482) + Me.btnRefreshControlPattern.Name = "btnRefreshControlPattern" + Me.btnRefreshControlPattern.Size = New System.Drawing.Size(166, 23) + Me.btnRefreshControlPattern.TabIndex = 88 + Me.btnRefreshControlPattern.Text = "Platzhalter aktualisieren" + Me.btnRefreshControlPattern.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.btnRefreshControlPattern.UseVisualStyleBackColor = True + Me.btnRefreshControlPattern.Visible = False + ' + 'lblSavePattern + ' + Me.lblSavePattern.AutoSize = True + Me.lblSavePattern.BackColor = System.Drawing.Color.Yellow + Me.lblSavePattern.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblSavePattern.Location = New System.Drawing.Point(586, 524) + Me.lblSavePattern.Name = "lblSavePattern" + Me.lblSavePattern.Size = New System.Drawing.Size(187, 15) + Me.lblSavePattern.TabIndex = 90 + Me.lblSavePattern.Text = "Pattern erfolgreich gespeichert!" + Me.lblSavePattern.Visible = False + ' '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, 550) + Me.BackColor = System.Drawing.SystemColors.GradientInactiveCaption + Me.ClientSize = New System.Drawing.Size(1426, 595) + Me.Controls.Add(Me.lblSavePattern) + Me.Controls.Add(Me.btnRefreshControlPattern) Me.Controls.Add(Label5) Me.Controls.Add(Me.ListBoxVorschau) Me.Controls.Add(Me.cmbControls) @@ -1081,7 +1116,6 @@ Partial Class frmTemplates Friend WithEvents ToolStripButton16 As System.Windows.Forms.ToolStripButton Friend WithEvents GUIDTextBox2 As System.Windows.Forms.TextBox Friend WithEvents NAME_PATTERNTextBox As System.Windows.Forms.TextBox - Friend WithEvents FIXED_VALUETextBox As System.Windows.Forms.TextBox Friend WithEvents CONNECTION_IDComboBox As System.Windows.Forms.ComboBox Friend WithEvents SQL_COMMANDTextBox As System.Windows.Forms.TextBox Friend WithEvents Label2 As System.Windows.Forms.Label @@ -1105,4 +1139,7 @@ Partial Class frmTemplates Friend WithEvents ListBoxVorschau As System.Windows.Forms.ListBox Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator Friend WithEvents tsbtnGetPatterns As System.Windows.Forms.ToolStripButton + Friend WithEvents FIXED_VALUETextBox As System.Windows.Forms.TextBox + Friend WithEvents btnRefreshControlPattern As System.Windows.Forms.Button + Friend WithEvents lblSavePattern As System.Windows.Forms.Label End Class diff --git a/app/DD-Record-Organiser/frmTemplates.resx b/app/DD-Record-Organiser/frmTemplates.resx index 4610cd1..9158ccc 100644 --- a/app/DD-Record-Organiser/frmTemplates.resx +++ b/app/DD-Record-Organiser/frmTemplates.resx @@ -256,31 +256,25 @@ 1322, 17 - 17, 56 + 1594, 17 - 350, 56 + 17, 56 - 17, 95 - - - 17, 95 - - - 832, 56 + 859, 56 - 832, 56 + 301, 56 - 1114, 56 + 583, 56 - 263, 95 + 1105, 56 - 503, 95 + 1345, 56 @@ -342,12 +336,12 @@ - 657, 95 + 1499, 56 - 799, 95 + 1641, 56 - 934, 95 + 17, 95 \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmTemplates.vb b/app/DD-Record-Organiser/frmTemplates.vb index aaade5c..c5c6671 100644 --- a/app/DD-Record-Organiser/frmTemplates.vb +++ b/app/DD-Record-Organiser/frmTemplates.vb @@ -60,6 +60,7 @@ cmbControls.DataSource = DT1 cmbControls.DisplayMember = DT1.Columns(1).ColumnName cmbControls.ValueMember = DT1.Columns(0).ColumnName + Get_CONTROL_COMBOBOX() Catch ex As Exception MsgBox("Unexpected error in Load Template-Patterns:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) End Try @@ -226,6 +227,18 @@ ListBoxVorschau.DataSource = DT ListBoxVorschau.DisplayMember = DT.Columns(0).ColumnName End If + If FIXED_VALUETextBox.Text <> "" Then + Dim name = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE GUID = " & FIXED_VALUETextBox.Text + name = ClassDatabase.Execute_Scalar(name, True) + If cmbControls.Text <> name Then + btnRefreshControlPattern.Visible = True + Else + btnRefreshControlPattern.Visible = False + End If + Else + btnRefreshControlPattern.Visible = True + End If + End If End If @@ -234,4 +247,37 @@ Private Sub tsbtnGetPatterns_Click(sender As Object, e As EventArgs) Handles tsbtnGetPatterns.Click GetPatterns() End Sub + + Private Sub ToolStripButton15_Click(sender As Object, e As EventArgs) Handles ToolStripButton15.Click + + End Sub + + Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnRefreshControlPattern.Click + If cmbControls.SelectedIndex <> -1 Then + Dim ctrlstring = cmbControls.SelectedValue.ToString + Dim sql = String.Format("UPDATE TBPMO_TEMPLATE_PATTERN SET FIXED_VALUE = '{0}',CHANGED_WHO = '{1}' WHERE GUID = {2}", ctrlstring, Environment.UserName, GUIDTextBox2.Text) + If ClassDatabase.Execute_non_Query(sql, True) Then + FIXED_VALUETextBox.Text = ctrlstring + lblSavePattern.Visible = True + Else + lblSavePattern.Visible = False + End If + End If + End Sub + Private Sub TBPMO_TEMPLATE_PATTERNBindingSource_CurrentChanged(sender As Object, e As EventArgs) Handles TBPMO_TEMPLATE_PATTERNBindingSource.CurrentChanged + If loaded = True Then + Get_CONTROL_COMBOBOX() + lblSavePattern.Visible = False + + End If + End Sub + Sub Get_CONTROL_COMBOBOX() + If IsNumeric(FIXED_VALUETextBox.Text) Then + Dim name = "SELECT COL_NAME FROM TBPMO_CONTROL WHERE GUID = " & FIXED_VALUETextBox.Text + name = ClassDatabase.Execute_Scalar(name, True) + cmbControls.SelectedIndex = cmbControls.FindStringExact(name) + Else + btnRefreshControlPattern.Visible = True + End If + End Sub End Class \ No newline at end of file diff --git a/app/DD-Record-Organiser/frmWD_EntityImport.Designer.vb b/app/DD-Record-Organiser/frmWD_EntityImport.Designer.vb index 50b0e0a..51a9c14 100644 --- a/app/DD-Record-Organiser/frmWD_EntityImport.Designer.vb +++ b/app/DD-Record-Organiser/frmWD_EntityImport.Designer.vb @@ -57,11 +57,11 @@ Partial Class frmWD_EntityImport Me.Label1.Font = New System.Drawing.Font("Segoe UI", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.Label1.Location = New System.Drawing.Point(12, 9) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(587, 30) + Me.Label1.Size = New System.Drawing.Size(585, 30) Me.Label1.TabIndex = 0 Me.Label1.Text = "Designen Sie hier den Import für Dateien welche zur aktuellen Entität zugeordnet " & _ - "werden sollen." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Beachten Sie dass alle gefundenen Dateien NUR der Entität und NU" & _ - "R der Parent-ID zugeordnet werden." + "werden sollen." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Beachten Sie dass alle gefundenen Dateien NUR die Entität und NU" & _ + "R die Parent-ID zugeordnet werden." ' 'Label2 ' diff --git a/app/SetupWiX/Product.wxs b/app/SetupWiX/Product.wxs index 03797ff..f885f5e 100644 --- a/app/SetupWiX/Product.wxs +++ b/app/SetupWiX/Product.wxs @@ -1,7 +1,7 @@ - +