Neue Funktionen und Optimierungen hinzugefügt

- Zwei neue DLL-Dateien in `Product.wxs` hinzugefügt und eine aktualisiert.
- Neues Feld `CFG_SEQUENCE` für Cockpit-Definitionen eingeführt.
- Verbesserte SQL-Statements und Logging-Nachrichten in mehreren Dateien.
- GUI-Elemente in `frmAdministration` und `frmCockpitConfig` angepasst.
- Neue Referenz für `GdPicture.NET.14.WinForms` in `taskFLOW.vbproj` hinzugefügt.
- Assembly-Version auf `3.5.1.0` aktualisiert.
- Verbesserte Handhabung von Benutzern und Gruppen in der Cockpit-Konfiguration.
- Inaktivitäts-Logout-Logik für offene Cockpit-Konfiguration deaktiviert.
This commit is contained in:
Developer01
2026-09-21 11:56:54 +02:00
parent 4ba29ce57b
commit 703df0adc3
13 changed files with 915 additions and 487 deletions

View File

@@ -156,6 +156,8 @@
<File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.filters.dll" /> <File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.filters.dll" />
<File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.image.gdimgplug.dll" /> <File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.image.gdimgplug.dll" />
<File Id="GdPicture.NET.14.Imaging.ML" Name="GdPicture.NET.14.Imaging.ML.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.Imaging.ML.dll" /> <File Id="GdPicture.NET.14.Imaging.ML" Name="GdPicture.NET.14.Imaging.ML.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.Imaging.ML.dll" />
<File Id="GdPicture.NET.14.Rendering.Skia" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" />
<File Id="GdPicture.NET.14.machine.vision" Name="GdPicture.NET.14.machine.vision.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.machine.vision.dll" /> <File Id="GdPicture.NET.14.machine.vision" Name="GdPicture.NET.14.machine.vision.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.machine.vision.dll" />
<File Id="GdPicture.NET.14.twain.client" Name="GdPicture.NET.14.twain.client.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.twain.client.dll" /> <File Id="GdPicture.NET.14.twain.client" Name="GdPicture.NET.14.twain.client.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.twain.client.dll" />
@@ -171,7 +173,6 @@
<File Id="GdPicture.NET.14.Imaging.Formats" Name="GdPicture.NET.14.Imaging.Formats.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.Imaging.Formats.dll" /> <File Id="GdPicture.NET.14.Imaging.Formats" Name="GdPicture.NET.14.Imaging.Formats.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.Imaging.Formats.dll" />
<File Id="GdPicture.NET.14.Imaging.Formats.Conversion" Name="GdPicture.NET.14.Imaging.Formats.Conversion.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.Imaging.Formats.Conversion.dll" /> <File Id="GdPicture.NET.14.Imaging.Formats.Conversion" Name="GdPicture.NET.14.Imaging.Formats.Conversion.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.Imaging.Formats.Conversion.dll" />
<File Id="GdPicture.NET.14.Imaging.Rendering" Name="GdPicture.NET.14.Imaging.Rendering.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.Imaging.Rendering.dll" /> <File Id="GdPicture.NET.14.Imaging.Rendering" Name="GdPicture.NET.14.Imaging.Rendering.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.Imaging.Rendering.dll" />
<File Id="GdPicture.NET.14.Imaging.Rendering.Skia" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
<File Id="GdPicture.NET.14.Markdown" Name="GdPicture.NET.14.Markdown.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.Markdown.dll" /> <File Id="GdPicture.NET.14.Markdown" Name="GdPicture.NET.14.Markdown.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.Markdown.dll" />
<File Id="GdPicture.NET.14.MSOfficeBinary" Name="GdPicture.NET.14.MSOfficeBinary.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.MSOfficeBinary.dll"/> <File Id="GdPicture.NET.14.MSOfficeBinary" Name="GdPicture.NET.14.MSOfficeBinary.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.MSOfficeBinary.dll"/>
<File Id="GdPicture.NET.14.OpenDocument" Name="GdPicture.NET.14.OpenDocument.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.OpenDocument.dll" /> <File Id="GdPicture.NET.14.OpenDocument" Name="GdPicture.NET.14.OpenDocument.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.OpenDocument.dll" />

View File

@@ -83,6 +83,7 @@
If IsNothing(DTVWIDB_BE_ATTRIBUTE) Then If IsNothing(DTVWIDB_BE_ATTRIBUTE) Then
oSQL = $"SELECT DISTINCT ATTR_TITLE, TYP_ID, TYP_ID as [TYPE_ID] FROM VWIDB_BE_ATTRIBUTE ORDER BY ATTR_TITLE " oSQL = $"SELECT DISTINCT ATTR_TITLE, TYP_ID, TYP_ID as [TYPE_ID] FROM VWIDB_BE_ATTRIBUTE ORDER BY ATTR_TITLE "
DTVWIDB_BE_ATTRIBUTE = DatabaseFallback.GetDatatableIDB(oSQL) DTVWIDB_BE_ATTRIBUTE = DatabaseFallback.GetDatatableIDB(oSQL)
LOGGER.Info($"[{DTVWIDB_BE_ATTRIBUTE.Rows.Count.ToString}] attributes [VWIDB_BE_ATTRIBUTE] found in IDB.")
End If End If
Return True Return True
End Function End Function
@@ -111,10 +112,8 @@
For Each oRow As DataRow In DTVWIDB_BE_ATTRIBUTE.Rows For Each oRow As DataRow In DTVWIDB_BE_ATTRIBUTE.Rows
oCount += 1 oCount += 1
aIndexNames(oCount) = oRow.Item("ATTR_TITLE") aIndexNames(oCount) = oRow.Item("ATTR_TITLE")
Next Next
' Indexarray sortiert zurückgeben ' Indexarray sortiert zurückgeben
Array.Sort(aIndexNames) Array.Sort(aIndexNames)
' Indexarray zurückgeben ' Indexarray zurückgeben

View File

@@ -80,12 +80,11 @@ Public Class ClassInit
If CONFIG.Config.EDMIAppServer <> String.Empty Then If CONFIG.Config.EDMIAppServer <> String.Empty Then
Try Try
LOGGER.Info($"Configuration EDMIAppServer [{CONFIG.Config.EDMIAppServer}] will be used...") LOGGER.Info($"Configuration EDMIAppServer [{CONFIG.Config.EDMIAppServer}] will be used...")
_EDMIClient = New Client(LOGCONFIG, CONFIG.Config.EDMIAppServer)
_Client = New Client(LOGCONFIG, CONFIG.Config.EDMIAppServer) If Not IsNothing(_EDMIClient) Then
If Not IsNothing(_Client) Then If _EDMIClient.Connect() Then
If _Client.Connect() Then
EDMIAppServerActive = True EDMIAppServerActive = True
EDMIService.Client = _Client EDMIService.Client = _EDMIClient
EDMIService.Address = CONFIG.Config.EDMIAppServer EDMIService.Address = CONFIG.Config.EDMIAppServer
LOGGER.Info($"EDMIAppServer [{CONFIG.Config.EDMIAppServer}] is active!") LOGGER.Info($"EDMIAppServer [{CONFIG.Config.EDMIAppServer}] is active!")
@@ -212,7 +211,7 @@ Public Class ClassInit
' We initialize the Class in anycase. ' We initialize the Class in anycase.
' If there is no client, it will fall back to the db by itself ' If there is no client, it will fall back to the db by itself
DatabaseFallback = New DatabaseWithFallback(LOGCONFIG, _Client, Database_ECM, Database_IDB) DatabaseFallback = New DatabaseWithFallback(LOGCONFIG, _EDMIClient, Database_ECM, Database_IDB)
If dbECMInitialized = True And CONNECTION_STRING_IDB = String.Empty Then If dbECMInitialized = True And CONNECTION_STRING_IDB = String.Empty Then
Return True Return True
@@ -483,7 +482,7 @@ Public Class ClassInit
Settings_LoadBasicConfig() Settings_LoadBasicConfig()
oStep = "TBDD_CONNECTION" oStep = "TBDD_CONNECTION"
oSql = "select * from TBDD_CONNECTION WHERE AKTIV = 1" oSql = "select * from TBDD_CONNECTION WITH (NOLOCK) WHERE AKTIV = 1"
'BASEDATA_DT_TBDD_CONNECTION = DataASorDB.GetDatatable("DD_ECM", oSql, "TBDD_CONNECTION", "") 'BASEDATA_DT_TBDD_CONNECTION = DataASorDB.GetDatatable("DD_ECM", oSql, "TBDD_CONNECTION", "")
BASEDATA_DT_TBDD_CONNECTION = DatabaseFallback.GetDatatable("TBDD_CONNECTION", New GetDatatableOptions(oSql, DatabaseType.ECM)) BASEDATA_DT_TBDD_CONNECTION = DatabaseFallback.GetDatatable("TBDD_CONNECTION", New GetDatatableOptions(oSql, DatabaseType.ECM))

View File

@@ -179,7 +179,7 @@ Module ModuleRuntimeVariables
Public Property MyIndicies As List(Of String) Public Property MyIndicies As List(Of String)
Public Property MyIndicies_Types As List(Of Integer) Public Property MyIndicies_Types As List(Of Integer)
Public Property _Client As Client Public Property _EDMIClient As Client
Public Property WMSUFFIX As String Public Property WMSUFFIX As String
Public Property WMDRIVE_LETTER As String Public Property WMDRIVE_LETTER As String

View File

@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.5.0.0")> <Assembly: AssemblyVersion("3.5.1.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguage("")> <Assembly: NeutralResourcesLanguage("")>

View File

@@ -294,6 +294,9 @@
<HintPath>..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath> <HintPath>..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes> <EmbedInteropTypes>True</EmbedInteropTypes>
</Reference> </Reference>
<Reference Include="GdPicture.NET.14.WinForms, Version=14.4.4.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
<HintPath>..\packages\GdPicture.WinForms.14.4.4\lib\net462\GdPicture.NET.14.WinForms.dll</HintPath>
</Reference>
<Reference Include="Google.Protobuf, Version=3.33.2.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> <Reference Include="Google.Protobuf, Version=3.33.2.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Protobuf.3.33.2\lib\net45\Google.Protobuf.dll</HintPath> <HintPath>..\packages\Google.Protobuf.3.33.2\lib\net45\Google.Protobuf.dll</HintPath>
</Reference> </Reference>

View File

