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

MS

Browse Source
This commit is contained in:
SchreiberM
2020-04-30 16:24:37 +02:00
parent d57049e245
commit f3bc104b37
3 changed files with 20 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/DD_PM_WINDREAM/frmValidator.vb
View File

@@ -131,7 +131,7 @@ Public Class frmValidator
End Try
Try
_step = 1
TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Connection.ConnectionString = CONNECTION_STRING
_step = 2
@@ -2119,12 +2119,16 @@ Public Class frmValidator
errormessage = oErrorMessage
frmError.ShowDialog()
Else
LOGGER.Info("End of profile - no more documents!")
Dim oMsg = "Ende des Profils - Keine weiteren Vorgänge!"
If USER_LANGUAGE <> "de-DE" Then
oMsg = "End of profile - no more objects!"
End If
LOGGER.Info(oMsg)
Dim oROW As DataRow = ClassAllgemeineFunktionen.GUI_LANGUAGE_MSGBOX("frmValidator.NoMoreDocument")
Try
MsgBox(oROW.Item("STRING1"), MsgBoxStyle.Information, oROW.Item("STRING2"))
Catch ex As Exception
MsgBox("No more documents!" & vbNewLine & "Form will be closed now!", MsgBoxStyle.Information, ADDITIONAL_TITLE)
MsgBox("No more documents! (No translation so far)" & vbNewLine & "Form will be closed now!", MsgBoxStyle.Information, ADDITIONAL_TITLE)
End Try
activate_controls(True)
Me.Close()
@@ -3251,13 +3255,16 @@ Public Class frmValidator
If includeFI = True Then
Try
TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName)
Dim oDTFinalIndexes As DataTable = FinalIndexDataSet.TBPM_PROFILE_FINAL_INDEXING
If oDTFinalIndexes?.Rows.Count > 0 Then
Dim oSQL = $"SELECT * FROM TBPM_PROFILE_FINAL_INDEXING WHERE PROFIL_ID = {CURRENT_ProfilGUID}"
Dim oDTFinalIndexing = ClassDatabase.Return_Datatable(oSQL)
If oDTFinalIndexing?.Rows.Count > 0 Then
'Jetzt finale Indexe setzen
LOGGER.Debug("FINAL INDEXING STARTING...")
For Each oFinalIndexRow As DataRow In oDTFinalIndexes.Rows
For Each oFinalIndexRow As DataRow In oDTFinalIndexing.Rows
Dim oValue As String = oFinalIndexRow.Item("VALUE").ToString
Dim oIndexType = 0
If IDB_ACTIVE = False Then
oIndexType = WINDREAM.GetTypeOfIndex(oFinalIndexRow.Item("INDEXNAME"))
@@ -3265,7 +3272,7 @@ Public Class frmValidator
If oValue.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ###
LOGGER.Debug("Indexing wih dynamic sql...")
Dim oSQLCommand = oFinalIndexRow.Item("SQL_COMMAND")
Dim oConnectionID = oFinalIndexRow.Item("CONNECTION_ID")
oSQLCommand = clsPatterns.ReplaceAllValues(oSQLCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID)
If IsNothing(oSQLCommand) Then
errormessage = "Error while replacing Values in final indexing - Check the log"
@@ -3275,7 +3282,7 @@ Public Class frmValidator
ItemWorked = False
End If
If Not IsNothing(oSQLCommand) Then
Dim oResultfromSQL = ClassDatabase.Execute_Scalar(oSQLCommand, CONNECTION_STRING, True)
Dim oResultfromSQL = ClassDatabase.Execute_Scalar_ConID(oSQLCommand, oConnectionID)
If Not IsNothing(oResultfromSQL) Then
LOGGER.Debug($"oResultfromSQL is [{oResultfromSQL.ToString}]")