MS:02.11.2015

2015-11-03 09:54:39 +01:00
parent f26ba63935
commit 304df6b023
19 changed files with 182 additions and 198 deletions
--- a/app/DD-Record-Organiser/ClassImport_Windream.vb
+++ b/app/DD-Record-Organiser/ClassImport_Windream.vb
@@ -148,53 +148,54 @@ Public Class ClassImport_Windream
            For Each element As System.Text.RegularExpressions.Match In elemente
                If LogErrorsOnly = False Then ClassLogger.Add(">> element in RegeX: " & element.Value, False)
                Select Case element.Value.Substring(2, 1).ToUpper
-                    ''Manueller Indexwert
-                    'Case "M"
-                    '    If LogErrorsOnly = False Then ClassLogger.Add(" >>Manueller Index wird geprüft...", False)
-                    '    Dim Indexname = element.Value.Substring(3, element.Value.Length - 4)
-                    '    Dim value As String = GetManIndex_Value(element.Value.Substring(3, element.Value.Length - 4), "FILE")
-                    '    If value <> String.Empty Then
-                    '        DATEINAME = DATEINAME.Replace(element.Value, value)
-                    '        _NewFileString = DATEINAME
-                    '        sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString
-                    '        AnzahlIndexe += 1
-                    '        sql_history_Index_Values = sql_history_Index_Values & ", '" & value & "'"
-                    '    Else
-                    '        Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & FW_DOCTYPE_IDTextBox.Text & " AND UPPER(NAME) = UPPER('" & Indexname & "')", True)
-                    '        If optional_index = True Then
-                    '            Dim result As MsgBoxResult
-                    '            result = MessageBox.Show("Achtung der optionale Index ist leer, wird aber für die Benennung der Datei benutzt." & vbNewLine & "Wollen Sie stattdessen den Originaldateinamen verwenden?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
-                    '            If result = MsgBoxResult.Yes Then
-                    '                DATEINAME = DATEINAME.Replace(element.Value, Path.GetFileNameWithoutExtension(CURRENT_FILENAME))
-                    '                _NewFileString = DATEINAME
-                    '                sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString
-                    '                AnzahlIndexe += 1
-                    '                sql_history_Index_Values = sql_history_Index_Values & ", '" & Path.GetFileNameWithoutExtension(CURRENT_FILENAME) & "'"
-                    '            Else
-                    '                DATEINAME = DATEINAME.Replace(element.Value, value)
-                    '                _NewFileString = DATEINAME
-                    '                sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString
-                    '                AnzahlIndexe += 1
-                    '                sql_history_Index_Values = sql_history_Index_Values & ", '" & value & "'"
-                    '            End If
-
-                    '        Else
-                    '            ClassLogger.Add(" >> Der Indexvalue für Index '" & Indexname & "' ist String.Empty", False)
-                    '            err = True
-                    '        End If
-
-                    '    End If
+                    'Nur automatische Indizes auswerten
                    Case "A"
                        Dim APattern = element.Value.Substring(3, element.Value.Length - 4)
                        Dim value As String

                        Select Case APattern
+                            'Laufzeitvariable Record-ID
                            Case "RECORD_ID"
                                value = CURRENT_RECORD_ID
                            Case "DOKART"
+                                'Laufzeitvariable Dokumentartstring
                                value = CURRENT_DOKARTSTRING
                            Case Else
-                                If APattern.Contains("#") Then
+                                'Ein Index der nur für die Namenkonvention herangezogen wird
+                                If APattern.StartsWith("NC_") And APattern.Contains("#") Then
+                                    Dim split() As String = APattern.Split("#")
+                                    If split.Length = 2 Then
+                                        'Die GUID des AutoIndex auslesen
+                                        Dim INDEX_ID = split(1)
+                                        If IsNumeric(INDEX_ID) Then
+                                            Dim sql_AUTOindexresult = ClassDatabase.Execute_Scalar("SELECT SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE GUID = " & INDEX_ID, True)
+                                            If IsNothing(sql_AUTOindexresult) Then
+                                                If LogErrorsOnly = False Then ClassLogger.Add(">> unexpected: sql_AUTOindexresult is nothing!!", False)
+                                                value = ""
+                                            Else
+                                                If IsDBNull(sql_AUTOindexresult) Then
+                                                    value = ""
+                                                Else
+                                                    sql_AUTOindexresult = sql_AUTOindexresult.ToString.ToUpper.Replace("@RECORD-ID", CURRENT_RECORD_ID)
+                                                    Dim AUTOindexresult = ClassDatabase.Execute_Scalar(sql_AUTOindexresult, True)
+                                                    If IsNothing(AUTOindexresult) Then
+                                                        ClassLogger.Add(">> unexpected: AUTOindexresult is nothing!!", False)
+                                                        value = ""
+                                                    Else
+                                                        If IsDBNull(AUTOindexresult) Then
+                                                            value = ""
+                                                        Else
+                                                            value = AUTOindexresult
+                                                        End If
+                                                    End If
+
+                                                End If
+                                            End If
+
+                                        End If
+                                    End If
+
+                                ElseIf APattern.Contains("#") Then
                                    If LogErrorsOnly = False Then ClassLogger.Add(">> element filled with Record-Data.......: ", False)
                                    Dim split() As String = APattern.Split("#")
                                    If split.Length = 2 Then
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.34014
+'     Laufzeitversion:4.0.30319.34209
 '
 '     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
 '     der Code erneut generiert wird.
