This commit is contained in:
Digital Data - Marlon Schreiber
2017-05-29 13:38:08 +02:00
parent c8c5b2dbe0
commit 078ba6b8cd
3 changed files with 106 additions and 35 deletions

View File

@@ -49,6 +49,7 @@ Partial Class frmConstructor_Main
Me.OberhalbToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.OberhalbToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.UnterhalbToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.UnterhalbToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.tsmiNodeDelete = New System.Windows.Forms.ToolStripMenuItem() Me.tsmiNodeDelete = New System.Windows.Forms.ToolStripMenuItem()
Me.tstxtboxSearchNode = New System.Windows.Forms.ToolStripTextBox()
Me.GridControlMain = New DevExpress.XtraGrid.GridControl() Me.GridControlMain = New DevExpress.XtraGrid.GridControl()
Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.FunktionenDataGridToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FunktionenDataGridToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@@ -309,7 +310,7 @@ Partial Class frmConstructor_Main
' '
'cmsTreeView 'cmsTreeView
' '
Me.cmsTreeView.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ResetEbenenAuswahlToolStripMenuItem, Me.ToolStripSeparator14, Me.FormDesignerToolStripMenuItem, Me.ToolStripSeparator13, Me.AuswertungAnzeigenToolStripMenuItem, Me.tsmiFilesearch, Me.ToolStripSeparator12, Me.ToolStripSeparator24, Me.tsmi_NewNode, Me.tsmiNodeDelete}) Me.cmsTreeView.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ResetEbenenAuswahlToolStripMenuItem, Me.ToolStripSeparator14, Me.FormDesignerToolStripMenuItem, Me.ToolStripSeparator13, Me.AuswertungAnzeigenToolStripMenuItem, Me.tsmiFilesearch, Me.ToolStripSeparator12, Me.ToolStripSeparator24, Me.tsmi_NewNode, Me.tsmiNodeDelete, Me.tstxtboxSearchNode})
Me.cmsTreeView.Name = "ContextMenuStrip2" Me.cmsTreeView.Name = "ContextMenuStrip2"
resources.ApplyResources(Me.cmsTreeView, "cmsTreeView") resources.ApplyResources(Me.cmsTreeView, "cmsTreeView")
' '
@@ -409,6 +410,12 @@ Partial Class frmConstructor_Main
resources.ApplyResources(Me.tsmiNodeDelete, "tsmiNodeDelete") resources.ApplyResources(Me.tsmiNodeDelete, "tsmiNodeDelete")
Me.tsmiNodeDelete.Name = "tsmiNodeDelete" Me.tsmiNodeDelete.Name = "tsmiNodeDelete"
' '
'tstxtboxSearchNode
'
Me.tstxtboxSearchNode.BackColor = System.Drawing.Color.Wheat
resources.ApplyResources(Me.tstxtboxSearchNode, "tstxtboxSearchNode")
Me.tstxtboxSearchNode.Name = "tstxtboxSearchNode"
'
'GridControlMain 'GridControlMain
' '
Me.GridControlMain.AllowDrop = True Me.GridControlMain.AllowDrop = True
@@ -1588,6 +1595,7 @@ Partial Class frmConstructor_Main
CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerTop.ResumeLayout(False) Me.SplitContainerTop.ResumeLayout(False)
Me.cmsTreeView.ResumeLayout(False) Me.cmsTreeView.ResumeLayout(False)
Me.cmsTreeView.PerformLayout()
CType(Me.GridControlMain, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControlMain, System.ComponentModel.ISupportInitialize).EndInit()
Me.ContextMenuGrid.ResumeLayout(False) Me.ContextMenuGrid.ResumeLayout(False)
CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1843,4 +1851,5 @@ Partial Class frmConstructor_Main
Friend WithEvents OrdnerÖffnenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents OrdnerÖffnenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents TimerClearResultfiles As System.Windows.Forms.Timer Friend WithEvents TimerClearResultfiles As System.Windows.Forms.Timer
Friend WithEvents tsbtnPos_Refresh As System.Windows.Forms.ToolStripButton Friend WithEvents tsbtnPos_Refresh As System.Windows.Forms.ToolStripButton
Friend WithEvents tstxtboxSearchNode As ToolStripTextBox
End Class End Class

View File

