JJ_16_11

2015-11-16 15:28:39 +01:00 · 2015-11-16 15:28:39 +01:00 · a7f86eb783
commit a7f86eb783
parent 69b738413a
24 changed files with 341 additions and 6741 deletions
--- a/app/DD-Record-Organiser/ClassControlProperties.vb
+++ b/app/DD-Record-Organiser/ClassControlProperties.vb
@ -426,7 +426,7 @@ Module ClassControlProperties
        End Property

        <CategoryAttribute("Termin Einstellungen")>
-        <DescriptionAttribute("Gibt den Betreff des Termins an.")>
+        <DescriptionAttribute("Gibt den Betreff des Termins an. Dynamische Werte aus anderen Controls können mit der Syntax [%controlname] eingefügt werden")>
        Public Property Subject() As String
            Get
                Return _subject
@ -437,7 +437,7 @@ Module ClassControlProperties
        End Property

        <CategoryAttribute("Termin Einstellungen")>
-        <DescriptionAttribute("Gibt den optionalen zweiten Betreff des Termins an.")>
+        <DescriptionAttribute("Gibt den optionalen zweiten Betreff des Termins an. Dynamische Werte aus anderen Controls können mit der Syntax [%controlname] eingefügt werden")>
        Public Property Subject2() As String
            Get
                Return _subject2
@ -448,7 +448,7 @@ Module ClassControlProperties
        End Property

        <CategoryAttribute("Termin Einstellungen")>
-        <DescriptionAttribute("Gibt den Ort des Termins an.")>
+        <DescriptionAttribute("Gibt den Ort des Termins an. Dynamische Werte aus anderen Controls können mit der Syntax [%controlname] eingefügt werden")>
        Public Property Place() As String
            Get
                Return _place
@ -459,7 +459,7 @@ Module ClassControlProperties
        End Property

        <CategoryAttribute("Termin Einstellungen")>
-        <DescriptionAttribute("Gibt die Beschreibung des Termins an.")>
+        <DescriptionAttribute("Gibt die Beschreibung des Termins an. Dynamische Werte aus anderen Controls können mit der Syntax [%controlname] eingefügt werden")>
        Public Property Description() As String
            Get
                Return _description
--- a/app/DD-Record-Organiser/ClassFunctionCommandsUI.vb
+++ b/app/DD-Record-Organiser/ClassFunctionCommandsUI.vb
@ -80,7 +80,7 @@ Public Class ClassFunctionCommandsUI
        Try
            Dim controlID = GetControlID_for_Name(ControlName, FormID)

-            Dim SQL = "SELECT GUID FROM TBPMO_APPOINTMENTS WHERE CustomField1 = " & RecordID & " AND CustomField2 = " & controlID
+            Dim SQL = "SELECT UniqueID FROM TBPMO_APPOINTMENTS WHERE CustomField1 = " & RecordID & " AND CustomField2 = " & controlID
            Dim result = ClassDatabase.Execute_Scalar(SQL)

            If result Is Nothing Then
@ -209,6 +209,8 @@ Public Class ClassFunctionCommandsUI
            Dim controlID = GetControlID_for_Name(ControlName, FormID)

            ' Load All appointments first
+            frmCalendar.TBPMO_RESOURCESTableAdapter.Connection.ConnectionString = MyConnectionString
+            frmCalendar.TBPMO_APPOINTMENTSTableAdapter.Connection.ConnectionString = MyConnectionString
            frmCalendar.TBPMO_RESOURCESTableAdapter.Fill(frmCalendar.DD_DMSDataSetCalendar.TBPMO_RESOURCES)
            frmCalendar.TBPMO_APPOINTMENTSTableAdapter.Fill(frmCalendar.DD_DMSDataSetCalendar.TBPMO_APPOINTMENTS)

--- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj
+++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj
@ -962,6 +962,7 @@
    <None Include="Resources\brick.png" />
  </ItemGroup>
  <ItemGroup>
+    <None Include="Resources\keinbild.png" />
    <None Include="Resources\page_white_office1.png" />
    <None Include="Resources\windream-Logo-transparent.png" />
    <None Include="Resources\view_16xLG.png" />
--- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj.bak
+++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj.bak
--- a/app/DD-Record-Organiser/ModuleHelperMethods.vb
+++ b/app/DD-Record-Organiser/ModuleHelperMethods.vb
@ -207,6 +207,17 @@
        frm.MdiParent = frmMain
        frm.Show()
    End Sub
+
+    ' TODO: NUR FÜR WINDREAM CON!!!
+    Public Sub OpenFormConstructorDemo(id As Integer)
+        CURRENT_CONSTRUCTOR_ID = id
+        Dim frm As New frmForm_Constructor_Main
+        ' frm = frmForm_Constructor.Instance()
+        frm.MdiParent = frmMain
+        frm.Show()
+    End Sub
+    ' TODO: NUR FÜR WINDREAM CON!!!
+
    Public Sub OpenTaskmanagement()
        Dim frm As New frmTaskmanagement
        frm = frmTaskmanagement.Instance()
--- a/app/DD-Record-Organiser/ModuleRuntimeVariables.vb
+++ b/app/DD-Record-Organiser/ModuleRuntimeVariables.vb
@ -36,5 +36,7 @@
    Public INTEGER1 As Integer
    Public STRING1 As String

