This commit is contained in:
Jonathan Jenne
2020-05-06 14:15:00 +02:00
10 changed files with 804 additions and 1171 deletions

View File

@@ -262,7 +262,7 @@ Public Class ClassDOC_SEARCH
Return Nothing Return Nothing
End If End If
sw = New SW("Get_DOC_RESULTTABLE DTGrid-Definition") sw = New SW("Get_DOC_RESULTTABLE DTGrid-Definition")
Dim DTGrid As New DataTable Dim oDTGrid As New DataTable
Dim ColArrayDEFINITION As New List(Of String) Dim ColArrayDEFINITION As New List(Of String)
Dim listcheck As New List(Of String) Dim listcheck As New List(Of String)
For Each row As DataRow In DT_TBPMO_DOCSEARCH_RESULTLIST_CONFIG.Rows For Each row As DataRow In DT_TBPMO_DOCSEARCH_RESULTLIST_CONFIG.Rows
@@ -286,25 +286,25 @@ Public Class ClassDOC_SEARCH
colIcon.DataType = GetType(Image) colIcon.DataType = GetType(Image)
colIcon.ColumnName = "ICON" colIcon.ColumnName = "ICON"
colIcon.Caption = "" colIcon.Caption = ""
DTGrid.Columns.Add(colIcon) oDTGrid.Columns.Add(colIcon)
_step = "4" _step = "4"
Dim colPath As New System.Data.DataColumn() Dim colPath As New System.Data.DataColumn()
colPath.DataType = GetType(String) colPath.DataType = GetType(String)
colPath.ColumnName = "FULLPATH" colPath.ColumnName = "FULLPATH"
colPath.Caption = "Fullpath" colPath.Caption = "Fullpath"
DTGrid.Columns.Add(colPath) oDTGrid.Columns.Add(colPath)
_step = "5" _step = "5"
Dim colOtype As New System.Data.DataColumn() Dim colOtype As New System.Data.DataColumn()
colOtype.DataType = GetType(String) colOtype.DataType = GetType(String)
colOtype.ColumnName = "OBJECTTYPE" colOtype.ColumnName = "OBJECTTYPE"
colOtype.Caption = "Objecttype" colOtype.Caption = "Objecttype"
DTGrid.Columns.Add(colOtype) oDTGrid.Columns.Add(colOtype)
_step = "6" _step = "6"
Dim colDocID As New System.Data.DataColumn() Dim colDocID As New System.Data.DataColumn()
colDocID.DataType = GetType(Int32) colDocID.DataType = GetType(Int32)
colDocID.ColumnName = "DocID" colDocID.ColumnName = "DocID"
colDocID.Caption = "DocID" colDocID.Caption = "DocID"
DTGrid.Columns.Add(colDocID) oDTGrid.Columns.Add(colDocID)
_step = "7" _step = "7"
If Not DT_TBPMO_DOCSEARCH_RESULTLIST_CONFIG Is Nothing And DT_TBPMO_DOCSEARCH_RESULTLIST_CONFIG.Rows.Count >= 1 Then If Not DT_TBPMO_DOCSEARCH_RESULTLIST_CONFIG Is Nothing And DT_TBPMO_DOCSEARCH_RESULTLIST_CONFIG.Rows.Count >= 1 Then
@@ -330,7 +330,7 @@ Public Class ClassDOC_SEARCH
oColumn.DataType = GetType(DateTime) oColumn.DataType = GetType(DateTime)
End If End If
DTGrid.Columns.Add(oColumn) oDTGrid.Columns.Add(oColumn)
ColCount += 1 ColCount += 1
Catch ex As Exception Catch ex As Exception
ClassLogger.Add(String.Format("Unexpected Error in DTGrid.Columns.Add({0}) - CONSTR_DET_ID: {1} ", ColumnName, CURRENT_CONSTRUCTOR_DETAIL_ID) & ex.Message) ClassLogger.Add(String.Format("Unexpected Error in DTGrid.Columns.Add({0}) - CONSTR_DET_ID: {1} ", ColumnName, CURRENT_CONSTRUCTOR_DETAIL_ID) & ex.Message)
@@ -348,7 +348,7 @@ Public Class ClassDOC_SEARCH
COL_ARRAY_RESULTLIST = ColArrayDEFINITION COL_ARRAY_RESULTLIST = ColArrayDEFINITION
_step = "8" _step = "8"
For Each col1 As String In listcheck For Each col1 As String In listcheck
Dim collist As DataColumn = DTGrid.Columns(col1) Dim collist As DataColumn = oDTGrid.Columns(col1)
If Not IsNothing(collist) Then If Not IsNothing(collist) Then
collist.DataType = GetType(Boolean) collist.DataType = GetType(Boolean)
End If End If
@@ -365,52 +365,53 @@ Public Class ClassDOC_SEARCH
Dim filename = Path.GetFileName(fullpath) Dim filename = Path.GetFileName(fullpath)
Dim extension = Path.GetExtension(fullpath) Dim extension = Path.GetExtension(fullpath)
' Try ' Try
Dim NewRow As DataRow Dim oNewRow As DataRow
NewRow = DTGrid.NewRow() oNewRow = oDTGrid.NewRow()
'Icon zuweisen 'Icon zuweisen
Select Case extension.ToUpper Select Case extension.ToUpper
Case ".csv".ToUpper Case ".csv".ToUpper
NewRow.Item(0) = My.Resources.doc_excel_csv oNewRow.Item(0) = My.Resources.doc_excel_csv
Case ".txt".ToUpper Case ".txt".ToUpper
NewRow.Item(0) = My.Resources.text oNewRow.Item(0) = My.Resources.text
Case ".pdf".ToUpper Case ".pdf".ToUpper
NewRow.Item(0) = My.Resources.pdf oNewRow.Item(0) = My.Resources.pdf
Case ".doc".ToUpper Case ".doc".ToUpper
NewRow.Item(0) = My.Resources.doc oNewRow.Item(0) = My.Resources.doc
Case ".docx".ToUpper Case ".docx".ToUpper
NewRow.Item(0) = My.Resources.doc oNewRow.Item(0) = My.Resources.doc
Case ".xls".ToUpper Case ".xls".ToUpper
NewRow.Item(0) = My.Resources.xls oNewRow.Item(0) = My.Resources.xls
Case ".xlsx".ToUpper Case ".xlsx".ToUpper
NewRow.Item(0) = My.Resources.xls oNewRow.Item(0) = My.Resources.xls
Case ".xlsm".ToUpper Case ".xlsm".ToUpper
NewRow.Item(0) = My.Resources.xls oNewRow.Item(0) = My.Resources.xls
Case ".ppt".ToUpper Case ".ppt".ToUpper
NewRow.Item(0) = My.Resources.ppt oNewRow.Item(0) = My.Resources.ppt
Case ".pptx".ToUpper Case ".pptx".ToUpper
NewRow.Item(0) = My.Resources.ppt oNewRow.Item(0) = My.Resources.ppt
Case ".dwg".ToUpper Case ".dwg".ToUpper
NewRow.Item(0) = My.Resources.dwg oNewRow.Item(0) = My.Resources.dwg
Case ".dxf".ToUpper Case ".dxf".ToUpper
NewRow.Item(0) = My.Resources.dxf oNewRow.Item(0) = My.Resources.dxf
Case ".msg".ToUpper Case ".msg".ToUpper
NewRow.Item(0) = My.Resources.email_go oNewRow.Item(0) = My.Resources.email_go
Case ".msg".ToUpper Case ".msg".ToUpper
NewRow.Item(0) = My.Resources.email_go oNewRow.Item(0) = My.Resources.email_go
Case Else Case Else
NewRow.Item(0) = My.Resources._blank oNewRow.Item(0) = My.Resources._blank
End Select End Select
'Den Filepath mitgeben 'Den Filepath mitgeben
NewRow.Item(1) = fullpath oNewRow.Item(1) = fullpath
NewRow.Item(2) = objecttype oNewRow.Item(2) = objecttype
NewRow.Item(3) = DocID oNewRow.Item(3) = DocID
Dim i = 4 'Fängt bei 4 an, um die definierten Spalten zu überspringen Dim i = 4 'Fängt bei 4 an, um die definierten Spalten zu überspringen
For Each Colname As String In ColArrayDEFINITION For Each Colname As String In ColArrayDEFINITION
Dim rowvalue Dim rowvalue
Try Try
rowvalue = FILE_ROW.Item(Colname) rowvalue = FILE_ROW.Item(Colname)
If LogErrorsOnly = False Then ClassLogger.Add(" >> rowvalue for Colname '" & Colname & "': '" & rowvalue.ToString & "'", False) _step = "9.1 rowvalue for Colname [" & Colname & "]: [" & rowvalue.ToString & "]"
If LogErrorsOnly = False Then ClassLogger.Add(" >> rowvalue for Colname [" & Colname & "]: [" & rowvalue.ToString & "]", False)
Catch ex As Exception Catch ex As Exception
If CURRENT_SEARCH_TYPE = "RECORD" Then ClassLogger.Add("Unexpected Error in GetVariableValue for Column '" & Colname & "'- Error: " & ex.Message) If CURRENT_SEARCH_TYPE = "RECORD" Then ClassLogger.Add("Unexpected Error in GetVariableValue for Column '" & Colname & "'- Error: " & ex.Message)
If Colname.ToString.StartsWith("doct") Or Colname.ToString.StartsWith("Dokum") Then If Colname.ToString.StartsWith("doct") Or Colname.ToString.StartsWith("Dokum") Then
@@ -424,17 +425,36 @@ Public Class ClassDOC_SEARCH
End If End If
End Try End Try
NewRow.Item(i) = rowvalue.ToString _step = "9.2 now: NewRow.Item(i) = rowvalue.ToString..."
If LogErrorsOnly = False Then ClassLogger.Add("9.2 now: NewRow.Item(i) = rowvalue.ToString...", False)
Try
Catch ex As Exception
End Try
Try
'If oDTGrid.Columns(i).DataType.ToString = "System.DateTime" And rowvalue = String.Empty Then
' If LogErrorsOnly = False Then ClassLogger.Add("rowvalue Is empty and Column is Datetime...", False)
'Else
oNewRow.Item(i) = rowvalue.ToString
'End If
Catch ex As Exception
ClassLogger.Add("Error in advising value to rowitem (oNewRow.Item(i) = rowvalue.ToString): " + ex.Message, False)
ClassLogger.Add("Type of column: " + oDTGrid.Columns(i).DataType.ToString(), False)
End Try
i += 1 i += 1
Next Next
DTGrid.Rows.Add(NewRow) oDTGrid.Rows.Add(oNewRow)
' Catch ex As Exception ' Catch ex As Exception
' ClassLogger.Add("Unexpected Error in CreateRow for doc '" & filename & "- Error: " & ex.Message) ' ClassLogger.Add("Unexpected Error in CreateRow for doc '" & filename & "- Error: " & ex.Message)
' End Try ' End Try
Next Next
_step = "10" _step = "10"
Return DTGrid Return oDTGrid
sw.Done() sw.Done()
Catch ex As Exception Catch ex As Exception

