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

Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo

Browse Source
This commit is contained in:
Jonathan Jenne 2022-05-09 16:40:34 +02:00
commit 6e8383d48d
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb
View File

@ -169,10 +169,8 @@ Public Class ClassFolderwatcher
'Die Datei übergeben
Logger.Info(">> OnCreated-File:" & e.FullPath)
If FileHandle.CheckDuplicateFiles(e.FullPath, "FolderWatch/Scan") Then
FileHandle.Decide_FileHandle(e.FullPath, handleType)
Else
Logger.Info(">> Folderwatcher: File already exists:" & e.FullPath)
If FileHandle.Decide_FileHandle(e.FullPath, handleType) = True Then
My.Application.Globix.NEW_FILES = True
End If
Catch ex As Exception

2
GUIs.ZooFlow/Modules/Globix/ClassUserFiles.vb
View File

@ -51,7 +51,7 @@ 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 TBGI_FILES_USER WHERE FILE_HASH = '" & oHash & "' AND WORKED = 0 ORDER BY ADDED_WHEN"
Dim oResult As DataTable = My.DatabaseECM.GetDatatable(oSQL)
If oResult Is Nothing Then

1
GUIs.ZooFlow/Modules/Globix/State.vb
View File

@ -10,6 +10,7 @@ Namespace Globix
Public Property CURRENT_SCAN_FOLDERWATCH As String
Public Property CurrentWorkfile As Models.WorkFile
Public Property INDEXING_ACTIVE As Boolean = False
Public Property NEW_FILES As Boolean = False
Public Property ABORT_INDEXING As Boolean = False
Public Property CURRENT_ISATTACHMENT As Boolean = False
Public Property DeleteOriginalFile As Boolean = False

4
GUIs.ZooFlow/My Project/AssemblyInfo.vb
View File

@ -32,5 +32,5 @@ Imports System.Runtime.InteropServices
' You can specify all the values or you can default the Build and Revision Numbers
' by using the '*' as shown below:
' [assembly: AssemblyVersion("1.0.*")]
<Assembly: AssemblyVersion("1.0.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: AssemblyVersion("1.1.0.0")>
<Assembly: AssemblyFileVersion("1.1.0.0")>

8
GUIs.ZooFlow/frmFlowForm.Designer.vb generated
View File

@ -41,7 +41,7 @@ Partial Class frmFlowForm
Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
Me.PictureBoxPM = New DevExpress.XtraEditors.SvgImageBox()
Me.PictureBoxSearch = New DevExpress.XtraEditors.SvgImageBox()
Me.TimerFolderwatch = New System.Windows.Forms.Timer(Me.components)
Me.TimerCheckFolderWatchTable = New System.Windows.Forms.Timer(Me.components)
Me.pnlQuicksearch1 = New System.Windows.Forms.Panel()
Me.txtQuicksearch1 = New DevExpress.XtraEditors.TextEdit()
Me.PictureEditQuicksearch1 = New DevExpress.XtraEditors.PictureEdit()
@ -184,9 +184,9 @@ Partial Class frmFlowForm
Me.PictureBoxSearch.Text = "X"
Me.ToolTip1.SetToolTip(Me.PictureBoxSearch, "FlowSearch öffnen")
'
'TimerFolderwatch
'TimerCheckFolderWatchTable
'
Me.TimerFolderwatch.Interval = 2000
Me.TimerCheckFolderWatchTable.Interval = 2000
'
'pnlQuicksearch1
'
@ -554,7 +554,7 @@ Partial Class frmFlowForm
Friend WithEvents ZooFlowBeendenToolStripMenuItem As ToolStripMenuItem
Friend WithEvents ToolTip1 As ToolTip
Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
Friend WithEvents TimerFolderwatch As Timer
Friend WithEvents TimerCheckFolderWatchTable As Timer
Friend WithEvents TestToolStripMenuItem As ToolStripMenuItem
Friend WithEvents PictureBoxSearch As DevExpress.XtraEditors.SvgImageBox
Friend WithEvents PictureBoxPM As DevExpress.XtraEditors.SvgImageBox

6
GUIs.ZooFlow/frmFlowForm.resx
View File

@ -1959,11 +1959,11 @@
<metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>468, 17</value>
</metadata>
<metadata name="TimerFolderwatch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="TimerCheckFolderWatchTable.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>567, 17</value>
</metadata>
<metadata name="BarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>716, 17</value>
<value>781, 17</value>
</metadata>
<assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="BarSubItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -2039,6 +2039,6 @@
</value>
</data>
<metadata name="AdornerUIManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>841, 17</value>
<value>17, 56</value>
</metadata>
</root>

13
GUIs.ZooFlow/frmFlowForm.vb
View File

@ -834,8 +834,8 @@ Public Class frmFlowForm
ShowErrorMessage(ex)
End Try
If TimerFolderwatch.Enabled = False Then
TimerFolderwatch.Start()
If TimerCheckFolderWatchTable.Enabled = False Then
TimerCheckFolderWatchTable.Start()
End If
End If
@ -846,7 +846,7 @@ Public Class frmFlowForm
My.UIConfigManager.Save()
End Sub
Private Sub TimerFolderwatch_Tick(sender As Object, e As EventArgs) Handles TimerFolderwatch.Tick
Private Sub TimerFolderwatch_Tick(sender As Object, e As EventArgs) Handles TimerCheckFolderWatchTable.Tick
Try
' JenneJ, 11.02.2019:
@ -864,8 +864,7 @@ Public Class frmFlowForm
If My.Application.Globix.DTACTUAL_FILES.Rows.Count > 0 Then
My.Application.Globix.ABORT_INDEXING = False
' Dim fil As String
Me.TimerFolderwatch.Stop()
TimerCheckFolderWatchTable.Enabled = False
For Each row As DataRow In My.Application.Globix.DTACTUAL_FILES.Rows
Dim FILEGUID = row.Item("GUID")
Dim oDel = String.Format("DELETE FROM TBGI_FILES_USER WHERE GUID = {0}", FILEGUID)
@ -911,7 +910,9 @@ Public Class frmFlowForm
End If
Next
Me.TimerFolderwatch.Start()
If TimerCheckFolderWatchTable.Enabled = False Then
TimerCheckFolderWatchTable.Start()
End If
End If
'tslblFW.Visible = True
Else