+    Public JUMP_RECORD_ID As Integer
+
    Public TEMP_FILES As List(Of String) = New List(Of String)
 End Module
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@ -1000,6 +1000,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property keinbild() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("keinbild", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
--- a/app/DD-Record-Organiser/My
+++ b/app/DD-Record-Organiser/My
@ -547,4 +547,7 @@
  <data name="page_white_office1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\page_white_office1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="keinbild" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\keinbild.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
--- a/app/DD-Record-Organiser/My
+++ b/app/DD-Record-Organiser/My
@ -1,3 +1,6 @@
 DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/app/DD-Record-Organiser/My
+++ b/app/DD-Record-Organiser/My
@ -1,2 +0,0 @@
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/app/DD-Record-Organiser/Resources/keinbild.png
+++ b/app/DD-Record-Organiser/Resources/keinbild.png
--- a/app/DD-Record-Organiser/frmConstructorDesigner.resx.bak
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.resx.bak
--- a/app/DD-Record-Organiser/frmCustomAppointment.Designer.vb
+++ b/app/DD-Record-Organiser/frmCustomAppointment.Designer.vb
@ -23,6 +23,7 @@ Partial Class frmCustomAppointment
        Me.txtRecordID = New System.Windows.Forms.TextBox()
        Me.txtControlID = New System.Windows.Forms.TextBox()
        Me.Label2 = New System.Windows.Forms.Label()
+        Me.btnJumpToRecord = New System.Windows.Forms.Button()
        CType(Me.chkAllDay.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.edtStartDate.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.edtStartDate.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
@ -65,10 +66,12 @@ Partial Class frmCustomAppointment
        'edtStartTime
        '
        Me.edtStartTime.EditValue = New Date(2005, 3, 31, 0, 0, 0, 0)
+        Me.edtStartTime.Properties.Mask.EditMask = "t"
        '
        'edtEndTime
        '
        Me.edtEndTime.EditValue = New Date(2005, 3, 31, 0, 0, 0, 0)
+        Me.edtEndTime.Properties.Mask.EditMask = "t"
        '
        'edtLabel
        '
@ -154,10 +157,23 @@ Partial Class frmCustomAppointment
        Me.Label2.TabIndex = 32
        Me.Label2.Text = "Control-ID:"
        '
+        'btnJumpToRecord
+        '
+        Me.btnJumpToRecord.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.btnJumpToRecord.Image = Global.DD_Record_Organiser.My.Resources.Resources.arrow_Forward_16xLG
+        Me.btnJumpToRecord.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnJumpToRecord.Location = New System.Drawing.Point(412, 348)
+        Me.btnJumpToRecord.Name = "btnJumpToRecord"
+        Me.btnJumpToRecord.Size = New System.Drawing.Size(100, 23)
+        Me.btnJumpToRecord.TabIndex = 33
+        Me.btnJumpToRecord.Text = "Zum Record"
+        Me.btnJumpToRecord.UseVisualStyleBackColor = True
+        '
        'frmCustomAppointment
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.ClientSize = New System.Drawing.Size(528, 382)
+        Me.Controls.Add(Me.btnJumpToRecord)
        Me.Controls.Add(Me.Label2)
        Me.Controls.Add(Me.txtControlID)
        Me.Controls.Add(Me.txtRecordID)
@ -187,6 +203,7 @@ Partial Class frmCustomAppointment
        Me.Controls.SetChildIndex(Me.txtRecordID, 0)
        Me.Controls.SetChildIndex(Me.txtControlID, 0)
        Me.Controls.SetChildIndex(Me.Label2, 0)
+        Me.Controls.SetChildIndex(Me.btnJumpToRecord, 0)
        CType(Me.chkAllDay.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.edtStartDate.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.edtStartDate.Properties, System.ComponentModel.ISupportInitialize).EndInit()
@ -219,5 +236,6 @@ Partial Class frmCustomAppointment
    Friend WithEvents txtRecordID As System.Windows.Forms.TextBox
    Friend WithEvents txtControlID As System.Windows.Forms.TextBox
    Friend WithEvents Label2 As System.Windows.Forms.Label
+    Friend WithEvents btnJumpToRecord As System.Windows.Forms.Button

 End Class
--- a/app/DD-Record-Organiser/frmCustomAppointment.vb
+++ b/app/DD-Record-Organiser/frmCustomAppointment.vb
@ -89,5 +89,14 @@ Partial Public Class frmCustomAppointment

    End Sub

-    
+    Private Sub btnJumpToRecord_Click(sender As Object, e As EventArgs) Handles btnJumpToRecord.Click
+        If txtRecordID.Text.Length > 0 Then
+            Dim RecordId = Integer.Parse(txtRecordID.Text)
+            JUMP_RECORD_ID = RecordId
+
+            ' TODO: Jetzt Constructor aufrufen
+            OpenFormConstructorDemo(CURRENT_CONSTRUCTOR_ID)
+            Me.Close()
+        End If
+    End Sub
 End Class
--- a/app/DD-Record-Organiser/frmForm_Constructor.designer.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor.designer.vb
@ -36,6 +36,7 @@ Partial Class frmForm_Constructor
        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
        Me.tslblStatusMain = New System.Windows.Forms.ToolStripStatusLabel()
        Me.tslblEntity = New System.Windows.Forms.ToolStripStatusLabel()
+        Me.ToolStripStatusLabel1 = New System.Windows.Forms.ToolStripStatusLabel()
        Me.SplitContainerMain = New System.Windows.Forms.SplitContainer()
        Me.SplitterLeft = New System.Windows.Forms.Splitter()
        Me.TreeViewEbeneSelect = New System.Windows.Forms.TreeView()
@ -131,7 +132,6 @@ Partial Class frmForm_Constructor
        Me.pnlTop = New System.Windows.Forms.Panel()
        Me.pnlNavButtons = New System.Windows.Forms.Panel()
        Me.pnlMain = New System.Windows.Forms.Panel()
-        Me.ToolStripStatusLabel1 = New System.Windows.Forms.ToolStripStatusLabel()
        CType(Me.grvwCarousel, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridControlSelection, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.grvwSelection, System.ComponentModel.ISupportInitialize).BeginInit()
@ -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(0, 297)
+        Me.GridControlParentEntity.Size = New System.Drawing.Size(0, 300)
        Me.GridControlParentEntity.TabIndex = 14
        Me.GridControlParentEntity.TabStop = False
        Me.GridControlParentEntity.UseEmbeddedNavigator = True
@ -296,6 +296,12 @@ Partial Class frmForm_Constructor
        Me.tslblEntity.Size = New System.Drawing.Size(132, 19)
        Me.tslblEntity.Text = "ToolStripStatusLabel1"
        '
+        'ToolStripStatusLabel1
+        '
+        Me.ToolStripStatusLabel1.Name = "ToolStripStatusLabel1"
+        Me.ToolStripStatusLabel1.Size = New System.Drawing.Size(121, 19)
+        Me.ToolStripStatusLabel1.Text = "ToolStripStatusLabel1"
+        '
        'SplitContainerMain
        '
        Me.SplitContainerMain.Dock = System.Windows.Forms.DockStyle.Fill
@ -717,7 +723,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.delete
        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button1.Location = New System.Drawing.Point(-321, 273)
+        Me.Button1.Location = New System.Drawing.Point(-324, 276)
        Me.Button1.Name = "Button1"
        Me.Button1.Size = New System.Drawing.Size(98, 27)
        Me.Button1.TabIndex = 18
@ -733,7 +739,7 @@ Partial Class frmForm_Constructor
        Me.btnRefreshPEntity.FlatAppearance.BorderColor = System.Drawing.Color.DarkOrange
        Me.btnRefreshPEntity.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.btnRefreshPEntity.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnRefreshPEntity.Location = New System.Drawing.Point(3, 305)
+        Me.btnRefreshPEntity.Location = New System.Drawing.Point(3, 308)
        Me.btnRefreshPEntity.Name = "btnRefreshPEntity"
        Me.btnRefreshPEntity.Size = New System.Drawing.Size(0, 31)
        Me.btnRefreshPEntity.TabIndex = 17
@ -747,7 +753,7 @@ Partial Class frmForm_Constructor
        Me.lblParentID.AutoSize = True
        Me.lblParentID.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.lblParentID.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.lblParentID.Location = New System.Drawing.Point(-410, 38)
+        Me.lblParentID.Location = New System.Drawing.Point(-413, 38)
        Me.lblParentID.Name = "lblParentID"
        Me.lblParentID.Size = New System.Drawing.Size(168, 16)
        Me.lblParentID.TabIndex = 16
@ -758,7 +764,7 @@ Partial Class frmForm_Constructor
        Me.Label4.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.Label4.AutoSize = True
        Me.Label4.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label4.Location = New System.Drawing.Point(-410, 12)
+        Me.Label4.Location = New System.Drawing.Point(-413, 12)
        Me.Label4.Name = "Label4"
        Me.Label4.Size = New System.Drawing.Size(160, 16)
        Me.Label4.TabIndex = 15
@ -869,9 +875,9 @@ Partial Class frmForm_Constructor
        'StatusStrip2
        '
        Me.StatusStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tserstellt_Details, Me.tsstatus_Detail, Me.tslblactWFState})