@@ -135,13 +135,13 @@
<value>468, 56</value> <value>468, 56</value>
</metadata> </metadata>
<data name="ResetEbenenAuswahlToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="ResetEbenenAuswahlToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>194, 22</value> <value>220, 22</value>
</data> </data>
<data name="ResetEbenenAuswahlToolStripMenuItem.Text" xml:space="preserve"> <data name="ResetEbenenAuswahlToolStripMenuItem.Text" xml:space="preserve">
<value>Reset Ebenen-Auswahl</value> <value>Reset Ebenen-Auswahl</value>
</data> </data>
<data name="ToolStripSeparator14.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStripSeparator14.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 6</value> <value>217, 6</value>
</data> </data>
<data name="FormDesignerToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="FormDesignerToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
@@ -153,16 +153,16 @@
</value> </value>
</data> </data>
<data name="FormDesignerToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="FormDesignerToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>194, 22</value> <value>220, 22</value>
</data> </data>
<data name="FormDesignerToolStripMenuItem.Text" xml:space="preserve"> <data name="FormDesignerToolStripMenuItem.Text" xml:space="preserve">
<value>Form-Designer</value> <value>Form-Designer</value>
</data> </data>
<data name="ToolStripSeparator13.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStripSeparator13.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 6</value> <value>217, 6</value>
</data> </data>
<data name="AuswertungAnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="AuswertungAnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>194, 22</value> <value>220, 22</value>
</data> </data>
<data name="AuswertungAnzeigenToolStripMenuItem.Text" xml:space="preserve"> <data name="AuswertungAnzeigenToolStripMenuItem.Text" xml:space="preserve">
<value>Auswertung anzeigen</value> <value>Auswertung anzeigen</value>
@@ -268,16 +268,16 @@
</value> </value>
</data> </data>
<data name="tsmiFilesearch.Size" type="System.Drawing.Size, System.Drawing"> <data name="tsmiFilesearch.Size" type="System.Drawing.Size, System.Drawing">
<value>194, 22</value> <value>220, 22</value>
</data> </data>
<data name="tsmiFilesearch.Text" xml:space="preserve"> <data name="tsmiFilesearch.Text" xml:space="preserve">
<value>Dateisuchen</value> <value>Dateisuchen</value>
</data> </data>
<data name="ToolStripSeparator12.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStripSeparator12.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 6</value> <value>217, 6</value>
</data> </data>
<data name="ToolStripSeparator24.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStripSeparator24.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 6</value> <value>217, 6</value>
</data> </data>
<data name="SdsdToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="SdsdToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>212, 22</value> <value>212, 22</value>
@@ -329,7 +329,7 @@
</value> </value>
</data> </data>
<data name="tsmi_NewNode.Size" type="System.Drawing.Size, System.Drawing"> <data name="tsmi_NewNode.Size" type="System.Drawing.Size, System.Drawing">
<value>194, 22</value> <value>220, 22</value>
</data> </data>
<data name="tsmi_NewNode.Text" xml:space="preserve"> <data name="tsmi_NewNode.Text" xml:space="preserve">
<value>Neuer Knoten</value> <value>Neuer Knoten</value>
@@ -351,7 +351,7 @@
</value> </value>
</data> </data>
<data name="tsmiNodeDelete.Size" type="System.Drawing.Size, System.Drawing"> <data name="tsmiNodeDelete.Size" type="System.Drawing.Size, System.Drawing">
<value>194, 22</value> <value>220, 22</value>
</data> </data>
<data name="tsmiNodeDelete.Text" xml:space="preserve"> <data name="tsmiNodeDelete.Text" xml:space="preserve">
<value>Knoten löschen</value> <value>Knoten löschen</value>
@@ -359,8 +359,17 @@
<data name="tsmiNodeDelete.Visible" type="System.Boolean, mscorlib"> <data name="tsmiNodeDelete.Visible" type="System.Boolean, mscorlib">
<value>False</value> <value>False</value>
</data> </data>
<data name="tstxtboxSearchNode.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt, style=Italic</value>
</data>
<data name="tstxtboxSearchNode.Size" type="System.Drawing.Size, System.Drawing">
<value>160, 23</value>
</data>
<data name="tstxtboxSearchNode.Text" xml:space="preserve">
<value>Suche Knoten</value>
</data>
<data name="cmsTreeView.Size" type="System.Drawing.Size, System.Drawing"> <data name="cmsTreeView.Size" type="System.Drawing.Size, System.Drawing">
<value>195, 160</value> <value>221, 207</value>
</data> </data>
<data name="&gt;&gt;cmsTreeView.Name" xml:space="preserve"> <data name="&gt;&gt;cmsTreeView.Name" xml:space="preserve">
<value>cmsTreeView</value> <value>cmsTreeView</value>
@@ -3207,6 +3216,12 @@
<data name="&gt;&gt;tsmiNodeDelete.Type" xml:space="preserve"> <data name="&gt;&gt;tsmiNodeDelete.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data> </data>
<data name="&gt;&gt;tstxtboxSearchNode.Name" xml:space="preserve">
<value>tstxtboxSearchNode</value>
</data>
<data name="&gt;&gt;tstxtboxSearchNode.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;FunktionenDataGridToolStripMenuItem.Name" xml:space="preserve"> <data name="&gt;&gt;FunktionenDataGridToolStripMenuItem.Name" xml:space="preserve">
<value>FunktionenDataGridToolStripMenuItem</value> <value>FunktionenDataGridToolStripMenuItem</value>
</data> </data>