View File

@@ -166,7 +166,7 @@ Public Class ClassWDRights
Else Else
_msg = "Right for User: '" & UserOrGroup.aName & "'""" _msg = "Right for User: '" & UserOrGroup.aName & "'"""
End If End If
If LogErrorsOnly = False Then ClassLogger.Add(String.Format(" >> {0} will now be deleted.", _msg), False) If LogErrorsOnly = False Then ClassLogger.Add(String.Format(" >> [{0}] will now be deleted.", _msg), False)
If Err.Number <> 0 Then If Err.Number <> 0 Then
Dim msg = "Error in setting UserGroupRelation - Err.Number: " & Err.Number & vbCrLf & Err.Description Dim msg = "Error in setting UserGroupRelation - Err.Number: " & Err.Number & vbCrLf & Err.Description
ClassLogger.Add(msg, True) ClassLogger.Add(msg, True)
@@ -178,7 +178,7 @@ Public Class ClassWDRights
Try Try
AccessRights.Delete2(UserOrGroup, WMAccessRightAllRights) AccessRights.Delete2(UserOrGroup, WMAccessRightAllRights)
Catch ex As Exception Catch ex As Exception
Dim msg = "Error in AccessRights.Delete2 (Doc_RenewRights) Doc-ID: " & doc_id & " - UserGroup: " & UserOrGroup & " - ErrorMsg: " & ex.Message Dim msg = "Error in AccessRights.Delete2 (Doc_RenewRights) Doc-ID: " & doc_id & " - UserGroup: " & UserOrGroup.aName & " - ErrorMsg: " & ex.Message
ClassLogger.Add(msg, True) ClassLogger.Add(msg, True)
Continue For Continue For
End Try End Try