-        Me.StatusStrip2.Location = New System.Drawing.Point(0, 559)
+        Me.StatusStrip2.Location = New System.Drawing.Point(0, 562)
        Me.StatusStrip2.Name = "StatusStrip2"
-        Me.StatusStrip2.Size = New System.Drawing.Size(1311, 25)
+        Me.StatusStrip2.Size = New System.Drawing.Size(1311, 22)
        Me.StatusStrip2.TabIndex = 1
        Me.StatusStrip2.Text = "StatusStrip2"
        '
@ -882,7 +888,7 @@ Partial Class frmForm_Constructor
            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides)
        Me.tserstellt_Details.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.tserstellt_Details.Name = "tserstellt_Details"
-        Me.tserstellt_Details.Size = New System.Drawing.Size(4, 20)
+        Me.tserstellt_Details.Size = New System.Drawing.Size(4, 17)
        '
        'tsstatus_Detail
        '
@ -900,7 +906,7 @@ Partial Class frmForm_Constructor
        '
        Me.tslblactWFState.Image = CType(resources.GetObject("tslblactWFState.Image"), System.Drawing.Image)
        Me.tslblactWFState.Name = "tslblactWFState"
-        Me.tslblactWFState.Size = New System.Drawing.Size(137, 20)
+        Me.tslblactWFState.Size = New System.Drawing.Size(137, 17)
        Me.tslblactWFState.Text = "ToolStripStatusLabel1"
        Me.tslblactWFState.Visible = False
        '
@ -1163,12 +1169,6 @@ Partial Class frmForm_Constructor
        Me.pnlMain.Size = New System.Drawing.Size(1311, 584)
        Me.pnlMain.TabIndex = 5
        '
-        'ToolStripStatusLabel1
-        '
-        Me.ToolStripStatusLabel1.Name = "ToolStripStatusLabel1"
-        Me.ToolStripStatusLabel1.Size = New System.Drawing.Size(121, 19)
-        Me.ToolStripStatusLabel1.Text = "ToolStripStatusLabel1"
-        '
        '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
-        CQAAAk1TRnQBSQFMAgEBAgEAAbgBCQG4AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAAcgBCQHIAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
--- a/app/DD-Record-Organiser/frmForm_Constructor_Main.Designer.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor_Main.Designer.vb
@ -52,6 +52,10 @@ Partial Class frmForm_Constructor_Main
        Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
        Me.SplitContainerTop = New DevExpress.XtraEditors.SplitContainerControl()
        Me.TreeViewMain = New System.Windows.Forms.TreeView()
+        Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ResetEbenenAuswahlToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.SplitContainerBottom = New DevExpress.XtraEditors.SplitContainerControl()
        Me.TCDetails = New DevExpress.XtraTab.XtraTabControl()
        Me.TabDetails = New DevExpress.XtraTab.XtraTabPage()
@ -105,9 +109,6 @@ Partial Class frmForm_Constructor_Main
        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.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.ResetEbenenAuswahlToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridControlMain, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.ContextMenuGrid.SuspendLayout()
@ -118,6 +119,7 @@ Partial Class frmForm_Constructor_Main
        Me.SplitContainerMain.SuspendLayout()
        CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerTop.SuspendLayout()
