diff --git a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj
index 30dc83b..c93a2a7 100644
--- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj
+++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj
@@ -234,10 +234,10 @@
-
- AboutBox1.vb
+
+ frmAbout.vb
-
+
Form
@@ -539,8 +539,8 @@
-
- AboutBox1.vb
+
+ frmAbout.vb
frmConfiguration_Basic.vb
diff --git a/app/DD-Record-Organiser/XtraForm2.vb b/app/DD-Record-Organiser/XtraForm2.vb
index 4e4e925..4c03da4 100644
--- a/app/DD-Record-Organiser/XtraForm2.vb
+++ b/app/DD-Record-Organiser/XtraForm2.vb
@@ -437,9 +437,15 @@ Public Class frmConstructor_Main
PARENT_RECORDID = EBENE1_RECID
CURRENT_PARENTID = EBENE1_RECID
_sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId))
- _sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
- _sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
- _sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
+ If GRID_TYPE = GridType.Grid Then
+
+ Else
+
+ _sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
+ _sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
+ _sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
+ End If
+
End If
'tslblEntity3.Visible = False
Select Case CURRENT_FORM_TYPE
@@ -454,12 +460,18 @@ Public Class frmConstructor_Main
EBENE3_COLUMNNAME = ""
'Wenn bereits ein Record für Ebene 1 gewählt wurde dann einschränken
If EBENE1_RECID > 0 Then
- '_sql = ClassDatabase.Execute_Scalar("SELECT SQL_QUICK_VIEW FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FormId)
_sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId))
- _sql = _sql.Replace("@RecordID", EBENE1_RECID)
- _sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
- _sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
- _sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
+ If GRID_TYPE = GridType.Grid Then
+
+ Else
+ '_sql = ClassDatabase.Execute_Scalar("SELECT SQL_QUICK_VIEW FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FormId)
+
+ _sql = _sql.Replace("@RecordID", EBENE1_RECID)
+ _sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
+ _sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
+ _sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
+ End If
+
Else
_sql = ClassDatabase.Execute_Scalar("SELECT SQL_QUICK_VIEW FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FormId)
End If
@@ -494,11 +506,18 @@ Public Class frmConstructor_Main
If EBENE2_RECID > 0 Then
Try
_sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId))
- _sql = _sql.Replace("@RecordID", EBENE2_RECID)
- _sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
- _sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
- _sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
+ If GRID_TYPE = GridType.Grid Then
+ Else
+
+ _sql = _sql.Replace("@RecordID", EBENE2_RECID)
+ _sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
+ _sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
+ _sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
+
+ End If
+
+
Catch ex As Exception
diff --git a/app/DD-Record-Organiser/frmAbout.Designer.vb b/app/DD-Record-Organiser/frmAbout.Designer.vb
index 2f2bcd3..f31b77f 100644
--- a/app/DD-Record-Organiser/frmAbout.Designer.vb
+++ b/app/DD-Record-Organiser/frmAbout.Designer.vb
@@ -26,22 +26,21 @@ Partial Class frmAbout
Private Sub InitializeComponent()
Me.OKButton = New System.Windows.Forms.Button()
Me.PictureBox1 = New System.Windows.Forms.PictureBox()
- Me.lblProductname = New System.Windows.Forms.Label()
+ Me.lblProduktname = New System.Windows.Forms.Label()
Me.lblVersion = New System.Windows.Forms.Label()
Me.lblCompanyName = New System.Windows.Forms.Label()
Me.txtDescription = New System.Windows.Forms.TextBox()
Me.LinkLabel1 = New System.Windows.Forms.LinkLabel()
- Me.LinkLabel3 = New System.Windows.Forms.LinkLabel()
+ Me.LinkLabel2 = New System.Windows.Forms.LinkLabel()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'OKButton
'
- Me.OKButton.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.OKButton.DialogResult = System.Windows.Forms.DialogResult.Cancel
- Me.OKButton.Location = New System.Drawing.Point(327, 272)
+ Me.OKButton.Location = New System.Drawing.Point(281, 242)
Me.OKButton.Name = "OKButton"
- Me.OKButton.Size = New System.Drawing.Size(252, 26)
+ Me.OKButton.Size = New System.Drawing.Size(260, 23)
Me.OKButton.TabIndex = 0
Me.OKButton.Text = "&OK"
'
@@ -49,86 +48,84 @@ Partial Class frmAbout
'
Me.PictureBox1.BackgroundImage = Global.DD_Record_Organiser.My.Resources.Resources.DD_Icons_ADDI
Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
- Me.PictureBox1.InitialImage = Global.DD_Record_Organiser.My.Resources.Resources.DD_Icons_ADDI
- Me.PictureBox1.Location = New System.Drawing.Point(-1, 1)
+ Me.PictureBox1.Location = New System.Drawing.Point(2, 1)
Me.PictureBox1.Name = "PictureBox1"
- Me.PictureBox1.Size = New System.Drawing.Size(307, 297)
- Me.PictureBox1.TabIndex = 2
+ Me.PictureBox1.Size = New System.Drawing.Size(267, 264)
+ Me.PictureBox1.TabIndex = 1
Me.PictureBox1.TabStop = False
'
- 'lblProductname
+ 'lblProduktname
'
- Me.lblProductname.AutoSize = True
- Me.lblProductname.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.lblProductname.Location = New System.Drawing.Point(324, 37)
- Me.lblProductname.Name = "lblProductname"
- Me.lblProductname.Size = New System.Drawing.Size(43, 15)
- Me.lblProductname.TabIndex = 3
- Me.lblProductname.Text = "Label1"
+ Me.lblProduktname.AutoSize = True
+ Me.lblProduktname.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.lblProduktname.Location = New System.Drawing.Point(278, 9)
+ Me.lblProduktname.Name = "lblProduktname"
+ Me.lblProduktname.Size = New System.Drawing.Size(48, 17)
+ Me.lblProduktname.TabIndex = 2
+ Me.lblProduktname.Text = "Label1"
'
'lblVersion
'
Me.lblVersion.AutoSize = True
- Me.lblVersion.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.lblVersion.Location = New System.Drawing.Point(324, 61)
+ Me.lblVersion.Location = New System.Drawing.Point(278, 35)
Me.lblVersion.Name = "lblVersion"
Me.lblVersion.Size = New System.Drawing.Size(40, 13)
- Me.lblVersion.TabIndex = 4
+ Me.lblVersion.TabIndex = 3
Me.lblVersion.Text = "Label1"
'
'lblCompanyName
'
Me.lblCompanyName.AutoSize = True
- Me.lblCompanyName.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.lblCompanyName.Location = New System.Drawing.Point(324, 83)
+ Me.lblCompanyName.Location = New System.Drawing.Point(278, 58)
Me.lblCompanyName.Name = "lblCompanyName"
Me.lblCompanyName.Size = New System.Drawing.Size(40, 13)
- Me.lblCompanyName.TabIndex = 5
+ Me.lblCompanyName.TabIndex = 4
Me.lblCompanyName.Text = "Label1"
'
'txtDescription
'
Me.txtDescription.BackColor = System.Drawing.SystemColors.Control
- Me.txtDescription.Location = New System.Drawing.Point(327, 159)
+ Me.txtDescription.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+ Me.txtDescription.Location = New System.Drawing.Point(281, 85)
Me.txtDescription.Multiline = True
Me.txtDescription.Name = "txtDescription"
Me.txtDescription.ScrollBars = System.Windows.Forms.ScrollBars.Vertical
- Me.txtDescription.Size = New System.Drawing.Size(252, 107)
- Me.txtDescription.TabIndex = 6
+ Me.txtDescription.Size = New System.Drawing.Size(260, 103)
+ Me.txtDescription.TabIndex = 5
'
'LinkLabel1
'
Me.LinkLabel1.AutoSize = True
- Me.LinkLabel1.Location = New System.Drawing.Point(324, 105)
+ Me.LinkLabel1.Location = New System.Drawing.Point(278, 200)
Me.LinkLabel1.Name = "LinkLabel1"
Me.LinkLabel1.Size = New System.Drawing.Size(93, 13)
- Me.LinkLabel1.TabIndex = 7
+ Me.LinkLabel1.TabIndex = 6
Me.LinkLabel1.TabStop = True
Me.LinkLabel1.Text = "www.didalog.de"
'
- 'LinkLabel3
+ 'LinkLabel2
'
- Me.LinkLabel3.AutoSize = True
- Me.LinkLabel3.Location = New System.Drawing.Point(324, 128)
- Me.LinkLabel3.Name = "LinkLabel3"
- Me.LinkLabel3.Size = New System.Drawing.Size(147, 13)
- Me.LinkLabel3.TabIndex = 41
- Me.LinkLabel3.TabStop = True
- Me.LinkLabel3.Text = "Support-Portal Digital Data"
+ Me.LinkLabel2.AutoSize = True
+ Me.LinkLabel2.Location = New System.Drawing.Point(430, 200)
+ Me.LinkLabel2.Name = "LinkLabel2"
+ Me.LinkLabel2.Size = New System.Drawing.Size(83, 13)
+ Me.LinkLabel2.TabIndex = 7
+ Me.LinkLabel2.TabStop = True
+ Me.LinkLabel2.Text = "Support-Portal"
'
- 'frmAbout
+ 'AboutBox1
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
Me.CancelButton = Me.OKButton
- Me.ClientSize = New System.Drawing.Size(591, 310)
- Me.Controls.Add(Me.LinkLabel3)
+ Me.ClientSize = New System.Drawing.Size(544, 311)
+ Me.Controls.Add(Me.LinkLabel2)
Me.Controls.Add(Me.LinkLabel1)
Me.Controls.Add(Me.txtDescription)
Me.Controls.Add(Me.lblCompanyName)
Me.Controls.Add(Me.lblVersion)
- Me.Controls.Add(Me.lblProductname)
+ Me.Controls.Add(Me.lblProduktname)
Me.Controls.Add(Me.OKButton)
Me.Controls.Add(Me.PictureBox1)
Me.DoubleBuffered = True
@@ -136,7 +133,7 @@ Partial Class frmAbout
Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog
Me.MaximizeBox = False
Me.MinimizeBox = False
- Me.Name = "frmAbout"
+ Me.Name = "AboutBox1"
Me.Padding = New System.Windows.Forms.Padding(9)
Me.ShowInTaskbar = False
Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
@@ -147,11 +144,11 @@ Partial Class frmAbout
End Sub
Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
- Friend WithEvents lblProductname As System.Windows.Forms.Label
+ Friend WithEvents lblProduktname As System.Windows.Forms.Label
Friend WithEvents lblVersion As System.Windows.Forms.Label
Friend WithEvents lblCompanyName As System.Windows.Forms.Label
Friend WithEvents txtDescription As System.Windows.Forms.TextBox
Friend WithEvents LinkLabel1 As System.Windows.Forms.LinkLabel
- Friend WithEvents LinkLabel3 As System.Windows.Forms.LinkLabel
+ Friend WithEvents LinkLabel2 As System.Windows.Forms.LinkLabel
End Class
diff --git a/app/DD-Record-Organiser/frmAbout.vb b/app/DD-Record-Organiser/frmAbout.vb
index bd10e20..24c0a3e 100644
--- a/app/DD-Record-Organiser/frmAbout.vb
+++ b/app/DD-Record-Organiser/frmAbout.vb
@@ -8,28 +8,24 @@
Else
ApplicationTitle = System.IO.Path.GetFileNameWithoutExtension(My.Application.Info.AssemblyName)
End If
- Me.Text = String.Format("Info {0}", ApplicationTitle)
- ' Initialisieren Sie den gesamten Text, der im Infofeld angezeigt wird.
- ' TODO: Die Assemblyinformationen der Anwendung im Bereich "Anwendung" des Dialogfelds für die
- ' Projekteigenschaften (im Menü "Projekt") anpassen.
- Me.lblProductname.Text = My.Application.Info.ProductName
+ Me.Text = String.Format("Information zu: {0}", ApplicationTitle)
+ 'Initialisieren Sie den gesamten Text, der im Infofeld angezeigt wird.
+ 'TODO: Die Assemblyinformationen der Anwendung im Bereich "Anwendung" des Dialogfelds für die
+ 'Projekteigenschaften (im Menü "Projekt") anpassen.
+ lblProduktname.Text = My.Application.Info.ProductName
Me.lblVersion.Text = String.Format("Version {0}", My.Application.Info.Version.ToString)
- 'Me.LabelCopyright.Text = My.Application.Info.Copyright
Me.lblCompanyName.Text = My.Application.Info.CompanyName
Me.txtDescription.Text = My.Application.Info.Description
End Sub
-
Private Sub OKButton_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OKButton.Click
Me.Close()
End Sub
-
Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked
- System.Diagnostics.Process.Start("www.didalog.de")
+ System.Diagnostics.Process.Start("http://www.didalog.de")
LinkLabel1.LinkVisited = True
End Sub
-
- Private Sub LinkLabel3_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel3.LinkClicked
- System.Diagnostics.Process.Start("www.didalog.de/support")
- LinkLabel3.LinkVisited = True
+ Private Sub LinkLabel2_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel2.LinkClicked
+ System.Diagnostics.Process.Start("http://www.didalog.de/support")
+ LinkLabel2.LinkVisited = True
End Sub
End Class
diff --git a/app/DD-Record-Organiser/frmForm_Constructor_Main.vb b/app/DD-Record-Organiser/frmForm_Constructor_Main.vb
index 2f7419a..1056401 100644
--- a/app/DD-Record-Organiser/frmForm_Constructor_Main.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor_Main.vb
@@ -463,6 +463,7 @@ Public Class frmForm_Constructor_Main
'tslblEntity2.Visible = False
'tslblEntity3.Visible = False
_sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId))
+
EBENE1_COLUMNNAME = ClassDatabase.Execute_Scalar("SELECT COLUMN_NAME1 FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FormId)
EBENE2_COLUMNNAME = ""
EBENE3_COLUMNNAME = ""
@@ -486,9 +487,14 @@ Public Class frmForm_Constructor_Main
PARENT_RECORDID = EBENE1_RECID
CURRENT_PARENTID = EBENE1_RECID
_sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId))
- _sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
- _sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
- _sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
+ If GRID_TYPE = GridType.Grid Then
+ Else
+ _sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId))
+ _sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
+ _sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
+ _sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
+ End If
+
End If
'tslblEntity3.Visible = False
Select Case CURRENT_FORM_TYPE
@@ -505,10 +511,15 @@ Public Class frmForm_Constructor_Main
If EBENE1_RECID > 0 Then
'_sql = ClassDatabase.Execute_Scalar("SELECT SQL_QUICK_VIEW FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FormId)
_sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId))
- _sql = _sql.Replace("@RecordID", EBENE1_RECID)
- _sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
- _sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
- _sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
+ If GRID_TYPE = GridType.Grid Then
+
+ Else
+ _sql = _sql.Replace("@RecordID", EBENE1_RECID)
+ _sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
+ _sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
+ _sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
+ End If
+
Else
_sql = ClassDatabase.Execute_Scalar("SELECT SQL_QUICK_VIEW FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FormId)
End If
@@ -543,10 +554,16 @@ Public Class frmForm_Constructor_Main
If EBENE2_RECID > 0 Then
Try
_sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId))
- _sql = _sql.Replace("@RecordID", EBENE2_RECID)
- _sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
- _sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
- _sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
+ If GRID_TYPE = GridType.Grid Then
+
+ Else
+ _sql = ClassDatabase.Execute_Scalar(Get_Grid_Sql(CONSTRUCTORID, FormId))
+ _sql = _sql.Replace("@RecordID", EBENE2_RECID)
+ _sql = _sql.ToString.Replace("TBPMO_FORM T1", "TBPMO_FORM T1 ,TBPMO_RECORD_CONNECT T2")
+ _sql = _sql & " AND T.GUID = T2.RECORD2_ID AND T2.RECORD1_ID = @T2.RECORD1_ID"
+ _sql = _sql.ToString.Replace("@T2.RECORD1_ID", PARENT_RECORDID)
+ End If
+
Catch ex As Exception
diff --git a/app/DD-Record-Organiser/frmMain.vb b/app/DD-Record-Organiser/frmMain.vb
index a57d03d..946d14e 100644
--- a/app/DD-Record-Organiser/frmMain.vb
+++ b/app/DD-Record-Organiser/frmMain.vb
@@ -333,11 +333,6 @@ Public Class frmMain
Private Sub UserKonfigurationToolStripMenuItem_Click(sender As Object, e As EventArgs)
OpenUserKonfig()
End Sub
-
- Private Sub InfoToolStripMenuItem_Click(sender As Object, e As EventArgs)
- frmAbout.ShowDialog()
- End Sub
-
Private Sub ImageManagerToolStripMenuItem_Click(sender As Object, e As EventArgs)
OpenImageManager()
End Sub