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

Merge branch 'master' of http://172.24.11.74:90/scm/git/ProcessManagerClient

Browse Source
This commit is contained in:
Jonathan Jenne 2019-07-03 14:28:17 +02:00
commit 772fc802a7
2 changed files with 96 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
app/DD_PM_WINDREAM/frmMain.vb
View File

@ -720,85 +720,85 @@ Public Class frmMain
LOGGER.Info("Unexpected Error in GridView_CheckInvalidColumns: " & ex.Message) LOGGER.Info("Unexpected Error in GridView_CheckInvalidColumns: " & ex.Message)
End Try End Try
End Function End Function
Sub LoadProfile_PM() 'Sub LoadProfile_PM()
Try ' Try
If Me.Visible = True And frmAdministration.Visible = False Then ' If Me.Visible = True And frmAdministration.Visible = False Then
Load_Profiles_for_User() ' Load_Profiles_for_User()
PROFILE_COUNT = 0 ' PROFILE_COUNT = 0
ClassInit.InitBasics() ' ClassInit.InitBasics()
Dim sql = CURRENT_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW") ' Dim sql = CURRENT_DT_CONFIG.Rows(0).Item("SQL_PROFILE_MAIN_VIEW")
sql = clsPatterns.ReplaceInternalValues(sql) ' sql = clsPatterns.ReplaceInternalValues(sql)
sql = clsPatterns.ReplaceUserValues(sql, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) ' 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 ' ' this needs to stay for backwards compatibility
sql = sql.Replace("@USER_ID", USER_ID) ' sql = sql.Replace("@USER_ID", USER_ID)
sql = sql.Replace("@USERNAME", Environment.UserName) '{#INT#USERNAME} ' sql = sql.Replace("@USERNAME", Environment.UserName) '{#INT#USERNAME}
sql = sql.Replace("@MACHINE_NAME", Environment.MachineName) '{#INT#machineName} ' sql = sql.Replace("@MACHINE_NAME", Environment.MachineName) '{#INT#machineName}
sql = sql.Replace("@DATE", Now.ToShortDateString) ' sql = sql.Replace("@DATE", Now.ToShortDateString)
sql = sql.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) ' 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 " & ' '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 " & ' ' "WHERE T.PROFIL_ID = T1.PROFIL_ID " &
' "AND T1.ACTIVE = 1 And (UPPER(T1.USERNAME) = UPPER('{0}')) Order By T1.PRIORITY", Environment.UserName) ' ' "AND T1.ACTIVE = 1 And (UPPER(T1.USERNAME) = UPPER('{0}')) Order By T1.PRIORITY", Environment.UserName)
CURR_DT_PROFILEGRID = ClassDatabase.Return_Datatable(sql, True) ' CURR_DT_PROFILEGRID = ClassDatabase.Return_Datatable(sql, True)
If Not IsNothing(CURR_DT_PROFILEGRID) Then ' If Not IsNothing(CURR_DT_PROFILEGRID) Then
If CURR_DT_PROFILEGRID.Rows.Count = 0 Then ' If CURR_DT_PROFILEGRID.Rows.Count = 0 Then
NO_WORKFLOWITEMS = True ' NO_WORKFLOWITEMS = True
Else ' Else
NO_WORKFLOWITEMS = False ' NO_WORKFLOWITEMS = False
End If ' End If
Create_Basic_View() ' Create_Basic_View()
Try ' Try
Try ' Try
GridView_Docs.Columns.Item("GROUP_TEXT").GroupIndex = 0 ' GridView_Docs.Columns.Item("GROUP_TEXT").GroupIndex = 0
GridView_Docs.Columns.Item("GROUP_TEXT").Visible = False ' GridView_Docs.Columns.Item("GROUP_TEXT").Visible = False
GridView_Docs.Columns.Item("GROUP_COLOR").Visible = False ' GridView_Docs.Columns.Item("GROUP_COLOR").Visible = False
Catch ex As Exception ' Catch ex As Exception
End Try ' End Try
For I = 0 To GridView_Docs.GroupCount - 1 ' For I = 0 To GridView_Docs.GroupCount - 1
Dim v = GridView_Docs.GroupedColumns(I).ToString ' Dim v = GridView_Docs.GroupedColumns(I).ToString
Dim ii = Nothing ' Dim ii = Nothing
GridView_Docs.GroupedColumns(I).Tag = GridView_Docs.Columns.Item("PROFILE_ID") ' GridView_Docs.GroupedColumns(I).Tag = GridView_Docs.Columns.Item("PROFILE_ID")
Next ' Next
'GridView_Docs.OptionsBehavior.AutoExpandAllGroups = False ' 'GridView_Docs.OptionsBehavior.AutoExpandAllGroups = False
'GridView_Docs.OptionsView.ShowGroupedColumns = False ' 'GridView_Docs.OptionsView.ShowGroupedColumns = False
Catch ex As Exception ' Catch ex As Exception
LOGGER.Error(ex) ' LOGGER.Error(ex)
LOGGER.Info("Unexpected Error in Formatting Grid: " & ex.Message) ' LOGGER.Info("Unexpected Error in Formatting Grid: " & ex.Message)
End Try ' End Try
Dim Columns_Removed = GridView_CheckInvalidColumns() ' Dim Columns_Removed = GridView_CheckInvalidColumns()
RestoreLayout() ' RestoreLayout()
If GridView_Docs.Columns.Count <= 2 Then ' If GridView_Docs.Columns.Count <= 2 Then
LOGGER.Info("GridView_Docs.Columns.Count <= 2 - Reset_Gridlayout will be forced...", False) ' LOGGER.Info("GridView_Docs.Columns.Count <= 2 - Reset_Gridlayout will be forced...", False)
Reset_GridLayout() ' Reset_GridLayout()
End If ' End If
Else ' Else
GridControl_Docs.DataSource = Nothing ' GridControl_Docs.DataSource = Nothing
Try ' Try
GridView_Docs.Columns.Clear() ' GridView_Docs.Columns.Clear()
Catch ex As Exception ' Catch ex As Exception
LOGGER.Error(ex) ' LOGGER.Error(ex)
End Try ' End Try
End If ' End If
End If ' End If
Catch ex As Exception ' Catch ex As Exception
LOGGER.Error(ex) ' LOGGER.Error(ex)
LOGGER.Info("LoadProfile_PM - Fehler: " & ex.Message) ' LOGGER.Info("LoadProfile_PM - Fehler: " & ex.Message)
MsgBox("Fehler LoadProfile_PM - Fehler: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") ' MsgBox("Fehler LoadProfile_PM - Fehler: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
End Try ' End Try
End Sub 'End Sub
Private Sub ToolStripButton1_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripButton1.Click Private Sub ToolStripButton1_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripButton1.Click
Try Try
frmKonfig.ShowDialog() frmKonfig.ShowDialog()

