This commit is contained in:
SchreiberM
2016-08-24 10:17:51 +02:00
parent d7fc187148
commit 3f636e6812
22 changed files with 3134 additions and 414 deletions

View File

@@ -51,7 +51,6 @@ Public Class frmConstructor_Main
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
@@ -98,7 +97,6 @@ Public Class frmConstructor_Main
Private GRID_TYPE As GridType = GridType.Tiles
Private GRID_TYPE_ID As Integer = 1
Private FORM_LOADED As Boolean = False
Private RECORD_CHANGED As Boolean = False
Private SAVE_ROUTINE_ACTIVE As Boolean = False
Private SP1 As String
Private SP2 As String
@@ -271,7 +269,7 @@ Public Class frmConstructor_Main
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))
CURRENT_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)
@@ -2040,6 +2038,23 @@ Public Class frmConstructor_Main
End If
If RIGHT_CONTROL_CHANGED = True Then
Dim msg = MSG_RIGHTMODULE_DE
If USER_LANGUAGE <> "de-DE" Then
msg = MSG_RIGHTMODULE_EN_US
End If
Dim result As MsgBoxResult
result = MessageBox.Show(msg, "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
If result = MsgBoxResult.No Then
RIGHT_CONTROL_CHANGED = False
RECORD_CHANGED = False
DisableEditMode()
Show_Selected_Record_Data(SELECTED_RECORD_ID, False)
Return True
End If
End If
If TrySave_User() = False Then
' Cursor zurücksetzen
Me.Cursor = Cursors.Default
@@ -3040,8 +3055,8 @@ Public Class frmConstructor_Main
MsgBox("Error in Save Record Changes: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
End Try
Else
' Wenn nicht gespeichert werden soll, den Record wieder löschen
If CtrlCommandUI.IsInsert = True Then
If CtrlCommandUI.IsInsert = True Then ' Wenn nicht gespeichert werden soll, den Record wieder löschen
ClassHelper.DeleteRecord(SELECTED_RECORD_ID)
End If
@@ -3358,6 +3373,7 @@ Public Class frmConstructor_Main
End If
End Select
End If
RIGHT_CONTROL_CHANGED = False
Select Case TCDetails.SelectedTabPageIndex
Case 0
ENTITY_RELOAD_AFT_CONTROL_LOAD = False
@@ -5819,18 +5835,6 @@ 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
@@ -5875,6 +5879,26 @@ Public Class frmConstructor_Main
' Änderungen sollen gespeichert werden
If ShouldSave = DialogResult.Yes Then
If RIGHT_CONTROL_CHANGED = True Then
Dim msg = "Achtung: " & vbNewLine & "Sie haben Änderungen an Rechte-relevanten Eingaben vorgenommen!" & vbNewLine & _
"Alle Rechte der zu diesem Datensatz gespeicherten Dateien werden nach Speichern serverseitig und im Hintergrund überprüft!" & vbNewLine & _
"Dies kann je nach Anzahl der Dateien bis zu 15 Minuten dauern! Wollen Sie fortfahren?"
If USER_LANGUAGE <> "de-DE" Then
msg = "Attention:" & "You applied changes to right-relevant data!" & vbNewLine & _
"All rights of files belonging to this record will be checked and changed after Saving!" & vbNewLine & _
"This might take up to 15 Minutes (related to the amount of files)! Would You like to continue?"
End If
Dim result As MsgBoxResult
result = MessageBox.Show(msg, "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
If result = MsgBoxResult.No Then
RIGHT_CONTROL_CHANGED = False
RECORD_CHANGED = False
Return True
End If
End If
If CtrlCommandUI.IsInsert Then
EDIT_STATE = EditState.None