diff --git a/app/DD-Record-Organizer/ClassNodeNavigation.vb b/app/DD-Record-Organizer/ClassNodeNavigation.vb index e582b39..665bf59 100644 --- a/app/DD-Record-Organizer/ClassNodeNavigation.vb +++ b/app/DD-Record-Organizer/ClassNodeNavigation.vb @@ -49,7 +49,7 @@ expression = "PARENT_GUID = 0" Dim MAIN_NODES() As DataRow ' Use the Select method to find all rows matching the filter. - MAIN_NODES = DT_TREEVIEW_NODES.Select(expression, "NODE_CAPTION") + MAIN_NODES = DT_TREEVIEW_NODES.Select(expression, "SEQUENCE, NODE_CAPTION") ' For each row create a Node For i = 0 To MAIN_NODES.GetUpperBound(0) If ENTITY_ID <> MAIN_NODES(i)("ENTITY_ID") Then @@ -57,7 +57,7 @@ ClassNodeNavigation.Check_NODE_CONFIG_ID(MAIN_NODES(i)("ENTITY_ID")) End If Dim NODE_Tag = CreateNODE_TAG(MAIN_NODES(i)("ENTITY_ID"), MAIN_NODES(i)("GUID"), MAIN_NODES(i)("RECORD_ID"), MAIN_NODES(i)("NODE_CONFIG_ID")) - Dim MAIN_NODE = New TreeNode(MAIN_NODES(i)("NODE_CAPTION")) + Dim MAIN_NODE = New TreeNode(MAIN_NODES(i)("NODE_CAPTION")) '"NODE_CAPTION" MAIN_NODE.Tag = NODE_Tag Dim index As Integer = 0 For Each img As String In TREEVIEW_IMAGELIST.Images.Keys @@ -73,7 +73,7 @@ mytrv.Nodes.Add(MAIN_NODE) Next - + Return mytrv Catch ex As System.Exception ClassLogger.Add(">> Unexpected Error in CreateTreeViewNodesNew (NodeNavigation): " & ex.Message, True) @@ -87,7 +87,7 @@ expression = "PARENT_GUID = " & PARENT_GUID.ToString Dim SUB_NODE_ROW() As DataRow ' Use the Select method to find all rows matching the filter. - SUB_NODE_ROW = DT_TREEVIEW_NODES.Select(expression, "NODE_CAPTION") + SUB_NODE_ROW = DT_TREEVIEW_NODES.Select(expression, "SEQUENCE, NODE_CAPTION") ' For each row create a Node For i = 0 To SUB_NODE_ROW.GetUpperBound(0) If ENTITY_ID <> SUB_NODE_ROW(i)("ENTITY_ID") Then @@ -197,7 +197,7 @@ expression = "TYPE_NODE = 0" Dim foundRowsLevel0() As DataRow ' Use the Select method to find all rows matching the filter. - foundRowsLevel0 = DT_TREEVIEW_PER_CONTROLS.Select(expression, "NODE_CAPTION") + foundRowsLevel0 = DT_TREEVIEW_PER_CONTROLS.Select(expression, "SEQUENCE,NODE_CAPTION") Dim i As Integer Dim NODE_CONFIG_ID Dim LEVEL0_NODE As TreeNode @@ -229,7 +229,7 @@ Dim expressionLevel1 As String expressionLevel1 = "PARENT_GUID = " & ID 'TYPE_NODE = 1 AND Einschränkung auf Type 2 und Parent_Guid Dim foundRowsLevel1() As DataRow - foundRowsLevel1 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel1, "NODE_CAPTION") + foundRowsLevel1 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel1, "SEQUENCE,NODE_CAPTION") Dim j As Integer For j = 0 To foundRowsLevel1.GetUpperBound(0) Dim ID1 = foundRowsLevel1(j)("GUID") @@ -261,7 +261,7 @@ Dim expressionLevel2 As String expressionLevel2 = "PARENT_GUID = " & ID1 'TYPE_NODE = 2 AND Einschränkung auf Type und Parent_Guid Dim foundRowsLevel2() As DataRow - foundRowsLevel2 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel2, "NODE_CAPTION") + foundRowsLevel2 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel2, "SEQUENCE,NODE_CAPTION") Dim k As Integer For k = 0 To foundRowsLevel2.GetUpperBound(0) Dim ID2 = foundRowsLevel2(k)("GUID") @@ -291,7 +291,7 @@ Dim expressionLevel3 As String expressionLevel3 = "PARENT_GUID = " & ID2 'TYPE_NODE = 3 AND Einschränkung auf Type und Parent_Guid Dim foundRowsLevel3() As DataRow - foundRowsLevel3 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel3, "NODE_CAPTION") + foundRowsLevel3 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel3, "SEQUENCE,NODE_CAPTION") Dim l As Integer For l = 0 To foundRowsLevel3.GetUpperBound(0) Dim ID3 = foundRowsLevel3(l)("GUID") @@ -321,7 +321,7 @@ Dim expressionLevel4 As String expressionLevel4 = "PARENT_GUID = " & ID3 'TYPE_NODE = 4 AND Einschränkung auf Type und Parent_Guid Dim foundRowsLevel4() As DataRow - foundRowsLevel4 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel4, "NODE_CAPTION") + foundRowsLevel4 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel4, "SEQUENCE,NODE_CAPTION") Dim m As Integer For m = 0 To foundRowsLevel4.GetUpperBound(0) Dim ID5 = foundRowsLevel4(m)("GUID") @@ -349,7 +349,7 @@ LEVEL3_NODE.Nodes.Add(LEVEL4_NODE) '### LEVEL 5 laden ####### Dim expressionLevel5 As String - Dim sortExp As String = "NODE_CONFIG_ID, NODE_CAPTION" + Dim sortExp As String = "NODE_CONFIG_ID, SEQUENCE" expressionLevel5 = "PARENT_GUID = " & ID5 'TYPE_NODE = 5 AND Einschränkung auf Type und Parent_Guid Dim foundRowsLevel5() As DataRow foundRowsLevel5 = DT_TREEVIEW_PER_CONTROLS.Select(expressionLevel5, sortExp) diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index fc79836..241dafc 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -56,6 +56,7 @@ Public Class frmConstructor_Main Private CONSTRUCTORID As Integer Private CONSTRUCTOR_DETAIL_ID As Integer + Private CONSTRUCT_EXPAND As Boolean = True Private DT_CONSTRUCT_VIEW As DataTable Private DT_VWPMO_CONSTRUCTOR_FORMS As DataTable Private DT_ENTITY_DATA As DataTable @@ -1167,6 +1168,9 @@ Public Class frmConstructor_Main TreeViewMain.Nodes.Add(node.Clone) Next End If + If CONSTRUCT_EXPAND = True Then + TreeViewMain.ExpandAll() + End If End Sub Sub Load_Tree_View(ConstructorId As Integer) Try @@ -1289,6 +1293,7 @@ Public Class frmConstructor_Main Select form Where form.Item("FORM_ID") = ENTITY_ID).Single() CONSTRUCTOR_DETAIL_ID = result.Item("GUID") + CONSTRUCT_EXPAND = result.Item("EXPAND") Dim FORM_DATE_FORMAT = result.Item("DATE_FORMAT") If FORM_DATE_FORMAT <> USER_DATE_FORMAT Then CURRENT_DATE_FORMAT = FORM_DATE_FORMAT diff --git a/app/DD-Record-Organizer/frmDocLink_to_Record.vb b/app/DD-Record-Organizer/frmDocLink_to_Record.vb index 3d705d2..c283ba6 100644 --- a/app/DD-Record-Organizer/frmDocLink_to_Record.vb +++ b/app/DD-Record-Organizer/frmDocLink_to_Record.vb @@ -93,6 +93,7 @@ Public Class frmDocLink_to_Record trvwMain.Nodes.Add(node.Clone) Next End If + Else Try Dim sel_sql = String.Format("SELECT *, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), {1}) AS 'CAPTION' " & _ diff --git a/app/DD-Record-Organizer/frmWD_Dokumentart_Konfig.Designer.vb b/app/DD-Record-Organizer/frmWD_Dokumentart_Konfig.Designer.vb index 8a0a0b4..2b13548 100644 --- a/app/DD-Record-Organizer/frmWD_Dokumentart_Konfig.Designer.vb +++ b/app/DD-Record-Organizer/frmWD_Dokumentart_Konfig.Designer.vb @@ -188,6 +188,7 @@ Partial Class frmWD_Dokumentart_Konfig Me.TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_WD_FORMVIEW_DOKTYPESTableAdapter() Me.TBWH_DOKART_MODULETableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBWH_DOKART_MODULETableAdapter() Me.ToolTipController1 = New DevExpress.Utils.ToolTipController(Me.components) + Me.colBESCHREIBUNG = New DevExpress.XtraGrid.Columns.GridColumn() GUIDLabel = New System.Windows.Forms.Label() BEZEICHNUNGLabel = New System.Windows.Forms.Label() KURZNAMELabel = New System.Windows.Forms.Label() @@ -483,7 +484,7 @@ Partial Class frmWD_Dokumentart_Konfig Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True Me.GridView1.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView1.Appearance.FocusedRow.BackColor"), System.Drawing.Color) Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True - Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colBEZEICHNUNG, Me.colOBJEKTTYP}) + Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colBEZEICHNUNG, Me.colOBJEKTTYP, Me.colBESCHREIBUNG}) Me.GridView1.GridControl = Me.GridControl1 Me.GridView1.Name = "GridView1" Me.GridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] @@ -1382,6 +1383,12 @@ Partial Class frmWD_Dokumentart_Konfig ' Me.TBWH_DOKART_MODULETableAdapter.ClearBeforeFill = True ' + 'colBESCHREIBUNG + ' + resources.ApplyResources(Me.colBESCHREIBUNG, "colBESCHREIBUNG") + Me.colBESCHREIBUNG.FieldName = "BESCHREIBUNG" + Me.colBESCHREIBUNG.Name = "colBESCHREIBUNG" + ' 'frmWD_Dokumentart_Konfig ' resources.ApplyResources(Me, "$this") @@ -1579,4 +1586,5 @@ Partial Class frmWD_Dokumentart_Konfig Friend WithEvents cmbIndex_Controls As System.Windows.Forms.ComboBox Friend WithEvents Button3 As System.Windows.Forms.Button Friend WithEvents lblpathsaved As System.Windows.Forms.Label + Friend WithEvents colBESCHREIBUNG As DevExpress.XtraGrid.Columns.GridColumn End Class diff --git a/app/DD-Record-Organizer/frmWD_Dokumentart_Konfig.resx b/app/DD-Record-Organizer/frmWD_Dokumentart_Konfig.resx index 3b35cdb..8e45a7b 100644 --- a/app/DD-Record-Organizer/frmWD_Dokumentart_Konfig.resx +++ b/app/DD-Record-Organizer/frmWD_Dokumentart_Konfig.resx @@ -937,6 +937,15 @@ 105 + + Beschreibung + + + True + + + 2 + 306, 237 @@ -3762,6 +3771,12 @@ DevExpress.Utils.ToolTipController, DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + colBESCHREIBUNG + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmWD_Dokumentart_Konfig diff --git a/app/DD-Record-Organizer/frmWD_IndexFile.Designer.vb b/app/DD-Record-Organizer/frmWD_IndexFile.Designer.vb index 0ff22f6..dc0244f 100644 --- a/app/DD-Record-Organizer/frmWD_IndexFile.Designer.vb +++ b/app/DD-Record-Organizer/frmWD_IndexFile.Designer.vb @@ -32,9 +32,7 @@ Partial Class frmWD_IndexFile Me.txtFilepath = New System.Windows.Forms.TextBox() Me.Label2 = New System.Windows.Forms.Label() Me.cmbDokumentart = New System.Windows.Forms.ComboBox() - Me.VWPMO_DOKUMENTTYPESBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DD_DMSDataSet = New DD_Record_Organizer.DD_DMSDataSet() - Me.VWPMO_DOKUMENTTYPESTableAdapter = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.VWPMO_DOKUMENTTYPESTableAdapter() Me.TableAdapterManager = New DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager() Me.btnindex = New System.Windows.Forms.Button() Me.OBJECT_TYPETextBox = New System.Windows.Forms.TextBox() @@ -56,7 +54,6 @@ Partial Class frmWD_IndexFile FW_DOCTYPE_IDLabel = New System.Windows.Forms.Label() PATHLabel = New System.Windows.Forms.Label() Label3 = New System.Windows.Forms.Label() - CType(Me.VWPMO_DOKUMENTTYPESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox1.SuspendLayout() CType(Me.VWDDINDEX_AUTOMBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -100,28 +97,17 @@ Partial Class frmWD_IndexFile ' 'cmbDokumentart ' - Me.cmbDokumentart.DataSource = Me.VWPMO_DOKUMENTTYPESBindingSource - Me.cmbDokumentart.DisplayMember = "DOKUMENTTYPE" resources.ApplyResources(Me.cmbDokumentart, "cmbDokumentart") Me.cmbDokumentart.FormattingEnabled = True Me.cmbDokumentart.Name = "cmbDokumentart" Me.ToolTip1.SetToolTip(Me.cmbDokumentart, resources.GetString("cmbDokumentart.ToolTip")) Me.cmbDokumentart.ValueMember = "DOKUMENTTYPE_ID" ' - 'VWPMO_DOKUMENTTYPESBindingSource - ' - Me.VWPMO_DOKUMENTTYPESBindingSource.DataMember = "VWPMO_DOKUMENTTYPES" - Me.VWPMO_DOKUMENTTYPESBindingSource.DataSource = Me.DD_DMSDataSet - ' 'DD_DMSDataSet ' Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet" Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' - 'VWPMO_DOKUMENTTYPESTableAdapter - ' - Me.VWPMO_DOKUMENTTYPESTableAdapter.ClearBeforeFill = True - ' 'TableAdapterManager ' Me.TableAdapterManager.BackupDataSetBeforeUpdate = False @@ -135,6 +121,7 @@ Partial Class frmWD_IndexFile Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Nothing Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing + Me.TableAdapterManager.TBPMO_APPOINTMENTSTableAdapter = Nothing Me.TableAdapterManager.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing @@ -194,7 +181,6 @@ Partial Class frmWD_IndexFile 'PATHTextBox ' resources.ApplyResources(Me.PATHTextBox, "PATHTextBox") - Me.PATHTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.VWPMO_DOKUMENTTYPESBindingSource, "PATH", True)) Me.PATHTextBox.Name = "PATHTextBox" ' 'lvwIndices @@ -280,7 +266,6 @@ Partial Class frmWD_IndexFile Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmWD_IndexFile" - CType(Me.VWPMO_DOKUMENTTYPESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() @@ -294,8 +279,6 @@ Partial Class frmWD_IndexFile Friend WithEvents Label2 As System.Windows.Forms.Label Friend WithEvents cmbDokumentart As System.Windows.Forms.ComboBox Friend WithEvents DD_DMSDataSet As DD_Record_Organizer.DD_DMSDataSet - Friend WithEvents VWPMO_DOKUMENTTYPESBindingSource As System.Windows.Forms.BindingSource - Friend WithEvents VWPMO_DOKUMENTTYPESTableAdapter As DD_Record_Organizer.DD_DMSDataSetTableAdapters.VWPMO_DOKUMENTTYPESTableAdapter Friend WithEvents TableAdapterManager As DD_Record_Organizer.DD_DMSDataSetTableAdapters.TableAdapterManager Friend WithEvents btnindex As System.Windows.Forms.Button Friend WithEvents OBJECT_TYPETextBox As System.Windows.Forms.TextBox diff --git a/app/DD-Record-Organizer/frmWD_IndexFile.resx b/app/DD-Record-Organizer/frmWD_IndexFile.resx index fd46a6e..6c847d0 100644 --- a/app/DD-Record-Organizer/frmWD_IndexFile.resx +++ b/app/DD-Record-Organizer/frmWD_IndexFile.resx @@ -324,11 +324,8 @@ 8 - - 160, 17 - - - 17, 17 + + 891, 17 Segoe UI Semibold, 9.75pt, style=Bold @@ -342,9 +339,6 @@ 3 - - 891, 17 - Auswahl der Dokumentart - Wird für nächste Eingabe gespeichert @@ -360,8 +354,8 @@ 7 - - 442, 17 + + 17, 17 718, 17 @@ -453,18 +447,6 @@ Top, Bottom, Left, Right - - Indexname - - - 100 - - - Value - - - 120 - 85, 93 @@ -537,6 +519,18 @@ 5 + + Indexname + + + 100 + + + Value + + + 120 + Bottom, Left @@ -573,6 +567,9 @@ 4 + + 891, 17 + Bottom, Left @@ -1175,24 +1172,12 @@ Import nach windream: - - VWPMO_DOKUMENTTYPESBindingSource - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - DD_DMSDataSet DD_Record_Organizer.DD_DMSDataSet, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - VWPMO_DOKUMENTTYPESTableAdapter - - - DD_Record_Organizer.DD_DMSDataSetTableAdapters.VWPMO_DOKUMENTTYPESTableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - TableAdapterManager diff --git a/app/DD-Record-Organizer/frmWD_IndexFile.vb b/app/DD-Record-Organizer/frmWD_IndexFile.vb index dae3f74..6c79e22 100644 --- a/app/DD-Record-Organizer/frmWD_IndexFile.vb +++ b/app/DD-Record-Organizer/frmWD_IndexFile.vb @@ -10,6 +10,7 @@ Public Class frmWD_IndexFile Dim aktFiledropped As String Dim MULTIFILES As Integer = 0 Dim formloaded As Boolean = False + Dim DTVWPMO_DOKUMENTTYPES As DataTable Function WORK_FILE(ImportFilePath As String, VerzeichnisZiel As String, vDokart_ID As Integer, vDokart As String, multiindex As Boolean) Try @@ -1035,17 +1036,20 @@ Public Class frmWD_IndexFile ElseIf HandleType = "SCAM" Then droptype = "scan" End If - VWPMO_DOKUMENTTYPESTableAdapter.Connection.ConnectionString = MyConnectionString - Me.VWPMO_DOKUMENTTYPESTableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_DOKUMENTTYPES, CURRENT_FORMVIEW_ID) + Dim sql = String.Format("SELECT FORMVIEW_ID, FORM_ID, FORM_TITLE, DOKUMENTTYPE_ID, DOKUMENTTYPE, PATH, SHORTNAME, OBJECT_TYPE, FW_DOCTYPE_ID FROM VWPMO_DOKUMENTTYPES WHERE (FORMVIEW_ID = {0}) " & _ + "ORDER BY SEQUENCE, DOKUMENTTYPE", CURRENT_FORMVIEW_ID) + DTVWPMO_DOKUMENTTYPES = ClassDatabase.Return_Datatable(sql, True) + + 'VWPMO_DOKUMENTTYPESTableAdapter.Connection.ConnectionString = MyConnectionString + 'Me.VWPMO_DOKUMENTTYPESTableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_DOKUMENTTYPES, CURRENT_FORMVIEW_ID) CURRENT_REDUNDANT_FORM_ID = 0 CURRENT_REDUNDANT_FORMVIEW_ID = 0 - If DD_DMSDataSet.VWPMO_DOKUMENTTYPES.Rows.Count = 0 Then + If DTVWPMO_DOKUMENTTYPES.Rows.Count = 0 Then ' DD_DMSDataSet.VWPMO_DOKUMENTTYPES.Rows.Count = 0 Then If CURRENT_ENTITY_REDUNDANT_ID <> 0 Then - Dim FVID = ClassDatabase.Execute_Scalar(String.Format("SELECT GUID FROM TBPMO_FORM_VIEW WHERE FORM_ID = {0} and SCREEN_ID = 1", CURRENT_ENTITY_REDUNDANT_ID), True) - Me.VWPMO_DOKUMENTTYPESTableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_DOKUMENTTYPES, FVID) - If DD_DMSDataSet.VWPMO_DOKUMENTTYPES.Rows.Count = 0 Then + 'Me.VWPMO_DOKUMENTTYPESTableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_DOKUMENTTYPES, FVID) + If DTVWPMO_DOKUMENTTYPES.Rows.Count = 0 Then 'DD_DMSDataSet.VWPMO_DOKUMENTTYPES.Rows.Count = 0 Then MsgBox("No documenttypes for the redundant entity configured either! Indexing is not possible!" & vbNewLine & "Please check the configuration!", MsgBoxStyle.Exclamation) Exit Sub Else @@ -1076,14 +1080,19 @@ Public Class frmWD_IndexFile If My.Settings.WD_INDEXDOKART_SAVE <> String.Empty Then Me.cmbDokumentart.SelectedItem = Me.cmbDokumentart.Items.IndexOf(My.Settings.WD_INDEXDOKART_SAVE) ' cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(My.Settings.WD_INDEXDOKART_SAVE) - Else - If DD_DMSDataSet.VWPMO_DOKUMENTTYPES.Rows.Count = 1 Then + End If + If DTVWPMO_DOKUMENTTYPES.Rows.Count >= 1 Then + cmbDokumentart.DataSource = DTVWPMO_DOKUMENTTYPES + cmbDokumentart.DisplayMember = DTVWPMO_DOKUMENTTYPES.Columns(4).ColumnName + cmbDokumentart.ValueMember = DTVWPMO_DOKUMENTTYPES.Columns(3).ColumnName + If DTVWPMO_DOKUMENTTYPES.Rows.Count = 1 Then cmbDokumentart.SelectedIndex = 0 CURRENT_DOKARTID = cmbDokumentart.SelectedValue CURRENT_DOKARTSTRING = cmbDokumentart.Text Refresh_indices() End If End If + Me.Hide() Me.Visible = True Me.Activate()