48
app/DD_PM_WINDREAM/frmValidator.vb
View File

@ -1434,24 +1434,34 @@ Public Class frmValidator
End Function End Function
Private Function GetWMDocPathWindows(_CheckStandard As Integer) Private Function GetWMDocPathWindows(_CheckStandard As Integer)
Dim oResult As String Try
Dim oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},{_CheckStandard})" Dim oResult As String
oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) Dim oSQL = $"SELECT [dbo].[FNPM_GET_WM_FILE_PATH] ({CURRENT_DOC_GUID},{_CheckStandard})"
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)"
oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) oResult = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING)
LOGGER.Debug($"Checking file [{oResult}] exists?...") LOGGER.Debug($"Checking file [{oResult}] exists?...")
If File.Exists(oResult) = False Then 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
End If WMDocPathWindows = oResult
WMDocPathWindows = oResult OLD_Document_Path = WMDocPathWindows
OLD_Document_Path = WMDocPathWindows CURRENT_DOC_PATH = WMDocPathWindows
CURRENT_DOC_PATH = WMDocPathWindows LOGGER.Debug($"CURRENT_DOC_PATH: {CURRENT_DOC_PATH}")
LOGGER.Debug($"CURRENT_DOC_PATH: {CURRENT_DOC_PATH}") Return True
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 End Function
Sub Load_Next_Document(first As Boolean) Sub Load_Next_Document(first As Boolean)
@ -1492,10 +1502,14 @@ Public Class frmValidator
If CURRENT_JUMP_DOC_GUID = 0 Then If CURRENT_JUMP_DOC_GUID = 0 Then
CURRENT_DOC_GUID = Get_Next_GUID() CURRENT_DOC_GUID = Get_Next_GUID()
End If End If
GetWMDocPathWindows(0)
LOGGER.Debug("Dokument-GUID: '" & CURRENT_DOC_GUID.ToString & "'") 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 'Beschriftung des Navigators
'lblNavigator_anzDok.Text = position & " of " & Anzahl_ValDoks & " files" 'lblNavigator_anzDok.Text = position & " of " & Anzahl_ValDoks & " files"
If WMDocPathWindows <> String.Empty Then If WMDocPathWindows <> String.Empty Then