JJ 28.04.16

This commit is contained in:
JenneJ 2016-04-28 12:58:25 +02:00
parent 0cae7cdc6a
commit f75f9c6981
3 changed files with 42 additions and 30 deletions

View File

@ -22,6 +22,7 @@ Partial Class frmConstructor_Main
'Das Bearbeiten mit dem Code-Editor ist nicht möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _ <System.Diagnostics.DebuggerStepThrough()> _
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main)) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main))
Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
Dim GridLevelNode2 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.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
Me.SplitContainerTop = New DevExpress.XtraEditors.SplitContainerControl() Me.SplitContainerTop = New DevExpress.XtraEditors.SplitContainerControl()
Me.TreeViewMain = New System.Windows.Forms.TreeView() 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.ResetEbenenAuswahlToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.GridControlMain = New DevExpress.XtraGrid.GridControl() 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.FunktionenDataGridToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
Me.AnsichtUmschaltenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AnsichtUmschaltenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@ -58,7 +59,7 @@ Partial Class frmConstructor_Main
Me.pnlDetails = New System.Windows.Forms.Panel() Me.pnlDetails = New System.Windows.Forms.Panel()
Me.TabWindream = New DevExpress.XtraTab.XtraTabPage() Me.TabWindream = New DevExpress.XtraTab.XtraTabPage()
Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl() 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.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator()
Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@ -93,7 +94,7 @@ Partial Class frmConstructor_Main
Me.Panel1 = New System.Windows.Forms.Panel() Me.Panel1 = New System.Windows.Forms.Panel()
Me.GridControlPos = New DevExpress.XtraGrid.GridControl() Me.GridControlPos = New DevExpress.XtraGrid.GridControl()
Me.grvwGridPos = New DevExpress.XtraGrid.Views.Grid.GridView() 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.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton()
Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel() Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel()
Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton() Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton()
@ -135,20 +136,20 @@ Partial Class frmConstructor_Main
Me.tsslblStatus = New System.Windows.Forms.ToolStripStatusLabel() Me.tsslblStatus = New System.Windows.Forms.ToolStripStatusLabel()
Me.tsslblRecord = New System.Windows.Forms.ToolStripStatusLabel() Me.tsslblRecord = New System.Windows.Forms.ToolStripStatusLabel()
Me.tsslblWorkflowstate = 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.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin()
Me.ImageCollection1 = New DevExpress.Utils.ImageCollection() Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components)
Me.ttToolTip = New System.Windows.Forms.ToolTip() Me.ttToolTip = New System.Windows.Forms.ToolTip(Me.components)
Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip() Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet() 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.VWPMO_WF_USER_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager() Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
Me.TBPMO_FILES_USERTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FILES_USERTableAdapter() 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.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource() Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.ToolTipController = New DevExpress.Utils.ToolTipController() Me.ToolTipController = New DevExpress.Utils.ToolTipController(Me.components)
CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerMain.SuspendLayout() Me.SplitContainerMain.SuspendLayout()
CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit() 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.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.BackColor = CType(resources.GetObject("GridViewDoc_Search.Appearance.OddRow.BackColor"), System.Drawing.Color)
Me.GridViewDoc_Search.Appearance.OddRow.Options.UseBackColor = True 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.GridControl = Me.GridControlDocSearch
Me.GridViewDoc_Search.Name = "GridViewDoc_Search" Me.GridViewDoc_Search.Name = "GridViewDoc_Search"
Me.GridViewDoc_Search.OptionsBehavior.Editable = False Me.GridViewDoc_Search.OptionsBehavior.Editable = False

View File

