diff --git a/.gitignore b/.gitignore index 60055c1..90165a0 100644 --- a/.gitignore +++ b/.gitignore @@ -155,3 +155,4 @@ $RECYCLE.BIN/ # Mac desktop service store files .DS_Store /app/.vs/DD-Record-Organizer/v15/Server/sqlite3 +/app/.vs/DD-Record-Organizer/v16/Server/sqlite3 diff --git a/app/DD-Record-Organizer/ClassDOC_SEARCH.vb b/app/DD-Record-Organizer/ClassDOC_SEARCH.vb index 078fe0b..5e37285 100644 --- a/app/DD-Record-Organizer/ClassDOC_SEARCH.vb +++ b/app/DD-Record-Organizer/ClassDOC_SEARCH.vb @@ -262,7 +262,7 @@ Public Class ClassDOC_SEARCH Return Nothing End If 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 listcheck As New List(Of String) 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.ColumnName = "ICON" colIcon.Caption = "" - DTGrid.Columns.Add(colIcon) + oDTGrid.Columns.Add(colIcon) _step = "4" Dim colPath As New System.Data.DataColumn() colPath.DataType = GetType(String) colPath.ColumnName = "FULLPATH" colPath.Caption = "Fullpath" - DTGrid.Columns.Add(colPath) + oDTGrid.Columns.Add(colPath) _step = "5" Dim colOtype As New System.Data.DataColumn() colOtype.DataType = GetType(String) colOtype.ColumnName = "OBJECTTYPE" colOtype.Caption = "Objecttype" - DTGrid.Columns.Add(colOtype) + oDTGrid.Columns.Add(colOtype) _step = "6" Dim colDocID As New System.Data.DataColumn() colDocID.DataType = GetType(Int32) colDocID.ColumnName = "DocID" colDocID.Caption = "DocID" - DTGrid.Columns.Add(colDocID) + oDTGrid.Columns.Add(colDocID) _step = "7" 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) End If - DTGrid.Columns.Add(oColumn) + oDTGrid.Columns.Add(oColumn) ColCount += 1 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) @@ -348,7 +348,7 @@ Public Class ClassDOC_SEARCH COL_ARRAY_RESULTLIST = ColArrayDEFINITION _step = "8" 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 collist.DataType = GetType(Boolean) End If @@ -365,52 +365,53 @@ Public Class ClassDOC_SEARCH Dim filename = Path.GetFileName(fullpath) Dim extension = Path.GetExtension(fullpath) ' Try - Dim NewRow As DataRow - NewRow = DTGrid.NewRow() + Dim oNewRow As DataRow + oNewRow = oDTGrid.NewRow() 'Icon zuweisen Select Case extension.ToUpper Case ".csv".ToUpper - NewRow.Item(0) = My.Resources.doc_excel_csv + oNewRow.Item(0) = My.Resources.doc_excel_csv Case ".txt".ToUpper - NewRow.Item(0) = My.Resources.text + oNewRow.Item(0) = My.Resources.text Case ".pdf".ToUpper - NewRow.Item(0) = My.Resources.pdf + oNewRow.Item(0) = My.Resources.pdf Case ".doc".ToUpper - NewRow.Item(0) = My.Resources.doc + oNewRow.Item(0) = My.Resources.doc Case ".docx".ToUpper - NewRow.Item(0) = My.Resources.doc + oNewRow.Item(0) = My.Resources.doc Case ".xls".ToUpper - NewRow.Item(0) = My.Resources.xls + oNewRow.Item(0) = My.Resources.xls Case ".xlsx".ToUpper - NewRow.Item(0) = My.Resources.xls + oNewRow.Item(0) = My.Resources.xls Case ".xlsm".ToUpper - NewRow.Item(0) = My.Resources.xls + oNewRow.Item(0) = My.Resources.xls Case ".ppt".ToUpper - NewRow.Item(0) = My.Resources.ppt + oNewRow.Item(0) = My.Resources.ppt Case ".pptx".ToUpper - NewRow.Item(0) = My.Resources.ppt + oNewRow.Item(0) = My.Resources.ppt Case ".dwg".ToUpper - NewRow.Item(0) = My.Resources.dwg + oNewRow.Item(0) = My.Resources.dwg Case ".dxf".ToUpper - NewRow.Item(0) = My.Resources.dxf + oNewRow.Item(0) = My.Resources.dxf Case ".msg".ToUpper - NewRow.Item(0) = My.Resources.email_go + oNewRow.Item(0) = My.Resources.email_go Case ".msg".ToUpper - NewRow.Item(0) = My.Resources.email_go + oNewRow.Item(0) = My.Resources.email_go Case Else - NewRow.Item(0) = My.Resources._blank + oNewRow.Item(0) = My.Resources._blank End Select 'Den Filepath mitgeben - NewRow.Item(1) = fullpath - NewRow.Item(2) = objecttype - NewRow.Item(3) = DocID + oNewRow.Item(1) = fullpath + oNewRow.Item(2) = objecttype + oNewRow.Item(3) = DocID Dim i = 4 'Fängt bei 4 an, um die definierten Spalten zu überspringen For Each Colname As String In ColArrayDEFINITION Dim rowvalue Try 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 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 @@ -424,17 +425,36 @@ Public Class ClassDOC_SEARCH End If 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 Next - DTGrid.Rows.Add(NewRow) + oDTGrid.Rows.Add(oNewRow) ' Catch ex As Exception ' ClassLogger.Add("Unexpected Error in CreateRow for doc '" & filename & "- Error: " & ex.Message) ' End Try Next _step = "10" - Return DTGrid + Return oDTGrid sw.Done() Catch ex As Exception diff --git a/app/DD-Record-Organizer/ClassWDRights.vb b/app/DD-Record-Organizer/ClassWDRights.vb index 5eeab25..49e4a08 100644 --- a/app/DD-Record-Organizer/ClassWDRights.vb +++ b/app/DD-Record-Organizer/ClassWDRights.vb @@ -166,7 +166,7 @@ Public Class ClassWDRights Else _msg = "Right for User: '" & UserOrGroup.aName & "'""" 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 Dim msg = "Error in setting UserGroupRelation - Err.Number: " & Err.Number & vbCrLf & Err.Description ClassLogger.Add(msg, True) @@ -178,7 +178,7 @@ Public Class ClassWDRights Try AccessRights.Delete2(UserOrGroup, WMAccessRightAllRights) 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) Continue For End Try diff --git a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb index 47a352e..aeecbb7 100644 --- a/app/DD-Record-Organizer/ClassWindreamDocGrid.vb +++ b/app/DD-Record-Organizer/ClassWindreamDocGrid.vb @@ -439,35 +439,38 @@ Public Class ClassWindreamDocGrid Try Dim view As ColumnView = sender 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 + 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 - parsedDate = DateTime.ParseExact(e.Value, CURRENT_DATE_FORMAT & " HH:MM:ss", System.Globalization.DateTimeFormatInfo.InvariantInfo) + 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 - - 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 Catch ex As Exception ClassLogger.Add("Unexpected error in gridView_CustomColumnDisplayText: " & ex.Message, False, False) - MsgBox("Unexpected error in gridView_CustomColumnDisplayText: " & ex.Message, MsgBoxStyle.Critical) End Try End Sub diff --git a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb index f904a7f..b39c27a 100644 --- a/app/DD-Record-Organizer/My Project/AssemblyInfo.vb +++ b/app/DD-Record-Organizer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb index 2942d18..4cb9cc9 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.Designer.vb @@ -39,8 +39,6 @@ Partial Class frmConstructor_Main Me.AuswertungAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.tsmiFilesearch = 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.ToolStripSeparator24 = New System.Windows.Forms.ToolStripSeparator() Me.tsmiNodeRename = New System.Windows.Forms.ToolStripMenuItem() @@ -357,7 +355,7 @@ Partial Class frmConstructor_Main ' '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") Me.tsmiFilesearch.Name = "tsmiFilesearch" ' @@ -367,17 +365,6 @@ Partial Class frmConstructor_Main Me.tsmiNodedownSearch.Name = "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 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" @@ -398,9 +385,9 @@ Partial Class frmConstructor_Main 'tstxtRenameNode ' Me.tstxtRenameNode.BackColor = System.Drawing.SystemColors.Control + resources.ApplyResources(Me.tstxtRenameNode, "tstxtRenameNode") Me.tstxtRenameNode.ForeColor = System.Drawing.SystemColors.ControlText Me.tstxtRenameNode.Name = "tstxtRenameNode" - resources.ApplyResources(Me.tstxtRenameNode, "tstxtRenameNode") ' 'tsmiNodeNew ' @@ -416,8 +403,8 @@ Partial Class frmConstructor_Main 'tsmINewText ' Me.tsmINewText.BackColor = System.Drawing.Color.Yellow - Me.tsmINewText.Name = "tsmINewText" resources.ApplyResources(Me.tsmINewText, "tsmINewText") + Me.tsmINewText.Name = "tsmINewText" ' 'ToolStripSeparator15 ' @@ -1315,8 +1302,8 @@ Partial Class frmConstructor_Main 'CMDoc_TextBoxRenameFile ' Me.CMDoc_TextBoxRenameFile.BackColor = System.Drawing.Color.Orange - Me.CMDoc_TextBoxRenameFile.Name = "CMDoc_TextBoxRenameFile" resources.ApplyResources(Me.CMDoc_TextBoxRenameFile, "CMDoc_TextBoxRenameFile") + Me.CMDoc_TextBoxRenameFile.Name = "CMDoc_TextBoxRenameFile" ' 'DisplaynameUmbenennenToolStripMenuItem ' @@ -1327,8 +1314,8 @@ Partial Class frmConstructor_Main 'CMDoc_TextBoxRenameDisplay ' Me.CMDoc_TextBoxRenameDisplay.BackColor = System.Drawing.Color.DarkOrange - Me.CMDoc_TextBoxRenameDisplay.Name = "CMDoc_TextBoxRenameDisplay" resources.ApplyResources(Me.CMDoc_TextBoxRenameDisplay, "CMDoc_TextBoxRenameDisplay") + Me.CMDoc_TextBoxRenameDisplay.Name = "CMDoc_TextBoxRenameDisplay" ' 'ToolStripSeparator22 ' @@ -1917,7 +1904,6 @@ Partial Class frmConstructor_Main Friend WithEvents DateiVersionierenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents DokumentartÄndernToolStripMenuItem 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 docCM_RenameMain 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 tslblPoslocked As System.Windows.Forms.ToolStripLabel 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 tslblWindreamView As System.Windows.Forms.ToolStripLabel Friend WithEvents ToolStripSeparator17 As System.Windows.Forms.ToolStripSeparator diff --git a/app/DD-Record-Organizer/frmConstructor_Main.resx b/app/DD-Record-Organizer/frmConstructor_Main.resx index 56a9874..a2272b4 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.resx +++ b/app/DD-Record-Organizer/frmConstructor_Main.resx @@ -168,7 +168,7 @@ Auswertung anzeigen - 233, 22 + 237, 26 Diesem Knoten untergeordnet @@ -177,81 +177,6 @@ False - - 233, 22 - - - Entitätssuche - "alle Dateien" - - - - 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 - - - - 233, 22 - - - Volltextsuche - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -279,6 +204,9 @@ 221, 6 + + Segoe UI, 9pt + 200, 23 @@ -296,16 +224,19 @@ Knoten umbenennen - 216, 26 + 212, 22 Knotentext: + + Segoe UI, 9pt + 152, 23 - 213, 6 + 209, 6 @@ -316,7 +247,7 @@ - 216, 26 + 212, 22 Auf dieser Ebene @@ -331,7 +262,7 @@ - 216, 26 + 212, 22 Unterhalb @@ -1049,6 +980,9 @@ False + + Segoe UI, 9pt + 50, 23 @@ -2186,6 +2120,9 @@ Verknüpfungen anzeigen + + Segoe UI, 9pt + 152, 23 @@ -2198,6 +2135,9 @@ Dateinamen umbenennen + + Segoe UI, 9pt + 152, 23 @@ -2893,7 +2833,7 @@ True - 85 + 226 6, 13 @@ -3398,18 +3338,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsmientitySearch - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tsmiFulltext - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ToolStripSeparator12 diff --git a/app/DD-Record-Organizer/frmConstructor_Main.vb b/app/DD-Record-Organizer/frmConstructor_Main.vb index 68ea8e6..31aacba 100644 --- a/app/DD-Record-Organizer/frmConstructor_Main.vb +++ b/app/DD-Record-Organizer/frmConstructor_Main.vb @@ -1170,7 +1170,7 @@ Public Class frmConstructor_Main 'pnlPositions.Enabled = True TabWindream.PageEnabled = True tsbtnDoc_Refresh.Enabled = True - tsmientitySearch.Enabled = True + If SQL_RECORD_AND_FILE_READ_ONLY <> "" Or SQL_DOC_READ_ONLY <> "" 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() 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" RUN_ENTITY_DOC_SEARCH() End Sub @@ -6868,7 +6868,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME") Open_FulltextSearch() 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() End Sub Sub Open_FulltextSearch() diff --git a/app/DD-Record-Organizer/frmViewsUser.vb b/app/DD-Record-Organizer/frmViewsUser.vb index ea49acb..89343fa 100644 --- a/app/DD-Record-Organizer/frmViewsUser.vb +++ b/app/DD-Record-Organizer/frmViewsUser.vb @@ -5,7 +5,7 @@ End Sub 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 -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) 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)