MS_08.09.2015 (1)

2015-09-08 13:07:18 +02:00 · 2015-09-08 13:07:18 +02:00 · 8e64871903
commit 8e64871903
parent b053807a99
4 changed files with 82 additions and 55 deletions
--- a/app/DD-Record-Organiser/ClassControlCommands.vb
+++ b/app/DD-Record-Organiser/ClassControlCommands.vb
@ -75,7 +75,7 @@

            ' SQL Befehl für CONTROL TABELLE
            ' SQL_COMMAND_1 auf leeren String setzen
-            SQL = "INSERT TBPMO_CONTROL (FORM_ID, CONTROL_TYPE_ID, DEFAULT_VALUE, NAME, COL_NAME, PARENT_CONTROL_ID, SQL_COMMAND_1) VALUES (" & CURRENT_FORM_ID & ", " & CONTROL_TYPE_ID & ", 'False', '" & NAME & "', '" & NAME & "', " & PARENT_CONTROL_ID & ", '')"
+            SQL = "INSERT INTO TBPMO_CONTROL (FORM_ID, CONTROL_TYPE_ID, DEFAULT_VALUE, NAME, COL_NAME, PARENT_CONTROL_ID, SQL_COMMAND_1) VALUES (" & CURRENT_FORM_ID & ", " & CONTROL_TYPE_ID & ", 'False', '" & NAME & "', '" & NAME & "', " & PARENT_CONTROL_ID & ", '')"

            If ClassDatabase.Execute_non_Query(SQL) = True Then
                SQL = "SELECT MAX(GUID) FROM TBPMO_CONTROL"
--- a/app/DD-Record-Organiser/frmForm_Constructor.designer.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor.designer.vb
@ -129,8 +129,8 @@ Partial Class frmForm_Constructor
        Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
        Me.pnlTop = New System.Windows.Forms.Panel()
-        Me.pnlMain = New System.Windows.Forms.Panel()
        Me.pnlNavButtons = New System.Windows.Forms.Panel()
+        Me.pnlMain = New System.Windows.Forms.Panel()
        CType(Me.grvwCarousel, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridControlSelection, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.grvwSelection, System.ComponentModel.ISupportInitialize).BeginInit()
@ -191,7 +191,7 @@ Partial Class frmForm_Constructor
        Me.GridControlSelection.Location = New System.Drawing.Point(298, 0)
        Me.GridControlSelection.MainView = Me.grvwSelection
        Me.GridControlSelection.Name = "GridControlSelection"
-        Me.GridControlSelection.Size = New System.Drawing.Size(1013, 183)
+        Me.GridControlSelection.Size = New System.Drawing.Size(1013, 181)
        Me.GridControlSelection.TabIndex = 13
        Me.GridControlSelection.TabStop = False
        Me.GridControlSelection.UseEmbeddedNavigator = True
@ -237,7 +237,7 @@ Partial Class frmForm_Constructor
        Me.GridControlParentEntity.Location = New System.Drawing.Point(3, 3)
        Me.GridControlParentEntity.MainView = Me.GridViewParentEntity
        Me.GridControlParentEntity.Name = "GridControlParentEntity"
-        Me.GridControlParentEntity.Size = New System.Drawing.Size(325, 317)
+        Me.GridControlParentEntity.Size = New System.Drawing.Size(325, 315)
        Me.GridControlParentEntity.TabIndex = 14
        Me.GridControlParentEntity.TabStop = False
        Me.GridControlParentEntity.UseEmbeddedNavigator = True
@ -314,8 +314,8 @@ Partial Class frmForm_Constructor
        Me.SplitContainerMain.Panel2.Controls.Add(Me.SplitCont_Details)
        Me.SplitContainerMain.Panel2.Controls.Add(Me.ToolStrip1)
        Me.SplitContainerMain.Panel2.Controls.Add(Me.StatusStrip2)
-        Me.SplitContainerMain.Size = New System.Drawing.Size(1311, 588)
-        Me.SplitContainerMain.SplitterDistance = 183
+        Me.SplitContainerMain.Size = New System.Drawing.Size(1311, 584)
+        Me.SplitContainerMain.SplitterDistance = 181
        Me.SplitContainerMain.TabIndex = 1
        '
        'SplitterLeft
