AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

jj: add cancel button, fix some bug

Browse Source
This commit is contained in:
Jonathan Jenne
2018-06-08 15:51:54 +02:00
parent 911a017dd9
commit 307d6ecabf
13 changed files with 1978 additions and 1667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb
View File

@@ -1,5 +1,6 @@
Imports System.Text.RegularExpressions
Imports Oracle.ManagedDataAccess.Client
Imports DD_LIB_Standards
Public Class frmSQL_DESIGNER
Private _windreamPM As ClassPMWindream
@@ -95,7 +96,7 @@ Public Class frmSQL_DESIGNER
Dim text As String = SQL_COMMANDTextBox.Text
dgvPlaceholders.Rows.Clear()
Dim patterns As List(Of ClassPatterns.Pattern) = ClassPatterns.GetAllPatterns(text)
Dim patterns As List(Of clsPatterns.Pattern) = clsPatterns.GetAllPatterns(text)
For Each pattern In patterns
dgvPlaceholders.Rows.Add({pattern.ToString, ""})
@@ -120,9 +121,9 @@ Public Class frmSQL_DESIGNER
' Wenn Ersetzung ausgefüllt wurde, Platzhalter damit ersetzen
If Not String.IsNullOrEmpty(replacement) Then
Dim pattern As New ClassPatterns.Pattern(placeholder)
Dim pattern As New clsPatterns.Pattern(placeholder)
query = ClassPatterns.ReplacePattern(query, pattern.Type, replacement)
query = clsPatterns.ReplacePattern(query, pattern.Type, replacement)
'query = query.Replace(placeholder, replacement)
Else
@@ -228,21 +229,21 @@ Public Class frmSQL_DESIGNER
Private Sub btnAddControl_Click(sender As Object, e As EventArgs) Handles btnAddControl.Click
If cmbControls.SelectedIndex <> -1 Then
Dim value As String = ClassPatterns.WrapPatternValue("CTRL", cmbControls.Text)
Dim value As String = clsPatterns.WrapPatternValue("CTRL", cmbControls.Text)
InsertAtSelection(value)
End If
End Sub
Private Sub btnAddStatic_Click(sender As Object, e As EventArgs) Handles btnAddStatic.Click
If cmbStatic.SelectedIndex <> -1 Then
Dim value As String = ClassPatterns.WrapPatternValue("INT", cmbStatic.Text)
Dim value As String = clsPatterns.WrapPatternValue("INT", cmbStatic.Text)
InsertAtSelection(value)
End If
End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnAddIndex.Click
If cmbIndexe.SelectedIndex <> -1 Then
Dim value As String = ClassPatterns.WrapPatternValue("WMI", cmbIndexe.Text)
Dim value As String = clsPatterns.WrapPatternValue("WMI", cmbIndexe.Text)
InsertAtSelection(value)
End If
End Sub
@@ -259,7 +260,7 @@ Public Class frmSQL_DESIGNER
Private Sub btnAddUser_Click(sender As Object, e As EventArgs) Handles btnAddUser.Click
If cmbUser.SelectedIndex <> -1 Then
Dim value As String = ClassPatterns.WrapPatternValue("USER", cmbUser.Text)
Dim value As String = clsPatterns.WrapPatternValue("USER", cmbUser.Text)
InsertAtSelection(value)
End If
End Sub