@@ -24,7 +24,7 @@ Namespace My
        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
        Public Sub New()
            MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)
-            Me.IsSingleInstance = false
+            Me.IsSingleInstance = true
            Me.EnableVisualStyles = true
            Me.SaveMySettingsOnExit = true
            Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses
--- a/app/DD-Record-Organiser/My
+++ b/app/DD-Record-Organiser/My
@@ -2,7 +2,7 @@
 <MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
  <MySubMain>true</MySubMain>
  <MainForm>frmMain</MainForm>
-  <SingleInstance>false</SingleInstance>
+  <SingleInstance>true</SingleInstance>
  <ShutdownMode>0</ShutdownMode>
  <EnableVisualStyles>true</EnableVisualStyles>
  <AuthenticationMode>0</AuthenticationMode>
--- a/app/DD-Record-Organiser/My
+++ b/app/DD-Record-Organiser/My
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("1.5.0.0")> 
+<Assembly: AssemblyVersion("1.6.0.0")> 
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
--- a/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb
+++ b/app/DD-Record-Organiser/frmDokumentart_Konfig.Designer.vb
@@ -41,9 +41,10 @@ Partial Class frmDokumentart_Konfig
        Dim CHANGED_WHOLabel As System.Windows.Forms.Label
        Dim CHANGED_WHENLabel As System.Windows.Forms.Label
        Dim OBJEKTTYPLabel As System.Windows.Forms.Label
+        Dim SQL_RESULTLabel As System.Windows.Forms.Label
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDokumentart_Konfig))
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.TBDD_DOKUMENTARTBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components)
        Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton()
        Me.TBDD_DOKUMENTARTBindingSource = New System.Windows.Forms.BindingSource(Me.components)
@@ -92,6 +93,7 @@ Partial Class frmDokumentart_Konfig
        Me.ToolStripStatusLabel1 = New System.Windows.Forms.ToolStripStatusLabel()
        Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
        Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
+        Me.SQL_RESULTTextBox = New System.Windows.Forms.TextBox()
        Me.Label2 = New System.Windows.Forms.Label()
        Me.lblSaveIndex = New System.Windows.Forms.Label()
        Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox()
@@ -167,6 +169,7 @@ Partial Class frmDokumentart_Konfig
        CHANGED_WHOLabel = New System.Windows.Forms.Label()
        CHANGED_WHENLabel = New System.Windows.Forms.Label()
        OBJEKTTYPLabel = New System.Windows.Forms.Label()
+        SQL_RESULTLabel = New System.Windows.Forms.Label()
        CType(Me.TBDD_DOKUMENTARTBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.TBDD_DOKUMENTARTBindingNavigator.SuspendLayout()
        CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -302,9 +305,9 @@ Partial Class frmDokumentart_Konfig
        VALUELabel.AutoSize = True
        VALUELabel.Location = New System.Drawing.Point(662, 63)
        VALUELabel.Name = "VALUELabel"
-        VALUELabel.Size = New System.Drawing.Size(181, 15)
+        VALUELabel.Size = New System.Drawing.Size(150, 15)
        VALUELabel.TabIndex = 6
-        VALUELabel.Text = "Automatischer Indexierungswert:"
+        VALUELabel.Text = "Platzhalter Laufzeitvariable:"
        '
        'COMMENTLabel
        '
@@ -361,6 +364,15 @@ Partial Class frmDokumentart_Konfig
        OBJEKTTYPLabel.TabIndex = 26
        OBJEKTTYPLabel.Text = "Objekttyp:"
        '
+        'SQL_RESULTLabel
+        '
+        SQL_RESULTLabel.AutoSize = True
+        SQL_RESULTLabel.Location = New System.Drawing.Point(929, 63)
+        SQL_RESULTLabel.Name = "SQL_RESULTLabel"
+        SQL_RESULTLabel.Size = New System.Drawing.Size(68, 15)
+        SQL_RESULTLabel.TabIndex = 79
+        SQL_RESULTLabel.Text = "SQL-Result:"
+        '
        'TBDD_DOKUMENTARTBindingNavigator
        '
        Me.TBDD_DOKUMENTARTBindingNavigator.AddNewItem = Me.BindingNavigatorAddNewItem
@@ -833,6 +845,8 @@ Partial Class frmDokumentart_Konfig
        'XtraTabPage1
        '
        Me.XtraTabPage1.AutoScroll = True
+        Me.XtraTabPage1.Controls.Add(SQL_RESULTLabel)
+        Me.XtraTabPage1.Controls.Add(Me.SQL_RESULTTextBox)
        Me.XtraTabPage1.Controls.Add(Me.Label2)
        Me.XtraTabPage1.Controls.Add(Me.lblSaveIndex)
        Me.XtraTabPage1.Controls.Add(CHANGED_WHENLabel)
@@ -858,6 +872,16 @@ Partial Class frmDokumentart_Konfig
        Me.XtraTabPage1.Size = New System.Drawing.Size(1265, 252)
        Me.XtraTabPage1.Text = "Automatische Indexe"
        '
+        'SQL_RESULTTextBox
+        '
+        Me.SQL_RESULTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "SQL_RESULT", True))
+        Me.SQL_RESULTTextBox.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.SQL_RESULTTextBox.Location = New System.Drawing.Point(932, 81)
+        Me.SQL_RESULTTextBox.Multiline = True
+        Me.SQL_RESULTTextBox.Name = "SQL_RESULTTextBox"
+        Me.SQL_RESULTTextBox.Size = New System.Drawing.Size(317, 115)
+        Me.SQL_RESULTTextBox.TabIndex = 80
+        '
        'Label2
        '
        Me.Label2.AutoSize = True