@ -323,7 +323,7 @@ Partial Class frmForm_Constructor
        Me.SplitterLeft.BackColor = System.Drawing.SystemColors.InactiveCaption
        Me.SplitterLeft.Location = New System.Drawing.Point(295, 0)
        Me.SplitterLeft.Name = "SplitterLeft"
-        Me.SplitterLeft.Size = New System.Drawing.Size(3, 183)
+        Me.SplitterLeft.Size = New System.Drawing.Size(3, 181)
        Me.SplitterLeft.TabIndex = 12
        Me.SplitterLeft.TabStop = False
        '
@ -339,7 +339,7 @@ Partial Class frmForm_Constructor
        Me.TreeViewEbeneSelect.Location = New System.Drawing.Point(0, 0)
        Me.TreeViewEbeneSelect.Name = "TreeViewEbeneSelect"
        Me.TreeViewEbeneSelect.SelectedImageIndex = 1
-        Me.TreeViewEbeneSelect.Size = New System.Drawing.Size(295, 183)
+        Me.TreeViewEbeneSelect.Size = New System.Drawing.Size(295, 181)
        Me.TreeViewEbeneSelect.TabIndex = 9
        Me.TreeViewEbeneSelect.TabStop = False
        Me.ttToolTip.SetToolTip(Me.TreeViewEbeneSelect, "Wählen Sie hier die zu filternde Entität (RechtsKlick für Zurücksetzen)")
@ -383,7 +383,7 @@ Partial Class frmForm_Constructor
        Me.SplitCont_Details.Panel1.Text = "Panel1"
        Me.SplitCont_Details.Panel2.Controls.Add(Me.XtraTabControl1)
        Me.SplitCont_Details.Panel2.Text = "Panel2"
-        Me.SplitCont_Details.Size = New System.Drawing.Size(1311, 376)
+        Me.SplitCont_Details.Size = New System.Drawing.Size(1311, 374)
        Me.SplitCont_Details.SplitterPosition = Global.DD_Record_Organiser.My.MySettings.Default.Constructor_DetailsSplitter
        Me.SplitCont_Details.TabIndex = 2
        Me.SplitCont_Details.Text = "SplitContainerControl1"
@ -400,7 +400,7 @@ Partial Class frmForm_Constructor
        Me.TCDetails.Name = "TCDetails"
        Me.TCDetails.SelectedTabPage = Me.TabPageDetails
        Me.TCDetails.ShowHeaderFocus = DevExpress.Utils.DefaultBoolean.[False]
-        Me.TCDetails.Size = New System.Drawing.Size(764, 372)
+        Me.TCDetails.Size = New System.Drawing.Size(764, 370)
        Me.TCDetails.TabIndex = 19
        Me.TCDetails.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageDetails, Me.TabPageWD_Files, Me.TabPageFollowUp})
        '
@ -409,7 +409,7 @@ Partial Class frmForm_Constructor
        Me.TabPageDetails.Controls.Add(Me.pnlDetails)
        Me.TabPageDetails.Image = Global.DD_Record_Organiser.My.Resources.Resources.grid_Data_16xMD
        Me.TabPageDetails.Name = "TabPageDetails"
-        Me.TabPageDetails.Size = New System.Drawing.Size(758, 341)
+        Me.TabPageDetails.Size = New System.Drawing.Size(762, 342)
        Me.TabPageDetails.Text = "Detailansicht:"
        '
        'pnlDetails
@ -418,7 +418,7 @@ Partial Class frmForm_Constructor
        Me.pnlDetails.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnlDetails.Location = New System.Drawing.Point(0, 0)
        Me.pnlDetails.Name = "pnlDetails"
-        Me.pnlDetails.Size = New System.Drawing.Size(758, 341)
+        Me.pnlDetails.Size = New System.Drawing.Size(762, 342)
        Me.pnlDetails.TabIndex = 0
        '
        'TabPageWD_Files
