MS Änderungen an Clickhandle Designer, Adding Controlfields SQLEditor

This commit is contained in:
Digital Data - Marlon Schreiber 2017-04-05 10:18:59 +02:00
parent f74a46597e
commit 12b8f9d52a
22 changed files with 166 additions and 79 deletions

Binary file not shown.

View File

@ -1 +1,4 @@
DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.15.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@ -44,7 +44,7 @@ Partial Class frmFormDesigner
Me.pnldesigner = New System.Windows.Forms.Panel() Me.pnldesigner = New System.Windows.Forms.Panel()
Me.Label1 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label()
Me.lblhintergrund = New System.Windows.Forms.Label() Me.lblhintergrund = New System.Windows.Forms.Label()
Me.gbx_CTRL = New System.Windows.Forms.GroupBox() Me.gbxControl = New System.Windows.Forms.GroupBox()
Me.TabControlEigenschaften = New System.Windows.Forms.TabControl() Me.TabControlEigenschaften = New System.Windows.Forms.TabControl()
Me.TabPage1 = New System.Windows.Forms.TabPage() Me.TabPage1 = New System.Windows.Forms.TabPage()
Me.LOAD_IDX_VALUECheckBox = New System.Windows.Forms.CheckBox() Me.LOAD_IDX_VALUECheckBox = New System.Windows.Forms.CheckBox()
@ -111,7 +111,7 @@ Partial Class frmFormDesigner
Me.Panel1.SuspendLayout() Me.Panel1.SuspendLayout()
Me.GroupBox1.SuspendLayout() Me.GroupBox1.SuspendLayout()
Me.pnldesigner.SuspendLayout() Me.pnldesigner.SuspendLayout()
Me.gbx_CTRL.SuspendLayout() Me.gbxControl.SuspendLayout()
Me.TabControlEigenschaften.SuspendLayout() Me.TabControlEigenschaften.SuspendLayout()
Me.TabPage1.SuspendLayout() Me.TabPage1.SuspendLayout()
CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
@ -359,22 +359,22 @@ Partial Class frmFormDesigner
Me.lblhintergrund.TabIndex = 1 Me.lblhintergrund.TabIndex = 1
Me.lblhintergrund.Text = "Validierungsbereich" Me.lblhintergrund.Text = "Validierungsbereich"
' '
'gbx_CTRL 'gbxControl
' '
Me.gbx_CTRL.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Me.gbxControl.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.gbx_CTRL.Controls.Add(Me.TabControlEigenschaften) Me.gbxControl.Controls.Add(Me.TabControlEigenschaften)
Me.gbx_CTRL.Controls.Add(Me.btndelete) Me.gbxControl.Controls.Add(Me.btndelete)
Me.gbx_CTRL.Controls.Add(Me.btnsave) Me.gbxControl.Controls.Add(Me.btnsave)
Me.gbx_CTRL.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.gbxControl.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.gbx_CTRL.Location = New System.Drawing.Point(507, 205) Me.gbxControl.Location = New System.Drawing.Point(507, 205)
Me.gbx_CTRL.Name = "gbx_CTRL" Me.gbxControl.Name = "gbxControl"
Me.gbx_CTRL.Size = New System.Drawing.Size(476, 332) Me.gbxControl.Size = New System.Drawing.Size(476, 332)
Me.gbx_CTRL.TabIndex = 4 Me.gbxControl.TabIndex = 4
Me.gbx_CTRL.TabStop = False Me.gbxControl.TabStop = False
Me.gbx_CTRL.Text = "Controleigenschaften:" Me.gbxControl.Text = "Controleigenschaften:"
Me.gbx_CTRL.Visible = False Me.gbxControl.Visible = False
' '
'TabControlEigenschaften 'TabControlEigenschaften
' '
@ -977,7 +977,7 @@ Partial Class frmFormDesigner
Me.Controls.Add(Me.Y_LOCTextBox) Me.Controls.Add(Me.Y_LOCTextBox)
Me.Controls.Add(X_LOCLabel) Me.Controls.Add(X_LOCLabel)
Me.Controls.Add(Me.X_LOCTextBox) Me.Controls.Add(Me.X_LOCTextBox)
Me.Controls.Add(Me.gbx_CTRL) Me.Controls.Add(Me.gbxControl)
Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.Panel1)
Me.Controls.Add(Me.GroupBox1) Me.Controls.Add(Me.GroupBox1)
Me.Controls.Add(Me.pnldesigner) Me.Controls.Add(Me.pnldesigner)
@ -993,7 +993,7 @@ Partial Class frmFormDesigner
Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.ResumeLayout(False)
Me.pnldesigner.ResumeLayout(False) Me.pnldesigner.ResumeLayout(False)
Me.pnldesigner.PerformLayout() Me.pnldesigner.PerformLayout()
Me.gbx_CTRL.ResumeLayout(False) Me.gbxControl.ResumeLayout(False)
Me.TabControlEigenschaften.ResumeLayout(False) Me.TabControlEigenschaften.ResumeLayout(False)
Me.TabPage1.ResumeLayout(False) Me.TabPage1.ResumeLayout(False)
Me.TabPage1.PerformLayout() Me.TabPage1.PerformLayout()
@ -1025,7 +1025,7 @@ Partial Class frmFormDesigner
Friend WithEvents pnldesigner As System.Windows.Forms.Panel Friend WithEvents pnldesigner As System.Windows.Forms.Panel
Friend WithEvents btndtp As System.Windows.Forms.Button Friend WithEvents btndtp As System.Windows.Forms.Button
Friend WithEvents btncmb As System.Windows.Forms.Button Friend WithEvents btncmb As System.Windows.Forms.Button
Friend WithEvents gbx_CTRL As System.Windows.Forms.GroupBox Friend WithEvents gbxControl As System.Windows.Forms.GroupBox
Friend WithEvents lblBeschriftung As System.Windows.Forms.Label Friend WithEvents lblBeschriftung As System.Windows.Forms.Label
Friend WithEvents lblCtrlName As System.Windows.Forms.Label Friend WithEvents lblCtrlName As System.Windows.Forms.Label
Friend WithEvents lblhintergrund As System.Windows.Forms.Label Friend WithEvents lblhintergrund As System.Windows.Forms.Label