@@ -954,7 +978,7 @@ Partial Class frmDokumentart_Konfig
        '
        Me.INDEXNAMEComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "INDEXNAME", True))
        Me.INDEXNAMEComboBox.FormattingEnabled = True
-        Me.INDEXNAMEComboBox.Location = New System.Drawing.Point(391, 81)
+        Me.INDEXNAMEComboBox.Location = New System.Drawing.Point(391, 80)
        Me.INDEXNAMEComboBox.Name = "INDEXNAMEComboBox"
        Me.INDEXNAMEComboBox.Size = New System.Drawing.Size(268, 23)
        Me.INDEXNAMEComboBox.TabIndex = 0
@@ -1125,8 +1149,8 @@ Partial Class frmDokumentart_Konfig
        '
        Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AllowUserToAddRows = False
        Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AllowUserToDeleteRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua
-        Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua
+        Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
        Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
            Or System.Windows.Forms.AnchorStyles.Left) _
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -1134,14 +1158,14 @@ Partial Class frmDokumentart_Konfig
        Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1, Me.DataGridViewTextBoxColumn3, Me.DataGridViewTextBoxColumn5, Me.DataGridViewTextBoxColumn6, Me.DataGridViewTextBoxColumn7, Me.DataGridViewTextBoxColumn8, Me.DataGridViewTextBoxColumn9})
        Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.DataSource = Me.TBPMO_WD_FORMVIEW_DOKTYPESBindingSource
-        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window
-        DataGridViewCellStyle3.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        DataGridViewCellStyle3.ForeColor = System.Drawing.Color.FromArgb(CType(CType(32, Byte), Integer), CType(CType(31, Byte), Integer), CType(CType(53, Byte), Integer))
-        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        DataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
-        Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.DefaultCellStyle = DataGridViewCellStyle3
+        DataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle2.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        DataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(CType(CType(59, Byte), Integer), CType(CType(59, Byte), Integer), CType(CType(59, Byte), Integer))
+        DataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
+        Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.DefaultCellStyle = DataGridViewCellStyle2
        Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.Location = New System.Drawing.Point(11, 106)
        Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.Name = "TBPMO_WD_FORMVIEW_DOKTYPESDataGridView"
        Me.TBPMO_WD_FORMVIEW_DOKTYPESDataGridView.ReadOnly = True
@@ -1520,4 +1544,5 @@ Partial Class frmDokumentart_Konfig
    Friend WithEvents Label4 As System.Windows.Forms.Label
    Friend WithEvents ListBox3 As System.Windows.Forms.ListBox
    Friend WithEvents Button1 As System.Windows.Forms.Button
+    Friend WithEvents SQL_RESULTTextBox As System.Windows.Forms.TextBox
 End Class
--- a/app/DD-Record-Organiser/frmDokumentart_Konfig.resx
+++ b/app/DD-Record-Organiser/frmDokumentart_Konfig.resx
@@ -171,6 +171,9 @@
  <metadata name="OBJEKTTYPLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>False</value>
  </metadata>
+  <metadata name="SQL_RESULTLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
  <metadata name="TBDD_DOKUMENTARTBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>854, 17</value>
  </metadata>
@@ -252,14 +255,8 @@
        dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
 </value>
  </data>
