diff --git a/app/TaskFlow/ClassControlCreator.vb b/app/TaskFlow/ClassControlCreator.vb index 7742120..d026162 100644 --- a/app/TaskFlow/ClassControlCreator.vb +++ b/app/TaskFlow/ClassControlCreator.vb @@ -365,7 +365,7 @@ Public Class ClassControlCreator Logger.Warn("Label [{0}] does not have a translation!", oControl.Name) oControl.Text = row.Item("CTRL_TEXT") End Try - Dim oAlignment = oControlRow.ItemEx("TEXT_ALIGNMENT", "Near") + Dim oAlignment = row.ItemEx("TEXT_ALIGNMENT", "Near") If oAlignment = "Near" Then oControl.TextAlign = ContentAlignment.MiddleLeft ElseIf oAlignment = "Center" Then @@ -420,15 +420,38 @@ Public Class ClassControlCreator oControl.AutoCompleteSource = AutoCompleteSource.ListItems End If - Dim oAlignment = pRow.ItemEx("TEXT_ALIGNMENT", "Near") - If oAlignment = "Near" Then - oControl. = ContentAlignment.MiddleLeft - ElseIf oAlignment = "Center" Then - oControl.TextAlign = ContentAlignment.MiddleCenter - ElseIf oAlignment = "Far" Then - oControl.TextAlign = ContentAlignment.MiddleRight - End If + '' Apply text alignment by owner-drawing based on oAlignment + 'Dim oAlignment = pRow.ItemEx("TEXT_ALIGNMENT", "Near") + '' Ensure owner-draw so we can control text alignment + 'oControl.DrawMode = Global.System.Windows.Forms.DrawMode.OwnerDrawFixed + + '' Attach handler with inline drawing logic respecting alignment + 'AddHandler oControl.DrawItem, + 'Sub(sender As Object, e As DrawItemEventArgs) + ' Dim cmb = TryCast(sender, Windows.Forms.ComboBox) + ' If cmb Is Nothing Then Return + ' e.DrawBackground() + ' If e.Index >= 0 AndAlso e.Index < cmb.Items.Count Then + ' Dim text As String = cmb.GetItemText(cmb.Items(e.Index)) + ' Dim sf As New StringFormat(StringFormatFlags.NoWrap) + ' Select Case oAlignment + ' Case "Near" + ' sf.Alignment = StringAlignment.Near + ' Case "Center" + ' sf.Alignment = StringAlignment.Center + ' Case "Far" + ' sf.Alignment = StringAlignment.Far + ' Case Else + ' sf.Alignment = StringAlignment.Near + ' End Select + ' sf.LineAlignment = StringAlignment.Center + ' Using foreBrush As New SolidBrush(If((e.State And DrawItemState.Selected) = DrawItemState.Selected, SystemColors.HighlightText, cmb.ForeColor)) + ' e.Graphics.DrawString(text, e.Font, foreBrush, e.Bounds, sf) + ' End Using + ' End If + ' e.DrawFocusRectangle() + 'End Sub Return oControl End Function @@ -490,18 +513,27 @@ Public Class ClassControlCreator Return control End Function - Public Function CreateExistingLookupControl(row As DataRow, designMode As Boolean) As LookupControl3 - Dim control As LookupControl3 = CreateBaseControl(New LookupControl3(), row, designMode) - control.Properties.Name = control.Name - control.Width = row.Item("WIDTH") - control.ReadOnly = row.Item("READ_ONLY") - control.Properties.AllowAddNewValues = row.Item("VKT_ADD_ITEM") + Public Function CreateExistingLookupControl(pRow As DataRow, pDesignMode As Boolean) As LookupControl3 + Dim oControl As LookupControl3 = CreateBaseControl(New LookupControl3(), pRow, pDesignMode) + oControl.Properties.Name = oControl.Name + oControl.Width = pRow.Item("WIDTH") + oControl.ReadOnly = pRow.Item("READ_ONLY") + oControl.Properties.AllowAddNewValues = pRow.Item("VKT_ADD_ITEM") + Dim oAlignment = pRow.ItemEx("TEXT_ALIGNMENT", "Near") - If designMode Then - control.Cursor = Cursors.Hand + If oAlignment = "Near" Then + oControl.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near + ElseIf oAlignment = "Center" Then + oControl.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center + ElseIf oAlignment = "Far" Then + oControl.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far End If - Return control + If pDesignMode Then + oControl.Cursor = Cursors.Hand + End If + + Return oControl End Function Public Function CreateExistingGridControl(row As DataRow, DT_MY_COLUMNS As DataTable, designMode As Boolean, pcurrencySymbol As String) As GridControl @@ -862,9 +894,4 @@ Public Class ClassControlCreator Next End If End Sub - - - - - End Class diff --git a/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb b/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb index 61ff433..48d141a 100644 --- a/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb +++ b/app/TaskFlow/DD_DMSLiteDataSet.Designer.vb @@ -4587,6 +4587,8 @@ Partial Public Class DD_DMSLiteDataSet Private columnBACKCOLOR_IF As Global.System.Data.DataColumn + Private columnTEXT_ALIGNMENT As Global.System.Data.DataColumn + _ Public Sub New() @@ -4966,6 +4968,14 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property + _ + Public ReadOnly Property TEXT_ALIGNMENTColumn() As Global.System.Data.DataColumn + Get + Return Me.columnTEXT_ALIGNMENT + End Get + End Property + _ @@ -5045,9 +5055,10 @@ Partial Public Class DD_DMSLiteDataSet ByVal TABLE_ORDER_COLUMN As String, _ ByVal SAVE_CHANGE_ON_ENABLED As Boolean, _ ByVal FORMAT_STRING As String, _ - ByVal BACKCOLOR_IF As String) As TBPM_PROFILE_CONTROLSRow + ByVal BACKCOLOR_IF As String, _ + ByVal TEXT_ALIGNMENT 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, FORMAT_STRING, BACKCOLOR_IF} + 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, TEXT_ALIGNMENT} If (Not (parentTBPM_PROFILERowByFK_TBPM_PROFILE_CONTROLS_PROFILE) Is Nothing) Then columnValuesArray(1) = parentTBPM_PROFILERowByFK_TBPM_PROFILE_CONTROLS_PROFILE(0) End If @@ -5122,6 +5133,7 @@ Partial Public Class DD_DMSLiteDataSet 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") + Me.columnTEXT_ALIGNMENT = MyBase.Columns("TEXT_ALIGNMENT") End Sub _ + Public Property TEXT_ALIGNMENT() As String + Get + Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.TEXT_ALIGNMENTColumn),String) + End Get + Set + Me(Me.tableTBPM_PROFILE_CONTROLS.TEXT_ALIGNMENTColumn) = value + End Set + End Property + _ Public Property TBPM_PROFILERow() As TBPM_PROFILERow @@ -20284,6 +20312,7 @@ Namespace DD_DMSLiteDataSetTableAdapters 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") + tableMapping.ColumnMappings.Add("TEXT_ALIGNMENT", "TEXT_ALIGNMENT") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -20298,19 +20327,19 @@ Namespace DD_DMSLiteDataSetTableAdapters "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, "& _ - "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" + "FORMAT_STRING, TEXT_ALIGNMENT)"&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_NAM"& _ + "E,@TYP,@VALIDATION,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH"& _ + ",@FONT_STYLE,@FONT_SIZE,@FONT_FAMILY,@FONT_COLOR,@READ_ONLY,@LOAD_IDX_VALUE,@DEF"& _ + "AULT_VALUE,@MULTISELECT,@VKT_ADD_ITEM,@VKT_PREVENT_MULTIPLE_VALUES,@REGEX_MATCH,"& _ + "@REGEX_MESSAGE_DE,@REGEX_MESSAGE_EN,@IMAGE_CONTROL,@SQL2,@SQL_ENABLE,@SAVE_CHANG"& _ + "E_ON_ENABLED,@FORMAT_STRING,@TEXT_ALIGNMENT); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFIL_ID, NAM"& _ + "E, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANG"& _ + "ED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEF"& _ + "UNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, L"& _ + "OAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VA"& _ + "LUES, 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, "", "", "")) @@ -20348,6 +20377,7 @@ Namespace DD_DMSLiteDataSetTableAdapters 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.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEXT_ALIGNMENT", Global.System.Data.SqlDbType.NVarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT_ALIGNMENT", 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"& _ @@ -20363,14 +20393,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, 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" + "LED = @SAVE_CHANGE_ON_ENABLED, FORMAT_STRING = @FORMAT_STRING, TEXT_ALIGNMENT = "& _ + "@TEXT_ALIGNMENT"&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_WH"& _ + "O, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UE"& _ + "BERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ"& _ + "_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MUL"& _ + "TIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_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, "", "", "")) @@ -20405,6 +20435,7 @@ Namespace DD_DMSLiteDataSetTableAdapters 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("@TEXT_ALIGNMENT", Global.System.Data.SqlDbType.NVarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT_ALIGNMENT", 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 @@ -20430,8 +20461,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, 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" + "BLED, FORMAT_STRING, TEXT_ALIGNMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHER"& _ + "E (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() @@ -20480,18 +20511,20 @@ Namespace DD_DMSLiteDataSetTableAdapters Me._commandCollection(8) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(8).Connection = Me.Connection Me._commandCollection(8).CommandText = "INSERT INTO TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (PROFIL_ID, NAME, CTR"& _ - "L_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, HEIGHT, WIDTH)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@PROF"& _ - "IL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@HEIGHT,@Width)" + "L_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, HEIGHT, WIDTH, TEXT_ALIGNMENT)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALU"& _ + "ES (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@HEIG"& _ + "HT,@Width,@TEXT_ALIGNMENT)" Me._commandCollection(8).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(8).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._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TYPE", Global.System.Data.SqlDbType.VarChar, 10, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TEXT", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TEXT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TEXT", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TEXT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@X_LOC", Global.System.Data.SqlDbType.Float, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "X_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Y_LOC", Global.System.Data.SqlDbType.Float, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "Y_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@HEIGHT", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "HEIGHT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Width", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "WIDTH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(8).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEXT_ALIGNMENT", Global.System.Data.SqlDbType.NVarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT_ALIGNMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(9) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(9).Connection = Me.Connection Me._commandCollection(9).CommandText = "UPDATE TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET INDEX_NAME = @INDEX_NAME,CH"& _ @@ -20511,8 +20544,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, 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" + "AVE_CHANGE_ON_ENABLED, FORMAT_STRING, TEXT_ALIGNMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_PROFI"& _ + "LE_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, "", "", "")) @@ -20669,7 +20702,8 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal SQL2 As String, _ ByVal SQL_ENABLE As String, _ ByVal SAVE_CHANGE_ON_ENABLED As Boolean, _ - ByVal FORMAT_STRING As String) As Integer + ByVal FORMAT_STRING As String, _ + ByVal TEXT_ALIGNMENT 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") @@ -20798,6 +20832,11 @@ Namespace DD_DMSLiteDataSetTableAdapters Else Me.Adapter.InsertCommand.Parameters(35).Value = CType(FORMAT_STRING,String) End If + If (TEXT_ALIGNMENT Is Nothing) Then + Throw New Global.System.ArgumentNullException("TEXT_ALIGNMENT") + Else + Me.Adapter.InsertCommand.Parameters(36).Value = CType(TEXT_ALIGNMENT,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 @@ -20851,6 +20890,7 @@ Namespace DD_DMSLiteDataSetTableAdapters ByVal SQL_ENABLE As String, _ ByVal SAVE_CHANGE_ON_ENABLED As Boolean, _ ByVal FORMAT_STRING As String, _ + ByVal TEXT_ALIGNMENT As String, _ ByVal Original_GUID As Integer, _ ByVal GUID As Integer) As Integer Me.Adapter.UpdateCommand.Parameters(0).Value = CType(PROFIL_ID,Integer) @@ -20970,8 +21010,13 @@ Namespace DD_DMSLiteDataSetTableAdapters 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) + If (TEXT_ALIGNMENT Is Nothing) Then + Throw New Global.System.ArgumentNullException("TEXT_ALIGNMENT") + Else + Me.Adapter.UpdateCommand.Parameters(33).Value = CType(TEXT_ALIGNMENT,String) + End If + Me.Adapter.UpdateCommand.Parameters(34).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(35).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 @@ -21184,9 +21229,8 @@ Namespace DD_DMSLiteDataSetTableAdapters _ - Public Overloads Overridable Function cmdInsertAnlage(ByVal PROFIL_ID As Integer, ByVal NAME As String, ByVal CTRL_TYPE As String, ByVal CTRL_TEXT As String, ByVal X_LOC As Double, ByVal Y_LOC As Double, ByVal ADDED_WHO As String, ByVal HEIGHT As Short, ByVal Width As Short) As Integer + Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ + Public Overloads Overridable Function cmdInsertAnlage(ByVal PROFIL_ID As Integer, ByVal NAME As String, ByVal CTRL_TYPE As String, ByVal CTRL_TEXT As String, ByVal X_LOC As Double, ByVal Y_LOC As Double, ByVal ADDED_WHO As String, ByVal HEIGHT As Short, ByVal Width As Short, ByVal TEXT_ALIGNMENT As String) As Integer Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(8) command.Parameters(0).Value = CType(PROFIL_ID,Integer) If (NAME Is Nothing) Then @@ -21213,6 +21257,11 @@ Namespace DD_DMSLiteDataSetTableAdapters End If command.Parameters(7).Value = CType(HEIGHT,Short) command.Parameters(8).Value = CType(Width,Short) + If (TEXT_ALIGNMENT Is Nothing) Then + Throw New Global.System.ArgumentNullException("TEXT_ALIGNMENT") + Else + command.Parameters(9).Value = CType(TEXT_ALIGNMENT,String) + End If Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State If ((command.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/app/TaskFlow/DD_DMSLiteDataSet.xsd b/app/TaskFlow/DD_DMSLiteDataSet.xsd index 8a5e4c8..0f4c4b5 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, 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); + REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING, TEXT_ALIGNMENT) +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,@TEXT_ALIGNMENT); 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 @@ -1012,6 +1012,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD + @@ -1020,7 +1021,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, FORMAT_STRING + TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING, TEXT_ALIGNMENT FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @guid) ORDER BY Y_LOC, X_LOC @@ -1037,8 +1038,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, FORMAT_STRING = @FORMAT_STRING -WHERE (GUID = @Original_GUID); + SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED, FORMAT_STRING = @FORMAT_STRING, TEXT_ALIGNMENT = @TEXT_ALIGNMENT +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 @@ -1074,6 +1075,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD + @@ -1124,6 +1126,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD + @@ -1211,7 +1214,7 @@ WHERE (GUID = @Guid) - + INSERT INTO TBPM_PROFILE_CONTROLS @@ -1230,6 +1233,25 @@ VALUES (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@ + + + INSERT INTO TBPM_PROFILE_CONTROLS + (PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, HEIGHT, WIDTH, TEXT_ALIGNMENT) +VALUES (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@HEIGHT,@Width,@TEXT_ALIGNMENT) + + + + + + + + + + + + + + @@ -1251,7 +1273,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, FORMAT_STRING + SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED, FORMAT_STRING, TEXT_ALIGNMENT FROM TBPM_PROFILE_CONTROLS AS T WHERE (PROFIL_ID = @profil_id) ORDER BY Y_LOC, X_LOC @@ -2667,6 +2689,13 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME + + + + + + + diff --git a/app/TaskFlow/DD_DMSLiteDataSet.xss b/app/TaskFlow/DD_DMSLiteDataSet.xss index 54cbe7f..f58fec7 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 bc8f695..e293816 100644 --- a/app/TaskFlow/ModuleControlProperties.vb +++ b/app/TaskFlow/ModuleControlProperties.vb @@ -2,6 +2,7 @@ Imports System.ComponentModel.Design Imports System.Drawing.Design Imports System.Globalization +Imports DevExpress.XtraPrinting.Native Imports DigitalData.Modules.Language.Utils Public Module ModuleControlProperties @@ -71,7 +72,33 @@ Public Module ModuleControlProperties + Public Property TextAlignment As String + ' Converter für Dropdown-Werte Near/Center/Far + Public Class TextAlignmentConverter + Inherits TypeConverter + + Public Overrides Function GetStandardValuesSupported(context As ITypeDescriptorContext) As Boolean + Return True + End Function + + ' Optional: True, damit nur die vorgegebenen Werte erlaubt sind + Public Overrides Function GetStandardValuesExclusive(context As ITypeDescriptorContext) As Boolean + Return True + End Function + + Public Overrides Function GetStandardValues(context As ITypeDescriptorContext) As StandardValuesCollection + Dim values = New List(Of String) From {"Near", "Center", "Far"} + Return New StandardValuesCollection(values) + End Function + + Public Overrides Function ConvertTo(context As ITypeDescriptorContext, culture As CultureInfo, value As Object, destinationType As Type) As Object + If destinationType Is GetType(String) Then + Return If(value Is Nothing, "", value.ToString()) + End If + Return MyBase.ConvertTo(context, culture, value, destinationType) + End Function + End Class Class FontConverter Inherits TypeConverter diff --git a/app/TaskFlow/frmFormDesigner.vb b/app/TaskFlow/frmFormDesigner.vb index 4a2f033..74d1eaa 100644 --- a/app/TaskFlow/frmFormDesigner.vb +++ b/app/TaskFlow/frmFormDesigner.vb @@ -592,7 +592,7 @@ Public Class frmFormDesigner Dim oColor As Integer = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), 0) obj.TextColor = IntToColor(oColor) - obj.TextAlignment = ClassAllgemeineFunktionen.NotNullString(row.Item("TEXT_ALIGNMENT"), 0) + obj.TextAlignment = ClassAllgemeineFunktionen.NotNullString(row.Item("TEXT_ALIGNMENT"), "Near") Return obj End Function @@ -615,7 +615,7 @@ Public Class frmFormDesigner obj.Active = StrToBool(row.Item("CONTROL_ACTIVE")) obj.Index = ClassAllgemeineFunktionen.NotNullString(row.Item("INDEX_NAME"), "") obj.DefaultValue = ClassAllgemeineFunktionen.NotNullString(row.Item("DEFAULT_VALUE"), Nothing) - + obj.TextAlignment = ClassAllgemeineFunktionen.NotNullString(row.Item("TEXT_ALIGNMENT"), "Near") ' Default value for ConnectionID Dim oConnectionId = ClassAllgemeineFunktionen.NotNullString(row.Item("CONNECTION_ID"), 0) obj.SQLCommand = New SQLValue(row.Item("SQL_UEBERPRUEFUNG")) @@ -906,7 +906,19 @@ Public Class frmFormDesigner Case "DisplayFormat" UpdateSingleValue("FORMAT_STRING", newValue) - + Case "TextAlignment" + UpdateSingleValue("TEXT_ALIGNMENT", newValue) + Select Case CurrentControl.GetType() + Case GetType(TextEdit) + If TypeOf CurrentControl Is DevExpress.XtraEditors.TextEdit Then + Dim txt = DirectCast(CurrentControl, DevExpress.XtraEditors.TextEdit) + Select Case newValue + Case "Near" : txt.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near + Case "Center" : txt.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center + Case "Far" : txt.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far + End Select + End If + End Select End Select End Sub @@ -1120,14 +1132,13 @@ Public Class frmFormDesigner If Cursor = Cursors.Cross And Mouse_IsPressed = True Then Dim cursorPosition As Point = pnldesigner.PointToClient(Cursor.Position) Mouse_IsPressed = False - Try Select Case NewControlSelected Case ClassControlCreator.PREFIX_LABEL Dim label = ControlCreator.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) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, label.Name, "LBL", label.Text, label.Location.X, label.Location.Y, USER_USERNAME, label.Size.Height, label.Size.Width, label.TextAlign) CHANGES_FORM_DESIGN = True CurrentControl = label CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { @@ -1135,14 +1146,13 @@ Public Class frmFormDesigner .ReadOnly = False } - pnldesigner.Controls.Add(label) Case ClassControlCreator.PREFIX_TEXTBOX Dim txt = ControlCreator.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) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, txt.Name, "TXT", txt.Name, txt.Location.X, txt.Location.Y, USER_USERNAME, txt.Size.Height, txt.Size.Width, txt.Properties.Appearance.TextOptions.HAlignment) CHANGES_FORM_DESIGN = True CurrentControl = txt CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { @@ -1156,7 +1166,7 @@ Public Class frmFormDesigner Dim cmb = ControlCreator.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) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, cmb.Name, "CMB", cmb.Name, cmb.Location.X, cmb.Location.Y, USER_USERNAME, cmb.Size.Height, cmb.Size.Width, "NONE") CHANGES_FORM_DESIGN = True CurrentControl = cmb CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { @@ -1170,7 +1180,7 @@ Public Class frmFormDesigner Dim dtp = ControlCreator.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) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dtp.Name, "DTP", dtp.Name, dtp.Location.X, dtp.Location.Y, USER_USERNAME, dtp.Size.Height, dtp.Size.Width, "NONE") CHANGES_FORM_DESIGN = True CurrentControl = dtp CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { @@ -1184,7 +1194,7 @@ Public Class frmFormDesigner Dim chk = ControlCreator.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) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, chk.Name, "CHK", chk.Text, chk.Location.X, chk.Location.Y, USER_USERNAME, chk.Size.Height, chk.Size.Width, "NONE") CHANGES_FORM_DESIGN = True CurrentControl = chk CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { @@ -1199,7 +1209,7 @@ Public Class frmFormDesigner 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) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, lc.Name, "LOOKUP", lc.Name, lc.Location.X, lc.Location.Y, USER_USERNAME, lc.Size.Height, lc.Size.Width, lc.Properties.Appearance.TextOptions.HAlignment) CHANGES_FORM_DESIGN = True CurrentControl = lc CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { @@ -1215,7 +1225,7 @@ Public Class frmFormDesigner 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) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, tb.Name, "TABLE", tb.Name, tb.Location.X, tb.Location.Y, USER_USERNAME, tb.Size.Height, tb.Size.Width, "NONE") CHANGES_FORM_DESIGN = True Dim oControlId = GetLastID() @@ -1234,7 +1244,7 @@ Public Class frmFormDesigner 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) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, line.Name, "LINE", line.Name, line.Location.X, line.Location.Y, USER_USERNAME, line.Size.Height, line.Size.Width, "NONE") CHANGES_FORM_DESIGN = True CurrentControl = line CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { @@ -1249,7 +1259,7 @@ Public Class frmFormDesigner 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) + TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, oButton.Name, "BUTTON", oButton.Name, oButton.Location.X, oButton.Location.Y, USER_USERNAME, oButton.Size.Height, oButton.Size.Width, "NONE") CHANGES_FORM_DESIGN = True CurrentControl = oButton CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With {