diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 535066f..2a92ff7 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -720,85 +720,85 @@ Public Class frmMain LOGGER.Info("Unexpected Error in GridView_CheckInvalidColumns: " & ex.Message) End Try End Function - Sub LoadProfile_PM() - Try - If Me.Visible = True And frmAdministration.Visible = False Then - Load_Profiles_for_User() + 'Sub LoadProfile_PM() + ' Try + ' If Me.Visible = True And frmAdministration.Visible = False Then + ' Load_Profiles_for_User() - PROFILE_COUNT = 0 - ClassInit.InitBasics() - Dim sql = CURRENT_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") + ' PROFILE_COUNT = 0 + ' 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, CURRENT_CLICKED_PROFILE_ID) + ' sql = clsPatterns.ReplaceInternalValues(sql) + ' sql = clsPatterns.ReplaceUserValues(sql, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) - ' this needs to stay for backwards compatibility - sql = sql.Replace("@USER_ID", USER_ID) - sql = sql.Replace("@USERNAME", Environment.UserName) '{#INT#USERNAME} - sql = sql.Replace("@MACHINE_NAME", Environment.MachineName) '{#INT#machineName} - sql = sql.Replace("@DATE", Now.ToShortDateString) - sql = sql.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) + ' ' this needs to stay for backwards compatibility + ' sql = sql.Replace("@USER_ID", USER_ID) + ' sql = sql.Replace("@USERNAME", Environment.UserName) '{#INT#USERNAME} + ' sql = sql.Replace("@MACHINE_NAME", Environment.MachineName) '{#INT#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) - CURR_DT_PROFILEGRID = ClassDatabase.Return_Datatable(sql, True) + ' '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) + ' CURR_DT_PROFILEGRID = ClassDatabase.Return_Datatable(sql, True) - If Not IsNothing(CURR_DT_PROFILEGRID) Then - If CURR_DT_PROFILEGRID.Rows.Count = 0 Then - NO_WORKFLOWITEMS = True - Else - NO_WORKFLOWITEMS = False - End If - Create_Basic_View() + ' If Not IsNothing(CURR_DT_PROFILEGRID) Then + ' If CURR_DT_PROFILEGRID.Rows.Count = 0 Then + ' NO_WORKFLOWITEMS = True + ' Else + ' NO_WORKFLOWITEMS = False + ' End If + ' Create_Basic_View() - Try - Try - GridView_Docs.Columns.Item("GROUP_TEXT").GroupIndex = 0 - GridView_Docs.Columns.Item("GROUP_TEXT").Visible = False - GridView_Docs.Columns.Item("GROUP_COLOR").Visible = False - Catch ex As Exception + ' Try + ' Try + ' GridView_Docs.Columns.Item("GROUP_TEXT").GroupIndex = 0 + ' GridView_Docs.Columns.Item("GROUP_TEXT").Visible = False + ' GridView_Docs.Columns.Item("GROUP_COLOR").Visible = False + ' Catch ex As Exception - End Try + ' End Try - For I = 0 To GridView_Docs.GroupCount - 1 - Dim v = GridView_Docs.GroupedColumns(I).ToString - Dim ii = Nothing - GridView_Docs.GroupedColumns(I).Tag = GridView_Docs.Columns.Item("PROFILE_ID") - Next + ' For I = 0 To GridView_Docs.GroupCount - 1 + ' Dim v = GridView_Docs.GroupedColumns(I).ToString + ' Dim ii = Nothing + ' GridView_Docs.GroupedColumns(I).Tag = GridView_Docs.Columns.Item("PROFILE_ID") + ' Next - 'GridView_Docs.OptionsBehavior.AutoExpandAllGroups = False - 'GridView_Docs.OptionsView.ShowGroupedColumns = False - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info("Unexpected Error in Formatting Grid: " & ex.Message) - End Try + ' 'GridView_Docs.OptionsBehavior.AutoExpandAllGroups = False + ' 'GridView_Docs.OptionsView.ShowGroupedColumns = False + ' Catch ex As Exception + ' LOGGER.Error(ex) + ' LOGGER.Info("Unexpected Error in Formatting Grid: " & ex.Message) + ' End Try - Dim Columns_Removed = GridView_CheckInvalidColumns() - RestoreLayout() + ' Dim Columns_Removed = GridView_CheckInvalidColumns() + ' RestoreLayout() - If GridView_Docs.Columns.Count <= 2 Then - LOGGER.Info("GridView_Docs.Columns.Count <= 2 - Reset_Gridlayout will be forced...", False) - Reset_GridLayout() - End If + ' If GridView_Docs.Columns.Count <= 2 Then + ' LOGGER.Info("GridView_Docs.Columns.Count <= 2 - Reset_Gridlayout will be forced...", False) + ' Reset_GridLayout() + ' End If - Else - GridControl_Docs.DataSource = Nothing - Try - GridView_Docs.Columns.Clear() - Catch ex As Exception - LOGGER.Error(ex) + ' Else + ' GridControl_Docs.DataSource = Nothing + ' Try + ' GridView_Docs.Columns.Clear() + ' Catch ex As Exception + ' LOGGER.Error(ex) - End Try - End If - End If - Catch ex As Exception - LOGGER.Error(ex) - LOGGER.Info("LoadProfile_PM - Fehler: " & ex.Message) - MsgBox("Fehler LoadProfile_PM - Fehler: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") - End Try + ' End Try + ' End If + ' End If + ' Catch ex As Exception + ' LOGGER.Error(ex) + ' LOGGER.Info("LoadProfile_PM - Fehler: " & ex.Message) + ' MsgBox("Fehler LoadProfile_PM - Fehler: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") + ' End Try - End Sub + 'End Sub Private Sub ToolStripButton1_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripButton1.Click Try frmKonfig.ShowDialog() diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 35b76a3..0a84b78 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -1434,24 +1434,34 @@ Public Class frmValidator End Function Private Function GetWMDocPathWindows(_CheckStandard As Integer) - Dim oResult As String - Dim oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},{_CheckStandard})" - oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) - LOGGER.Debug($"Checking file [{oResult}] exists?...") - If File.Exists(oResult) = False Then - LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...") - oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},1)" + Try + Dim oResult As String + Dim oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},{_CheckStandard})" oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) LOGGER.Debug($"Checking file [{oResult}] exists?...") If File.Exists(oResult) = False Then - Return False + LOGGER.Debug($"GetWMDocPathWindows returned false - trying with standard again...") + oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},1)" + oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) + LOGGER.Debug($"Checking file [{oResult}] exists?...") + If File.Exists(oResult) = False Then + Return False + End If End If - End If - WMDocPathWindows = oResult - OLD_Document_Path = WMDocPathWindows - CURRENT_DOC_PATH = WMDocPathWindows - LOGGER.Debug($"CURRENT_DOC_PATH: {CURRENT_DOC_PATH}") - Return True + WMDocPathWindows = oResult + OLD_Document_Path = WMDocPathWindows + CURRENT_DOC_PATH = WMDocPathWindows + LOGGER.Debug($"CURRENT_DOC_PATH: {CURRENT_DOC_PATH}") + Return True + Catch ex As Exception + WMDocPathWindows = "" + OLD_Document_Path = "" + CURRENT_DOC_PATH = "" + errormessage = $"Unexpected error in GetWMDocPathWindows: [{ex.Message}]!" + frmError.ShowDialog() + Return False + End Try + End Function Sub Load_Next_Document(first As Boolean) @@ -1492,10 +1502,14 @@ Public Class frmValidator If CURRENT_JUMP_DOC_GUID = 0 Then CURRENT_DOC_GUID = Get_Next_GUID() End If - GetWMDocPathWindows(0) LOGGER.Debug("Dokument-GUID: '" & CURRENT_DOC_GUID.ToString & "'") - If CURRENT_DOC_GUID > 0 And CreateWMObject() = True Then - + If CURRENT_DOC_GUID > 0 Then + If GetWMDocPathWindows(0) = False Then + Exit Sub + End If + If CreateWMObject() = False Then + Exit Sub + End If 'Beschriftung des Navigators 'lblNavigator_anzDok.Text = position & " of " & Anzahl_ValDoks & " files" If WMDocPathWindows <> String.Empty Then