View File

@ -26,18 +26,18 @@
'Try 'Try
If CURRENT_ProfilGUID > 0 Then If CURRENT_ProfilGUID > 0 Then
Dim DT As DataTable = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND (CTRL_TYPE <> 'LBL')", CURRENT_ProfilGUID), True) Dim DT As DataTable = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND (CTRL_TYPE <> 'LBL')", CURRENT_ProfilGUID), True)
gbx_CTRL.Visible = False gbxControl.Visible = False
For Each row As DataRow In DT.Rows For Each row As DataRow In DT.Rows
If row.Item("INDEX_NAME").GetType.ToString.ToLower = "system.dbnull" Or row.Item("INDEX_NAME").ToString = "" Then If row.Item("INDEX_NAME").GetType.ToString.ToLower = "system.dbnull" Or row.Item("INDEX_NAME").ToString = "" Then
MsgBox("Für das Control '" & row.Item("NAME") & "' wurde noch keine Indexdefintion hinterlegt!", MsgBoxStyle.Exclamation, "Unvollständige Konfiguration:") MsgBox("Für das Control '" & row.Item("NAME") & "' wurde noch keine Indexdefintion hinterlegt!", MsgBoxStyle.Exclamation, "Unvollständige Konfiguration:")
e.Cancel = True e.Cancel = True
gbx_CTRL.Visible = True gbxControl.Visible = True
End If End If
Next Next
End If End If
If Application.OpenForms().OfType(Of frmControl_Detail).Any Then If Application.OpenForms().OfType(Of frmControl_Detail).Any Then
frmControl_Detail.Close() frmControl_Detail.Close()
End If End If
' MessageBox.Show("Opened") ' MessageBox.Show("Opened")
'Catch ex As Exception 'Catch ex As Exception
' MsgBox("Fehler bei FormClosing: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") ' MsgBox("Fehler bei FormClosing: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
@ -131,12 +131,19 @@
Me.cmbIndex.Visible = False Me.cmbIndex.Visible = False
Me.INDEX_NAMETextBox.Visible = False Me.INDEX_NAMETextBox.Visible = False
If ID = 0 Then If ID = 0 Then
If IsNothing(CURRENT_CONTROL.Tag) Then
Dim ID_CTRL = GetControlGUID(CURRENT_CONTROL.Name)
If ID_CTRL > 0 Then
CURRENT_CONTROL.Tag = ID_CTRL
End If
End If
CURRENT_CONTROL_ID = CURRENT_CONTROL.Tag CURRENT_CONTROL_ID = CURRENT_CONTROL.Tag
Else Else
CURRENT_CONTROL_ID = ID CURRENT_CONTROL_ID = ID
End If End If
If CURRENT_CONTROL_ID <> 0 Then If CURRENT_CONTROL_ID <> 0 Then
gbxControl.Enabled = True
TBPM_PROFILE_CONTROLSTableAdapter.Fill(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, CURRENT_CONTROL_ID) TBPM_PROFILE_CONTROLSTableAdapter.Fill(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, CURRENT_CONTROL_ID)
Dim dt As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS Dim dt As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS
Dim dr As DataRow = dt.Rows(0) Dim dr As DataRow = dt.Rows(0)
@ -170,6 +177,7 @@
End If End If
Else Else
gbxControl.Enabled = False
tslblAenderungen.Visible = True tslblAenderungen.Visible = True
tslblAenderungen.Text = "Konte das aktuelle Control nicht wählen!!" tslblAenderungen.Text = "Konte das aktuelle Control nicht wählen!!"
End If End If
@ -210,13 +218,18 @@
Catch ex As Exception Catch ex As Exception
MsgBox("Fehler bei Controls_laden: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") MsgBox("Fehler bei Controls_laden: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
End Try End Try
End Sub End Sub
Private Sub DragDropButtons_MouseDown(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btnlabel.MouseDown, btntextbox.MouseDown, btncmb.MouseDown, btndtp.MouseDown, btnVektor.MouseDown, Private Sub DragDropButtons_MouseDown(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btnlabel.MouseDown, btntextbox.MouseDown, btncmb.MouseDown, btndtp.MouseDown, btnVektor.MouseDown,
btnTabelle.MouseDown, btnCheckbox.MouseDown btnTabelle.MouseDown, btnCheckbox.MouseDown
MouseIsDown = True MouseIsDown = True
CURRENT_CONTROL = Nothing CURRENT_CONTROL = Nothing
TBPM_PROFILE_CONTROLSBindingSource.Clear() Try
TBPM_PROFILE_CONTROLSBindingSource.Clear()
Catch ex As Exception
End Try
End Sub End Sub
@ -606,15 +619,15 @@
'Columns laden 'Columns laden
TBPM_CONTROL_TABLETableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_CONTROL_TABLE, table.Tag) TBPM_CONTROL_TABLETableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_CONTROL_TABLE, table.Tag)
Dim DT As DataTable = Me.DD_DMSLiteDataSet.TBPM_CONTROL_TABLE Dim DT As DataTable = Me.DD_DMSLiteDataSet.TBPM_CONTROL_TABLE
If DT.Rows.Count > 0 Then If DT.Rows.Count > 0 Then
For Each Row As DataRow In DT.Rows For Each Row As DataRow In DT.Rows
Dim col As New DataGridViewTextBoxColumn Dim col As New DataGridViewTextBoxColumn
col.HeaderText = Row.Item("SPALTEN_HEADER") col.HeaderText = Row.Item("SPALTEN_HEADER")
col.Name = Row.Item("SPALTENNAME") col.Name = Row.Item("SPALTENNAME")
col.Width = Row.Item("SPALTENBREITE") col.Width = Row.Item("SPALTENBREITE")
table.Columns.Add(col) table.Columns.Add(col)
Next Next
End If End If
' table.AutoResizeColumns() ' table.AutoResizeColumns()
@ -662,7 +675,7 @@
Me.CheckBoxAuswahlliste.Visible = False Me.CheckBoxAuswahlliste.Visible = False
Me.CHOICE_LISTTextBox.Visible = False Me.CHOICE_LISTTextBox.Visible = False
Me.lblAuswahlliste.Visible = False Me.lblAuswahlliste.Visible = False
gbx_CTRL.Visible = True gbxControl.Visible = True
' Me.pnlAuswahlliste.Enabled = False ' Me.pnlAuswahlliste.Enabled = False
Me.READ_ONLYCheckBox.Visible = False Me.READ_ONLYCheckBox.Visible = False
@ -674,7 +687,7 @@
CURRENT_CONTROL = sender CURRENT_CONTROL = sender
Dim txt As TextBox = sender Dim txt As TextBox = sender
Set_Active_Color() Set_Active_Color()
CURRENT_CONTROL = txt
Load_indexe() Load_indexe()
Load_Control() Load_Control()
@ -690,7 +703,7 @@
Me.CHOICE_LISTTextBox.Visible = False Me.CHOICE_LISTTextBox.Visible = False
Me.lblAuswahlliste.Visible = False Me.lblAuswahlliste.Visible = False
gbx_CTRL.Visible = True gbxControl.Visible = True
' Me.pnlAuswahlliste.Enabled = False ' Me.pnlAuswahlliste.Enabled = False
Me.READ_ONLYCheckBox.Visible = True Me.READ_ONLYCheckBox.Visible = True
@ -713,7 +726,7 @@
Me.CheckBoxAuswahlliste.Visible = False Me.CheckBoxAuswahlliste.Visible = False
Me.CHOICE_LISTTextBox.Visible = False Me.CHOICE_LISTTextBox.Visible = False
Me.lblAuswahlliste.Visible = False Me.lblAuswahlliste.Visible = False
gbx_CTRL.Visible = True gbxControl.Visible = True
' Me.pnlAuswahlliste.Enabled = False ' Me.pnlAuswahlliste.Enabled = False
Me.READ_ONLYCheckBox.Visible = True Me.READ_ONLYCheckBox.Visible = True
Me.LOAD_IDX_VALUECheckBox.Visible = True Me.LOAD_IDX_VALUECheckBox.Visible = True
@ -723,10 +736,7 @@
Dim cmb As ComboBox = sender Dim cmb As ComboBox = sender
Set_Active_Color() Set_Active_Color()
CURRENT_CONTROL = cmb
Load_indexe() Load_indexe()
Load_Control()
Me.lblBeschriftung.Visible = False Me.lblBeschriftung.Visible = False
Me.CTRL_TEXTTextBox.Visible = False Me.CTRL_TEXTTextBox.Visible = False
Me.lblIndex.Visible = True Me.lblIndex.Visible = True
@ -735,7 +745,7 @@
Me.rbVektor.Visible = True Me.rbVektor.Visible = True
Me.CheckBoxAuswahlliste.Visible = True Me.CheckBoxAuswahlliste.Visible = True
Me.VALIDATIONCheckBox.Visible = True Me.VALIDATIONCheckBox.Visible = True
gbx_CTRL.Visible = True gbxControl.Visible = True
If CHOICE_LISTTextBox.Text <> "" Then If CHOICE_LISTTextBox.Text <> "" Then
CheckBoxAuswahlliste.Checked = True CheckBoxAuswahlliste.Checked = True
Else Else
@ -745,6 +755,8 @@
' Me.pnlAuswahlliste.Enabled = True ' Me.pnlAuswahlliste.Enabled = True
Me.READ_ONLYCheckBox.Visible = True Me.READ_ONLYCheckBox.Visible = True
Me.LOAD_IDX_VALUECheckBox.Visible = True Me.LOAD_IDX_VALUECheckBox.Visible = True
Load_Control()
End Sub End Sub
Public Sub OndtpClick(sender As System.Object, e As System.EventArgs) Public Sub OndtpClick(sender As System.Object, e As System.EventArgs)
@ -762,7 +774,7 @@
Me.CheckBoxAuswahlliste.Visible = False Me.CheckBoxAuswahlliste.Visible = False
Me.VALIDATIONCheckBox.Visible = True Me.VALIDATIONCheckBox.Visible = True
gbx_CTRL.Visible = True gbxControl.Visible = True
CHOICE_LISTTextBox.Visible = False CHOICE_LISTTextBox.Visible = False
' Me.pnlAuswahlliste.Enabled = False ' Me.pnlAuswahlliste.Enabled = False
Me.READ_ONLYCheckBox.Visible = True Me.READ_ONLYCheckBox.Visible = True
@ -793,14 +805,14 @@
Me.lblIndex.Visible = True Me.lblIndex.Visible = True
Me.cmbIndex.Visible = True Me.cmbIndex.Visible = True
Me.rbIndex.Visible = True Me.rbIndex.Visible = True
Me.CheckBoxAuswahlliste.Visible = False Me.CheckBoxAuswahlliste.Visible = False
Me.CHOICE_LISTTextBox.Visible = False Me.CHOICE_LISTTextBox.Visible = False
Me.lblAuswahlliste.Visible = False Me.lblAuswahlliste.Visible = False
Me.VALIDATIONCheckBox.Visible = True Me.VALIDATIONCheckBox.Visible = True
gbx_CTRL.Visible = True gbxControl.Visible = True
CHOICE_LISTTextBox.Visible = False CHOICE_LISTTextBox.Visible = False
'Me.pnlAuswahlliste.Enabled = False 'Me.pnlAuswahlliste.Enabled = False
Me.READ_ONLYCheckBox.Visible = True Me.READ_ONLYCheckBox.Visible = True
@ -839,7 +851,7 @@
Me.VALIDATIONCheckBox.Visible = True Me.VALIDATIONCheckBox.Visible = True
gbx_CTRL.Visible = True gbxControl.Visible = True
' Me.pnlAuswahlliste.Enabled = False ' Me.pnlAuswahlliste.Enabled = False
Me.READ_ONLYCheckBox.Visible = True Me.READ_ONLYCheckBox.Visible = True
Me.LOAD_IDX_VALUECheckBox.Visible = True Me.LOAD_IDX_VALUECheckBox.Visible = True
@ -990,7 +1002,7 @@
Set_Active_Color() Set_Active_Color()
Load_Control() Load_Control()
gbx_CTRL.Visible = True gbxControl.Visible = True
End If End If
End Sub End Sub
Private Sub MovableCtrl_MouseUp(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles Me.MouseUp Private Sub MovableCtrl_MouseUp(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles Me.MouseUp
@ -1517,6 +1529,8 @@
Load_Control(CURRENT_CONTROL_ID) Load_Control(CURRENT_CONTROL_ID)
TabControlEigenschaften.SelectedIndex = 2 TabControlEigenschaften.SelectedIndex = 2
Else
MsgBox("Please choose a control!", MsgBoxStyle.Information)
End If End If
End Sub End Sub

View File

@ -885,6 +885,7 @@ Public Class frmProfileDesigner
CURRENT_DESIGN_TYPE = "FINAL_INDEX" CURRENT_DESIGN_TYPE = "FINAL_INDEX"
CURRENT_SQL_COMAMND = SQL_COMMANDTextBox.Text CURRENT_SQL_COMAMND = SQL_COMMANDTextBox.Text
CURRENT_SQL_CON = CONID CURRENT_SQL_CON = CONID
CURRENT_ProfilGUID = PROFILGUIDTextBox.Text
frmSQL_DESIGNER.ShowDialog() frmSQL_DESIGNER.ShowDialog()
End If End If

View File

@ -23,8 +23,8 @@ Partial Class frmSQL_DESIGNER
<System.Diagnostics.DebuggerStepThrough()> _ <System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container() Me.components = New System.ComponentModel.Container()
Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle() Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQL_DESIGNER)) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQL_DESIGNER))
Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet() Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet()
Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource = New System.Windows.Forms.BindingSource(Me.components)
@ -46,9 +46,12 @@ Partial Class frmSQL_DESIGNER
Me.btnTestSQL = New System.Windows.Forms.Button() Me.btnTestSQL = New System.Windows.Forms.Button()
Me.Label15 = New System.Windows.Forms.Label() Me.Label15 = New System.Windows.Forms.Label()
Me.cmbIndexe = New System.Windows.Forms.ComboBox() Me.cmbIndexe = New System.Windows.Forms.ComboBox()
Me.Button1 = New System.Windows.Forms.Button() Me.btnAddIndex = New System.Windows.Forms.Button()
Me.btnSaveSQLCommand = New System.Windows.Forms.Button() Me.btnSaveSQLCommand = New System.Windows.Forms.Button()
Me.lblSaveFinalIndex = New System.Windows.Forms.Label() Me.lblSaveFinalIndex = New System.Windows.Forms.Label()
Me.btnAddControl = New System.Windows.Forms.Button()
Me.lblControls = New System.Windows.Forms.Label()
Me.cmbControls = New System.Windows.Forms.ComboBox()
CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBPM_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
@ -176,8 +179,8 @@ Partial Class frmSQL_DESIGNER
' '
Me.dgvResult.AllowUserToAddRows = False Me.dgvResult.AllowUserToAddRows = False
Me.dgvResult.AllowUserToDeleteRows = False Me.dgvResult.AllowUserToDeleteRows = False
DataGridViewCellStyle5.BackColor = System.Drawing.Color.Cyan DataGridViewCellStyle3.BackColor = System.Drawing.Color.Cyan
Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5 Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvResult.Location = New System.Drawing.Point(372, 373) Me.dgvResult.Location = New System.Drawing.Point(372, 373)
Me.dgvResult.Name = "dgvResult" Me.dgvResult.Name = "dgvResult"
@ -189,8 +192,8 @@ Partial Class frmSQL_DESIGNER
' '
Me.dgvPlaceholders.AllowUserToAddRows = False Me.dgvPlaceholders.AllowUserToAddRows = False
Me.dgvPlaceholders.AllowUserToDeleteRows = False Me.dgvPlaceholders.AllowUserToDeleteRows = False
DataGridViewCellStyle6.BackColor = System.Drawing.Color.Cyan DataGridViewCellStyle4.BackColor = System.Drawing.Color.Cyan
Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6 Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace}) Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace})
Me.dgvPlaceholders.Enabled = False Me.dgvPlaceholders.Enabled = False
@ -242,14 +245,14 @@ Partial Class frmSQL_DESIGNER
Me.cmbIndexe.Size = New System.Drawing.Size(194, 21) Me.cmbIndexe.Size = New System.Drawing.Size(194, 21)
Me.cmbIndexe.TabIndex = 92 Me.cmbIndexe.TabIndex = 92
' '
'Button1 'btnAddIndex
' '
Me.Button1.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.add Me.btnAddIndex.Image = CType(resources.GetObject("btnAddIndex.Image"), System.Drawing.Image)
Me.Button1.Location = New System.Drawing.Point(881, 28) Me.btnAddIndex.Location = New System.Drawing.Point(881, 28)
Me.Button1.Name = "Button1" Me.btnAddIndex.Name = "btnAddIndex"
Me.Button1.Size = New System.Drawing.Size(32, 23) Me.btnAddIndex.Size = New System.Drawing.Size(32, 23)
Me.Button1.TabIndex = 94 Me.btnAddIndex.TabIndex = 94
Me.Button1.UseVisualStyleBackColor = True Me.btnAddIndex.UseVisualStyleBackColor = True
' '
'btnSaveSQLCommand 'btnSaveSQLCommand
' '
@ -274,14 +277,44 @@ Partial Class frmSQL_DESIGNER
Me.lblSaveFinalIndex.Text = "Label4" Me.lblSaveFinalIndex.Text = "Label4"
Me.lblSaveFinalIndex.Visible = False Me.lblSaveFinalIndex.Visible = False
' '
'btnAddControl
'
Me.btnAddControl.Image = CType(resources.GetObject("btnAddControl.Image"), System.Drawing.Image)
Me.btnAddControl.Location = New System.Drawing.Point(645, 28)
Me.btnAddControl.Name = "btnAddControl"
Me.btnAddControl.Size = New System.Drawing.Size(32, 23)
Me.btnAddControl.TabIndex = 99
Me.btnAddControl.UseVisualStyleBackColor = True
'
'lblControls
'
Me.lblControls.AutoSize = True
Me.lblControls.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.lblControls.Location = New System.Drawing.Point(442, 9)
Me.lblControls.Name = "lblControls"
Me.lblControls.Size = New System.Drawing.Size(215, 16)
Me.lblControls.TabIndex = 98
Me.lblControls.Text = "Controls (zur Laufzeit ausgewertet):"
'
'cmbControls
'
Me.cmbControls.FormattingEnabled = True
Me.cmbControls.Location = New System.Drawing.Point(445, 28)
Me.cmbControls.Name = "cmbControls"
Me.cmbControls.Size = New System.Drawing.Size(194, 21)
Me.cmbControls.TabIndex = 97
'
'frmSQL_DESIGNER 'frmSQL_DESIGNER
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(923, 547) Me.ClientSize = New System.Drawing.Size(923, 547)
Me.Controls.Add(Me.btnAddControl)
Me.Controls.Add(Me.lblControls)
Me.Controls.Add(Me.cmbControls)
Me.Controls.Add(Me.lblSaveFinalIndex) Me.Controls.Add(Me.lblSaveFinalIndex)
Me.Controls.Add(Me.btnSaveSQLCommand) Me.Controls.Add(Me.btnSaveSQLCommand)
Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.btnAddIndex)
Me.Controls.Add(Me.Label15) Me.Controls.Add(Me.Label15)
Me.Controls.Add(Me.cmbIndexe) Me.Controls.Add(Me.cmbIndexe)
Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.Label1)
@ -330,7 +363,10 @@ Partial Class frmSQL_DESIGNER
Friend WithEvents btnTestSQL As System.Windows.Forms.Button Friend WithEvents btnTestSQL As System.Windows.Forms.Button
Friend WithEvents Label15 As System.Windows.Forms.Label Friend WithEvents Label15 As System.Windows.Forms.Label
Friend WithEvents cmbIndexe As System.Windows.Forms.ComboBox Friend WithEvents cmbIndexe As System.Windows.Forms.ComboBox
Friend WithEvents Button1 As System.Windows.Forms.Button Friend WithEvents btnAddIndex As System.Windows.Forms.Button
Friend WithEvents btnSaveSQLCommand As System.Windows.Forms.Button Friend WithEvents btnSaveSQLCommand As System.Windows.Forms.Button
Friend WithEvents lblSaveFinalIndex As System.Windows.Forms.Label Friend WithEvents lblSaveFinalIndex As System.Windows.Forms.Label
Friend WithEvents btnAddControl As Button
Friend WithEvents lblControls As Label
Friend WithEvents cmbControls As ComboBox
End Class End Class