View File

@@ -439,35 +439,38 @@ Public Class ClassWindreamDocGrid
Try Try
Dim view As ColumnView = sender Dim view As ColumnView = sender
Dim parsedDate As DateTime Dim parsedDate As DateTime
If Not IsNothing(DATE_COLUMNS) Then
If DATE_COLUMNS.Contains(e.Column.FieldName) And e.ListSourceRowIndex <> DevExpress.XtraGrid.GridControl.InvalidRowHandle Then
If DATE_COLUMNS.Contains(e.Column.FieldName) And e.ListSourceRowIndex <> DevExpress.XtraGrid.GridControl.InvalidRowHandle Then If e.Value.ToString() = String.Empty Then
e.DisplayText = ""
Exit Sub
End If
If Not DateTime.TryParse(e.Value, parsedDate) Then
parsedDate = DateTime.ParseExact(e.Value, CURRENT_DATE_FORMAT & " HH:MM:ss", System.Globalization.DateTimeFormatInfo.InvariantInfo)
End If
e.DisplayText = parsedDate.ToString(CURRENT_DATE_FORMAT & " HH:MM:ss")
If e.Value.ToString() = String.Empty Then
e.DisplayText = ""
Exit Sub
End If End If
End If
If Not IsNothing(DATE_COLUMNS_CONFIG) Then
If DATE_COLUMNS_CONFIG.Contains(e.Column.FieldName) And e.ListSourceRowIndex <> DevExpress.XtraGrid.GridControl.InvalidRowHandle Then
If e.Value.ToString() = String.Empty Then
e.DisplayText = ""
Exit Sub
End If
If Not DateTime.TryParse(e.Value, parsedDate) Then If Not DateTime.TryParse(e.Value, parsedDate) Then
parsedDate = DateTime.ParseExact(e.Value, CURRENT_DATE_FORMAT & " HH:MM:ss", System.Globalization.DateTimeFormatInfo.InvariantInfo) parsedDate = DateTime.ParseExact(e.Value, CURRENT_DATE_FORMAT, System.Globalization.DateTimeFormatInfo.InvariantInfo)
End If
e.DisplayText = parsedDate.ToString(CURRENT_DATE_FORMAT)
End If End If
e.DisplayText = parsedDate.ToString(CURRENT_DATE_FORMAT & " HH:MM:ss")
ElseIf DATE_COLUMNS_CONFIG.Contains(e.Column.FieldName) And e.ListSourceRowIndex <> DevExpress.XtraGrid.GridControl.InvalidRowHandle Then
If e.Value.ToString() = String.Empty Then
e.DisplayText = ""
Exit Sub
End If
If Not DateTime.TryParse(e.Value, parsedDate) Then
parsedDate = DateTime.ParseExact(e.Value, CURRENT_DATE_FORMAT, System.Globalization.DateTimeFormatInfo.InvariantInfo)
End If
e.DisplayText = parsedDate.ToString(CURRENT_DATE_FORMAT)
End If End If
Catch ex As Exception Catch ex As Exception
ClassLogger.Add("Unexpected error in gridView_CustomColumnDisplayText: " & ex.Message, False, False) ClassLogger.Add("Unexpected error in gridView_CustomColumnDisplayText: " & ex.Message, False, False)
MsgBox("Unexpected error in gridView_CustomColumnDisplayText: " & ex.Message, MsgBoxStyle.Critical)
End Try End Try
End Sub End Sub