+        Me.CMSEntity.SuspendLayout()
        CType(Me.SplitContainerBottom, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerBottom.SuspendLayout()
        CType(Me.TCDetails, System.ComponentModel.ISupportInitialize).BeginInit()
@ -137,7 +139,6 @@ Partial Class frmForm_Constructor_Main
        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.CMSEntity.SuspendLayout()
        Me.SuspendLayout()
        '
        'grvwGrid
@ -378,6 +379,7 @@ Partial Class frmForm_Constructor_Main
        '
        Me.TreeViewMain.BackColor = System.Drawing.SystemColors.GradientInactiveCaption
        Me.TreeViewMain.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.TreeViewMain.ContextMenuStrip = Me.CMSEntity
        Me.TreeViewMain.Dock = System.Windows.Forms.DockStyle.Fill
        Me.TreeViewMain.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.TreeViewMain.FullRowSelect = True
@ -387,6 +389,31 @@ Partial Class frmForm_Constructor_Main
        Me.TreeViewMain.Size = New System.Drawing.Size(283, 270)
        Me.TreeViewMain.TabIndex = 0
        '
+        'CMSEntity
+        '
+        Me.CMSEntity.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ResetEbenenAuswahlToolStripMenuItem, Me.DateiimportEntitätToolStripMenuItem, Me.FormDesignerToolStripMenuItem})
+        Me.CMSEntity.Name = "ContextMenuStrip2"
+        Me.CMSEntity.Size = New System.Drawing.Size(195, 70)
+        '
+        'ResetEbenenAuswahlToolStripMenuItem
+        '
+        Me.ResetEbenenAuswahlToolStripMenuItem.Name = "ResetEbenenAuswahlToolStripMenuItem"
+        Me.ResetEbenenAuswahlToolStripMenuItem.Size = New System.Drawing.Size(194, 22)
+        Me.ResetEbenenAuswahlToolStripMenuItem.Text = "Reset Ebenen-Auswahl"
+        '
+        'DateiimportEntitätToolStripMenuItem
+        '
+        Me.DateiimportEntitätToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.folder_Open_32xMD
+        Me.DateiimportEntitätToolStripMenuItem.Name = "DateiimportEntitätToolStripMenuItem"
+        Me.DateiimportEntitätToolStripMenuItem.Size = New System.Drawing.Size(194, 22)
+        Me.DateiimportEntitätToolStripMenuItem.Text = "Dateiimport Entität"
+        '
+        'FormDesignerToolStripMenuItem
+        '
+        Me.FormDesignerToolStripMenuItem.Name = "FormDesignerToolStripMenuItem"
+        Me.FormDesignerToolStripMenuItem.Size = New System.Drawing.Size(194, 22)
+        Me.FormDesignerToolStripMenuItem.Text = "Form-Designer"
+        '
        'SplitContainerBottom
        '
        Me.SplitContainerBottom.Collapsed = True
@ -440,7 +467,7 @@ Partial Class frmForm_Constructor_Main
        Me.TabWindream.Controls.Add(Me.ToolStripDokumente)
        Me.TabWindream.Image = Global.DD_Record_Organiser.My.Resources.Resources.Files_7954
        Me.TabWindream.Name = "TabWindream"
-        Me.TabWindream.Size = New System.Drawing.Size(1060, 312)
+        Me.TabWindream.Size = New System.Drawing.Size(1063, 316)
        Me.TabWindream.Text = "windream-Dateien"
        '
        'AxObjectListControl
@ -451,7 +478,7 @@ Partial Class frmForm_Constructor_Main
        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(1060, 287)
+        Me.AxObjectListControl.Size = New System.Drawing.Size(1063, 291)
        Me.AxObjectListControl.TabIndex = 6
        Me.AxObjectListControl.TabStop = False
        '
@ -460,7 +487,7 @@ Partial Class frmForm_Constructor_Main
        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(1060, 25)
+        Me.ToolStripDokumente.Size = New System.Drawing.Size(1063, 25)
        Me.ToolStripDokumente.TabIndex = 2
        Me.ToolStripDokumente.Text = "ToolStrip2"
        '
@ -494,7 +521,7 @@ Partial Class frmForm_Constructor_Main
        Me.TabFollowUp.Controls.Add(Me.ListViewFollowUp)
        Me.TabFollowUp.Image = Global.DD_Record_Organiser.My.Resources.Resources.Task_16xMD
        Me.TabFollowUp.Name = "TabFollowUp"
-        Me.TabFollowUp.Size = New System.Drawing.Size(1060, 312)
+        Me.TabFollowUp.Size = New System.Drawing.Size(1063, 316)
        Me.TabFollowUp.Text = "Wiedervorlage"
        '
        'grpbxFU_Profile
@ -845,25 +872,6 @@ Partial Class frmForm_Constructor_Main
        Me.TBPMO_FILES_USERBindingSource.DataMember = "TBPMO_FILES_USER"
        Me.TBPMO_FILES_USERBindingSource.DataSource = Me.DD_DMSDataSet
        '
-        'CMSEntity
-        '
-        Me.CMSEntity.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ResetEbenenAuswahlToolStripMenuItem, Me.DateiimportEntitätToolStripMenuItem})
-        Me.CMSEntity.Name = "ContextMenuStrip2"
-        Me.CMSEntity.Size = New System.Drawing.Size(195, 48)
-        '
-        'ResetEbenenAuswahlToolStripMenuItem
-        '
-        Me.ResetEbenenAuswahlToolStripMenuItem.Name = "ResetEbenenAuswahlToolStripMenuItem"
-        Me.ResetEbenenAuswahlToolStripMenuItem.Size = New System.Drawing.Size(194, 22)
-        Me.ResetEbenenAuswahlToolStripMenuItem.Text = "Reset Ebenen-Auswahl"
-        '
-        'DateiimportEntitätToolStripMenuItem
-        '
-        Me.DateiimportEntitätToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.folder_Open_32xMD
-        Me.DateiimportEntitätToolStripMenuItem.Name = "DateiimportEntitätToolStripMenuItem"
-        Me.DateiimportEntitätToolStripMenuItem.Size = New System.Drawing.Size(194, 22)
-        Me.DateiimportEntitätToolStripMenuItem.Text = "Dateiimport Entität"
-        '
        'frmForm_Constructor_Main
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@ -885,6 +893,7 @@ Partial Class frmForm_Constructor_Main
        Me.SplitContainerMain.ResumeLayout(False)
        CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainerTop.ResumeLayout(False)