View File

@ -149,6 +149,14 @@
5ku43W8eh7DWkmcxxhzFP2HB4bqnaZ7IS27OuU341BcW7E7bN5f7ebxNLGCG26QCENo0qQq01qSUIill 5ku43W8eh7DWkmcxxhzFP2HB4bqnaZ7IS27OuU341BcW7E7bN5f7ebxNLGCG26QCENo0qQq01qSUIill
kaIAV+Dz0lJMJkhr89BjeRZZCeIfh8UamcDzfbphQRoIMITKYFhQoykogUUQ1n7pFYTxPBDUaAp6+EwL kaIAV+Dz0lJMJkhr89BjeRZZCeIfh8UamcDzfbphQRoIMITKYFhQoykogUUQ1n7pFYTxPBDUaAp6+EwL
8QKzYQ6as7QBdAAAAABJRU5ErkJggg== 8QKzYQ6as7QBdAAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnAddIndex.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAABcSURBVDhPzYxRCoAwDEN3tt7/PP2NWDrJaoRNYRh4H0uX
1wB8QpYrjA+Ku6OSp8iUwMwu9gjOT0wVMH1zE/DoiZ8LmDpi+mYQcJQgT5E9gkqeIlLwBlmuIMt50A4j
RH5TZf96FwAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="btnSaveSQLCommand.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="btnSaveSQLCommand.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -156,6 +164,14 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAAFRJREFUOE9j+P//P0UYTHz79u0/Cfg9EBswAAGKAU5OTnD84f1HOEYWA9FtbW1w xAAADsQBlSsOGwAAAFRJREFUOE9j+P//P0UYTHz79u0/Cfg9EBswAAGKAU5OTnD84f1HOEYWA9FtbW1w
Q8gyAIRhhpBtAAiD9BBlADJGVkNbA4jBowYMSgPIwXADyMf/GQC4A6rkpAjLjQAAAABJRU5ErkJggg== Q8gyAIRhhpBtAAiD9BBlADJGVkNbA4jBowYMSgPIwXADyMf/GQC4A6rkpAjLjQAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnAddControl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAABcSURBVDhPzYxRCoAwDEN3tt7/PP2NWDrJaoRNYRh4H0uX
1wB8QpYrjA+Ku6OSp8iUwMwu9gjOT0wVMH1zE/DoiZ8LmDpi+mYQcJQgT5E9gkqeIlLwBlmuIMt50A4j
RH5TZf96FwAAAABJRU5ErkJggg==
</value> </value>
</data> </data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

