AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://scmadmin@172.24.11.74:90/scm/git/RecordOrganizer

Browse Source
This commit is contained in:
SchreiberM
2016-06-03 15:24:46 +02:00
parent e0a585b13c 6f72be904d
commit 060c375774
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/DD-Record-Organiser/My Project/licenses.licx
View File

@@ -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

25
app/DD-Record-Organiser/frmConstructor_Main.vb
View File

@@ -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()