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

jj: new place holders

Browse Source
This commit is contained in:
Jonathan Jenne
2019-06-13 12:44:15 +02:00
parent 1b0729c2e3
commit 726d79ef3b
11 changed files with 181 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/DD_PM_WINDREAM/frmMain.vb
View File

@@ -476,6 +476,10 @@ Public Class frmMain
Dim value = row.Item("VALUE")
Dim argument = row.Item("ARGUMENT")
Dim sqlchart = row.Item("SQL_COMMAND")
sqlchart = clsPatterns.ReplaceInternalValues(sqlchart)
sqlchart = clsPatterns.ReplaceUserValues(sqlchart, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID)
sqlchart = sqlchart.ToString.ToUpper.Replace("@USER_ID", USER_ID)
sqlchart = sqlchart.ToString.ToUpper.Replace("@USER", USER_USERNAME)
Dim DATA_DT As DataTable = ClassDatabase.Return_Datatable(sqlchart)
@@ -588,6 +592,10 @@ Public Class frmMain
ToolStripLabelViewTape.Text = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE
Dim sql = foundRows(0)("SQL_VIEW")
sql = clsPatterns.ReplaceInternalValues(sql)
sql = clsPatterns.ReplaceUserValues(sql, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID)
sql = sql.Replace("@USER_ID", USER_ID)
sql = sql.Replace("@USERNAME", Environment.UserName)
sql = sql.Replace("@MACHINE_NAME", Environment.MachineName)
@@ -721,6 +729,10 @@ Public Class frmMain
ClassInit.InitBasics()
Dim sql = CURRENT_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW")
sql = clsPatterns.ReplaceInternalValues(sql)
sql = clsPatterns.ReplaceUserValues(sql, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID)
' this needs to stay for backwards compatibility
sql = sql.Replace("@USER_ID", USER_ID)
sql = sql.Replace("@USERNAME", Environment.UserName)
sql = sql.Replace("@MACHINE_NAME", Environment.MachineName)
@@ -1171,6 +1183,10 @@ Public Class frmMain
tslblmessage.Text = "No GROUP-CONFIG (SQL_PROFILE_MAIN_VIEW) in Baseconfig"
Exit Sub
End If
oSQLOverview = clsPatterns.ReplaceInternalValues(oSQLOverview)
oSQLOverview = clsPatterns.ReplaceUserValues(oSQLOverview, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID)
oSQLOverview = oSQLOverview.Replace("@USER_ID", USER_ID)
oSQLOverview = oSQLOverview.Replace("@USERNAME", Environment.UserName)
oSQLOverview = oSQLOverview.Replace("@MACHINE_NAME", Environment.MachineName)