AppStd/Modules
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Zooflow: Fix wrong image on dragdrop, prepare removal of manual database config

Browse Source
This commit is contained in:
Jonathan Jenne
2022-04-04 16:40:25 +02:00
parent de451e8c57
commit 8ff4ae5a27
11 changed files with 166 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
GUIs.ZooFlow/frmFlowForm.vb
View File

@@ -647,12 +647,14 @@ Public Class frmFlowForm
Exit Function
End If
PictureEdit2.Image = My.Resources.ZooFlow_drop
'Erstmal alles löschen
My.Database.ExecuteNonQueryECM("DELETE FROM TBGI_FILES_USER WHERE USER@WORK = '" & My.Application.User.UserName & "'")
Dim oDroppedFiles = FileDropNew.GetFiles(e)
If oDroppedFiles.Count > 0 Then
Await Globix_Check_Dropped_Files(oDroppedFiles)
Await Globix_CheckDroppedFiles(oDroppedFiles)
End If
End Function
@@ -660,7 +662,7 @@ Public Class frmFlowForm
Await DragDropForm(e)
End Sub
Private Async Function Globix_Check_Dropped_Files(pDroppedFiles As List(Of FileDrop.DroppedFile)) As Threading.Tasks.Task
Private Async Function Globix_CheckDroppedFiles(pDroppedFiles As List(Of FileDrop.DroppedFile)) As Threading.Tasks.Task
Try
Await My.Database.ExecuteNonQueryECMAsync($"DELETE FROM TBGI_FILES_USER WHERE WORKED = 1 AND USER@WORK = '{My.Application.User.UserName}'")
@@ -697,8 +699,7 @@ Public Class frmFlowForm
Dim oFilePath As String = oRow.Item("FILENAME2WORK").ToString
Dim oFileId As Integer = oRow.Item("GUID")
My.Application.Globix.CurrentWorkfile = New Globix.Models.WorkFile With {
.Id = oFileId,
My.Application.Globix.CurrentWorkfile = New Globix.Models.WorkFile(oFileId) With {
.FilePath = oFilePath
}
@@ -706,8 +707,6 @@ Public Class frmFlowForm
If IO.File.Exists(My.Application.Globix.CurrentWorkfile.FilePath) = True And
My.Application.Globix.DTACTUAL_FILES.Rows.Count > 0 Then
Globix_Open_IndexDialog()
PictureEdit2.Image = My.Resources.ZooFlow_drop_drag
End If
Next
Catch ex As Exception
@@ -907,11 +906,10 @@ Public Class frmFlowForm
handleType = "|FW_SIMPLEINDEXER|"
End If
If FileHandle.CheckDuplicateFiles(FileForWork, "FolderWatch") Then
My.Application.Globix.CurrentWorkfile = New Globix.Models.WorkFile With {
.Id = DirectCast(row.Item("GUID"), Integer),
.FilePath = FileForWork,
.HotfolderFile = True
}
My.Application.Globix.CurrentWorkfile = New Globix.Models.WorkFile(row.Item("GUID")) With {
.FilePath = FileForWork,
.HotfolderFile = True
}
Globix_Open_IndexDialog()
Else
My.Database.ExecuteNonQueryECM(oDel)
@@ -1231,7 +1229,7 @@ Public Class frmFlowForm
frmServiceConfig.ShowDialog()
End Sub
Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnDatabaseConfig.ItemClick
Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
Dim oForm As New frmSQLConfig(My.LogConfig) With {
.ConnectionString = My.SystemConfig.ConnectionString,
.FormTitle = "ECM Datenbank"