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

16
app/DD_PM_WINDREAM/frmValidator.vb
View File

@@ -11,6 +11,7 @@ Imports DevExpress.Pdf.pdfdo
Imports DevExpress.Pdf
Imports System.Text.RegularExpressions
Imports System.ComponentModel
Imports DD_LIB_Standards
Public Class frmValidator
Dim viewerID
@@ -423,7 +424,8 @@ Public Class frmValidator
Dim sqlStatement As String = row.Item("SQL_UEBERPRUEFUNG")
Dim connectionId As Integer = row.Item("CONNECTION_ID")
sql = ClassPatterns.ReplaceInternalValues(sqlStatement)
sql = DD_LIB_Standards.clsPatterns.ReplaceInternalValues(sqlStatement)
'sql = ClassPatterns.ReplaceInternalValues(sqlStatement)
dt = ClassDatabase.Return_Datatable(sql)
If IsNothing(dt) Then
@@ -638,9 +640,11 @@ Public Class frmValidator
sql = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID)
'sql = ClassPatterns.ReplaceAllValues(sql, pnldesigner, aktivesDokument)
If ClassPatterns.HasOnlySimplePatterns(sql) Then
sql = ClassPatterns.ReplaceInternalValues(sql)
sql = ClassPatterns.ReplaceControlValues(sql, pnldesigner)
'If ClassPatterns.HasOnlySimplePatterns(sql) Then
If clsPatterns.HasOnlySimplePatterns(sql) Then
sql = clsPatterns.ReplaceInternalValues(sql)
sql = clsPatterns.ReplaceControlValues(sql, pnldesigner)
sqlCnn = New SqlClient.SqlConnection(connectionString)
' Try
@@ -813,7 +817,7 @@ Public Class frmValidator
Dim sql_Statement = ROW.Item(2)
sql_Statement = ClassPatterns.ReplaceAllValues(sql_Statement, pnldesigner, aktivesDokument, CURRENT_USER_PRENAME, CURRENT_USER_SURNAME, CURRENT_USER_SHORTNAME, CURRENT_USER_EMAIL)
sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, aktivesDokument, CURRENT_USER_PRENAME, CURRENT_USER_SURNAME, CURRENT_USER_SHORTNAME, CURRENT_USER_EMAIL)
'' Regulären Ausdruck zum Auslesen der Indexe definieren
'Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
@@ -936,7 +940,7 @@ Public Class frmValidator
If Not IsDBNull(ROW.Item("CONNECTION_ID")) And Not IsDBNull(ROW.Item("SQL_UEBERPRUEFUNG")) Then
Dim sql_Statement = ROW.Item("SQL_UEBERPRUEFUNG")
sql_Statement = ClassPatterns.ReplaceAllValues(sql_Statement, pnldesigner, aktivesDokument, CURRENT_USER_PRENAME, CURRENT_USER_SURNAME, CURRENT_USER_SHORTNAME, CURRENT_USER_EMAIL)
sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, aktivesDokument, CURRENT_USER_PRENAME, CURRENT_USER_SURNAME, CURRENT_USER_SHORTNAME, CURRENT_USER_EMAIL)
'' Regulären Ausdruck zum Auslesen der Indexe definieren
'Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
'' einen Regulären Ausdruck laden