-  <metadata name="DD_DMSDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
  <metadata name="TBWH_DOKART_MODULEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>905, 95</value>
-  </metadata>
-  <metadata name="TBWH_DOKART_MODULEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>905, 95</value>
+    <value>339, 95</value>
  </metadata>
  <metadata name="TBDD_EINGANGSARTENBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>160, 17</value>
@@ -274,19 +271,19 @@
    <value>1380, 17</value>
  </metadata>
  <metadata name="TBDD_INDEX_AUTOMTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>267, 56</value>
-  </metadata>
-  <metadata name="TBDD_INDEX_AUTOMBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 56</value>
  </metadata>
+  <metadata name="TBDD_INDEX_AUTOMBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1629, 17</value>
+  </metadata>
  <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>511, 56</value>
+    <value>261, 56</value>
  </metadata>
  <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>653, 56</value>
+    <value>403, 56</value>
  </metadata>
  <metadata name="TBDD_INDEX_AUTOMBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>770, 56</value>
+    <value>520, 56</value>
  </metadata>
  <data name="ToolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
@@ -359,20 +356,14 @@
        dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
 </value>
  </data>
-  <metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1036, 56</value>
-  </metadata>
  <metadata name="TBPMO_WD_FORMVIEW_DOKTYPESBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>255, 95</value>
+    <value>1422, 56</value>
  </metadata>
  <metadata name="TBPMO_FORM_VIEWBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1190, 56</value>
-  </metadata>
-  <metadata name="TBPMO_FORM_VIEWBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1190, 56</value>
+    <value>940, 56</value>
  </metadata>
  <metadata name="BindingNavigator1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1036, 56</value>
+    <value>786, 56</value>
  </metadata>
  <data name="ToolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
@@ -446,13 +437,13 @@
 </value>
  </data>
  <metadata name="TBPMO_FORM_VIEWTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 95</value>
+    <value>1184, 56</value>
  </metadata>
  <metadata name="TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>583, 95</value>
+    <value>17, 95</value>
  </metadata>
  <metadata name="TBWH_DOKART_MODULETableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1176, 95</value>
+    <value>610, 95</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>89</value>
--- a/app/DD-Record-Organiser/frmDokumentart_Konfig.vb
+++ b/app/DD-Record-Organiser/frmDokumentart_Konfig.vb
@@ -187,6 +187,7 @@
                Me.INDEXNAMEComboBox.Items.Clear()
                Dim indexe = ClassWindream.GetIndicesByObjecttype(OBJEKTTYPComboBox.Text)
                If indexe IsNot Nothing Then
+                    Me.INDEXNAMEComboBox.Items.Add("(ONLY for Nameconvention)")
                    For Each index As String In indexe
                        Me.INDEXNAMEComboBox.Items.Add(index)
                    Next
@@ -300,4 +301,14 @@
        End Try
    End Sub

+    Private Sub INDEXNAMEComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles INDEXNAMEComboBox.SelectedIndexChanged
+        If INDEXNAMEComboBox.SelectedIndex <> -1 Then
+            If COMMENTTextBox.Text = String.Empty Then
+                If INDEXNAMEComboBox.Text = "(ONLY for Nameconvention)" Then
+                    COMMENTTextBox.Text = "Please insert a description for this placeholder"
+                End If
+
+            End If
+        End If
+    End Sub
 End Class
--- a/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb
+++ b/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb
@@ -53,6 +53,7 @@ Partial Class frmDokumentart_NameConvention
        Me.GroupBox3 = New System.Windows.Forms.GroupBox()
        Me.Label5 = New System.Windows.Forms.Label()
        Me.Label6 = New System.Windows.Forms.Label()
