From c830f21590287382d555486a363ceb92df5f33b3 Mon Sep 17 00:00:00 2001
From: Digital Data - Marlon Schreiber <m.schreiber@digitaldata.works>
Date: Tue, 31 May 2022 15:54:48 +0200
Subject: [PATCH] ClassUserFiles HASH FileObject

---
 .../IDB/frmAdmin_IDBAttribute.resx            |  3 ---
 GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb | 23 +++----------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.resx b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.resx
index bb2306b3..2c3576b0 100644
--- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.resx
+++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.resx
@@ -166,9 +166,6 @@
   <metadata name="TBWH_ATTRIBUTE_TYPEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>848, 17</value>
   </metadata>
-  <metadata name="DSIDB_Stammdaten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>177, 17</value>
   </metadata>
diff --git a/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb b/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb
index a97510d3..51da2641 100644
--- a/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb
+++ b/GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb
@@ -52,31 +52,14 @@ Public Class ClassUserFiles
                 oHash = ""
             End Try
 
-            oSQL = "SELECT * FROM TBGI_FILES_USER WHERE FILE_HASH = '" & oHash & "' AND WORKED = 0 ORDER BY ADDED_WHEN"
+            oSQL = "SELECT * FROM TBIDB_FILE_OBJECT WHERE FILE_HASH = '" & oHash & "' ORDER BY ADDED_WHEN"
             Dim oResult As DataTable = My.DatabaseECM.GetDatatable(oSQL)
 
-            If oResult Is Nothing Then
-                Return Nothing
-            End If
-
             If oResult.Rows.Count = 0 Then
-                oSQL = "SELECT * FROM TBIDB_FILE_OBJECT WHERE FILE_HASH = '" & oHash & "' ORDER BY ADDED_WHEN"
-                oResult = My.DatabaseIDB.GetDatatable(oSQL)
-
-                If oResult Is Nothing Then
-                    Return Nothing
-                End If
-
-                If oResult.Rows.Count = 0 Then
-                    Return Nothing
-                Else
-                    Dim oFirstRow As DataRow = oResult.Rows.Item(0)
-                    My.Application.Globix.DOCUMENT_ID = oFirstRow.Item("IDB_OBJ_ID")
-                    Return oFirstRow.Item("ADDED_WHEN")
-                End If
+                Return Nothing
             Else
                 Dim oFirstRow As DataRow = oResult.Rows.Item(0)
-                My.Application.Globix.DOCUMENT_ID = oFirstRow.Item("DocID")
+                My.Application.Globix.DOCUMENT_ID = oFirstRow.Item("IDB_OBJ_ID")
                 Return oFirstRow.Item("ADDED_WHEN")
             End If
         Catch ex As Exception