This commit is contained in:
SchreiberM
2016-08-17 11:32:45 +02:00
parent b811570870
commit 32192cf542
70 changed files with 7103 additions and 9527 deletions

View File

@@ -212,9 +212,13 @@ Public Class frmConfig_Basic
Case 1
cmbLanguage.SelectedIndex = cmbLanguage.FindStringExact(USER_LANGUAGE)
Case 2
Dim SCAN_folderwatch = ClassDatabase.Execute_Scalar("SELECT FOLDER_PATH FROM TBPMO_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & USER_GUID, True)
If Not SCAN_folderwatch Is Nothing Then
CURRENT_SCAN_FOLDERWATCH = SCAN_folderwatch
Dim DTSCAN_folderwatch As DataTable = ClassDatabase.Return_Datatable("SELECT FOLDER_PATH,SUBDIRECTORIES FROM TBPMO_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & USER_GUID, True)
If Not DTSCAN_folderwatch Is Nothing Then
If DTSCAN_folderwatch.Rows.Count = 1 Then
CURRENT_SCAN_FOLDERWATCH = DTSCAN_folderwatch.Rows(0).Item(0)
CURRENT_SCAN_FOLDERWATCH_SD = DTSCAN_folderwatch.Rows(0).Item(1)
End If
End If
Me.txtScanFolderWatch.Text = CURRENT_SCAN_FOLDERWATCH
@@ -256,10 +260,10 @@ Public Class frmConfig_Basic
fbdialog.SelectedPath = txtScanFolderWatch.Text
End If
If fbdialog.ShowDialog() = DialogResult.OK Then
CheckScanFolder(fbdialog.SelectedPath)
CheckScanFolder(fbdialog.SelectedPath, chkSubfolder.Checked)
End If
End Sub
Sub CheckScanFolder(mypath As String)
Sub CheckScanFolder(mypath As String, SUBDIRECTORIES As Boolean)
Try
If mypath <> "" Then
Try
@@ -274,18 +278,27 @@ Public Class frmConfig_Basic
End Try
End If
Dim _SUBDIRECTORIES
If SUBDIRECTORIES = False Then
_SUBDIRECTORIES = 0
Else
_SUBDIRECTORIES = 1
End If
Dim folderwatch = ClassDatabase.Execute_Scalar("SELECT GUID FROM TBPMO_FOLDERWATCH_USER WHERE USER_ID = " & USER_GUID & " AND FOLDER_TYPE = 'SCAN'", True)
Dim sql As String
If folderwatch Is Nothing And mypath <> "" Then
sql = "INSERT INTO TBPMO_FOLDERWATCH_USER (USER_ID, FOLDER_PATH, FOLDER_TYPE, ADDED_WHO) VALUES (" & USER_GUID & ",'" & mypath & "','SCAN','" & Environment.UserName & "')"
sql = "INSERT INTO TBPMO_FOLDERWATCH_USER (USER_ID, FOLDER_PATH, FOLDER_TYPE,SUBDIRECTORIES, ADDED_WHO) VALUES (" & USER_GUID & ",'" & mypath & "','SCAN', " & _SUBDIRECTORIES & ",'" & Environment.UserName & "')"
Else
sql = "UPDATE TBPMO_FOLDERWATCH_USER SET FOLDER_PATH = '" & mypath & "', CHANGED_WHO = '" & Environment.UserName & "' where GUID = " & folderwatch
sql = "UPDATE TBPMO_FOLDERWATCH_USER SET FOLDER_PATH = '" & mypath & "', SUBDIRECTORIES = " & _SUBDIRECTORIES & ", CHANGED_WHO = '" & Environment.UserName & "' where GUID = " & folderwatch
End If
If ClassDatabase.Execute_non_Query(sql) Then
folderwatch = ClassDatabase.Execute_Scalar("SELECT FOLDER_PATH FROM TBPMO_FOLDERWATCH_USER WHERE USER_ID = " & USER_GUID & " AND FOLDER_TYPE = 'SCAN'", True)
Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT FOLDER_PATH, SUBDIRECTORIES FROM TBPMO_FOLDERWATCH_USER WHERE USER_ID = " & USER_GUID & " AND FOLDER_TYPE = 'SCAN'", True)
CURRENT_SCAN_FOLDERWATCH = folderwatch
CURRENT_SCAN_FOLDERWATCH = DT.Rows(0).Item(0)
CURRENT_SCAN_FOLDERWATCH_SD = DT.Rows(0).Item(1)
Me.txtScanFolderWatch.Text = CURRENT_SCAN_FOLDERWATCH
Me.chkSubfolder.Checked = CURRENT_SCAN_FOLDERWATCH_SD
End If
If FWSCAN_started = True Then
ClassFolderWatcher.Restart_FolderWatchSCAN()
@@ -309,7 +322,7 @@ Public Class frmConfig_Basic
Private Sub btnstartstop2_Click(sender As Object, e As EventArgs) Handles btnstartstop2.Click
If CURRENT_SCAN_FOLDERWATCH <> "" Then
CheckScanFolder(CURRENT_SCAN_FOLDERWATCH)
CheckScanFolder(CURRENT_SCAN_FOLDERWATCH, chkSubfolder.Checked)
CheckFWSCAN_State()
End If
End Sub
@@ -404,6 +417,10 @@ Public Class frmConfig_Basic
End Sub
Private Sub txtScanFolderWatch_TextChanged(sender As Object, e As EventArgs) Handles txtScanFolderWatch.TextChanged
CheckScanFolder(txtScanFolderWatch.Text)
CheckScanFolder(txtScanFolderWatch.Text, chkSubfolder.Checked)
End Sub
Private Sub chkSubfolder_CheckedChanged(sender As Object, e As EventArgs) Handles chkSubfolder.CheckedChanged
CheckScanFolder(txtScanFolderWatch.Text, chkSubfolder.Checked)
End Sub
End Class