+        Me.CMSEntity.ResumeLayout(False)
        CType(Me.SplitContainerBottom, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainerBottom.ResumeLayout(False)
        CType(Me.TCDetails, System.ComponentModel.ISupportInitialize).EndInit()
@ -910,7 +919,6 @@ Partial Class frmForm_Constructor_Main
        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.CMSEntity.ResumeLayout(False)
        Me.ResumeLayout(False)
        Me.PerformLayout()

@ -997,4 +1005,5 @@ Partial Class frmForm_Constructor_Main
    Friend WithEvents ResetEbenenAuswahlToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
    Friend WithEvents DateiimportEntitätToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
    Friend WithEvents tsslblWorkflowstate As System.Windows.Forms.ToolStripStatusLabel
+    Friend WithEvents FormDesignerToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
 End Class
--- a/app/DD-Record-Organiser/frmForm_Constructor_Main.resx
+++ b/app/DD-Record-Organiser/frmForm_Constructor_Main.resx
@ -151,6 +151,9 @@
  <metadata name="StatusStrip_Main.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
+  <metadata name="CMSEntity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 93</value>
+  </metadata>
  <data name="AxObjectListControl.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
@ -162,9 +165,6 @@
  <metadata name="ToolStripDokumente.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1157, 15</value>
  </metadata>
-  <metadata name="ToolStripEdit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>773, 15</value>
-  </metadata>
  <data name="ToolStripDropDownButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@ -178,6 +178,9 @@
        DwcIdDRYJUwiAB0yTe/NNUuIXy/etxLLTTpKAAAAAElFTkSuQmCC
 </value>
  </data>
+  <metadata name="ToolStripEdit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>773, 15</value>
+  </metadata>
  <metadata name="BindingSource_Entity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>162, 11</value>
  </metadata>
@ -225,7 +228,7 @@
  <metadata name="TBPMO_FILES_USERBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1222, 54</value>
  </metadata>
-  <metadata name="CMSEntity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 93</value>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>164</value>
  </metadata>
 </root>
--- a/app/DD-Record-Organiser/frmForm_Constructor_Main.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor_Main.vb
@ -18,7 +18,7 @@ Public Class frmForm_Constructor_Main
    Public EBENE2_PARENT_ID As Integer
    Public EBENE3_PARENT_ID As Integer
    Public ACT_EBENE As Integer
-    Public ACT_EBENE_STRING
+    Public ACT_EBENE_STRING As String
    Public SELECTED_RECORD_ID As Integer
    Public PARENT_RECORDID As Integer
    Public thisFORMVIEW_ID As Integer
@ -92,7 +92,6 @@ Public Class frmForm_Constructor_Main
    Private Sub frmForm_Constructor_Main_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
        _FormClosing = True
        ' Check_Record_Changed()
-        SaveLayout()
        CloseWDDocview()
        ClassWindowLocation.SaveFormLocationSize(Me, CONSTRUCTORID, CURRENT_SCREEN_ID, "CONSTRUCTOR_MAIN")
    End Sub
@ -105,7 +104,12 @@ Public Class frmForm_Constructor_Main

        Init_Grid_Control()

-      
+        ' Bestimme Dinge ausblenden wenn kein admin
+        If USER_IS_ADMIN = True Then
+            FormDesignerToolStripMenuItem.Visible = True
+        Else
+            FormDesignerToolStripMenuItem.Visible = False
+        End If

        Try

@ -133,13 +137,37 @@ Public Class frmForm_Constructor_Main
    End Sub

 #Region "Layout"
-    Public Sub LoadLayout()
-        'TODO
+    Private Sub grvwGrid_Layout(sender As Object, e As EventArgs) Handles grvwGrid.Layout
+        If dataloaded And grvwGrid.Columns.Count <> 0 Then
+            Save_Grid_Layout()
+        End If
    End Sub

-    Public Sub SaveLayout()
-        'TODO
+    Sub Save_Grid_Layout()
+        Dim XMLPath = Get_Grid_Layout_Filename()
+        grvwGrid.SaveLayoutToXml(XMLPath)
+        Update_Status_Label(True, "Grid Layout Loaded")
    End Sub
+
+    Sub Load_Grid_Layout()
+        Dim XMLPath = Get_Grid_Layout_Filename()
+        If File.Exists(XMLPath) Then
+            grvwGrid.RestoreLayoutFromXml(XMLPath)
+            grvwGrid.ClearColumnsFilter()
+            'grvwGrid.ClearGrouping()
+            grvwGrid.ClearSelection()
+            grvwGrid.OptionsView.ShowPreview = False
+
+            Update_Status_Label(True, "Grid Layout Loaded")
+        End If
+    End Sub
+
+    Private Function Get_Grid_Layout_Filename()
+        Dim EntityRegex As New RegularExpressions.Regex("\s+\(\d+\)")
+        Dim EntityName As String = EntityRegex.Replace(ACT_EBENE_STRING, "")
+        Dim Filename As String = String.Format("{0}-{1}-{2}-UserLayout.xml", grvwGrid.Name, EntityName, CONSTRUCTORID)
+        Return System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
+    End Function
 #End Region

 #Region "NavPane"
@ -494,6 +522,88 @@ Public Class frmForm_Constructor_Main
            Load_Entity_Data(ACT_EBENE)
        End If
    End Sub
+
+    Sub Get_RecordCounts_Nodes()
+        Try
+            Dim selnode As TreeNode = TreeViewMain.SelectedNode
+            Dim a As Integer = 0
+            For Each childNodeLevel1 As TreeNode In selnode.Nodes
+                Dim PARENT_ID As Integer
+                Dim TYPE_ID As Integer
+                If a = 0 Then
+                    Dim sql As String = "SELECT PARENT_ID, FORM_TYPE_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & childNodeLevel1.Tag
+                    Dim DT As DataTable = ClassDatabase.Return_Datatable(sql, "ShowNodeAmounts")
+                    PARENT_ID = DT.Rows(0).Item(0)
+                    TYPE_ID = DT.Rows(0).Item(1)
+                End If
+                If TYPE_ID <> 5 Then
+                    If childNodeLevel1.Text = "Allgemein" Then
+                        Console.WriteLine("Allgemein-Reiter")
+                    End If
+                    Dim result As Integer = ReturnAmountofRecords(childNodeLevel1.Tag, PARENT_ID)
+                    If result <> 99999999 Then
+                        Dim origtext As String = childNodeLevel1.Text
+                        If origtext.Contains(" (") Then
+                            Dim existingstring = origtext.Substring(0, origtext.IndexOf("(") - 1)
+                            childNodeLevel1.Text = existingstring & " (" & result.ToString & ")"
+                        Else
+                            childNodeLevel1.Text = childNodeLevel1.Text & " (" & result.ToString & ")"
+                        End If
+                    End If
+
+                    For Each childNodeLevel2 As TreeNode In childNodeLevel1.Nodes
+                        Dim origtext As String = childNodeLevel2.Text
+                        If origtext.Contains(" (") Then
+                            Dim existingstring = origtext.Substring(0, origtext.IndexOf("(") - 1)
+                            childNodeLevel2.Text = existingstring
+                        End If
+                        For Each childNodeLevel3 As TreeNode In childNodeLevel2.Nodes
+                            Dim origtext1 As String = childNodeLevel3.Text
+                            If origtext1.Contains(" (") Then
+                                Dim existingstring = origtext1.Substring(0, origtext1.IndexOf("(") - 1)
+                                childNodeLevel1.Text = existingstring
+                            End If
+                        Next
+                    Next
+                    a += 1
+                End If
+
+            Next
+        Catch ex As Exception
+            MsgBox("Error in Get_RecordCounts_Nodes:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
+        End Try
+    End Sub
+    Function ReturnAmountofRecords(EntityID As Integer, PARENT_ID As Integer)
+        Dim _sql As String
+        'Abhängig von der Entität dieAnzahl der Datensätze laden
+        _sql = ClassDatabase.Execute_Scalar("SELECT SQL_SELECT_EBENE2 FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = " & CONSTRUCTORID & " AND FORM_ID = " & EntityID)
+        Select Case ACT_EBENE
+            Case 1
+                If EBENE1_RECID = 0 Then
+                    Return 99999999
+                End If
+
+                _sql = _sql.Replace("@RecordID", EBENE1_RECID)
+            Case 2
+                If EBENE2_RECID = 0 Then
+                    Return 99999999
+                End If
+                If EBENE1_RECID = 0 Then
+
+                End If
+                _sql = _sql.Replace("@RecordID", EBENE2_RECID)
+            Case 3
+                If EBENE3_RECID = 0 Then
+                    Return 99999999
+                End If
+                _sql = _sql.Replace("@RecordID", EBENE2_RECID)
+
+        End Select
+
+        Dim DT2 As DataTable = ClassDatabase.Return_Datatable(_sql, "ReturnAmountofRecords 1")
+        Return DT2.Rows.Count
+    End Function
+
 #End Region

 #Region "Status Bar"
@ -542,8 +652,8 @@ Public Class frmForm_Constructor_Main
                                                   AddressOf NewEditAppointment,
                                                   AddressOf OpenFormData)
        CtrlCommandUI.LoadControls(CURRENT_FORM_ID)
+        pnlDetails.Enabled = False
        AddHandler CtrlBuilder.OnRecordChanged, AddressOf OnRecordChanged
-
    End Sub

    Private Sub OnRecordChanged(sender As Object, e As System.EventArgs)
@ -814,7 +924,7 @@ Public Class frmForm_Constructor_Main
                MsgBox("Error in GetParentID for selectedNode - Check Logfile", MsgBoxStyle.Exclamation)
                Exit Sub
            End If
-            'dataloaded = False
+            dataloaded = False
            'Abhängig von der Entität die Selektierungs-Daten laden
            Get_Grid_Sql(CONSTRUCTORID, CURRENT_FORM_ID)

@ -995,6 +1105,8 @@ Public Class frmForm_Constructor_Main
            Me.Cursor = Cursors.Default
            dataloaded = True

+            Load_Grid_Layout()
+

            If GRID_TYPE = GridType.Tiles Then
                CreateTile()
@ -1057,6 +1169,7 @@ Public Class frmForm_Constructor_Main
                    If Column.DataType.ToString.Contains("Byte") Then
                        ImageColumn = New TileViewItemElement()
                        With ImageColumn
+                            .Image = My.Resources.keinbild
                            .Column = grvwTiles.Columns(1)
                            .ImageSize = New Size(186, 90)
                            .ImageScaleMode = TileItemImageScaleMode.Squeeze
@ -1179,7 +1292,9 @@ Public Class frmForm_Constructor_Main
            '    End If
            'Next
            'grvwGrid.Columns("Record-ID").OptionsColumn.AllowShowHide = False
-            'Load_GridSelection_Layout()
+            Load_Grid_Layout()
+
+
            HideColumns()
            Dim selnode As TreeNode = TreeViewMain.SelectedNode
            Dim origtext As String = selnode.Text
@ -1411,7 +1526,8 @@ Public Class frmForm_Constructor_Main
        'Refresh_CreatedChangedRecordByID(SelectedRecordID)
        'Anzeige_Selected_Entity()
        'Show_act_WFTask()
-        'Get_RecordCounts_Nodes()
+        Get_RecordCounts_Nodes()
+        pnlDetails.Enabled = False

        'Refresh_TaskOverview()
    End Sub
@ -2137,4 +2253,40 @@ Public Class frmForm_Constructor_Main
    Private Sub ZeigeRecordLogsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZeigeRecordLogsToolStripMenuItem.Click
        frmRecord_Changes.ShowDialog()
    End Sub
+
+    Private Sub FormDesignerToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles FormDesignerToolStripMenuItem.Click
+        Try
+            Dim SelectedNode As TreeNode = TryCast(TreeViewMain.SelectedNode, TreeNode)
+            If SelectedNode IsNot Nothing Then
+                Dim FormId As Integer = SelectedNode.Tag
+                If FormId > 0 Then
+                    CURRENT_FORM_ID = FormId
+                    Cursor = Cursors.WaitCursor
+                    OpenFormLevelDesigner()
+                    Cursor = Cursors.Default
+                End If
+            End If
+        Catch ex As Exception
+            MsgBox("Unexpected Error in Open Designer: " & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+
+    Private Sub ButtonExportToExcel_Click(sender As Object, e As EventArgs) Handles ButtonExportToExcel.Click
+        Dim saveFileDialog1 As New SaveFileDialog
+        saveFileDialog1.Filter = "Excel File|*.xlsx"
+        saveFileDialog1.Title = "Export to Excel:"
+        saveFileDialog1.ShowDialog()
+        If saveFileDialog1.FileName <> "" Then
+            Cursor = Cursors.WaitCursor
+            GridControlMain.MainView.ExportToXlsx(saveFileDialog1.FileName)
+            Dim result As MsgBoxResult
+            result = MessageBox.Show("Datei wurde erstellt! Wollen Sie diese nun öffnen?", "Erfolgsmeldung:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+            If result = MsgBoxResult.Yes Then
+                Process.Start(saveFileDialog1.FileName)
+            End If
+        End If
+        Cursor = Cursors.Default
+    End Sub
+
+   
 End Class
--- a/app/DD-Record-Organiser/frmLevel_Designer.vb
+++ b/app/DD-Record-Organiser/frmLevel_Designer.vb
@ -208,7 +208,6 @@
            Dim wid As Integer = Me.Width
            Dim update_sizepnl As String = "UPDATE TBPMO_FORM_VIEW SET HEIGHT = " & pnlDesigner.Height & ",WIDTH = " & wid & " where FORM_ID = " & CURRENT_FORM_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID
            ClassDatabase.Execute_non_Query(update_sizepnl)
-            frmForm_Overview.Instance.Show()
            frmTool_ControlProperties.Instance.Close()
            frmTool_ControlDesigner.Instance.Close()
        Catch ex As Exception
--- a/app/DD-Record-Organiser/frmMain.Designer.vb
+++ b/app/DD-Record-Organiser/frmMain.Designer.vb
@ -58,6 +58,7 @@ Partial Class frmMain
        Me.pageHome = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.groupQuickAccess = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.groupQuickAccessDemo = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.pageForms = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.pageAdmin = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroupProgram = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@ -68,8 +69,6 @@ Partial Class frmMain
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.DefaultLookAndFeel1 = New DevExpress.LookAndFeel.DefaultLookAndFeel(Me.components)
        Me.BarButtonItem11 = New DevExpress.XtraBars.BarButtonItem()
-        Me.Button1 = New System.Windows.Forms.Button()
-        Me.Button2 = New System.Windows.Forms.Button()
        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.ribbonMain, System.ComponentModel.ISupportInitialize).BeginInit()
@ -141,7 +140,7 @@ Partial Class frmMain
        Me.ribbonMain.ExpandCollapseItem.Id = 0
        Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.LabelMachine, Me.LabelUser, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17})
        Me.ribbonMain.Location = New System.Drawing.Point(0, 0)