View File

@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.5.0.4")> <Assembly: AssemblyVersion("2.5.0.6")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguageAttribute("")> <Assembly: NeutralResourcesLanguageAttribute("")>

View File

@@ -24,10 +24,10 @@ Partial Class frmConstructor_Main
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container() 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 GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
Dim GridLevelNode4 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode4 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
Dim GridLevelNode5 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
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()
@@ -39,8 +39,6 @@ Partial Class frmConstructor_Main
Me.AuswertungAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.AuswertungAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
Me.tsmiFilesearch = New System.Windows.Forms.ToolStripMenuItem() Me.tsmiFilesearch = New System.Windows.Forms.ToolStripMenuItem()
Me.tsmiNodedownSearch = New System.Windows.Forms.ToolStripMenuItem() Me.tsmiNodedownSearch = New System.Windows.Forms.ToolStripMenuItem()
Me.tsmientitySearch = New System.Windows.Forms.ToolStripMenuItem()
Me.tsmiFulltext = New System.Windows.Forms.ToolStripMenuItem()
Me.ToolStripSeparator12 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripSeparator12 = New System.Windows.Forms.ToolStripSeparator()
Me.ToolStripSeparator24 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripSeparator24 = New System.Windows.Forms.ToolStripSeparator()
Me.tsmiNodeRename = New System.Windows.Forms.ToolStripMenuItem() Me.tsmiNodeRename = New System.Windows.Forms.ToolStripMenuItem()
@@ -231,10 +229,10 @@ Partial Class frmConstructor_Main
Me.bsitmLoadEntity = New DevExpress.XtraBars.BarStaticItem() Me.bsitmLoadEntity = New DevExpress.XtraBars.BarStaticItem()
Me.bsitmWFState = New DevExpress.XtraBars.BarStaticItem() Me.bsitmWFState = New DevExpress.XtraBars.BarStaticItem()
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -357,7 +355,7 @@ Partial Class frmConstructor_Main
' '
'tsmiFilesearch 'tsmiFilesearch
' '
Me.tsmiFilesearch.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiNodedownSearch, Me.tsmientitySearch, Me.tsmiFulltext}) Me.tsmiFilesearch.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiNodedownSearch})
resources.ApplyResources(Me.tsmiFilesearch, "tsmiFilesearch") resources.ApplyResources(Me.tsmiFilesearch, "tsmiFilesearch")
Me.tsmiFilesearch.Name = "tsmiFilesearch" Me.tsmiFilesearch.Name = "tsmiFilesearch"
' '
@@ -367,17 +365,6 @@ Partial Class frmConstructor_Main
Me.tsmiNodedownSearch.Name = "tsmiNodedownSearch" Me.tsmiNodedownSearch.Name = "tsmiNodedownSearch"
resources.ApplyResources(Me.tsmiNodedownSearch, "tsmiNodedownSearch") resources.ApplyResources(Me.tsmiNodedownSearch, "tsmiNodedownSearch")
' '
'tsmientitySearch
'
Me.tsmientitySearch.Image = Global.DD_Record_Organizer.My.Resources.Resources.search_glyph
Me.tsmientitySearch.Name = "tsmientitySearch"
resources.ApplyResources(Me.tsmientitySearch, "tsmientitySearch")
'
'tsmiFulltext
'
resources.ApplyResources(Me.tsmiFulltext, "tsmiFulltext")
Me.tsmiFulltext.Name = "tsmiFulltext"
'
'ToolStripSeparator12 'ToolStripSeparator12
' '
Me.ToolStripSeparator12.Name = "ToolStripSeparator12" Me.ToolStripSeparator12.Name = "ToolStripSeparator12"
@@ -398,9 +385,9 @@ Partial Class frmConstructor_Main
'tstxtRenameNode 'tstxtRenameNode
' '
Me.tstxtRenameNode.BackColor = System.Drawing.SystemColors.Control Me.tstxtRenameNode.BackColor = System.Drawing.SystemColors.Control
resources.ApplyResources(Me.tstxtRenameNode, "tstxtRenameNode")
Me.tstxtRenameNode.ForeColor = System.Drawing.SystemColors.ControlText Me.tstxtRenameNode.ForeColor = System.Drawing.SystemColors.ControlText
Me.tstxtRenameNode.Name = "tstxtRenameNode" Me.tstxtRenameNode.Name = "tstxtRenameNode"
resources.ApplyResources(Me.tstxtRenameNode, "tstxtRenameNode")
' '
'tsmiNodeNew 'tsmiNodeNew
' '
@@ -416,8 +403,8 @@ Partial Class frmConstructor_Main
'tsmINewText 'tsmINewText
' '
Me.tsmINewText.BackColor = System.Drawing.Color.Yellow Me.tsmINewText.BackColor = System.Drawing.Color.Yellow
Me.tsmINewText.Name = "tsmINewText"
resources.ApplyResources(Me.tsmINewText, "tsmINewText") resources.ApplyResources(Me.tsmINewText, "tsmINewText")
Me.tsmINewText.Name = "tsmINewText"
' '
'ToolStripSeparator15 'ToolStripSeparator15
' '
@@ -450,12 +437,12 @@ Partial Class frmConstructor_Main
Me.GridControlMain.AllowDrop = True Me.GridControlMain.AllowDrop = True
Me.GridControlMain.ContextMenuStrip = Me.ContextMenuGrid Me.GridControlMain.ContextMenuStrip = Me.ContextMenuGrid
resources.ApplyResources(Me.GridControlMain, "GridControlMain") resources.ApplyResources(Me.GridControlMain, "GridControlMain")
GridLevelNode2.LevelTemplate = Me.grvwGrid GridLevelNode1.LevelTemplate = Me.grvwGrid
GridLevelNode2.RelationName = "Level1" GridLevelNode1.RelationName = "Level1"
GridLevelNode3.LevelTemplate = Me.grvwCarousel GridLevelNode2.LevelTemplate = Me.grvwCarousel
GridLevelNode3.RelationName = "Level2" GridLevelNode2.RelationName = "Level2"
GridLevelNode4.RelationName = "Level3" GridLevelNode3.RelationName = "Level3"
Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2, GridLevelNode3, GridLevelNode4}) Me.GridControlMain.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1, GridLevelNode2, GridLevelNode3})
Me.GridControlMain.MainView = Me.grvwTiles Me.GridControlMain.MainView = Me.grvwTiles
Me.GridControlMain.Name = "GridControlMain" Me.GridControlMain.Name = "GridControlMain"
Me.GridControlMain.TabStop = False Me.GridControlMain.TabStop = False
@@ -893,8 +880,8 @@ Partial Class frmConstructor_Main
Me.GridControlDocSearch.AllowDrop = True Me.GridControlDocSearch.AllowDrop = True
Me.GridControlDocSearch.ContextMenuStrip = Me.cmsResultFilesBasic Me.GridControlDocSearch.ContextMenuStrip = Me.cmsResultFilesBasic
resources.ApplyResources(Me.GridControlDocSearch, "GridControlDocSearch") resources.ApplyResources(Me.GridControlDocSearch, "GridControlDocSearch")
GridLevelNode5.RelationName = "Level1" GridLevelNode4.RelationName = "Level1"
Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode5}) Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode4})
Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search
Me.GridControlDocSearch.Name = "GridControlDocSearch" Me.GridControlDocSearch.Name = "GridControlDocSearch"
Me.GridControlDocSearch.TabStop = False Me.GridControlDocSearch.TabStop = False
@@ -1315,8 +1302,8 @@ Partial Class frmConstructor_Main
'CMDoc_TextBoxRenameFile 'CMDoc_TextBoxRenameFile
' '
Me.CMDoc_TextBoxRenameFile.BackColor = System.Drawing.Color.Orange Me.CMDoc_TextBoxRenameFile.BackColor = System.Drawing.Color.Orange
Me.CMDoc_TextBoxRenameFile.Name = "CMDoc_TextBoxRenameFile"
resources.ApplyResources(Me.CMDoc_TextBoxRenameFile, "CMDoc_TextBoxRenameFile") resources.ApplyResources(Me.CMDoc_TextBoxRenameFile, "CMDoc_TextBoxRenameFile")
Me.CMDoc_TextBoxRenameFile.Name = "CMDoc_TextBoxRenameFile"
' '
'DisplaynameUmbenennenToolStripMenuItem 'DisplaynameUmbenennenToolStripMenuItem
' '
@@ -1327,8 +1314,8 @@ Partial Class frmConstructor_Main
'CMDoc_TextBoxRenameDisplay 'CMDoc_TextBoxRenameDisplay
' '
Me.CMDoc_TextBoxRenameDisplay.BackColor = System.Drawing.Color.DarkOrange Me.CMDoc_TextBoxRenameDisplay.BackColor = System.Drawing.Color.DarkOrange
Me.CMDoc_TextBoxRenameDisplay.Name = "CMDoc_TextBoxRenameDisplay"
resources.ApplyResources(Me.CMDoc_TextBoxRenameDisplay, "CMDoc_TextBoxRenameDisplay") resources.ApplyResources(Me.CMDoc_TextBoxRenameDisplay, "CMDoc_TextBoxRenameDisplay")
Me.CMDoc_TextBoxRenameDisplay.Name = "CMDoc_TextBoxRenameDisplay"
' '
'ToolStripSeparator22 'ToolStripSeparator22
' '
@@ -1653,12 +1640,6 @@ Partial Class frmConstructor_Main
Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Name = "RibbonPage1"
resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
' '
'RibbonPageGroup4
'
Me.RibbonPageGroup4.ItemLinks.Add(Me.bStaticItem1)
Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
'
'RibbonPageGroup1 'RibbonPageGroup1
' '
Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtniRefresh) Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtniRefresh)
@@ -1683,6 +1664,12 @@ Partial Class frmConstructor_Main
Me.RibbonPageGroup3.Name = "RibbonPageGroup3" Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
' '
'RibbonPageGroup4
'
Me.RibbonPageGroup4.ItemLinks.Add(Me.bStaticItem1)
Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
'
'RibbonStatusBar1 'RibbonStatusBar1
' '
Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmState) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmState)
@@ -1917,7 +1904,6 @@ Partial Class frmConstructor_Main
Friend WithEvents DateiVersionierenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents DateiVersionierenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents DokumentartÄndernToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents DokumentartÄndernToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents tsmiFilesearch As System.Windows.Forms.ToolStripMenuItem Friend WithEvents tsmiFilesearch As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents tsmientitySearch As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents tsmiNodedownSearch As System.Windows.Forms.ToolStripMenuItem Friend WithEvents tsmiNodedownSearch As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents docCM_RenameMain As System.Windows.Forms.ToolStripMenuItem Friend WithEvents docCM_RenameMain As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents NeuToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents NeuToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
@@ -1937,7 +1923,6 @@ Partial Class frmConstructor_Main
Friend WithEvents cmDoc1FileProperties As System.Windows.Forms.ToolStripMenuItem Friend WithEvents cmDoc1FileProperties As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents tslblPoslocked As System.Windows.Forms.ToolStripLabel Friend WithEvents tslblPoslocked As System.Windows.Forms.ToolStripLabel
Friend WithEvents tsbtnWork As System.Windows.Forms.ToolStripButton Friend WithEvents tsbtnWork As System.Windows.Forms.ToolStripButton
Friend WithEvents tsmiFulltext As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents ToolStripDokumente As System.Windows.Forms.ToolStrip Friend WithEvents ToolStripDokumente As System.Windows.Forms.ToolStrip
Friend WithEvents tslblWindreamView As System.Windows.Forms.ToolStripLabel Friend WithEvents tslblWindreamView As System.Windows.Forms.ToolStripLabel
Friend WithEvents ToolStripSeparator17 As System.Windows.Forms.ToolStripSeparator Friend WithEvents ToolStripSeparator17 As System.Windows.Forms.ToolStripSeparator