@@ -364,6 +364,7 @@ Partial Class frmAdministration
Me.gridAssignedUsers.AllowDrop = True Me.gridAssignedUsers.AllowDrop = True
Me.gridAssignedUsers.DataSource = Me.TBPROFILE_USERBindingSource Me.gridAssignedUsers.DataSource = Me.TBPROFILE_USERBindingSource
resources.ApplyResources(Me.gridAssignedUsers, "gridAssignedUsers") resources.ApplyResources(Me.gridAssignedUsers, "gridAssignedUsers")
Me.gridAssignedUsers.EmbeddedNavigator.Margin = CType(resources.GetObject("gridAssignedUsers.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.gridAssignedUsers.MainView = Me.viewAssignedUsers Me.gridAssignedUsers.MainView = Me.viewAssignedUsers
Me.gridAssignedUsers.Name = "gridAssignedUsers" Me.gridAssignedUsers.Name = "gridAssignedUsers"
Me.gridAssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAssignedUsers}) Me.gridAssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAssignedUsers})
@@ -381,7 +382,6 @@ Partial Class frmAdministration
'viewAssignedUsers 'viewAssignedUsers
' '
Me.viewAssignedUsers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colPRENAME1, Me.colNAME3, Me.colUSERNAME1, Me.colEMAIL1, Me.GridColumn1, Me.GridColumn2}) Me.viewAssignedUsers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colPRENAME1, Me.colNAME3, Me.colUSERNAME1, Me.colEMAIL1, Me.GridColumn1, Me.GridColumn2})
Me.viewAssignedUsers.DetailHeight = 295
Me.viewAssignedUsers.GridControl = Me.gridAssignedUsers Me.viewAssignedUsers.GridControl = Me.gridAssignedUsers
Me.viewAssignedUsers.Name = "viewAssignedUsers" Me.viewAssignedUsers.Name = "viewAssignedUsers"
Me.viewAssignedUsers.OptionsBehavior.Editable = False Me.viewAssignedUsers.OptionsBehavior.Editable = False
@@ -393,42 +393,42 @@ Partial Class frmAdministration
' '
resources.ApplyResources(Me.colPRENAME1, "colPRENAME1") resources.ApplyResources(Me.colPRENAME1, "colPRENAME1")
Me.colPRENAME1.FieldName = "PRENAME" Me.colPRENAME1.FieldName = "PRENAME"
Me.colPRENAME1.MinWidth = 16 Me.colPRENAME1.MinWidth = 21
Me.colPRENAME1.Name = "colPRENAME1" Me.colPRENAME1.Name = "colPRENAME1"
' '
'colNAME3 'colNAME3
' '
resources.ApplyResources(Me.colNAME3, "colNAME3") resources.ApplyResources(Me.colNAME3, "colNAME3")
Me.colNAME3.FieldName = "NAME" Me.colNAME3.FieldName = "NAME"
Me.colNAME3.MinWidth = 16 Me.colNAME3.MinWidth = 21
Me.colNAME3.Name = "colNAME3" Me.colNAME3.Name = "colNAME3"
' '
'colUSERNAME1 'colUSERNAME1
' '
resources.ApplyResources(Me.colUSERNAME1, "colUSERNAME1") resources.ApplyResources(Me.colUSERNAME1, "colUSERNAME1")
Me.colUSERNAME1.FieldName = "USERNAME" Me.colUSERNAME1.FieldName = "USERNAME"
Me.colUSERNAME1.MinWidth = 16 Me.colUSERNAME1.MinWidth = 21
Me.colUSERNAME1.Name = "colUSERNAME1" Me.colUSERNAME1.Name = "colUSERNAME1"
' '
'colEMAIL1 'colEMAIL1
' '
resources.ApplyResources(Me.colEMAIL1, "colEMAIL1") resources.ApplyResources(Me.colEMAIL1, "colEMAIL1")
Me.colEMAIL1.FieldName = "EMAIL" Me.colEMAIL1.FieldName = "EMAIL"
Me.colEMAIL1.MinWidth = 16 Me.colEMAIL1.MinWidth = 21
Me.colEMAIL1.Name = "colEMAIL1" Me.colEMAIL1.Name = "colEMAIL1"
' '
'GridColumn1 'GridColumn1
' '
resources.ApplyResources(Me.GridColumn1, "GridColumn1") resources.ApplyResources(Me.GridColumn1, "GridColumn1")
Me.GridColumn1.FieldName = "COMMENT" Me.GridColumn1.FieldName = "COMMENT"
Me.GridColumn1.MinWidth = 16 Me.GridColumn1.MinWidth = 21
Me.GridColumn1.Name = "GridColumn1" Me.GridColumn1.Name = "GridColumn1"
' '
'GridColumn2 'GridColumn2
' '
resources.ApplyResources(Me.GridColumn2, "GridColumn2") resources.ApplyResources(Me.GridColumn2, "GridColumn2")
Me.GridColumn2.FieldName = "SHORTNAME" Me.GridColumn2.FieldName = "SHORTNAME"
Me.GridColumn2.MinWidth = 16 Me.GridColumn2.MinWidth = 21
Me.GridColumn2.Name = "GridColumn2" Me.GridColumn2.Name = "GridColumn2"
' '
'Panel1 'Panel1
@@ -447,6 +447,7 @@ Partial Class frmAdministration
Me.gridAvailableUsers.AllowDrop = True Me.gridAvailableUsers.AllowDrop = True
Me.gridAvailableUsers.DataSource = Me.FNPM_GET_FREE_USER_FOR_PROFILEBindingSource Me.gridAvailableUsers.DataSource = Me.FNPM_GET_FREE_USER_FOR_PROFILEBindingSource
resources.ApplyResources(Me.gridAvailableUsers, "gridAvailableUsers") resources.ApplyResources(Me.gridAvailableUsers, "gridAvailableUsers")
Me.gridAvailableUsers.EmbeddedNavigator.Margin = CType(resources.GetObject("gridAvailableUsers.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.gridAvailableUsers.MainView = Me.viewAvailableUsers Me.gridAvailableUsers.MainView = Me.viewAvailableUsers
Me.gridAvailableUsers.Name = "gridAvailableUsers" Me.gridAvailableUsers.Name = "gridAvailableUsers"
Me.gridAvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableUsers}) Me.gridAvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableUsers})
@@ -459,7 +460,6 @@ Partial Class frmAdministration
'viewAvailableUsers 'viewAvailableUsers
' '
Me.viewAvailableUsers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colPRENAME, Me.colNAME2, Me.colUSERNAME, Me.colEMAIL, Me.GridColumn3, Me.GridColumn4}) Me.viewAvailableUsers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colPRENAME, Me.colNAME2, Me.colUSERNAME, Me.colEMAIL, Me.GridColumn3, Me.GridColumn4})
Me.viewAvailableUsers.DetailHeight = 295
Me.viewAvailableUsers.GridControl = Me.gridAvailableUsers Me.viewAvailableUsers.GridControl = Me.gridAvailableUsers
Me.viewAvailableUsers.Name = "viewAvailableUsers" Me.viewAvailableUsers.Name = "viewAvailableUsers"
Me.viewAvailableUsers.OptionsBehavior.Editable = False Me.viewAvailableUsers.OptionsBehavior.Editable = False
@@ -471,42 +471,42 @@ Partial Class frmAdministration
' '
resources.ApplyResources(Me.colPRENAME, "colPRENAME") resources.ApplyResources(Me.colPRENAME, "colPRENAME")
Me.colPRENAME.FieldName = "USER_PRENAME" Me.colPRENAME.FieldName = "USER_PRENAME"
Me.colPRENAME.MinWidth = 16 Me.colPRENAME.MinWidth = 21
Me.colPRENAME.Name = "colPRENAME" Me.colPRENAME.Name = "colPRENAME"
' '
'colNAME2 'colNAME2
' '
resources.ApplyResources(Me.colNAME2, "colNAME2") resources.ApplyResources(Me.colNAME2, "colNAME2")
Me.colNAME2.FieldName = "USER_SURNAME" Me.colNAME2.FieldName = "USER_SURNAME"
Me.colNAME2.MinWidth = 16 Me.colNAME2.MinWidth = 21
Me.colNAME2.Name = "colNAME2" Me.colNAME2.Name = "colNAME2"
' '
'colUSERNAME 'colUSERNAME
' '
resources.ApplyResources(Me.colUSERNAME, "colUSERNAME") resources.ApplyResources(Me.colUSERNAME, "colUSERNAME")
Me.colUSERNAME.FieldName = "USER_NAME" Me.colUSERNAME.FieldName = "USER_NAME"
Me.colUSERNAME.MinWidth = 16 Me.colUSERNAME.MinWidth = 21
Me.colUSERNAME.Name = "colUSERNAME" Me.colUSERNAME.Name = "colUSERNAME"
' '
'colEMAIL 'colEMAIL
' '
resources.ApplyResources(Me.colEMAIL, "colEMAIL") resources.ApplyResources(Me.colEMAIL, "colEMAIL")
Me.colEMAIL.FieldName = "USER_EMAIL" Me.colEMAIL.FieldName = "USER_EMAIL"
Me.colEMAIL.MinWidth = 16 Me.colEMAIL.MinWidth = 21
Me.colEMAIL.Name = "colEMAIL" Me.colEMAIL.Name = "colEMAIL"
' '
'GridColumn3 'GridColumn3
' '
resources.ApplyResources(Me.GridColumn3, "GridColumn3") resources.ApplyResources(Me.GridColumn3, "GridColumn3")
Me.GridColumn3.FieldName = "USER_COMMENT" Me.GridColumn3.FieldName = "USER_COMMENT"
Me.GridColumn3.MinWidth = 16 Me.GridColumn3.MinWidth = 21
Me.GridColumn3.Name = "GridColumn3" Me.GridColumn3.Name = "GridColumn3"
' '
'GridColumn4 'GridColumn4
' '
resources.ApplyResources(Me.GridColumn4, "GridColumn4") resources.ApplyResources(Me.GridColumn4, "GridColumn4")
Me.GridColumn4.FieldName = "USER_SHORTNAME" Me.GridColumn4.FieldName = "USER_SHORTNAME"
Me.GridColumn4.MinWidth = 16 Me.GridColumn4.MinWidth = 21
Me.GridColumn4.Name = "GridColumn4" Me.GridColumn4.Name = "GridColumn4"
' '
'Panel2 'Panel2
@@ -542,6 +542,7 @@ Partial Class frmAdministration
Me.gridAssignedGroups.AllowDrop = True Me.gridAssignedGroups.AllowDrop = True
Me.gridAssignedGroups.DataSource = Me.TBPROFILE_GROUPBindingSource Me.gridAssignedGroups.DataSource = Me.TBPROFILE_GROUPBindingSource
resources.ApplyResources(Me.gridAssignedGroups, "gridAssignedGroups") resources.ApplyResources(Me.gridAssignedGroups, "gridAssignedGroups")
Me.gridAssignedGroups.EmbeddedNavigator.Margin = CType(resources.GetObject("gridAssignedGroups.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.gridAssignedGroups.MainView = Me.viewAssignedGroups Me.gridAssignedGroups.MainView = Me.viewAssignedGroups
Me.gridAssignedGroups.Name = "gridAssignedGroups" Me.gridAssignedGroups.Name = "gridAssignedGroups"
Me.gridAssignedGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAssignedGroups}) Me.gridAssignedGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAssignedGroups})
@@ -554,7 +555,6 @@ Partial Class frmAdministration
'viewAssignedGroups 'viewAssignedGroups
' '
Me.viewAssignedGroups.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colNAME5, Me.colCOMMENT1}) Me.viewAssignedGroups.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colNAME5, Me.colCOMMENT1})
Me.viewAssignedGroups.DetailHeight = 295
Me.viewAssignedGroups.GridControl = Me.gridAssignedGroups Me.viewAssignedGroups.GridControl = Me.gridAssignedGroups
Me.viewAssignedGroups.Name = "viewAssignedGroups" Me.viewAssignedGroups.Name = "viewAssignedGroups"
Me.viewAssignedGroups.OptionsBehavior.Editable = False Me.viewAssignedGroups.OptionsBehavior.Editable = False
@@ -566,14 +566,14 @@ Partial Class frmAdministration
' '
resources.ApplyResources(Me.colNAME5, "colNAME5") resources.ApplyResources(Me.colNAME5, "colNAME5")
Me.colNAME5.FieldName = "NAME" Me.colNAME5.FieldName = "NAME"
Me.colNAME5.MinWidth = 16 Me.colNAME5.MinWidth = 21
Me.colNAME5.Name = "colNAME5" Me.colNAME5.Name = "colNAME5"
' '
'colCOMMENT1 'colCOMMENT1
' '
resources.ApplyResources(Me.colCOMMENT1, "colCOMMENT1") resources.ApplyResources(Me.colCOMMENT1, "colCOMMENT1")
Me.colCOMMENT1.FieldName = "COMMENT" Me.colCOMMENT1.FieldName = "COMMENT"
Me.colCOMMENT1.MinWidth = 16 Me.colCOMMENT1.MinWidth = 21
Me.colCOMMENT1.Name = "colCOMMENT1" Me.colCOMMENT1.Name = "colCOMMENT1"
' '
'Panel3 'Panel3
@@ -592,6 +592,7 @@ Partial Class frmAdministration
Me.gridAvailableGroups.AllowDrop = True Me.gridAvailableGroups.AllowDrop = True
Me.gridAvailableGroups.DataSource = Me.TBDD_GROUPSBindingSource Me.gridAvailableGroups.DataSource = Me.TBDD_GROUPSBindingSource
resources.ApplyResources(Me.gridAvailableGroups, "gridAvailableGroups") resources.ApplyResources(Me.gridAvailableGroups, "gridAvailableGroups")
Me.gridAvailableGroups.EmbeddedNavigator.Margin = CType(resources.GetObject("gridAvailableGroups.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.gridAvailableGroups.MainView = Me.viewAvailableGroups Me.gridAvailableGroups.MainView = Me.viewAvailableGroups
Me.gridAvailableGroups.Name = "gridAvailableGroups" Me.gridAvailableGroups.Name = "gridAvailableGroups"
Me.gridAvailableGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableGroups}) Me.gridAvailableGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableGroups})
@@ -604,7 +605,6 @@ Partial Class frmAdministration
'viewAvailableGroups 'viewAvailableGroups
' '
Me.viewAvailableGroups.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colNAME4, Me.colCOMMENT}) Me.viewAvailableGroups.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colNAME4, Me.colCOMMENT})
Me.viewAvailableGroups.DetailHeight = 295
Me.viewAvailableGroups.GridControl = Me.gridAvailableGroups Me.viewAvailableGroups.GridControl = Me.gridAvailableGroups
Me.viewAvailableGroups.Name = "viewAvailableGroups" Me.viewAvailableGroups.Name = "viewAvailableGroups"
Me.viewAvailableGroups.OptionsBehavior.Editable = False Me.viewAvailableGroups.OptionsBehavior.Editable = False
@@ -616,14 +616,14 @@ Partial Class frmAdministration
' '
resources.ApplyResources(Me.colNAME4, "colNAME4") resources.ApplyResources(Me.colNAME4, "colNAME4")
Me.colNAME4.FieldName = "NAME" Me.colNAME4.FieldName = "NAME"
Me.colNAME4.MinWidth = 16 Me.colNAME4.MinWidth = 21
Me.colNAME4.Name = "colNAME4" Me.colNAME4.Name = "colNAME4"
' '
'colCOMMENT 'colCOMMENT
' '
resources.ApplyResources(Me.colCOMMENT, "colCOMMENT") resources.ApplyResources(Me.colCOMMENT, "colCOMMENT")
Me.colCOMMENT.FieldName = "COMMENT" Me.colCOMMENT.FieldName = "COMMENT"
Me.colCOMMENT.MinWidth = 16 Me.colCOMMENT.MinWidth = 21
Me.colCOMMENT.Name = "colCOMMENT" Me.colCOMMENT.Name = "colCOMMENT"
' '
'Panel4 'Panel4
@@ -651,12 +651,13 @@ Partial Class frmAdministration
' '
Me.SplitContainerControl1.Panel2.Controls.Add(Me.pgFinalIndexes) Me.SplitContainerControl1.Panel2.Controls.Add(Me.pgFinalIndexes)
resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2") resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2")
Me.SplitContainerControl1.SplitterPosition = 506 Me.SplitContainerControl1.SplitterPosition = 651
' '
'gridFinalIndex 'gridFinalIndex
' '
Me.gridFinalIndex.DataSource = Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource Me.gridFinalIndex.DataSource = Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource
resources.ApplyResources(Me.gridFinalIndex, "gridFinalIndex") resources.ApplyResources(Me.gridFinalIndex, "gridFinalIndex")
Me.gridFinalIndex.EmbeddedNavigator.Margin = CType(resources.GetObject("gridFinalIndex.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.gridFinalIndex.MainView = Me.viewFinalIndex Me.gridFinalIndex.MainView = Me.viewFinalIndex
Me.gridFinalIndex.Name = "gridFinalIndex" Me.gridFinalIndex.Name = "gridFinalIndex"
Me.gridFinalIndex.TabStop = False Me.gridFinalIndex.TabStop = False
@@ -677,7 +678,6 @@ Partial Class frmAdministration
Me.viewFinalIndex.Appearance.EvenRow.BackColor = System.Drawing.Color.PaleTurquoise Me.viewFinalIndex.Appearance.EvenRow.BackColor = System.Drawing.Color.PaleTurquoise
Me.viewFinalIndex.Appearance.EvenRow.Options.UseBackColor = True Me.viewFinalIndex.Appearance.EvenRow.Options.UseBackColor = True
Me.viewFinalIndex.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colPROFIL_ID, Me.colCONNECTION_ID, Me.colINDEXNAME, Me.colVALUE, Me.colSQL_COMMAND, Me.colPREVENT_DUPLICATES, Me.colALLOW_NEW_VALUES, Me.colDESCRIPTION1, Me.colACTIVE}) Me.viewFinalIndex.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colPROFIL_ID, Me.colCONNECTION_ID, Me.colINDEXNAME, Me.colVALUE, Me.colSQL_COMMAND, Me.colPREVENT_DUPLICATES, Me.colALLOW_NEW_VALUES, Me.colDESCRIPTION1, Me.colACTIVE})
Me.viewFinalIndex.DetailHeight = 295
Me.viewFinalIndex.GridControl = Me.gridFinalIndex Me.viewFinalIndex.GridControl = Me.gridFinalIndex
Me.viewFinalIndex.Name = "viewFinalIndex" Me.viewFinalIndex.Name = "viewFinalIndex"
Me.viewFinalIndex.OptionsBehavior.Editable = False Me.viewFinalIndex.OptionsBehavior.Editable = False
@@ -689,74 +689,92 @@ Partial Class frmAdministration
'colGUID 'colGUID
' '
Me.colGUID.FieldName = "GUID" Me.colGUID.FieldName = "GUID"
Me.colGUID.MinWidth = 26
Me.colGUID.Name = "colGUID" Me.colGUID.Name = "colGUID"
resources.ApplyResources(Me.colGUID, "colGUID")
' '
'colPROFIL_ID 'colPROFIL_ID
' '
Me.colPROFIL_ID.FieldName = "PROFIL_ID" Me.colPROFIL_ID.FieldName = "PROFIL_ID"
Me.colPROFIL_ID.MinWidth = 26
Me.colPROFIL_ID.Name = "colPROFIL_ID" Me.colPROFIL_ID.Name = "colPROFIL_ID"
resources.ApplyResources(Me.colPROFIL_ID, "colPROFIL_ID")
' '
'colCONNECTION_ID 'colCONNECTION_ID
' '
Me.colCONNECTION_ID.FieldName = "CONNECTION_ID" Me.colCONNECTION_ID.FieldName = "CONNECTION_ID"
Me.colCONNECTION_ID.MinWidth = 26
Me.colCONNECTION_ID.Name = "colCONNECTION_ID" Me.colCONNECTION_ID.Name = "colCONNECTION_ID"
resources.ApplyResources(Me.colCONNECTION_ID, "colCONNECTION_ID")
' '
'colINDEXNAME 'colINDEXNAME
' '
resources.ApplyResources(Me.colINDEXNAME, "colINDEXNAME") resources.ApplyResources(Me.colINDEXNAME, "colINDEXNAME")
Me.colINDEXNAME.FieldName = "INDEXNAME" Me.colINDEXNAME.FieldName = "INDEXNAME"
Me.colINDEXNAME.MinWidth = 26
Me.colINDEXNAME.Name = "colINDEXNAME" Me.colINDEXNAME.Name = "colINDEXNAME"
' '
'colVALUE 'colVALUE
' '
resources.ApplyResources(Me.colVALUE, "colVALUE") resources.ApplyResources(Me.colVALUE, "colVALUE")
Me.colVALUE.FieldName = "VALUE" Me.colVALUE.FieldName = "VALUE"
Me.colVALUE.MinWidth = 26
Me.colVALUE.Name = "colVALUE" Me.colVALUE.Name = "colVALUE"
' '
'colSQL_COMMAND 'colSQL_COMMAND
' '
resources.ApplyResources(Me.colSQL_COMMAND, "colSQL_COMMAND") resources.ApplyResources(Me.colSQL_COMMAND, "colSQL_COMMAND")
Me.colSQL_COMMAND.FieldName = "SQL_COMMAND" Me.colSQL_COMMAND.FieldName = "SQL_COMMAND"
Me.colSQL_COMMAND.MinWidth = 26
Me.colSQL_COMMAND.Name = "colSQL_COMMAND" Me.colSQL_COMMAND.Name = "colSQL_COMMAND"
' '
'colPREVENT_DUPLICATES 'colPREVENT_DUPLICATES
' '
resources.ApplyResources(Me.colPREVENT_DUPLICATES, "colPREVENT_DUPLICATES") resources.ApplyResources(Me.colPREVENT_DUPLICATES, "colPREVENT_DUPLICATES")
Me.colPREVENT_DUPLICATES.FieldName = "PREVENT_DUPLICATES" Me.colPREVENT_DUPLICATES.FieldName = "PREVENT_DUPLICATES"
Me.colPREVENT_DUPLICATES.MinWidth = 26
Me.colPREVENT_DUPLICATES.Name = "colPREVENT_DUPLICATES" Me.colPREVENT_DUPLICATES.Name = "colPREVENT_DUPLICATES"
' '
'colALLOW_NEW_VALUES 'colALLOW_NEW_VALUES
' '
resources.ApplyResources(Me.colALLOW_NEW_VALUES, "colALLOW_NEW_VALUES") resources.ApplyResources(Me.colALLOW_NEW_VALUES, "colALLOW_NEW_VALUES")
Me.colALLOW_NEW_VALUES.FieldName = "ALLOW_NEW_VALUES" Me.colALLOW_NEW_VALUES.FieldName = "ALLOW_NEW_VALUES"
Me.colALLOW_NEW_VALUES.MinWidth = 26
Me.colALLOW_NEW_VALUES.Name = "colALLOW_NEW_VALUES" Me.colALLOW_NEW_VALUES.Name = "colALLOW_NEW_VALUES"
' '
'colDESCRIPTION1 'colDESCRIPTION1
' '
resources.ApplyResources(Me.colDESCRIPTION1, "colDESCRIPTION1") resources.ApplyResources(Me.colDESCRIPTION1, "colDESCRIPTION1")
Me.colDESCRIPTION1.FieldName = "DESCRIPTION" Me.colDESCRIPTION1.FieldName = "DESCRIPTION"
Me.colDESCRIPTION1.MinWidth = 26
Me.colDESCRIPTION1.Name = "colDESCRIPTION1" Me.colDESCRIPTION1.Name = "colDESCRIPTION1"
' '
'colACTIVE 'colACTIVE
' '
Me.colACTIVE.FieldName = "ACTIVE" Me.colACTIVE.FieldName = "ACTIVE"
Me.colACTIVE.MinWidth = 26
Me.colACTIVE.Name = "colACTIVE" Me.colACTIVE.Name = "colACTIVE"
resources.ApplyResources(Me.colACTIVE, "colACTIVE")
' '
'pgFinalIndexes 'pgFinalIndexes
' '
Me.pgFinalIndexes.Cursor = System.Windows.Forms.Cursors.Default
resources.ApplyResources(Me.pgFinalIndexes, "pgFinalIndexes") resources.ApplyResources(Me.pgFinalIndexes, "pgFinalIndexes")
Me.pgFinalIndexes.Cursor = System.Windows.Forms.Cursors.Default
Me.pgFinalIndexes.MenuManager = Me.RibbonControl1 Me.pgFinalIndexes.MenuManager = Me.RibbonControl1
Me.pgFinalIndexes.Name = "pgFinalIndexes" Me.pgFinalIndexes.Name = "pgFinalIndexes"
Me.pgFinalIndexes.OptionsView.AllowReadOnlyRowAppearance = DevExpress.Utils.DefaultBoolean.[True] Me.pgFinalIndexes.OptionsView.AllowReadOnlyRowAppearance = DevExpress.Utils.DefaultBoolean.[True]
Me.pgFinalIndexes.OptionsView.FixedLineWidth = 3
Me.pgFinalIndexes.OptionsView.MinRowAutoHeight = 12
' '
'RibbonControl1 'RibbonControl1
' '
Me.RibbonControl1.EmptyAreaImageOptions.ImagePadding = New System.Windows.Forms.Padding(39, 36, 39, 36)
Me.RibbonControl1.ExpandCollapseItem.Id = 0 Me.RibbonControl1.ExpandCollapseItem.Id = 0
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemRefreshProfileData, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem11, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.tsbStaticInfo, Me.BarButtonItem20, Me.BarButtonItem21, Me.bbtnItemFinishSQL, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.BarButtonItem26, Me.BarToggleSwitchItemEdit, Me.bbtnitmReject, Me.bbtnitmNotResponsible}) Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemRefreshProfileData, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem11, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.tsbStaticInfo, Me.BarButtonItem20, Me.BarButtonItem21, Me.bbtnItemFinishSQL, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.BarButtonItem26, Me.BarToggleSwitchItemEdit, Me.bbtnitmReject, Me.bbtnitmNotResponsible})
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
Me.RibbonControl1.MaxItemId = 33 Me.RibbonControl1.MaxItemId = 33
Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.OptionsMenuMinWidth = 424
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3}) Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3})
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
Me.RibbonControl1.ShowMoreCommandsButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowMoreCommandsButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -1865,6 +1883,7 @@ Partial Class frmAdministration
' '
Me.GridControlNavigation.DataSource = Me.TBPM_PROFILEBindingSource Me.GridControlNavigation.DataSource = Me.TBPM_PROFILEBindingSource
resources.ApplyResources(Me.GridControlNavigation, "GridControlNavigation") resources.ApplyResources(Me.GridControlNavigation, "GridControlNavigation")
Me.GridControlNavigation.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlNavigation.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.GridControlNavigation.MainView = Me.GridViewProfile Me.GridControlNavigation.MainView = Me.GridViewProfile
Me.GridControlNavigation.Name = "GridControlNavigation" Me.GridControlNavigation.Name = "GridControlNavigation"
Me.GridControlNavigation.TabStop = False Me.GridControlNavigation.TabStop = False
@@ -1877,7 +1896,6 @@ Partial Class frmAdministration
Me.GridViewProfile.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia Me.GridViewProfile.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
Me.GridViewProfile.Appearance.FocusedRow.Options.UseBackColor = True Me.GridViewProfile.Appearance.FocusedRow.Options.UseBackColor = True
Me.GridViewProfile.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colProfilGUID, Me.colNAME}) Me.GridViewProfile.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colProfilGUID, Me.colNAME})
Me.GridViewProfile.DetailHeight = 295
Me.GridViewProfile.GridControl = Me.GridControlNavigation Me.GridViewProfile.GridControl = Me.GridControlNavigation
Me.GridViewProfile.Name = "GridViewProfile" Me.GridViewProfile.Name = "GridViewProfile"
Me.GridViewProfile.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] Me.GridViewProfile.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
@@ -1894,13 +1912,14 @@ Partial Class frmAdministration
' '
resources.ApplyResources(Me.colProfilGUID, "colProfilGUID") resources.ApplyResources(Me.colProfilGUID, "colProfilGUID")
Me.colProfilGUID.FieldName = "GUID" Me.colProfilGUID.FieldName = "GUID"
Me.colProfilGUID.MinWidth = 26
Me.colProfilGUID.Name = "colProfilGUID" Me.colProfilGUID.Name = "colProfilGUID"
' '
'colNAME 'colNAME
' '
resources.ApplyResources(Me.colNAME, "colNAME") resources.ApplyResources(Me.colNAME, "colNAME")
Me.colNAME.FieldName = "NAME" Me.colNAME.FieldName = "NAME"
Me.colNAME.MinWidth = 16 Me.colNAME.MinWidth = 21
Me.colNAME.Name = "colNAME" Me.colNAME.Name = "colNAME"
' '
'TBPM_KONFIGURATIONBindingSource 'TBPM_KONFIGURATIONBindingSource

