JJ 28.04.16

2016-04-28 12:58:25 +02:00 · 2016-04-28 12:58:25 +02:00 · f75f9c6981
commit f75f9c6981
parent 0cae7cdc6a
3 changed files with 42 additions and 30 deletions
--- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb
@ -22,6 +22,7 @@ Partial Class frmConstructor_Main
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main))
        Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
        Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
@ -29,12 +30,12 @@ Partial Class frmConstructor_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.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.GridControlMain = New DevExpress.XtraGrid.GridControl()
-        Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.FunktionenDataGridToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
        Me.AnsichtUmschaltenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@ -58,7 +59,7 @@ Partial Class frmConstructor_Main
        Me.pnlDetails = New System.Windows.Forms.Panel()
        Me.TabWindream = New DevExpress.XtraTab.XtraTabPage()
        Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl()
-        Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator()
        Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@ -93,7 +94,7 @@ Partial Class frmConstructor_Main
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.GridControlPos = New DevExpress.XtraGrid.GridControl()
        Me.grvwGridPos = New DevExpress.XtraGrid.Views.Grid.GridView()
-        Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator()
+        Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator(Me.components)
        Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton()
        Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel()
        Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton()
@ -135,20 +136,20 @@ Partial Class frmConstructor_Main
        Me.tsslblStatus = New System.Windows.Forms.ToolStripStatusLabel()
        Me.tsslblRecord = New System.Windows.Forms.ToolStripStatusLabel()
        Me.tsslblWorkflowstate = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.BindingSource_Entity = New System.Windows.Forms.BindingSource()
+        Me.BindingSource_Entity = New System.Windows.Forms.BindingSource(Me.components)
        Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin()
-        Me.ImageCollection1 = New DevExpress.Utils.ImageCollection()
-        Me.ttToolTip = New System.Windows.Forms.ToolTip()
-        Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip()
+        Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components)
+        Me.ttToolTip = New System.Windows.Forms.ToolTip(Me.components)
+        Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
-        Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource()
+        Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.VWPMO_WF_USER_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
        Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
        Me.TBPMO_FILES_USERTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FILES_USERTableAdapter()
-        Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource()
+        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.ToolTipController = New DevExpress.Utils.ToolTipController()
+        Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.ToolTipController = New DevExpress.Utils.ToolTipController(Me.components)
        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerMain.SuspendLayout()
        CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit()
@ -502,6 +503,7 @@ Partial Class frmConstructor_Main
        Me.GridViewDoc_Search.Appearance.HorzLine.Options.UseForeColor = True
        Me.GridViewDoc_Search.Appearance.OddRow.BackColor = CType(resources.GetObject("GridViewDoc_Search.Appearance.OddRow.BackColor"), System.Drawing.Color)
        Me.GridViewDoc_Search.Appearance.OddRow.Options.UseBackColor = True
+        Me.GridViewDoc_Search.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFullFocus
        Me.GridViewDoc_Search.GridControl = Me.GridControlDocSearch
        Me.GridViewDoc_Search.Name = "GridViewDoc_Search"
        Me.GridViewDoc_Search.OptionsBehavior.Editable = False
--- a/app/DD-Record-Organiser/frmConstructor_Main.resx
+++ b/app/DD-Record-Organiser/frmConstructor_Main.resx
@ -415,40 +415,40 @@
    <value>187, 65</value>
  </metadata>
  <data name="DateiÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>152, 22</value>
+    <value>148, 22</value>
  </data>
  <data name="DateiÖffnenToolStripMenuItem.Text" xml:space="preserve">
    <value>Datei Öffnen</value>
  </data>
  <data name="ToolStripSeparator7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 6</value>
+    <value>145, 6</value>
  </data>
  <data name="CopyToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>152, 22</value>
+    <value>148, 22</value>
  </data>
  <data name="CopyToolStripMenuItem.Text" xml:space="preserve">
    <value>Kopieren</value>
  </data>
  <data name="ToolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 6</value>