@ -427,7 +427,7 @@ Partial Class frmForm_Constructor
        Me.TabPageWD_Files.Controls.Add(Me.ToolStripDokumente)
        Me.TabPageWD_Files.Image = Global.DD_Record_Organiser.My.Resources.Resources.Files_7954
        Me.TabPageWD_Files.Name = "TabPageWD_Files"
-        Me.TabPageWD_Files.Size = New System.Drawing.Size(758, 341)
+        Me.TabPageWD_Files.Size = New System.Drawing.Size(762, 344)
        Me.TabPageWD_Files.Text = "windream-Dateien"
        Me.ttToolTip.SetToolTip(Me.TabPageWD_Files, "Zeigt die Dateien in windream zum ausgewählten Datensatz an")
        '
@ -439,7 +439,7 @@ Partial Class frmForm_Constructor
        Me.AxObjectListControl.Location = New System.Drawing.Point(0, 25)
        Me.AxObjectListControl.Name = "AxObjectListControl"
        Me.AxObjectListControl.OcxState = CType(resources.GetObject("AxObjectListControl.OcxState"), System.Windows.Forms.AxHost.State)
-        Me.AxObjectListControl.Size = New System.Drawing.Size(758, 316)
+        Me.AxObjectListControl.Size = New System.Drawing.Size(762, 319)
        Me.AxObjectListControl.TabIndex = 5
        Me.AxObjectListControl.TabStop = False
        '
@ -448,7 +448,7 @@ Partial Class frmForm_Constructor
        Me.ToolStripDokumente.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblWindreamView, Me.ToolStripDropDownButton2})
        Me.ToolStripDokumente.Location = New System.Drawing.Point(0, 0)
        Me.ToolStripDokumente.Name = "ToolStripDokumente"
-        Me.ToolStripDokumente.Size = New System.Drawing.Size(758, 25)
+        Me.ToolStripDokumente.Size = New System.Drawing.Size(762, 25)
        Me.ToolStripDokumente.TabIndex = 1
        Me.ToolStripDokumente.Text = "ToolStrip2"
        '
@ -482,7 +482,7 @@ Partial Class frmForm_Constructor
        Me.TabPageFollowUp.Controls.Add(Me.ListViewFollowUp)
        Me.TabPageFollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.Task_16xMD
        Me.TabPageFollowUp.Name = "TabPageFollowUp"
-        Me.TabPageFollowUp.Size = New System.Drawing.Size(758, 341)
+        Me.TabPageFollowUp.Size = New System.Drawing.Size(762, 344)
        Me.TabPageFollowUp.Text = "Wiedervorlage"
        '
        'grpbxFU_Profile
@ -696,7 +696,7 @@ Partial Class frmForm_Constructor
        Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0)
        Me.XtraTabControl1.Name = "XtraTabControl1"
        Me.XtraTabControl1.SelectedTabPage = Me.TabPageParentEntity
-        Me.XtraTabControl1.Size = New System.Drawing.Size(538, 372)
+        Me.XtraTabControl1.Size = New System.Drawing.Size(531, 370)
        Me.XtraTabControl1.TabIndex = 0
        Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageParentEntity})
        '
@ -710,7 +710,7 @@ Partial Class frmForm_Constructor
        Me.TabPageParentEntity.Controls.Add(Me.Label4)
        Me.TabPageParentEntity.Controls.Add(Me.GridControlParentEntity)
        Me.TabPageParentEntity.Name = "TabPageParentEntity"
-        Me.TabPageParentEntity.Size = New System.Drawing.Size(532, 344)
+        Me.TabPageParentEntity.Size = New System.Drawing.Size(529, 345)
        Me.TabPageParentEntity.Text = "Parent-Entity"
        '
        'Button1
@ -718,7 +718,7 @@ Partial Class frmForm_Constructor
        Me.Button1.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.Close_16xLG
        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button1.Location = New System.Drawing.Point(423, 293)
+        Me.Button1.Location = New System.Drawing.Point(423, 291)
        Me.Button1.Name = "Button1"
        Me.Button1.Size = New System.Drawing.Size(98, 27)
        Me.Button1.TabIndex = 18
