diff --git a/app/DD_PM_WINDREAM/App.config b/app/DD_PM_WINDREAM/App.config
index d3c8393..bf84d37 100644
--- a/app/DD_PM_WINDREAM/App.config
+++ b/app/DD_PM_WINDREAM/App.config
@@ -6,11 +6,10 @@
-
+
-
+
diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb
index 94e3906..d078210 100644
--- a/app/DD_PM_WINDREAM/ClassControlCreator.vb
+++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb
@@ -1,4 +1,5 @@
Imports DD_LIB_Standards
+Imports DigitalData.Controls.LookupGrid
Public Class ClassControlCreator
@@ -78,7 +79,7 @@ Public Class ClassControlCreator
Public Shared Function CreateNewTextBox(location As Point) As TextBox
Dim control As New TextBox With {
- .Name = $"{PREFIX_TEXTBOX}_{clsTools.ShortGUID()}",
+ .Name = $"{PREFIX_TEXTBOX}_{clsTools.ShortGuid()}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
.Location = location,
.ReadOnly = True,
@@ -91,7 +92,7 @@ Public Class ClassControlCreator
Public Shared Function CreateNewLabel(location As Point) As Label
Dim control As New Label With {
- .Name = $"{PREFIX_LABEL}_{clsTools.ShortGUID}",
+ .Name = $"{PREFIX_LABEL}_{clsTools.ShortGuid}",
.Text = DEFAULT_TEXT,
.AutoSize = True,
.Location = location,
@@ -103,7 +104,7 @@ Public Class ClassControlCreator
Public Shared Function CreateNewCheckbox(location As Point) As CheckBox
Dim control As New CheckBox With {
- .Name = $"{PREFIX_CHECKBOX}_{clsTools.ShortGUID}",
+ .Name = $"{PREFIX_CHECKBOX}_{clsTools.ShortGuid}",
.AutoSize = True,
.Text = DEFAULT_TEXT,
.Cursor = Cursors.Hand,
@@ -115,7 +116,7 @@ Public Class ClassControlCreator
Public Shared Function CreateNewCombobox(location As Point) As ComboBox
Dim control As New ComboBox With {
- .Name = $"{PREFIX_COMBOBOX}_{clsTools.ShortGUID}",
+ .Name = $"{PREFIX_COMBOBOX}_{clsTools.ShortGuid}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
.Cursor = Cursors.Hand,
.Location = location
@@ -126,7 +127,7 @@ Public Class ClassControlCreator
Public Shared Function CreateNewDatetimepicker(location As Point) As DateTimePicker
Dim control As New DateTimePicker With {
- .Name = $"{PREFIX_DATETIMEPICKER}_{clsTools.ShortGUID}",
+ .Name = $"{PREFIX_DATETIMEPICKER}_{clsTools.ShortGuid}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
.Cursor = Cursors.Hand,
.Location = location,
@@ -138,7 +139,7 @@ Public Class ClassControlCreator
Public Shared Function CreateNewDatagridview(location As Point) As DataGridView
Dim control As New DataGridView With {
- .Name = $"{PREFIX_DATAGRIDVIEW}_{clsTools.ShortGUID}",
+ .Name = $"{PREFIX_DATAGRIDVIEW}_{clsTools.ShortGuid}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE),
.Cursor = Cursors.Hand,
.Location = location,
@@ -156,9 +157,21 @@ Public Class ClassControlCreator
Return control
End Function
+ Friend Shared Function CreateNewLookupControl(location As Point) As LookupControl
+ Dim control As New LookupControl With {
+ .Name = $"{PREFIX_DATAGRIDVIEW}_{clsTools.ShortGuid}",
+ .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
+ .Cursor = Cursors.Hand,
+ .Location = location
+ }
+
+ Return control
+ End Function
+
+
Public Shared Function CreateNewTable(location As Point) As DataGridView
Dim control As New DataGridView With {
- .Name = $"{PREFIX_TABLE}_{clsTools.ShortGUID}",
+ .Name = $"{PREFIX_TABLE}_{clsTools.ShortGuid}",
.Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE),
.Cursor = Cursors.Hand,
.Location = location,
@@ -183,7 +196,7 @@ Public Class ClassControlCreator
Public Shared Function CreateNewLine(location As Point) As LineLabel
Dim control As New LineLabel With {
- .Name = $"{PREFIX_LINE}_{clsTools.ShortGUID}",
+ .Name = $"{PREFIX_LINE}_{clsTools.ShortGuid}",
.Text = "---------------------------------",
.Size = New Size(100, 5),
.Location = location
@@ -296,6 +309,16 @@ Public Class ClassControlCreator
Return control
End Function
+ Public Shared Function CreateExistingLookupControl(row As DataRow, designMode As Boolean)
+ Dim control As LookupControl = CreateBaseControl(New LookupControl(), row, designMode)
+
+ If designMode Then
+ control.Cursor = Cursors.Hand
+ End If
+
+ Return control
+ End Function
+
Public Shared Function CreateExistingTable(row As DataRow, columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow), designMode As Boolean) As DataGridView
Dim control As DataGridView = CreateBaseControl(New DataGridView(), row, designMode)
@@ -402,6 +425,7 @@ Public Class ClassControlCreator
Return 0
End Try
End Function
+
Public Shared Function GET_CONNECTION_INFO(CON_ID As Integer)
Try
diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
index b08eea9..3d6cf19 100644
--- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
+++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
@@ -13,7 +13,7 @@
DD_PM_WINDREAM
512
WindowsForms
- v4.5.1
+ v4.6.1
@@ -60,58 +60,63 @@
False
P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll
-
-
+
False
- D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll
+ D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Charts.v18.1.Core.dll
-
+
+
False
- D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Images.v15.2.dll
+ D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Images.v18.1.dll
-
+
False
- D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll
+ D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Pdf.v18.1.Drawing.dll
-
+
+
+
False
- D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll
+ D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.Xpf.PdfViewer.v18.1.dll
-
+
False
- D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll
+ D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraBars.v18.1.dll
-
+
False
- D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.dll
+ D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraCharts.v18.1.dll
-
-
-
-
+
False
- D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll
+ D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraCharts.v18.1.Extensions.dll
-
+
False
- D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll
+ D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraCharts.v18.1.UI.dll
-
+
False
- D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll
+ D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraCharts.v18.1.Wizard.dll
-
-
+
+
+
+
False
- D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPdfViewer.v15.2.dll
+ D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraNavBar.v18.1.dll
-
+
False
- D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraPrinting.v15.2.dll
+ D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraPdfViewer.v18.1.dll
-
+
+
False
- D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraTreeList.v15.2.dll
+ D:\ProgramFiles\DevExpress 18.1\Components\Bin\Framework\DevExpress.XtraTreeList.v18.1.dll
+
+
+ ..\..\..\DDMonorepo\LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll
P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll
diff --git a/app/DD_PM_WINDREAM/My Project/licenses.licx b/app/DD_PM_WINDREAM/My Project/licenses.licx
index c24b7bc..6aa5a0a 100644
--- a/app/DD_PM_WINDREAM/My Project/licenses.licx
+++ b/app/DD_PM_WINDREAM/My Project/licenses.licx
@@ -1,7 +1,8 @@
-DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraPdfViewer.PdfViewer, DevExpress.XtraPdfViewer.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraCharts.ChartControl, DevExpress.XtraCharts.v15.2.UI, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
index fc42182..2689266 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
@@ -418,6 +418,7 @@ Partial Class frmFormDesigner
'TableAdapterManager
'
Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
+ Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing
Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing
Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb
index b06803a..bc21f6f 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb
@@ -1,5 +1,6 @@
Imports System.ComponentModel
Imports DD_LIB_Standards
+Imports DigitalData.Controls.LookupGrid
Public Class frmFormDesigner
Public ProfileId As Integer
@@ -175,6 +176,11 @@ Public Class frmFormDesigner
pnldesigner.Controls.Add(table)
SetMovementHandlers(table)
+ Case "LOOKUP"
+ Dim lookup = ClassControlCreator.CreateExistingLookupControl(row, True)
+ pnldesigner.Controls.Add(lookup)
+ SetMovementHandlers(lookup)
+
Case "LINE"
Dim line = ClassControlCreator.CreateExistingLine(row, True)
pnldesigner.Controls.Add(line)
@@ -290,16 +296,32 @@ Public Class frmFormDesigner
pnldesigner.Controls.Add(chk)
+ 'Case ClassControlCreator.PREFIX_DATAGRIDVIEW
+ ' Dim dgv = ClassControlCreator.CreateNewDatagridview(cursorPosition)
+ ' SetMovementHandlers(dgv)
+
+ ' TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dgv.Name, "DGV", dgv.Name, dgv.Location.X, dgv.Location.Y, Environment.UserName, dgv.Size.Height, dgv.Size.Width)
+
+ ' CurrentControl = dgv
+ ' CurrentControl.Tag = GetLastID()
+
+ ' pnldesigner.Controls.Add(dgv)
+
Case ClassControlCreator.PREFIX_DATAGRIDVIEW
- Dim dgv = ClassControlCreator.CreateNewDatagridview(cursorPosition)
- SetMovementHandlers(dgv)
+ Dim lc As LookupControl = ClassControlCreator.CreateNewLookupControl(cursorPosition)
- TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dgv.Name, "DGV", dgv.Name, dgv.Location.X, dgv.Location.Y, Environment.UserName, dgv.Size.Height, dgv.Size.Width)
+ SetMovementHandlers(lc)
- CurrentControl = dgv
+ AddHandler lc.Click, Sub()
+ 'noop
+ End Sub
+
+ TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, lc.Name, "LOOKUP", lc.Name, lc.Location.X, lc.Location.Y, Environment.UserName, lc.Size.Height, lc.Size.Width)
+
+ CurrentControl = lc
CurrentControl.Tag = GetLastID()
- pnldesigner.Controls.Add(dgv)
+ pnldesigner.Controls.Add(lc)
Case ClassControlCreator.PREFIX_TABLE
Dim tb = ClassControlCreator.CreateNewTable(cursorPosition)
@@ -688,11 +710,18 @@ Public Class frmFormDesigner
Dim dtpProps As DatepickerProperties = CreatePropsObjectWithIndicies(New DatepickerProperties, row, Windream_AllIndicies)
props = dtpProps
- ElseIf TypeOf sender Is DataGridView Then
- Dim grid As DataGridView = sender
+ 'ElseIf TypeOf sender Is DataGridView Then
+ ' Dim grid As DataGridView = sender
+ ' Dim gridProps As GridViewProperties = CreatePropsObjectWithIndicies(New GridViewProperties, row, Windream_VectorIndicies)
+
+ ' props = gridProps
+
+ ElseIf TypeOf sender Is LookupControl Then
+ Dim grid As LookupControl = sender
Dim gridProps As GridViewProperties = CreatePropsObjectWithIndicies(New GridViewProperties, row, Windream_VectorIndicies)
props = gridProps
+
Else
MsgBox("This is not a supported control type!")
Exit Sub