From e9a7c5376c9f06c2150eaf23e6acefb8bbe8571d Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Wed, 6 Oct 2021 13:41:11 +0200 Subject: [PATCH 1/2] MS SetBack CurrentDocID --- app/DD_PM_WINDREAM/frmValidator.vb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 41c83a6..74f087d 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -437,6 +437,7 @@ Public Class frmValidator Try Dim oDel = $"DELETE FROM TBPM_DOCWALKOVER WHERE UserID = {USER_ID}" + Database_ECM.ExecuteNonQuery(oDel) Catch ex As Exception LOGGER.Error(ex) @@ -452,6 +453,8 @@ Public Class frmValidator LOGGER.Error(ex) End Try End If + CURRENT_DOC_ID = 0 + CURRENT_DOC_GUID = 0 Try DocumentViewerValidator.CloseDocument() DocumentViewerValidator.Done() @@ -1093,7 +1096,7 @@ Public Class frmValidator End If 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 Try From a5c5113aef1e5405dbb6f9527324cd83dd4acb6e Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 12 Oct 2021 17:01:39 +0200 Subject: [PATCH 2/2] MS ProfileID und Title FinalIndices --- app/DD_PM_WINDREAM/frmMain.vb | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 7a7596a..2ecc1f7 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -711,9 +711,13 @@ Public Class frmMain If IsNumeric(_tag) Then If CURRENT_CLICKED_PROFILE_ID <> _tag Then OverviewOrDEtail = "DETAIL" - CURRENT_CLICKED_PROFILE_ID = _tag - CURRENT_CLICKED_PROFILE_TITLE = e.Link.Item.Caption - GRID_LOAD_TYPE = "PROFILE#" & CURRENT_CLICKED_PROFILE_ID.ToString + If Not Application.OpenForms().OfType(Of frmValidator).Any Then + CURRENT_CLICKED_PROFILE_ID = _tag + CURRENT_CLICKED_PROFILE_TITLE = e.Link.Item.Caption + End If + + + GRID_LOAD_TYPE = "PROFILE#" & _tag.ToString TimerRefresh.Stop() GridView_Docs.ShowLoadingPanel() DetailLinkActive = True @@ -2128,10 +2132,16 @@ Public Class frmMain ' Ein/Ausklappen verhindern DXMouseEventArgs.GetMouseArgs(e).Handled = True 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 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 GridViewItem_Clicked = Nothing End If @@ -2140,7 +2150,10 @@ Public Class frmMain If CURRENT_CLICKED_PROFILE_ID > 0 Then For Each orow As DataRow In CURRENT_DT_PROFILES.Rows 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 End If Next