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

MS2

Browse Source
This commit is contained in:
SchreiberM
2016-08-23 16:18:37 +02:00
parent 05b5fffc29
commit ce622b0ff1
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,8 @@ Public Class frmConstructor_Main
Private DT_FORM As DataTable Private DT_FORM As DataTable
Private DT_TREEVIEW_PER_CONTROLS As DataTable Private DT_TREEVIEW_PER_CONTROLS As DataTable
Private DT_TREEVIEW_CONFIGURATION As DataTable Private DT_TREEVIEW_CONFIGURATION As DataTable
Private DT_TBPMO_ENTITY_RIGHT_CONTROLS As DataTable
Private DT_CONTROL_SCREEN As DataTable Private DT_CONTROL_SCREEN As DataTable
Private TREEVIEW_IMAGELIST As ImageList Private TREEVIEW_IMAGELIST As ImageList
Private NODE_NAVIGATION As Boolean = False Private NODE_NAVIGATION As Boolean = False
@@ -267,6 +269,9 @@ Public Class frmConstructor_Main
"FROM VWPMO_CONSTRUCTOR_FORMS WHERE SCREEN_ID = {2} AND CONSTRUCT_ID = {3} ORDER BY SEQUENCE", USER_LANGUAGE, CURRENT_SCREEN_ID, CURRENT_SCREEN_ID, CONSTRUCTORID) "FROM VWPMO_CONSTRUCTOR_FORMS WHERE SCREEN_ID = {2} AND CONSTRUCT_ID = {3} ORDER BY SEQUENCE", USER_LANGUAGE, CURRENT_SCREEN_ID, CURRENT_SCREEN_ID, CONSTRUCTORID)
DT_VWPMO_CONSTRUCTOR_FORMS = ClassDatabase.Return_Datatable(SQL) DT_VWPMO_CONSTRUCTOR_FORMS = ClassDatabase.Return_Datatable(SQL)
DT_TBPMO_ENTITY_RIGHT_CONTROLS = ClassDatabase.Return_Datatable(String.Format("SELECT * FROM TBPMO_ENTITY_RIGHT_CONTROLS where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID))
SQL = String.Format("select * from VWPMO_STRUCTURE_NODES where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID) SQL = String.Format("select * from VWPMO_STRUCTURE_NODES where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", CONSTRUCTORID)
Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL) Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL)
If DT.Rows.Count > 1 Then If DT.Rows.Count > 1 Then
@@ -1653,7 +1658,6 @@ Public Class frmConstructor_Main
ENTITY_LOADED = False ENTITY_LOADED = False
ENTITY_ID = Return_ENTITY_FOR_TAG(SelectedNode.Tag) ENTITY_ID = Return_ENTITY_FOR_TAG(SelectedNode.Tag)
CURRENT_FORM_ID = ENTITY_ID CURRENT_FORM_ID = ENTITY_ID
Dim result = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() Dim result = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable()
Select form Select form
Where form.Item("FORM_ID") = ENTITY_ID).Single() Where form.Item("FORM_ID") = ENTITY_ID).Single()
@@ -5770,7 +5774,6 @@ Public Class frmConstructor_Main
Return True Return True
End If End If
End Function End Function
''' <summary> ''' <summary>
''' Überprüft beim manuellen Speichern, ob Datensatz verändert wurde und ''' Überprüft beim manuellen Speichern, ob Datensatz verändert wurde und
''' ob alle Muss-Felder ausgefüllt wurden ''' ob alle Muss-Felder ausgefüllt wurden
@@ -5789,6 +5792,18 @@ Public Class frmConstructor_Main
Return True Return True
End If End If
Dim RightControlsChanged As Boolean =
Dim expression As String
expression = "TYPE_NODE = 0"
Dim foundRowsLevel0() As DataRow
' Use the Select method to find all rows matching the filter.
foundRowsLevel0 = DT_TREEVIEW_PER_CONTROLS.Select(expression)
Dim i As Integer
Dim NODE_CONFIG_ID
' For each row create a Node
For i = 0 To foundRowsLevel0.GetUpperBound(0)
Next
Dim RequiredControlsFilled As Boolean = TrySave_RequiredControlsFilled() Dim RequiredControlsFilled As Boolean = TrySave_RequiredControlsFilled()
If RequiredControlsFilled = True Then If RequiredControlsFilled = True Then