+        Me.Label7 = New System.Windows.Forms.Label()
        Me.GroupBox1.SuspendLayout()
        CType(Me.TBDD_INDEX_AUTOMBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -78,7 +79,7 @@ Partial Class frmDokumentart_NameConvention
        Me.txtnamenKonv.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.txtnamenKonv.Location = New System.Drawing.Point(12, 93)
        Me.txtnamenKonv.Name = "txtnamenKonv"
-        Me.txtnamenKonv.Size = New System.Drawing.Size(417, 23)
+        Me.txtnamenKonv.Size = New System.Drawing.Size(627, 23)
        Me.txtnamenKonv.TabIndex = 1
        '
        'GroupBox1
@@ -116,15 +117,12 @@ Partial Class frmDokumentart_NameConvention
        '
        'cmbIndex_AUTO
        '
-        Me.cmbIndex_AUTO.DataSource = Me.TBDD_INDEX_AUTOMBindingSource
-        Me.cmbIndex_AUTO.DisplayMember = "VALUE"
        Me.cmbIndex_AUTO.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cmbIndex_AUTO.FormattingEnabled = True
        Me.cmbIndex_AUTO.Location = New System.Drawing.Point(9, 70)
        Me.cmbIndex_AUTO.Name = "cmbIndex_AUTO"
        Me.cmbIndex_AUTO.Size = New System.Drawing.Size(182, 25)
        Me.cmbIndex_AUTO.TabIndex = 2
-        Me.cmbIndex_AUTO.ValueMember = "DOCTYPE_ID"
        '
        'TBDD_INDEX_AUTOMBindingSource
        '
@@ -246,19 +244,22 @@ Partial Class frmDokumentart_NameConvention
        'btndelete
        '
        Me.btndelete.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
-        Me.btndelete.Location = New System.Drawing.Point(435, 93)
+        Me.btndelete.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btndelete.Location = New System.Drawing.Point(498, 62)
        Me.btndelete.Name = "btndelete"
-        Me.btndelete.Size = New System.Drawing.Size(28, 25)
+        Me.btndelete.Size = New System.Drawing.Size(141, 25)
        Me.btndelete.TabIndex = 4
+        Me.btndelete.Text = "Lösche Konvention"
+        Me.btndelete.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
        Me.btndelete.UseVisualStyleBackColor = True
        '
        'btnOK
        '
        Me.btnOK.Image = Global.DD_Record_Organiser.My.Resources.Resources.save
        Me.btnOK.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnOK.Location = New System.Drawing.Point(248, 355)
+        Me.btnOK.Location = New System.Drawing.Point(498, 147)
        Me.btnOK.Name = "btnOK"
-        Me.btnOK.Size = New System.Drawing.Size(110, 26)
+        Me.btnOK.Size = New System.Drawing.Size(141, 26)
        Me.btnOK.TabIndex = 5
        Me.btnOK.Text = "Speichern"
        Me.btnOK.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -268,9 +269,9 @@ Partial Class frmDokumentart_NameConvention
        '
        Me.btnclose.Image = Global.DD_Record_Organiser.My.Resources.Resources.cancel
        Me.btnclose.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnclose.Location = New System.Drawing.Point(369, 355)
+        Me.btnclose.Location = New System.Drawing.Point(498, 196)
        Me.btnclose.Name = "btnclose"
-        Me.btnclose.Size = New System.Drawing.Size(94, 26)
+        Me.btnclose.Size = New System.Drawing.Size(141, 26)
        Me.btnclose.TabIndex = 6
        Me.btnclose.Text = "Abbruch"
        Me.btnclose.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -365,10 +366,10 @@ Partial Class frmDokumentart_NameConvention
        Me.Label5.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Label5.Location = New System.Drawing.Point(6, 21)
        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(236, 26)
+        Me.Label5.Size = New System.Drawing.Size(448, 13)
        Me.Label5.TabIndex = 8
-        Me.Label5.Text = "Zur Dateibenennung können Sie auch Werte aus " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "dem zur Laufzeit aktuellen Datensa" & _
-    "tzes nutzen."
+        Me.Label5.Text = "Zur Dateibenennung können Sie auch Werte aus dem zur Laufzeit aktuellen Datensatz" & _
+    " nutzen."
        '
        'Label6
        '
@@ -380,12 +381,22 @@ Partial Class frmDokumentart_NameConvention
        Me.Label6.TabIndex = 12
        Me.Label6.Text = "Aktuelle Namenkonvention:"
        '
+        'Label7
+        '
+        Me.Label7.AutoSize = True
+        Me.Label7.Location = New System.Drawing.Point(645, 99)
+        Me.Label7.Name = "Label7"
+        Me.Label7.Size = New System.Drawing.Size(80, 17)
+        Me.Label7.TabIndex = 13
+        Me.Label7.Text = ".Dateiformat"
+        '
        'frmDokumentart_NameConvention
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 17.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(478, 388)
+        Me.ClientSize = New System.Drawing.Size(733, 388)
        Me.ControlBox = False
+        Me.Controls.Add(Me.Label7)
        Me.Controls.Add(Me.Label6)
        Me.Controls.Add(Me.GroupBox3)
        Me.Controls.Add(Me.FILE_DELIMITERTextBox)
@@ -450,4 +461,5 @@ Partial Class frmDokumentart_NameConvention
    Friend WithEvents Label6 As System.Windows.Forms.Label
    Friend WithEvents Label2 As System.Windows.Forms.Label
    Friend WithEvents Label5 As System.Windows.Forms.Label
+    Friend WithEvents Label7 As System.Windows.Forms.Label
 End Class
--- a/app/DD-Record-Organiser/frmDokumentart_NameConvention.resx
+++ b/app/DD-Record-Organiser/frmDokumentart_NameConvention.resx
@@ -120,9 +120,6 @@
  <metadata name="TBDD_INDEX_AUTOMBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>871, 17</value>
  </metadata>
-  <metadata name="TBDD_INDEX_AUTOMBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>871, 17</value>
-  </metadata>
  <metadata name="DD_DMSDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
--- a/app/DD-Record-Organiser/frmDokumentart_NameConvention.vb
+++ b/app/DD-Record-Organiser/frmDokumentart_NameConvention.vb
@@ -7,11 +7,17 @@

    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnAddIndexM.Click
        If Not Me.cmbIndex_AUTO.Text = "" Then
+            Dim text As String
+            If Me.cmbIndex_AUTO.Text.StartsWith("NC_") Then
+                text = "[%a" & Me.cmbIndex_AUTO.Text.ToString.ToUpper & "#" & Me.cmbIndex_AUTO.SelectedValue & "]"
+            Else
+                text = "[%a" & Me.cmbIndex_AUTO.Text.ToString.ToUpper & "]"
+            End If
            'AREANLAGE-[%mARENR]-[%aKurzname]-I[%Version]
-            Dim text As String = "[%a" & Me.cmbIndex_AUTO.Text.ToString.ToUpper & "]"
+
            Dim altePosition As Integer = Me.txtnamenKonv.SelectionStart()
-            Me.txtnamenKonv.Text = Me.txtnamenKonv.Text.Insert(altePosition, text)
-            Me.txtnamenKonv.SelectionStart = altePosition + text.Length
+            Me.txtnamenKonv.Text = Me.txtnamenKonv.Text.Insert(altePosition, Text)
+            Me.txtnamenKonv.SelectionStart = altePosition + Text.Length
        End If
    End Sub

@@ -37,12 +43,22 @@
            Me.TBDD_INDEX_AUTOMTableAdapter.Connection.ConnectionString = MyConnectionString
            Me.TBPMO_KONFIGURATIONTableAdapter.Connection.ConnectionString = MyConnectionString
            Me.TBPMO_KONFIGURATIONTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_KONFIGURATION)