-        Me.ribbonMain.MaxItemId = 30
+        Me.ribbonMain.MaxItemId = 31
        Me.ribbonMain.Name = "ribbonMain"
        Me.ribbonMain.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.pageHome, Me.pageForms, Me.pageAdmin})
        Me.ribbonMain.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2013
@ -341,7 +340,7 @@ Partial Class frmMain
        '
        'pageHome
        '
-        Me.pageHome.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.groupQuickAccess})
+        Me.pageHome.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.groupQuickAccess, Me.groupQuickAccessDemo})
        Me.pageHome.Image = Global.DD_Record_Organiser.My.Resources.Resources.HomeHS
        Me.pageHome.Name = "pageHome"
        Me.pageHome.Text = "Home"
@ -360,6 +359,11 @@ Partial Class frmMain
        Me.groupQuickAccess.Name = "groupQuickAccess"
        Me.groupQuickAccess.Text = "Schnellstart"
        '
+        'groupQuickAccessDemo
+        '
+        Me.groupQuickAccessDemo.Name = "groupQuickAccessDemo"
+        Me.groupQuickAccessDemo.Text = "Schnellstart 2"
+        '
        'pageForms
        '
        Me.pageForms.Appearance.BackColor = System.Drawing.Color.Yellow
@ -441,24 +445,6 @@ Partial Class frmMain
        Me.BarButtonItem11.Name = "BarButtonItem11"
        Me.BarButtonItem11.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
        '
