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

Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ProcessManager_Client

Browse Source
This commit is contained in:
Jonathan Jenne 2021-10-13 09:41:22 +02:00
commit 7269d19460
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/DD_PM_WINDREAM/frmMain.vb
View File

@ -711,9 +711,13 @@ Public Class frmMain
If IsNumeric(_tag) Then If IsNumeric(_tag) Then
If CURRENT_CLICKED_PROFILE_ID <> _tag Then If CURRENT_CLICKED_PROFILE_ID <> _tag Then
OverviewOrDEtail = "DETAIL" OverviewOrDEtail = "DETAIL"
CURRENT_CLICKED_PROFILE_ID = _tag If Not Application.OpenForms().OfType(Of frmValidator).Any Then
CURRENT_CLICKED_PROFILE_TITLE = e.Link.Item.Caption CURRENT_CLICKED_PROFILE_ID = _tag
GRID_LOAD_TYPE = "PROFILE#" & CURRENT_CLICKED_PROFILE_ID.ToString CURRENT_CLICKED_PROFILE_TITLE = e.Link.Item.Caption
End If
GRID_LOAD_TYPE = "PROFILE#" & _tag.ToString
TimerRefresh.Stop() TimerRefresh.Stop()
GridView_Docs.ShowLoadingPanel() GridView_Docs.ShowLoadingPanel()
DetailLinkActive = True DetailLinkActive = True
@ -2128,10 +2132,16 @@ Public Class frmMain
' Ein/Ausklappen verhindern ' Ein/Ausklappen verhindern
DXMouseEventArgs.GetMouseArgs(e).Handled = True DXMouseEventArgs.GetMouseArgs(e).Handled = True
GridViewItem_Clicked = "GROUP" GridViewItem_Clicked = "GROUP"
CURRENT_CLICKED_PROFILE_ID = GridView_Docs.GetRowCellValue(GridView_Docs.GetDataRowHandleByGroupRowHandle(hi.RowHandle), GridView_Docs.Columns("PROFILE_ID")) If Not Application.OpenForms().OfType(Of frmValidator).Any Then
CURRENT_CLICKED_PROFILE_ID = GridView_Docs.GetRowCellValue(GridView_Docs.GetDataRowHandleByGroupRowHandle(hi.RowHandle), GridView_Docs.Columns("PROFILE_ID"))
End If
ElseIf hi.InDataRow Then ElseIf hi.InDataRow Then
GridViewItem_Clicked = "ROW" GridViewItem_Clicked = "ROW"
CURRENT_CLICKED_PROFILE_ID = GridView_Docs.GetRowCellValue(GridView_Docs.GetDataRowHandleByGroupRowHandle(hi.RowHandle), GridView_Docs.Columns("PROFILE_ID")) If Not Application.OpenForms().OfType(Of frmValidator).Any Then
CURRENT_CLICKED_PROFILE_ID = GridView_Docs.GetRowCellValue(GridView_Docs.GetDataRowHandleByGroupRowHandle(hi.RowHandle), GridView_Docs.Columns("PROFILE_ID"))
End If
Else Else
GridViewItem_Clicked = Nothing GridViewItem_Clicked = Nothing
End If End If
@ -2140,7 +2150,10 @@ Public Class frmMain
If CURRENT_CLICKED_PROFILE_ID > 0 Then If CURRENT_CLICKED_PROFILE_ID > 0 Then
For Each orow As DataRow In CURRENT_DT_PROFILES.Rows For Each orow As DataRow In CURRENT_DT_PROFILES.Rows
If orow.Item("GUID") = CURRENT_CLICKED_PROFILE_ID Then If orow.Item("GUID") = CURRENT_CLICKED_PROFILE_ID Then
CURRENT_CLICKED_PROFILE_TITLE = orow.Item("TITLE") If Not Application.OpenForms().OfType(Of frmValidator).Any Then
CURRENT_CLICKED_PROFILE_TITLE = orow.Item("TITLE")
End If
Exit For Exit For
End If End If
Next Next

5
app/DD_PM_WINDREAM/frmValidator.vb
View File

@ -438,6 +438,7 @@ Public Class frmValidator
Try Try
Dim oDel = $"DELETE FROM TBPM_DOCWALKOVER WHERE UserID = {USER_ID}" Dim oDel = $"DELETE FROM TBPM_DOCWALKOVER WHERE UserID = {USER_ID}"
Database_ECM.ExecuteNonQuery(oDel) Database_ECM.ExecuteNonQuery(oDel)
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex) LOGGER.Error(ex)
@ -453,6 +454,8 @@ Public Class frmValidator
LOGGER.Error(ex) LOGGER.Error(ex)
End Try End Try
End If End If
CURRENT_DOC_ID = 0
CURRENT_DOC_GUID = 0
Try Try
DocumentViewerValidator.CloseDocument() DocumentViewerValidator.CloseDocument()
DocumentViewerValidator.Done() DocumentViewerValidator.Done()
@ -1088,7 +1091,7 @@ Public Class frmValidator
End If End If
Dim oTextBox As TextBox = sender Dim oTextBox As TextBox = sender
If oTextBox.Text <> String.Empty And me_closing = False And _Indexe_Loaded = True And oTextBox.Height < 25 Then If oTextBox.Text <> String.Empty And me_closing = False And _Indexe_Loaded = True And oTextBox.Height <25 Then
If (e.KeyCode = Keys.Return) Or (e.KeyCode = Keys.Tab) Or (e.KeyCode = Keys.Enter) Then If (e.KeyCode = Keys.Return) Or (e.KeyCode = Keys.Tab) Or (e.KeyCode = Keys.Enter) Then
Try Try