diff --git a/app/TaskFlow/ClassControlCreator.vb b/app/TaskFlow/ClassControlCreator.vb index a267092..c0d65fc 100644 --- a/app/TaskFlow/ClassControlCreator.vb +++ b/app/TaskFlow/ClassControlCreator.vb @@ -47,11 +47,21 @@ Public Class ClassControlCreator Public Const AGGREGATE_NONE = "NONE" Public Const AGGREGATE_TOTAL_INTEGER = "TOTAL_INTEGER" Public Const AGGREGATE_TOTAL_FLOAT = "TOTAL_FLOAT" + Public Const AGGREGATE_TOTAL_CURRENCY = "TOTAL_CURRENCY" Public Const AGGREGATE_TOTAL_MIN = "TOTAL_MIN" Public Const AGGREGATE_TOTAL_MAX = "TOTAL_MAX" Public Const AGGREGATE_TOTAL_AVG = "TOTAL_AVG" Public Const AGGREGATE_TOTAL_COUNT = "TOTAL_COUNT" + Public Const CONTROL_TYPE_TEXT = "TEXT" + Public Const CONTROL_TYPE_INTEGER = "INTEGER" + Public Const CONTROL_TYPE_BOOLEAN = "BOOLEAN" + Public Const CONTROL_TYPE_DOUBLE = "DOUBLE" + Public Const CONTROL_TYPE_CURRENCY = "CURRENCY" + Public Const CONTROL_TYPE_DATE = "DATE" + Public Const CONTROL_TYPE_DATETIME = "DATETIME" + + Public Shared Property Logger As Logger ''' @@ -509,18 +519,20 @@ Public Class ClassControlCreator .ReadOnly = False } Select Case oRow.Item("TYPE_COLUMN") - Case "TEXT" + Case CONTROL_TYPE_TEXT oColumn.DataType = GetType(String) - Case "INTEGER" + Case CONTROL_TYPE_INTEGER oColumn.DataType = GetType(Integer) - Case "BOOLEAN" + Case CONTROL_TYPE_DOUBLE + oColumn.DataType = GetType(Double) + Case CONTROL_TYPE_CURRENCY + oColumn.DataType = GetType(Double) + Case CONTROL_TYPE_BOOLEAN oColumn.DataType = GetType(Boolean) Case Else oColumn.DataType = GetType(String) End Select - - oDatatable.Columns.Add(oColumn) ' Fetch and cache Combobox results @@ -599,17 +611,38 @@ Public Class ClassControlCreator Dim oSequence As Integer = oColumnData.Item("SEQUENCE") oCol.VisibleIndex = oSequence + Dim oColumnType As String = oColumnData.Item("TYPE_COLUMN") + + Select Case oColumnType + Case "INTEGER" + oCol.DisplayFormat.FormatType = FormatType.Custom + oCol.DisplayFormat.FormatString = "N0" + + Case "DOUBLE" + oCol.DisplayFormat.FormatType = FormatType.Custom + oCol.DisplayFormat.FormatString = "N2" + + Case "CURRENCY" + oCol.DisplayFormat.FormatType = FormatType.Custom + oCol.DisplayFormat.FormatString = "C2" + End Select + Dim oSummaryFunction As String = oColumnData.Item("SUMMARY_FUNCTION") Select Case oSummaryFunction Case AGGREGATE_TOTAL_INTEGER oCol.SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Sum - oCol.SummaryItem.DisplayFormat = "SUM: {0:0}" + oCol.SummaryItem.DisplayFormat = "SUM: {0:N0}" oShouldDisplayFooter = True Case AGGREGATE_TOTAL_FLOAT oCol.SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Sum - oCol.SummaryItem.DisplayFormat = "SUM: {0:n2}" + oCol.SummaryItem.DisplayFormat = "SUM: {0:N2}" + oShouldDisplayFooter = True + + Case AGGREGATE_TOTAL_CURRENCY + oCol.SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Sum + oCol.SummaryItem.DisplayFormat = "SUM: {0:C2}" oShouldDisplayFooter = True Case AGGREGATE_TOTAL_AVG diff --git a/app/TaskFlow/ClassFormat.vb b/app/TaskFlow/ClassFormat.vb new file mode 100644 index 0000000..30bdc5d --- /dev/null +++ b/app/TaskFlow/ClassFormat.vb @@ -0,0 +1,118 @@ +Imports System.Globalization +Imports DevExpress.CodeParser +Imports DevExpress.Data.Controls +Imports DevExpress.XtraPrinting + +Public Class ClassFormat + Public Const CURRENCY_FORMAT = "C2" + Public Const DECIMAL_FORMAT = "F" + Public Const DATE_FORMAT = "d" + Public Const DATETIME_FORMAT = "G" + + Public Shared Function GetFormattedValue(pControlName As String, pValueObject As Object, pFormatString As String) As String + Try + If pFormatString <> String.Empty Then + ' https://learn.microsoft.com/en-us/dotnet/api/system.datetime.tostring?view=net-7.0#system-datetime-tostring(system-string) + + Select Case pFormatString + Case ClassControlCreator.CONTROL_TYPE_CURRENCY ' 16,325.63 € + If TypeOf pValueObject Is Double Then + Dim oFormattedValue As Double = pValueObject + Return oFormattedValue.ToString(CURRENCY_FORMAT) + + ElseIf TypeOf pValueObject Is String Then + Dim oFormattedValue As Double + Double.TryParse(pValueObject, oFormattedValue) + Return oFormattedValue.ToString(CURRENCY_FORMAT) + + Else + Return Nothing + + End If + + Case ClassControlCreator.CONTROL_TYPE_DOUBLE ' 16325,63 + If TypeOf pValueObject Is Double Then + Dim oFormattedValue As Double = pValueObject + Return oFormattedValue.ToString(DECIMAL_FORMAT) + + ElseIf TypeOf pValueObject Is String Then + Dim oFormattedValue As Double + Double.TryParse(pValueObject, oFormattedValue) + Return oFormattedValue.ToString(DECIMAL_FORMAT) + + Else + Return Nothing + End If + + Case ClassControlCreator.CONTROL_TYPE_DATE ' 15.06.2008 + Dim oFormattedValue As DateTime + + If TypeOf pValueObject Is DateTime Then + oFormattedValue = pValueObject + Return oFormattedValue.ToString(DATE_FORMAT) + + ElseIf TypeOf pValueObject Is String Then + DateTime.TryParse(pValueObject, oFormattedValue) + Return oFormattedValue.ToString(DATE_FORMAT) + + Else + Return Nothing + End If + + Case ClassControlCreator.CONTROL_TYPE_DATETIME ' 15.06.2008 9:15:07 + Dim oFormattedValue As DateTime + + If TypeOf pValueObject Is DateTime Then + oFormattedValue = pValueObject + Return oFormattedValue.ToString(DATETIME_FORMAT) + ElseIf TypeOf pValueObject Is String Then + DateTime.TryParse(pValueObject, oFormattedValue) + Return oFormattedValue.ToString(DATETIME_FORMAT) + Else + Return Nothing + End If + + Case Else ' Unknown Format String + LOGGER.Warn("Format String [{0}] for Control [{1}] is not valid!", pFormatString, pControlName) + Return Nothing + + End Select + Else + Return Nothing + End If + Catch ex As Exception + LOGGER.Warn($"Unexpected error while formatting Value for Control [{0}]", pControlName) + LOGGER.Error(ex) + Return Nothing + End Try + End Function + + ''' + ''' Converts a string according to the type information, using the invariant culture + ''' + ''' + ''' + ''' + Public Shared Function GetConvertedValue(pValue As Object, pType As String) As Object + Dim oConvertedValue = pValue + + Select Case pType + Case ClassControlCreator.CONTROL_TYPE_DOUBLE + If Double.TryParse(pValue, NumberStyles.Float, CultureInfo.InvariantCulture, oConvertedValue) Then + Return oConvertedValue + End If + + Case ClassControlCreator.CONTROL_TYPE_CURRENCY + If Double.TryParse(pValue, NumberStyles.Currency, CultureInfo.InvariantCulture, oConvertedValue) Then + Return oConvertedValue + End If + + Case ClassControlCreator.CONTROL_TYPE_INTEGER + If Integer.TryParse(pValue, NumberStyles.Integer, CultureInfo.InvariantCulture, oConvertedValue) Then + Return oConvertedValue + End If + End Select + + Return oConvertedValue + End Function +End Class diff --git a/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb b/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb index 373dcdb..1325b5a 100644 --- a/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb +++ b/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb @@ -4583,6 +4583,10 @@ Partial Public Class DD_DMSLiteDataSet Private columnSAVE_CHANGE_ON_ENABLED As Global.System.Data.DataColumn + Private columnFORMAT_STRING As Global.System.Data.DataColumn + + Private columnBACKCOLOR_IF As Global.System.Data.DataColumn + _ Public Sub New() @@ -4946,6 +4950,22 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property FORMAT_STRINGColumn() As Global.System.Data.DataColumn + Get + Return Me.columnFORMAT_STRING + End Get + End Property + + _ + Public ReadOnly Property BACKCOLOR_IFColumn() As Global.System.Data.DataColumn + Get + Return Me.columnBACKCOLOR_IF + End Get + End Property + _ @@ -5023,9 +5043,11 @@ Partial Public Class DD_DMSLiteDataSet ByVal SQL_ENABLE_ON_LOAD_CONID As Byte, _ ByVal CONTROL_ACTIVE As Boolean, _ ByVal TABLE_ORDER_COLUMN As String, _ - ByVal SAVE_CHANGE_ON_ENABLED As Boolean) As TBPM_PROFILE_CONTROLSRow + ByVal SAVE_CHANGE_ON_ENABLED As Boolean, _ + ByVal FORMAT_STRING As String, _ + ByVal BACKCOLOR_IF As String) As TBPM_PROFILE_CONTROLSRow Dim rowTBPM_PROFILE_CONTROLSRow As TBPM_PROFILE_CONTROLSRow = CType(Me.NewRow,TBPM_PROFILE_CONTROLSRow) - Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED} + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING, BACKCOLOR_IF} If (Not (parentTBPM_PROFILERowByFK_TBPM_PROFILE_CONTROLS_PROFILE) Is Nothing) Then columnValuesArray(1) = parentTBPM_PROFILERowByFK_TBPM_PROFILE_CONTROLS_PROFILE(0) End If @@ -5098,6 +5120,8 @@ Partial Public Class DD_DMSLiteDataSet Me.columnCONTROL_ACTIVE = MyBase.Columns("CONTROL_ACTIVE") Me.columnTABLE_ORDER_COLUMN = MyBase.Columns("TABLE_ORDER_COLUMN") Me.columnSAVE_CHANGE_ON_ENABLED = MyBase.Columns("SAVE_CHANGE_ON_ENABLED") + Me.columnFORMAT_STRING = MyBase.Columns("FORMAT_STRING") + Me.columnBACKCOLOR_IF = MyBase.Columns("BACKCOLOR_IF") End Sub _ + Public Property FORMAT_STRING() As String + Get + Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.FORMAT_STRINGColumn),String) + End Get + Set + Me(Me.tableTBPM_PROFILE_CONTROLS.FORMAT_STRINGColumn) = value + End Set + End Property + + _ + Public Property BACKCOLOR_IF() As String + Get + Try + Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.BACKCOLOR_IFColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte BACKCOLOR_IF in Tabelle TBPM_PROFILE_CONTROLS ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBPM_PROFILE_CONTROLS.BACKCOLOR_IFColumn) = value + End Set + End Property + _ Public Property TBPM_PROFILERow() As TBPM_PROFILERow @@ -12752,6 +12807,18 @@ Partial Public Class DD_DMSLiteDataSet Me(Me.tableTBPM_PROFILE_CONTROLS.SQL_ENABLE_ON_LOAD_CONIDColumn) = Global.System.Convert.DBNull End Sub + _ + Public Function IsBACKCOLOR_IFNull() As Boolean + Return Me.IsNull(Me.tableTBPM_PROFILE_CONTROLS.BACKCOLOR_IFColumn) + End Function + + _ + Public Sub SetBACKCOLOR_IFNull() + Me(Me.tableTBPM_PROFILE_CONTROLS.BACKCOLOR_IFColumn) = Global.System.Convert.DBNull + End Sub + _ Public Function GetTBPM_CONTROL_TABLERows() As TBPM_CONTROL_TABLERow() @@ -20216,6 +20283,7 @@ Namespace DD_DMSLiteDataSetTableAdapters tableMapping.ColumnMappings.Add("CONTROL_ACTIVE", "CONTROL_ACTIVE") tableMapping.ColumnMappings.Add("TABLE_ORDER_COLUMN", "TABLE_ORDER_COLUMN") tableMapping.ColumnMappings.Add("SAVE_CHANGE_ON_ENABLED", "SAVE_CHANGE_ON_ENABLED") + tableMapping.ColumnMappings.Add("FORMAT_STRING", "FORMAT_STRING") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -20229,18 +20297,20 @@ Namespace DD_DMSLiteDataSetTableAdapters "N, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FON"& _ "T_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VK"& _ "T_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" REGEX_MESSAGE"& _ - "_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SAVE_CHANGE_ON_ENABLED)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,"& _ - "@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@INDEX_NAME,@TYP,@VALIDATION,@CHOICE_LIST"& _ - ",@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH,@FONT_STYLE,@FONT_SIZE,@FONT_F"& _ - "AMILY,@FONT_COLOR,@READ_ONLY,@LOAD_IDX_VALUE,@DEFAULT_VALUE,@MULTISELECT,@VKT_AD"& _ - "D_ITEM,@VKT_PREVENT_MULTIPLE_VALUES,@REGEX_MATCH,@REGEX_MESSAGE_DE,@REGEX_MESSAG"& _ - "E_EN,@IMAGE_CONTROL,@SQL2,@SQL_ENABLE,@SAVE_CHANGE_ON_ENABLED); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID,"& _ - " PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHA"& _ - "NGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID,"& _ - " SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLO"& _ - "R, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREV"& _ - "ENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_P"& _ - "ROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY()) ORDER BY Y_LOC, X_LOC" + "_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SAVE_CHANGE_ON_ENABLED, "& _ + "FORMAT_STRING)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_"& _ + "LOC,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@INDEX_NAME,@TYP,@VALIDATI"& _ + "ON,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH,@FONT_STYLE,@FO"& _ + "NT_SIZE,@FONT_FAMILY,@FONT_COLOR,@READ_ONLY,@LOAD_IDX_VALUE,@DEFAULT_VALUE,@MULT"& _ + "ISELECT,@VKT_ADD_ITEM,@VKT_PREVENT_MULTIPLE_VALUES,@REGEX_MATCH,@REGEX_MESSAGE_D"& _ + "E,@REGEX_MESSAGE_EN,@IMAGE_CONTROL,@SQL2,@SQL_ENABLE,@SAVE_CHANGE_ON_ENABLED,@FO"& _ + "RMAT_STRING); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y"& _ + "_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDAT"& _ + "ION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, F"& _ + "ONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MUL"& _ + "TISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_"& _ + "DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY()) "& _ + "ORDER BY Y_LOC, X_LOC" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -20277,6 +20347,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL2", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL2", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ENABLE", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ENABLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SAVE_CHANGE_ON_ENABLED", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SAVE_CHANGE_ON_ENABLED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FORMAT_STRING", Global.System.Data.SqlDbType.VarChar, 200, Global.System.Data.ParameterDirection.Input, 0, 0, "FORMAT_STRING", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection Me._adapter.UpdateCommand.CommandText = "UPDATE TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET PROFIL_ID = @PROFIL_ID, NA"& _ @@ -20292,13 +20363,14 @@ Namespace DD_DMSLiteDataSetTableAdapters "CH = @REGEX_MATCH, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" REGEX_MESSAGE_DE = @REGEX_MESSAGE_"& _ "DE, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, IMAGE_CONTROL = @IMAGE_CONTROL, SQL2 ="& _ " @SQL2, SQL_ENABLE = @SQL_ENABLE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SAVE_CHANGE_ON_ENAB"& _ - "LED = @SAVE_CHANGE_ON_ENABLED"&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, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN"& _ - ", CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTIO"& _ - "N_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT"& _ - "_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT"& _ - "_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM T"& _ - "BPM_PROFILE_CONTROLS WHERE (GUID = @GUID) ORDER BY Y_LOC, X_LOC" + "LED = @SAVE_CHANGE_ON_ENABLED, FORMAT_STRING = @FORMAT_STRING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUI"& _ + "D = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_"& _ + "LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, V"& _ + "ALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_ST"& _ + "YLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALU"& _ + "E, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_ME"& _ + "SSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @GUID) ORDER"& _ + " BY Y_LOC, X_LOC" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -20332,6 +20404,7 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL2", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL2", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ENABLE", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ENABLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SAVE_CHANGE_ON_ENABLED", Global.System.Data.SqlDbType.Bit, 1, 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("@FORMAT_STRING", Global.System.Data.SqlDbType.VarChar, 200, Global.System.Data.ParameterDirection.Input, 0, 0, "FORMAT_STRING", 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 @@ -20357,8 +20430,8 @@ Namespace DD_DMSLiteDataSetTableAdapters " REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL"& _ "2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, C"& _ "ONTROL_ACTIVE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENA"& _ - "BLED"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @guid)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER "& _ - "BY Y_LOC, X_LOC" + "BLED, FORMAT_STRING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID ="& _ + " @guid)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).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(1) = New Global.System.Data.SqlClient.SqlCommand() @@ -20438,8 +20511,8 @@ Namespace DD_DMSLiteDataSetTableAdapters "P, VALIDATION, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, WIDTH, X_LOC, Y_LOC, I"& _ "MAGE_CONTROL, SQL2, SQL_ENABLE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SET_CONTROL_DATA, SQL"& _ "_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, S"& _ - "AVE_CHANGE_ON_ENABLED"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_PROFILE_CONTROLS AS T"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE "& _ - "(PROFIL_ID = @profil_id)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC" + "AVE_CHANGE_ON_ENABLED, FORMAT_STRING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_PROFILE_CONTROLS AS T"& _ + ""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (PROFIL_ID = @profil_id)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC" Me._commandCollection(10).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(10).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USER_LANGUAGE", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(10).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@profil_id", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -20595,7 +20668,8 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal IMAGE_CONTROL() As Byte, _ ByVal SQL2 As String, _ ByVal SQL_ENABLE As String, _ - ByVal SAVE_CHANGE_ON_ENABLED As Boolean) As Integer + ByVal SAVE_CHANGE_ON_ENABLED As Boolean, _ + ByVal FORMAT_STRING As String) As Integer Me.Adapter.InsertCommand.Parameters(0).Value = CType(PROFIL_ID,Integer) If (NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("NAME") @@ -20719,6 +20793,11 @@ Namespace DD_DMSLiteDataSetTableAdapters Me.Adapter.InsertCommand.Parameters(33).Value = CType(SQL_ENABLE,String) 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") + Else + Me.Adapter.InsertCommand.Parameters(35).Value = CType(FORMAT_STRING,String) + End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -20771,6 +20850,7 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal SQL2 As String, _ ByVal SQL_ENABLE As String, _ ByVal SAVE_CHANGE_ON_ENABLED As Boolean, _ + ByVal FORMAT_STRING As String, _ ByVal Original_GUID As Integer, _ ByVal GUID As Integer) As Integer Me.Adapter.UpdateCommand.Parameters(0).Value = CType(PROFIL_ID,Integer) @@ -20885,8 +20965,13 @@ Namespace DD_DMSLiteDataSetTableAdapters Me.Adapter.UpdateCommand.Parameters(30).Value = CType(SQL_ENABLE,String) End If Me.Adapter.UpdateCommand.Parameters(31).Value = CType(SAVE_CHANGE_ON_ENABLED,Boolean) - Me.Adapter.UpdateCommand.Parameters(32).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(33).Value = CType(GUID,Integer) + If (FORMAT_STRING Is Nothing) Then + Throw New Global.System.ArgumentNullException("FORMAT_STRING") + Else + Me.Adapter.UpdateCommand.Parameters(32).Value = CType(FORMAT_STRING,String) + End If + Me.Adapter.UpdateCommand.Parameters(33).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(34).Value = CType(GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/app/TaskFlow/DD_DMSLiteDataSet.xsc b/app/TaskFlow/DD_DMSLiteDataSet.xsc index ebcefb0..70f99aa 100644 --- a/app/TaskFlow/DD_DMSLiteDataSet.xsc +++ b/app/TaskFlow/DD_DMSLiteDataSet.xsc @@ -123,11 +123,9 @@ - - + - - + diff --git a/app/TaskFlow/DD_DMSLiteDataSet.xsd b/app/TaskFlow/DD_DMSLiteDataSet.xsd index b601b8b..038a832 100644 --- a/app/TaskFlow/DD_DMSLiteDataSet.xsd +++ b/app/TaskFlow/DD_DMSLiteDataSet.xsd @@ -972,8 +972,8 @@ WHERE (GUID = @Original_GUID) INSERT INTO TBPM_PROFILE_CONTROLS (PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, - REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SAVE_CHANGE_ON_ENABLED) -VALUES (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@INDEX_NAME,@TYP,@VALIDATION,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH,@FONT_STYLE,@FONT_SIZE,@FONT_FAMILY,@FONT_COLOR,@READ_ONLY,@LOAD_IDX_VALUE,@DEFAULT_VALUE,@MULTISELECT,@VKT_ADD_ITEM,@VKT_PREVENT_MULTIPLE_VALUES,@REGEX_MATCH,@REGEX_MESSAGE_DE,@REGEX_MESSAGE_EN,@IMAGE_CONTROL,@SQL2,@SQL_ENABLE,@SAVE_CHANGE_ON_ENABLED); + REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING) +VALUES (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@INDEX_NAME,@TYP,@VALIDATION,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH,@FONT_STYLE,@FONT_SIZE,@FONT_FAMILY,@FONT_COLOR,@READ_ONLY,@LOAD_IDX_VALUE,@DEFAULT_VALUE,@MULTISELECT,@VKT_ADD_ITEM,@VKT_PREVENT_MULTIPLE_VALUES,@REGEX_MATCH,@REGEX_MESSAGE_DE,@REGEX_MESSAGE_EN,@IMAGE_CONTROL,@SQL2,@SQL_ENABLE,@SAVE_CHANGE_ON_ENABLED,@FORMAT_STRING); SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY()) ORDER BY Y_LOC, X_LOC @@ -1011,6 +1011,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD + @@ -1019,7 +1020,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, - TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED + TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @guid) ORDER BY Y_LOC, X_LOC @@ -1036,8 +1037,8 @@ SET PROFIL_ID = @PROFIL_ID, NAME = @NAME, CTRL_TYPE = @CTRL_TYPE, FONT_STYLE = @FONT_STYLE, FONT_SIZE = @FONT_SIZE, FONT_FAMILY = @FONT_FAMILY, FONT_COLOR = @FONT_COLOR, READ_ONLY = @READ_ONLY, LOAD_IDX_VALUE = @LOAD_IDX_VALUE, DEFAULT_VALUE = @DEFAULT_VALUE, MULTISELECT = @MULTISELECT, VKT_ADD_ITEM = @VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES = @VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH = @REGEX_MATCH, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, IMAGE_CONTROL = @IMAGE_CONTROL, SQL2 = @SQL2, SQL_ENABLE = @SQL_ENABLE, - SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED -WHERE (GUID = @Original_GUID); + SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED, FORMAT_STRING = @FORMAT_STRING +WHERE (GUID = @Original_GUID); SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @GUID) ORDER BY Y_LOC, X_LOC @@ -1072,6 +1073,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD + @@ -1121,6 +1123,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD + @@ -1248,7 +1251,7 @@ WHERE (GUID = @Original_GUID); SELECT dbo.FNPM_LANGUAGE_CONTROL_TEXT(NAME, @USER_LANGUAGE, CTRL_TYPE, CTRL_TEXT) AS CTRL_CAPTION_LANG, ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, CHOICE_LIST, CONNECTION_ID, CTRL_TEXT, CTRL_TYPE, DEFAULT_VALUE, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, GUID, HEIGHT, INDEX_NAME, LOAD_IDX_VALUE, MULTISELECT, NAME, PROFIL_ID, READ_ONLY, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SQL_UEBERPRUEFUNG, TYP, VALIDATION, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, WIDTH, X_LOC, Y_LOC, IMAGE_CONTROL, SQL2, SQL_ENABLE, - SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED + SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING FROM TBPM_PROFILE_CONTROLS AS T WHERE (PROFIL_ID = @profil_id) ORDER BY Y_LOC, X_LOC @@ -2664,6 +2667,8 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME + + @@ -3268,8 +3273,8 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME - - + + @@ -3352,9 +3357,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 0845de1..e96e9cb 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. --> - + diff --git a/app/TaskFlow/ModuleControlProperties.vb b/app/TaskFlow/ModuleControlProperties.vb index 1319360..d77a177 100644 --- a/app/TaskFlow/ModuleControlProperties.vb +++ b/app/TaskFlow/ModuleControlProperties.vb @@ -210,6 +210,39 @@ Public Module ModuleControlProperties Public Property RegexMessage As String + + + + + Public Property DisplayFormat As String + + Public Class DisplayFormatConverter + Inherits TypeConverter + + Public Overrides Function GetStandardValuesSupported(context As ITypeDescriptorContext) As Boolean + Return True + End Function + + Public Overrides Function GetStandardValues(context As ITypeDescriptorContext) As StandardValuesCollection + Dim displayFormatList = New List(Of String) From { + ClassControlCreator.CONTROL_TYPE_TEXT, + ClassControlCreator.CONTROL_TYPE_BOOLEAN, + ClassControlCreator.CONTROL_TYPE_INTEGER, + ClassControlCreator.CONTROL_TYPE_DOUBLE, + ClassControlCreator.CONTROL_TYPE_CURRENCY + } + Dim values As New StandardValuesCollection(displayFormatList) + Return values + End Function + + Public Overrides Function ConvertTo(context As ITypeDescriptorContext, culture As CultureInfo, value As Object, destinationType As Type) As Object + If IsNothing(value) Then + Return "" + Else + Return value.ToString() + End If + End Function + End Class End Class Public Class LabelProperties diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index 0a2e427..ea1e4c0 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -271,6 +271,7 @@ + diff --git a/app/TaskFlow/frmColumn_Detail.Designer.vb b/app/TaskFlow/frmColumn_Detail.Designer.vb index f660b46..abbd984 100644 --- a/app/TaskFlow/frmColumn_Detail.Designer.vb +++ b/app/TaskFlow/frmColumn_Detail.Designer.vb @@ -83,6 +83,8 @@ Partial Class frmColumn_Detail Me.LayoutControlItem19 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem22 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem23 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem21 = New DevExpress.XtraLayout.LayoutControlItem() + Me.TYPE_COLUMNComboBox2 = New DevExpress.XtraEditors.LookUpEdit() CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -130,6 +132,8 @@ Partial Class frmColumn_Detail CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem21, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TYPE_COLUMNComboBox2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'TBPM_CONTROL_TABLEBindingSource @@ -248,6 +252,7 @@ Partial Class frmColumn_Detail Me.LayoutControl1.Controls.Add(Me.DEFAULTVALUETextBox) Me.LayoutControl1.Controls.Add(Me.SEQUENCETextBox) Me.LayoutControl1.Controls.Add(Me.SUMMARY_FUNCTIONCombobox) + Me.LayoutControl1.Controls.Add(Me.TYPE_COLUMNComboBox2) resources.ApplyResources(Me.LayoutControl1, "LayoutControl1") Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root @@ -262,7 +267,7 @@ Partial Class frmColumn_Detail ' Me.TYPE_COLUMNComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "TYPE_COLUMN", True)) Me.TYPE_COLUMNComboBox.FormattingEnabled = True - Me.TYPE_COLUMNComboBox.Items.AddRange(New Object() {resources.GetString("TYPE_COLUMNComboBox.Items"), resources.GetString("TYPE_COLUMNComboBox.Items1"), resources.GetString("TYPE_COLUMNComboBox.Items2")}) + Me.TYPE_COLUMNComboBox.Items.AddRange(New Object() {resources.GetString("TYPE_COLUMNComboBox.Items"), resources.GetString("TYPE_COLUMNComboBox.Items1"), resources.GetString("TYPE_COLUMNComboBox.Items2"), resources.GetString("TYPE_COLUMNComboBox.Items3"), resources.GetString("TYPE_COLUMNComboBox.Items4")}) resources.ApplyResources(Me.TYPE_COLUMNComboBox, "TYPE_COLUMNComboBox") Me.TYPE_COLUMNComboBox.Name = "TYPE_COLUMNComboBox" ' @@ -440,9 +445,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.LayoutControlItem22, Me.LayoutControlItem23}) + 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.LayoutControlItem22, Me.LayoutControlItem23, Me.LayoutControlItem21}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(573, 669) + Me.Root.Size = New System.Drawing.Size(556, 688) Me.Root.TextVisible = False ' 'LayoutControlItem1 @@ -451,7 +456,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(536, 40) resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1") Me.LayoutControlItem1.TextSize = New System.Drawing.Size(112, 13) ' @@ -461,7 +466,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(536, 40) resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2") Me.LayoutControlItem2.TextSize = New System.Drawing.Size(112, 13) ' @@ -471,7 +476,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(536, 40) resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3") Me.LayoutControlItem3.TextSize = New System.Drawing.Size(112, 13) ' @@ -481,104 +486,104 @@ 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(268, 40) resources.ApplyResources(Me.LayoutControlItem4, "LayoutControlItem4") Me.LayoutControlItem4.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem5 ' Me.LayoutControlItem5.Control = Me.REGEX_MATCHTextBox - Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 201) + Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 241) Me.LayoutControlItem5.Name = "LayoutControlItem5" Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem5.Size = New System.Drawing.Size(472, 46) + Me.LayoutControlItem5.Size = New System.Drawing.Size(457, 46) resources.ApplyResources(Me.LayoutControlItem5, "LayoutControlItem5") Me.LayoutControlItem5.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.SimpleButton1 - Me.LayoutControlItem6.Location = New System.Drawing.Point(472, 201) + Me.LayoutControlItem6.Location = New System.Drawing.Point(457, 241) Me.LayoutControlItem6.Name = "LayoutControlItem6" - Me.LayoutControlItem6.Size = New System.Drawing.Size(81, 46) + Me.LayoutControlItem6.Size = New System.Drawing.Size(79, 46) Me.LayoutControlItem6.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem6.TextVisible = False ' 'LayoutControlItem8 ' Me.LayoutControlItem8.Control = Me.SQL_COMMANDTextBox - Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 327) + Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 367) Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem8.Size = New System.Drawing.Size(472, 46) + Me.LayoutControlItem8.Size = New System.Drawing.Size(457, 46) resources.ApplyResources(Me.LayoutControlItem8, "LayoutControlItem8") Me.LayoutControlItem8.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem7 ' Me.LayoutControlItem7.Control = Me.REGEX_MESSAGE_DETextBox - Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 247) + Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 287) 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(536, 40) resources.ApplyResources(Me.LayoutControlItem7, "LayoutControlItem7") Me.LayoutControlItem7.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem9 ' Me.LayoutControlItem9.Control = Me.SimpleButton2 - Me.LayoutControlItem9.Location = New System.Drawing.Point(472, 327) + Me.LayoutControlItem9.Location = New System.Drawing.Point(457, 367) Me.LayoutControlItem9.Name = "LayoutControlItem9" - Me.LayoutControlItem9.Size = New System.Drawing.Size(81, 46) + Me.LayoutControlItem9.Size = New System.Drawing.Size(79, 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, 413) + Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 453) 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(268, 40) resources.ApplyResources(Me.LayoutControlItem10, "LayoutControlItem10") Me.LayoutControlItem10.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem12 ' Me.LayoutControlItem12.Control = Me.CHANGED_WHOTextBox - Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 453) + Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 493) 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(268, 40) resources.ApplyResources(Me.LayoutControlItem12, "LayoutControlItem12") Me.LayoutControlItem12.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem11 ' Me.LayoutControlItem11.Control = Me.TextEdit8 - Me.LayoutControlItem11.Location = New System.Drawing.Point(276, 413) + Me.LayoutControlItem11.Location = New System.Drawing.Point(268, 453) 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(268, 40) resources.ApplyResources(Me.LayoutControlItem11, "LayoutControlItem11") Me.LayoutControlItem11.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem13 ' Me.LayoutControlItem13.Control = Me.TextEdit10 - Me.LayoutControlItem13.Location = New System.Drawing.Point(276, 453) + Me.LayoutControlItem13.Location = New System.Drawing.Point(268, 493) 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(268, 40) resources.ApplyResources(Me.LayoutControlItem13, "LayoutControlItem13") Me.LayoutControlItem13.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlGroup1 ' Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem16, Me.LayoutControlItem14, Me.LayoutControlItem15, Me.LayoutControlItem17, Me.LayoutControlItem20}) - Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 493) + Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 533) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(553, 156) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(536, 135) resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1") ' 'LayoutControlItem16 @@ -586,7 +591,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(256, 24) Me.LayoutControlItem16.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem16.TextVisible = False ' @@ -595,54 +600,54 @@ 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, 23) + Me.LayoutControlItem14.Size = New System.Drawing.Size(512, 22) Me.LayoutControlItem14.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem14.TextVisible = False ' 'LayoutControlItem15 ' Me.LayoutControlItem15.Control = Me.LOAD_IDX_VALUECheckBox - Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 47) + Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 46) Me.LayoutControlItem15.Name = "LayoutControlItem15" - Me.LayoutControlItem15.Size = New System.Drawing.Size(529, 23) + Me.LayoutControlItem15.Size = New System.Drawing.Size(512, 22) Me.LayoutControlItem15.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem15.TextVisible = False ' 'LayoutControlItem17 ' Me.LayoutControlItem17.Control = Me.ADVANCED_LOOKUPCheckbox - Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 70) + Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 68) Me.LayoutControlItem17.Name = "LayoutControlItem17" - Me.LayoutControlItem17.Size = New System.Drawing.Size(529, 43) + Me.LayoutControlItem17.Size = New System.Drawing.Size(512, 22) Me.LayoutControlItem17.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem17.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(256, 0) Me.LayoutControlItem20.Name = "LayoutControlItem20" - Me.LayoutControlItem20.Size = New System.Drawing.Size(265, 24) + Me.LayoutControlItem20.Size = New System.Drawing.Size(256, 24) resources.ApplyResources(Me.LayoutControlItem20, "LayoutControlItem20") Me.LayoutControlItem20.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem18 ' Me.LayoutControlItem18.Control = Me.DEFAULTVALUETextBox - Me.LayoutControlItem18.Location = New System.Drawing.Point(0, 373) + Me.LayoutControlItem18.Location = New System.Drawing.Point(0, 413) 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(536, 40) resources.ApplyResources(Me.LayoutControlItem18, "LayoutControlItem18") Me.LayoutControlItem18.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem19 ' Me.LayoutControlItem19.Control = Me.SEQUENCETextBox - Me.LayoutControlItem19.Location = New System.Drawing.Point(276, 120) + Me.LayoutControlItem19.Location = New System.Drawing.Point(268, 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(268, 40) resources.ApplyResources(Me.LayoutControlItem19, "LayoutControlItem19") Me.LayoutControlItem19.TextSize = New System.Drawing.Size(112, 13) ' @@ -653,19 +658,40 @@ Partial Class frmColumn_Detail Me.LayoutControlItem22.Location = New System.Drawing.Point(0, 160) Me.LayoutControlItem22.Name = "LayoutControlItem22" Me.LayoutControlItem22.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem22.Size = New System.Drawing.Size(553, 41) + Me.LayoutControlItem22.Size = New System.Drawing.Size(536, 41) Me.LayoutControlItem22.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem23 ' Me.LayoutControlItem23.Control = Me.LU_CAPTIONTextBox resources.ApplyResources(Me.LayoutControlItem23, "LayoutControlItem23") - Me.LayoutControlItem23.Location = New System.Drawing.Point(0, 287) + Me.LayoutControlItem23.Location = New System.Drawing.Point(0, 327) 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(536, 40) Me.LayoutControlItem23.TextSize = New System.Drawing.Size(112, 13) ' + 'LayoutControlItem21 + ' + Me.LayoutControlItem21.Control = Me.TYPE_COLUMNComboBox2 + Me.LayoutControlItem21.Location = New System.Drawing.Point(0, 201) + Me.LayoutControlItem21.Name = "LayoutControlItem21" + Me.LayoutControlItem21.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem21.Size = New System.Drawing.Size(536, 40) + resources.ApplyResources(Me.LayoutControlItem21, "LayoutControlItem21") + Me.LayoutControlItem21.TextSize = New System.Drawing.Size(112, 13) + ' + 'TYPE_COLUMNComboBox2 + ' + Me.TYPE_COLUMNComboBox2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "TYPE_COLUMN", True)) + resources.ApplyResources(Me.TYPE_COLUMNComboBox2, "TYPE_COLUMNComboBox2") + Me.TYPE_COLUMNComboBox2.MenuManager = Me.RibbonControl1 + Me.TYPE_COLUMNComboBox2.Name = "TYPE_COLUMNComboBox2" + Me.TYPE_COLUMNComboBox2.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("TYPE_COLUMNComboBox2.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.TYPE_COLUMNComboBox2.Properties.NullText = resources.GetString("TYPE_COLUMNComboBox2.Properties.NullText") + Me.TYPE_COLUMNComboBox2.Properties.PopupSizeable = False + Me.TYPE_COLUMNComboBox2.StyleController = Me.LayoutControl1 + ' 'frmColumn_Detail ' Me.Appearance.Options.UseFont = True @@ -727,6 +753,8 @@ Partial Class frmColumn_Detail CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem21, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TYPE_COLUMNComboBox2.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout @@ -790,4 +818,6 @@ End Sub Friend WithEvents LU_CAPTIONTextBox As TextBox Friend WithEvents LayoutControlItem16 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem23 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem21 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents TYPE_COLUMNComboBox2 As DevExpress.XtraEditors.LookUpEdit End Class diff --git a/app/TaskFlow/frmColumn_Detail.resx b/app/TaskFlow/frmColumn_Detail.resx index fa933b7..502c756 100644 --- a/app/TaskFlow/frmColumn_Detail.resx +++ b/app/TaskFlow/frmColumn_Detail.resx @@ -152,10 +152,10 @@ 573, 67 - 0, 736 + 0, 735 - 573, 21 + 573, 22 RibbonStatusBar1 @@ -185,10 +185,10 @@ RibbonPage2 - 136, 307 + 144, 347 - 417, 20 + 392, 20 @@ -207,7 +207,7 @@ 4 - STRING + TEXT INTEGER @@ -215,11 +215,17 @@ BOOLEAN + + DOUBLE + + + CURRENCY + - 136, 180 + 144, 180 - 417, 21 + 392, 21 25 @@ -237,10 +243,10 @@ 5 - 136, 20 + 144, 20 - 417, 20 + 392, 20 4 @@ -258,10 +264,10 @@ 6 - 136, 60 + 144, 60 - 417, 20 + 392, 20 5 @@ -279,10 +285,10 @@ 7 - 136, 100 + 144, 100 - 417, 20 + 392, 20 6 @@ -303,14 +309,14 @@ 0 - 136, 140 + 144, 140 Combo - 140, 20 + 124, 20 7 @@ -328,10 +334,10 @@ 9 - 136, 221 + 144, 261 - 336, 20 + 313, 20 8 @@ -349,7 +355,7 @@ 10 - 484, 213 + 469, 253 @@ -359,7 +365,7 @@ 10, 10, 10, 10 - 77, 42 + 75, 42 9 @@ -380,10 +386,10 @@ 11 - 136, 267 + 144, 307 - 417, 20 + 392, 20 10 @@ -401,10 +407,10 @@ 12 - 136, 347 + 144, 387 - 336, 20 + 313, 20 11 @@ -422,13 +428,13 @@ 13 - 484, 339 + 469, 379 10, 10, 10, 10 - 77, 42 + 75, 42 12 @@ -449,10 +455,10 @@ 14 - 136, 433 + 144, 473 - 140, 20 + 124, 20 13 @@ -470,10 +476,10 @@ 15 - 412, 433 + 412, 473 - 141, 20 + 124, 20 14 @@ -491,10 +497,10 @@ 16 - 136, 473 + 144, 513 - 140, 20 + 124, 20 15 @@ -512,10 +518,10 @@ 17 - 412, 473 + 412, 513 - 141, 20 + 124, 20 16 @@ -533,13 +539,13 @@ 18 - 24, 560 + 24, 602 Read Only - 525, 19 + 508, 18 17 @@ -557,13 +563,13 @@ 19 - 24, 583 + 24, 624 Lade Indexdaten - 525, 19 + 508, 18 18 @@ -581,13 +587,13 @@ 20 - 24, 536 + 24, 578 Muss ausgefüllt werden - 260, 19 + 252, 18 19 @@ -605,13 +611,13 @@ 21 - 24, 606 + 24, 646 Erweitertes Auswahl Control (für lange Listen) - 525, 19 + 508, 18 20 @@ -629,10 +635,10 @@ 22 - 136, 393 + 144, 433 - 417, 20 + 392, 20 21 @@ -659,7 +665,7 @@ Combo - 141, 20 + 124, 20 22 @@ -677,7 +683,7 @@ 24 - 404, 536 + 404, 578 Combo @@ -686,7 +692,7 @@ - 145, 20 + 128, 20 23 @@ -703,6 +709,33 @@ 25 + + 144, 221 + + + Combo + + + + + + 392, 20 + + + 27 + + + TYPE_COLUMNComboBox2 + + + DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControl1 + + + 26 + Fill @@ -766,8 +799,11 @@ Caption Auswahldialog: + + Datentyp: + - 573, 669 + 573, 668 33 @@ -1006,6 +1042,12 @@ DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + LayoutControlItem21 + + + 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 af5dd05..fc83be5 100644 --- a/app/TaskFlow/frmColumn_Detail.vb +++ b/app/TaskFlow/frmColumn_Detail.vb @@ -25,11 +25,20 @@ Public Class frmColumn_Detail {ClassControlCreator.AGGREGATE_NONE, "Keine Summierung"}, {ClassControlCreator.AGGREGATE_TOTAL_INTEGER, "Summe (Ganzzahl)"}, {ClassControlCreator.AGGREGATE_TOTAL_FLOAT, "Summe (Zwei Nachkommastellen)"}, + {ClassControlCreator.AGGREGATE_TOTAL_CURRENCY, "Summe (Währung)"}, {ClassControlCreator.AGGREGATE_TOTAL_COUNT, "Anzahl"}, {ClassControlCreator.AGGREGATE_TOTAL_MIN, "Minimum"}, {ClassControlCreator.AGGREGATE_TOTAL_MAX, "Maximum"}, {ClassControlCreator.AGGREGATE_TOTAL_AVG, "Durchschnitt"} } + + TYPE_COLUMNComboBox2.Properties.DataSource = New Dictionary(Of String, String) From { + {ClassControlCreator.CONTROL_TYPE_TEXT, "Text"}, + {ClassControlCreator.CONTROL_TYPE_BOOLEAN, "Boolean"}, + {ClassControlCreator.CONTROL_TYPE_INTEGER, "Ganzzahl"}, + {ClassControlCreator.CONTROL_TYPE_DOUBLE, "Fließkommazahl"}, + {ClassControlCreator.CONTROL_TYPE_CURRENCY, "Währung"} + } Catch ex As Exception LOGGER.Error(ex) MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Laden der Formulardaten:") @@ -180,4 +189,8 @@ Public Class frmColumn_Detail End If End If End Sub + + Private Sub RibbonControl1_Click(sender As Object, e As EventArgs) Handles RibbonControl1.Click + + End Sub End Class \ No newline at end of file diff --git a/app/TaskFlow/frmFormDesigner.vb b/app/TaskFlow/frmFormDesigner.vb index 8ebac86..391b930 100644 --- a/app/TaskFlow/frmFormDesigner.vb +++ b/app/TaskFlow/frmFormDesigner.vb @@ -9,6 +9,7 @@ Imports DigitalData.Modules.Language.Utils Imports DigitalData.Modules.Language Imports System.Drawing Imports DigitalData.GUIs.Common +Imports DevExpress.Utils.Filtering.Internal Public Class frmFormDesigner Public ProfileId As Integer @@ -124,13 +125,13 @@ Public Class frmFormDesigner TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION) Catch ex As Exception - _LOGGER.Error(ex) + _Logger.Error(ex) MsgBox("Fehler bei Laden der Connection-Strings und Grunddaten: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") End Try LoadControls() Catch ex As Exception - _LOGGER.Error(ex) + _Logger.Error(ex) MsgBox(ex.Message, MsgBoxStyle.Critical, "error loading form:") End Try End Sub @@ -318,226 +319,11 @@ Public Class frmFormDesigner End Select Next Catch ex As Exception - _LOGGER.Error(ex) + _Logger.Error(ex) MsgBox("Unexpected error in LoadControls " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") End Try End Sub - 'Private Sub DragDropButtons_MouseDown(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseDown, btntextbox.MouseDown, btndtp.MouseDown, btnVektor.MouseDown, btnTabelle.MouseDown, btnCheckbox.MouseDown, btnLine.MouseDown, btnButton.MouseDown - ' If Designer_Locked Then - ' Exit Sub - ' End If - ' Mouse_IsPressed = True - - ' CurrentControl = Nothing - ' Try - ' TBPM_PROFILE_CONTROLSBindingSource.Clear() - ' Catch ex As Exception - ' _Logger.Error(ex) - ' End Try - 'End Sub - - 'Private Sub DragDropButtons_MouseMove(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseMove, btntextbox.MouseMove, btndtp.MouseMove, btnVektor.MouseMove, btnTabelle.MouseMove, btnCheckbox.MouseMove, btnLine.MouseMove, btnButton.MouseMove - ' If Designer_Locked Then - ' Exit Sub - ' End If - ' If Mouse_IsPressed Then - ' Dim btn As Button = sender - ' Dim dragDropData As String - - ' Select Case btn.Name - ' Case "btnlabel" - ' dragDropData = ClassControlCreator.PREFIX_LABEL - ' Case "btntextbox" - ' dragDropData = ClassControlCreator.PREFIX_TEXTBOX - ' Case "btncmb" - ' dragDropData = ClassControlCreator.PREFIX_COMBOBOX - ' Case "btndtp" - ' dragDropData = ClassControlCreator.PREFIX_DATETIMEPICKER - ' Case "btnVektor" - ' dragDropData = ClassControlCreator.PREFIX_DATAGRIDVIEW - ' Case "btnTabelle" - ' dragDropData = ClassControlCreator.PREFIX_TABLE - ' Case "btnCheckbox" - ' dragDropData = ClassControlCreator.PREFIX_CHECKBOX - ' Case "btnLine" - ' dragDropData = ClassControlCreator.PREFIX_LINE - ' Case "btnButton" - ' dragDropData = ClassControlCreator.PREFIX_BUTTON - ' End Select - - ' btn.DoDragDrop(dragDropData, DragDropEffects.Copy) - ' End If - 'End Sub - - 'Private Sub DragDropButtons_MouseUp(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseUp, btntextbox.MouseUp, btndtp.MouseUp, btnVektor.MouseUp, btnTabelle.MouseUp, btnCheckbox.MouseUp, btnLine.MouseUp, btnButton.MouseUp - ' Mouse_IsPressed = False - 'End Sub - - 'Private Sub pnlDesigner_DragDrop(sender As Object, e As DragEventArgs) Handles pnldesigner.DragDrop - ' If Designer_Locked Then - ' Exit Sub - ' End If - ' Dim cursorPosition As Point = pnldesigner.PointToClient(Cursor.Position) - - ' Mouse_IsPressed = False - - ' Try - ' Select Case e.Data.GetData(DataFormats.Text) - ' Case ClassControlCreator.PREFIX_LABEL - ' Dim label = ClassControlCreator.CreateNewLabel(cursorPosition) - ' SetMovementHandlers(label) - - ' TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, label.Name, "LBL", label.Text, label.Location.X, label.Location.Y, USER_USERNAME, label.Size.Height, label.Size.Width) - ' CHANGES_IN_ADMINISTRATION = True - ' CurrentControl = label - ' CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { - ' .Guid = GetLastID(), - ' .ReadOnly = False - ' } - - - ' pnldesigner.Controls.Add(label) - - ' Case ClassControlCreator.PREFIX_TEXTBOX - ' Dim txt = ClassControlCreator.CreateNewTextBox(cursorPosition) - ' SetMovementHandlers(txt) - - ' TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, txt.Name, "TXT", txt.Name, txt.Location.X, txt.Location.Y, USER_USERNAME, txt.Size.Height, txt.Size.Width) - ' CHANGES_IN_ADMINISTRATION = True - ' CurrentControl = txt - ' CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { - ' .Guid = GetLastID(), - ' .ReadOnly = False - ' } - - ' pnldesigner.Controls.Add(txt) - - ' Case ClassControlCreator.PREFIX_COMBOBOX - ' Dim cmb = ClassControlCreator.CreateNewCombobox(cursorPosition) - ' SetMovementHandlers(cmb) - - ' TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, cmb.Name, "CMB", cmb.Name, cmb.Location.X, cmb.Location.Y, USER_USERNAME, cmb.Size.Height, cmb.Size.Width) - ' CHANGES_IN_ADMINISTRATION = True - ' CurrentControl = cmb - ' CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { - ' .Guid = GetLastID(), - ' .ReadOnly = False - ' } - - ' pnldesigner.Controls.Add(cmb) - - ' Case ClassControlCreator.PREFIX_DATETIMEPICKER - ' Dim dtp = ClassControlCreator.CreateNewDatetimepicker(cursorPosition) - ' SetMovementHandlers(dtp) - - ' TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dtp.Name, "DTP", dtp.Name, dtp.Location.X, dtp.Location.Y, USER_USERNAME, dtp.Size.Height, dtp.Size.Width) - ' CHANGES_IN_ADMINISTRATION = True - ' CurrentControl = dtp - ' CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { - ' .Guid = GetLastID(), - ' .ReadOnly = False - ' } - - ' pnldesigner.Controls.Add(dtp) - - ' Case ClassControlCreator.PREFIX_CHECKBOX - ' Dim chk = ClassControlCreator.CreateNewCheckbox(cursorPosition) - ' SetMovementHandlers(chk) - - ' TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, chk.Name, "CHK", chk.Text, chk.Location.X, chk.Location.Y, USER_USERNAME, chk.Size.Height, chk.Size.Width) - ' CHANGES_IN_ADMINISTRATION = True - ' CurrentControl = chk - ' CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { - ' .Guid = GetLastID(), - ' .ReadOnly = False - ' } - - ' pnldesigner.Controls.Add(chk) - - ' Case ClassControlCreator.PREFIX_DATAGRIDVIEW - ' Dim lc As LookupControl3 = ClassControlCreator.CreateNewLookupControl(cursorPosition) - - ' SetMovementHandlers(lc) - - ' TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, lc.Name, "LOOKUP", lc.Name, lc.Location.X, lc.Location.Y, USER_USERNAME, lc.Size.Height, lc.Size.Width) - ' CHANGES_IN_ADMINISTRATION = True - ' CurrentControl = lc - ' CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { - ' .Guid = GetLastID(), - ' .ReadOnly = False - ' } - - ' pnldesigner.Controls.Add(lc) - - ' Case ClassControlCreator.PREFIX_TABLE - ' Dim tb = ClassControlCreator.CreateNewTable(cursorPosition) - - ' SetMovementHandlers(tb) - ' AddHandler tb.MouseClick, AddressOf gridControl_MouseClick - - ' TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, tb.Name, "TABLE", tb.Name, tb.Location.X, tb.Location.Y, USER_USERNAME, tb.Size.Height, tb.Size.Width) - ' CHANGES_IN_ADMINISTRATION = True - ' Dim oControlId = GetLastID() - - ' CurrentControl = tb - ' CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { - ' .Guid = oControlId, - ' .ReadOnly = False - ' } - - ' TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column1", "Column1", 95, USER_USERNAME) - ' TBPM_CONTROL_TABLETableAdapter.Insert(oControlId, "column2", "Column2", 95, USER_USERNAME) - - ' pnldesigner.Controls.Add(tb) - ' Case ClassControlCreator.PREFIX_LINE - ' Dim line = ClassControlCreator.CreateNewLine(cursorPosition) - - ' SetMovementHandlers(line) - - ' TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, line.Name, "LINE", line.Name, line.Location.X, line.Location.Y, USER_USERNAME, line.Size.Height, line.Size.Width) - ' CHANGES_IN_ADMINISTRATION = True - ' CurrentControl = line - ' CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { - ' .Guid = GetLastID(), - ' .ReadOnly = False - ' } - - - ' pnldesigner.Controls.Add(line) - ' Case ClassControlCreator.PREFIX_BUTTON - ' Dim oButton = ClassControlCreator.CreateNewButton(cursorPosition) - - ' SetMovementHandlers(oButton) - - ' TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, oButton.Name, "BUTTON", oButton.Name, oButton.Location.X, oButton.Location.Y, USER_USERNAME, oButton.Size.Height, oButton.Size.Width) - ' CHANGES_IN_ADMINISTRATION = True - ' CurrentControl = oButton - ' CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { - ' .Guid = GetLastID(), - ' .ReadOnly = False - ' } - - - ' pnldesigner.Controls.Add(oButton) - ' End Select - ' Catch ex As Exception - ' _Logger.Error(ex) - ' _Logger.Info($"Error while Adding new control {e.Data.GetData(DataFormats.Text)}:") - ' _Logger.Info(ex) - ' End Try - 'End Sub - - 'Private Sub pnlDesigner_DragEnter(sender As System.Object, e As DragEventArgs) Handles pnldesigner.DragEnter - ' ' Check the format of the data being dropped. - ' If (e.Data.GetDataPresent(DataFormats.Text)) Then - ' ' Display the copy cursor. - ' e.Effect = DragDropEffects.Copy - ' Else - ' ' Display the no-drop cursor. - ' e.Effect = DragDropEffects.None - ' End If - 'End Sub Private Function GetLastID() Dim sql = String.Format("SELECT MAX(GUID) FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0}", ProfileId) @@ -612,7 +398,7 @@ Public Class frmFormDesigner GridControlContextMenu.Show(Cursor.Position.X, Cursor.Position.Y) End If Catch ex As Exception - _LOGGER.Error(ex) + _Logger.Error(ex) MsgBox("Error while loading Column Configuration: " & vbCrLf & ex.Message, MsgBoxStyle.Critical) End Try End Sub @@ -631,7 +417,7 @@ Public Class frmFormDesigner End If End If Catch ex As Exception - _LOGGER.Error(ex) + _Logger.Error(ex) MsgBox(ex.Message, MsgBoxStyle.Critical, "DeleteControl:") End Try End Sub @@ -640,9 +426,6 @@ Public Class frmFormDesigner Return pnldesigner.PointToClient(Cursor.Position) End Function - - - ''' ''' Setzt die Eventhandler für ein Control, die für die Bewegung via Drag & Drop und das Laden der Eigentschaften verantwortlich sind ''' @@ -731,7 +514,7 @@ Public Class frmFormDesigner MyBase.Cursor = Cursors.Default Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical) - _LOGGER.Error(ex) + _Logger.Error(ex) Mouse_IsMoving = False Mouse_IsPressed = False End Try @@ -760,7 +543,7 @@ Public Class frmFormDesigner End If End If Catch ex As Exception - _LOGGER.Error(ex) + _Logger.Error(ex) Mouse_IsMoving = False End Try End Sub @@ -835,9 +618,9 @@ Public Class frmFormDesigner Try TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, USER_LANGUAGE, ProfileId) Catch ex As Exception - _LOGGER.Error(ex) - _LOGGER.Info("Error while executing TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil in LoadControlProperties:") - _LOGGER.Info(ex) + _Logger.Error(ex) + _Logger.Info("Error while executing TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil in LoadControlProperties:") + _Logger.Info(ex) End Try Dim oControlId = DirectCast(sender.Tag, ClassControlCreator.ControlMetadata).Guid @@ -848,7 +631,7 @@ Public Class frmFormDesigner ' Control-Id wurde nicht in DataRow gefunden If IsNothing(oRow) Then - _LOGGER.Info($"Error while filtering Controls by Guid '{oControlId}' in LoadControlProperties:") + _Logger.Info($"Error while filtering Controls by Guid '{oControlId}' in LoadControlProperties:") MsgBox($"Control mit der Id {oControlId} wurde nicht gefunden!", MsgBoxStyle.Critical, "Fehler beim Laden der Control Eigenschaften") Exit Sub @@ -889,6 +672,7 @@ Public Class frmFormDesigner txtProps.Enable_SQL = New SQLValue(NotNull(oRow.Item("SQL_ENABLE"), "")) txtProps.Enable_SQL_OnLoad = New SQLValue(NotNull(oRow.Item("SQL_ENABLE_ON_LOAD"), "")) txtProps.SetControlData = New SQLValue(NotNull(oRow.Item("SET_CONTROL_DATA"), "")) + txtProps.DisplayFormat = oRow.ItemEx("FORMAT_STRING", ClassControlCreator.CONTROL_TYPE_TEXT) props = txtProps @@ -1091,148 +875,20 @@ Public Class frmFormDesigner Case "RegexMessage" UpdateSingleValue("REGEX_MESSAGE_DE", newValue) + Case "Active" UpdateSingleValue("CONTROL_ACTIVE", IIf(newValue = True, 1, 0)) + Case "CtrlImage" Dim myPath As ImageValue = newValue UpdateImage(myPath.Value) + + Case "DisplayFormat" + UpdateSingleValue("FORMAT_STRING", newValue) + End Select End Sub - - - Private Sub pgControls_PropertyValueChanged(s As Object, e As PropertyValueChangedEventArgs) - Dim oldValue As Object = e.OldValue - Dim newValue = e.ChangedItem.Value - - 'Dim prop As String = e.ChangedItem.Label - Dim prop As String = e.ChangedItem.PropertyDescriptor.Name - - - Select Case prop - Case "DisplayAsLookUpControl" - If UpdateSingleValue("CTRL_TYPE", "LOOKUP") = True Then - MsgBox("Type has been changed. Controls will be reloaded!", MsgBoxStyle.Information, "") - LoadControls() - End If - Case "DisplayAsComboBox" - If UpdateSingleValue("CTRL_TYPE", "CMB") = True Then - MsgBox("Type has been changed. Controls will be reloaded!", MsgBoxStyle.Information, "") - LoadControls() - End If - Case "Location" - UpdateSingleValue("X_LOC", DirectCast(newValue, Point).X) - UpdateSingleValue("Y_LOC", DirectCast(newValue, Point).Y) - - CurrentControl.Location = newValue - - Case "X" - UpdateSingleValue("X_LOC", CInt(newValue)) - - CurrentControl.Location = New Point(newValue, CurrentControl.Location.Y) - - Case "Y" - UpdateSingleValue("Y_LOC", CInt(newValue)) - - CurrentControl.Location = New Point(CurrentControl.Location.X, newValue) - - Case "Size" - UpdateSingleValue("WIDTH", DirectCast(newValue, Size).Width) - UpdateSingleValue("HEIGHT", DirectCast(newValue, Size).Height) - - CurrentControl.Size = newValue - - Case "Width" - UpdateSingleValue("WIDTH", CInt(newValue)) - - CurrentControl.Size = New Size(newValue, CurrentControl.Size.Height) - - Case "Height" - UpdateSingleValue("HEIGHT", CInt(newValue)) - - CurrentControl.Size = New Size(CurrentControl.Size.Width, newValue) - - Case "Name" - UpdateSingleValue("NAME", newValue) - - CurrentControl.Name = newValue - - Case "Index" - UpdateSingleValue("INDEX_NAME", newValue) - - Case "Text" - UpdateSingleValue("CTRL_TEXT", newValue) - - CurrentControl.Text = newValue - - Case "Required" - UpdateSingleValue("VALIDATION", IIf(newValue = True, 1, 0)) - - Case "ReadOnly" - UpdateSingleValue("READ_ONLY", IIf(newValue = True, 1, 0)) - Case "SaveChangeOnReadOnly" - UpdateSingleValue("SAVE_CHANGE_ON_ENABLED", IIf(newValue = True, 1, 0)) - Case "Font" - Dim font As Font = newValue - Dim fontSize As Integer = Math.Truncate(font.SizeInPoints) - UpdateSingleValue("FONT_SIZE", fontSize) - UpdateSingleValue("FONT_FAMILY", font.FontFamily.Name) - UpdateSingleValue("FONT_STYLE", CInt(font.Style)) - - CurrentControl.Font = font - Case "TextColor" - Dim color As Color = newValue - UpdateSingleValue("FONT_COLOR", ColorTranslator.ToWin32(color)) - - CurrentControl.ForeColor = color - Case "SQLCommand" - UpdateSingleValue("SQL_UEBERPRUEFUNG", newValue) - UpdateSingleValue("CHOICE_LIST", "") - - Case "Enable_SQL" - UpdateSingleValue("SQL_ENABLE", newValue) - UpdateSingleValue("CHOICE_LIST", "") - - Case "Enable_SQL_OnLoad" - UpdateSingleValue("SQL_ENABLE_ON_LOAD", newValue) - UpdateSingleValue("CHOICE_LIST", "") - - Case "Override_SQL" - UpdateSingleValue("SQL2", newValue) - UpdateSingleValue("CHOICE_LIST", "") - - Case "SetControlData" - UpdateSingleValue("SET_CONTROL_DATA", newValue) - UpdateSingleValue("CHOICE_LIST", "") - - Case "ChoiceList" - UpdateSingleValue("CHOICE_LIST", newValue) - UpdateSingleValue("SQL_UEBERPRUEFUNG", "") - - Case "MultiSelect" - UpdateSingleValue("MULTISELECT", IIf(newValue = True, 1, 0)) - - Case "AllowAddNewValues" - UpdateSingleValue("VKT_ADD_ITEM", IIf(newValue = True, 1, 0)) - - Case "PreventDuplicates" - UpdateSingleValue("VKT_PREVENT_MULTIPLE_VALUES", IIf(newValue = True, 1, 0)) - - Case "DefaultValue" - UpdateSingleValue("DEFAULT_VALUE", newValue) - - Case "Regex" - UpdateSingleValue("REGEX_MATCH", newValue) - - Case "RegexMessage" - UpdateSingleValue("REGEX_MESSAGE_DE", newValue) - Case "Active" - UpdateSingleValue("CONTROL_ACTIVE", IIf(newValue = True, 1, 0)) - Case "CtrlImage" - Dim myPath As ImageValue = newValue - UpdateImage(myPath.Value) - End Select - End Sub Private Function UpdateImage(ImageLocation As String) Try Dim image As Bitmap = CType(System.Drawing.Image.FromFile(ImageLocation, True), Bitmap) @@ -1256,10 +912,10 @@ Public Class frmFormDesigner Return True Catch ex As Exception - _LOGGER.Error(ex) + _Logger.Error(ex) Dim oMsg = $"UpdateImage - Error while saving Control (Id: {CURRENT_CONTROL_ID}): {vbCrLf}{ex.Message}" MsgBox(oMsg) - _LOGGER.Info(oMsg) + _Logger.Info(oMsg) Return False End Try End Function @@ -1289,13 +945,13 @@ Public Class frmFormDesigner Return True End If - + Return False Catch ex As Exception - _LOGGER.Error(ex) + _Logger.Error(ex) Dim oMsg = $"UpdateSingleValue - Fehler beim Speichern von Control (Id: {guid}, column: {columnName}): {vbCrLf}{ex.Message}" MsgBox(oMsg) - _LOGGER.Info(oMsg) + _Logger.Info(oMsg) Return False End Try End Function @@ -1314,7 +970,7 @@ Public Class frmFormDesigner Catch ex As Exception Dim oMsg = $"MenuItemAddColumn_Click - Fehler beim Hinzufügen von einer neuen Spalte: {vbCrLf}{ex.Message}" MsgBox(oMsg) - _LOGGER.Error(ex) + _Logger.Error(ex) End Try End Sub @@ -1347,7 +1003,7 @@ Public Class frmFormDesigner End If Catch ex As Exception MsgBox("Error in Saving Profile SQLFinish: " & vbNewLine & vbNewLine & ex.Message) - _LOGGER.Error(ex) + _Logger.Error(ex) End Try End Sub @@ -1592,9 +1248,9 @@ Public Class frmFormDesigner RibPGCtrlWidth.Enabled = True End If Catch ex As Exception - _LOGGER.Error(ex) - _LOGGER.Info($"Error while Adding new control {ControlSelected}:") - _LOGGER.Info(ex) + _Logger.Error(ex) + _Logger.Info($"Error while Adding new control {ControlSelected}:") + _Logger.Info(ex) End Try Me.Cursor = Cursors.Default ControlSelected = "" diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx index d943687..bdf87bd 100644 --- a/app/TaskFlow/frmMain.resx +++ b/app/TaskFlow/frmMain.resx @@ -124,46 +124,46 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAfgBCQH4AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo - AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA - AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 - AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA - AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm - AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM - AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA - ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz - AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ - AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM - AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA - AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA - AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ - AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ - AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA - AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm - ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ - Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz - AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA - AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM - AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM - ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM - Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA - AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM - AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ - AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz - AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm - AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw - AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/0YAAQgEcgEICgABGgEc - AnQBHAEaKQABcgFVAVoCWwFaAVUBTwgAAXQBeQF6AuUBegF5AXQnAAJVAVoBWwLkAVsBWgJVBgABdAJ6 - BOUBegF5AVIlAAFPAVUCWgRbAVoCVQFPBAABUgFZAXoG5QF6AlIjAAEIAlUIWgJVAQgCAAEaAVIBWQF6 - BuUBWQFYAVIBGiIAAU8CVQdaA1UBTwIAAUwBUgpZAVIBTCIAAU8BNApVATQBLgIAAUwBUgFTCFkBUwFS - AUwiAAEtAzMHNAIzAS0CAAIrAjIGUwIyAisiAAFPAS0BMwhVATQCLQIAAUwCKwhTAVICKyIAAQgBLQFV - CJcBVQEtAQgCAAEaASsBUgh1AVIBKwEaIwABAgGXCJgBlwEtBAABKgF0CJoBdAErJQABTwEIARsFwgHx - AU8GAAFMARoBGwQaARsBGgFSJwABTwEIAfMC/wHzAQgBcggAAUwBGgT2ARoBdCkAAQgEcgEICgABGgR0 - ARplAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQAE/wQAAfgBHwH4AR8EAAHw - AQ8B8AEPBAAB4AEHAeABBwQAAcABAwHAAQMEAAGAAQEBgAEBBAABgAEBAYABAQQAAYABAQGAAQEEAAGA - AQEBgAEBBAABgAEBAYABAQQAAYABAQGAAQEEAAHAAQMBwAEDBAAB4AEHAeABBwQAAfABDwHwAQ8EAAH4 - AR8B+AEfBAAE/wQACw== + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADu + CAAAAk1TRnQBSQFMAgEBAgIAAQoBAAEKARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA + AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA + AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA + AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm + AwABmQMAAcwCAAEzAwACMwIAATMBZgIAATMBmQIAATMBzAIAATMB/wIAAWYDAAFmATMCAAJmAgABZgGZ + AgABZgHMAgABZgH/AgABmQMAAZkBMwIAAZkBZgIAApkCAAGZAcwCAAGZAf8CAAHMAwABzAEzAgABzAFm + AgABzAGZAgACzAIAAcwB/wIAAf8BZgIAAf8BmQIAAf8BzAEAATMB/wIAAf8BAAEzAQABMwEAAWYBAAEz + AQABmQEAATMBAAHMAQABMwEAAf8BAAH/ATMCAAMzAQACMwFmAQACMwGZAQACMwHMAQACMwH/AQABMwFm + AgABMwFmATMBAAEzAmYBAAEzAWYBmQEAATMBZgHMAQABMwFmAf8BAAEzAZkCAAEzAZkBMwEAATMBmQFm + AQABMwKZAQABMwGZAcwBAAEzAZkB/wEAATMBzAIAATMBzAEzAQABMwHMAWYBAAEzAcwBmQEAATMCzAEA + ATMBzAH/AQABMwH/ATMBAAEzAf8BZgEAATMB/wGZAQABMwH/AcwBAAEzAv8BAAFmAwABZgEAATMBAAFm + AQABZgEAAWYBAAGZAQABZgEAAcwBAAFmAQAB/wEAAWYBMwIAAWYCMwEAAWYBMwFmAQABZgEzAZkBAAFm + ATMBzAEAAWYBMwH/AQACZgIAAmYBMwEAA2YBAAJmAZkBAAJmAcwBAAFmAZkCAAFmAZkBMwEAAWYBmQFm + AQABZgKZAQABZgGZAcwBAAFmAZkB/wEAAWYBzAIAAWYBzAEzAQABZgHMAZkBAAFmAswBAAFmAcwB/wEA + AWYB/wIAAWYB/wEzAQABZgH/AZkBAAFmAf8BzAEAAcwBAAH/AQAB/wEAAcwBAAKZAgABmQEzAZkBAAGZ + AQABmQEAAZkBAAHMAQABmQMAAZkCMwEAAZkBAAFmAQABmQEzAcwBAAGZAQAB/wEAAZkBZgIAAZkBZgEz + AQABmQEzAWYBAAGZAWYBmQEAAZkBZgHMAQABmQEzAf8BAAKZATMBAAKZAWYBAAOZAQACmQHMAQACmQH/ + AQABmQHMAgABmQHMATMBAAFmAcwBZgEAAZkBzAGZAQABmQLMAQABmQHMAf8BAAGZAf8CAAGZAf8BMwEA + AZkBzAFmAQABmQH/AZkBAAGZAf8BzAEAAZkC/wEAAcwDAAGZAQABMwEAAcwBAAFmAQABzAEAAZkBAAHM + AQABzAEAAZkBMwIAAcwCMwEAAcwBMwFmAQABzAEzAZkBAAHMATMBzAEAAcwBMwH/AQABzAFmAgABzAFm + ATMBAAGZAmYBAAHMAWYBmQEAAcwBZgHMAQABmQFmAf8BAAHMAZkCAAHMAZkBMwEAAcwBmQFmAQABzAKZ + AQABzAGZAcwBAAHMAZkB/wEAAswCAALMATMBAALMAWYBAALMAZkBAAPMAQACzAH/AQABzAH/AgABzAH/ + ATMBAAGZAf8BZgEAAcwB/wGZAQABzAH/AcwBAAHMAv8BAAHMAQABMwEAAf8BAAFmAQAB/wEAAZkBAAHM + ATMCAAH/AjMBAAH/ATMBZgEAAf8BMwGZAQAB/wEzAcwBAAH/ATMB/wEAAf8BZgIAAf8BZgEzAQABzAJm + AQAB/wFmAZkBAAH/AWYBzAEAAcwBZgH/AQAB/wGZAgAB/wGZATMBAAH/AZkBZgEAAf8CmQEAAf8BmQHM + AQAB/wGZAf8BAAH/AcwCAAH/AcwBMwEAAf8BzAFmAQAB/wHMAZkBAAH/AswBAAH/AcwB/wEAAv8BMwEA + AcwB/wFmAQAC/wGZAQAC/wHMAQACZgH/AQABZgH/AWYBAAFmAv8BAAH/AmYBAAH/AWYB/wEAAv8BZgEA + ASEBAAGlAQADXwEAA3cBAAOGAQADlgEAA8sBAAOyAQAD1wEAA90BAAPjAQAD6gEAA/EBAAP4AQAB8AH7 + Af8BAAGkAqABAAOAAwAB/wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA/9GAAEIBHIBCAoAARoBHAJ0 + ARwBGikAAXIBVQFaAlsBWgFVAU8IAAF0AXkBegLlAXoBeQF0JwACVQFaAVsC5AFbAVoCVQYAAXQCegTl + AXoBeQFSJQABTwFVAloEWwFaAlUBTwQAAVIBWQF6BuUBegJSIwABCAJVCFoCVQEIAgABGgFSAVkBegbl + AVkBWAFSARoiAAFPAlUHWgNVAU8CAAFMAVIKWQFSAUwiAAFPATQKVQE0AS4CAAFMAVIBUwhZAVMBUgFM + IgABLQMzBzQCMwEtAgACKwIyBlMCMgIrIgABTwEtATMIVQE0Ai0CAAFMAisIUwFSAisiAAEIAS0BVQiX + AVUBLQEIAgABGgErAVIIdQFSASsBGiMAAQIBlwiYAZcBLQQAASoBdAiaAXQBKyUAAU8BCAEbBcIB8QFP + BgABTAEaARsEGgEbARoBUicAAU8BCAHzAv8B8wEIAXIIAAFMARoE9gEaAXQpAAEIBHIBCAoAARoEdAEa + ZQABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/wEABP8EAAH4AR8B+AEfBAAB8AEP + AfABDwQAAeABBwHgAQcEAAHAAQMBwAEDBAABgAEBAYABAQQAAYABAQGAAQEEAAGAAQEBgAEBBAABgAEB + AYABAQQAAYABAQGAAQEEAAGAAQEBgAEBBAABwAEDAcABAwQAAeABBwHgAQcEAAHwAQ8B8AEPBAAB+AEf + AfgBHwQABP8EAAs= @@ -501,7 +501,7 @@ Out of Range - Fenster wiederherstellen - 283, 76 + 283, 98 ContextMenuNotifyIcon @@ -1942,7 +1942,7 @@ True - 25 + 147 9, 19 diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index a5bf5f7..27244f5 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -4,20 +4,21 @@ Imports System.Runtime.InteropServices Imports System.IO Imports System.Text.RegularExpressions Imports System.ComponentModel +Imports System.Globalization Imports DigitalData.Controls.LookupGrid -Imports DevExpress.XtraGrid -Imports DevExpress.XtraGrid.Views.Grid Imports DigitalData.Modules.Language.Utils Imports DigitalData.Modules.Language +Imports DigitalData.Modules.Base Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback Imports DigitalData.Modules.EDMI.API.Constants -Imports DevExpress.XtraBars Imports DigitalData.GUIs.Common.DocumentResultList Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.ZooFlow.Constants Imports DigitalData.GUIs.Common +Imports DevExpress.XtraGrid +Imports DevExpress.XtraGrid.Views.Grid +Imports DevExpress.XtraBars Imports DevExpress.XtraGrid.Columns -Imports System.Globalization Public Class frmValidator Private Property Current_Document As DocumentResultList.Document = Nothing @@ -2638,8 +2639,8 @@ Public Class frmValidator LOGGER.Info("LoadNextDocument - Dokument-GUID: '" & CURRENT_DOC_GUID.ToString & "'") If CURRENT_DOC_GUID > 0 Then If (OPERATION_MODE_FS = ClassConstants.OpModeFS_PWM Or OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM) And GetDocPathWindows(0) = False Then - SetStatusLabel($"File not accessable: {DocPathWindows}", "DarkOrange") - MsgBox("The file can not be diplayed or is not accessable!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) + SetStatusLabel($"File not accessible: {DocPathWindows}", "DarkOrange") + MsgBox("The file can not be diplayed or is not accessible!", MsgBoxStyle.Exclamation, ADDITIONAL_TITLE) End If If IDB_ACTIVE = False Then If CreateWMObject() = False Then @@ -3182,67 +3183,12 @@ Public Class frmValidator End If End If - End If Try Dim oFormatString As String = oControlRow.ItemEx("CTRL_FORMAT_STRING", "") - If oFormatString <> String.Empty Then - ' https://learn.microsoft.com/en-us/dotnet/api/system.datetime.tostring?view=net-7.0#system-datetime-tostring(system-string) + oFormattedValue = ClassFormat.GetFormattedValue(oControl.Name, oValueFromSource, oFormatString) - Select Case oFormatString - Case "Currency" ' 16,325.63 € - Dim oValue As Double = oValueFromSource - oFormattedValue = oValue.ToString("C2") - - Case "Decimal" ' 16325,63 - Dim oValue As Double = oValueFromSource - oFormattedValue = oValue.ToString("F") - - Case "Date" ' 15.06.2008 - Dim oValue As DateTime = oValueFromSource - oFormattedValue = oValue.ToString("d") - - Case "DateTime" ' 15.06.2008 9:15:07 - Dim oValue As DateTime = oValueFromSource - oFormattedValue = oValue.ToString("G") - - End Select - - End If - Catch ex As Exception - LOGGER.Warn($"Unexpected error in Format String [{oControl.Name}]: {ex.Message}") - LOGGER.Error(ex) - End Try - - Try - 'Dim oFormatString As String = oControlRow.ItemEx("CTRL_FORMAT_STRING", "") - 'If oFormatString <> String.Empty Then - ' Try - ' Dim oSPlit = Split(oFormatString, ";") - ' If oSPlit(0) = "Decimal" Then - ' LOGGER.Debug("FORMAT_STRING DECIMAL") - ' oFormattedValue = oValueFromSource - ' LOGGER.Debug($"Unformatted String: {oFormattedValue}") - ' Dim oFormattedDec As Decimal = oValueFromSource - ' If oSPlit.Length = 3 Then - ' oFormattedValue = $"{oFormattedDec.ToString(oSPlit(1))} {oSPlit(2)}" - ' ElseIf oSPlit.Length = 4 Then - ' oFormattedValue = $"{oFormattedDec.ToString(oSPlit(1), New CultureInfo(oSPlit(2)))} {oSPlit(3)}" - ' Else - ' oFormatString = oFormatString.Replace("Decimal;", "") - ' End If - ' LOGGER.Debug($"Formatted String: {oFormattedValue}") - - - ' End If - ' Catch ex As Exception - ' LOGGER.Warn($"Unexpected error in Format String [{oControl.Name}]: {ex.Message}") - ' LOGGER.Error(ex) - ' End Try - - - 'End If If Not IsNothing(oFormattedValue) And oFormattedValue <> String.Empty Then oControl.Text = NotNull(oFormattedValue, oDefaultValue) Else @@ -3264,11 +3210,13 @@ Public Class frmValidator Dim oSQl = $"SELECT CASE WHEN {oExpression} THEN CONVERT(BIT,1) ELSE CONVERT(BIT,0) END " Dim oColorName = IIf(DatabaseECM.GetScalarValue(oSQl), oSPlit(1), oSPlit(2)) oControl.BackColor = Color.FromName(oColorName) - If oColorName = "Green" Or oColorName = "Blue" Or oColorName = "Red" Then - oControl.ForeColor = Color.FromName("White") - Else - oControl.ForeColor = Color.FromName("Black") - End If + + oControl.ForeColor = GraphicsEx.GetContrastedColor(oControl.BackColor) + 'If oColorName = "Green" Or oColorName = "Blue" Or oColorName = "Red" Then + ' oControl.ForeColor = Color.FromName("White") + 'Else + ' oControl.ForeColor = Color.FromName("Black") + 'End If End If End If Catch ex As Exception @@ -3447,25 +3395,37 @@ Public Class frmValidator If oColValuesfromSource.Length > 8 Then LOGGER.Warn("Fill Grid Error - Max 8 columns can be configured!") End If - Select Case oColValuesfromSource.Length - Case 1 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0)}) - Case 2 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1)}) - Case 3 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)}) - Case 4 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)}) - Case 5 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4)}) - Case 6 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5)}) - Case 7 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6)}) - Case 8 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6), oColValuesfromSource(7)}) - End Select + Dim oRowData As New List(Of Object) + + For index = 1 To oColValuesfromSource.Length + Dim oColumnType = oDTColumnsPerDevExGrid.Rows.Item(index - 1).Item("TYPE_COLUMN") + Dim oConvertedValue = ClassFormat.GetConvertedValue(oColValuesfromSource(index - 1), oColumnType) + oRowData.Add(oConvertedValue) + Next + + oDataSource.Rows.Add(oRowData.ToArray()) + + 'Select Case oColValuesfromSource.Length + ' Case 1 + ' oDataSource.Rows.Add(New String() {oColValuesfromSource(0)}) + ' Case 2 + ' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1)}) + ' Case 3 + ' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)}) + ' Case 4 + ' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)}) + ' Case 5 + ' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4)}) + ' Case 6 + ' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5)}) + ' Case 7 + ' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6)}) + ' Case 8 + ' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6), oColValuesfromSource(7)}) + 'End Select + + ElseIf oValueType = "System.Data.DataTable" Then Dim oMyDatatable As DataTable = oValueFromSource LOGGER.Debug($"IDB Fill Grid [{oControl.Name}] with Datatable - Rows: " & oMyDatatable.Rows.Count) @@ -3473,28 +3433,39 @@ Public Class frmValidator LOGGER.Debug($"IDB ROW Vector {oRow.Item(0).ToString}...") oColValuesfromSource = Split(oRow.Item(0).ToString, PMDelimiter) 'If USER_USERNAME.ToLower = "'marscheiber" Then MsgBox($"IDB ROW Vector {oRow.Item(0).ToString}...") + If oColValuesfromSource.Length > 8 Then LOGGER.Warn("Fill Grid with DatatableSplit Error - Max 8 columns can be configured!") End If - Select Case oColValuesfromSource.Length - Case 1 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0)}) - Case 2 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1)}) - Case 3 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)}) - Case 4 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)}) - Case 5 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4)}) - Case 6 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5)}) - Case 7 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6)}) - Case 8 - oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6), oColValuesfromSource(7)}) - End Select + Dim oRowData As New List(Of Object) + + For index = 1 To oColValuesfromSource.Length + Dim oColumnType = oDTColumnsPerDevExGrid.Rows.Item(index - 1).Item("TYPE_COLUMN") + Dim oConvertedValue = ClassFormat.GetConvertedValue(oColValuesfromSource(index - 1), oColumnType) + oRowData.Add(oConvertedValue) + Next + + oDataSource.Rows.Add(oRowData.ToArray()) + + 'Select Case oColValuesfromSource.Length + ' Case 1 + ' oDataSource.Rows.Add(New String() {oColValuesfromSource(0)}) + ' Case 2 + ' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1)}) + ' Case 3 + ' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)}) + ' Case 4 + ' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)}) + ' Case 5 + ' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4)}) + ' Case 6 + ' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5)}) + ' Case 7 + ' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6)}) + ' Case 8 + ' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6), oColValuesfromSource(7)}) + 'End Select Next End If @@ -5424,9 +5395,12 @@ Public Class frmValidator Dim oValueList As New List(Of String) - For Each item In oRow.ItemArray + For Each item As Object In oRow.ItemArray item = NotNull(item, String.Empty) - If TypeOf item IsNot String Then item.ToString() + ' Convert to string using InvariantCulture, so converting back from string does not screw up values + If TypeOf item IsNot String Then + item = String.Format(CultureInfo.InvariantCulture, "{0}", item) + End If oValueList.Add(item) Next