-        'Button1
-        '
-        Me.Button1.Location = New System.Drawing.Point(381, 32)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(75, 23)
-        Me.Button1.TabIndex = 3
-        Me.Button1.Text = "Button1"
-        Me.Button1.UseVisualStyleBackColor = True
-        '
-        'Button2
-        '
-        Me.Button2.Location = New System.Drawing.Point(504, 32)
-        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(75, 23)
-        Me.Button2.TabIndex = 7
-        Me.Button2.Text = "Button2"
-        Me.Button2.UseVisualStyleBackColor = True
-        '
        'frmMain
        '
        Me.Appearance.BackColor = System.Drawing.Color.White
@ -467,8 +453,6 @@ Partial Class frmMain
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(1498, 678)
-        Me.Controls.Add(Me.Button2)
-        Me.Controls.Add(Me.Button1)
        Me.Controls.Add(Me.RibbonStatusBar1)
        Me.Controls.Add(Me.ribbonMain)
        Me.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@ -530,7 +514,6 @@ Partial Class frmMain
    Friend WithEvents BarButtonItem15 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarButtonItem16 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarButtonItem17 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents Button1 As System.Windows.Forms.Button
-    Friend WithEvents Button2 As System.Windows.Forms.Button
+    Friend WithEvents groupQuickAccessDemo As DevExpress.XtraBars.Ribbon.RibbonPageGroup

 End Class
--- a/app/DD-Record-Organiser/frmMain.vb
+++ b/app/DD-Record-Organiser/frmMain.vb
@ -130,9 +130,37 @@ Public Class frmMain
                AddHandler item.ItemClick, AddressOf ToolbarButtonItemClick

                groupQuickAccess.ItemLinks.Add(item)
+
            Next

        End If
+
+        ' TODO: NUR FÜR WINDREAM CON!!!
+        If dt.Rows.Count <> 0 Then
+
+            For Each row As DataRow In dt.Rows
+                If Not IsDBNull(row.Item("MENU_IMG")) Then
+                    Dim bimg() As Byte = row.Item("MENU_IMG")
+                    Dim bitmap As Bitmap = ByteArrayToBitmap(bimg)
+                    image2 = bitmap
+                End If
+
+                Dim title As String = row.Item("FORM_TITLE")
+                Dim index As Integer = row.Item("SEQUENCE_MENU")
+                Dim tag As Integer = row.Item("GUID")
+                Dim item As New BarButtonItem(ribbonMain.Manager, title)
+                item.RibbonStyle = RibbonItemStyles.Large
+                item.Caption = title
+                item.Tag = tag
+                item.Glyph = image2
+
+                AddHandler item.ItemClick, AddressOf ToolbarButtonItemClickDemo
+                groupQuickAccessDemo.ItemLinks.Add(item)
+
+            Next
+
+        End If
+        ' TODO: NUR FÜR WINDREAM CON!!!
    End Sub

  
@ -144,6 +172,16 @@ Public Class frmMain
        Cursor = Cursors.Default
    End Sub

