From c957dd04003f427e03fb6ce91146548c91a9711f Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 13 May 2019 17:20:40 +0200 Subject: [PATCH] WIP: Validation per Column in Table --- app/DD_PM_WINDREAM/ClassControlCreator.vb | 5 + .../DD_DMSLiteDataSet.Designer.vb | 141 +++- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc | 19 +- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd | 111 +-- app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss | 8 +- .../frmControl_Detail.Designer.vb | 219 +++--- app/DD_PM_WINDREAM/frmControl_Detail.resx | 643 +++++++++++------- app/DD_PM_WINDREAM/frmControl_Detail.vb | 10 +- 8 files changed, 767 insertions(+), 389 deletions(-) diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb index 67448b1..a98df28 100644 --- a/app/DD_PM_WINDREAM/ClassControlCreator.vb +++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb @@ -4,6 +4,7 @@ Imports DevExpress.XtraEditors Imports DevExpress.XtraEditors.Controls Imports DevExpress.XtraEditors.NavigatorButtons Imports DevExpress.XtraGrid +Imports DevExpress.XtraGrid.Views.Base Imports DevExpress.XtraGrid.Views.Grid Imports DigitalData.Controls.LookupGrid @@ -373,6 +374,10 @@ Public Class ClassControlCreator oControl.DataSource = oDatatable + AddHandler oView.CellValueChanged, Function(sender As Object, e As CellValueChangedEventArgs) + ' TODO: Do the validation + End Function + Return oControl End Function diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index 25f5d25..ee265df 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -6678,6 +6678,12 @@ Partial Public Class DD_DMSLiteDataSet Private columnCHANGED_WHEN As Global.System.Data.DataColumn + Private columnREGEX_MATCH As Global.System.Data.DataColumn + + Private columnREGEX_MESSAGE_EN As Global.System.Data.DataColumn + + Private columnREGEX_MESSAGE_DE As Global.System.Data.DataColumn + _ Public Sub New() @@ -6833,6 +6839,30 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property REGEX_MATCHColumn() As Global.System.Data.DataColumn + Get + Return Me.columnREGEX_MATCH + End Get + End Property + + _ + Public ReadOnly Property REGEX_MESSAGE_ENColumn() As Global.System.Data.DataColumn + Get + Return Me.columnREGEX_MESSAGE_EN + End Get + End Property + + _ + Public ReadOnly Property REGEX_MESSAGE_DEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnREGEX_MESSAGE_DE + End Get + End Property + _ @@ -6870,9 +6900,26 @@ Partial Public Class DD_DMSLiteDataSet _ - Public Overloads Function AddTBPM_CONTROL_TABLERow(ByVal parentTBPM_PROFILE_CONTROLSRowByFK_TBPM_CONTROL_TABLE_CONTROL1 As TBPM_PROFILE_CONTROLSRow, ByVal SPALTENNAME As String, ByVal SPALTEN_HEADER As String, ByVal SPALTENBREITE As Integer, ByVal VALIDATION As Boolean, ByVal CHOICE_LIST As String, ByVal CONNECTION_ID As Short, ByVal SQL_COMMAND As String, ByVal READ_ONLY As Boolean, ByVal LOAD_IDX_VALUE As Boolean, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBPM_CONTROL_TABLERow + Public Overloads Function AddTBPM_CONTROL_TABLERow( _ + ByVal parentTBPM_PROFILE_CONTROLSRowByFK_TBPM_CONTROL_TABLE_CONTROL1 As TBPM_PROFILE_CONTROLSRow, _ + ByVal SPALTENNAME As String, _ + ByVal SPALTEN_HEADER As String, _ + ByVal SPALTENBREITE As Integer, _ + ByVal VALIDATION As Boolean, _ + ByVal CHOICE_LIST As String, _ + ByVal CONNECTION_ID As Short, _ + ByVal SQL_COMMAND As String, _ + ByVal READ_ONLY As Boolean, _ + ByVal LOAD_IDX_VALUE As Boolean, _ + ByVal ADDED_WHO As String, _ + ByVal ADDED_WHEN As Date, _ + ByVal CHANGED_WHO As String, _ + ByVal CHANGED_WHEN As Date, _ + ByVal REGEX_MATCH As String, _ + ByVal REGEX_MESSAGE_EN As String, _ + ByVal REGEX_MESSAGE_DE As String) As TBPM_CONTROL_TABLERow Dim rowTBPM_CONTROL_TABLERow As TBPM_CONTROL_TABLERow = CType(Me.NewRow,TBPM_CONTROL_TABLERow) - Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE} If (Not (parentTBPM_PROFILE_CONTROLSRowByFK_TBPM_CONTROL_TABLE_CONTROL1) Is Nothing) Then columnValuesArray(1) = parentTBPM_PROFILE_CONTROLSRowByFK_TBPM_CONTROL_TABLE_CONTROL1(0) End If @@ -6919,6 +6966,9 @@ Partial Public Class DD_DMSLiteDataSet Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN") Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") + Me.columnREGEX_MATCH = MyBase.Columns("REGEX_MATCH") + Me.columnREGEX_MESSAGE_EN = MyBase.Columns("REGEX_MESSAGE_EN") + Me.columnREGEX_MESSAGE_DE = MyBase.Columns("REGEX_MESSAGE_DE") End Sub _ + Public Property REGEX_MATCH() As String + Get + Return CType(Me(Me.tableTBPM_CONTROL_TABLE.REGEX_MATCHColumn),String) + End Get + Set + Me(Me.tableTBPM_CONTROL_TABLE.REGEX_MATCHColumn) = value + End Set + End Property + + _ + Public Property REGEX_MESSAGE_EN() As String + Get + Return CType(Me(Me.tableTBPM_CONTROL_TABLE.REGEX_MESSAGE_ENColumn),String) + End Get + Set + Me(Me.tableTBPM_CONTROL_TABLE.REGEX_MESSAGE_ENColumn) = value + End Set + End Property + + _ + Public Property REGEX_MESSAGE_DE() As String + Get + Return CType(Me(Me.tableTBPM_CONTROL_TABLE.REGEX_MESSAGE_DEColumn),String) + End Get + Set + Me(Me.tableTBPM_CONTROL_TABLE.REGEX_MESSAGE_DEColumn) = value + End Set + End Property + _ Public Property TBPM_PROFILE_CONTROLSRow() As TBPM_PROFILE_CONTROLSRow @@ -21162,6 +21257,9 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") + tableMapping.ColumnMappings.Add("REGEX_MATCH", "REGEX_MATCH") + tableMapping.ColumnMappings.Add("REGEX_MESSAGE_EN", "REGEX_MESSAGE_EN") + tableMapping.ColumnMappings.Add("REGEX_MESSAGE_DE", "REGEX_MESSAGE_DE") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -21258,17 +21356,19 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection(0).Connection = Me.Connection Me._commandCollection(0).CommandText = "SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALID"& _ "ATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED"& _ - "_WHO, ADDED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ - " TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (CONTROL_ID = @CONTROL_ID)" + "_WHO, ADDED_WHEN, CHANGED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANGED_WHEN, REGEX_MA"& _ + "TCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHE"& _ + "RE (CONTROL_ID = @CONTROL_ID)" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONTROL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_ID", 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 = "UPDATE TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET SPALTENNAME = @SPALTENNAME, S"& _ "PALTEN_HEADER = @SPALTEN_HEADER, SPALTENBREITE = @SPALTENBREITE, VALIDATION = @V"& _ - "ALIDATION, READ_ONLY = @READ_ONLY, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" LOAD_IDX_VALUE = @"& _ - "LOAD_IDX_VALUE, CHANGED_WHO = @CHANGED_WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)"& _ - "" + "ALIDATION, READ_ONLY = @READ_ONLY, LOAD_IDX_VALUE = @LOAD_IDX_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " CHANGED_WHO = @CHANGED_WHO, REGEX_MATCH = @REGEX_MATCH, REGEX_ME"& _ + "SSAGE_EN = @REGEX_MESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE "& _ + " (GUID = @Original_GUID)" Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SPALTENNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTENNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SPALTEN_HEADER", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTEN_HEADER", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -21277,6 +21377,9 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@READ_ONLY", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "READ_ONLY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOAD_IDX_VALUE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "LOAD_IDX_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MATCH", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MATCH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MESSAGE_EN", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MESSAGE_EN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MESSAGE_DE", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MESSAGE_DE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).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._commandCollection(2) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(2).Connection = Me.Connection @@ -21291,8 +21394,9 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection(4).Connection = Me.Connection Me._commandCollection(4).CommandText = "SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALID"& _ "ATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED"& _ - "_WHO, ADDED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ - " TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @GUID)" + "_WHO, ADDED_WHEN, CHANGED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" CHANGED_WHEN, REGEX_MA"& _ + "TCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHE"& _ + "RE (GUID = @GUID)" Me._commandCollection(4).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(4).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(5) = New Global.System.Data.SqlClient.SqlCommand() @@ -21660,7 +21764,7 @@ Namespace DD_DMSLiteDataSetTableAdapters _ - Public Overloads Overridable Function cmdUpdate(ByVal SPALTENNAME As String, ByVal SPALTEN_HEADER As String, ByVal SPALTENBREITE As Integer, ByVal VALIDATION As Boolean, ByVal READ_ONLY As Boolean, ByVal LOAD_IDX_VALUE As Boolean, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer) As Integer + Public Overloads Overridable Function cmdUpdate(ByVal SPALTENNAME As String, ByVal SPALTEN_HEADER As String, ByVal SPALTENBREITE As Integer, ByVal VALIDATION As Boolean, ByVal READ_ONLY As Boolean, ByVal LOAD_IDX_VALUE As Boolean, ByVal CHANGED_WHO As String, ByVal REGEX_MATCH As String, ByVal REGEX_MESSAGE_EN As String, ByVal REGEX_MESSAGE_DE As String, ByVal Original_GUID As Integer) As Integer Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(1) If (SPALTENNAME Is Nothing) Then Throw New Global.System.ArgumentNullException("SPALTENNAME") @@ -21681,7 +21785,22 @@ Namespace DD_DMSLiteDataSetTableAdapters Else command.Parameters(6).Value = CType(CHANGED_WHO,String) End If - command.Parameters(7).Value = CType(Original_GUID,Integer) + If (REGEX_MATCH Is Nothing) Then + Throw New Global.System.ArgumentNullException("REGEX_MATCH") + Else + command.Parameters(7).Value = CType(REGEX_MATCH,String) + End If + If (REGEX_MESSAGE_EN Is Nothing) Then + Throw New Global.System.ArgumentNullException("REGEX_MESSAGE_EN") + Else + command.Parameters(8).Value = CType(REGEX_MESSAGE_EN,String) + End If + If (REGEX_MESSAGE_DE Is Nothing) Then + Throw New Global.System.ArgumentNullException("REGEX_MESSAGE_DE") + Else + command.Parameters(9).Value = CType(REGEX_MESSAGE_DE,String) + End If + command.Parameters(10).Value = CType(Original_GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State If ((command.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc index 32c7db1..f740567 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsc @@ -64,15 +64,26 @@ + + + + + + + - + + - + + - + + - + + diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd index 1cfbd9a..dbda0c5 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd @@ -1765,13 +1765,13 @@ WHERE (GUID = @Original_GUID); - + - + DELETE FROM TBPM_CONTROL_TABLE WHERE (GUID = @COLUMNID) - + @@ -1792,12 +1792,12 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, - SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, - CHANGED_WHO, CHANGED_WHEN + SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, + CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE FROM TBPM_CONTROL_TABLE WHERE (CONTROL_ID = @CONTROL_ID) - + @@ -1862,24 +1862,30 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, + + + UPDATE TBPM_CONTROL_TABLE -SET SPALTENNAME = @SPALTENNAME, SPALTEN_HEADER = @SPALTEN_HEADER, SPALTENBREITE = @SPALTENBREITE, VALIDATION = @VALIDATION, READ_ONLY = @READ_ONLY, - LOAD_IDX_VALUE = @LOAD_IDX_VALUE, CHANGED_WHO = @CHANGED_WHO +SET SPALTENNAME = @SPALTENNAME, SPALTEN_HEADER = @SPALTEN_HEADER, SPALTENBREITE = @SPALTENBREITE, VALIDATION = @VALIDATION, READ_ONLY = @READ_ONLY, LOAD_IDX_VALUE = @LOAD_IDX_VALUE, + CHANGED_WHO = @CHANGED_WHO, REGEX_MATCH = @REGEX_MATCH, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE WHERE (GUID = @Original_GUID) - - - - - - - - + + + + + + + + + + + @@ -1928,12 +1934,12 @@ FROM TBPM_CONTROL_TABLE - SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, - CHANGED_WHO, CHANGED_WHEN + SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, + CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID) - + @@ -2089,7 +2095,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2142,7 +2148,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2238,7 +2244,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2303,7 +2309,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2333,7 +2339,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2356,7 +2362,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2467,7 +2473,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2540,7 +2546,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2589,7 +2595,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2604,7 +2610,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2625,7 +2631,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2733,7 +2739,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2806,7 +2812,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2857,7 +2863,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2973,7 +2979,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -3027,10 +3033,31 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE + + + + + + + + + + + + + + + + + + + + + - + @@ -3071,7 +3098,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -3109,7 +3136,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -3244,11 +3271,11 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - - - - - + + + + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss index c691a66..6fffa86 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -19,7 +19,7 @@ - + @@ -73,7 +73,7 @@ 550 - 1259 + 1301 550 @@ -89,7 +89,7 @@ 344 - 1259 + 1301 344 diff --git a/app/DD_PM_WINDREAM/frmControl_Detail.Designer.vb b/app/DD_PM_WINDREAM/frmControl_Detail.Designer.vb index 2ceb72f..52679e5 100644 --- a/app/DD_PM_WINDREAM/frmControl_Detail.Designer.vb +++ b/app/DD_PM_WINDREAM/frmControl_Detail.Designer.vb @@ -28,14 +28,12 @@ Partial Class frmControl_Detail Dim SPALTEN_HEADERLabel As System.Windows.Forms.Label Dim SPALTENBREITELabel As System.Windows.Forms.Label Dim GUIDLabel As System.Windows.Forms.Label + Dim Label1 As System.Windows.Forms.Label + Dim Label2 As System.Windows.Forms.Label Dim ADDED_WHOLabel As System.Windows.Forms.Label Dim ADDED_WHENLabel As System.Windows.Forms.Label Dim CHANGED_WHOLabel As System.Windows.Forms.Label Dim CHANGED_WHENLabel As System.Windows.Forms.Label - Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet() - Me.TBPM_CONTROL_TABLEBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.TBPM_CONTROL_TABLETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter() - Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.SPALTENNAMETextBox = New System.Windows.Forms.TextBox() Me.SPALTEN_HEADERTextBox = New System.Windows.Forms.TextBox() Me.SPALTENBREITETextBox = New System.Windows.Forms.TextBox() @@ -43,24 +41,33 @@ Partial Class frmControl_Detail Me.READ_ONLYCheckBox = New System.Windows.Forms.CheckBox() Me.LOAD_IDX_VALUECheckBox = New System.Windows.Forms.CheckBox() Me.btnSave = New System.Windows.Forms.Button() + Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() + Me.tslblAenderungen = New System.Windows.Forms.ToolStripStatusLabel() + Me.btnDelete = New System.Windows.Forms.Button() + Me.REGEX_MATCHTextBox = New System.Windows.Forms.TextBox() + Me.Button1 = New System.Windows.Forms.Button() + Me.TBPM_CONTROL_TABLEBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet() + Me.TBPM_CONTROL_TABLETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter() + Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() + Me.REGEX_MESSAGE_DETextBox = New System.Windows.Forms.TextBox() Me.ADDED_WHOTextBox = New System.Windows.Forms.TextBox() Me.ADDED_WHENTextBox = New System.Windows.Forms.TextBox() Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox() Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox() - Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() - Me.tslblAenderungen = New System.Windows.Forms.ToolStripStatusLabel() - Me.btnDelete = New System.Windows.Forms.Button() SPALTENNAMELabel = New System.Windows.Forms.Label() SPALTEN_HEADERLabel = New System.Windows.Forms.Label() SPALTENBREITELabel = New System.Windows.Forms.Label() GUIDLabel = New System.Windows.Forms.Label() + Label1 = New System.Windows.Forms.Label() + Label2 = New System.Windows.Forms.Label() ADDED_WHOLabel = New System.Windows.Forms.Label() ADDED_WHENLabel = New System.Windows.Forms.Label() CHANGED_WHOLabel = New System.Windows.Forms.Label() CHANGED_WHENLabel = New System.Windows.Forms.Label() - CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.StatusStrip1.SuspendLayout() + CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SPALTENNAMELabel @@ -83,56 +90,6 @@ Partial Class frmControl_Detail resources.ApplyResources(GUIDLabel, "GUIDLabel") GUIDLabel.Name = "GUIDLabel" ' - 'ADDED_WHOLabel - ' - resources.ApplyResources(ADDED_WHOLabel, "ADDED_WHOLabel") - ADDED_WHOLabel.Name = "ADDED_WHOLabel" - ' - 'ADDED_WHENLabel - ' - resources.ApplyResources(ADDED_WHENLabel, "ADDED_WHENLabel") - ADDED_WHENLabel.Name = "ADDED_WHENLabel" - ' - 'CHANGED_WHOLabel - ' - resources.ApplyResources(CHANGED_WHOLabel, "CHANGED_WHOLabel") - CHANGED_WHOLabel.Name = "CHANGED_WHOLabel" - ' - 'CHANGED_WHENLabel - ' - resources.ApplyResources(CHANGED_WHENLabel, "CHANGED_WHENLabel") - CHANGED_WHENLabel.Name = "CHANGED_WHENLabel" - ' - 'DD_DMSLiteDataSet - ' - Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet" - Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema - ' - 'TBPM_CONTROL_TABLEBindingSource - ' - Me.TBPM_CONTROL_TABLEBindingSource.DataMember = "TBPM_CONTROL_TABLE" - Me.TBPM_CONTROL_TABLEBindingSource.DataSource = Me.DD_DMSLiteDataSet - ' - 'TBPM_CONTROL_TABLETableAdapter - ' - Me.TBPM_CONTROL_TABLETableAdapter.ClearBeforeFill = True - ' - 'TableAdapterManager - ' - Me.TableAdapterManager.BackupDataSetBeforeUpdate = False - Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing - Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing - Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Me.TBPM_CONTROL_TABLETableAdapter - Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing - Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing - Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing - Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing - Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing - Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete - ' 'SPALTENNAMETextBox ' Me.SPALTENNAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "SPALTENNAME", True)) @@ -179,6 +136,88 @@ Partial Class frmControl_Detail Me.btnSave.Name = "btnSave" Me.btnSave.UseVisualStyleBackColor = True ' + 'StatusStrip1 + ' + Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblAenderungen}) + resources.ApplyResources(Me.StatusStrip1, "StatusStrip1") + Me.StatusStrip1.Name = "StatusStrip1" + ' + 'tslblAenderungen + ' + Me.tslblAenderungen.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.flag_red + Me.tslblAenderungen.Name = "tslblAenderungen" + resources.ApplyResources(Me.tslblAenderungen, "tslblAenderungen") + ' + 'btnDelete + ' + Me.btnDelete.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.cancel + resources.ApplyResources(Me.btnDelete, "btnDelete") + Me.btnDelete.Name = "btnDelete" + Me.btnDelete.UseVisualStyleBackColor = True + ' + 'REGEX_MATCHTextBox + ' + Me.REGEX_MATCHTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "REGEX_MATCH", True)) + resources.ApplyResources(Me.REGEX_MATCHTextBox, "REGEX_MATCHTextBox") + Me.REGEX_MATCHTextBox.Name = "REGEX_MATCHTextBox" + ' + 'Label1 + ' + resources.ApplyResources(Label1, "Label1") + Label1.Name = "Label1" + ' + 'Button1 + ' + resources.ApplyResources(Me.Button1, "Button1") + Me.Button1.Name = "Button1" + Me.Button1.UseVisualStyleBackColor = True + ' + 'TBPM_CONTROL_TABLEBindingSource + ' + Me.TBPM_CONTROL_TABLEBindingSource.DataMember = "TBPM_CONTROL_TABLE" + Me.TBPM_CONTROL_TABLEBindingSource.DataSource = Me.DD_DMSLiteDataSet + ' + 'DD_DMSLiteDataSet + ' + Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet" + Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema + ' + 'TBPM_CONTROL_TABLETableAdapter + ' + Me.TBPM_CONTROL_TABLETableAdapter.ClearBeforeFill = True + ' + 'TableAdapterManager + ' + Me.TableAdapterManager.BackupDataSetBeforeUpdate = False + Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing + Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing + Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Me.TBPM_CONTROL_TABLETableAdapter + Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing + Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing + Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing + Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing + Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing + Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing + Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing + Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing + Me.TableAdapterManager.UpdateOrder = DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete + ' + 'REGEX_MESSAGE_DETextBox + ' + Me.REGEX_MESSAGE_DETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "REGEX_MESSAGE_DE", True)) + resources.ApplyResources(Me.REGEX_MESSAGE_DETextBox, "REGEX_MESSAGE_DETextBox") + Me.REGEX_MESSAGE_DETextBox.Name = "REGEX_MESSAGE_DETextBox" + ' + 'Label2 + ' + resources.ApplyResources(Label2, "Label2") + Label2.Name = "Label2" + ' + 'ADDED_WHOLabel + ' + resources.ApplyResources(ADDED_WHOLabel, "ADDED_WHOLabel") + ADDED_WHOLabel.Name = "ADDED_WHOLabel" + ' 'ADDED_WHOTextBox ' Me.ADDED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "ADDED_WHO", True)) @@ -186,6 +225,11 @@ Partial Class frmControl_Detail Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox" Me.ADDED_WHOTextBox.ReadOnly = True ' + 'ADDED_WHENLabel + ' + resources.ApplyResources(ADDED_WHENLabel, "ADDED_WHENLabel") + ADDED_WHENLabel.Name = "ADDED_WHENLabel" + ' 'ADDED_WHENTextBox ' Me.ADDED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "ADDED_WHEN", True)) @@ -193,6 +237,11 @@ Partial Class frmControl_Detail Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox" Me.ADDED_WHENTextBox.ReadOnly = True ' + 'CHANGED_WHOLabel + ' + resources.ApplyResources(CHANGED_WHOLabel, "CHANGED_WHOLabel") + CHANGED_WHOLabel.Name = "CHANGED_WHOLabel" + ' 'CHANGED_WHOTextBox ' Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "CHANGED_WHO", True)) @@ -200,6 +249,11 @@ Partial Class frmControl_Detail Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" Me.CHANGED_WHOTextBox.ReadOnly = True ' + 'CHANGED_WHENLabel + ' + resources.ApplyResources(CHANGED_WHENLabel, "CHANGED_WHENLabel") + CHANGED_WHENLabel.Name = "CHANGED_WHENLabel" + ' 'CHANGED_WHENTextBox ' Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "CHANGED_WHEN", True)) @@ -207,30 +261,10 @@ Partial Class frmControl_Detail Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" Me.CHANGED_WHENTextBox.ReadOnly = True ' - 'StatusStrip1 - ' - Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblAenderungen}) - resources.ApplyResources(Me.StatusStrip1, "StatusStrip1") - Me.StatusStrip1.Name = "StatusStrip1" - ' - 'tslblAenderungen - ' - Me.tslblAenderungen.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.flag_red - Me.tslblAenderungen.Name = "tslblAenderungen" - resources.ApplyResources(Me.tslblAenderungen, "tslblAenderungen") - ' - 'btnDelete - ' - Me.btnDelete.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.cancel - resources.ApplyResources(Me.btnDelete, "btnDelete") - Me.btnDelete.Name = "btnDelete" - Me.btnDelete.UseVisualStyleBackColor = True - ' 'frmControl_Detail ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(CHANGED_WHENLabel) Me.Controls.Add(Me.CHANGED_WHENTextBox) Me.Controls.Add(CHANGED_WHOLabel) @@ -239,13 +273,19 @@ Partial Class frmControl_Detail Me.Controls.Add(Me.ADDED_WHENTextBox) Me.Controls.Add(ADDED_WHOLabel) Me.Controls.Add(Me.ADDED_WHOTextBox) + Me.Controls.Add(Me.Button1) + Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.btnDelete) Me.Controls.Add(Me.btnSave) Me.Controls.Add(Me.LOAD_IDX_VALUECheckBox) Me.Controls.Add(Me.READ_ONLYCheckBox) Me.Controls.Add(GUIDLabel) Me.Controls.Add(Me.GUIDTextBox) + Me.Controls.Add(Label2) + Me.Controls.Add(Label1) Me.Controls.Add(SPALTENBREITELabel) + Me.Controls.Add(Me.REGEX_MESSAGE_DETextBox) + Me.Controls.Add(Me.REGEX_MATCHTextBox) Me.Controls.Add(Me.SPALTENBREITETextBox) Me.Controls.Add(SPALTEN_HEADERLabel) Me.Controls.Add(Me.SPALTEN_HEADERTextBox) @@ -255,11 +295,11 @@ Partial Class frmControl_Detail Me.MinimizeBox = False Me.Name = "frmControl_Detail" Me.TopMost = True - CType(Me.DD_DMSLiteDataSet,System.ComponentModel.ISupportInitialize).EndInit - CType(Me.TBPM_CONTROL_TABLEBindingSource,System.ComponentModel.ISupportInitialize).EndInit - Me.StatusStrip1.ResumeLayout(false) - Me.StatusStrip1.PerformLayout - Me.ResumeLayout(false) + Me.StatusStrip1.ResumeLayout(False) + Me.StatusStrip1.PerformLayout() + CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) Me.PerformLayout End Sub @@ -274,11 +314,14 @@ End Sub Friend WithEvents READ_ONLYCheckBox As System.Windows.Forms.CheckBox Friend WithEvents LOAD_IDX_VALUECheckBox As System.Windows.Forms.CheckBox Friend WithEvents btnSave As System.Windows.Forms.Button - Friend WithEvents ADDED_WHOTextBox As System.Windows.Forms.TextBox - Friend WithEvents ADDED_WHENTextBox As System.Windows.Forms.TextBox - Friend WithEvents CHANGED_WHOTextBox As System.Windows.Forms.TextBox - Friend WithEvents CHANGED_WHENTextBox As System.Windows.Forms.TextBox Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip Friend WithEvents tslblAenderungen As System.Windows.Forms.ToolStripStatusLabel Friend WithEvents btnDelete As Button + Friend WithEvents REGEX_MATCHTextBox As TextBox + Friend WithEvents Button1 As Button + Friend WithEvents REGEX_MESSAGE_DETextBox As TextBox + Friend WithEvents ADDED_WHOTextBox As TextBox + Friend WithEvents ADDED_WHENTextBox As TextBox + Friend WithEvents CHANGED_WHOTextBox As TextBox + Friend WithEvents CHANGED_WHENTextBox As TextBox End Class diff --git a/app/DD_PM_WINDREAM/frmControl_Detail.resx b/app/DD_PM_WINDREAM/frmControl_Detail.resx index 9f1a7c9..ecc882d 100644 --- a/app/DD_PM_WINDREAM/frmControl_Detail.resx +++ b/app/DD_PM_WINDREAM/frmControl_Detail.resx @@ -124,6 +124,10 @@ True + + + NoControl + 12, 51 @@ -147,7 +151,7 @@ $this - 19 + 24 False @@ -155,6 +159,9 @@ True + + NoControl + 12, 92 @@ -177,7 +184,7 @@ $this - 17 + 22 False @@ -185,6 +192,9 @@ True + + NoControl + 12, 133 @@ -207,7 +217,7 @@ $this - 15 + 18 False @@ -215,6 +225,9 @@ True + + NoControl + 12, 9 @@ -237,145 +250,16 @@ $this - 13 - - - False - - - True - - - 11, 263 - - - 67, 13 - - - 12 - - - Erstellt wer: - - - ADDED_WHOLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 7 - - - False - - - True - - - 164, 263 - - - 77, 13 - - - 13 - - - Erstellt wann: - - - ADDED_WHENLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 5 - - - False - - - True - - - 12, 304 - - - 80, 13 - - - 15 - - - Geändert wer: - - - CHANGED_WHOLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - - - False - - - True - - - 164, 304 - - - 90, 13 - - - 17 - - - Geändert wann: - - - CHANGED_WHENLabel - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 + 14 - - 17, 17 - 179, 17 - - 440, 17 - - - 695, 17 - 15, 67 - 226, 22 + 311, 22 3 @@ -390,13 +274,13 @@ $this - 20 + 25 15, 108 - 226, 22 + 311, 22 4 @@ -411,7 +295,7 @@ $this - 18 + 23 15, 149 @@ -432,7 +316,7 @@ $this - 16 + 21 15, 25 @@ -453,10 +337,13 @@ $this - 14 + 15 + + + NoControl - 15, 177 + 15, 392 87, 24 @@ -477,10 +364,13 @@ $this - 12 + 13 + + + NoControl - 108, 177 + 108, 392 120, 24 @@ -501,13 +391,16 @@ $this - 11 + 12 MiddleLeft + + NoControl + - 167, 228 + 167, 422 159, 32 @@ -531,16 +424,265 @@ $this + 11 + + + 1021, 17 + + + 0, 467 + + + 348, 22 + + + 21 + + + StatusStrip1 + + + StatusStrip1 + + + System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + 153, 17 + + + Änderungen gespeichert + + + False + + + MiddleLeft + + + NoControl + + + 12, 422 + + + 149, 32 + + + 12 + + + Löschen + + + MiddleRight + + + btnDelete + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 10 + + 15, 190 + + + 275, 22 + + + 5 + + + REGEX_MATCHTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 20 + + + False + + + True + + + NoControl + + + 12, 174 + + + 41, 13 + + + 4 + + + Regex: + + + Label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 17 + + + NoControl + + + 296, 190 + + + 30, 22 + + + 22 + + + ... + + + Button1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + 179, 17 + + + 17, 17 + + + 17, 17 + + + 440, 17 + + + 695, 17 + + + 15, 235 + + + 311, 22 + + + 5 + + + REGEX_MESSAGE_DETextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 19 + + + False + + + True + + + NoControl + + + 12, 219 + + + 93, 13 + + + 4 + + + Regex Nachricht: + + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 16 + + + False + + + True + + + 19, 266 + + + 99, 13 + + + 22 + + + Hinzugefügt Wer: + + + ADDED_WHOLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + - 14, 279 + 134, 263 - 147, 22 + 192, 22 - 13 + 23 ADDED_WHOTextBox @@ -552,16 +694,46 @@ $this - 8 + 7 + + + False + + + True + + + 19, 294 + + + 109, 13 + + + 23 + + + Hinzugefügt Wann: + + + ADDED_WHENLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 - 167, 279 + 134, 291 - 159, 22 + 192, 22 - 14 + 24 ADDED_WHENTextBox @@ -573,119 +745,109 @@ $this - 6 + 5 - - 15, 320 + + False + + + True - - 146, 22 + + 19, 322 - - 16 + + 82, 13 - - CHANGED_WHOTextBox + + 24 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Geändert Wer: - + + CHANGED_WHOLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + $this - - 4 + + 2 - - 167, 320 + + 134, 319 - - 159, 22 + + 192, 22 - - 18 + + 25 - - CHANGED_WHENTextBox + + CHANGED_WHOTextBox - + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 2 - - - 1021, 17 - - - 153, 17 - - - Änderungen gespeichert + + 3 - + False + + + True - - 0, 353 + + 19, 350 - - 342, 22 + + 92, 13 - - 21 + + 25 - - StatusStrip1 + + Geändert Wann: - - StatusStrip1 + + CHANGED_WHENLabel - - System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 0 - - MiddleLeft - - - - NoControl - - - 12, 228 - - - 149, 32 - - - 12 + + 134, 347 - - Löschen + + 192, 22 - - MiddleRight + + 26 - - btnDelete + + CHANGED_WHENTextBox - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 9 + + 1 True @@ -694,19 +856,22 @@ 6, 13 - 342, 375 + 348, 489 Segoe UI, 8.25pt + + NoControl + - frmControl_Detail + Spalte bearbeiten - - DD_DMSLiteDataSet + + tslblAenderungen - - DD_PM_WINDREAM.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 TBPM_CONTROL_TABLEBindingSource @@ -714,6 +879,12 @@ System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + DD_DMSLiteDataSet + + + DD_PM_WINDREAM.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + TBPM_CONTROL_TABLETableAdapter @@ -726,12 +897,6 @@ DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - tslblAenderungen - - - System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - frmControl_Detail diff --git a/app/DD_PM_WINDREAM/frmControl_Detail.vb b/app/DD_PM_WINDREAM/frmControl_Detail.vb index cfa48a2..0ea6cf0 100644 --- a/app/DD_PM_WINDREAM/frmControl_Detail.vb +++ b/app/DD_PM_WINDREAM/frmControl_Detail.vb @@ -23,7 +23,7 @@ Public Class frmControl_Detail If DD_DMSLiteDataSet.TBPM_CONTROL_TABLE.GetChanges Is Nothing = False Then Me.CHANGED_WHOTextBox.Text = Environment.UserName TBPM_CONTROL_TABLEBindingSource.EndEdit() - TBPM_CONTROL_TABLETableAdapter.cmdUpdate(SPALTENNAMETextBox.Text, SPALTEN_HEADERTextBox.Text, SPALTENBREITETextBox.Text, True, READ_ONLYCheckBox.Checked, LOAD_IDX_VALUECheckBox.Checked, CHANGED_WHOTextBox.Text, GUIDTextBox.Text) + TBPM_CONTROL_TABLETableAdapter.cmdUpdate(SPALTENNAMETextBox.Text, SPALTEN_HEADERTextBox.Text, SPALTENBREITETextBox.Text, True, READ_ONLYCheckBox.Checked, LOAD_IDX_VALUECheckBox.Checked, CHANGED_WHOTextBox.Text, REGEX_MATCHTextBox.Text, REGEX_MESSAGE_DETextBox.Text, REGEX_MESSAGE_DETextBox.Text, GUIDTextBox.Text) tslblAenderungen.Visible = True tslblAenderungen.Text = "Änderungen gespeichert - " & Now FillData(GUIDTextBox.Text) @@ -68,5 +68,13 @@ Public Class frmControl_Detail End Sub + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Dim oForm As New frmRegexEditor() + oForm.RegexString = REGEX_MATCHTextBox.Text + Dim oResult = oForm.ShowDialog() + If oResult = DialogResult.OK Then + REGEX_MATCHTextBox.Text = oForm.RegexString + End If + End Sub End Class \ No newline at end of file