diff --git a/app/README.md b/app/README.md new file mode 100644 index 0000000..7dbdfe4 --- /dev/null +++ b/app/README.md @@ -0,0 +1,62 @@ +Here's the improved `README.md` file incorporating the new content while maintaining the existing structure and coherence: + +# Project Title + +## Overview +Provide a brief description of the project, its purpose, and its main features. + +## Installation +Instructions on how to install and set up the project. + +## Usage +How to use the project, including code examples and explanations. + +## DataColumn.Expression (Formelsprachen-Übersicht) + +Die dynamischen Grid-Formeln verwenden die ADO.NET **`DataColumn.Expression`**-Sprache. Spalten werden immer über den **Spaltennamen** referenziert (in eckigen Klammern). + +### Grundoperatoren +| Typ | Ausdruck | Beispiel | +|---|---|---| +| Arithmetik | `+ - * /` | `[A] * [B]` | +| Vergleich | `= <> > >= < <=` | `[MENGE] > 0` | +| Logik | `AND OR NOT` | `[A] > 0 AND [B] < 10` | +| Klammern | `(...)` | `([A] + [B]) * 2` | + +### String-Verkettung +| Ausdruck | Beispiel | +|---|---| +| `+` | `[VORNAME] + ' - ' + [NACHNAME]` | +| `Convert` | `Convert([NUMMER], 'System.String')` | + +### Bedingungen +| Ausdruck | Beispiel | +|---|---| +| `IIF` | `IIF([A] = 'Harry', 'Blume', 'Tier')` | + +### Häufige Funktionen +| Funktion | Beispiel | +|---|---| +| `Len` | `Len([TEXT])` | +| `Trim` | `Trim([TEXT])` | +| `Substring` | `Substring([TEXT], 0, 3)` | +| `IsNull` | `IsNull([WERT], 0)` | +| `Convert` | `Convert([WERT], 'System.Double')` | + +### Beispiele (FORMULA_EXPRESSION) +- **Multiplikation:** `[MENGE] * [PREIS]` +- **Addieren:** `[A] + [B]` +- **Division:** `[A] / [B]` +- **Text zusammensetzen:** `[SAKNR] + ' - ' + [KST]` +- **Bedingung:** `IIF([STATUS] = 'X', 'OK', 'NOK')` + +## Contributing +Guidelines for contributing to the project. + +## License +Information about the project's license. + +## Contact +How to contact the project maintainers for questions or support. + +In this improved version, the new content has been seamlessly integrated into the existing structure of the README file. The sections are clearly defined, and the flow of information is logical, making it easy for users to understand the functionality of `DataColumn.Expression` and how to use it effectively. \ No newline at end of file diff --git a/app/TaskFlow/ControlCreator/GridControl.vb b/app/TaskFlow/ControlCreator/GridControl.vb index d6747e4..184f4a8 100644 --- a/app/TaskFlow/ControlCreator/GridControl.vb +++ b/app/TaskFlow/ControlCreator/GridControl.vb @@ -439,9 +439,10 @@ Namespace ControlCreator Return End If - confirmationEntry.Count += 1 - CONFIG.Save() - _Logger.Info("User confirmed value inheritance. Confirmation count: {0}", confirmationEntry.Count) + Dim newCount = confirmationEntry.Count + 1 + confirmationEntry.Count = newCount + SetInheritanceConfirmationCount(confirmationEntry.ColumnName, newCount) + _Logger.Info("User confirmed value inheritance. Confirmation count: {0}", newCount) ElseIf affectedRowsCount > 0 AndAlso confirmationEntry.Count = InheritanceMsgAmount Then ' Schwellenwert erreicht - User fragen, ob er weiterhin gefragt werden möchte Dim continueAskingMessage As String = "Sie haben diese Bestätigung bereits mehrfach durchgeführt. Möchten Sie in Zukunft weiterhin gefragt werden?" @@ -463,13 +464,14 @@ Namespace ControlCreator If continueResult = DialogResult.Yes Then ' User möchte weiterhin gefragt werden - Counter zurücksetzen confirmationEntry.Count = 0 - CONFIG.Save() + SetInheritanceConfirmationCount(confirmationEntry.ColumnName, 0) _Logger.Info("User wants to continue being asked. Counter reset to 0.") Else ' User möchte nicht mehr gefragt werden - Counter erhöhen - confirmationEntry.Count += 1 - CONFIG.Save() - _Logger.Info("User does not want to be asked anymore. Counter increased to {0}.", confirmationEntry.Count) + Dim newCount = confirmationEntry.Count + 1 + confirmationEntry.Count = newCount + SetInheritanceConfirmationCount(confirmationEntry.ColumnName, newCount) + _Logger.Info("User does not want to be asked anymore. Counter increased to {0}.", newCount) End If ElseIf affectedRowsCount > 0 Then _Logger.Info("Skipping confirmation dialog (already confirmed {0} times)", confirmationEntry.Count) @@ -499,7 +501,21 @@ Namespace ControlCreator isApplyingInheritedValue = False End Try End Sub + Private Sub SetInheritanceConfirmationCount(columnName As String, newCount As Integer) + Dim entries = UserInheritance_ConfirmationByColumn + If entries Is Nothing Then + Return + End If + Dim entryIndex = entries.FindIndex(Function(item) String.Equals(item.ColumnName, columnName, StringComparison.OrdinalIgnoreCase)) + If entryIndex < 0 Then + Return + End If + + Dim entry = entries(entryIndex) + entry.Count = newCount + entries(entryIndex) = entry + End Sub Private Function GetInheritanceConfirmationEntry(columnName As String) As UserInheritanceConfirmation Dim entries = UserInheritance_ConfirmationByColumn diff --git a/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb b/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb index 32254ea..7a9f7e6 100644 --- a/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb +++ b/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb @@ -5273,7 +5273,7 @@ Partial Public Class DD_DMSLiteDataSet Me.columnTABLE_ORDER_COLUMN.DefaultValue = CType("",String) Me.columnTABLE_ORDER_COLUMN.MaxLength = 250 Me.columnSAVE_CHANGE_ON_ENABLED.AllowDBNull = false - Me.columnFORMAT_STRING.AllowDBNull = false + Me.columnFORMAT_STRING.DefaultValue = CType("",String) Me.columnTEXT_ALIGNMENT.AllowDBNull = false Me.columnTEXT_ALIGNMENT.DefaultValue = CType("Near",String) Me.columnTEXT_ALIGNMENT.MaxLength = 20 @@ -5464,6 +5464,8 @@ Partial Public Class DD_DMSLiteDataSet Private columnINHERIT_VALUE As Global.System.Data.DataColumn + Private columnFORMULA_EXPRESSION As Global.System.Data.DataColumn + _ Public Sub New() @@ -5699,6 +5701,14 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property FORMULA_EXPRESSIONColumn() As Global.System.Data.DataColumn + Get + Return Me.columnFORMULA_EXPRESSION + End Get + End Property + _ @@ -5760,9 +5770,10 @@ Partial Public Class DD_DMSLiteDataSet ByVal SUMMARY_FUNCTION As String, _ ByVal TYPE_COLUMN As String, _ ByVal LU_CAPTION As String, _ - ByVal INHERIT_VALUE As Boolean) As TBPM_CONTROL_TABLERow + ByVal INHERIT_VALUE As Boolean, _ + ByVal FORMULA_EXPRESSION 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, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE} + 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, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE, FORMULA_EXPRESSION} If (Not (parentTBPM_PROFILE_CONTROLSRowByFK_TBPM_CONTROL_TABLE_CONTROL1) Is Nothing) Then columnValuesArray(1) = parentTBPM_PROFILE_CONTROLSRowByFK_TBPM_CONTROL_TABLE_CONTROL1(0) End If @@ -5819,6 +5830,7 @@ Partial Public Class DD_DMSLiteDataSet Me.columnTYPE_COLUMN = MyBase.Columns("TYPE_COLUMN") Me.columnLU_CAPTION = MyBase.Columns("LU_CAPTION") Me.columnINHERIT_VALUE = MyBase.Columns("INHERIT_VALUE") + Me.columnFORMULA_EXPRESSION = MyBase.Columns("FORMULA_EXPRESSION") End Sub _ Public Property FORMAT_STRING() As String Get - Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.FORMAT_STRINGColumn),String) + Try + Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.FORMAT_STRINGColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte FORMAT_STRING in Tabelle TBPM_PROFILE_CONTROLS ist DBNull.", e) + End Try End Get Set Me(Me.tableTBPM_PROFILE_CONTROLS.FORMAT_STRINGColumn) = value @@ -12851,6 +12871,18 @@ Partial Public Class DD_DMSLiteDataSet Me(Me.tableTBPM_PROFILE_CONTROLS.SQL_ENABLE_ON_LOAD_CONIDColumn) = Global.System.Convert.DBNull End Sub + _ + Public Function IsFORMAT_STRINGNull() As Boolean + Return Me.IsNull(Me.tableTBPM_PROFILE_CONTROLS.FORMAT_STRINGColumn) + End Function + + _ + Public Sub SetFORMAT_STRINGNull() + Me(Me.tableTBPM_PROFILE_CONTROLS.FORMAT_STRINGColumn) = Global.System.Convert.DBNull + End Sub + _ Public Function IsBACKCOLOR_IFNull() As Boolean @@ -13184,6 +13216,17 @@ Partial Public Class DD_DMSLiteDataSet End Set End Property + _ + Public Property FORMULA_EXPRESSION() As String + Get + Return CType(Me(Me.tableTBPM_CONTROL_TABLE.FORMULA_EXPRESSIONColumn),String) + End Get + Set + Me(Me.tableTBPM_CONTROL_TABLE.FORMULA_EXPRESSIONColumn) = value + End Set + End Property + _ Public Property TBPM_PROFILE_CONTROLSRow() As TBPM_PROFILE_CONTROLSRow @@ -20855,7 +20898,7 @@ Namespace DD_DMSLiteDataSetTableAdapters End If Me.Adapter.InsertCommand.Parameters(34).Value = CType(SAVE_CHANGE_ON_ENABLED,Boolean) If (FORMAT_STRING Is Nothing) Then - Throw New Global.System.ArgumentNullException("FORMAT_STRING") + Me.Adapter.InsertCommand.Parameters(35).Value = Global.System.DBNull.Value Else Me.Adapter.InsertCommand.Parameters(35).Value = CType(FORMAT_STRING,String) End If @@ -21033,7 +21076,7 @@ Namespace DD_DMSLiteDataSetTableAdapters End If Me.Adapter.UpdateCommand.Parameters(31).Value = CType(SAVE_CHANGE_ON_ENABLED,Boolean) If (FORMAT_STRING Is Nothing) Then - Throw New Global.System.ArgumentNullException("FORMAT_STRING") + Me.Adapter.UpdateCommand.Parameters(32).Value = Global.System.DBNull.Value Else Me.Adapter.UpdateCommand.Parameters(32).Value = CType(FORMAT_STRING,String) End If @@ -21491,6 +21534,7 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("TYPE_COLUMN", "TYPE_COLUMN") tableMapping.ColumnMappings.Add("LU_CAPTION", "LU_CAPTION") tableMapping.ColumnMappings.Add("INHERIT_VALUE", "INHERIT_VALUE") + tableMapping.ColumnMappings.Add("FORMULA_EXPRESSION", "FORMULA_EXPRESSION") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -21527,12 +21571,13 @@ Namespace DD_DMSLiteDataSetTableAdapters "ESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SEQU"& _ "ENCE = @SEQUENCE, DEFAULT_VALUE = @DEFAULT_VALUE, ADVANCED_LOOKUP = @ADVANCED_LO"& _ "OKUP, SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED, INHERIT_VALUE = @INHERIT"& _ - "_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" LU_CAPTION = @LU_CAPTION"&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, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SP"& _ - "ALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOA"& _ - "D_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGE"& _ - "X_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TB"& _ - "PM_CONTROL_TABLE WHERE (GUID = @GUID)" + "_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" LU_CAPTION = @LU_CAPTION, FORMULA_EXPRESSION "& _ + "= @FORMULA_EXPRESSION"&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, "& _ + "CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST,"& _ + " CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, C"& _ + "HANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUE"& _ + "NCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID)"& _ + "" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.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._adapter.UpdateCommand.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, "", "", "")) @@ -21557,6 +21602,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SAVE_CHANGE_ON_ENABLED", Global.System.Data.SqlDbType.[Variant], 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "SAVE_CHANGE_ON_ENABLED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INHERIT_VALUE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "INHERIT_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LU_CAPTION", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "LU_CAPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORMULA_EXPRESSION", Global.System.Data.SqlDbType.NVarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "FORMULA_EXPRESSION", 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 @@ -21578,8 +21624,9 @@ Namespace DD_DMSLiteDataSetTableAdapters "ATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED"& _ "_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, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKU"& _ - "P, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBP"& _ - "M_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (CONTROL_ID = @CONTROL_ID)" + "P, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " FORMULA_EXPRESSION"&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 (CO"& _ + "NTROL_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() @@ -21592,7 +21639,8 @@ Namespace DD_DMSLiteDataSetTableAdapters "E = @DEFAULT_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SEQUENCE = @SEQUENCE, ADVANCED_LO"& _ "OKUP = @ADVANCED_LOOKUP, SUMMARY_FUNCTION = @SUMMARY_FUNCTION, TYPE_COLUMN = @TY"& _ "PE_COLUMN, LU_CAPTION = @LU_CAPTION, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" INHERIT_VALUE = "& _ - "@INHERIT_VALUE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + "@INHERIT_VALUE, FORMULA_EXPRESSION = @FORMULA_EXPRESSION"&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, "", "", "")) @@ -21611,6 +21659,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYPE_COLUMN", Global.System.Data.SqlDbType.VarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "TYPE_COLUMN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LU_CAPTION", Global.System.Data.SqlDbType.VarChar, 150, Global.System.Data.ParameterDirection.Input, 0, 0, "LU_CAPTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INHERIT_VALUE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "INHERIT_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORMULA_EXPRESSION", Global.System.Data.SqlDbType.NVarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "FORMULA_EXPRESSION", 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 @@ -21623,8 +21672,8 @@ Namespace DD_DMSLiteDataSetTableAdapters "CHOICE_LIST, CONNECTION_ID, CONTROL_ID, DEFAULT_VALUE, GUID, LOAD_IDX_VALUE, REA"& _ "D_ONLY, REGEX_MATCH, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" REGEX_MESSAGE_DE, REGEX_MESSAGE_"& _ "EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATIO"& _ - "N, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_CONTROL_TABLE"& _ - "" + "N, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " FORMULA_EXPRESSION"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_CONTROL_TABLE" Me._commandCollection(3).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(4) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(4).Connection = Me.Connection @@ -21632,8 +21681,9 @@ Namespace DD_DMSLiteDataSetTableAdapters "CHOICE_LIST, CONNECTION_ID, CONTROL_ID, DEFAULT_VALUE, GUID, LOAD_IDX_VALUE, REA"& _ "D_ONLY, REGEX_MATCH, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" REGEX_MESSAGE_DE, REGEX_MESSAGE_"& _ "EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATIO"& _ - "N, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBP"& _ - "M_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @GUID)" + "N, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " FORMULA_EXPRESSION"&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 (GU"& _ + "ID = @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() @@ -21841,6 +21891,7 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal SAVE_CHANGE_ON_ENABLED As Object, _ ByVal INHERIT_VALUE As Boolean, _ ByVal LU_CAPTION As String, _ + ByVal FORMULA_EXPRESSION As String, _ ByVal Original_GUID As Integer, _ ByVal GUID As Integer) As Integer Me.Adapter.UpdateCommand.Parameters(0).Value = CType(CONTROL_ID,Integer) @@ -21922,8 +21973,13 @@ Namespace DD_DMSLiteDataSetTableAdapters Else Me.Adapter.UpdateCommand.Parameters(22).Value = CType(LU_CAPTION,String) End If - Me.Adapter.UpdateCommand.Parameters(23).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(24).Value = CType(GUID,Integer) + If (FORMULA_EXPRESSION Is Nothing) Then + Throw New Global.System.ArgumentNullException("FORMULA_EXPRESSION") + Else + Me.Adapter.UpdateCommand.Parameters(23).Value = CType(FORMULA_EXPRESSION,String) + End If + Me.Adapter.UpdateCommand.Parameters(24).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(25).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 @@ -21960,6 +22016,7 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal TYPE_COLUMN As String, _ ByVal LU_CAPTION As String, _ ByVal INHERIT_VALUE As Boolean, _ + ByVal FORMULA_EXPRESSION As String, _ ByVal Original_GUID As Integer) As Object Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(1) If (SPALTENNAME Is Nothing) Then @@ -22019,7 +22076,12 @@ Namespace DD_DMSLiteDataSetTableAdapters command.Parameters(15).Value = CType(LU_CAPTION,String) End If command.Parameters(16).Value = CType(INHERIT_VALUE,Boolean) - command.Parameters(17).Value = CType(Original_GUID,Integer) + If (FORMULA_EXPRESSION Is Nothing) Then + Throw New Global.System.ArgumentNullException("FORMULA_EXPRESSION") + Else + command.Parameters(17).Value = CType(FORMULA_EXPRESSION,String) + End If + command.Parameters(18).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/TaskFlow/DD_DMSLiteDataSet.xsc b/app/TaskFlow/DD_DMSLiteDataSet.xsc index 70f99aa..c280a8c 100644 --- a/app/TaskFlow/DD_DMSLiteDataSet.xsc +++ b/app/TaskFlow/DD_DMSLiteDataSet.xsc @@ -56,24 +56,32 @@ - + + - + + - + + - + + - + + - + + - + + - + + diff --git a/app/TaskFlow/DD_DMSLiteDataSet.xsd b/app/TaskFlow/DD_DMSLiteDataSet.xsd index fa42b74..9daf4fe 100644 --- a/app/TaskFlow/DD_DMSLiteDataSet.xsd +++ b/app/TaskFlow/DD_DMSLiteDataSet.xsd @@ -1011,7 +1011,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD - + @@ -1074,7 +1074,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD - + @@ -1299,26 +1299,27 @@ WHERE (GUID = @Original_GUID) - + INSERT INTO TBPM_CONTROL_TABLE (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, ADDED_WHO, TYPE_COLUMN, INHERIT_VALUE) VALUES (@CONTROL_ID,@SPALTENNAME,@SPALTEN_HEADER,@SPALTENBREITE,@ADDED_WHO,@TYPE_COLUMN,@INHERIT_VALUE); 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, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = SCOPE_IDENTITY()) - - - - - - - + + + + + + + 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, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE + CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE, + FORMULA_EXPRESSION FROM TBPM_CONTROL_TABLE WHERE (CONTROL_ID = @CONTROL_ID) @@ -1333,8 +1334,8 @@ SET CONTROL_ID = @CONTROL_ID, SPALTENNAME = @SPALTENNAME, SPALTEN CONNECTION_ID = @CONNECTION_ID, SQL_COMMAND = @SQL_COMMAND, READ_ONLY = @READ_ONLY, LOAD_IDX_VALUE = @LOAD_IDX_VALUE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN, REGEX_MATCH = @REGEX_MATCH, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, SEQUENCE = @SEQUENCE, DEFAULT_VALUE = @DEFAULT_VALUE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP, SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED, INHERIT_VALUE = @INHERIT_VALUE, - LU_CAPTION = @LU_CAPTION -WHERE (GUID = @Original_GUID); + LU_CAPTION = @LU_CAPTION, FORMULA_EXPRESSION = @FORMULA_EXPRESSION +WHERE (GUID = @Original_GUID); 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, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID) @@ -1360,6 +1361,7 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, + @@ -1393,6 +1395,7 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, + @@ -1402,7 +1405,7 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, 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, DEFAULT_VALUE = @DEFAULT_VALUE, SEQUENCE = @SEQUENCE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP, SUMMARY_FUNCTION = @SUMMARY_FUNCTION, TYPE_COLUMN = @TYPE_COLUMN, LU_CAPTION = @LU_CAPTION, - INHERIT_VALUE = @INHERIT_VALUE + INHERIT_VALUE = @INHERIT_VALUE, FORMULA_EXPRESSION = @FORMULA_EXPRESSION WHERE (GUID = @Original_GUID) @@ -1422,6 +1425,7 @@ WHERE (GUID = @Original_GUID) + @@ -1442,7 +1446,8 @@ WHERE (CONTROL_ID = @CONTROL_ID) SELECT ADDED_WHEN, ADDED_WHO, ADVANCED_LOOKUP, CHANGED_WHEN, CHANGED_WHO, CHOICE_LIST, CONNECTION_ID, CONTROL_ID, DEFAULT_VALUE, GUID, LOAD_IDX_VALUE, READ_ONLY, REGEX_MATCH, - REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION + REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE, + FORMULA_EXPRESSION FROM TBPM_CONTROL_TABLE @@ -1452,7 +1457,8 @@ FROM TBPM_CONTROL_TABLE SELECT ADDED_WHEN, ADDED_WHO, ADVANCED_LOOKUP, CHANGED_WHEN, CHANGED_WHO, CHOICE_LIST, CONNECTION_ID, CONTROL_ID, DEFAULT_VALUE, GUID, LOAD_IDX_VALUE, READ_ONLY, REGEX_MATCH, - REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE + REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SEQUENCE, SPALTENBREITE, SPALTENNAME, SPALTEN_HEADER, SQL_COMMAND, VALIDATION, SUMMARY_FUNCTION, TYPE_COLUMN, LU_CAPTION, INHERIT_VALUE, + FORMULA_EXPRESSION FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID) @@ -2694,7 +2700,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - + @@ -2806,6 +2812,13 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME + + + + + + + @@ -3392,9 +3405,9 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - - - + + + \ No newline at end of file diff --git a/app/TaskFlow/DD_DMSLiteDataSet.xss b/app/TaskFlow/DD_DMSLiteDataSet.xss index f6c615a..ec47d6d 100644 --- a/app/TaskFlow/DD_DMSLiteDataSet.xss +++ b/app/TaskFlow/DD_DMSLiteDataSet.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -15,8 +15,8 @@ - - + + @@ -33,11 +33,11 @@ 1247 - 542 + 611 - 1299 - 542 + 1297 + 611 @@ -49,11 +49,11 @@ 141 - 343 + 408 - 1299 - 343 + 1297 + 408 @@ -65,7 +65,7 @@ 965 - 400 + 404 diff --git a/app/TaskFlow/My Project/AssemblyInfo.vb b/app/TaskFlow/My Project/AssemblyInfo.vb index 72aeabb..04a8cb7 100644 --- a/app/TaskFlow/My Project/AssemblyInfo.vb +++ b/app/TaskFlow/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/TaskFlow/frmColumn_Detail.Designer.vb b/app/TaskFlow/frmColumn_Detail.Designer.vb index 655b262..620af69 100644 --- a/app/TaskFlow/frmColumn_Detail.Designer.vb +++ b/app/TaskFlow/frmColumn_Detail.Designer.vb @@ -37,6 +37,8 @@ Partial Class frmColumn_Detail Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() + Me.FORMULA_EXPRESSIONTextBox = New System.Windows.Forms.TextBox() Me.LU_CAPTIONTextBox = New System.Windows.Forms.TextBox() Me.GUIDTextBox = New DevExpress.XtraEditors.TextEdit() Me.SPALTENNAMETextBox = New DevExpress.XtraEditors.TextEdit() @@ -78,12 +80,15 @@ Partial Class frmColumn_Detail Me.LayoutControlItem16 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem14 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem17 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem25 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem20 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem22 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem18 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem19 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem23 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem21 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem24 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem15 = New DevExpress.XtraLayout.LayoutControlItem() CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -127,12 +132,15 @@ Partial Class frmColumn_Detail CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem25, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem21, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem24, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'TBPM_CONTROL_TABLEBindingSource @@ -229,6 +237,8 @@ Partial Class frmColumn_Detail ' 'LayoutControl1 ' + Me.LayoutControl1.Controls.Add(Me.LabelControl1) + Me.LayoutControl1.Controls.Add(Me.FORMULA_EXPRESSIONTextBox) Me.LayoutControl1.Controls.Add(Me.LU_CAPTIONTextBox) Me.LayoutControl1.Controls.Add(Me.GUIDTextBox) Me.LayoutControl1.Controls.Add(Me.SPALTENNAMETextBox) @@ -256,6 +266,22 @@ Partial Class frmColumn_Detail Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root ' + 'LabelControl1 + ' + Me.LabelControl1.Appearance.Font = CType(resources.GetObject("LabelControl1.Appearance.Font"), System.Drawing.Font) + Me.LabelControl1.Appearance.Options.UseFont = True + Me.LabelControl1.Appearance.Options.UseTextOptions = True + Me.LabelControl1.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap + resources.ApplyResources(Me.LabelControl1, "LabelControl1") + Me.LabelControl1.Name = "LabelControl1" + Me.LabelControl1.StyleController = Me.LayoutControl1 + ' + 'FORMULA_EXPRESSIONTextBox + ' + Me.FORMULA_EXPRESSIONTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "FORMULA_EXPRESSION", True)) + resources.ApplyResources(Me.FORMULA_EXPRESSIONTextBox, "FORMULA_EXPRESSIONTextBox") + Me.FORMULA_EXPRESSIONTextBox.Name = "FORMULA_EXPRESSIONTextBox" + ' 'LU_CAPTIONTextBox ' Me.LU_CAPTIONTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "LU_CAPTION", True)) @@ -456,9 +482,9 @@ Partial Class frmColumn_Detail ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem10, Me.LayoutControlItem12, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlGroup1, Me.LayoutControlItem18, Me.LayoutControlItem19, Me.LayoutControlItem23, Me.LayoutControlItem21}) + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem10, Me.LayoutControlItem12, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlGroup1, Me.LayoutControlItem18, Me.LayoutControlItem19, Me.LayoutControlItem23, Me.LayoutControlItem21, Me.LayoutControlItem24, Me.LayoutControlItem15}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(573, 668) + Me.Root.Size = New System.Drawing.Size(593, 816) Me.Root.TextVisible = False ' 'LayoutControlItem1 @@ -467,7 +493,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem1.Name = "LayoutControlItem1" Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem1.Size = New System.Drawing.Size(553, 40) + Me.LayoutControlItem1.Size = New System.Drawing.Size(573, 40) resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1") Me.LayoutControlItem1.TextSize = New System.Drawing.Size(110, 13) ' @@ -477,7 +503,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 40) Me.LayoutControlItem2.Name = "LayoutControlItem2" Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem2.Size = New System.Drawing.Size(553, 40) + Me.LayoutControlItem2.Size = New System.Drawing.Size(573, 40) resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2") Me.LayoutControlItem2.TextSize = New System.Drawing.Size(110, 13) ' @@ -487,7 +513,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 80) Me.LayoutControlItem3.Name = "LayoutControlItem3" Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem3.Size = New System.Drawing.Size(553, 40) + Me.LayoutControlItem3.Size = New System.Drawing.Size(573, 40) resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3") Me.LayoutControlItem3.TextSize = New System.Drawing.Size(110, 13) ' @@ -497,7 +523,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 120) Me.LayoutControlItem4.Name = "LayoutControlItem4" Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem4.Size = New System.Drawing.Size(276, 40) + Me.LayoutControlItem4.Size = New System.Drawing.Size(286, 40) resources.ApplyResources(Me.LayoutControlItem4, "LayoutControlItem4") Me.LayoutControlItem4.TextSize = New System.Drawing.Size(110, 13) ' @@ -507,16 +533,16 @@ Partial Class frmColumn_Detail Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 200) Me.LayoutControlItem5.Name = "LayoutControlItem5" Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem5.Size = New System.Drawing.Size(471, 46) + Me.LayoutControlItem5.Size = New System.Drawing.Size(488, 46) resources.ApplyResources(Me.LayoutControlItem5, "LayoutControlItem5") Me.LayoutControlItem5.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.SimpleButton1 - Me.LayoutControlItem6.Location = New System.Drawing.Point(471, 200) + Me.LayoutControlItem6.Location = New System.Drawing.Point(488, 200) Me.LayoutControlItem6.Name = "LayoutControlItem6" - Me.LayoutControlItem6.Size = New System.Drawing.Size(82, 46) + Me.LayoutControlItem6.Size = New System.Drawing.Size(85, 46) Me.LayoutControlItem6.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem6.TextVisible = False ' @@ -526,7 +552,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 326) Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem8.Size = New System.Drawing.Size(471, 46) + Me.LayoutControlItem8.Size = New System.Drawing.Size(488, 46) resources.ApplyResources(Me.LayoutControlItem8, "LayoutControlItem8") Me.LayoutControlItem8.TextSize = New System.Drawing.Size(110, 13) ' @@ -536,65 +562,65 @@ Partial Class frmColumn_Detail Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 246) Me.LayoutControlItem7.Name = "LayoutControlItem7" Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem7.Size = New System.Drawing.Size(553, 40) + Me.LayoutControlItem7.Size = New System.Drawing.Size(573, 40) resources.ApplyResources(Me.LayoutControlItem7, "LayoutControlItem7") Me.LayoutControlItem7.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem9 ' Me.LayoutControlItem9.Control = Me.SimpleButton2 - Me.LayoutControlItem9.Location = New System.Drawing.Point(471, 326) + Me.LayoutControlItem9.Location = New System.Drawing.Point(488, 326) Me.LayoutControlItem9.Name = "LayoutControlItem9" - Me.LayoutControlItem9.Size = New System.Drawing.Size(82, 46) + Me.LayoutControlItem9.Size = New System.Drawing.Size(85, 46) Me.LayoutControlItem9.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem9.TextVisible = False ' 'LayoutControlItem10 ' Me.LayoutControlItem10.Control = Me.TextEdit7 - Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 412) + Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 547) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem10.Size = New System.Drawing.Size(276, 40) + Me.LayoutControlItem10.Size = New System.Drawing.Size(286, 40) resources.ApplyResources(Me.LayoutControlItem10, "LayoutControlItem10") Me.LayoutControlItem10.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem12 ' Me.LayoutControlItem12.Control = Me.CHANGED_WHOTextBox - Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 452) + Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 587) Me.LayoutControlItem12.Name = "LayoutControlItem12" Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem12.Size = New System.Drawing.Size(276, 40) + Me.LayoutControlItem12.Size = New System.Drawing.Size(286, 40) resources.ApplyResources(Me.LayoutControlItem12, "LayoutControlItem12") Me.LayoutControlItem12.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem11 ' Me.LayoutControlItem11.Control = Me.TextEdit8 - Me.LayoutControlItem11.Location = New System.Drawing.Point(276, 412) + Me.LayoutControlItem11.Location = New System.Drawing.Point(286, 547) Me.LayoutControlItem11.Name = "LayoutControlItem11" Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem11.Size = New System.Drawing.Size(277, 40) + Me.LayoutControlItem11.Size = New System.Drawing.Size(287, 40) resources.ApplyResources(Me.LayoutControlItem11, "LayoutControlItem11") Me.LayoutControlItem11.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem13 ' Me.LayoutControlItem13.Control = Me.TextEdit10 - Me.LayoutControlItem13.Location = New System.Drawing.Point(276, 452) + Me.LayoutControlItem13.Location = New System.Drawing.Point(286, 587) Me.LayoutControlItem13.Name = "LayoutControlItem13" Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem13.Size = New System.Drawing.Size(277, 40) + Me.LayoutControlItem13.Size = New System.Drawing.Size(287, 40) resources.ApplyResources(Me.LayoutControlItem13, "LayoutControlItem13") Me.LayoutControlItem13.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlGroup1 ' - Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem16, Me.LayoutControlItem14, Me.LayoutControlItem17, Me.LayoutControlItem20, Me.LayoutControlItem22}) - Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 492) + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem16, Me.LayoutControlItem14, Me.LayoutControlItem17, Me.LayoutControlItem25, Me.LayoutControlItem20, Me.LayoutControlItem22}) + Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 627) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(553, 156) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(573, 169) resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1") ' 'LayoutControlItem16 @@ -602,7 +628,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem16.Control = Me.VALIDATIONCheckbox Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem16.Name = "LayoutControlItem16" - Me.LayoutControlItem16.Size = New System.Drawing.Size(264, 24) + Me.LayoutControlItem16.Size = New System.Drawing.Size(274, 24) Me.LayoutControlItem16.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem16.TextVisible = False ' @@ -611,7 +637,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem14.Control = Me.READ_ONLYCheckBox Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 24) Me.LayoutControlItem14.Name = "LayoutControlItem14" - Me.LayoutControlItem14.Size = New System.Drawing.Size(529, 22) + Me.LayoutControlItem14.Size = New System.Drawing.Size(549, 22) Me.LayoutControlItem14.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem14.TextVisible = False ' @@ -620,16 +646,25 @@ Partial Class frmColumn_Detail Me.LayoutControlItem17.Control = Me.ADVANCED_LOOKUPCheckbox Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 46) Me.LayoutControlItem17.Name = "LayoutControlItem17" - Me.LayoutControlItem17.Size = New System.Drawing.Size(529, 22) + Me.LayoutControlItem17.Size = New System.Drawing.Size(549, 22) Me.LayoutControlItem17.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem17.TextVisible = False ' + 'LayoutControlItem25 + ' + Me.LayoutControlItem25.Control = Me.LOAD_IDX_VALUECheckBox + Me.LayoutControlItem25.Location = New System.Drawing.Point(0, 68) + Me.LayoutControlItem25.Name = "LayoutControlItem25" + Me.LayoutControlItem25.Size = New System.Drawing.Size(549, 22) + Me.LayoutControlItem25.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem25.TextVisible = False + ' 'LayoutControlItem20 ' Me.LayoutControlItem20.Control = Me.SUMMARY_FUNCTIONCombobox - Me.LayoutControlItem20.Location = New System.Drawing.Point(264, 0) + Me.LayoutControlItem20.Location = New System.Drawing.Point(274, 0) Me.LayoutControlItem20.Name = "LayoutControlItem20" - Me.LayoutControlItem20.Size = New System.Drawing.Size(265, 24) + Me.LayoutControlItem20.Size = New System.Drawing.Size(275, 24) resources.ApplyResources(Me.LayoutControlItem20, "LayoutControlItem20") Me.LayoutControlItem20.TextSize = New System.Drawing.Size(110, 13) ' @@ -637,9 +672,9 @@ Partial Class frmColumn_Detail ' Me.LayoutControlItem22.Control = Me.CheckEditInheritValue Me.LayoutControlItem22.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "INHERIT_VALUE", True)) - Me.LayoutControlItem22.Location = New System.Drawing.Point(0, 68) + Me.LayoutControlItem22.Location = New System.Drawing.Point(0, 90) Me.LayoutControlItem22.Name = "LayoutControlItem22" - Me.LayoutControlItem22.Size = New System.Drawing.Size(529, 43) + Me.LayoutControlItem22.Size = New System.Drawing.Size(549, 34) Me.LayoutControlItem22.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem22.TextVisible = False ' @@ -649,17 +684,17 @@ Partial Class frmColumn_Detail Me.LayoutControlItem18.Location = New System.Drawing.Point(0, 372) Me.LayoutControlItem18.Name = "LayoutControlItem18" Me.LayoutControlItem18.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem18.Size = New System.Drawing.Size(553, 40) + Me.LayoutControlItem18.Size = New System.Drawing.Size(573, 40) resources.ApplyResources(Me.LayoutControlItem18, "LayoutControlItem18") Me.LayoutControlItem18.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem19 ' Me.LayoutControlItem19.Control = Me.SEQUENCETextBox - Me.LayoutControlItem19.Location = New System.Drawing.Point(276, 120) + Me.LayoutControlItem19.Location = New System.Drawing.Point(286, 120) Me.LayoutControlItem19.Name = "LayoutControlItem19" Me.LayoutControlItem19.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem19.Size = New System.Drawing.Size(277, 40) + Me.LayoutControlItem19.Size = New System.Drawing.Size(287, 40) resources.ApplyResources(Me.LayoutControlItem19, "LayoutControlItem19") Me.LayoutControlItem19.TextSize = New System.Drawing.Size(110, 13) ' @@ -670,7 +705,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem23.Location = New System.Drawing.Point(0, 286) Me.LayoutControlItem23.Name = "LayoutControlItem23" Me.LayoutControlItem23.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem23.Size = New System.Drawing.Size(553, 40) + Me.LayoutControlItem23.Size = New System.Drawing.Size(573, 40) Me.LayoutControlItem23.TextSize = New System.Drawing.Size(110, 13) ' 'LayoutControlItem21 @@ -679,10 +714,29 @@ Partial Class frmColumn_Detail Me.LayoutControlItem21.Location = New System.Drawing.Point(0, 160) Me.LayoutControlItem21.Name = "LayoutControlItem21" Me.LayoutControlItem21.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem21.Size = New System.Drawing.Size(553, 40) + Me.LayoutControlItem21.Size = New System.Drawing.Size(573, 40) resources.ApplyResources(Me.LayoutControlItem21, "LayoutControlItem21") Me.LayoutControlItem21.TextSize = New System.Drawing.Size(110, 13) ' + 'LayoutControlItem24 + ' + Me.LayoutControlItem24.Control = Me.FORMULA_EXPRESSIONTextBox + Me.LayoutControlItem24.Location = New System.Drawing.Point(0, 412) + Me.LayoutControlItem24.Name = "LayoutControlItem24" + Me.LayoutControlItem24.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem24.Size = New System.Drawing.Size(573, 40) + resources.ApplyResources(Me.LayoutControlItem24, "LayoutControlItem24") + Me.LayoutControlItem24.TextSize = New System.Drawing.Size(110, 13) + ' + 'LayoutControlItem15 + ' + Me.LayoutControlItem15.Control = Me.LabelControl1 + Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 452) + Me.LayoutControlItem15.Name = "LayoutControlItem15" + Me.LayoutControlItem15.Size = New System.Drawing.Size(573, 95) + Me.LayoutControlItem15.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem15.TextVisible = False + ' 'frmColumn_Detail ' Me.Appearance.Options.UseFont = True @@ -740,12 +794,15 @@ Partial Class frmColumn_Detail CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem25, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem21, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem24, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout @@ -810,4 +867,9 @@ End Sub Friend WithEvents TYPE_COLUMNComboBox2 As DevExpress.XtraEditors.LookUpEdit Friend WithEvents CheckEditInheritValue As DevExpress.XtraEditors.CheckEdit Friend WithEvents LayoutControlItem22 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents FORMULA_EXPRESSIONTextBox As TextBox + Friend WithEvents LayoutControlItem24 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem25 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl + Friend WithEvents LayoutControlItem15 As DevExpress.XtraLayout.LayoutControlItem End Class diff --git a/app/TaskFlow/frmColumn_Detail.resx b/app/TaskFlow/frmColumn_Detail.resx index 9228e5d..9d3fce5 100644 --- a/app/TaskFlow/frmColumn_Detail.resx +++ b/app/TaskFlow/frmColumn_Detail.resx @@ -149,13 +149,13 @@ RibbonPage1 - 573, 67 + 593, 67 - 0, 735 + 0, 883 - 573, 22 + 593, 22 RibbonStatusBar1 @@ -184,13 +184,72 @@ RibbonPage2 + + Segoe UI, 8.25pt + + + + None + + + 12, 464 + + + 569, 91 + + + + 30 + + + In der Formel nutzen wir die DataColumn.Expression‑Ausdruckssprache von ADO.NET +Kurz: ADO.NET DataColumn Expression Language. +Die Spaltennamen sind hier relevant. +Beispiele: +Multiplikation: [colMENGE] * [colPREIS] +Verkettung: [colVORNAME] + ' - ' [colNACHNAME] +IIF([colSTATUS] = 'X', 'OK', 'NOK') + + + + LabelControl1 + + + DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControl1 + + + 4 + + + 142, 432 + + + 431, 20 + + + 29 + + + FORMULA_EXPRESSIONTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + LayoutControl1 + + + 5 + 142, 306 - 411, 20 + 431, 20 - 26 @@ -204,13 +263,13 @@ LayoutControl1 - 4 + 6 142, 20 - 411, 20 + 431, 20 4 @@ -225,13 +284,13 @@ LayoutControl1 - 5 + 7 142, 60 - 411, 20 + 431, 20 5 @@ -246,13 +305,13 @@ LayoutControl1 - 6 + 8 142, 100 - 411, 20 + 431, 20 6 @@ -267,7 +326,7 @@ LayoutControl1 - 7 + 9 0 @@ -280,7 +339,7 @@ Combo - 134, 20 + 144, 20 7 @@ -295,13 +354,13 @@ LayoutControl1 - 8 + 10 142, 220 - 329, 20 + 346, 20 8 @@ -316,10 +375,10 @@ LayoutControl1 - 9 + 11 - 483, 212 + 500, 212 @@ -329,7 +388,7 @@ 10, 10, 10, 10 - 78, 42 + 81, 42 9 @@ -347,13 +406,13 @@ LayoutControl1 - 10 + 12 142, 266 - 411, 20 + 431, 20 10 @@ -368,13 +427,13 @@ LayoutControl1 - 11 + 13 142, 346 - 329, 20 + 346, 20 11 @@ -389,16 +448,16 @@ LayoutControl1 - 12 + 14 - 483, 338 + 500, 338 10, 10, 10, 10 - 78, 42 + 81, 42 12 @@ -416,13 +475,13 @@ LayoutControl1 - 13 + 15 - 142, 432 + 142, 567 - 134, 20 + 144, 20 13 @@ -437,13 +496,13 @@ LayoutControl1 - 14 + 16 - 418, 432 + 428, 567 - 135, 20 + 145, 20 14 @@ -458,13 +517,13 @@ LayoutControl1 - 15 + 17 - 142, 472 + 142, 607 - 134, 20 + 144, 20 15 @@ -479,13 +538,13 @@ LayoutControl1 - 16 + 18 - 418, 472 + 428, 607 - 135, 20 + 145, 20 16 @@ -500,16 +559,16 @@ LayoutControl1 - 17 + 19 - 24, 561 + 24, 696 Read Only - 525, 18 + 545, 18 17 @@ -524,16 +583,16 @@ LayoutControl1 - 18 + 20 - 24, 583 + 24, 740 Lade Indexdaten - 525, 18 + 545, 18 18 @@ -548,16 +607,16 @@ LayoutControl1 - 19 + 21 - 24, 537 + 24, 672 Muss ausgefüllt werden - 260, 18 + 270, 18 19 @@ -572,16 +631,16 @@ LayoutControl1 - 20 + 22 - 24, 583 + 24, 718 Erweitertes Auswahl Control (für lange Listen) - 525, 18 + 545, 18 20 @@ -596,13 +655,13 @@ LayoutControl1 - 21 + 23 142, 392 - 411, 20 + 431, 20 21 @@ -617,19 +676,19 @@ LayoutControl1 - 22 + 24 0 - 418, 140 + 428, 140 Combo - 135, 20 + 145, 20 22 @@ -644,10 +703,10 @@ LayoutControl1 - 23 + 25 - 410, 537 + 420, 672 Combo @@ -656,7 +715,7 @@ - 139, 20 + 149, 20 23 @@ -671,7 +730,7 @@ LayoutControl1 - 24 + 26 142, 180 @@ -683,7 +742,7 @@ - 411, 20 + 431, 20 27 @@ -698,16 +757,16 @@ LayoutControl1 - 25 + 27 - 24, 605 + 24, 762 Inherit Value (Vererbt den Wert der aktuellen Zelle auf alle nachfolgenden) - 525, 18 + 545, 18 28 @@ -722,7 +781,7 @@ LayoutControl1 - 26 + 28 Fill @@ -784,8 +843,11 @@ Formatierung: + + Formel: + - 573, 668 + 593, 816 33 @@ -812,7 +874,7 @@ 6, 13 - 573, 757 + 593, 905 Segoe UI, 8.25pt @@ -988,6 +1050,12 @@ DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + LayoutControlItem25 + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + LayoutControlItem20 @@ -1024,6 +1092,18 @@ DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + LayoutControlItem24 + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControlItem15 + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmColumn_Detail diff --git a/app/TaskFlow/frmColumn_Detail.vb b/app/TaskFlow/frmColumn_Detail.vb index 9ee2dad..a2773d1 100644 --- a/app/TaskFlow/frmColumn_Detail.vb +++ b/app/TaskFlow/frmColumn_Detail.vb @@ -99,6 +99,7 @@ Public Class frmColumn_Detail TYPE_COLUMNComboBox2.EditValue, LU_CAPTIONTextBox.Text, CheckEditInheritValue.Checked, + FORMULA_EXPRESSIONTextBox.Text, GUIDTextBox.Text ) tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always diff --git a/app/TaskFlow/frmFormDesigner.Designer.vb b/app/TaskFlow/frmFormDesigner.Designer.vb index 0278c72..499609c 100644 --- a/app/TaskFlow/frmFormDesigner.Designer.vb +++ b/app/TaskFlow/frmFormDesigner.Designer.vb @@ -25,6 +25,8 @@ Partial Class frmFormDesigner Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFormDesigner)) Me.SplitContainerDesigner = New System.Windows.Forms.SplitContainer() + Me.TBPM_CONTROL_TABLEBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.DD_DMSLiteDataSet = New taskFLOW.DD_DMSLiteDataSet() Me.pnldesigner = New DigitalData.Controls.SnapPanel.ClassSnapPanel() Me.Panel1 = New System.Windows.Forms.Panel() Me.pgControlsNew = New DevExpress.XtraVerticalGrid.PropertyGridControl() @@ -59,7 +61,6 @@ Partial Class frmFormDesigner Me.RibPGCtrlheight = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.DD_DMSLiteDataSet = New taskFLOW.DD_DMSLiteDataSet() Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) Me.GridControlContextMenu = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -69,7 +70,6 @@ Partial Class frmFormDesigner Me.TBDD_CONNECTIONTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBWH_CHECK_PROFILE_CONTROLSTableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBWH_CHECK_PROFILE_CONTROLSTableAdapter() - Me.TBPM_CONTROL_TABLEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_CONTROL_TABLETableAdapter = New taskFLOW.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RPGControlFunction = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -79,15 +79,15 @@ Partial Class frmFormDesigner Me.SplitContainerDesigner.Panel1.SuspendLayout() Me.SplitContainerDesigner.Panel2.SuspendLayout() Me.SplitContainerDesigner.SuspendLayout() + CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() CType(Me.pgControlsNew, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.GridControlContextMenu.SuspendLayout() CType(Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SplitContainerDesigner @@ -97,12 +97,23 @@ Partial Class frmFormDesigner ' 'SplitContainerDesigner.Panel1 ' + resources.ApplyResources(Me.SplitContainerDesigner.Panel1, "SplitContainerDesigner.Panel1") Me.SplitContainerDesigner.Panel1.Controls.Add(Me.pnldesigner) ' 'SplitContainerDesigner.Panel2 ' Me.SplitContainerDesigner.Panel2.Controls.Add(Me.Panel1) ' + '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 + ' 'pnldesigner ' resources.ApplyResources(Me.pnldesigner, "pnldesigner") @@ -359,11 +370,6 @@ Partial Class frmFormDesigner Me.TBPM_PROFILE_CONTROLSBindingSource.DataMember = "TBPM_PROFILE_CONTROLS" Me.TBPM_PROFILE_CONTROLSBindingSource.DataSource = Me.DD_DMSLiteDataSet ' - 'DD_DMSLiteDataSet - ' - Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet" - Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema - ' 'TBDD_CONNECTIONBindingSource ' Me.TBDD_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION" @@ -414,11 +420,6 @@ Partial Class frmFormDesigner ' Me.TBWH_CHECK_PROFILE_CONTROLSTableAdapter.ClearBeforeFill = True ' - '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 @@ -463,15 +464,15 @@ Partial Class frmFormDesigner Me.SplitContainerDesigner.Panel2.ResumeLayout(False) CType(Me.SplitContainerDesigner, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerDesigner.ResumeLayout(False) + CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel1.ResumeLayout(False) CType(Me.pgControlsNew, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.GridControlContextMenu.ResumeLayout(False) CType(Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/app/TaskFlow/frmFormDesigner.resx b/app/TaskFlow/frmFormDesigner.resx index 60eb7e0..2e07077 100644 --- a/app/TaskFlow/frmFormDesigner.resx +++ b/app/TaskFlow/frmFormDesigner.resx @@ -126,6 +126,9 @@ 0, 132 + + True + True @@ -562,12 +565,15 @@ 1 - - 368, 17 + + 17, 95 206, 17 + + 368, 17 + 17, 56 @@ -607,9 +613,6 @@ 823, 56 - - 17, 95 - 278, 95 @@ -1068,6 +1071,18 @@ Formular Designer + + TBPM_CONTROL_TABLEBindingSource + + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + DD_DMSLiteDataSet + + + taskFLOW.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + bbtnItemFinishSQL @@ -1242,12 +1257,6 @@ System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - DD_DMSLiteDataSet - - - taskFLOW.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - TBDD_CONNECTIONBindingSource @@ -1296,12 +1305,6 @@ taskFLOW.DD_DMSLiteDataSetTableAdapters.TBWH_CHECK_PROFILE_CONTROLSTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - TBPM_CONTROL_TABLEBindingSource - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TBPM_CONTROL_TABLETableAdapter