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

MS Button SQL

Browse Source
This commit is contained in:
SchreiberM 2019-11-20 17:36:42 +01:00
parent 8ebd2b0ff0
commit d3024ca395
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/DD_PM_WINDREAM/clsPatterns.vb
View File

@ -38,8 +38,8 @@ Public Class clsPatterns
Public Const MAX_TRY_COUNT = 500 Public Const MAX_TRY_COUNT = 500
Private Shared regex As Regex = New Regex("{#(\w+)#([\w\s_-]+)}+") Private Shared regex As Regex = New Regex("{#(\w+)#([\w\s_-]+)}+")
Private Shared allPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_USER, PATTERN_INT} Private Shared allPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_IDBA, PATTERN_USER, PATTERN_INT}
Private Shared complexPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL} Private Shared complexPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_IDBA}
Private Shared simplePatterns As New List(Of String) From {PATTERN_USER, PATTERN_INT} Private Shared simplePatterns As New List(Of String) From {PATTERN_USER, PATTERN_INT}
''' <summary> ''' <summary>

7
app/DD_PM_WINDREAM/frmValidator.vb
View File

@ -993,7 +993,7 @@ Public Class frmValidator
' = $"select SQL_UEBERPRUEFUNG,SQL2 FROM TBPM_PROFILE_CONTROLS WHERE GUID = {oControlID}" ' = $"select SQL_UEBERPRUEFUNG,SQL2 FROM TBPM_PROFILE_CONTROLS WHERE GUID = {oControlID}"
oSQL = clsPatterns.ReplaceAllValues(oSQL, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) oSQL = clsPatterns.ReplaceAllValues(oSQL, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID)
LOGGER.Debug($"oSQL after replace {oSQL}") LOGGER.Debug($"oSQL after replace {oSQL}")
oSQL = clsPatterns.ReplaceAllValues(oSQL2, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) oSQL2 = clsPatterns.ReplaceAllValues(oSQL2, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID)
Dim oDT_ACTIONS As DataTable = ClassDatabase.Return_Datatable(oSQL) Dim oDT_ACTIONS As DataTable = ClassDatabase.Return_Datatable(oSQL)
If IsNothing(oDT_ACTIONS) Then If IsNothing(oDT_ACTIONS) Then
MsgBox("Something went wrong in custom action - Please check Your log!", MsgBoxStyle.Exclamation) MsgBox("Something went wrong in custom action - Please check Your log!", MsgBoxStyle.Exclamation)
@ -1009,7 +1009,7 @@ Public Class frmValidator
Dim oCaption Dim oCaption
Dim oColor Dim oColor
Try Try
oAction = oDT_ACTIONS?.Rows(0).Item("Action_Type") oAction = oDT_ACTIONS?.Rows(0).Item("ActionType")
Catch ex As Exception Catch ex As Exception
oAction = "" oAction = ""
End Try End Try
@ -2670,13 +2670,14 @@ Public Class frmValidator
btnSave.Enabled = False btnSave.Enabled = False
LOGGER.Debug("Abschluss für Dok: " & CURRENT_DOC_PATH & " gestartet") LOGGER.Debug("Abschluss für Dok: " & CURRENT_DOC_PATH & " gestartet")
ItemWorked = True
If OverrideAll = False Then If OverrideAll = False Then
'Eingaben auf Form überprüfen 'Eingaben auf Form überprüfen
If Check_UpdateIndexe() = False Then If Check_UpdateIndexe() = False Then
'lblerror.Visible = False 'lblerror.Visible = False
'Try 'Try
Dim oErrorOcurred As Boolean = False Dim oErrorOcurred As Boolean = False
ItemWorked = True
TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName) TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName)
Dim oDTFinalIndexes As DataTable = FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING Dim oDTFinalIndexes As DataTable = FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING
If oDTFinalIndexes.Rows.Count > 0 Then If oDTFinalIndexes.Rows.Count > 0 Then