File diff suppressed because it is too large Load Diff

View File

@@ -1170,7 +1170,7 @@ Public Class frmConstructor_Main
'pnlPositions.Enabled = True 'pnlPositions.Enabled = True
TabWindream.PageEnabled = True TabWindream.PageEnabled = True
tsbtnDoc_Refresh.Enabled = True tsbtnDoc_Refresh.Enabled = True
tsmientitySearch.Enabled = True
If SQL_RECORD_AND_FILE_READ_ONLY <> "" Or SQL_DOC_READ_ONLY <> "" Then If SQL_RECORD_AND_FILE_READ_ONLY <> "" Or SQL_DOC_READ_ONLY <> "" Then
If RIGHT_RECORD_AND_FILE_READ_ONLY = True Then If RIGHT_RECORD_AND_FILE_READ_ONLY = True Then
@@ -6632,7 +6632,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
RUN_WDSEARCH_GRID() RUN_WDSEARCH_GRID()
End Sub End Sub
Private Sub EnitätssucheToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles tsmientitySearch.Click Private Sub EnitätssucheToolStripMenuItem_Click(sender As Object, e As EventArgs)
CURRENT_SEARCH_TYPE = "ENTITY" CURRENT_SEARCH_TYPE = "ENTITY"
RUN_ENTITY_DOC_SEARCH() RUN_ENTITY_DOC_SEARCH()
End Sub End Sub
@@ -6868,7 +6868,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
Open_FulltextSearch() Open_FulltextSearch()
End Sub End Sub
Private Sub tsmiFulltext_Click(sender As Object, e As EventArgs) Handles tsmiFulltext.Click Private Sub tsmiFulltext_Click(sender As Object, e As EventArgs)
Open_FulltextSearch() Open_FulltextSearch()
End Sub End Sub
Sub Open_FulltextSearch() Sub Open_FulltextSearch()