+    <value>145, 6</value>
  </data>
  <data name="DeleteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>152, 22</value>
+    <value>148, 22</value>
  </data>
  <data name="DeleteToolStripMenuItem.Text" xml:space="preserve">
    <value>Löschen</value>
  </data>
  <data name="ToolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 6</value>
+    <value>145, 6</value>
  </data>
  <data name="PropertiesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>152, 22</value>
+    <value>148, 22</value>
  </data>
  <data name="PropertiesToolStripMenuItem.Text" xml:space="preserve">
    <value>Eigenschaften</value>
  </data>
  <data name="ContextMenuStripResultFiles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>153, 132</value>
+    <value>149, 110</value>
  </data>
  <data name="&gt;&gt;ContextMenuStripResultFiles.Name" xml:space="preserve">
    <value>ContextMenuStripResultFiles</value>
--- a/app/DD-Record-Organiser/frmConstructor_Main.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.vb
@ -3451,14 +3451,16 @@ Public Class frmConstructor_Main
            elapsed = sw.Elapsed.TotalSeconds
            If LogErrorsOnly = False Then ClassLogger.Add(" >> GetSearchDocuments took " & Format(elapsed, "0.000000000") & " seconds", False)
            Dim DTGrid As New DataTable
+
+            Dim stg As String
+            If USER_LANGUAGE = "de-DE" Then
+                stg = "windream-Dateien"
+            Else
+                stg = "windream-files"
+            End If
+            TabWindream.Text = stg & " (" & windreamSucheErgebnisse.Count & ")"
+
            If windreamSucheErgebnisse.Count > 0 Then 'Es gibt Suchergebnisse
-                Dim stg As String
-                If USER_LANGUAGE = "de-DE" Then
-                    stg = "windream-Dateien"
-                Else
-                    stg = "windream-files"
-                End If
-                TabWindream.Text = stg & " (" & windreamSucheErgebnisse.Count & ")"
                Dim sql_ResultList = "select * from TBPMO_WINDREAM_RESULTLIST_CONFIG where guid = 2"
                Dim DT As DataTable = ClassDatabase.Return_Datatable(sql_ResultList, "GET RESULTLIST KONFIG")
                Dim ColArray As New List(Of String)
@ -3475,6 +3477,8 @@ Public Class frmConstructor_Main
                    colPath.ColumnName = "FULLPATH"
                    colPath.Caption = "Fullpath"
                    DTGrid.Columns.Add(colPath)
+                    'GridViewDoc_Search.Columns.
+                    'TODO: colPath ausblenden

                    If Not DT Is Nothing And DT.Rows.Count = 1 Then
                        Dim ColCount As Integer = 1
@ -3563,6 +3567,11 @@ Public Class frmConstructor_Main
                                    Else
                                        'windream-Indexwert holen
                                        idxvalue = dok.GetVariableValue(Indexname)
+
+                                        If IsNothing(idxvalue) Then
+                                            idxvalue = "-"
+                                        End If
+
                                    End If
                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> idxvalue from windream: '" & idxvalue.ToString & "'", False)
                                Catch ex As Exception
@ -3586,9 +3595,10 @@ Public Class frmConstructor_Main
                End If
                If DTGrid.Rows.Count > 0 Then
                    GridControlDocSearch.DataSource = DTGrid
-                    GridViewDoc_Search.Columns.Item(0).MaxWidth = 24
-                    GridViewDoc_Search.Columns.Item(0).MinWidth = 24
-                    grvwGrid.Columns.Item(1).Visible = False
+                    ' Größe der Icon Column anpassen
+                    GridViewDoc_Search.Columns.Item("ICON").MaxWidth = 24
+                    GridViewDoc_Search.Columns.Item("ICON").MinWidth = 24
+                    GridViewDoc_Search.Columns.Item("FULLPATH").Visible = False
                End If
            Else
                Dim msg = "Windream-Dokumente für Record: " & RECORD_ID & " - Keine Dateien gefunden"