This commit is contained in:
SchreiberM 2016-08-24 15:54:10 +02:00
parent dc020c2c2e
commit cf2fa721de
7 changed files with 109 additions and 93 deletions

View File

@ -181,13 +181,14 @@ Public Class ClassControlBuilder
Dim controlId As Integer = DirectCast(control.Tag, ClassControlMetadata).Id
CONTROL_ID = controlId
If CtrlCommandUI.IsEdit Then
Dim expression As String
expression = "ENTITY_ID = " & CURRENT_FORM_ID
Dim foundControls() As DataRow
' Use the Select method to find all rows matching the filter.
foundControls = CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS.Select(expression)
Dim i As Integer
Dim NODE_CONFIG_ID
' Check if control is one of rightcontrols
For i = 0 To foundControls.GetUpperBound(0)
@ -210,6 +211,8 @@ Public Class ClassControlBuilder
End If
End If
Next
End If
Catch ex As Exception
If ex.Message.Contains("Objektverweis") Or ex.Message.Contains("reference not set") Then
@ -553,7 +556,7 @@ Public Class ClassControlBuilder
Dim combo As CustomComboBox = DirectCast(control, CustomComboBox)
Dim controlId As Integer = DirectCast(control.Tag, ClassControlMetadata).Id
CONTROL_ID = controlId
If CtrlCommandUI.IsEdit Then
Dim expression As String
expression = "ENTITY_ID = " & CURRENT_FORM_ID
Dim foundControls() As DataRow
@ -584,6 +587,8 @@ Public Class ClassControlBuilder
End If
End If
Next
End If
Dim onRecordChangedHandler As EventHandler = CType(Me.Events(_onRecordChangedName), EventHandler)
If Not ControlsChanged.Contains(controlId) Then
@ -648,7 +653,7 @@ Public Class ClassControlBuilder
CONTROL_ID = controlId
control.Update()
If CtrlCommandUI.IsEdit Then
Dim expression As String
expression = "ENTITY_ID = " & CURRENT_FORM_ID
Dim foundControls() As DataRow
@ -679,6 +684,8 @@ Public Class ClassControlBuilder
End If
End If
Next
End If
'SQL für abhängige Auswahllisten
Dim SQL As String = String.Format("SELECT GUID, SQL_COMMAND_1,CONTROL_TYPE_ID,FORMAT_TYPE FROM TBPMO_CONTROL WHERE SQL_COMMAND_1 LIKE '%@{0}@%'", controlId)
'SQL für enable control

View File

@ -10,7 +10,7 @@ Public Class ClassControlCommandsUI
Private _ContextMenuStrip As ContextMenuStrip
Public IsInsert As Boolean = False
Public IsEdit As Boolean = False
''' <summary>
''' Erstellt eine neue Instanz der ClassControlCommandsUI Klasse
''' </summary>

View File

@ -454,8 +454,10 @@
End If
End While
Next
If CtrlCommandUI.IsInsert Or CtrlCommandUI.IsEdit Then
CURRENT_RECORD_ENABLED = True
End If
End Sub
Public Shared Sub LoadList(control As DevExpress.XtraEditors.CheckedListBoxControl, formId As Integer, conn_Id As Object, SQLCommand As String)

View File

@ -106,8 +106,8 @@
Public RIGHT_CONTROL_CHANGED As Boolean = False
Public MSG_RIGHTMODULE_DE = "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!" & vbNewLine & "Wollen Sie fortfahren?"
"Dies kann je nach Anzahl der Dateien bis zu 10 Minuten dauern!" & vbNewLine & "Wollen Sie fortfahren?"
Public MSG_RIGHTMODULE_EN_US = "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)!" & vbNewLine & "Would You like to continue?"
"This might take up to 10 Minutes (related to the amount of files)!" & vbNewLine & "Would You like to continue?"
End Module

View File

@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.4.7.0")>
<Assembly: AssemblyVersion("2.4.7.1")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguageAttribute("")>

View File

@ -920,6 +920,7 @@ Public Class frmConstructor_Main
'Check_Record_Changed()
DisableEditMode()
VerknüpfungenAnzeigenToolStripMenuItem.Enabled = True
elapsed = sw.Elapsed.TotalSeconds
sw.Stop()
@ -2135,7 +2136,8 @@ Public Class frmConstructor_Main
Next
End Select
End If
CtrlCommandUI.IsInsert = False
CtrlCommandUI.IsEdit = False
'Jetzt den Record nochmal laden
' Show_Selected_Record_Data(SELECTED_RECORD_ID)
Update_Status_Label(True, "Record saved - " & Now, EditState.Update)
@ -2299,7 +2301,7 @@ Public Class frmConstructor_Main
End If
CURRENT_RECORD_ID = RECORD_ID
CtrlCommandUI.IsEdit = True
' Abhängige Listen laden
CtrlBuilder.WatchRecordChanges = False
'ClassControlValues.LoadControlValuesListWithPlaceholders(ENTITY_ID, RECORD_ID, PARENT_ID, CtrlBuilder.AllControls, ENTITY_ID)
@ -2320,7 +2322,12 @@ Public Class frmConstructor_Main
Lock_RecordControls(True)
RECORD_ENABLED = False
CURRENT_RECORD_ENABLED = False
' Me.pnlDetails.Enabled = False
If Not IsNothing(CtrlCommandUI) Then
CtrlCommandUI.IsEdit = False
CtrlCommandUI.IsInsert = False
End If
Me.tsButtonDelete.Enabled = False
Me.tsButtonAdd.Enabled = True
Me.tsButtonSave.Enabled = False

View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.0.0.0")>
<Assembly: AssemblyVersion("1.0.0.1")>
<Assembly: AssemblyFileVersion("1.0.0.0")>