View File

@@ -42,8 +42,8 @@ Partial Class frmDoc_Links
' '
'tslbl 'tslbl
' '
Me.tslbl.Name = "tslbl"
resources.ApplyResources(Me.tslbl, "tslbl") resources.ApplyResources(Me.tslbl, "tslbl")
Me.tslbl.Name = "tslbl"
' '
'ToolStripButtonDelete 'ToolStripButtonDelete
' '
@@ -65,13 +65,13 @@ Partial Class frmDoc_Links
' '
'grvwGrid 'grvwGrid
' '
Me.grvwGrid.Appearance.EvenRow.BackColor = CType(resources.GetObject("grvwGrid.Appearance.EvenRow.BackColor"), System.Drawing.Color) Me.grvwGrid.Appearance.EvenRow.BackColor = System.Drawing.Color.Aqua
Me.grvwGrid.Appearance.EvenRow.Options.UseBackColor = True Me.grvwGrid.Appearance.EvenRow.Options.UseBackColor = True
Me.grvwGrid.Appearance.FilterPanel.BackColor = CType(resources.GetObject("grvwGrid.Appearance.FilterPanel.BackColor"), System.Drawing.Color) Me.grvwGrid.Appearance.FilterPanel.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
Me.grvwGrid.Appearance.FilterPanel.Options.UseBackColor = True Me.grvwGrid.Appearance.FilterPanel.Options.UseBackColor = True
Me.grvwGrid.Appearance.HideSelectionRow.BackColor = CType(resources.GetObject("grvwGrid.Appearance.HideSelectionRow.BackColor"), System.Drawing.Color) Me.grvwGrid.Appearance.HideSelectionRow.BackColor = System.Drawing.Color.Yellow
Me.grvwGrid.Appearance.HideSelectionRow.Options.UseBackColor = True Me.grvwGrid.Appearance.HideSelectionRow.Options.UseBackColor = True
Me.grvwGrid.Appearance.SelectedRow.BackColor = CType(resources.GetObject("grvwGrid.Appearance.SelectedRow.BackColor"), System.Drawing.Color) Me.grvwGrid.Appearance.SelectedRow.BackColor = System.Drawing.Color.Yellow
Me.grvwGrid.Appearance.SelectedRow.Options.UseBackColor = True Me.grvwGrid.Appearance.SelectedRow.Options.UseBackColor = True
Me.grvwGrid.Appearance.SelectedRow.Options.UseForeColor = True Me.grvwGrid.Appearance.SelectedRow.Options.UseForeColor = True
Me.grvwGrid.GridControl = Me.dgRecords Me.grvwGrid.GridControl = Me.dgRecords