@ -735,7 +735,7 @@ Partial Class frmForm_Constructor
        Me.btnRefreshPEntity.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.btnRefreshPEntity.Image = Global.DD_Record_Organiser.My.Resources.Resources.refresh_16xLG
        Me.btnRefreshPEntity.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnRefreshPEntity.Location = New System.Drawing.Point(3, 328)
+        Me.btnRefreshPEntity.Location = New System.Drawing.Point(3, 326)
        Me.btnRefreshPEntity.Name = "btnRefreshPEntity"
        Me.btnRefreshPEntity.Size = New System.Drawing.Size(518, 31)
        Me.btnRefreshPEntity.TabIndex = 17
@ -1144,26 +1144,26 @@ Partial Class frmForm_Constructor
        Me.pnlTop.Dock = System.Windows.Forms.DockStyle.Top
        Me.pnlTop.Location = New System.Drawing.Point(0, 0)
        Me.pnlTop.Name = "pnlTop"
-        Me.pnlTop.Size = New System.Drawing.Size(1311, 70)
+        Me.pnlTop.Size = New System.Drawing.Size(1311, 74)
        Me.pnlTop.TabIndex = 4
        '
-        'pnlMain
-        '
-        Me.pnlMain.Controls.Add(Me.SplitContainerMain)
-        Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pnlMain.Location = New System.Drawing.Point(0, 70)
-        Me.pnlMain.Name = "pnlMain"
-        Me.pnlMain.Size = New System.Drawing.Size(1311, 588)
-        Me.pnlMain.TabIndex = 5
-        '
        'pnlNavButtons
        '
        Me.pnlNavButtons.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnlNavButtons.Location = New System.Drawing.Point(0, 25)
        Me.pnlNavButtons.Name = "pnlNavButtons"
-        Me.pnlNavButtons.Size = New System.Drawing.Size(1311, 45)
+        Me.pnlNavButtons.Size = New System.Drawing.Size(1311, 49)
        Me.pnlNavButtons.TabIndex = 2
        '
+        'pnlMain
+        '
+        Me.pnlMain.Controls.Add(Me.SplitContainerMain)
+        Me.pnlMain.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.pnlMain.Location = New System.Drawing.Point(0, 74)
+        Me.pnlMain.Name = "pnlMain"
+        Me.pnlMain.Size = New System.Drawing.Size(1311, 584)
+        Me.pnlMain.TabIndex = 5
+        '
        'frmForm_Constructor
        '
        Me.AllowDrop = True
--- a/app/DD-Record-Organiser/frmForm_Constructor.resx
+++ b/app/DD-Record-Organiser/frmForm_Constructor.resx
@ -157,7 +157,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS
-        CQAAAk1TRnQBSQFMAgEBAgEAAeABCAHgAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAAegBCAHoAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
--- a/app/DD-Record-Organiser/frmForm_Constructor.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor.vb
@ -1810,8 +1810,39 @@ Public Class frmForm_Constructor
            Load_Entity_Data(TreeViewEbeneSelect.SelectedNode.Tag)
        End If
    End Sub
