From ce622b0ff1f0c7b60be03a7b894c9d4c0218a7ef Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Tue, 23 Aug 2016 16:18:37 +0200 Subject: [PATCH] MS2 --- .../frmConstructor_Main.vb | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/app/DD-Record-Organiser/frmConstructor_Main.vb b/app/DD-Record-Organiser/frmConstructor_Main.vb index c5dc8d5..ae61685 100644 --- a/app/DD-Record-Organiser/frmConstructor_Main.vb +++ b/app/DD-Record-Organiser/frmConstructor_Main.vb @@ -50,6 +50,8 @@ Public Class frmConstructor_Main Private DT_FORM As DataTable Private DT_TREEVIEW_PER_CONTROLS As DataTable Private DT_TREEVIEW_CONFIGURATION As DataTable + + Private DT_TBPMO_ENTITY_RIGHT_CONTROLS As DataTable Private DT_CONTROL_SCREEN As DataTable Private TREEVIEW_IMAGELIST As ImageList 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) 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) Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL) If DT.Rows.Count > 1 Then @@ -1653,7 +1658,6 @@ Public Class frmConstructor_Main ENTITY_LOADED = False ENTITY_ID = Return_ENTITY_FOR_TAG(SelectedNode.Tag) CURRENT_FORM_ID = ENTITY_ID - Dim result = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable() Select form Where form.Item("FORM_ID") = ENTITY_ID).Single() @@ -5770,7 +5774,6 @@ Public Class frmConstructor_Main Return True End If End Function - ''' ''' Überprüft beim manuellen Speichern, ob Datensatz verändert wurde und ''' ob alle Muss-Felder ausgefüllt wurden @@ -5789,6 +5792,18 @@ Public Class frmConstructor_Main Return True 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() If RequiredControlsFilled = True Then