@ -415,40 +415,40 @@
<value>187, 65</value> <value>187, 65</value>
</metadata> </metadata>
<data name="DateiÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="DateiÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value> <value>148, 22</value>
</data> </data>
<data name="DateiÖffnenToolStripMenuItem.Text" xml:space="preserve"> <data name="DateiÖffnenToolStripMenuItem.Text" xml:space="preserve">
<value>Datei Öffnen</value> <value>Datei Öffnen</value>
</data> </data>
<data name="ToolStripSeparator7.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStripSeparator7.Size" type="System.Drawing.Size, System.Drawing">
<value>149, 6</value> <value>145, 6</value>
</data> </data>
<data name="CopyToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="CopyToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value> <value>148, 22</value>
</data> </data>
<data name="CopyToolStripMenuItem.Text" xml:space="preserve"> <data name="CopyToolStripMenuItem.Text" xml:space="preserve">
<value>Kopieren</value> <value>Kopieren</value>
</data> </data>
<data name="ToolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing">
<value>149, 6</value> <value>145, 6</value>
</data> </data>
<data name="DeleteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="DeleteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value> <value>148, 22</value>
</data> </data>
<data name="DeleteToolStripMenuItem.Text" xml:space="preserve"> <data name="DeleteToolStripMenuItem.Text" xml:space="preserve">
<value>Löschen</value> <value>Löschen</value>
</data> </data>
<data name="ToolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing"> <data name="ToolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
<value>149, 6</value> <value>145, 6</value>
</data> </data>
<data name="PropertiesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing"> <data name="PropertiesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>152, 22</value> <value>148, 22</value>
</data> </data>
<data name="PropertiesToolStripMenuItem.Text" xml:space="preserve"> <data name="PropertiesToolStripMenuItem.Text" xml:space="preserve">
<value>Eigenschaften</value> <value>Eigenschaften</value>
</data> </data>
<data name="ContextMenuStripResultFiles.Size" type="System.Drawing.Size, System.Drawing"> <data name="ContextMenuStripResultFiles.Size" type="System.Drawing.Size, System.Drawing">
<value>153, 132</value> <value>149, 110</value>
</data> </data>
<data name="&gt;&gt;ContextMenuStripResultFiles.Name" xml:space="preserve"> <data name="&gt;&gt;ContextMenuStripResultFiles.Name" xml:space="preserve">
<value>ContextMenuStripResultFiles</value> <value>ContextMenuStripResultFiles</value>

View File

@ -3451,14 +3451,16 @@ Public Class frmConstructor_Main
elapsed = sw.Elapsed.TotalSeconds elapsed = sw.Elapsed.TotalSeconds
If LogErrorsOnly = False Then ClassLogger.Add(" >> GetSearchDocuments took " & Format(elapsed, "0.000000000") & " seconds", False) If LogErrorsOnly = False Then ClassLogger.Add(" >> GetSearchDocuments took " & Format(elapsed, "0.000000000") & " seconds", False)
Dim DTGrid As New DataTable 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 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 sql_ResultList = "select * from TBPMO_WINDREAM_RESULTLIST_CONFIG where guid = 2"
Dim DT As DataTable = ClassDatabase.Return_Datatable(sql_ResultList, "GET RESULTLIST KONFIG") Dim DT As DataTable = ClassDatabase.Return_Datatable(sql_ResultList, "GET RESULTLIST KONFIG")
Dim ColArray As New List(Of String) Dim ColArray As New List(Of String)
@ -3475,6 +3477,8 @@ Public Class frmConstructor_Main
colPath.ColumnName = "FULLPATH" colPath.ColumnName = "FULLPATH"
colPath.Caption = "Fullpath" colPath.Caption = "Fullpath"
DTGrid.Columns.Add(colPath) DTGrid.Columns.Add(colPath)
'GridViewDoc_Search.Columns.
'TODO: colPath ausblenden
If Not DT Is Nothing And DT.Rows.Count = 1 Then If Not DT Is Nothing And DT.Rows.Count = 1 Then
Dim ColCount As Integer = 1 Dim ColCount As Integer = 1
@ -3563,6 +3567,11 @@ Public Class frmConstructor_Main
Else Else
'windream-Indexwert holen 'windream-Indexwert holen
idxvalue = dok.GetVariableValue(Indexname) idxvalue = dok.GetVariableValue(Indexname)
If IsNothing(idxvalue) Then
idxvalue = "-"
End If
End If End If
If LogErrorsOnly = False Then ClassLogger.Add(" >> idxvalue from windream: '" & idxvalue.ToString & "'", False) If LogErrorsOnly = False Then ClassLogger.Add(" >> idxvalue from windream: '" & idxvalue.ToString & "'", False)
Catch ex As Exception Catch ex As Exception
@ -3586,9 +3595,10 @@ Public Class frmConstructor_Main
End If End If
If DTGrid.Rows.Count > 0 Then If DTGrid.Rows.Count > 0 Then
GridControlDocSearch.DataSource = DTGrid GridControlDocSearch.DataSource = DTGrid
GridViewDoc_Search.Columns.Item(0).MaxWidth = 24 ' Größe der Icon Column anpassen
GridViewDoc_Search.Columns.Item(0).MinWidth = 24 GridViewDoc_Search.Columns.Item("ICON").MaxWidth = 24
grvwGrid.Columns.Item(1).Visible = False GridViewDoc_Search.Columns.Item("ICON").MinWidth = 24
GridViewDoc_Search.Columns.Item("FULLPATH").Visible = False
End If End If
Else Else
Dim msg = "Windream-Dokumente für Record: " & RECORD_ID & " - Keine Dateien gefunden" Dim msg = "Windream-Dokumente für Record: " & RECORD_ID & " - Keine Dateien gefunden"