View File

@ -36,6 +36,19 @@ Public Class frmSQL_DESIGNER
Next Next
Me.cmbIndexe.SelectedIndex = -1 Me.cmbIndexe.SelectedIndex = -1
End If End If
If CURRENT_DESIGN_TYPE = "INPUT_INDEX" Then
Dim sql = String.Format("SELECT NAME FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND CTRL_TYPE <> 'LBL' ORDER BY NAME", CURRENT_ProfilGUID)
Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, True)
cmbControls.DataSource = DT
cmbControls.DisplayMember = DT.Columns(0).ColumnName
cmbControls.Visible = True
lblControls.Visible = True
btnAddControl.Visible = True
Else
cmbControls.Visible = False
lblControls.Visible = False
btnAddControl.Visible = False
End If
Catch ex As Exception Catch ex As Exception
MsgBox("Unexpected Error while loading form: " & ex.Message, MsgBoxStyle.Critical) MsgBox("Unexpected Error while loading form: " & ex.Message, MsgBoxStyle.Critical)
End Try End Try
@ -173,14 +186,14 @@ Public Class frmSQL_DESIGNER
End Try End Try
End Function End Function
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnAddIndex.Click
If cmbIndexe.SelectedIndex <> -1 Then If cmbIndexe.SelectedIndex <> -1 Then
Dim val As String = "[%" & cmbIndexe.Text & "]" Dim val As String = "[%" & cmbIndexe.Text & "]"
Dim altePosition As Integer = Me.SQL_COMMANDTextBox.SelectionStart() Dim altePosition As Integer = Me.SQL_COMMANDTextBox.SelectionStart()
Me.SQL_COMMANDTextBox.Text = Me.SQL_COMMANDTextBox.Text.Insert(altePosition, val) Me.SQL_COMMANDTextBox.Text = Me.SQL_COMMANDTextBox.Text.Insert(altePosition, val)
Me.SQL_COMMANDTextBox.SelectionStart = altePosition + val.Length Me.SQL_COMMANDTextBox.SelectionStart = altePosition + val.Length
End If End If
End Sub End Sub
Private Sub btnSaveSQLCommand_Click(sender As Object, e As EventArgs) Handles btnSaveSQLCommand.Click Private Sub btnSaveSQLCommand_Click(sender As Object, e As EventArgs) Handles btnSaveSQLCommand.Click
@ -201,4 +214,13 @@ Public Class frmSQL_DESIGNER
End If End If
End Sub End Sub
Private Sub btnAddControl_Click(sender As Object, e As EventArgs) Handles btnAddControl.Click
If cmbControls.SelectedIndex <> -1 Then
Dim val As String = "[%" & cmbControls.Text & "]"
Dim altePosition As Integer = Me.SQL_COMMANDTextBox.SelectionStart()
Me.SQL_COMMANDTextBox.Text = Me.SQL_COMMANDTextBox.Text.Insert(altePosition, val)
Me.SQL_COMMANDTextBox.SelectionStart = altePosition + val.Length
End If
End Sub
End Class End Class