-            Me.TBDD_INDEX_AUTOMTableAdapter.Fill(Me.DD_DMSDataSet.TBDD_INDEX_AUTOM, frmDokumentart_Konfig.akt_DokartID)
+
+            Dim autoIIndex = "SELECT GUID, CASE WHEN INDEXNAME = '(ONLY for Nameconvention)' THEN 'NC_' + COMMENT ELSE INDEXNAME END as INDEXNAME FROM TBDD_INDEX_AUTOM WHERE DOCTYPE_ID = " & frmDokumentart_Konfig.akt_DokartID
+            Dim DTAUTOINDEX As DataTable = ClassDatabase.Return_Datatable(autoIIndex, "LOAD AUTOINDEXE")
+
+            'Me.TBDD_INDEX_AUTOMTableAdapter.Fill(Me.DD_DMSDataSet.TBDD_INDEX_AUTOM, frmDokumentart_Konfig.akt_DokartID)
            DT_ENTITIES = ClassDatabase.Return_Datatable("select T.GUID, T.FORMVIEW_ID, T1.FORM_TITLE FROM TBPMO_WD_FORMVIEW_DOKTYPES T, TBPMO_FORM_VIEW T1 WHERE T.FORMVIEW_ID = T1.GUID AND T1.SCREEN_ID = 1 AND T.DOCTYPE_ID = " & frmDokumentart_Konfig.akt_DokartID & " ORDER BY T1.FORM_TITLE", "Load NameConventionData")
            cmbEntity.DataSource = DT_ENTITIES
            cmbEntity.DisplayMember = DT_ENTITIES.Columns(2).ColumnName
            cmbEntity.ValueMember = DT_ENTITIES.Columns(0).ColumnName
            cmbEntity.SelectedIndex = 0
+
+
+            cmbIndex_AUTO.DataSource = DTAUTOINDEX
+            cmbIndex_AUTO.DisplayMember = DTAUTOINDEX.Columns(1).ColumnName
+            cmbIndex_AUTO.ValueMember = DTAUTOINDEX.Columns(0).ColumnName
+            cmbIndex_AUTO.SelectedIndex = 0
            'txtnamenKonv.Text = frmDokumentart_Konfig.akt_Namenkonvention
        Catch ex As Exception
            MsgBox("Fehler beim Laden der Grunddaten zur Dokumentart: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
--- a/app/DD-Record-Organiser/frmForm_Constructor.designer.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor.designer.vb
@@ -236,7 +236,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(304, 288)
+        Me.GridControlParentEntity.Size = New System.Drawing.Size(298, 294)
        Me.GridControlParentEntity.TabIndex = 14
        Me.GridControlParentEntity.TabStop = False
        Me.GridControlParentEntity.UseEmbeddedNavigator = True
@@ -716,7 +716,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(402, 264)
+        Me.Button1.Location = New System.Drawing.Point(396, 270)
        Me.Button1.Name = "Button1"
        Me.Button1.Size = New System.Drawing.Size(98, 27)
        Me.Button1.TabIndex = 18
@@ -732,9 +732,9 @@ 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, 296)
+        Me.btnRefreshPEntity.Location = New System.Drawing.Point(3, 302)
        Me.btnRefreshPEntity.Name = "btnRefreshPEntity"