View File

@@ -121,8 +121,11 @@
<value>17, 17</value> <value>17, 17</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="tslbl.Font" type="System.Drawing.Font, System.Drawing">
<value>Segoe UI, 9pt, style=Bold, Italic</value>
</data>
<data name="tslbl.Size" type="System.Drawing.Size, System.Drawing"> <data name="tslbl.Size" type="System.Drawing.Size, System.Drawing">
<value>29, 22</value> <value>32, 22</value>
</data> </data>
<data name="tslbl.Text" xml:space="preserve"> <data name="tslbl.Text" xml:space="preserve">
<value>tslbl</value> <value>tslbl</value>
@@ -195,18 +198,6 @@
<data name="dgRecords.Location" type="System.Drawing.Point, System.Drawing"> <data name="dgRecords.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 25</value> <value>0, 25</value>
</data> </data>
<data name="grvwGrid.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
<value>Aqua</value>
</data>
<data name="grvwGrid.Appearance.FilterPanel.BackColor" type="System.Drawing.Color, System.Drawing">
<value>255, 128, 0</value>
</data>
<data name="grvwGrid.Appearance.HideSelectionRow.BackColor" type="System.Drawing.Color, System.Drawing">
<value>Yellow</value>
</data>
<data name="grvwGrid.Appearance.SelectedRow.BackColor" type="System.Drawing.Color, System.Drawing">
<value>Yellow</value>
</data>
<data name="dgRecords.Size" type="System.Drawing.Size, System.Drawing"> <data name="dgRecords.Size" type="System.Drawing.Size, System.Drawing">
<value>800, 403</value> <value>800, 403</value>
</data> </data>

