Compare commits
7 Commits
2.7.0-Rele
...
55d7e025c9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
55d7e025c9 | ||
|
|
2f64dc4b70 | ||
|
|
17ec4953e5 | ||
|
|
c29c508224 | ||
|
|
443242415a | ||
|
|
4db9b71a29 | ||
|
|
b526108d5d |
@@ -123,7 +123,6 @@
|
||||
<File Id="DDLogging" Name="DigitalData.Modules.Logging.dll" Source="DigitalData.Modules.Logging.dll"/>
|
||||
<File Id="DDInterfaces" Name="DigitalData.Modules.Interfaces.dll" Source="DigitalData.Modules.Interfaces.dll"/>
|
||||
<File Id="DDBase" Name="DigitalData.Modules.Base.dll" Source="DigitalData.Modules.Base.dll"/>
|
||||
<File Id="DDLanguage" Name="DigitalData.Modules.Language.dll" Source="DigitalData.Modules.Language.dll"/>
|
||||
<File Id="DDFilesystem" Name="DigitalData.Modules.Filesystem.dll" Source="DigitalData.Modules.Filesystem.dll"/>
|
||||
<File Id="DDEncryption" Name="DigitalData.Modules.Encryption.dll" Source="DigitalData.Modules.Encryption.dll"/>
|
||||
<File Id="DDWindream" Name="DigitalData.Modules.Windream.dll" Source="DigitalData.Modules.Windream.dll"/>
|
||||
@@ -277,14 +276,13 @@
|
||||
</RegistryKey>
|
||||
</RegistryKey>
|
||||
|
||||
<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="APPLICATIONFOLDER" />
|
||||
<util:RemoveFolderEx Id="RemoveApplicationFolder" On="uninstall" Property="INSTALLDIR" />
|
||||
</Component>
|
||||
</DirectoryRef>
|
||||
|
||||
<Feature Id="MainApplication" Title="Main Application" Level="1">
|
||||
<ComponentRef Id="MainApplicationExe" />
|
||||
<ComponentRef Id="RegistryKeys" />
|
||||
<!--<ComponentRef Id="ReleaseNotes" />-->
|
||||
<ComponentRef Id="WindreamLibs" />
|
||||
<ComponentRef Id="FormsUtilsLibs"/>
|
||||
<ComponentRef Id="DDLibs" />
|
||||
@@ -294,6 +292,7 @@
|
||||
<ComponentRef Id="DevExpressLibs" />
|
||||
<ComponentRef Id="GDPictureLibs" />
|
||||
<ComponentRef Id="Devexpress.Locales.de" />
|
||||
<ComponentRef Id="ProtocolHandlerMachine" />
|
||||
</Feature>
|
||||
|
||||
<Feature Id="DesktopShortcut" Title="Desktop Shortcut">
|
||||
@@ -305,7 +304,28 @@
|
||||
<Condition Level="0">DISABLE_STARTMENU_ICON</Condition>
|
||||
<ComponentRef Id="ApplicationShortcut_StartMenu" />
|
||||
</Feature>
|
||||
<!-- #######################-->
|
||||
<!-- Beginn Aufruf über Link-->
|
||||
<!-- Per-user ProtocolHandler (HKCU) -->
|
||||
<Component Id="ProtocolHandlerMachine" Guid="F2817163-DAAA-4EB2-A8D9-A9EF00E910C0" Directory="INSTALLDIR">
|
||||
<!-- Basis-Schlüssel -->
|
||||
<RegistryKey Root="HKLM" Key="Software\Classes\DDtaskFLOW" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
|
||||
<RegistryValue Type="string" Value="URL:ddtaskflow Protocol" KeyPath="yes"/>
|
||||
<RegistryValue Type="string" Name="URL Protocol" Value="" />
|
||||
</RegistryKey>
|
||||
|
||||
<!-- Icon -->
|
||||
<RegistryKey Root="HKLM" Key="Software\Classes\DDtaskFLOW\DefaultIcon" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
|
||||
<RegistryValue Type="string" Value="[INSTALLDIR]taskFLOW.exe,1" />
|
||||
</RegistryKey>
|
||||
|
||||
<!-- Kommando -->
|
||||
<RegistryKey Root="HKLM" Key="Software\Classes\DDtaskFLOW\shell\open\command" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
|
||||
<RegistryValue Type="string" Value=""[INSTALLDIR]taskFLOW.exe" "%1"" />
|
||||
</RegistryKey>
|
||||
</Component>
|
||||
<!-- Ende Aufruf über Link-->
|
||||
<!-- #######################-->
|
||||
<!-- Legt das Standard-Installationsverzeichnis fest-->
|
||||
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
|
||||
<Property Id="_BrowseProperty" Value="INSTALLDIR" />
|
||||
|
||||
@@ -148,8 +148,6 @@ Public Class ClassControlCreator
|
||||
ctrl.Location = props.Location
|
||||
ctrl.Font = props.Font
|
||||
ctrl.ForeColor = props.Color
|
||||
|
||||
|
||||
If designMode Then
|
||||
ctrl.Cursor = Cursors.Hand
|
||||
End If
|
||||
@@ -310,6 +308,7 @@ Public Class ClassControlCreator
|
||||
Dim oFormatString = oControlRow.ItemEx("FORMAT_STRING", String.Empty)
|
||||
Dim oBackColorIf = oControlRow.ItemEx("CTRL_BACKCOLOR_IF", String.Empty)
|
||||
Dim oIndexname = oControlRow.ItemEx("INDEX_NAME", String.Empty)
|
||||
Dim oAlignment = oControlRow.ItemEx("TEXT_ALIGNMENT", "Near")
|
||||
Dim oControl As BaseEdit = Nothing
|
||||
If oHeight >= 27 Then
|
||||
oControl = CreateBaseControl(New MemoEdit(), oControlRow, designMode)
|
||||
@@ -324,6 +323,13 @@ Public Class ClassControlCreator
|
||||
|
||||
oControl.Height = oHeight
|
||||
oControl.Width = oWidth
|
||||
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
|
||||
|
||||
If Not designMode Then
|
||||
'oControl.ReadOnly = oReadOnly
|
||||
@@ -352,17 +358,24 @@ Public Class ClassControlCreator
|
||||
End Function
|
||||
|
||||
Public Function CreateExistingLabel(row As DataRow, designMode As Boolean) As Label
|
||||
Dim control As Label = CreateBaseControl(New Label(), row, designMode)
|
||||
Dim oControl As Label = CreateBaseControl(New Label(), row, designMode)
|
||||
Try
|
||||
control.Text = row.Item("CTRL_CAPTION_LANG")
|
||||
oControl.Text = row.Item("CTRL_CAPTION_LANG")
|
||||
Catch ex As Exception
|
||||
Logger.Warn("Label [{0}] does not have a translation!", control.Name)
|
||||
control.Text = row.Item("CTRL_TEXT")
|
||||
Logger.Warn("Label [{0}] does not have a translation!", oControl.Name)
|
||||
oControl.Text = row.Item("CTRL_TEXT")
|
||||
End Try
|
||||
Dim oAlignment = row.ItemEx("TEXT_ALIGNMENT", "Near")
|
||||
If oAlignment = "Near" Then
|
||||
oControl.TextAlign = ContentAlignment.MiddleLeft
|
||||
ElseIf oAlignment = "Center" Then
|
||||
oControl.TextAlign = ContentAlignment.MiddleCenter
|
||||
ElseIf oAlignment = "Far" Then
|
||||
oControl.TextAlign = ContentAlignment.MiddleRight
|
||||
End If
|
||||
oControl.AutoSize = True
|
||||
|
||||
control.AutoSize = True
|
||||
|
||||
Return control
|
||||
Return oControl
|
||||
End Function
|
||||
|
||||
Public Function CreateExistingButton(row As DataRow, designMode As Boolean) As Button
|
||||
@@ -394,21 +407,53 @@ Public Class ClassControlCreator
|
||||
|
||||
Return oControl
|
||||
End Function
|
||||
Public Function CreateExistingCombobox(row As DataRow, designMode As Boolean) As Windows.Forms.ComboBox
|
||||
Dim control As Windows.Forms.ComboBox = CreateBaseControl(New Windows.Forms.ComboBox(), row, designMode)
|
||||
|
||||
control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
|
||||
Public Function CreateExistingCombobox(pRow As DataRow, designMode As Boolean) As Windows.Forms.ComboBox
|
||||
Dim oControl As Windows.Forms.ComboBox = CreateBaseControl(New Windows.Forms.ComboBox(), pRow, designMode)
|
||||
oControl.Size = New Size(pRow.Item("WIDTH"), pRow.Item("HEIGHT"))
|
||||
|
||||
If Not designMode Then
|
||||
control.Enabled = Not row.Item("READ_ONLY")
|
||||
control.TabStop = Not row.Item("READ_ONLY")
|
||||
control.BackColor = IIf(row.Item("READ_ONLY"), Color.LightGray, Color.White)
|
||||
oControl.Enabled = Not pRow.Item("READ_ONLY")
|
||||
oControl.TabStop = Not pRow.Item("READ_ONLY")
|
||||
oControl.BackColor = IIf(pRow.Item("READ_ONLY"), Color.LightGray, Color.White)
|
||||
|
||||
control.AutoCompleteMode = AutoCompleteMode.SuggestAppend
|
||||
control.AutoCompleteSource = AutoCompleteSource.ListItems
|
||||
oControl.AutoCompleteMode = AutoCompleteMode.SuggestAppend
|
||||
oControl.AutoCompleteSource = AutoCompleteSource.ListItems
|
||||
End If
|
||||
|
||||
Return control
|
||||
'' 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
|
||||
|
||||
Public Function CreateExistingDatepicker(row As DataRow, designMode As Boolean) As DateTimePicker
|
||||
@@ -468,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
|
||||
@@ -840,9 +894,4 @@ Public Class ClassControlCreator
|
||||
Next
|
||||
End If
|
||||
End Sub
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
End Class
|
||||
|
||||
@@ -380,6 +380,7 @@ Public Class ClassInit
|
||||
LOGGER.Debug("User Info:")
|
||||
LOGGER.Debug("Language: [{0}]", USER_LANGUAGE)
|
||||
LOGGER.Debug("Username: [{0}]", USER_USERNAME)
|
||||
LOGGER.Debug("Environment.MachineName: [{0}]", Environment.MachineName)
|
||||
|
||||
Try
|
||||
USER_RIGHT_FILE_DELETE = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")), False, DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL"))
|
||||
|
||||
@@ -343,6 +343,10 @@ Namespace ControlCreator
|
||||
Private Sub View_PopupMenuShowing(sender As Object, e As PopupMenuShowingEventArgs)
|
||||
Dim view As GridView = TryCast(sender, GridView)
|
||||
Dim oFocusedColumn As GridColumn = view.FocusedColumn
|
||||
If IsNothing(oFocusedColumn) Then
|
||||
MsgBox("Please focus a column first.", MsgBoxStyle.Information, "No Column focused")
|
||||
Exit Sub
|
||||
End If
|
||||
Dim oColumnType As Type = oFocusedColumn.ColumnType
|
||||
Dim oColumnName As String = oFocusedColumn.FieldName
|
||||
|
||||
|
||||
121
app/TaskFlow/DD_DMSLiteDataSet.Designer.vb
generated
121
app/TaskFlow/DD_DMSLiteDataSet.Designer.vb
generated
@@ -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
|
||||
|
||||
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _
|
||||
Public Sub New()
|
||||
@@ -4966,6 +4968,14 @@ Partial Public Class DD_DMSLiteDataSet
|
||||
End Get
|
||||
End Property
|
||||
|
||||
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _
|
||||
Public ReadOnly Property TEXT_ALIGNMENTColumn() As Global.System.Data.DataColumn
|
||||
Get
|
||||
Return Me.columnTEXT_ALIGNMENT
|
||||
End Get
|
||||
End Property
|
||||
|
||||
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0"), _
|
||||
Global.System.ComponentModel.Browsable(false)> _
|
||||
@@ -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
|
||||
|
||||
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
@@ -5213,6 +5225,8 @@ Partial Public Class DD_DMSLiteDataSet
|
||||
MyBase.Columns.Add(Me.columnFORMAT_STRING)
|
||||
Me.columnBACKCOLOR_IF = New Global.System.Data.DataColumn("BACKCOLOR_IF", GetType(String), Nothing, Global.System.Data.MappingType.Element)
|
||||
MyBase.Columns.Add(Me.columnBACKCOLOR_IF)
|
||||
Me.columnTEXT_ALIGNMENT = New Global.System.Data.DataColumn("TEXT_ALIGNMENT", GetType(String), Nothing, Global.System.Data.MappingType.Element)
|
||||
MyBase.Columns.Add(Me.columnTEXT_ALIGNMENT)
|
||||
Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true))
|
||||
Me.columnGUID.AutoIncrement = true
|
||||
Me.columnGUID.AllowDBNull = false
|
||||
@@ -5260,6 +5274,9 @@ Partial Public Class DD_DMSLiteDataSet
|
||||
Me.columnTABLE_ORDER_COLUMN.MaxLength = 250
|
||||
Me.columnSAVE_CHANGE_ON_ENABLED.AllowDBNull = false
|
||||
Me.columnFORMAT_STRING.AllowDBNull = false
|
||||
Me.columnTEXT_ALIGNMENT.AllowDBNull = false
|
||||
Me.columnTEXT_ALIGNMENT.DefaultValue = CType("Near",String)
|
||||
Me.columnTEXT_ALIGNMENT.MaxLength = 20
|
||||
End Sub
|
||||
|
||||
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
@@ -12568,6 +12585,17 @@ Partial Public Class DD_DMSLiteDataSet
|
||||
End Set
|
||||
End Property
|
||||
|
||||
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _
|
||||
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
|
||||
|
||||
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")> _
|
||||
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
|
||||
|
||||
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0"), _
|
||||
Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _
|
||||
Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, false)> _
|
||||
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
|
||||
|
||||
@@ -972,8 +972,8 @@ WHERE (GUID = @Original_GUID)</CommandText>
|
||||
<CommandText>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</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="PROFIL_ID" ColumnName="PROFIL_ID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFIL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFIL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
@@ -1012,6 +1012,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="SQL_ENABLE" ColumnName="SQL_ENABLE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL_ENABLE" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL_ENABLE" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="SAVE_CHANGE_ON_ENABLED" ColumnName="SAVE_CHANGE_ON_ENABLED" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SAVE_CHANGE_ON_ENABLED" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SAVE_CHANGE_ON_ENABLED" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="FORMAT_STRING" ColumnName="FORMAT_STRING" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(200)" DbType="AnsiString" Direction="Input" ParameterName="@FORMAT_STRING" Precision="0" ProviderType="VarChar" Scale="0" Size="200" SourceColumn="FORMAT_STRING" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="TEXT_ALIGNMENT" ColumnName="TEXT_ALIGNMENT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(20)" DbType="String" Direction="Input" ParameterName="@TEXT_ALIGNMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="20" SourceColumn="TEXT_ALIGNMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</InsertCommand>
|
||||
@@ -1020,7 +1021,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD
|
||||
<CommandText>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</CommandText>
|
||||
@@ -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</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="PROFIL_ID" ColumnName="PROFIL_ID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFIL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFIL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
@@ -1074,6 +1075,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="SQL_ENABLE" ColumnName="SQL_ENABLE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL_ENABLE" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL_ENABLE" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="SAVE_CHANGE_ON_ENABLED" ColumnName="SAVE_CHANGE_ON_ENABLED" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SAVE_CHANGE_ON_ENABLED" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SAVE_CHANGE_ON_ENABLED" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="FORMAT_STRING" ColumnName="FORMAT_STRING" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(200)" DbType="AnsiString" Direction="Input" ParameterName="@FORMAT_STRING" Precision="0" ProviderType="VarChar" Scale="0" Size="200" SourceColumn="FORMAT_STRING" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="TEXT_ALIGNMENT" ColumnName="TEXT_ALIGNMENT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(20)" DbType="String" Direction="Input" ParameterName="@TEXT_ALIGNMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="20" SourceColumn="TEXT_ALIGNMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
</Parameters>
|
||||
@@ -1124,6 +1126,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD
|
||||
<Mapping SourceColumn="TABLE_ORDER_COLUMN" DataSetColumn="TABLE_ORDER_COLUMN" />
|
||||
<Mapping SourceColumn="SAVE_CHANGE_ON_ENABLED" DataSetColumn="SAVE_CHANGE_ON_ENABLED" />
|
||||
<Mapping SourceColumn="FORMAT_STRING" DataSetColumn="FORMAT_STRING" />
|
||||
<Mapping SourceColumn="TEXT_ALIGNMENT" DataSetColumn="TEXT_ALIGNMENT" />
|
||||
</Mappings>
|
||||
<Sources>
|
||||
<DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="cmdControlExists" Modifier="Public" Name="cmdControlExists" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="cmdControlExists">
|
||||
@@ -1211,7 +1214,7 @@ WHERE (GUID = @Guid)</CommandText>
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
</DbSource>
|
||||
<DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="cmdInsertAnlage" Modifier="Public" Name="cmdInsertAnlage" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy7" UserSourceName="cmdInsertAnlage">
|
||||
<DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DbObjectType="Table" GenerateShortCommands="true" GeneratorSourceName="cmdInsertAnlage" Modifier="Public" Name="cmdInsertAnlage" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy7" UserSourceName="cmdInsertAnlage">
|
||||
<InsertCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>INSERT INTO TBPM_PROFILE_CONTROLS
|
||||
@@ -1230,6 +1233,25 @@ VALUES (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</InsertCommand>
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>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)</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="PROFIL_ID" ColumnName="PROFIL_ID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFIL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFIL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="CTRL_TYPE" ColumnName="CTRL_TYPE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="CTRL_TYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="CTRL_TEXT" ColumnName="CTRL_TEXT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TEXT" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="CTRL_TEXT" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="X_LOC" ColumnName="X_LOC" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@X_LOC" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="X_LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="Y_LOC" ColumnName="Y_LOC" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@Y_LOC" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="Y_LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="HEIGHT" ColumnName="HEIGHT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@HEIGHT" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="HEIGHT" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="Width" ColumnName="WIDTH" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@Width" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="WIDTH" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="TEXT_ALIGNMENT" ColumnName="TEXT_ALIGNMENT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(20)" DbType="String" Direction="Input" ParameterName="@TEXT_ALIGNMENT" Precision="0" ProviderType="NVarChar" Scale="0" Size="20" SourceColumn="TEXT_ALIGNMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
</DbSource>
|
||||
<DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="cmdUpdateIndexname" Modifier="Public" Name="cmdUpdateIndexname" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy8" UserSourceName="cmdUpdateIndexname">
|
||||
<UpdateCommand>
|
||||
@@ -1251,7 +1273,7 @@ WHERE (GUID = @Original_GUID);</CommandText>
|
||||
<CommandText>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</CommandText>
|
||||
@@ -2667,6 +2689,13 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME
|
||||
<xs:element name="SAVE_CHANGE_ON_ENABLED" msprop:Generator_ColumnPropNameInTable="SAVE_CHANGE_ON_ENABLEDColumn" msprop:Generator_ColumnPropNameInRow="SAVE_CHANGE_ON_ENABLED" msprop:Generator_UserColumnName="SAVE_CHANGE_ON_ENABLED" msprop:Generator_ColumnVarNameInTable="columnSAVE_CHANGE_ON_ENABLED" type="xs:boolean" />
|
||||
<xs:element name="FORMAT_STRING" msprop:Generator_ColumnPropNameInTable="FORMAT_STRINGColumn" msprop:Generator_ColumnPropNameInRow="FORMAT_STRING" msprop:Generator_UserColumnName="FORMAT_STRING" msprop:Generator_ColumnVarNameInTable="columnFORMAT_STRING" type="xs:string" />
|
||||
<xs:element name="BACKCOLOR_IF" msprop:Generator_ColumnPropNameInTable="BACKCOLOR_IFColumn" msprop:Generator_ColumnPropNameInRow="BACKCOLOR_IF" msprop:Generator_UserColumnName="BACKCOLOR_IF" msprop:Generator_ColumnVarNameInTable="columnBACKCOLOR_IF" type="xs:string" minOccurs="0" />
|
||||
<xs:element name="TEXT_ALIGNMENT" msprop:Generator_UserColumnName="TEXT_ALIGNMENT" msprop:Generator_ColumnPropNameInTable="TEXT_ALIGNMENTColumn" msprop:Generator_ColumnPropNameInRow="TEXT_ALIGNMENT" msprop:Generator_ColumnVarNameInTable="columnTEXT_ALIGNMENT" default="Near">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="20" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
Changes to this file may cause incorrect behavior and will be lost if
|
||||
the code is regenerated.
|
||||
</autogenerated>-->
|
||||
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-27" ViewPortY="-97" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
|
||||
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-27" ViewPortY="91" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
|
||||
<Shapes>
|
||||
<Shape ID="DesignTable:TBPM_PROFILE_FINAL_INDEXING" ZOrder="14" X="1688" Y="-74" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
|
||||
<Shape ID="DesignTable:TBPM_KONFIGURATION" ZOrder="2" X="-17" Y="232" Height="262" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="97" />
|
||||
|
||||
@@ -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
|
||||
@@ -69,6 +70,35 @@ Public Module ModuleControlProperties
|
||||
<Category(ClassConstants.CAT_DISPLAY)>
|
||||
Public Property TextColor As Color
|
||||
|
||||
<DisplayName("Text Alignement")>
|
||||
<Category(ClassConstants.CAT_DISPLAY)>
|
||||
<TypeConverter(GetType(TextAlignmentConverter))>
|
||||
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
|
||||
|
||||
|
||||
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("2.7.4.0")>
|
||||
<Assembly: AssemblyVersion("2.7.5.0")>
|
||||
<Assembly: AssemblyFileVersion("1.0.0.0")>
|
||||
<Assembly: NeutralResourcesLanguage("")>
|
||||
|
||||
@@ -77,12 +77,12 @@
|
||||
<PropertyGroup>
|
||||
<ApplicationManifest>My Project\app.manifest</ApplicationManifest>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<GdPictureAssemblies Include="$(SolutionDir)lib\GdPicture14*.dll" />
|
||||
</ItemGroup>
|
||||
<Target Name="CopyGdPictureDlls" AfterTargets="Build">
|
||||
<Copy SourceFiles="@(GdPictureAssemblies)" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
|
||||
</Target>
|
||||
<ItemGroup>
|
||||
<GdPictureAssemblies Include="$(SolutionDir)lib\GdPicture14*.dll" />
|
||||
</ItemGroup>
|
||||
<Target Name="CopyGdPictureDlls" AfterTargets="Build">
|
||||
<Copy SourceFiles="@(GdPictureAssemblies)" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
|
||||
</Target>
|
||||
<ItemGroup>
|
||||
<Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
|
||||
@@ -1036,6 +1036,7 @@
|
||||
<None Include="FinalIndexDataSet.xss">
|
||||
<DependentUpon>FinalIndexDataSet.xsd</DependentUpon>
|
||||
</None>
|
||||
<None Include="frmValidator.v" />
|
||||
<None Include="My Project\app.manifest" />
|
||||
<None Include="My Project\Application.myapp">
|
||||
<Generator>MyApplicationCodeGenerator</Generator>
|
||||
|
||||
@@ -582,16 +582,17 @@ Public Class frmFormDesigner
|
||||
obj.ChangedAt = ClassAllgemeineFunktionen.NotNullDate(row.Item("CHANGED_WHEN"), Nothing)
|
||||
obj.ChangedWho = ClassAllgemeineFunktionen.NotNullString(row.Item("CHANGED_WHO"), "")
|
||||
|
||||
Dim style As FontStyle = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_STYLE"), FontStyle.Regular)
|
||||
Dim size As Single = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_SIZE"), 10)
|
||||
Dim familyString As String = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_FAMILY"), "Arial")
|
||||
Dim family As FontFamily = New FontFamily(familyString)
|
||||
Dim oStyle As FontStyle = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_STYLE"), FontStyle.Regular)
|
||||
Dim oSize As Single = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_SIZE"), 10)
|
||||
Dim oFamilyString As String = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_FAMILY"), "Arial")
|
||||
Dim oFamily As FontFamily = New FontFamily(oFamilyString)
|
||||
|
||||
obj.Font = New Font(family, size, style)
|
||||
obj.Font = New Font(oFamily, oSize, oStyle)
|
||||
|
||||
Dim color As Integer = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), 0)
|
||||
Dim oColor As Integer = ClassAllgemeineFunktionen.NotNullString(row.Item("FONT_COLOR"), 0)
|
||||
|
||||
obj.TextColor = IntToColor(color)
|
||||
obj.TextColor = IntToColor(oColor)
|
||||
obj.TextAlignment = ClassAllgemeineFunktionen.NotNullString(row.Item("TEXT_ALIGNMENT"), "Near")
|
||||
|
||||
Return obj
|
||||
End Function
|
||||
@@ -614,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"))
|
||||
@@ -905,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
|
||||
|
||||
@@ -1119,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 {
|
||||
@@ -1134,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 {
|
||||
@@ -1155,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 {
|
||||
@@ -1169,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 {
|
||||
@@ -1183,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 {
|
||||
@@ -1198,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 {
|
||||
@@ -1214,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()
|
||||
|
||||
@@ -1233,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 {
|
||||
@@ -1248,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 {
|
||||
|
||||
0
app/TaskFlow/frmValidator.v
Normal file
0
app/TaskFlow/frmValidator.v
Normal file
@@ -1,5 +1,14 @@
|
||||
Imports DevExpress.DataAccess.Native.Sql
|
||||
Imports System.ComponentModel
|
||||
'Imports System.Data.SqlClient
|
||||
Imports System.Globalization
|
||||
Imports System.IO
|
||||
Imports System.Reflection
|
||||
Imports System.Runtime.InteropServices
|
||||
Imports System.Text.RegularExpressions
|
||||
Imports System.Threading
|
||||
Imports DevExpress.DataAccess.Native.Sql
|
||||
Imports DevExpress.Utils
|
||||
Imports DevExpress.Utils.Automation
|
||||
Imports DevExpress.XtraBars
|
||||
Imports DevExpress.XtraEditors
|
||||
Imports DevExpress.XtraEditors.Mask
|
||||
@@ -19,14 +28,6 @@ Imports DigitalData.Modules.Interfaces
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports DigitalData.Modules.ZooFlow
|
||||
Imports DigitalData.Modules.ZooFlow.Constants
|
||||
Imports System.ComponentModel
|
||||
'Imports System.Data.SqlClient
|
||||
Imports System.Globalization
|
||||
Imports System.IO
|
||||
Imports System.Reflection
|
||||
Imports System.Runtime.InteropServices
|
||||
Imports System.Text.RegularExpressions
|
||||
Imports System.Threading
|
||||
'Imports System.Windows.Forms.VisualStyles.VisualStyleElement
|
||||
'Imports System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox
|
||||
Imports WINDREAMLib
|
||||
@@ -1774,7 +1775,7 @@ Public Class frmValidator
|
||||
Else
|
||||
oDateEdit.EditValue = Nothing
|
||||
End If
|
||||
|
||||
|
||||
Catch ex As Exception
|
||||
MyValidationLogger.Warn($"Error While Control2Set (DateEdit): {ex.Message}")
|
||||
End Try
|
||||
@@ -2739,6 +2740,33 @@ Public Class frmValidator
|
||||
' oErrorMessage = IDB_GetDocInfo()
|
||||
End If
|
||||
|
||||
Dim oCurrency As String
|
||||
If PROFIL_CURRENCY_ATTRIBUTE <> "" Then
|
||||
oCurrency = GetVariableValuefromSource(PROFIL_CURRENCY_ATTRIBUTE, 1, False)
|
||||
MyValidationLogger.Debug(String.Format("Read oCurrency from Attribute: {0} is {1}", PROFIL_CURRENCY_ATTRIBUTE, oCurrency))
|
||||
Else
|
||||
oCurrency = "EUR"
|
||||
MyValidationLogger.Debug(String.Format("oCurrency by default is {0}", oCurrency))
|
||||
End If
|
||||
If Not IsNothing(oCurrency) Then
|
||||
DocCurrency = oCurrency
|
||||
Dim oValueType = DocCurrency.GetType.ToString
|
||||
If IsDBNull(DocCurrency) Then
|
||||
DocCurrency = "EUR"
|
||||
Else
|
||||
Try
|
||||
DocCurrency = DocCurrency.ToString
|
||||
Catch ex As Exception
|
||||
MyValidationLogger.Warn($"Unexpected error in Converting oCurreny to string: " & ex.Message)
|
||||
DocCurrency = "EUR"
|
||||
End Try
|
||||
End If
|
||||
Else
|
||||
MyValidationLogger.Warn($"oCurrency is Nothing - Check PROFIL_CURRENCY_ATTRIBUTE! ")
|
||||
|
||||
End If
|
||||
|
||||
|
||||
|
||||
|
||||
If oErrMsgMissingInput = "" Then
|
||||
@@ -2788,27 +2816,10 @@ Public Class frmValidator
|
||||
End If
|
||||
End If
|
||||
Try
|
||||
Dim oCurrency As String
|
||||
If PROFIL_CURRENCY_ATTRIBUTE <> "" Then
|
||||
oCurrency = GetVariableValuefromSource(PROFIL_CURRENCY_ATTRIBUTE, 1, False)
|
||||
Else
|
||||
oCurrency = "EUR"
|
||||
End If
|
||||
|
||||
If Not IsNothing(oCurrency) Then
|
||||
DocCurrency = oCurrency
|
||||
Dim oValueType = DocCurrency.GetType.ToString
|
||||
If IsDBNull(DocCurrency) Then
|
||||
DocCurrency = "EUR"
|
||||
Else
|
||||
Try
|
||||
DocCurrency = DocCurrency.ToString
|
||||
Catch ex As Exception
|
||||
MyValidationLogger.Warn($"Unexpected error in Converting oCurreny to string: " & ex.Message)
|
||||
DocCurrency = "EUR"
|
||||
End Try
|
||||
End If
|
||||
If DocCurrency <> String.Empty Then
|
||||
|
||||
|
||||
If DocCurrency <> String.Empty Then
|
||||
If DocCurrency.ToString.Length <> 3 Then
|
||||
MyValidationLogger.Info("DocCurrency-Length = 3 - Setting to EUR")
|
||||
DocCurrency = "EUR"
|
||||
@@ -2861,10 +2872,7 @@ Public Class frmValidator
|
||||
Else
|
||||
MyValidationLogger.Warn($"DocCurrency is String.empty! ")
|
||||
End If
|
||||
Else
|
||||
MyValidationLogger.Warn($"oCurrency is Nothing - Check PROFIL_CURRENCY_ATTRIBUTE! ")
|
||||
|
||||
End If
|
||||
Catch ex As Exception
|
||||
MyValidationLogger.Warn($"Unexpected error in display format Currency: " & ex.Message)
|
||||
End Try
|
||||
@@ -3397,6 +3405,9 @@ Public Class frmValidator
|
||||
|
||||
oTextBox.EditValue = ObjectEx.NotNull(oValueFromSource, oDefaultValue)
|
||||
|
||||
If oControl.GetType = GetType(DevExpress.XtraEditors.TextEdit) And oFormatString = "CURRENCY" Then
|
||||
ApplyCurrencyMask(oTextBox)
|
||||
End If
|
||||
Try
|
||||
Dim oBackColor As String = oControlRow.Item("CTRL_BACKCOLOR_IF")
|
||||
If oBackColor <> String.Empty Then
|
||||
@@ -3574,28 +3585,53 @@ Public Class frmValidator
|
||||
For Each Zeile As Object In oValueFromSource
|
||||
MyValidationLogger.Debug($"vektorrow Value {Zeile.ToString}...")
|
||||
oColValuesfromSource = Split(Zeile, PMDelimiter)
|
||||
|
||||
Dim oNewRow = oDataSource.NewRow()
|
||||
MyValidationLogger.Debug("Creating new row..")
|
||||
|
||||
|
||||
For index = 0 To oDTColumnsPerDevExGrid.Rows.Count - 1
|
||||
MyValidationLogger.Debug("Column Index {0}", index)
|
||||
If oColValuesfromSource.Length > index Then
|
||||
MyValidationLogger.Debug("Value: {0}", oColValuesfromSource(index))
|
||||
oNewRow.Item(index) = oColValuesfromSource(index)
|
||||
Else
|
||||
MyValidationLogger.Debug("Value: String.Empty")
|
||||
oNewRow.Item(index) = String.Empty
|
||||
End If
|
||||
Dim rawValue As String = If(index < oColValuesfromSource.Length, oColValuesfromSource(index), String.Empty)
|
||||
Dim targetColumn As DataColumn = oDataSource.Columns(index)
|
||||
Dim colName As String = targetColumn.ColumnName
|
||||
Dim colType As String = targetColumn.DataType.FullName
|
||||
|
||||
' Detailliertes Debug vor der Zuweisung
|
||||
MyValidationLogger.Debug("Grid row assign: RowIdx={0}, ColIdx={1}, ColName={2}, ColType={3}, RawValue=[{4}], IsEmpty={5}",
|
||||
oDataSource.Rows.Count, index, colName, colType, rawValue, String.IsNullOrWhiteSpace(rawValue))
|
||||
|
||||
Try
|
||||
If oColValuesfromSource.Length > index Then
|
||||
oNewRow.Item(index) = oColValuesfromSource(index)
|
||||
Else
|
||||
If colType = "System.Double" Or colType = "System.Int32" Or colType = "System.Int64" Then
|
||||
' Numerische Spalten können nicht mit Empty befüllt werden
|
||||
oNewRow.Item(index) = 0
|
||||
Else
|
||||
oNewRow.Item(index) = String.Empty
|
||||
End If
|
||||
End If
|
||||
Catch ex As Exception
|
||||
' Ausführliches Logging bei Fehlern inkl. aktuell bekannter Metadaten
|
||||
MyValidationLogger.Warn("Grid row assign FAILED RowIdx = {0}, ColIdx={1}, ColName={2}, ColType={3}, RawValue=[{4}]",
|
||||
oDataSource.Rows.Count, index, colName, colType, rawValue)
|
||||
MyValidationLogger.Error(ex)
|
||||
' Optional: weitere Kontexthilfe – z.B. ob Spalte DBNull erlaubt
|
||||
Try
|
||||
MyValidationLogger.Debug("Column.AllowDBNull={0}, Column.MaxLength={1}", targetColumn.AllowDBNull, targetColumn.MaxLength)
|
||||
Catch
|
||||
End Try
|
||||
' Fehler weiterwerfen, damit ursprüngliches Verhalten erhalten bleibt
|
||||
Throw
|
||||
End Try
|
||||
Next
|
||||
MyValidationLogger.Debug("Adding row to grid..")
|
||||
MyValidationLogger.Debug("Adding row To grid..")
|
||||
oDataSource.Rows.Add(oNewRow)
|
||||
|
||||
|
||||
Next
|
||||
Else
|
||||
If oValueType = "System.String" Then
|
||||
MyValidationLogger.Debug($"IDB Fill Grid [{oControl.Name}] with String")
|
||||
MyValidationLogger.Debug($"IDB Fill Grid [{oControl.Name}] With String")
|
||||
MyValidationLogger.Debug($"oValueFromSource [{oValueFromSource}] - PMDelimiter[{PMDelimiter}]")
|
||||
|
||||
oColValuesfromSource = Split(oValueFromSource.ToString, PMDelimiter)
|
||||
@@ -3604,7 +3640,7 @@ Public Class frmValidator
|
||||
End If
|
||||
|
||||
Dim oRowData As New List(Of Object)
|
||||
MyValidationLogger.Debug(String.Format("Now creating the rows for DevexpressGrid ..."))
|
||||
MyValidationLogger.Debug(String.Format("Now creating the rows For DevexpressGrid ..."))
|
||||
Dim oMSG = ""
|
||||
Try
|
||||
For index = 1 To oColValuesfromSource.Length
|
||||
@@ -3617,9 +3653,9 @@ Public Class frmValidator
|
||||
oRowData.Add(oConvertedValue)
|
||||
Next
|
||||
Catch ex As Exception
|
||||
MyValidationLogger.Warn(String.Format("Unexpected error while working on IDB Fill GridControl: {0}", oControl.Name))
|
||||
MyValidationLogger.Warn(String.Format("Unexpected Error While working On IDB Fill GridControl {0}", oControl.Name))
|
||||
If Not oMSG = String.Empty Then
|
||||
MyValidationLogger.Warn(String.Format("oMSG: {0}", oMSG))
|
||||
MyValidationLogger.Warn(String.Format("oMSG {0}", oMSG))
|
||||
End If
|
||||
MyValidationLogger.Error(ex)
|
||||
End Try
|
||||
@@ -3630,14 +3666,14 @@ Public Class frmValidator
|
||||
|
||||
ElseIf oValueType = "System.Data.DataTable" Then
|
||||
Dim oMyDatatable As DataTable = oValueFromSource
|
||||
MyValidationLogger.Debug($"IDB Fill Grid [{oControl.Name}] with Datatable - Rows: " & oMyDatatable.Rows.Count)
|
||||
MyValidationLogger.Debug($"IDB Fill Grid [{oControl.Name}] With Datatable - Rows " & oMyDatatable.Rows.Count)
|
||||
For Each oRow As DataRow In oMyDatatable.Rows
|
||||
Try
|
||||
MyValidationLogger.Debug($"IDB ROW Vector {oRow.Item(0).ToString}...")
|
||||
oColValuesfromSource = Split(oRow.Item(0).ToString, PMDelimiter)
|
||||
|
||||
If oColValuesfromSource.Length > 8 Then
|
||||
MyValidationLogger.Warn("Fill Grid with DatatableSplit Error - Max 8 columns can be configured!")
|
||||
MyValidationLogger.Warn("Fill Grid With DatatableSplit Error - Max 8 columns can be configured!")
|
||||
End If
|
||||
MyValidationLogger.Debug($"oColValuesfromSource splitted - Length ({oColValuesfromSource.Length.ToString})")
|
||||
Dim oRowData As New List(Of Object)
|
||||
@@ -3645,16 +3681,16 @@ Public Class frmValidator
|
||||
For index = 1 To oColValuesfromSource.Length
|
||||
Try
|
||||
Dim oColumnType = oDTColumnsPerDevExGrid.Rows.Item(index - 1).Item("TYPE_COLUMN")
|
||||
MyValidationLogger.Debug($"oColumnType of DGView-Column ({oColumnType.ToString})...")
|
||||
MyValidationLogger.Debug($"oColumnType Of DGView-Column ({oColumnType.ToString})...")
|
||||
Dim oConvertedValue = ClassFormat.GetConvertedValue(oColValuesfromSource(index - 1), oColumnType)
|
||||
oRowData.Add(oConvertedValue)
|
||||
Catch ex As Exception
|
||||
MyValidationLogger.Warn($"Error while converting/adding Value to oRowData: " & ex.Message)
|
||||
MyValidationLogger.Warn($"Error While converting/adding Value To oRowData " & ex.Message)
|
||||
End Try
|
||||
Next
|
||||
oDataSource.Rows.Add(oRowData.ToArray())
|
||||
Catch ex As Exception
|
||||
MyValidationLogger.Warn($"Error while adding datarow [{oRow.Item(0).ToString}] to Grid: " & ex.Message)
|
||||
MyValidationLogger.Warn($"Error While adding datarow [{oRow.Item(0).ToString}] To Grid " & ex.Message)
|
||||
End Try
|
||||
|
||||
|
||||
@@ -3663,7 +3699,7 @@ Public Class frmValidator
|
||||
|
||||
End If
|
||||
Else
|
||||
MyValidationLogger.Info($"DevExpressGrid: There are no columns configured/listed for control {oControlId}.")
|
||||
MyValidationLogger.Info($"DevExpressGrid There are no columns configured/listed For control {oControlId}.")
|
||||
End If
|
||||
|
||||
Case Else
|
||||
@@ -3679,7 +3715,7 @@ Public Class frmValidator
|
||||
Next
|
||||
End Select
|
||||
Else
|
||||
MyValidationLogger.Warn($"Could not load Devexpress.Grid [{oControl.Name }] as omytype is [{oValueType}]!")
|
||||
MyValidationLogger.Warn($"Could Not load Devexpress.Grid [{oControl.Name }] As omytype Is [{oValueType}]!")
|
||||
|
||||
End If
|
||||
|
||||
@@ -3720,10 +3756,10 @@ Public Class frmValidator
|
||||
End If
|
||||
Catch ex As Exception
|
||||
MyValidationLogger.Error(ex)
|
||||
MyValidationLogger.Info(">> Unexpected error in FillIndexValues(GridControl: " & oMyGridControl.Name & "): " & ex.Message, True)
|
||||
MyValidationLogger.Info(">> Controltype: " & oControlType)
|
||||
MyValidationLogger.Info(">> Attributname: " & oIndexName)
|
||||
errormessage = "Unexpected error in FillIndexValues(Combobox: " & oMyGridControl.Name & "): " & vbNewLine & ex.Message & vbNewLine & "Check Logfile"
|
||||
MyValidationLogger.Info(">> Unexpected Error In FillIndexValues(GridControl " & oMyGridControl.Name & ") " & ex.Message, True)
|
||||
MyValidationLogger.Info(">> Controltype " & oControlType)
|
||||
MyValidationLogger.Info(">> Attributname " & oIndexName)
|
||||
errormessage = "Unexpected Error In FillIndexValues(Combobox " & oMyGridControl.Name & ") " & vbNewLine & ex.Message & vbNewLine & "Check Logfile"
|
||||
My.Settings.Save()
|
||||
frmError.ShowDialog()
|
||||
End Try
|
||||
@@ -3733,15 +3769,15 @@ Public Class frmValidator
|
||||
MyValidationLogger.Debug("Loading checkbox...")
|
||||
oControlType = "CheckBox"
|
||||
If oSourceIndexName = "" Then
|
||||
MsgBox("Attention wrong configuration:" & vbNewLine & "for control " & oControl.Name & " no INDEX configured!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical, ADDITIONAL_TITLE)
|
||||
MsgBox("Attention wrong configuration" & vbNewLine & "For control " & oControl.Name & " no INDEX configured!" & vbNewLine & "Bitte prüfen Sie den Formulardesigner!", MsgBoxStyle.Critical, ADDITIONAL_TITLE)
|
||||
Exit For
|
||||
End If
|
||||
If oSourceIndexName Is Nothing = False Then
|
||||
|
||||
Dim myCheckBox As CheckBox = oControl
|
||||
|
||||
If oLoadIndex = False Or {"@@DISPLAY_ONLY", "DD PM-ONLY FOR DISPLAY"}.Contains(oSourceIndexName) Then
|
||||
MyValidationLogger.Debug($" oControl {oControl.Name}: Indexwert soll nicht geladen werden.")
|
||||
If oLoadIndex = False Or {"@@DISPLAY_ONLY", "DD PM-ONLY For DISPLAY"}.Contains(oSourceIndexName) Then
|
||||
MyValidationLogger.Debug($" oControl {oControl.Name} Indexwert soll nicht geladen werden.")
|
||||
Exit Select
|
||||
End If
|
||||
|
||||
@@ -3755,7 +3791,7 @@ Public Class frmValidator
|
||||
MyValidationLogger.Debug($"..Now GetVariableValue({oSourceIndexName})...")
|
||||
oValueFromSource = GetVariableValuefromSource(oSourceIndexName, oIDBTyp, oIDBOverride)
|
||||
Catch ex As Exception
|
||||
MyValidationLogger.Warn($"Could not get the windreamValue for CheckboxIndex: {oSourceIndexName} [{ex.Message}]")
|
||||
MyValidationLogger.Warn($"Could Not Get the windreamValue For CheckboxIndex {oSourceIndexName} [{ex.Message}]")
|
||||
End Try
|
||||
|
||||
End If
|
||||
@@ -3764,19 +3800,19 @@ Public Class frmValidator
|
||||
If oValueFromSource Is Nothing Then
|
||||
MyValidationLogger.Info(">> Zurückgegebener Wert des Wertes für Checkbox mit Indexname '" & oIndexName & "' ist nothing. Checking defaultvalue")
|
||||
MyValidationLogger.Debug(">> Zurückgegebener Wert des Wertes für Checkbox mit Indexname '" & oIndexName & "' ist nothing. Checking defaultvalue")
|
||||
If oDefaultValue <> String.Empty Then
|
||||
MyValidationLogger.Info($"Using Default value [{oDefaultValue}]")
|
||||
MyValidationLogger.Debug($"Using Default value [{oDefaultValue}]")
|
||||
myCheckBox.Checked = CBool(oDefaultValue)
|
||||
Exit Select
|
||||
Else
|
||||
MyValidationLogger.Debug("No Default Value for Checkbox - so using false!")
|
||||
myCheckBox.CheckState = CheckState.Indeterminate
|
||||
End If
|
||||
If oDefaultValue <> String.Empty Then
|
||||
MyValidationLogger.Info($"Using Default value [{oDefaultValue}]")
|
||||
MyValidationLogger.Debug($"Using Default value [{oDefaultValue}]")
|
||||
myCheckBox.Checked = CBool(oDefaultValue)
|
||||
Exit Select
|
||||
Else
|
||||
MyValidationLogger.Debug("No Default Value for Checkbox - so using false!")
|
||||
myCheckBox.CheckState = CheckState.Indeterminate
|
||||
End If
|
||||
|
||||
|
||||
Else
|
||||
MyValidationLogger.Debug("oValueFromSource: " & oValueFromSource.ToString)
|
||||
Else
|
||||
MyValidationLogger.Debug("oValueFromSource: " & oValueFromSource.ToString)
|
||||
If oValueFromSource.ToString = "" Then
|
||||
MyValidationLogger.Info(">> Versuch, default Value zu laden")
|
||||
If oDefaultValue <> String.Empty Then
|
||||
@@ -4074,6 +4110,33 @@ Public Class frmValidator
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub ApplyCurrencyMask(pTextEdit As TextEdit)
|
||||
If pTextEdit Is Nothing Then Return
|
||||
Try
|
||||
' Kultur auf Basis der aktuellen UI, aber Währungssymbol aus DocCurrency setzen
|
||||
Dim culture As New CultureInfo("de-DE")
|
||||
' Wenn DocCurrency leer/fehlerhaft ist, fallback auf EUR
|
||||
Dim currencySymbol As String = If(String.IsNullOrWhiteSpace(DocCurrency) OrElse DocCurrency.Length <> 3, "EUR", DocCurrency)
|
||||
|
||||
' DevExpress Numeric-Mask "c" mit angepasster Kultur
|
||||
pTextEdit.Properties.MaskSettings.Configure(Of MaskSettings.Numeric)(
|
||||
Sub(settings)
|
||||
settings.MaskExpression = "c"
|
||||
settings.Culture = DirectCast(culture.Clone(), CultureInfo)
|
||||
settings.Culture.NumberFormat.CurrencySymbol = currencySymbol
|
||||
End Sub)
|
||||
|
||||
pTextEdit.Properties.UseMaskAsDisplayFormat = True
|
||||
|
||||
|
||||
Catch ex As Exception
|
||||
MyValidationLogger.Warn(String.Format("Unexpected error while applying CurrencyMaskfor pTextEdit: [{0} - ERROR: {1}", pTextEdit.Name, ex.Message))
|
||||
|
||||
End Try
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub frmValidation_Shown(sender As Object, e As System.EventArgs) Handles Me.Shown
|
||||
' Refresh_FileList()
|
||||
Load_Next_Document(True)
|
||||
@@ -5662,12 +5725,20 @@ Public Class frmValidator
|
||||
Dim oValueList As New List(Of String)
|
||||
|
||||
For Each item As Object In oRow.ItemArray
|
||||
item = ObjectEx.NotNull(item, String.Empty)
|
||||
' 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)
|
||||
Dim normalized As Object = ObjectEx.NotNull(item, String.Empty)
|
||||
If TypeOf normalized Is IFormattable AndAlso Not TypeOf normalized Is String Then
|
||||
Dim provider As IFormatProvider =
|
||||
If(TypeOf normalized Is Decimal OrElse
|
||||
TypeOf normalized Is Double OrElse
|
||||
TypeOf normalized Is Single,
|
||||
CultureInfo.CurrentCulture,
|
||||
CultureInfo.InvariantCulture)
|
||||
MyValidationLogger.Debug("Normalizing value [{0}]", normalized.ToString)
|
||||
|
||||
normalized = DirectCast(normalized, IFormattable).ToString(Nothing, provider)
|
||||
End If
|
||||
oValueList.Add(item)
|
||||
|
||||
oValueList.Add(normalized)
|
||||
Next
|
||||
|
||||
str = String.Join(PMDelimiter, oValueList.ToArray)
|
||||
|
||||
1352
app/TaskFlow/taskFLOW.vbproj
Normal file
1352
app/TaskFlow/taskFLOW.vbproj
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user