-        Me.btnRefreshPEntity.Size = New System.Drawing.Size(497, 31)
+        Me.btnRefreshPEntity.Size = New System.Drawing.Size(491, 31)
        Me.btnRefreshPEntity.TabIndex = 17
        Me.btnRefreshPEntity.Text = "Parent-Datensatz aktualisieren"
        Me.btnRefreshPEntity.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -746,7 +746,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(313, 38)
+        Me.lblParentID.Location = New System.Drawing.Point(307, 38)
        Me.lblParentID.Name = "lblParentID"
        Me.lblParentID.Size = New System.Drawing.Size(168, 16)
        Me.lblParentID.TabIndex = 16
@@ -757,7 +757,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(313, 12)
+        Me.Label4.Location = New System.Drawing.Point(307, 12)
        Me.Label4.Name = "Label4"
        Me.Label4.Size = New System.Drawing.Size(160, 16)
        Me.Label4.TabIndex = 15
--- a/app/DD-Record-Organiser/frmForm_Constructor.resx
+++ b/app/DD-Record-Organiser/frmForm_Constructor.resx
@@ -157,7 +157,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS
-        CQAAAk1TRnQBSQFMAgEBAgEAAWgBCQFoAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAAYABCQGAAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
--- a/app/DD-Record-Organiser/frmMain.Designer.vb
+++ b/app/DD-Record-Organiser/frmMain.Designer.vb
@@ -446,8 +446,6 @@ Partial Class frmMain
        Me.Appearance.Options.UseFont = True
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.BackgroundImageLayoutStore = System.Windows.Forms.ImageLayout.Center
-        Me.BackgroundImageStore = CType(resources.GetObject("$this.BackgroundImageStore"), System.Drawing.Image)
        Me.ClientSize = New System.Drawing.Size(1498, 678)
        Me.Controls.Add(Me.RibbonStatusBar1)
        Me.Controls.Add(Me.ribbonMain)
--- a/app/DD-Record-Organiser/frmMain.resx
+++ b/app/DD-Record-Organiser/frmMain.resx
@@ -1192,83 +1192,6 @@
  <metadata name="DefaultLookAndFeel1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>242, 17</value>
  </metadata>
-  <data name="$this.BackgroundImageStore" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-        AABJRU5ErkJggg==
-</value>
-  </data>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAABAAEAgIUAAAEAGAD4zwAAFgAAACgAAACAAAAACgEAAAEAGAAAAAAAAAAAAEgAAABIAAAAAAAAAAAA
--- a/app/DD-Record-Organiser/frmMain.vb
+++ b/app/DD-Record-Organiser/frmMain.vb
@@ -214,6 +214,7 @@ Public Class frmMain
            Me.Invoke(d, New Object() {i})
        Else
            Me.BackgroundImage = i
+            Me.BackgroundImageLayout = ImageLayout.Center
        End If
    End Sub

--- a/app/DD-Record-Organiser/frmWD_Index_Dokart.vb
+++ b/app/DD-Record-Organiser/frmWD_Index_Dokart.vb
@@ -24,7 +24,7 @@ Public Class frmWD_Index_Dokart
            Dim streamresult = ClassWindream.Stream_File(Filepath, Targetpath)
            'Dim type = streamresult.GetType
            If streamresult = True Then
-                Dim sql = "SELECT * FROM TBDD_INDEX_AUTOM WHERE DOCTYPE_ID = " & vDokart_ID
+                Dim sql = "SELECT * FROM TBDD_INDEX_AUTOM WHERE ACTIVE = 1 AND UPPER(INDEXNAME) NOT LIKE UPPER('%ONLY %') AND DOCTYPE_ID = " & vDokart_ID
                Dim dt As DataTable = ClassDatabase.Return_Datatable(sql)
                Dim indexierung_erfolgreich As Boolean = False
                If dt Is Nothing = False Then
@@ -210,6 +210,9 @@ Public Class frmWD_Index_Dokart
    'End Function

    Private Sub btnindex_Click(sender As Object, e As EventArgs) Handles btnindex.Click
+        Indexing_File()
+    End Sub
+    Sub Indexing_File()
        Try
            Me.Cursor = Cursors.WaitCursor
            SaveMySettingsValue("WD_IndexDeleteDocs", WD_IndexDeleteDocs)