+    ' TODO: NUR FÜR WINDREAM CON!!!
+    Private Sub ToolbarButtonItemClickDemo(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
+        Dim formId As Integer = Integer.Parse(e.Item.Tag)
+
+        Cursor = Cursors.WaitCursor
+        OpenFormConstructorDemo(formId)
+        Cursor = Cursors.Default
+    End Sub
+    ' TODO: NUR FÜR WINDREAM CON!!!
+
    Private Sub ToolbarButtonItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
        Dim formId As Integer = Integer.Parse(e.Item.Tag)

@ -222,11 +260,6 @@ Public Class frmMain

    Private Sub frmMain_Load(sender As Object, e As EventArgs) Handles Me.Load
        Try
-            If Environment.UserDomainName.ToLower.Contains("digitald") Then
-                Button1.Visible = True
-            Else
-                Button1.Visible = False
-            End If
            ' Form Titel setzen
            ClassWindowLocation.LoadFormLocationSize(Me, 1, CURRENT_SCREEN_ID, "frmMain")
            Me.Text = Application.ProductName
@ -434,14 +467,4 @@ Public Class frmMain
    Private Sub BarButtonItem17_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem17.ItemClick
        OpenTemplatemanagement()
    End Sub
-
-    Private Sub Button1_Click_1(sender As Object, e As EventArgs) Handles Button1.Click
-        Dim form As New frmConstructor_Main()
-        form.Show()
-    End Sub
-
-    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
-        Dim frm As New frmForm_Constructor_Main()
-        frm.Show()
-    End Sub
 End Class
--- a/app/DD-Record-Organiser/frmTool_ControlProperties.vb
+++ b/app/DD-Record-Organiser/frmTool_ControlProperties.vb
@ -86,14 +86,12 @@
                        Case "Checkbox"
                            props = New CheckBoxProperties()
                            props.Caption = row.Item("CTRLSCR_CAPTION")
-                            If Not IsDBNull(row.Item("CONTROL_DEF_VALUE")) Then
-                                props.DefaultValue = row.Item("CONTROL_DEF_VALUE")
-                            Else
+
+                            If IsDBNull(row.Item("CONTROL_DEF_VALUE")) Or row.Item("CONTROL_DEF_VALUE") = String.Empty Then
                                props.DefaultValue = False
+                            Else
+                                props.DefaultValue = row.Item("CONTROL_DEF_VALUE")
                            End If
-
-
-
                        Case "Datepicker"
                            props = New DateTimePickerProperties()
                        Case "Datagridview"
--- a/app/DD-Record-Organiser/nveup4i1.png
+++ b/app/DD-Record-Organiser/nveup4i1.png
@ -1,84 +0,0 @@
-Public NotInheritable Class frmSplash
-
-    'TODO: Dieses Formular kann einfach als Begrüßungsbildschirm für die Anwendung festgelegt werden, indem Sie zur Registerkarte "Anwendung"
-    '  des Projekt-Designers wechseln (Menü "Projekt", Option "Eigenschaften").
-    Private Init As ClassInit
-    Private InitSteps As Integer = 4
-
-    Private Sub frmSplash_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
-        'Richten Sie den Dialogtext zur Laufzeit gemäß den Assemblyinformationen der Anwendung ein.  
-
-        'TODO: Die Assemblyinformationen der Anwendung im Bereich "Anwendung" des Dialogfelds für die 
-        '  Projekteigenschaften (im Menü "Projekt") anpassen.
-
-        'Anwendungstitel
-        If My.Application.Info.Title <> "" Then
-            ApplicationTitle.Text = My.Application.Info.Title
-        Else
-            'Wenn der Anwendungstitel fehlt, Anwendungsnamen ohne Erweiterung verwenden
-            ApplicationTitle.Text = System.IO.Path.GetFileNameWithoutExtension(My.Application.Info.AssemblyName)
-        End If
-
-        'Verwenden Sie zum Formatieren der Versionsinformationen den Text, der zur Entwurfszeit in der Versionskontrolle festgelegt wurde, als
-        '  Formatierungszeichenfolge. Dies ermöglicht ggf. eine effektive Lokalisierung.
-        '  Build- und Revisionsinformationen können durch Verwendung des folgenden Codes und durch Ändern 
-        '  des Entwurfszeittexts der Versionskontrolle in "Version {0}.{1:00}.{2}.{3}" oder einen ähnlichen Text eingeschlossen werden.  Weitere Informationen erhalten Sie unter
-        '  String.Format() in der Hilfe.
-        '
-        '    Version.Text = System.String.Format(Version.Text, My.Application.Info.Version.Major, My.Application.Info.Version.Minor, My.Application.Info.Version.Build, My.Application.Info.Version.Revision)
-
-        Version.Text = System.String.Format(Version.Text, My.Application.Info.Version.Major, My.Application.Info.Version.Minor)
-
-        'Copyrightinformationen
-        Copyright.Text = My.Application.Info.Copyright
-        Me.BringToFront()
-
-        InitProgram()
-    End Sub
-
-    Private Sub InitProgram()
-        Init = New ClassInit()
-        BackgroundWorker1.RunWorkerAsync()
-    End Sub
-
-    Private Function CalcProgress(_step As Integer)
-        Return _step * (100 / InitSteps)
-    End Function
-
-
-    Private Sub BackgroundWorker1_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles BackgroundWorker1.DoWork
-        BackgroundWorker1.ReportProgress(CalcProgress(1), "Initialisiere Logger")
-        Init.InitLogger()
-
-        System.Threading.Thread.Sleep(100)
-
-        BackgroundWorker1.ReportProgress(CalcProgress(2), "Initialisiere Datenbank")
-        Init.InitDatabase()
-
-        System.Threading.Thread.Sleep(100)
-
-        BackgroundWorker1.ReportProgress(CalcProgress(3), "Initialisiere Windream-Einstellungen")
-        Init.InitWindream()
-
-        System.Threading.Thread.Sleep(100)
-
-        BackgroundWorker1.ReportProgress(CalcProgress(4), "Initialisiere Benutzer")
-        Init.InitUserLogin()
-    End Sub
-
-    Private Sub BackgroundWorker1_ProgressChanged(sender As Object, e As System.ComponentModel.ProgressChangedEventArgs) Handles BackgroundWorker1.ProgressChanged
-        pbStatus.Value = e.ProgressPercentage
-        lblStatus.Text = e.UserState.ToString()
-    End Sub
-
-    Private Sub BackgroundWorker1_RunWorkerCompleted(sender As Object, e As System.ComponentModel.RunWorkerCompletedEventArgs) Handles BackgroundWorker1.RunWorkerCompleted
-        ' Bei Fehler MsgBox anzeigen und Programm beenden
-        If e.Error IsNot Nothing Then
-            MsgBox(e.Error.Message, MsgBoxStyle.Critical, "Fehler beim Initialisieren")
-            Application.Exit()
-        End If
-
-        ' Wenn kein Fehler, Splashscreen schließen
-        Me.Close()
-    End Sub
-End Class