File diff suppressed because it is too large Load Diff

View File

@@ -162,12 +162,14 @@ Public Class frmAdministration
PM_VEKTOR_INDEXComboBox.Enabled = False PM_VEKTOR_INDEXComboBox.Enabled = False
Label4.Enabled = False Label4.Enabled = False
Dim oCount = 0
Try Try
For Each oRow As DataRow In IDBData.DTVWIDB_BE_ATTRIBUTE.Rows For Each oRow As DataRow In IDBData.DTVWIDB_BE_ATTRIBUTE.Rows
Select Case CInt(oRow.Item("TYP_ID")) Select Case CInt(oRow.Item("TYP_ID"))
Case 8 Case 8
Me.PM_VEKTOR_INDEXComboBox.Items.Add(oRow.Item("ATTR_TITLE")) Me.PM_VEKTOR_INDEXComboBox.Items.Add(oRow.Item("ATTR_TITLE"))
Me.cmbLOGIndex.Items.Add(oRow.Item("ATTR_TITLE")) Me.cmbLOGIndex.Items.Add(oRow.Item("ATTR_TITLE"))
oCount += 1
End Select End Select
Next Next
@@ -181,7 +183,11 @@ Public Class frmAdministration
_Logger.Error(ex) _Logger.Error(ex)
MsgBox("Error in GetIndices IDB: " & vbNewLine & ex.Message, MsgBoxStyle.Critical) MsgBox("Error in GetIndices IDB: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try End Try
If IDBData.DTVWIDB_BE_ATTRIBUTE.Rows.Count = 0 Then
LOGGER.Warn("⚠ No attributes [VWIDB_BE_ATTRIBUTE] found in IDB for the selected object type.")
Else
LOGGER.Info($"Found {oCount} vector attributes in IDB for the selected object type.")
End If
End If End If
@@ -231,7 +237,7 @@ Public Class frmAdministration
MsgBox("No connection to windream-server possible.", MsgBoxStyle.Critical, "Unexprected error:") MsgBox("No connection to windream-server possible.", MsgBoxStyle.Critical, "Unexprected error:")
End Try End Try
Else Else
Dim oSQL = "SELECT GUID, TITLE FROM IDB.dbo.TBIDB_BUSINESS_ENTITY" Dim oSQL = "SELECT GUID, TITLE FROM TBIDB_BUSINESS_ENTITY"
Dim oDT As DataTable = DatabaseFallback.GetDatatableIDB(oSQL) Dim oDT As DataTable = DatabaseFallback.GetDatatableIDB(oSQL)
For Each oROW As DataRow In oDT.Rows For Each oROW As DataRow In oDT.Rows
Me.cmbObjekttypen.Items.Add(oROW.Item(1)) Me.cmbObjekttypen.Items.Add(oROW.Item(1))

View File

@@ -69,7 +69,7 @@ Partial Class frmCockpitConfig
Me.LabelControl_Chart = New DevExpress.XtraEditors.LabelControl() Me.LabelControl_Chart = New DevExpress.XtraEditors.LabelControl()
Me.LookUpEditMonitor = New DevExpress.XtraEditors.LookUpEdit() Me.LookUpEditMonitor = New DevExpress.XtraEditors.LookUpEdit()
Me.LabelControl_Monitor = New DevExpress.XtraEditors.LabelControl() Me.LabelControl_Monitor = New DevExpress.XtraEditors.LabelControl()
Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabControl_UserGroup = New DevExpress.XtraTab.XtraTabControl()
Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
Me.gridAssignedUsers = New DevExpress.XtraGrid.GridControl() Me.gridAssignedUsers = New DevExpress.XtraGrid.GridControl()
Me.viewAssignedUsers = New DevExpress.XtraGrid.Views.Grid.GridView() Me.viewAssignedUsers = New DevExpress.XtraGrid.Views.Grid.GridView()
@@ -89,8 +89,8 @@ Partial Class frmCockpitConfig
Me.TextEditCockpit_Bez = New DevExpress.XtraEditors.TextEdit() Me.TextEditCockpit_Bez = New DevExpress.XtraEditors.TextEdit()
Me.LabelControl12 = New DevExpress.XtraEditors.LabelControl() Me.LabelControl12 = New DevExpress.XtraEditors.LabelControl()
Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
Me.SpinEdit_sequence = New DevExpress.XtraEditors.SpinEdit()
Me.LabelControl13 = New DevExpress.XtraEditors.LabelControl() Me.LabelControl13 = New DevExpress.XtraEditors.LabelControl()
Me.SpinEdit1 = New DevExpress.XtraEditors.SpinEdit()
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.LookUpEditCockpit.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LookUpEditCockpit.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.CheckEdit_Cockpit_Active.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CheckEdit_Cockpit_Active.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -106,8 +106,8 @@ Partial Class frmCockpitConfig
CType(Me.LookUpEditProfil.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LookUpEditProfil.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.LookUpEditChart.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LookUpEditChart.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.LookUpEditMonitor.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LookUpEditMonitor.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControl_UserGroup, System.ComponentModel.ISupportInitialize).BeginInit()
Me.XtraTabControl1.SuspendLayout() Me.XtraTabControl_UserGroup.SuspendLayout()
Me.XtraTabPage1.SuspendLayout() Me.XtraTabPage1.SuspendLayout()
CType(Me.gridAssignedUsers, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.gridAssignedUsers, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.viewAssignedUsers, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.viewAssignedUsers, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -129,7 +129,7 @@ Partial Class frmCockpitConfig
CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl1.Panel2.SuspendLayout() Me.SplitContainerControl1.Panel2.SuspendLayout()
Me.SplitContainerControl1.SuspendLayout() Me.SplitContainerControl1.SuspendLayout()
CType(Me.SpinEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SpinEdit_sequence.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout() Me.SuspendLayout()
' '
'RibbonControl1 'RibbonControl1
@@ -145,7 +145,7 @@ Partial Class frmCockpitConfig
Me.RibbonControl1.OptionsMenuMinWidth = 385 Me.RibbonControl1.OptionsMenuMinWidth = 385
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
Me.RibbonControl1.Size = New System.Drawing.Size(1451, 194) Me.RibbonControl1.Size = New System.Drawing.Size(1451, 158)
Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
' '
'BarButtonItem1 'BarButtonItem1
@@ -286,11 +286,11 @@ Partial Class frmCockpitConfig
' '
Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitm_info) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitm_info)
Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitm_added_Changed) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitm_added_Changed)
Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 679) Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 685)
Me.RibbonStatusBar1.Margin = New System.Windows.Forms.Padding(4) Me.RibbonStatusBar1.Margin = New System.Windows.Forms.Padding(4)
Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
Me.RibbonStatusBar1.Size = New System.Drawing.Size(1451, 28) Me.RibbonStatusBar1.Size = New System.Drawing.Size(1451, 22)
' '
'RibbonPage2 'RibbonPage2
' '
@@ -303,7 +303,7 @@ Partial Class frmCockpitConfig
Me.LabelControl1.Appearance.Options.UseFont = True Me.LabelControl1.Appearance.Options.UseFont = True
Me.LabelControl1.Location = New System.Drawing.Point(12, 7) Me.LabelControl1.Location = New System.Drawing.Point(12, 7)
Me.LabelControl1.Name = "LabelControl1" Me.LabelControl1.Name = "LabelControl1"
Me.LabelControl1.Size = New System.Drawing.Size(100, 21) Me.LabelControl1.Size = New System.Drawing.Size(83, 17)
Me.LabelControl1.TabIndex = 16 Me.LabelControl1.TabIndex = 16
Me.LabelControl1.Text = "Wähle Cockpit" Me.LabelControl1.Text = "Wähle Cockpit"
' '
@@ -315,7 +315,7 @@ Partial Class frmCockpitConfig
Me.LookUpEditCockpit.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LookUpEditCockpit.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.LookUpEditCockpit.Properties.Appearance.Options.UseFont = True Me.LookUpEditCockpit.Properties.Appearance.Options.UseFont = True
Me.LookUpEditCockpit.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.LookUpEditCockpit.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
Me.LookUpEditCockpit.Size = New System.Drawing.Size(312, 28) Me.LookUpEditCockpit.Size = New System.Drawing.Size(312, 24)
Me.LookUpEditCockpit.TabIndex = 17 Me.LookUpEditCockpit.TabIndex = 17
' '
'CheckEdit_Cockpit_Active 'CheckEdit_Cockpit_Active
@@ -324,7 +324,7 @@ Partial Class frmCockpitConfig
Me.CheckEdit_Cockpit_Active.MenuManager = Me.RibbonControl1 Me.CheckEdit_Cockpit_Active.MenuManager = Me.RibbonControl1
Me.CheckEdit_Cockpit_Active.Name = "CheckEdit_Cockpit_Active" Me.CheckEdit_Cockpit_Active.Name = "CheckEdit_Cockpit_Active"
Me.CheckEdit_Cockpit_Active.Properties.Caption = "Active" Me.CheckEdit_Cockpit_Active.Properties.Caption = "Active"
Me.CheckEdit_Cockpit_Active.Size = New System.Drawing.Size(52, 21) Me.CheckEdit_Cockpit_Active.Size = New System.Drawing.Size(52, 18)
Me.CheckEdit_Cockpit_Active.TabIndex = 20 Me.CheckEdit_Cockpit_Active.TabIndex = 20
' '
'ImageCollection1 'ImageCollection1
@@ -362,7 +362,7 @@ Partial Class frmCockpitConfig
Me.TreeList_Cockpit.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Dark Me.TreeList_Cockpit.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Dark
Me.TreeList_Cockpit.ParentFieldName = "PARENT_ID" Me.TreeList_Cockpit.ParentFieldName = "PARENT_ID"
Me.TreeList_Cockpit.SelectImageList = Me.ImageCollection1 Me.TreeList_Cockpit.SelectImageList = Me.ImageCollection1
Me.TreeList_Cockpit.Size = New System.Drawing.Size(383, 156) Me.TreeList_Cockpit.Size = New System.Drawing.Size(383, 165)
Me.TreeList_Cockpit.TabIndex = 24 Me.TreeList_Cockpit.TabIndex = 24
' '
'LabelControl2 'LabelControl2
@@ -371,7 +371,7 @@ Partial Class frmCockpitConfig
Me.LabelControl2.Appearance.Options.UseFont = True Me.LabelControl2.Appearance.Options.UseFont = True
Me.LabelControl2.Location = New System.Drawing.Point(417, 76) Me.LabelControl2.Location = New System.Drawing.Point(417, 76)
Me.LabelControl2.Name = "LabelControl2" Me.LabelControl2.Name = "LabelControl2"
Me.LabelControl2.Size = New System.Drawing.Size(15, 21) Me.LabelControl2.Size = New System.Drawing.Size(12, 17)
Me.LabelControl2.TabIndex = 27 Me.LabelControl2.TabIndex = 27
Me.LabelControl2.Text = "ID" Me.LabelControl2.Text = "ID"
' '
@@ -379,9 +379,9 @@ Partial Class frmCockpitConfig
' '
Me.LabelControl3.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LabelControl3.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.LabelControl3.Appearance.Options.UseFont = True Me.LabelControl3.Appearance.Options.UseFont = True
Me.LabelControl3.Location = New System.Drawing.Point(494, 76) Me.LabelControl3.Location = New System.Drawing.Point(454, 76)
Me.LabelControl3.Name = "LabelControl3" Me.LabelControl3.Name = "LabelControl3"
Me.LabelControl3.Size = New System.Drawing.Size(60, 21) Me.LabelControl3.Size = New System.Drawing.Size(49, 17)
Me.LabelControl3.TabIndex = 28 Me.LabelControl3.TabIndex = 28
Me.LabelControl3.Text = "ParentID" Me.LabelControl3.Text = "ParentID"
' '
@@ -391,7 +391,7 @@ Partial Class frmCockpitConfig
Me.LabelControl4.Appearance.Options.UseFont = True Me.LabelControl4.Appearance.Options.UseFont = True
Me.LabelControl4.Location = New System.Drawing.Point(417, 126) Me.LabelControl4.Location = New System.Drawing.Point(417, 126)
Me.LabelControl4.Name = "LabelControl4" Me.LabelControl4.Name = "LabelControl4"
Me.LabelControl4.Size = New System.Drawing.Size(80, 21) Me.LabelControl4.Size = New System.Drawing.Size(67, 17)
Me.LabelControl4.TabIndex = 29 Me.LabelControl4.TabIndex = 29
Me.LabelControl4.Text = "Knoten-Typ" Me.LabelControl4.Text = "Knoten-Typ"
' '
@@ -403,18 +403,18 @@ Partial Class frmCockpitConfig
Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID.Properties.Appearance.Options.UseFont = True Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID.Properties.Appearance.Options.UseFont = True
Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID.Properties.ReadOnly = True Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID.Properties.ReadOnly = True
Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID.Size = New System.Drawing.Size(55, 28) Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID.Size = New System.Drawing.Size(30, 24)
Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID.TabIndex = 31 Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID.TabIndex = 31
' '
'TextEdit_ParentID 'TextEdit_ParentID
' '
Me.TextEdit_ParentID.Location = New System.Drawing.Point(494, 96) Me.TextEdit_ParentID.Location = New System.Drawing.Point(454, 96)
Me.TextEdit_ParentID.MenuManager = Me.RibbonControl1 Me.TextEdit_ParentID.MenuManager = Me.RibbonControl1
Me.TextEdit_ParentID.Name = "TextEdit_ParentID" Me.TextEdit_ParentID.Name = "TextEdit_ParentID"
Me.TextEdit_ParentID.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.TextEdit_ParentID.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.TextEdit_ParentID.Properties.Appearance.Options.UseFont = True Me.TextEdit_ParentID.Properties.Appearance.Options.UseFont = True
Me.TextEdit_ParentID.Properties.ReadOnly = True Me.TextEdit_ParentID.Properties.ReadOnly = True
Me.TextEdit_ParentID.Size = New System.Drawing.Size(55, 28) Me.TextEdit_ParentID.Size = New System.Drawing.Size(30, 24)
Me.TextEdit_ParentID.TabIndex = 32 Me.TextEdit_ParentID.TabIndex = 32
' '
'LookUpEditTypeID 'LookUpEditTypeID
@@ -425,7 +425,7 @@ Partial Class frmCockpitConfig
Me.LookUpEditTypeID.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LookUpEditTypeID.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.LookUpEditTypeID.Properties.Appearance.Options.UseFont = True Me.LookUpEditTypeID.Properties.Appearance.Options.UseFont = True
Me.LookUpEditTypeID.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.LookUpEditTypeID.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
Me.LookUpEditTypeID.Size = New System.Drawing.Size(143, 28) Me.LookUpEditTypeID.Size = New System.Drawing.Size(143, 24)
Me.LookUpEditTypeID.TabIndex = 33 Me.LookUpEditTypeID.TabIndex = 33
' '
'TextEdit_Bezeichnung 'TextEdit_Bezeichnung
@@ -435,7 +435,7 @@ Partial Class frmCockpitConfig
Me.TextEdit_Bezeichnung.Name = "TextEdit_Bezeichnung" Me.TextEdit_Bezeichnung.Name = "TextEdit_Bezeichnung"
Me.TextEdit_Bezeichnung.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.TextEdit_Bezeichnung.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.TextEdit_Bezeichnung.Properties.Appearance.Options.UseFont = True Me.TextEdit_Bezeichnung.Properties.Appearance.Options.UseFont = True
Me.TextEdit_Bezeichnung.Size = New System.Drawing.Size(283, 28) Me.TextEdit_Bezeichnung.Size = New System.Drawing.Size(359, 24)
Me.TextEdit_Bezeichnung.TabIndex = 36 Me.TextEdit_Bezeichnung.TabIndex = 36
' '
'LabelControl5 'LabelControl5
@@ -444,19 +444,19 @@ Partial Class frmCockpitConfig
Me.LabelControl5.Appearance.Options.UseFont = True Me.LabelControl5.Appearance.Options.UseFont = True
Me.LabelControl5.Location = New System.Drawing.Point(565, 76) Me.LabelControl5.Location = New System.Drawing.Point(565, 76)
Me.LabelControl5.Name = "LabelControl5" Me.LabelControl5.Name = "LabelControl5"
Me.LabelControl5.Size = New System.Drawing.Size(144, 21) Me.LabelControl5.Size = New System.Drawing.Size(120, 17)
Me.LabelControl5.TabIndex = 35 Me.LabelControl5.TabIndex = 35
Me.LabelControl5.Text = "Knoten Bezeichnung:" Me.LabelControl5.Text = "Knoten Bezeichnung:"
' '
'CheckEdit_Active 'CheckEdit_Active
' '
Me.CheckEdit_Active.Location = New System.Drawing.Point(854, 97) Me.CheckEdit_Active.Location = New System.Drawing.Point(504, 97)
Me.CheckEdit_Active.MenuManager = Me.RibbonControl1 Me.CheckEdit_Active.MenuManager = Me.RibbonControl1
Me.CheckEdit_Active.Name = "CheckEdit_Active" Me.CheckEdit_Active.Name = "CheckEdit_Active"
Me.CheckEdit_Active.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CheckEdit_Active.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.CheckEdit_Active.Properties.Appearance.Options.UseFont = True Me.CheckEdit_Active.Properties.Appearance.Options.UseFont = True
Me.CheckEdit_Active.Properties.Caption = "Active" Me.CheckEdit_Active.Properties.Caption = "Aktiv"
Me.CheckEdit_Active.Size = New System.Drawing.Size(70, 25) Me.CheckEdit_Active.Size = New System.Drawing.Size(55, 21)
Me.CheckEdit_Active.TabIndex = 37 Me.CheckEdit_Active.TabIndex = 37
' '
'LookUpEdit_Image 'LookUpEdit_Image
@@ -467,7 +467,7 @@ Partial Class frmCockpitConfig
Me.LookUpEdit_Image.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LookUpEdit_Image.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.LookUpEdit_Image.Properties.Appearance.Options.UseFont = True Me.LookUpEdit_Image.Properties.Appearance.Options.UseFont = True
Me.LookUpEdit_Image.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.LookUpEdit_Image.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
Me.LookUpEdit_Image.Size = New System.Drawing.Size(143, 28) Me.LookUpEdit_Image.Size = New System.Drawing.Size(143, 24)
Me.LookUpEdit_Image.TabIndex = 39 Me.LookUpEdit_Image.TabIndex = 39
' '
'LabelControl6 'LabelControl6
@@ -476,7 +476,7 @@ Partial Class frmCockpitConfig
Me.LabelControl6.Appearance.Options.UseFont = True Me.LabelControl6.Appearance.Options.UseFont = True
Me.LabelControl6.Location = New System.Drawing.Point(417, 181) Me.LabelControl6.Location = New System.Drawing.Point(417, 181)
Me.LabelControl6.Name = "LabelControl6" Me.LabelControl6.Name = "LabelControl6"
Me.LabelControl6.Size = New System.Drawing.Size(57, 21) Me.LabelControl6.Size = New System.Drawing.Size(47, 17)
Me.LabelControl6.TabIndex = 38 Me.LabelControl6.TabIndex = 38
Me.LabelControl6.Text = "Bild-Typ" Me.LabelControl6.Text = "Bild-Typ"
' '
@@ -487,7 +487,7 @@ Partial Class frmCockpitConfig
Me.TextEdit_Comment.Name = "TextEdit_Comment" Me.TextEdit_Comment.Name = "TextEdit_Comment"
Me.TextEdit_Comment.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.TextEdit_Comment.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.TextEdit_Comment.Properties.Appearance.Options.UseFont = True Me.TextEdit_Comment.Properties.Appearance.Options.UseFont = True
Me.TextEdit_Comment.Size = New System.Drawing.Size(359, 28) Me.TextEdit_Comment.Size = New System.Drawing.Size(409, 24)
Me.TextEdit_Comment.TabIndex = 41 Me.TextEdit_Comment.TabIndex = 41
' '
'LabelControl7 'LabelControl7
@@ -496,7 +496,7 @@ Partial Class frmCockpitConfig
Me.LabelControl7.Appearance.Options.UseFont = True Me.LabelControl7.Appearance.Options.UseFont = True
Me.LabelControl7.Location = New System.Drawing.Point(566, 181) Me.LabelControl7.Location = New System.Drawing.Point(566, 181)
Me.LabelControl7.Name = "LabelControl7" Me.LabelControl7.Name = "LabelControl7"
Me.LabelControl7.Size = New System.Drawing.Size(80, 21) Me.LabelControl7.Size = New System.Drawing.Size(65, 17)
Me.LabelControl7.TabIndex = 40 Me.LabelControl7.TabIndex = 40
Me.LabelControl7.Text = "Bemerkung" Me.LabelControl7.Text = "Bemerkung"
' '
@@ -506,7 +506,7 @@ Partial Class frmCockpitConfig
Me.LabelControl_Profil.Appearance.Options.UseFont = True Me.LabelControl_Profil.Appearance.Options.UseFont = True
Me.LabelControl_Profil.Location = New System.Drawing.Point(565, 126) Me.LabelControl_Profil.Location = New System.Drawing.Point(565, 126)
Me.LabelControl_Profil.Name = "LabelControl_Profil" Me.LabelControl_Profil.Name = "LabelControl_Profil"
Me.LabelControl_Profil.Size = New System.Drawing.Size(37, 21) Me.LabelControl_Profil.Size = New System.Drawing.Size(30, 17)
Me.LabelControl_Profil.TabIndex = 42 Me.LabelControl_Profil.TabIndex = 42
Me.LabelControl_Profil.Text = "Profil" Me.LabelControl_Profil.Text = "Profil"
' '
@@ -518,7 +518,7 @@ Partial Class frmCockpitConfig
Me.LookUpEditProfil.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LookUpEditProfil.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.LookUpEditProfil.Properties.Appearance.Options.UseFont = True Me.LookUpEditProfil.Properties.Appearance.Options.UseFont = True
Me.LookUpEditProfil.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.LookUpEditProfil.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
Me.LookUpEditProfil.Size = New System.Drawing.Size(359, 28) Me.LookUpEditProfil.Size = New System.Drawing.Size(409, 24)
Me.LookUpEditProfil.TabIndex = 43 Me.LookUpEditProfil.TabIndex = 43
' '
'LookUpEditChart 'LookUpEditChart
@@ -529,7 +529,7 @@ Partial Class frmCockpitConfig
Me.LookUpEditChart.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LookUpEditChart.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.LookUpEditChart.Properties.Appearance.Options.UseFont = True Me.LookUpEditChart.Properties.Appearance.Options.UseFont = True
Me.LookUpEditChart.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.LookUpEditChart.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
Me.LookUpEditChart.Size = New System.Drawing.Size(359, 28) Me.LookUpEditChart.Size = New System.Drawing.Size(408, 24)
Me.LookUpEditChart.TabIndex = 45 Me.LookUpEditChart.TabIndex = 45
' '
'LabelControl_Chart 'LabelControl_Chart
@@ -538,7 +538,7 @@ Partial Class frmCockpitConfig
Me.LabelControl_Chart.Appearance.Options.UseFont = True Me.LabelControl_Chart.Appearance.Options.UseFont = True
Me.LabelControl_Chart.Location = New System.Drawing.Point(566, 126) Me.LabelControl_Chart.Location = New System.Drawing.Point(566, 126)
Me.LabelControl_Chart.Name = "LabelControl_Chart" Me.LabelControl_Chart.Name = "LabelControl_Chart"
Me.LabelControl_Chart.Size = New System.Drawing.Size(112, 21) Me.LabelControl_Chart.Size = New System.Drawing.Size(91, 17)
Me.LabelControl_Chart.TabIndex = 44 Me.LabelControl_Chart.TabIndex = 44
Me.LabelControl_Chart.Text = "Chart-Definition" Me.LabelControl_Chart.Text = "Chart-Definition"
' '
@@ -550,7 +550,7 @@ Partial Class frmCockpitConfig
Me.LookUpEditMonitor.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LookUpEditMonitor.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.LookUpEditMonitor.Properties.Appearance.Options.UseFont = True Me.LookUpEditMonitor.Properties.Appearance.Options.UseFont = True
Me.LookUpEditMonitor.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.LookUpEditMonitor.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
Me.LookUpEditMonitor.Size = New System.Drawing.Size(359, 28) Me.LookUpEditMonitor.Size = New System.Drawing.Size(409, 24)
Me.LookUpEditMonitor.TabIndex = 47 Me.LookUpEditMonitor.TabIndex = 47
' '
'LabelControl_Monitor 'LabelControl_Monitor
@@ -559,20 +559,20 @@ Partial Class frmCockpitConfig
Me.LabelControl_Monitor.Appearance.Options.UseFont = True Me.LabelControl_Monitor.Appearance.Options.UseFont = True
Me.LabelControl_Monitor.Location = New System.Drawing.Point(565, 126) Me.LabelControl_Monitor.Location = New System.Drawing.Point(565, 126)
Me.LabelControl_Monitor.Name = "LabelControl_Monitor" Me.LabelControl_Monitor.Name = "LabelControl_Monitor"
Me.LabelControl_Monitor.Size = New System.Drawing.Size(130, 21) Me.LabelControl_Monitor.Size = New System.Drawing.Size(107, 17)
Me.LabelControl_Monitor.TabIndex = 46 Me.LabelControl_Monitor.TabIndex = 46
Me.LabelControl_Monitor.Text = "Monitor-Definition" Me.LabelControl_Monitor.Text = "Monitor-Definition"
' '
'XtraTabControl1 'XtraTabControl_UserGroup
' '
Me.XtraTabControl1.AllowDrop = True Me.XtraTabControl_UserGroup.AllowDrop = True
Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.XtraTabControl_UserGroup.Dock = System.Windows.Forms.DockStyle.Fill
Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl_UserGroup.Location = New System.Drawing.Point(0, 0)
Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl_UserGroup.Name = "XtraTabControl_UserGroup"
Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 Me.XtraTabControl_UserGroup.SelectedTabPage = Me.XtraTabPage1
Me.XtraTabControl1.Size = New System.Drawing.Size(1451, 223) Me.XtraTabControl_UserGroup.Size = New System.Drawing.Size(1451, 267)
Me.XtraTabControl1.TabIndex = 50 Me.XtraTabControl_UserGroup.TabIndex = 50
Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) Me.XtraTabControl_UserGroup.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2})
' '
'XtraTabPage1 'XtraTabPage1
' '
@@ -580,17 +580,17 @@ Partial Class frmCockpitConfig
Me.XtraTabPage1.Controls.Add(Me.gridAvailableUsers) Me.XtraTabPage1.Controls.Add(Me.gridAvailableUsers)
Me.XtraTabPage1.Controls.Add(Me.PanelControl1) Me.XtraTabPage1.Controls.Add(Me.PanelControl1)
Me.XtraTabPage1.Name = "XtraTabPage1" Me.XtraTabPage1.Name = "XtraTabPage1"
Me.XtraTabPage1.Size = New System.Drawing.Size(1449, 195) Me.XtraTabPage1.Size = New System.Drawing.Size(1449, 244)
Me.XtraTabPage1.Text = "User zu Cockpit" Me.XtraTabPage1.Text = "User zu Cockpit"
' '
'gridAssignedUsers 'gridAssignedUsers
' '
Me.gridAssignedUsers.AllowDrop = True Me.gridAssignedUsers.AllowDrop = True
Me.gridAssignedUsers.Dock = System.Windows.Forms.DockStyle.Fill Me.gridAssignedUsers.Dock = System.Windows.Forms.DockStyle.Fill
Me.gridAssignedUsers.Location = New System.Drawing.Point(406, 33) Me.gridAssignedUsers.Location = New System.Drawing.Point(508, 33)
Me.gridAssignedUsers.MainView = Me.viewAssignedUsers Me.gridAssignedUsers.MainView = Me.viewAssignedUsers
Me.gridAssignedUsers.Name = "gridAssignedUsers" Me.gridAssignedUsers.Name = "gridAssignedUsers"
Me.gridAssignedUsers.Size = New System.Drawing.Size(1043, 162) Me.gridAssignedUsers.Size = New System.Drawing.Size(941, 211)
Me.gridAssignedUsers.TabIndex = 7 Me.gridAssignedUsers.TabIndex = 7
Me.gridAssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAssignedUsers}) Me.gridAssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAssignedUsers})
' '
@@ -609,7 +609,7 @@ Partial Class frmCockpitConfig
Me.gridAvailableUsers.Location = New System.Drawing.Point(0, 33) Me.gridAvailableUsers.Location = New System.Drawing.Point(0, 33)
Me.gridAvailableUsers.MainView = Me.viewAvailableUsers Me.gridAvailableUsers.MainView = Me.viewAvailableUsers
Me.gridAvailableUsers.Name = "gridAvailableUsers" Me.gridAvailableUsers.Name = "gridAvailableUsers"
Me.gridAvailableUsers.Size = New System.Drawing.Size(406, 162) Me.gridAvailableUsers.Size = New System.Drawing.Size(508, 211)
Me.gridAvailableUsers.TabIndex = 6 Me.gridAvailableUsers.TabIndex = 6
Me.gridAvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableUsers}) Me.gridAvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableUsers})
' '
@@ -639,7 +639,7 @@ Partial Class frmCockpitConfig
Me.LabelControl9.Appearance.Options.UseFont = True Me.LabelControl9.Appearance.Options.UseFont = True
Me.LabelControl9.Location = New System.Drawing.Point(409, 5) Me.LabelControl9.Location = New System.Drawing.Point(409, 5)
Me.LabelControl9.Name = "LabelControl9" Me.LabelControl9.Name = "LabelControl9"
Me.LabelControl9.Size = New System.Drawing.Size(125, 21) Me.LabelControl9.Size = New System.Drawing.Size(106, 17)
Me.LabelControl9.TabIndex = 1 Me.LabelControl9.TabIndex = 1
Me.LabelControl9.Text = "Zugeordnete User" Me.LabelControl9.Text = "Zugeordnete User"
' '
@@ -649,7 +649,7 @@ Partial Class frmCockpitConfig
Me.LabelControl8.Appearance.Options.UseFont = True Me.LabelControl8.Appearance.Options.UseFont = True
Me.LabelControl8.Location = New System.Drawing.Point(5, 5) Me.LabelControl8.Location = New System.Drawing.Point(5, 5)
Me.LabelControl8.Name = "LabelControl8" Me.LabelControl8.Name = "LabelControl8"
Me.LabelControl8.Size = New System.Drawing.Size(164, 21) Me.LabelControl8.Size = New System.Drawing.Size(139, 17)
Me.LabelControl8.TabIndex = 0 Me.LabelControl8.TabIndex = 0
Me.LabelControl8.Text = "Nicht zugeordnete User" Me.LabelControl8.Text = "Nicht zugeordnete User"
' '
@@ -659,17 +659,17 @@ Partial Class frmCockpitConfig
Me.XtraTabPage2.Controls.Add(Me.GridAvailableGroups) Me.XtraTabPage2.Controls.Add(Me.GridAvailableGroups)
Me.XtraTabPage2.Controls.Add(Me.PanelControl2) Me.XtraTabPage2.Controls.Add(Me.PanelControl2)
Me.XtraTabPage2.Name = "XtraTabPage2" Me.XtraTabPage2.Name = "XtraTabPage2"
Me.XtraTabPage2.Size = New System.Drawing.Size(1449, 237) Me.XtraTabPage2.Size = New System.Drawing.Size(1449, 244)
Me.XtraTabPage2.Text = "Gruppe zu Cockpit" Me.XtraTabPage2.Text = "Gruppe zu Cockpit"
' '
'GridAssignedGroups 'GridAssignedGroups
' '
Me.GridAssignedGroups.AllowDrop = True Me.GridAssignedGroups.AllowDrop = True
Me.GridAssignedGroups.Dock = System.Windows.Forms.DockStyle.Fill Me.GridAssignedGroups.Dock = System.Windows.Forms.DockStyle.Fill
Me.GridAssignedGroups.Location = New System.Drawing.Point(406, 33) Me.GridAssignedGroups.Location = New System.Drawing.Point(508, 33)
Me.GridAssignedGroups.MainView = Me.ViewAssignedGroups Me.GridAssignedGroups.MainView = Me.ViewAssignedGroups
Me.GridAssignedGroups.Name = "GridAssignedGroups" Me.GridAssignedGroups.Name = "GridAssignedGroups"
Me.GridAssignedGroups.Size = New System.Drawing.Size(1043, 204) Me.GridAssignedGroups.Size = New System.Drawing.Size(941, 211)
Me.GridAssignedGroups.TabIndex = 8 Me.GridAssignedGroups.TabIndex = 8
Me.GridAssignedGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewAssignedGroups}) Me.GridAssignedGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewAssignedGroups})
' '
@@ -688,7 +688,7 @@ Partial Class frmCockpitConfig
Me.GridAvailableGroups.Location = New System.Drawing.Point(0, 33) Me.GridAvailableGroups.Location = New System.Drawing.Point(0, 33)
Me.GridAvailableGroups.MainView = Me.ViewAvailableGroups Me.GridAvailableGroups.MainView = Me.ViewAvailableGroups
Me.GridAvailableGroups.Name = "GridAvailableGroups" Me.GridAvailableGroups.Name = "GridAvailableGroups"
Me.GridAvailableGroups.Size = New System.Drawing.Size(406, 204) Me.GridAvailableGroups.Size = New System.Drawing.Size(508, 211)
Me.GridAvailableGroups.TabIndex = 7 Me.GridAvailableGroups.TabIndex = 7
Me.GridAvailableGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewAvailableGroups}) Me.GridAvailableGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewAvailableGroups})
' '
@@ -718,7 +718,7 @@ Partial Class frmCockpitConfig
Me.LabelControl10.Appearance.Options.UseFont = True Me.LabelControl10.Appearance.Options.UseFont = True
Me.LabelControl10.Location = New System.Drawing.Point(409, 5) Me.LabelControl10.Location = New System.Drawing.Point(409, 5)
Me.LabelControl10.Name = "LabelControl10" Me.LabelControl10.Name = "LabelControl10"
Me.LabelControl10.Size = New System.Drawing.Size(154, 21) Me.LabelControl10.Size = New System.Drawing.Size(130, 17)
Me.LabelControl10.TabIndex = 1 Me.LabelControl10.TabIndex = 1
Me.LabelControl10.Text = "Zugeordnete Gruppen" Me.LabelControl10.Text = "Zugeordnete Gruppen"
' '
@@ -728,7 +728,7 @@ Partial Class frmCockpitConfig
Me.LabelControl11.Appearance.Options.UseFont = True Me.LabelControl11.Appearance.Options.UseFont = True
Me.LabelControl11.Location = New System.Drawing.Point(5, 5) Me.LabelControl11.Location = New System.Drawing.Point(5, 5)
Me.LabelControl11.Name = "LabelControl11" Me.LabelControl11.Name = "LabelControl11"
Me.LabelControl11.Size = New System.Drawing.Size(193, 21) Me.LabelControl11.Size = New System.Drawing.Size(163, 17)
Me.LabelControl11.TabIndex = 0 Me.LabelControl11.TabIndex = 0
Me.LabelControl11.Text = "Nicht zugeordnete Gruppen" Me.LabelControl11.Text = "Nicht zugeordnete Gruppen"
' '
@@ -739,7 +739,7 @@ Partial Class frmCockpitConfig
Me.TextEditCockpit_Bez.Name = "TextEditCockpit_Bez" Me.TextEditCockpit_Bez.Name = "TextEditCockpit_Bez"
Me.TextEditCockpit_Bez.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.TextEditCockpit_Bez.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.TextEditCockpit_Bez.Properties.Appearance.Options.UseFont = True Me.TextEditCockpit_Bez.Properties.Appearance.Options.UseFont = True
Me.TextEditCockpit_Bez.Size = New System.Drawing.Size(431, 28) Me.TextEditCockpit_Bez.Size = New System.Drawing.Size(507, 24)
Me.TextEditCockpit_Bez.TabIndex = 55 Me.TextEditCockpit_Bez.TabIndex = 55
' '
'LabelControl12 'LabelControl12
@@ -748,7 +748,7 @@ Partial Class frmCockpitConfig
Me.LabelControl12.Appearance.Options.UseFont = True Me.LabelControl12.Appearance.Options.UseFont = True
Me.LabelControl12.Location = New System.Drawing.Point(417, 7) Me.LabelControl12.Location = New System.Drawing.Point(417, 7)
Me.LabelControl12.Name = "LabelControl12" Me.LabelControl12.Name = "LabelControl12"
Me.LabelControl12.Size = New System.Drawing.Size(147, 21) Me.LabelControl12.Size = New System.Drawing.Size(122, 17)
Me.LabelControl12.TabIndex = 54 Me.LabelControl12.TabIndex = 54
Me.LabelControl12.Text = "Cockpit Bezeichnung:" Me.LabelControl12.Text = "Cockpit Bezeichnung:"
' '
@@ -756,12 +756,12 @@ Partial Class frmCockpitConfig
' '
Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill
Me.SplitContainerControl1.Horizontal = False Me.SplitContainerControl1.Horizontal = False
Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 194) Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 158)
Me.SplitContainerControl1.Name = "SplitContainerControl1" Me.SplitContainerControl1.Name = "SplitContainerControl1"
' '
'SplitContainerControl1.Panel1 'SplitContainerControl1.Panel1
' '
Me.SplitContainerControl1.Panel1.Controls.Add(Me.SpinEdit1) Me.SplitContainerControl1.Panel1.Controls.Add(Me.SpinEdit_sequence)
Me.SplitContainerControl1.Panel1.Controls.Add(Me.LabelControl13) Me.SplitContainerControl1.Panel1.Controls.Add(Me.LabelControl13)
Me.SplitContainerControl1.Panel1.Controls.Add(Me.LabelControl1) Me.SplitContainerControl1.Panel1.Controls.Add(Me.LabelControl1)
Me.SplitContainerControl1.Panel1.Controls.Add(Me.TextEditCockpit_Bez) Me.SplitContainerControl1.Panel1.Controls.Add(Me.TextEditCockpit_Bez)
@@ -792,39 +792,41 @@ Partial Class frmCockpitConfig
' '
'SplitContainerControl1.Panel2 'SplitContainerControl1.Panel2
' '
Me.SplitContainerControl1.Panel2.Controls.Add(Me.XtraTabControl1) Me.SplitContainerControl1.Panel2.Controls.Add(Me.XtraTabControl_UserGroup)
Me.SplitContainerControl1.Panel2.Text = "Panel2" Me.SplitContainerControl1.Panel2.Text = "Panel2"
Me.SplitContainerControl1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.[True] Me.SplitContainerControl1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.[True]
Me.SplitContainerControl1.Size = New System.Drawing.Size(1451, 485) Me.SplitContainerControl1.Size = New System.Drawing.Size(1451, 527)
Me.SplitContainerControl1.SplitterPosition = 250 Me.SplitContainerControl1.SplitterPosition = 250
Me.SplitContainerControl1.TabIndex = 58 Me.SplitContainerControl1.TabIndex = 58
' '
'SpinEdit_sequence
'
Me.SpinEdit_sequence.EditValue = New Decimal(New Integer() {1, 0, 0, 0})
Me.SpinEdit_sequence.Location = New System.Drawing.Point(930, 99)
Me.SpinEdit_sequence.MenuManager = Me.RibbonControl1
Me.SpinEdit_sequence.Name = "SpinEdit_sequence"
Me.SpinEdit_sequence.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.SpinEdit_sequence.Properties.Appearance.Options.UseFont = True
Me.SpinEdit_sequence.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
Me.SpinEdit_sequence.Properties.MaxValue = New Decimal(New Integer() {20, 0, 0, 0})
Me.SpinEdit_sequence.Properties.MinValue = New Decimal(New Integer() {1, 0, 0, 0})
Me.SpinEdit_sequence.Size = New System.Drawing.Size(44, 20)
Me.SpinEdit_sequence.TabIndex = 58
'
'LabelControl13 'LabelControl13
' '
Me.LabelControl13.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LabelControl13.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.LabelControl13.Appearance.Options.UseFont = True Me.LabelControl13.Appearance.Options.UseFont = True
Me.LabelControl13.Location = New System.Drawing.Point(930, 76) Me.LabelControl13.Location = New System.Drawing.Point(930, 76)
Me.LabelControl13.Name = "LabelControl13" Me.LabelControl13.Name = "LabelControl13"
Me.LabelControl13.Size = New System.Drawing.Size(86, 21) Me.LabelControl13.Size = New System.Drawing.Size(72, 17)
Me.LabelControl13.TabIndex = 57 Me.LabelControl13.TabIndex = 57
Me.LabelControl13.Text = "Reihenfolge:" Me.LabelControl13.Text = "Reihenfolge:"
' '
'SpinEdit1
'
Me.SpinEdit1.EditValue = New Decimal(New Integer() {1, 0, 0, 0})
Me.SpinEdit1.Location = New System.Drawing.Point(930, 99)
Me.SpinEdit1.MenuManager = Me.RibbonControl1
Me.SpinEdit1.Name = "SpinEdit1"
Me.SpinEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
Me.SpinEdit1.Properties.MaxValue = New Decimal(New Integer() {20, 0, 0, 0})
Me.SpinEdit1.Properties.MinValue = New Decimal(New Integer() {1, 0, 0, 0})
Me.SpinEdit1.Size = New System.Drawing.Size(86, 24)
Me.SpinEdit1.TabIndex = 58
'
'frmCockpitConfig 'frmCockpitConfig
' '
Me.Appearance.Options.UseFont = True Me.Appearance.Options.UseFont = True
Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 21.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 17.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(1451, 707) Me.ClientSize = New System.Drawing.Size(1451, 707)
Me.Controls.Add(Me.SplitContainerControl1) Me.Controls.Add(Me.SplitContainerControl1)
@@ -852,8 +854,8 @@ Partial Class frmCockpitConfig
CType(Me.LookUpEditProfil.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LookUpEditProfil.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.LookUpEditChart.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LookUpEditChart.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.LookUpEditMonitor.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LookUpEditMonitor.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl_UserGroup, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabControl1.ResumeLayout(False) Me.XtraTabControl_UserGroup.ResumeLayout(False)
Me.XtraTabPage1.ResumeLayout(False) Me.XtraTabPage1.ResumeLayout(False)
CType(Me.gridAssignedUsers, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.gridAssignedUsers, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.viewAssignedUsers, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.viewAssignedUsers, System.ComponentModel.ISupportInitialize).EndInit()
@@ -878,7 +880,7 @@ Partial Class frmCockpitConfig
Me.SplitContainerControl1.Panel2.ResumeLayout(False) Me.SplitContainerControl1.Panel2.ResumeLayout(False)
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl1.ResumeLayout(False) Me.SplitContainerControl1.ResumeLayout(False)
CType(Me.SpinEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SpinEdit_sequence.Properties, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False) Me.ResumeLayout(False)
Me.PerformLayout() Me.PerformLayout()
@@ -923,7 +925,7 @@ Partial Class frmCockpitConfig
Friend WithEvents LookUpEditMonitor As DevExpress.XtraEditors.LookUpEdit Friend WithEvents LookUpEditMonitor As DevExpress.XtraEditors.LookUpEdit
Friend WithEvents LabelControl_Monitor As DevExpress.XtraEditors.LabelControl Friend WithEvents LabelControl_Monitor As DevExpress.XtraEditors.LabelControl
Friend WithEvents bbtnitmCopy As DevExpress.XtraBars.BarButtonItem Friend WithEvents bbtnitmCopy As DevExpress.XtraBars.BarButtonItem
Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl Friend WithEvents XtraTabControl_UserGroup As DevExpress.XtraTab.XtraTabControl
Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents gridAvailableUsers As DevExpress.XtraGrid.GridControl Friend WithEvents gridAvailableUsers As DevExpress.XtraGrid.GridControl
@@ -950,5 +952,5 @@ Partial Class frmCockpitConfig
Friend WithEvents bsitm_added_Changed As DevExpress.XtraBars.BarStaticItem Friend WithEvents bsitm_added_Changed As DevExpress.XtraBars.BarStaticItem
Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents LabelControl13 As DevExpress.XtraEditors.LabelControl Friend WithEvents LabelControl13 As DevExpress.XtraEditors.LabelControl
Friend WithEvents SpinEdit1 As DevExpress.XtraEditors.SpinEdit Friend WithEvents SpinEdit_sequence As DevExpress.XtraEditors.SpinEdit
End Class End Class

View File

@@ -191,6 +191,7 @@ Public Class frmCockpitConfig
,SQL_QUERY ,SQL_QUERY
,SQL_QUERY_COUNT ,SQL_QUERY_COUNT
,COMMENT ,COMMENT
,CFG_SEQUENCE
,ADDED_WHO ,ADDED_WHO
,ADDED_WHEN ,ADDED_WHEN
,CHANGED_WHO ,CHANGED_WHO
@@ -215,7 +216,7 @@ Public Class frmCockpitConfig
_currentCockpitDefinition.SQL_Query = If(IsDBNull(row("SQL_QUERY")), String.Empty, row("SQL_QUERY").ToString()) _currentCockpitDefinition.SQL_Query = If(IsDBNull(row("SQL_QUERY")), String.Empty, row("SQL_QUERY").ToString())
_currentCockpitDefinition.SQL_Query_Count = If(IsDBNull(row("SQL_QUERY_COUNT")), String.Empty, row("SQL_QUERY_COUNT").ToString()) _currentCockpitDefinition.SQL_Query_Count = If(IsDBNull(row("SQL_QUERY_COUNT")), String.Empty, row("SQL_QUERY_COUNT").ToString())
_currentCockpitDefinition.Comment = If(IsDBNull(row("COMMENT")), String.Empty, row("COMMENT").ToString()) _currentCockpitDefinition.Comment = If(IsDBNull(row("COMMENT")), String.Empty, row("COMMENT").ToString())
_currentCockpitDefinition.CFG_Sequence = If(IsDBNull(row("CFG_SEQUENCE")), 0, CInt(row("CFG_SEQUENCE")))
LOGGER.Debug($"Reload_CurrentCockpitDefinition: Erfolgreich neu geladen - ID={pkId}, SQL_Query Length={_currentCockpitDefinition.SQL_Query.Length}, SQL_Query_Count Length={_currentCockpitDefinition.SQL_Query_Count.Length}") LOGGER.Debug($"Reload_CurrentCockpitDefinition: Erfolgreich neu geladen - ID={pkId}, SQL_Query Length={_currentCockpitDefinition.SQL_Query.Length}, SQL_Query_Count Length={_currentCockpitDefinition.SQL_Query_Count.Length}")
Else Else
LOGGER.Warn($"Reload_CurrentCockpitDefinition: Keine Daten gefunden für ID={pkId}") LOGGER.Warn($"Reload_CurrentCockpitDefinition: Keine Daten gefunden für ID={pkId}")
@@ -250,6 +251,8 @@ Public Class frmCockpitConfig
FROM [dbo].[TBTF_CFG_COCKPIT_DEFINITION] WITH (NOLOCK) WHERE FK_CFG_COCKPIT_ID = {Selected_Cockpit_ID} ORDER BY PARENT_ID " FROM [dbo].[TBTF_CFG_COCKPIT_DEFINITION] WITH (NOLOCK) WHERE FK_CFG_COCKPIT_ID = {Selected_Cockpit_ID} ORDER BY PARENT_ID "
Dim DT_CONFIG_DEF = DatabaseFallback.GetDatatableECM(oSQL) Dim DT_CONFIG_DEF = DatabaseFallback.GetDatatableECM(oSQL)
If Not IsNothing(DT_CONFIG_DEF) Then If Not IsNothing(DT_CONFIG_DEF) Then
TreeList_Cockpit.ClearNodes()
TreeList_Cockpit.DataSource = Nothing
' ===== NEUE DATATABLE MIT KORREKTEN TYPEN ERSTELLEN ===== ' ===== NEUE DATATABLE MIT KORREKTEN TYPEN ERSTELLEN =====
Dim cleanedTable As New DataTable() Dim cleanedTable As New DataTable()
cleanedTable.Columns.Add("PK_CFG_COCKPIT_DEFINITION_ID", GetType(Integer)) cleanedTable.Columns.Add("PK_CFG_COCKPIT_DEFINITION_ID", GetType(Integer))
@@ -323,10 +326,18 @@ Public Class frmCockpitConfig
CheckEdit_Cockpit_Active.Checked = LookUpEditCockpit.Properties.GetDataSourceValue("ACTIVE", LookUpEditCockpit.ItemIndex) CheckEdit_Cockpit_Active.Checked = LookUpEditCockpit.Properties.GetDataSourceValue("ACTIVE", LookUpEditCockpit.ItemIndex)
TextEditCockpit_Bez.Text = LookUpEditCockpit.Properties.GetDataSourceValue("NAME", LookUpEditCockpit.ItemIndex).ToString() TextEditCockpit_Bez.Text = LookUpEditCockpit.Properties.GetDataSourceValue("NAME", LookUpEditCockpit.ItemIndex).ToString()
Load_TBTF_CFG_COCKPIT_DEFINITION() Load_TBTF_CFG_COCKPIT_DEFINITION()
Load_Free_User_2_Cockpit()
Load_Assigned_User_2_Cockpit() Select Case XtraTabControl_UserGroup.SelectedTabPageIndex
Case 0
Load_Free_User_2_Cockpit()
Load_Assigned_User_2_Cockpit()
Case 1
Load_Free_Groups_2_Cockpit()
Load_Assigned_Groups_2_Cockpit()
End Select
Display_Added_Changed("Cockpit") Display_Added_Changed("Cockpit")
Enable_GrpCockpit()
Catch ex As Exception Catch ex As Exception
LOGGER.Error($"Error in LookUpEdit1_EditValueChanged: {ex.Message}") LOGGER.Error($"Error in LookUpEdit1_EditValueChanged: {ex.Message}")
End Try End Try
@@ -461,9 +472,9 @@ Public Class frmCockpitConfig
LookUpEditChart.EditValue = 0 LookUpEditChart.EditValue = 0
End If End If
If _currentCockpitDefinition.CFG_Sequence.HasValue Then If _currentCockpitDefinition.CFG_Sequence.HasValue Then
SpinEdit1.Value = _currentCockpitDefinition.CFG_Sequence.Value SpinEdit_sequence.Value = _currentCockpitDefinition.CFG_Sequence.Value
Else Else
SpinEdit1.Value = 0 SpinEdit_sequence.Value = 0
End If End If
If _currentCockpitDefinition.FK_MonitorID.HasValue Then If _currentCockpitDefinition.FK_MonitorID.HasValue Then
'LOGGER.Debug($"Attempting to set FK_MonitorID to: {_currentCockpitDefinition.FK_MonitorID.Value}") 'LOGGER.Debug($"Attempting to set FK_MonitorID to: {_currentCockpitDefinition.FK_MonitorID.Value}")
@@ -513,25 +524,24 @@ Public Class frmCockpitConfig
Case 0 ' Overview Case 0 ' Overview
bbtnSQL_Data.Visibility = DevExpress.XtraBars.BarItemVisibility.Always bbtnSQL_Data.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
bbtnSQL_Count.Visibility = DevExpress.XtraBars.BarItemVisibility.Always bbtnSQL_Count.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
bbtnitm_NodeOverviewAdd.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
bbtnitm_NodeProfilAdd.Visibility = DevExpress.XtraBars.BarItemVisibility.Always bbtnitm_NodeProfilAdd.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
LOGGER.Debug("Selected node is of type Overview - keine FK-Felder angezeigt") LOGGER.Debug("Selected node is of type Overview - keine FK-Felder angezeigt")
RbmPgGrp_Node.Enabled = True
Case 1 ' Profil Case 1 ' Profil
bbtnSQL_Data.Visibility = DevExpress.XtraBars.BarItemVisibility.Always bbtnSQL_Data.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
bbtnSQL_Count.Visibility = DevExpress.XtraBars.BarItemVisibility.Always bbtnSQL_Count.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
bbtnitm_NodeProfilAdd.Visibility = DevExpress.XtraBars.BarItemVisibility.Always bbtnitm_NodeProfilAdd.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
ProfileID_display(True) ProfileID_display(True)
LOGGER.Debug("Selected node is of type Profil - LookUpEditProfil angezeigt") LOGGER.Debug("Selected node is of type Profil - LookUpEditProfil angezeigt")
RbmPgGrp_Node.Enabled = True
Case 2 ' Monitor Case 2 ' Monitor
Monitor_display(True) Monitor_display(True)
LOGGER.Debug("Selected node is of type Monitor - LookUpEditMonitor angezeigt") LOGGER.Debug("Selected node is of type Monitor - LookUpEditMonitor angezeigt")
RbmPgGrp_Node.Enabled = True
Case 3 ' Chart Case 3 ' Chart
Chart_display(True) Chart_display(True)
LOGGER.Debug("Selected node is of type Chart - LookUpEditChart angezeigt") LOGGER.Debug("Selected node is of type Chart - LookUpEditChart angezeigt")
RbmPgGrp_Node.Enabled = True
Case Else Case Else
LOGGER.Warn($"Selected node has an unknown TYPE_ID: {_currentCockpitDefinition.TypeID.Value}") LOGGER.Warn($"Selected node has an unknown TYPE_ID: {_currentCockpitDefinition.TypeID.Value}")
End Select End Select
@@ -622,7 +632,8 @@ Public Class frmCockpitConfig
End Sub End Sub
Private Sub Load_Profile_LookUp() Private Sub Load_Profile_LookUp()
Try Try
Dim oSQL = "SELECT 0 GUID, '' NAME UNION SELECT GUID, NAME FROM TBPM_PROFILE WITH (NOLOCK)" Dim oSQL = "SELECT 0 GUID, '' NAME UNION SELECT GUID, CONVERT(VARCHAR(4),GUID) + ' - ' + NAME AS NAME
FROM TBPM_PROFILE WITH (NOLOCK) ORDER BY NAME"
Dim oDT = DatabaseFallback.GetDatatableECM(oSQL) Dim oDT = DatabaseFallback.GetDatatableECM(oSQL)
LookUpEditProfil.Properties.DataSource = oDT LookUpEditProfil.Properties.DataSource = oDT
@@ -736,14 +747,13 @@ Public Class frmCockpitConfig
Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnSQL_Count.ItemClick Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnSQL_Count.ItemClick
Try Try
Dim praefix As String = $"DECLARE @PROFILE_ID INT = {_currentCockpitDefinition.FK_ProfileID} --only for testing/runtime, removed while saving sql" & vbCrLf Dim oSQL = _currentCockpitDefinition.SQL_Query_Count
Dim oSQL = praefix & _currentCockpitDefinition.SQL_Query_Count
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {.SQLCommand = oSQL, .SQLConnection = 0} Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {.SQLCommand = oSQL, .SQLConnection = 0}
oForm.ShowDialog() oForm.ShowDialog()
If oForm.DialogResult = DialogResult.OK Then If oForm.DialogResult = DialogResult.OK Then
' ===== NUR IM OBJEKT SPEICHERN, NICHT IN DATENBANK ===== ' ===== NUR IM OBJEKT SPEICHERN, NICHT IN DATENBANK =====
_currentCockpitDefinition.SQL_Query_Count = oForm.SQLCommand.Replace(praefix, "") _currentCockpitDefinition.SQL_Query_Count = oForm.SQLCommand
LOGGER.Debug($"SQL_Query_Count updated in _currentCockpitDefinition - Length: {_currentCockpitDefinition.SQL_Query_Count.Length}") LOGGER.Debug($"SQL_Query_Count updated in _currentCockpitDefinition - Length: {_currentCockpitDefinition.SQL_Query_Count.Length}")
bsitm_info_Display("SQL_Query_Count aktualisiert (noch nicht gespeichert - bitte 'Speichern' klicken)") bsitm_info_Display("SQL_Query_Count aktualisiert (noch nicht gespeichert - bitte 'Speichern' klicken)")
@@ -756,14 +766,13 @@ Public Class frmCockpitConfig
Private Sub bbtnSQL_Data_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnSQL_Data.ItemClick Private Sub bbtnSQL_Data_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnSQL_Data.ItemClick
Try Try
Dim praefix As String = $"DECLARE @PROFILE_ID INT = {_currentCockpitDefinition.FK_ProfileID} --only for testing/runtime, removed while saving sql" & vbCrLf Dim oSQL = _currentCockpitDefinition.SQL_Query
Dim oSQL = praefix & _currentCockpitDefinition.SQL_Query
Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {.SQLCommand = oSQL, .SQLConnection = 0} Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {.SQLCommand = oSQL, .SQLConnection = 0}
oForm.ShowDialog() oForm.ShowDialog()
If oForm.DialogResult = DialogResult.OK Then If oForm.DialogResult = DialogResult.OK Then
' ===== NUR IM OBJEKT SPEICHERN, NICHT IN DATENBANK ===== ' ===== NUR IM OBJEKT SPEICHERN, NICHT IN DATENBANK =====
_currentCockpitDefinition.SQL_Query = oForm.SQLCommand.Replace(praefix, "") _currentCockpitDefinition.SQL_Query = oForm.SQLCommand
LOGGER.Debug($"SQL_Query updated in _currentCockpitDefinition - Length: {_currentCockpitDefinition.SQL_Query.Length}") LOGGER.Debug($"SQL_Query updated in _currentCockpitDefinition - Length: {_currentCockpitDefinition.SQL_Query.Length}")
bsitm_info_Display("SQL_Query aktualisiert (noch nicht gespeichert - bitte 'Speichern' klicken)") bsitm_info_Display("SQL_Query aktualisiert (noch nicht gespeichert - bitte 'Speichern' klicken)")
@@ -785,7 +794,7 @@ Public Class frmCockpitConfig
_currentCockpitDefinition.Active = CheckEdit_Active.Checked _currentCockpitDefinition.Active = CheckEdit_Active.Checked
_currentCockpitDefinition.Name = TextEdit_Bezeichnung.Text.Trim() _currentCockpitDefinition.Name = TextEdit_Bezeichnung.Text.Trim()
_currentCockpitDefinition.Comment = TextEdit_Comment.Text.Trim() _currentCockpitDefinition.Comment = TextEdit_Comment.Text.Trim()
_currentCockpitDefinition.CFG_Sequence = SpinEdit1.Value _currentCockpitDefinition.CFG_Sequence = SpinEdit_sequence.Value
' TYPE_ID ' TYPE_ID
If LookUpEditTypeID.EditValue IsNot Nothing AndAlso IsNumeric(LookUpEditTypeID.EditValue) Then If LookUpEditTypeID.EditValue IsNot Nothing AndAlso IsNumeric(LookUpEditTypeID.EditValue) Then
_currentCockpitDefinition.TypeID = CInt(LookUpEditTypeID.EditValue) _currentCockpitDefinition.TypeID = CInt(LookUpEditTypeID.EditValue)
@@ -866,45 +875,31 @@ Public Class frmCockpitConfig
WHERE PK_CFG_COCKPIT_DEFINITION_ID = {_currentCockpitDefinition.PK_CFG_COCKPIT_DEFINITION_ID}" WHERE PK_CFG_COCKPIT_DEFINITION_ID = {_currentCockpitDefinition.PK_CFG_COCKPIT_DEFINITION_ID}"
If DatabaseFallback.ExecuteNonQueryECM(updateSQL) Then If DatabaseFallback.ExecuteNonQueryECM(updateSQL) Then
' ===== AKTUELLEN KNOTEN IM TREEVIEW AKTUALISIEREN ===== Dim savedPK As Integer = _currentCockpitDefinition.PK_CFG_COCKPIT_DEFINITION_ID
Dim currentNode = TreeList_Cockpit.FocusedNode
If currentNode IsNot Nothing Then
' NAME aktualisieren
currentNode.SetValue("NAME", _currentCockpitDefinition.Name)
' ICON_ID aktualisieren wenn geändert ' ===== TREE NEU LADEN (erzwingt korrekte Reihenfolge) =====
Dim currentIconId As Object = currentNode.GetValue("ICON_ID") Load_TBTF_CFG_COCKPIT_DEFINITION()
Dim newIconId As Integer? = _currentCockpitDefinition.IconID
If (currentIconId Is Nothing OrElse IsDBNull(currentIconId)) AndAlso newIconId.HasValue Then ' ===== GESPEICHERTEN KNOTEN WIEDER FOKUSSIEREN =====
currentNode.SetValue("ICON_ID", newIconId.Value) Dim nodeList As New List(Of DevExpress.XtraTreeList.Nodes.TreeListNode)
LOGGER.Debug($"Icon aktualisiert: NULL -> {newIconId.Value}") CollectAllNodes(TreeList_Cockpit.Nodes, nodeList)
ElseIf currentIconId IsNot Nothing AndAlso Not IsDBNull(currentIconId) AndAlso newIconId.HasValue Then Dim targetNode = nodeList.FirstOrDefault(
If CInt(currentIconId) <> newIconId.Value Then Function(n)
currentNode.SetValue("ICON_ID", newIconId.Value) Dim pkObj As Object = n.GetValue("PK_CFG_COCKPIT_DEFINITION_ID")
LOGGER.Debug($"Icon aktualisiert: {currentIconId} -> {newIconId.Value}") Return pkObj IsNot Nothing AndAlso Not IsDBNull(pkObj) AndAlso CInt(pkObj) = savedPK
End If End Function)
ElseIf (currentIconId IsNot Nothing AndAlso Not IsDBNull(currentIconId)) AndAlso Not newIconId.HasValue Then
currentNode.SetValue("ICON_ID", DBNull.Value)
LOGGER.Debug($"Icon aktualisiert: {currentIconId} -> NULL")
End If
' ACTIVE-Status aktualisieren (für CustomDrawNodeCell) If targetNode IsNot Nothing Then
currentNode.SetValue("ACTIVE", _currentCockpitDefinition.Active) Load_CP_InAction = True
TreeList_Cockpit.FocusedNode = targetNode
' ===== SQL-FELDER IM TREEVIEW-KNOTEN AKTUALISIEREN ===== Load_CP_InAction = False
currentNode.SetValue("SQL_QUERY", _currentCockpitDefinition.SQL_Query) ' ===== FORMULARFELDER EXPLIZIT NEU LADEN =====
currentNode.SetValue("SQL_QUERY_COUNT", _currentCockpitDefinition.SQL_Query_Count) ProcessTreeListNodeAsync(targetNode)
currentNode.SetValue("CFG_SEQUENCE", _currentCockpitDefinition.CFG_Sequence)
LOGGER.Debug($"TreeView SQL fields updated - SQL_Query length: {_currentCockpitDefinition.SQL_Query.Length}, SQL_Query_Count length: {_currentCockpitDefinition.SQL_Query_Count.Length}")
' TreeView visuell aktualisieren
TreeList_Cockpit.RefreshNode(currentNode)
End If End If
Reload_CurrentCockpitDefinition() Reload_CurrentCockpitDefinition()
MsgBox("Node definition saved successfully.", MsgBoxStyle.Information) MsgBox("Node definition saved successfully.", MsgBoxStyle.Information)
LOGGER.Debug($"Saved node definition ID={_currentCockpitDefinition.PK_CFG_COCKPIT_DEFINITION_ID}, Name={_currentCockpitDefinition.Name}") LOGGER.Debug($"Saved node definition ID={savedPK}, Name={_currentCockpitDefinition.Name}")
Else Else
MsgBox("Error saving node definition. No rows were updated.", MsgBoxStyle.Exclamation) MsgBox("Error saving node definition. No rows were updated.", MsgBoxStyle.Exclamation)
LOGGER.Warn($"No rows updated for PK_CFG_COCKPIT_DEFINITION_ID={_currentCockpitDefinition.PK_CFG_COCKPIT_DEFINITION_ID}") LOGGER.Warn($"No rows updated for PK_CFG_COCKPIT_DEFINITION_ID={_currentCockpitDefinition.PK_CFG_COCKPIT_DEFINITION_ID}")
@@ -1219,7 +1214,7 @@ Public Class frmCockpitConfig
TBTF_MAP_COCKPIT CP_MAP (NOLOCK) TBTF_MAP_COCKPIT CP_MAP (NOLOCK)
WHERE WHERE
CP_MAP.FK_CFG_COCKPIT_ID = {Selected_Cockpit_ID} AND CP_MAP.FK_CFG_GROUP_ID IS NOT NULL) CP_MAP.FK_CFG_COCKPIT_ID = {Selected_Cockpit_ID} AND CP_MAP.FK_CFG_GROUP_ID IS NOT NULL)
ORDER BY [Groupname]" ORDER BY INTERNAL DESC, [Groupname]"
Dim oDT As DataTable = DatabaseFallback.GetDatatableECM(oSQL) Dim oDT As DataTable = DatabaseFallback.GetDatatableECM(oSQL)
ViewAvailableGroups.Columns.Clear() ViewAvailableGroups.Columns.Clear()
GridAvailableGroups.DataSource = oDT GridAvailableGroups.DataSource = oDT
@@ -1615,8 +1610,8 @@ Public Class frmCockpitConfig
MsgBox(ex.Message, MsgBoxStyle.Critical, "Error removing group:") MsgBox(ex.Message, MsgBoxStyle.Critical, "Error removing group:")
End Try End Try
End Sub End Sub
Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl_UserGroup.SelectedPageChanged
Select Case XtraTabControl1.SelectedTabPageIndex Select Case XtraTabControl_UserGroup.SelectedTabPageIndex
Case 0 Case 0
Load_Assigned_User_2_Cockpit() Load_Assigned_User_2_Cockpit()
Load_Free_User_2_Cockpit() Load_Free_User_2_Cockpit()
@@ -1666,6 +1661,8 @@ Public Class frmCockpitConfig
Load_CFG_COCKPIT() Load_CFG_COCKPIT()
MsgBox("Neues Cockpit erfolgreich angelegt und inaktiviert. Bitte wählen Sie es aus, um weitere Einstellungen vorzunehmen." & vbCrLf & MsgBox("Neues Cockpit erfolgreich angelegt und inaktiviert. Bitte wählen Sie es aus, um weitere Einstellungen vorzunehmen." & vbCrLf &
"Ein Overview-Knoten wurde ebenso angelegt!", MsgBoxStyle.Information) "Ein Overview-Knoten wurde ebenso angelegt!", MsgBoxStyle.Information)
Enable_GrpNode()
Else Else
MsgBox("Fehler beim Anlegen des Cockpits. Prüfen Sie Ihr Log", MsgBoxStyle.Exclamation) MsgBox("Fehler beim Anlegen des Cockpits. Prüfen Sie Ihr Log", MsgBoxStyle.Exclamation)
LOGGER.Error("bbtnitm_AddCockpit_ItemClick: Insert returned no ID or invalid ID") LOGGER.Error("bbtnitm_AddCockpit_ItemClick: Insert returned no ID or invalid ID")
@@ -1817,7 +1814,7 @@ Public Class frmCockpitConfig
End If End If
Enable_GrpCockpit() Enable_GrpCockpit()
End Sub End Sub
Private Sub SpinEdit1_EditValueChanged(sender As Object, e As EventArgs) Handles SpinEdit1.EditValueChanged Private Sub SpinEdit1_EditValueChanged(sender As Object, e As EventArgs) Handles SpinEdit_sequence.EditValueChanged
If Load_CP_InAction Or Node_change_inAction Then If Load_CP_InAction Or Node_change_inAction Then
Exit Sub Exit Sub
End If End If