View File

@ -776,12 +776,8 @@ Public Class frmValidator
Public Sub OnTextBoxKeyUp(sender As Object, e As KeyEventArgs) Public Sub OnTextBoxKeyUp(sender As Object, e As KeyEventArgs)
Dim box As TextBox = sender Dim box As TextBox = sender
If box.Text <> String.Empty And me_closing = False And _Indexe_Loaded = True Then If box.Text <> String.Empty And me_closing = False And _Indexe_Loaded = True Then
'If CheckValueExists(box) = False Then
' box.Text = "" If (e.KeyCode = Keys.Return) Or (e.KeyCode = Keys.Tab) Then
' box.Focus()
' frmError.ShowDialog()
'End If
If e.KeyCode = Keys.Return Or e.KeyCode = Keys.Tab Then
Try Try
Dim CONTROL_ID = VWPM_CONTROL_INDEXTableAdapter.cmdGetControlID(CURRENT_ProfilGUID, box.Name) Dim CONTROL_ID = VWPM_CONTROL_INDEXTableAdapter.cmdGetControlID(CURRENT_ProfilGUID, box.Name)
Dim sql = String.Format("select NAME,CONNECTION_ID,SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND SQL_UEBERPRUEFUNG LIKE '%{1}%'", CURRENT_ProfilGUID, box.Name) Dim sql = String.Format("select NAME,CONNECTION_ID,SQL_UEBERPRUEFUNG FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND SQL_UEBERPRUEFUNG LIKE '%{1}%'", CURRENT_ProfilGUID, box.Name)
@ -816,7 +812,7 @@ Public Class frmValidator
Catch ex As Exception Catch ex As Exception
ClassLogger.Add("Unexpected Error in Checking control values for Variable SQL Result - ERROR: " & ex.Message) ClassLogger.Add("Unexpected Error in Checking control values for Variable SQL Result - ERROR: " & ex.Message)
End Try End Try
Next Next

