diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb
index 09ee1da..83adc5d 100644
--- a/app/DD-Record-Organizer/frmConstructor_Main.vb
+++ b/app/DD-Record-Organizer/frmConstructor_Main.vb
@@ -67,7 +67,8 @@ Public Class frmConstructor_Main
Private DT_ADDING_USERS As DataTable
- Private DT_CONTROL_SCREEN As DataTable
+ Private DT_CONTROL_SCREEN_SHOW_COL_0 As DataTable
+ Private DT_VWPMO_CONTROL_SCREEN As DataTable
Private TREEVIEW_IMAGELIST As ImageList
Private NODE_NAVIGATION As Boolean = False
Private NODE_NAVIGATION_LOADED As Boolean = False
@@ -372,7 +373,8 @@ Public Class frmConstructor_Main
DT_CONSTRUCT_VIEW = ClassDatabase.Return_Datatable("SELECT * FROM TBPMO_FORM_CONSTRUCTOR WHERE GUID = " & CONSTRUCTORID)
Dim SEL1 = String.Format("SELECT * FROM TBPMO_FORM WHERE GUID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE SCREEN_ID = {0} AND CONSTRUCT_ID = {1})", CURRENT_SCREEN_ID, CONSTRUCTORID)
DT_ENTITY_DATA = ClassDatabase.Return_Datatable(SEL1, True)
- DT_CONTROL_SCREEN = ClassDatabase.Return_Datatable("SELECT FORM_ID, CONTROL_ID, CONTROL_COL_NAME, CONTROL_SHOW_COLUMN FROM VWPMO_CONTROL_SCREEN WHERE CONTROL_SHOW_COLUMN = 0", True)
+ DT_CONTROL_SCREEN_SHOW_COL_0 = ClassDatabase.Return_Datatable("SELECT FORM_ID, CONTROL_ID, CONTROL_COL_NAME, CONTROL_SHOW_COLUMN FROM VWPMO_CONTROL_SCREEN WHERE CONTROL_SHOW_COLUMN = 0", True)
+ DT_VWPMO_CONTROL_SCREEN = ClassDatabase.Return_Datatable("SELECT * FROM VWPMO_CONTROL_SCREEN", True)
If DT_CONSTRUCT_VIEW.Rows.Count = 1 Then
'Load Input Grid
Me.Text = DT_CONSTRUCT_VIEW.Rows(0).Item("FORM_TITLE")
@@ -2096,14 +2098,13 @@ Public Class frmConstructor_Main
Me.Cursor = Cursors.WaitCursor
RECORD_CHANGED = False
RECORD_ID = 0
- 'Setzen von Rechten
+ Dim expression As String
- 'VerknüpfungenToolStripMenuItem.Enabled = False
Dim sql = "SELECT CONTROL_ID, CONTROL_READ_ONLY FROM VWPMO_CONTROL_SCREEN WHERE CTRLTYPE_ID NOT IN (1) AND CONTROL_ENTITY_ID = " & ENTITY_ID
DT_CONTROLS_ENTITY = ClassDatabase.Return_Datatable(sql, True)
-
+
COUNT_RO_CONTROLS = 0
- Dim expression As String
+
expression = "CONTROL_READ_ONLY = " & 1
Dim CONTROLS_ROW() As DataRow
CONTROLS_ROW = DT_CONTROLS_ENTITY.Select(expression)
@@ -2901,7 +2902,7 @@ Public Class frmConstructor_Main
expression = "FORM_ID = " & ENTITY_ID
Dim foundRowsLevel0() As DataRow
' Use the Select method to find all rows matching the filter.
- foundRowsLevel0 = DT_CONTROL_SCREEN.Select(expression)
+ foundRowsLevel0 = DT_CONTROL_SCREEN_SHOW_COL_0.Select(expression)
Dim i As Integer
' Dim DT As DataTable = ClassDatabase.Return_Datatable(SQL)
diff --git a/app/DD-Record-Organizer/frmMain.Designer.vb b/app/DD-Record-Organizer/frmMain.Designer.vb
index 077ab2b..0384232 100644
--- a/app/DD-Record-Organizer/frmMain.Designer.vb
+++ b/app/DD-Record-Organizer/frmMain.Designer.vb
@@ -574,6 +574,7 @@ Partial Class frmMain
'groupQuickAccessForm
'
Me.groupQuickAccessForm.AllowTextClipping = False
+ Me.groupQuickAccessForm.KeyTip = "V"
Me.groupQuickAccessForm.Name = "groupQuickAccessForm"
resources.ApplyResources(Me.groupQuickAccessForm, "groupQuickAccessForm")
'
diff --git a/app/DD-Record-Organizer/frmMain.resx b/app/DD-Record-Organizer/frmMain.resx
index 51e1028..a4a9bd5 100644
--- a/app/DD-Record-Organizer/frmMain.resx
+++ b/app/DD-Record-Organizer/frmMain.resx
@@ -124,6 +124,18 @@
17, 56
+
+ 165, 22
+
+
+ ADDI beenden
+
+
+ 165, 22
+
+
+ Cockpit anzeigen
+
166, 48
@@ -1032,18 +1044,6 @@
True
-
- 165, 22
-
-
- ADDI beenden
-
-
- 165, 22
-
-
- Cockpit anzeigen
-
1208, 17
@@ -2626,12 +2626,24 @@
RibbonPageCategory1
+
+ Kalender
+
+
+ Views/Sichten
+
+
+ Weitere Views
+
Home
Yellow
+
+ Views/Sichten
+
Weitere Sichten
@@ -2651,13 +2663,13 @@
Administration
- 1468, 150
+ 1476, 150
- 0, 779
+ 0, 783
- 1468, 23
+ 1476, 23
RibbonStatusBar1
@@ -2683,18 +2695,6 @@
4
-
- Kalender
-
-
- Views/Sichten
-
-
- Weitere Views
-
-
- Views/Sichten
-
242, 17
@@ -2738,7 +2738,7 @@
6, 13
- 1468, 802
+ 1476, 806
Segoe UI, 8.25pt