From 6f72be904dc6e227c9d40bd33aa805a639f80610 Mon Sep 17 00:00:00 2001 From: JenneJ Date: Fri, 3 Jun 2016 15:21:55 +0200 Subject: [PATCH] jj 02.06 jumprecord --- .../My Project/licenses.licx | 1 + .../frmConstructor_Main.vb | 25 ++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/app/DD-Record-Organiser/My Project/licenses.licx b/app/DD-Record-Organiser/My Project/licenses.licx index 7f387e4..ff22d8e 100644 --- a/app/DD-Record-Organiser/My Project/licenses.licx +++ b/app/DD-Record-Organiser/My Project/licenses.licx @@ -1,2 +1,3 @@ +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index 74ef5ed..bf04a67 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -4591,6 +4591,14 @@ Public Class frmConstructor_Main Next End If End If + + ' wurde nicht zurückgesetzt, also + ' wurde der record nicht gefunden + If JUMP_RECORD_ID <> 0 Then + MsgBox("Fehler in Jump Record: " & vbNewLine & "Record-ID " & JUMP_RECORD_ID & " konnte nicht gefunden werden") + End If + + elapsed = sw.Elapsed.TotalSeconds sw.Stop() If LogErrorsOnly = False Then ClassLogger.Add(String.Format(" >> Jump_Record took {0} to load", Format(elapsed, "0.000000000") & " seconds"), False) @@ -4601,8 +4609,23 @@ Public Class frmConstructor_Main Private Sub CheckNode(ByVal n As TreeNode, FormID As Integer) Dim aNode As TreeNode + If CInt(n.Tag) = FormID Then + 'Gefunden also selektieren + TreeViewMain.SelectedNode = n + TreeViewMain.SelectedNode.EnsureVisible() + TreeViewMain.Select() + + 'Für Grid filtern wir die Aktuelle Ansicht nach der Record-ID, + 'für Carousel und Tiles markieren wir den Record + LocateRecordById(JUMP_RECORD_ID) + + ' Jump Record-ID wieder zurücksetzen + JUMP_RECORD_ID = 0 + Exit Sub + End If + For Each aNode In n.Nodes - If aNode.Tag = FormID Then + If CInt(aNode.Tag) = FormID Then 'Gefunden also selektieren TreeViewMain.SelectedNode = aNode TreeViewMain.SelectedNode.EnsureVisible()