View File

@@ -672,7 +672,36 @@ Public Class frmConstructor_Main
Next Next
Return Nothing Return Nothing
End Function End Function
Dim NodesThatMatch As New List(Of TreeNode)
Private Function SearchTheTreeView(ByVal TV As TreeView, ByVal TextToFind As String) As TreeNode
' Empty previous
NodesThatMatch.Clear()
' Keep calling RecursiveSearch
For Each TN As TreeNode In TV.Nodes
If TN.Text = TextToFind Then
NodesThatMatch.Add(TN)
End If
RecursiveSearch(TN, TextToFind)
Next
If NodesThatMatch.Count > 0 Then
Return NodesThatMatch(0)
Else
Return Nothing
End If
End Function
Private Sub RecursiveSearch(ByVal treeNode As TreeNode, ByVal TextToFind As String)
' Keep calling the test recursively.
For Each TN As TreeNode In treeNode.Nodes
If TN.Text.Contains(TextToFind) Then
NodesThatMatch.Add(TN)
End If
RecursiveSearch(TN, TextToFind)
Next
End Sub
Private Sub NavPane_MouseUp(sender As Object, e As MouseEventArgs) Handles NavPane.MouseUp Private Sub NavPane_MouseUp(sender As Object, e As MouseEventArgs) Handles NavPane.MouseUp
Dim pane As TileNavPane = TryCast(sender, TileNavPane) Dim pane As TileNavPane = TryCast(sender, TileNavPane)
Dim hitInfo As TileNavPaneHitInfo = pane.ViewInfo.CalcHitInfo(e.Location) Dim hitInfo As TileNavPaneHitInfo = pane.ViewInfo.CalcHitInfo(e.Location)
@@ -982,22 +1011,22 @@ Public Class frmConstructor_Main
End If End If
Dim sw1 As New Stopwatch Dim sw1 As New Stopwatch
sw1.Start() sw1.Start()
ClassRightManagement.Check_Set_Rights(CURRENT_RECORD_ID, ENTITY_ID) ClassRightManagement.Check_Set_Rights(CURRENT_RECORD_ID, ENTITY_ID)
CONTROL_HANDLING() CONTROL_HANDLING()
elapsed = sw1.Elapsed.TotalSeconds elapsed = sw1.Elapsed.TotalSeconds
sw1.Stop() sw1.Stop()
If LogErrorsOnly = False Then ClassLogger.Add(" >> Check Rights took " & Format(elapsed, "0.000000000") & " seconds", False) If LogErrorsOnly = False Then ClassLogger.Add(" >> Check Rights took " & Format(elapsed, "0.000000000") & " seconds", False)
If TCDetails.SelectedTabPage Is Nothing Then If TCDetails.SelectedTabPage Is Nothing Then
Exit Sub Exit Sub
End If End If
If TabPos.PageVisible = True And TCDetails.SelectedTabPage.Name = "TabPos" Then If TabPos.PageVisible = True And TCDetails.SelectedTabPage.Name = "TabPos" Then
Clear_GridPos_View() Clear_GridPos_View()
Dim POS_GRID_RECORD = Get_Focused_Row_Cell_Value_pos("Record-ID") Dim POS_GRID_RECORD = Get_Focused_Row_Cell_Value_pos("Record-ID")
Load_Pos_Data() Load_Pos_Data()
Load_POSGrid_Layout() Load_POSGrid_Layout()
End If End If
If CURRENT_RECORD_ID > 0 Then If CURRENT_RECORD_ID > 0 Then
If RIGHT_RECORD_AND_FILE_READ_ONLY = False And CtrlCommandUI.IsInsert = False Then If RIGHT_RECORD_AND_FILE_READ_ONLY = False And CtrlCommandUI.IsInsert = False Then
@@ -1018,14 +1047,14 @@ Public Class frmConstructor_Main
'Liste der geänderten Control Values leeren 'Liste der geänderten Control Values leeren
CtrlBuilder.ControlsChanged.Clear() CtrlBuilder.ControlsChanged.Clear()
elapsed = sw.Elapsed.TotalSeconds elapsed = sw.Elapsed.TotalSeconds
sw.Stop() sw.Stop()
Console.WriteLine("Column_Row_Handler took {0}ms to load", sw.ElapsedMilliseconds) Console.WriteLine("Column_Row_Handler took {0}ms to load", sw.ElapsedMilliseconds)
sw.Reset() sw.Reset()
If LogErrorsOnly = False Then ClassLogger.Add(" >>>> Column/Row Change took " & Format(elapsed, "0.000000000") & " seconds", False) If LogErrorsOnly = False Then ClassLogger.Add(" >>>> Column/Row Change took " & Format(elapsed, "0.000000000") & " seconds", False)
If NODE_NAVIGATION = True And _navload = False Then If NODE_NAVIGATION = True And _navload = False Then
SearchNode(TreeViewMain.Nodes, RECORD_ID) SearchNode(TreeViewMain.Nodes, RECORD_ID)
End If End If
Catch ex As Exception Catch ex As Exception
ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error:", ex.Message & vbNewLine & ex.StackTrace) ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error:", ex.Message & vbNewLine & ex.StackTrace)
@@ -6149,6 +6178,11 @@ Public Class frmConstructor_Main
End If End If
End If End If
End If End If
If USER_LANGUAGE <> "de-DE" Then
Me.tstxtboxSearchNode.Text = "Search Node"
Else
Me.tstxtboxSearchNode.Text = "Suche Knoten"
End If
End Sub End Sub
Private Function FindFocussedControl(ByVal ctr As Control) As Control Private Function FindFocussedControl(ByVal ctr As Control) As Control
Dim container As ContainerControl = TryCast(ctr, ContainerControl) Dim container As ContainerControl = TryCast(ctr, ContainerControl)
@@ -6332,10 +6366,10 @@ Public Class frmConstructor_Main
End If End If
Dim ins Dim ins
If RECORD_CREATE Then If RECORD_CREATE Then
ins = String.Format("INSERT INTO TBPMO_STRUCTURE_NODES (RECORD_ID,NODE_CONFIG_ID, NODE_CAPTION, ID1, PARENT_GUID, ADDED_WHO) VALUES (" & _ ins = String.Format("INSERT INTO TBPMO_STRUCTURE_NODES (RECORD_ID,NODE_CONFIG_ID, NODE_CAPTION, ID1, PARENT_GUID, ADDED_WHO) VALUES (" &
"{0},{1},'{2}','{3}','{4}','{5}')", NEWRECORD, CURRENT_NODE_CONFIGURABLE_ID, tsmINewText.Text, "CONFIG " & NEWRECORD & "-" & CURRENT_NODE_CONFIGURABLE_ID, PARENT_ID, USER_USERNAME) "{0},{1},'{2}','{3}','{4}','{5}')", NEWRECORD, CURRENT_NODE_CONFIGURABLE_ID, tsmINewText.Text, "CONFIG " & NEWRECORD & "-" & CURRENT_NODE_CONFIGURABLE_ID, PARENT_ID, USER_USERNAME)
Else Else
ins = String.Format("INSERT INTO TBPMO_STRUCTURE_NODES (NODE_CONFIG_ID, NODE_CAPTION, ID1, PARENT_GUID, ADDED_WHO) VALUES (" & _ ins = String.Format("INSERT INTO TBPMO_STRUCTURE_NODES (NODE_CONFIG_ID, NODE_CAPTION, ID1, PARENT_GUID, ADDED_WHO) VALUES (" &
"{1},'{2}','{3}','{4}','{5}')", NEWRECORD, CURRENT_NODE_CONFIGURABLE_ID, tsmINewText.Text, "CONFIG " & NEWRECORD & "-" & CURRENT_NODE_CONFIGURABLE_ID, PARENT_ID, USER_USERNAME) "{1},'{2}','{3}','{4}','{5}')", NEWRECORD, CURRENT_NODE_CONFIGURABLE_ID, tsmINewText.Text, "CONFIG " & NEWRECORD & "-" & CURRENT_NODE_CONFIGURABLE_ID, PARENT_ID, USER_USERNAME)
End If End If
If ClassDatabase.Execute_non_Query(ins) Then If ClassDatabase.Execute_non_Query(ins) Then
@@ -6617,4 +6651,17 @@ Public Class frmConstructor_Main
End If End If
End Sub End Sub
Private Sub tstxtboxSearchNode_KeyUp(sender As Object, e As KeyEventArgs) Handles tstxtboxSearchNode.KeyUp
If e.KeyCode = Keys.Return Then
If SearchTheTreeView(TreeViewMain, tstxtboxSearchNode.Text) Is Nothing Then
MessageBox.Show("No Match Found")
Else
TreeViewMain.SelectedNode = SearchTheTreeView(TreeViewMain, tstxtboxSearchNode.Text)
End If
End If
End Sub
Private Sub tstxtboxSearchNode_Click(sender As Object, e As EventArgs) Handles tstxtboxSearchNode.Click, tstxtboxSearchNode.Enter
tstxtboxSearchNode.Text = ""
End Sub
End Class End Class