@@ -257,7 +260,7 @@ Public Class frmWD_Index_Dokart
                Me.Cursor = Cursors.Default
            End If
        Catch ex As Exception
-            MsgBox("Error in Indexing:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+            MsgBox("Error in Indexing_File:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
    End Sub
    Private Sub cmbDokumentart_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbDokumentart.SelectedIndexChanged
@@ -353,12 +356,6 @@ Public Class frmWD_Index_Dokart
            TBPMO_FILES_USERTableAdapter.Connection.ConnectionString = MyConnectionString
            VWPMO_DOKUMENTTYPESTableAdapter.Connection.ConnectionString = MyConnectionString
            Me.VWPMO_DOKUMENTTYPESTableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_DOKUMENTTYPES, CURRENT_FORMVIEW_ID)
-            If DD_DMSDataSet.VWPMO_DOKUMENTTYPES.Rows.Count = 1 Then
-                cmbDokumentart.SelectedIndex = 0
-            End If
-
-
-            Refresh_indices()
        Catch ex As Exception
            MsgBox("Error in frmWD_Index_Dokart_Load:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
@@ -372,6 +369,14 @@ Public Class frmWD_Index_Dokart
    Private Sub frmWD_Index_Dokart_Shown(sender As Object, e As EventArgs) Handles Me.Shown
        If My.Settings.WD_INDEXDOKART_SAVE <> String.Empty Then
            cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(My.Settings.WD_INDEXDOKART_SAVE)
+        Else
+            If DD_DMSDataSet.VWPMO_DOKUMENTTYPES.Rows.Count = 1 Then
+                cmbDokumentart.SelectedIndex = 0
+                CURRENT_DOKARTID = cmbDokumentart.SelectedValue
+                CURRENT_DOKARTSTRING = cmbDokumentart.Text
+                Refresh_indices()
+                Indexing_File()
+            End If
        End If

    End Sub
--- a/app/DD-Record-Organiser/frmWiedervorlage.Designer.vb
+++ b/app/DD-Record-Organiser/frmWiedervorlage.Designer.vb
@@ -708,7 +708,7 @@ Partial Class frmWiedervorlage
        Me.lblSaveWVEmail.AutoSize = True
        Me.lblSaveWVEmail.BackColor = System.Drawing.Color.Yellow
        Me.lblSaveWVEmail.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblSaveWVEmail.Location = New System.Drawing.Point(720, 196)
+        Me.lblSaveWVEmail.Location = New System.Drawing.Point(724, 196)
        Me.lblSaveWVEmail.Name = "lblSaveWVEmail"
        Me.lblSaveWVEmail.Size = New System.Drawing.Size(219, 17)
        Me.lblSaveWVEmail.TabIndex = 78
--- a/app/DD-Record-Organiser/frmWiedervorlage.vb
+++ b/app/DD-Record-Organiser/frmWiedervorlage.vb
@@ -110,6 +110,7 @@

    Private Sub TBPMO_FOLLOW_UP_EMAILBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPMO_FOLLOW_UP_EMAILBindingSource.AddingNew
        Try
+            Me.FOLLOW_UP_SEQUENCEComboBox.SelectedIndex = 0
            DD_DMSDataSet.TBPMO_FOLLOW_UP_EMAIL.ADDED_WHOColumn.DefaultValue = Environment.UserName
            DD_DMSDataSet.TBPMO_FOLLOW_UP_EMAIL.FOLLOW_UP_DAYSColumn.DefaultValue = "0000000"
        Catch ex As Exception
@@ -230,7 +231,10 @@
            Exit Sub
        End If
        Dim sql As String = "select FOLLOW_UP_DAYS from TBPMO_FOLLOW_UP_EMAIL where guid = " & GUIDTextBox.Text
-        Dim follup_Days As String = ClassDatabase.Execute_Scalar(sql)
+        Dim follup_Days = ClassDatabase.Execute_Scalar(sql)
+        If IsNothing(follup_Days) Then
+            follup_Days = "0000000"
+        End If
        Dim follup_Old = follup_Days
        CheckChange = True
        If CheckBox1.Checked Then
--- a/app/SetupWiX/Product.wxs
+++ b/app/SetupWiX/Product.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product Name="Record Organizer" Id="*" UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}" Version="1.5.0.0" Manufacturer="Digital Data" Language="1031" Codepage="1252">
+  <Product Name="Record Organizer" Id="*" UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}" Version="1.6.0.0" Manufacturer="Digital Data" Language="1031" Codepage="1252">
    <Package Id="*" Keywords="Installer" Description="Digital Data Record Organizer Setup" Comments="Record Organizer is a registered Trademark of Digital Data" Manufacturer="Digital Data" InstallerVersion="100" Languages="1031" Compressed="yes" SummaryCodepage="1252"/>
    
    <!-- Nicht entfernen! -->