View File

@ -1 +1 @@
a28b93252062401d442bdadd50a17aabae2dfd1f f02f886c5d02020d7c93a185c5202b3343db149e

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,3 @@
S:\DIGITAL DATA\DIGITAL DATA - Produkte\ico\DD_Icons_ICO_PM_128.ico
D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll
D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll
D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll
@ -11,10 +10,10 @@ D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll
D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll
D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll
D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll
E:\SchreiberM\Visual Studio\GIT\PROCESSMANAGER\DD-ProcessManagerWindream\DD_PM_WINDREAM\DD_PM_WINDREAM\bin\Debug\DLLLicenseManager.dll P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll
E:\SchreiberM\Visual Studio\GIT\PROCESSMANAGER\DD-ProcessManagerWindream\DD_PM_WINDREAM\DD_PM_WINDREAM\bin\Debug\DD_PM_WINDREAM.exe ..\DD_PM_WINDREAM\bin\Debug\DD_PM_WINDREAM.exe
P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.dll
P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll
P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\Digital Data - Process Manager\Release_Notes.txt P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\Digital Data - Process Manager\Release_Notes.txt
E:\SchreiberM\Visual Studio\Bibliotheken\DLL\windreamDLL\64bit\Interop.WINDREAMLib.dll P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll
P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll