MS_21.10.2015

2015-10-21 11:58:58 +02:00
parent be7347af13
commit bab4910c44
18 changed files with 1885 additions and 1781 deletions
--- a/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb
+++ b/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb
@@ -27,13 +27,13 @@ Partial Class frmDokumentart_NameConvention
        Me.txtnamenKonv = New System.Windows.Forms.TextBox()
        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
        Me.btnAddIndexM = New System.Windows.Forms.Button()
-        Me.cmbIndex_m = New System.Windows.Forms.ComboBox()
+        Me.cmbIndex_AUTO = New System.Windows.Forms.ComboBox()
+        Me.TBDD_INDEX_AUTOMBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
        Me.Label4 = New System.Windows.Forms.Label()
        Me.cmbEntity = New System.Windows.Forms.ComboBox()
        Me.btnAddIndexA = New System.Windows.Forms.Button()
-        Me.cmbIndex_A = New System.Windows.Forms.ComboBox()
-        Me.TBDD_INDEX_AUTOMBindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
+        Me.cmbIndex_Controls = New System.Windows.Forms.ComboBox()
        Me.Label3 = New System.Windows.Forms.Label()
        Me.GroupBox2 = New System.Windows.Forms.GroupBox()
        Me.Button1 = New System.Windows.Forms.Button()
@@ -50,8 +50,9 @@ Partial Class frmDokumentart_NameConvention
        Me.VERSION_DELIMITERTextBox = New System.Windows.Forms.TextBox()
        Me.FILE_DELIMITERTextBox = New System.Windows.Forms.TextBox()
        Me.GroupBox3 = New System.Windows.Forms.GroupBox()
-        Me.Label5 = New System.Windows.Forms.Label()
        Me.Label6 = New System.Windows.Forms.Label()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.Label2 = 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()
@@ -82,35 +83,47 @@ Partial Class frmDokumentart_NameConvention
        '
        'GroupBox1
        '
+        Me.GroupBox1.Controls.Add(Me.Label2)
        Me.GroupBox1.Controls.Add(Me.btnAddIndexM)
-        Me.GroupBox1.Controls.Add(Me.cmbIndex_m)
+        Me.GroupBox1.Controls.Add(Me.cmbIndex_AUTO)
        Me.GroupBox1.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.GroupBox1.Location = New System.Drawing.Point(12, 124)
        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(237, 56)
+        Me.GroupBox1.Size = New System.Drawing.Size(237, 104)
        Me.GroupBox1.TabIndex = 2
        Me.GroupBox1.TabStop = False
-        Me.GroupBox1.Text = "Globale automatische Indexe:"
+        Me.GroupBox1.Text = "Automatische Indexe:"
        '
        'btnAddIndexM
        '
        Me.btnAddIndexM.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD
-        Me.btnAddIndexM.Location = New System.Drawing.Point(197, 24)
+        Me.btnAddIndexM.Location = New System.Drawing.Point(197, 70)
        Me.btnAddIndexM.Name = "btnAddIndexM"
        Me.btnAddIndexM.Size = New System.Drawing.Size(30, 23)
        Me.btnAddIndexM.TabIndex = 4
        Me.btnAddIndexM.UseVisualStyleBackColor = True
        '
-        'cmbIndex_m
+        'cmbIndex_AUTO
        '
-        Me.cmbIndex_m.DisplayMember = "DOKUMENTART_ID"
-        Me.cmbIndex_m.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cmbIndex_m.FormattingEnabled = True
-        Me.cmbIndex_m.Location = New System.Drawing.Point(9, 24)
-        Me.cmbIndex_m.Name = "cmbIndex_m"
-        Me.cmbIndex_m.Size = New System.Drawing.Size(182, 25)
-        Me.cmbIndex_m.TabIndex = 2
-        Me.cmbIndex_m.ValueMember = "DOKUMENTART_ID"
+        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
+        '
+        Me.TBDD_INDEX_AUTOMBindingSource.DataMember = "TBDD_INDEX_AUTOM"
+        Me.TBDD_INDEX_AUTOMBindingSource.DataSource = Me.DD_DMSDataSet
+        '
+        'DD_DMSDataSet
+        '
+        Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet"
+        Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
        '
        'Label4
        '
@@ -127,7 +140,7 @@ Partial Class frmDokumentart_NameConvention
        Me.cmbEntity.DisplayMember = "GUID"
        Me.cmbEntity.Font = New System.Drawing.Font("Segoe UI Semibold", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.cmbEntity.FormattingEnabled = True
-        Me.cmbEntity.Location = New System.Drawing.Point(9, 74)
+        Me.cmbEntity.Location = New System.Drawing.Point(9, 76)
        Me.cmbEntity.Name = "cmbEntity"
        Me.cmbEntity.Size = New System.Drawing.Size(218, 23)
        Me.cmbEntity.TabIndex = 6
@@ -137,40 +150,30 @@ Partial Class frmDokumentart_NameConvention
        '
        Me.btnAddIndexA.Enabled = False
        Me.btnAddIndexA.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD
-        Me.btnAddIndexA.Location = New System.Drawing.Point(197, 120)
+        Me.btnAddIndexA.Location = New System.Drawing.Point(423, 74)
        Me.btnAddIndexA.Name = "btnAddIndexA"
        Me.btnAddIndexA.Size = New System.Drawing.Size(30, 23)
        Me.btnAddIndexA.TabIndex = 5
        Me.btnAddIndexA.UseVisualStyleBackColor = True
        '
-        'cmbIndex_A
+        'cmbIndex_Controls
        '
-        Me.cmbIndex_A.DataSource = Me.TBDD_INDEX_AUTOMBindingSource
-        Me.cmbIndex_A.DisplayMember = "INDEXNAME"
-        Me.cmbIndex_A.Enabled = False
-        Me.cmbIndex_A.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cmbIndex_A.FormattingEnabled = True
-        Me.cmbIndex_A.Location = New System.Drawing.Point(9, 120)
-        Me.cmbIndex_A.Name = "cmbIndex_A"
-        Me.cmbIndex_A.Size = New System.Drawing.Size(182, 25)
-        Me.cmbIndex_A.TabIndex = 3
-        Me.cmbIndex_A.ValueMember = "DOCTYPE_ID"
-        '
-        'TBDD_INDEX_AUTOMBindingSource
-        '
-        Me.TBDD_INDEX_AUTOMBindingSource.DataMember = "TBDD_INDEX_AUTOM"
-        Me.TBDD_INDEX_AUTOMBindingSource.DataSource = Me.DD_DMSDataSet
-        '
-        'DD_DMSDataSet
-        '
-        Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet"
-        Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
+        Me.cmbIndex_Controls.DataSource = Me.TBDD_INDEX_AUTOMBindingSource
+        Me.cmbIndex_Controls.DisplayMember = "INDEXNAME"
+        Me.cmbIndex_Controls.Enabled = False
+        Me.cmbIndex_Controls.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cmbIndex_Controls.FormattingEnabled = True
+        Me.cmbIndex_Controls.Location = New System.Drawing.Point(236, 76)
+        Me.cmbIndex_Controls.Name = "cmbIndex_Controls"
+        Me.cmbIndex_Controls.Size = New System.Drawing.Size(182, 25)
+        Me.cmbIndex_Controls.TabIndex = 3
+        Me.cmbIndex_Controls.ValueMember = "DOCTYPE_ID"
        '
        'Label3
        '
        Me.Label3.AutoSize = True
        Me.Label3.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label3.Location = New System.Drawing.Point(6, 100)
+        Me.Label3.Location = New System.Drawing.Point(233, 56)
        Me.Label3.Name = "Label3"
        Me.Label3.Size = New System.Drawing.Size(158, 17)
        Me.Label3.TabIndex = 1
@@ -242,7 +245,7 @@ Partial Class frmDokumentart_NameConvention
        '
        Me.btnOK.Image = Global.DD_Record_Organiser.My.Resources.Resources.save_16xLG
        Me.btnOK.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnOK.Location = New System.Drawing.Point(258, 306)
+        Me.btnOK.Location = New System.Drawing.Point(248, 355)
        Me.btnOK.Name = "btnOK"
        Me.btnOK.Size = New System.Drawing.Size(110, 26)
        Me.btnOK.TabIndex = 5
@@ -254,7 +257,7 @@ Partial Class frmDokumentart_NameConvention
        '
        Me.btnclose.Image = Global.DD_Record_Organiser.My.Resources.Resources.cancel1
        Me.btnclose.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnclose.Location = New System.Drawing.Point(374, 306)
+        Me.btnclose.Location = New System.Drawing.Point(369, 355)
        Me.btnclose.Name = "btnclose"
        Me.btnclose.Size = New System.Drawing.Size(94, 26)
        Me.btnclose.TabIndex = 6
@@ -335,16 +338,26 @@ Partial Class frmDokumentart_NameConvention
        Me.GroupBox3.Controls.Add(Me.btnAddIndexA)
        Me.GroupBox3.Controls.Add(Me.Label4)
        Me.GroupBox3.Controls.Add(Me.cmbEntity)
-        Me.GroupBox3.Controls.Add(Me.cmbIndex_A)
+        Me.GroupBox3.Controls.Add(Me.cmbIndex_Controls)
        Me.GroupBox3.Controls.Add(Me.Label3)
        Me.GroupBox3.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.GroupBox3.Location = New System.Drawing.Point(15, 186)
+        Me.GroupBox3.Location = New System.Drawing.Point(12, 234)
        Me.GroupBox3.Name = "GroupBox3"
-        Me.GroupBox3.Size = New System.Drawing.Size(237, 153)
+        Me.GroupBox3.Size = New System.Drawing.Size(459, 115)
        Me.GroupBox3.TabIndex = 11
        Me.GroupBox3.TabStop = False
        Me.GroupBox3.Text = "Entitäts-abhängige Indexe:"
        '
+        'Label6
+        '
+        Me.Label6.AutoSize = True
+        Me.Label6.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label6.Location = New System.Drawing.Point(12, 73)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(177, 17)
+        Me.Label6.TabIndex = 12
+        Me.Label6.Text = "Aktuelle Namenkonvention:"
+        '
        'Label5
        '
        Me.Label5.AutoSize = True
@@ -356,21 +369,22 @@ Partial Class frmDokumentart_NameConvention
        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."
        '
-        'Label6
+        'Label2
        '
-        Me.Label6.AutoSize = True
-        Me.Label6.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label6.Location = New System.Drawing.Point(12, 73)
-        Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(177, 17)
-        Me.Label6.TabIndex = 12
-        Me.Label6.Text = "Aktuelle Namenkonvention:"
+        Me.Label2.AutoSize = True
+        Me.Label2.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label2.Location = New System.Drawing.Point(6, 21)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(202, 39)
+        Me.Label2.TabIndex = 9
+        Me.Label2.Text = "Diese Indexe werden automatisch gesetzt," & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "können aber auch zur Dateibenennung" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "ge" & _
+    "nutzt werden."
        '
        '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, 349)
+        Me.ClientSize = New System.Drawing.Size(478, 388)
        Me.ControlBox = False
        Me.Controls.Add(Me.Label6)
        Me.Controls.Add(Me.GroupBox3)
@@ -390,6 +404,7 @@ Partial Class frmDokumentart_NameConvention
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
        Me.Text = "Assistent zur Namenskonvention/Dateibenennung:"
        Me.GroupBox1.ResumeLayout(False)
+        Me.GroupBox1.PerformLayout()
        CType(Me.TBDD_INDEX_AUTOMBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit()
        Me.GroupBox2.ResumeLayout(False)
@@ -408,8 +423,8 @@ Partial Class frmDokumentart_NameConvention


    Friend WithEvents btnAddIndexM As System.Windows.Forms.Button
-    Friend WithEvents cmbIndex_A As System.Windows.Forms.ComboBox
-    Friend WithEvents cmbIndex_m As System.Windows.Forms.ComboBox
+    Friend WithEvents cmbIndex_Controls As System.Windows.Forms.ComboBox
+    Friend WithEvents cmbIndex_AUTO As System.Windows.Forms.ComboBox
    Friend WithEvents Label3 As System.Windows.Forms.Label
    Friend WithEvents btnAddIndexA As System.Windows.Forms.Button
    Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
@@ -432,6 +447,7 @@ Partial Class frmDokumentart_NameConvention
    Friend WithEvents Label4 As System.Windows.Forms.Label
    Friend WithEvents cmbEntity As System.Windows.Forms.ComboBox
    Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox
-    Friend WithEvents Label5 As System.Windows.Forms.Label
    Friend WithEvents Label6 As System.Windows.Forms.Label
+    Friend WithEvents Label2 As System.Windows.Forms.Label
+    Friend WithEvents Label5 As System.Windows.Forms.Label
 End Class