View File

@@ -259,6 +259,7 @@ Public Class frmMain
Dim oCultureInfo As System.Globalization.CultureInfo Dim oCultureInfo As System.Globalization.CultureInfo
oCultureInfo = New System.Globalization.CultureInfo(USER_LANGUAGE) oCultureInfo = New System.Globalization.CultureInfo(USER_LANGUAGE)
oCultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT oCultureInfo.DateTimeFormat.ShortDatePattern = USER_DATE_FORMAT
Thread.CurrentThread.CurrentCulture = oCultureInfo Thread.CurrentThread.CurrentCulture = oCultureInfo
Thread.CurrentThread.CurrentUICulture = oCultureInfo Thread.CurrentThread.CurrentUICulture = oCultureInfo
CultureInfo.DefaultThreadCurrentCulture = oCultureInfo CultureInfo.DefaultThreadCurrentCulture = oCultureInfo
@@ -693,11 +694,11 @@ Public Class frmMain
LOGGER.Debug($"AppendCountsToTreeAsync: {_emptyNodeCount} node(s) with Count=0 stored in class variable") LOGGER.Debug($"AppendCountsToTreeAsync: {_emptyNodeCount} node(s) with Count=0 stored in class variable")
LOGGER.Debug("AppendCountsToTreeAsync: Finished") LOGGER.Debug("AppendCountsToTreeAsync: Finished")
Decide_Show_Empty_Workflows(Not CONFIG.Config.Hide_Empty_Workflows) Decide_Show_Empty_Workflows(Not CONFIG.Config.Hide_Empty_Workflows)
If _emptyNodeCount > 0 Then 'If _emptyNodeCount > 0 Then
Bchkitm_load_empty_wf.Visibility = DevExpress.XtraBars.BarItemVisibility.Never ' Bchkitm_load_empty_wf.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
Else 'Else
Bchkitm_load_empty_wf.Visibility = DevExpress.XtraBars.BarItemVisibility.Always ' Bchkitm_load_empty_wf.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
End If 'End If
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex) LOGGER.Error(ex)
End Try End Try
@@ -1246,7 +1247,8 @@ Public Class frmMain
oSQL = oSQL.Replace("@MACHINE_NAME", System.Environment.MachineName) oSQL = oSQL.Replace("@MACHINE_NAME", System.Environment.MachineName)
oSQL = oSQL.Replace("@DATE", Now.ToShortDateString) oSQL = oSQL.Replace("@DATE", Now.ToShortDateString)
oSQL = oSQL.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID) oSQL = oSQL.Replace("@PROFILE_ID", CURRENT_CLICKED_PROFILE_ID)
oSQL = oSQL.Replace("{#USER#PROFILE_ID}", CURRENT_CLICKED_PROFILE_ID.ToString())
oSQL = oSQL.Replace("{#USER#PROFIL_ID}", CURRENT_CLICKED_PROFILE_ID.ToString())
DT_CURR_WF_ITEMS = Await DatabaseFallback.GetDatatableECMAsync(oSQL) DT_CURR_WF_ITEMS = Await DatabaseFallback.GetDatatableECMAsync(oSQL)
If IsNothing(DT_CURR_WF_ITEMS) Then If IsNothing(DT_CURR_WF_ITEMS) Then
@@ -2008,6 +2010,8 @@ Public Class frmMain
End If End If
oSQL = oSQL.Replace("@PROFILE_ID", oProfileID) oSQL = oSQL.Replace("@PROFILE_ID", oProfileID)
oSQL = oSQL.Replace("@PROFIL_ID", oProfileID) oSQL = oSQL.Replace("@PROFIL_ID", oProfileID)
oSQL = oSQL.Replace("{#USER#PROFILE_ID}", oProfileID)
oSQL = oSQL.Replace("{#USER#PROFIL_ID}", oProfileID)
Return oSQL Return oSQL
End Function End Function
@@ -4227,6 +4231,13 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
Timer_Inactivity_Reset_Disable("frmMonitor") Timer_Inactivity_Reset_Disable("frmMonitor")
Exit Sub Exit Sub
End If End If
If Application.OpenForms().OfType(Of frmCockpitConfig).Any Then
bsiMessage.Caption = "Cockpit Configuration open - no Inactivity-Logout"
bsiMessage.ItemAppearance.Normal.BackColor = Color.Yellow
bsiMessage.ItemAppearance.Normal.ForeColor = Color.Black
Timer_Inactivity_Reset_Disable("frmCockpitConfig")
Exit Sub
End If
If GHOSTMODE_ACTIVE And USER_GHOST_MODE_ACTIVE Then If GHOSTMODE_ACTIVE And USER_GHOST_MODE_ACTIVE Then
bsiMessage.Caption = "GhostMode Active - no Inactivity-Logout" bsiMessage.Caption = "GhostMode Active - no Inactivity-Logout"
bsiMessage.ItemAppearance.Normal.BackColor = Color.Yellow bsiMessage.ItemAppearance.Normal.BackColor = Color.Yellow

View File

@@ -7,6 +7,7 @@
<package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net462" /> <package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net462" />
<package id="GdPicture" version="14.4.4" targetFramework="net462" /> <package id="GdPicture" version="14.4.4" targetFramework="net462" />
<package id="GdPicture.runtimes.windows" version="14.4.4" targetFramework="net462" /> <package id="GdPicture.runtimes.windows" version="14.4.4" targetFramework="net462" />
<package id="GdPicture.WinForms" version="14.4.4" targetFramework="net462" />
<package id="Google.Protobuf" version="3.33.2" targetFramework="net462" /> <package id="Google.Protobuf" version="3.33.2" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" /> <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="10.0.9" targetFramework="net462" /> <package id="Microsoft.Bcl.AsyncInterfaces" version="10.0.9" targetFramework="net462" />