From e41e9cc5753b20634c57d1c6a86f19e35eec1a0b Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Wed, 13 Jun 2018 16:12:49 +0200 Subject: [PATCH] MS frmMain PArameterErsetzung --- app/DD_PM_WINDREAM/frmMain.vb | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 6b76cbe..e804550 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -280,7 +280,7 @@ Public Class frmMain End Sub Sub Load_Profiles_for_User() Try - Dim sql = String.Format("SELECT T.* FROM VWPM_PROFILE_ACTIVE T, TBPM_PROFILE_USER T1, TBDD_USER T2 WHERE T.GUID = T1.PROFIL_ID AND T1.USER_ID = T2.GUID AND UPPER(T2.USERNAME) = UPPER('{0}')", Environment.UserName) + Dim sql = String.Format("SELECT T.* FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_GET_ACTIVE_PROFILES_USER] ({0}))", CURRENT_USER_ID) CURR_DT_VWPM_PROFILE_ACTIVE = ClassDatabase.Return_Datatable(sql) Catch ex As Exception ClassLogger.Add("Load_Profiles_for_User - Error: " & ex.Message) @@ -367,6 +367,7 @@ Public Class frmMain Dim value = row.Item("VALUE") Dim argument = row.Item("ARGUMENT") Dim sqlchart = row.Item("SQL_COMMAND") + sqlchart = sqlchart.ToString.ToUpper.Replace("@USER_ID", CURRENT_USER_ID) sqlchart = sqlchart.ToString.ToUpper.Replace("@USER", USER_USERNAME) Dim DATA_DT As DataTable = ClassDatabase.Return_Datatable(sqlchart) @@ -473,9 +474,10 @@ Public Class frmMain If result = 1 Then lblViewType.Text = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE + Dim sql = foundRows(0)("SQL_VIEW") - sql = sql.Replace("@USER", Environment.UserName) sql = sql.Replace("@USER_ID", CURRENT_USER_ID) + sql = sql.Replace("@USERNAME", Environment.UserName) sql = sql.Replace("@MACHINE_NAME", Environment.MachineName) sql = sql.Replace("@DATE", Now.ToShortDateString) sql = sql.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) @@ -592,9 +594,13 @@ Public Class frmMain PROFILE_COUNT = 0 ClassInit.InitBasics() Dim sql = CURRENT_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") - sql = sql.Replace("@USER", Environment.UserName) + + sql = sql.Replace("@USER_ID", CURRENT_USER_ID) + sql = sql.Replace("@USERNAME", Environment.UserName) sql = sql.Replace("@MACHINE_NAME", Environment.MachineName) sql = sql.Replace("@DATE", Now.ToShortDateString) + sql = sql.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) + 'String.Format("SELECT '1' TL_STATE,T.PROFIL_ID,T1.TITLE, T.DOC_ID, T.FILE_PATH, T.DMS_ERSTELLT_DATE,[dbo].[FNPM_LAST_WORKUSER_DOC] (T.PROFIL_ID,T.DOC_ID) AS 'Last User',[dbo].[FNPM_LAST_EDITED_DOC] (T.PROFIL_ID,T.DOC_ID) as 'Last edited' FROM TBPM_PROFILE_FILES T, VWPM_PROFILE_USER T1 " & ' "WHERE T.PROFIL_ID = T1.PROFIL_ID " & ' "AND T1.ACTIVE = 1 And (UPPER(T1.USERNAME) = UPPER('{0}')) Order By T1.PRIORITY", Environment.UserName) @@ -978,9 +984,12 @@ Public Class frmMain tslblmessage.Text = "No GROUP-CONFIG (SQL_PROFILE_MAIN_VIEW) in Baseconfig" Exit Sub End If - sql = sql.Replace("@USER", Environment.UserName) + sql = sql.Replace("@USER_ID", CURRENT_USER_ID) + sql = sql.Replace("@USERNAME", Environment.UserName) sql = sql.Replace("@MACHINE_NAME", Environment.MachineName) sql = sql.Replace("@DATE", Now.ToShortDateString) + sql = sql.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) + 'String.Format("SELECT '1' TL_STATE,T.PROFIL_ID,T1.TITLE, T.DOC_ID, T.FILE_PATH, T.DMS_ERSTELLT_DATE,[dbo].[FNPM_LAST_WORKUSER_DOC] (T.PROFIL_ID,T.DOC_ID) AS 'Last User',[dbo].[FNPM_LAST_EDITED_DOC] (T.PROFIL_ID,T.DOC_ID) as 'Last edited' FROM TBPM_PROFILE_FILES T, VWPM_PROFILE_USER T1 " & ' "WHERE T.PROFIL_ID = T1.PROFIL_ID " & ' "AND T1.ACTIVE = 1 And (UPPER(T1.USERNAME) = UPPER('{0}')) Order By T1.PRIORITY", Environment.UserName)