+    Private Function GET_GROUP_RECORD(FORM_ID As Integer)
+        Dim sqlRecord As String = "select guid from TBPMO_RECORD where Form_ID = " & FORM_ID
+        Dim recid = ClassDatabase.Execute_Scalar(sqlRecord, True)
+        If IsNothing(recid) Then
+            If ClassControlCommandsUI.CreateRecord(FORM_ID) = True Then
+                recid = ClassControlCommandsUI.GetLastRecord
+                If IsNothing(recid) Then
+                    CURRENT_RECORD_ID = recid
+                    ClassControlCommandsUI.ConnectRecord(CURRENT_PARENTID, CURRENT_RECORD_ID, "Group-Entity Link")
+                Else
+                    Return False
+                End If
+            Else
+
+                Return False
+            End If
+        Else
+            Try
+                CURRENT_RECORD_ID = CInt(recid)
+
+            Catch ex As Exception
+                MsgBox("Error while getting CURRENT_RECORDID: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+                Return False
+            End Try
+        End If
+        Refresh_CreatedChangedRecordByID(CURRENT_RECORD_ID)
+        Return True
+    End Function
+
    Sub Load_Entity_Data(FORM_ID As Integer)
        Try
+            Me.Cursor = Cursors.WaitCursor
+
            Dim IS_SINGLE_RECORD As Boolean
            VerknüpfungenToolStripMenuItem.Enabled = False
            CURRENT_FORM_TYPE = ClassDatabase.Execute_Scalar("SELECT FORM_TYPE_ID FROM TBPMO_FORM WHERE GUID = " & FORM_ID)
@ -1881,6 +1912,12 @@ Public Class frmForm_Constructor
                        CURRENT_PARENTID = EBENE1_RECID
                    End If
                    'tslblEntity3.Visible = False
+                    Select Case CURRENT_FORM_TYPE
+                        Case 5
+                            If GET_GROUP_RECORD(FORM_ID) = True Then
+                                EBENE2_RECID = CURRENT_RECORD_ID
+                            End If
+                    End Select

                    EBENE2_COLUMNNAME = ClassDatabase.Execute_Scalar("SELECT COLUMN_NAME1 FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & FORM_ID)

@ -1894,6 +1931,10 @@ Public Class frmForm_Constructor
                    End If
                    EBENE2_GRID_RESULT = Nothing
                    EBENE3_GRID_RESULT = Nothing
+
+
+
+
                    Try
                        If ClassControlCommands.CTRL_EXISTSinPARENT("btnEntity3", pnlNavButtons) Then
                            Dim btn As Button = DirectCast(pnlNavButtons.Controls("btnEntity3"), Button)
@ -1908,6 +1949,13 @@ Public Class frmForm_Constructor
                    End Try

                Case 3
+                    Select Case CURRENT_FORM_TYPE
+                        Case 5
+                            If GET_GROUP_RECORD(FORM_ID) = True Then
+                                EBENE3_RECID = CURRENT_RECORD_ID
+                            End If
+                    End Select
+
                    If EBENE2_RECID = 0 Then
                        MsgBox("Entität '" & TreeViewEbeneSelect.SelectedNode.Text & "' kann nicht ohne Auswahl eines Ebene 1 Datensatzes gewählt werden!", MsgBoxStyle.Exclamation)
                        TreeViewEbeneSelect.SelectedNode = TreeViewEbeneSelect.SelectedNode.Parent
@ -1946,10 +1994,7 @@ Public Class frmForm_Constructor

            End Select

-            Me.Cursor = Cursors.WaitCursor
-
            CURRENT_FORM_ID = FORM_ID
-
            CURRENT_ENTITYSTRING = ACT_EBENE_STRING
            CURRENT_PARENTID = PARENT_RECORDID
            act_FormViewID = ClassDatabase.Execute_Scalar("SELECT GUID FROM TBPMO_FORM_VIEW where FORM_ID = " & FORM_ID)
@ -1981,25 +2026,7 @@ Public Class frmForm_Constructor
                Case 5
                    'Nur eine Gruppen-Entität: d.h. es wird nur die Dateientab angezeigt
                    Console.WriteLine("OnlyGroupType")
-                    Dim sqlRecord As String = "select guid from TBPMO_RECORD where Form_ID = " & CURRENT_FORM_ID
-                    Dim recid = ClassDatabase.Execute_Scalar(sqlRecord, True)
-                    If IsNothing(recid) Then
-                        If ClassControlCommandsUI.CreateRecord(CURRENT_FORM_ID) = True Then
-                            recid = ClassControlCommandsUI.GetLastRecord
-                            If IsNothing(recid) Then
-                                CURRENT_RECORD_ID = recid
-                                ClassControlCommandsUI.ConnectRecord(CURRENT_PARENTID, CURRENT_RECORD_ID, "Group-Entity Link")
-                                Refresh_CreatedChangedRecordByID(CURRENT_RECORD_ID)
-                            End If
-                        End If
-                    Else
-                        Try
-                            CURRENT_RECORD_ID = CInt(recid)
-                        Catch ex As Exception
-                            MsgBox("Error while getting CURRENT_RECORDID: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-                        End Try
-                        Refresh_CreatedChangedRecordByID(CURRENT_RECORD_ID)
-                    End If
+
                    TabPageDetails.PageVisible = False
                    Anzeige_Selected_Entity()
                Case Else