View File

@@ -5,7 +5,7 @@
End Sub End Sub
Sub Load_Users_GS() Sub Load_Users_GS()
Dim Sql = String.Format("SELECT T.* FROM TBDD_USER T INNER JOIN TBDD_USER_MODULES T1 ON T.GUID = T1.USER_ID INNER JOIN TBDD_MODULES T2 ON T1.MODULE_ID = T2.GUID Dim Sql = String.Format("SELECT T.* FROM TBDD_USER T INNER JOIN TBDD_USER_MODULES T1 ON T.GUID = T1.USER_ID INNER JOIN TBDD_MODULES T2 ON T1.MODULE_ID = T2.GUID
WHERE T2.SHORT_NAME = 'ADDI' AND T.GUID NOT IN (SELECT USER_ID FROM TBPMO_USER_GLOBAL_SEARCH) ORDER BY USERNAME ORDER BY T.USERNAME") WHERE T2.SHORT_NAME = 'ADDI' AND T.GUID NOT IN (SELECT USER_ID FROM TBPMO_USER_GLOBAL_SEARCH) ORDER BY T.USERNAME")
Dim DT_USER = ClassDatabase.Return_Datatable(Sql) Dim DT_USER = ClassDatabase.Return_Datatable(Sql)
Sql = String.Format("SELECT * FROM TBDD_USER WHERE GUID IN (SELECT USER_ID FROM TBPMO_USER_GLOBAL_SEARCH) ORDER BY USERNAME") Sql = String.Format("SELECT * FROM TBDD_USER WHERE GUID IN (SELECT USER_ID FROM TBPMO_USER_GLOBAL_SEARCH) ORDER BY USERNAME")
Dim DT_USERS_CONFIGURED = ClassDatabase.Return_Datatable(Sql) Dim DT_USERS_CONFIGURED = ClassDatabase.Return_Datatable(Sql)